Presenting GNOME 2.18 for FreeBSD. GNOME 2.18 is a departure from recent GNOME

releases in that it focuses more on stability and functionality than on new features. Not that it doesn't have its share of new and exciting items. See http://www.gnome.org/start/2.18/ for all the goodies in this release. GNOME 2.18 for FreeBSD would not have been possible without the hard work of the FreeBSD GNOME Team and our intrepid band of testers including J. W. Ballantine, Pawel Worach, Yasuda Keisuke, Pascal Hofstee, miwi, Yoshihiro Ota, Vladimir Grebenschikov, Jukka A. Ukkonen, Phillip Neumann, Franz Klammer, and Neal Delmonico.
svn path=/head/; revision=187702
2025-01-31 10:46:16 +00:00 · 2007-03-19 05:14:07 +00:00 · 2007-03-19 05:14:07 +00:00 · 951c257ea3 · 2021-03-31 03:12:20 +00:00
commit 951c257ea3
parent 91926e92b7
479 changed files with 9790 additions and 6425 deletions
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@ -15,6 +15,7 @@
    SUBDIR += gnome-speech
    SUBDIR += gnopernicus
    SUBDIR += gok
+    SUBDIR += java-access-bridge
    SUBDIR += kdeaccessibility
    SUBDIR += linux-atk
    SUBDIR += orca
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@ -3,11 +3,11 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi/Makefile,v 1.50 2006/10/02 00:50:26 ahze Exp $
+#   $MCom: ports/accessibility/at-spi/Makefile,v 1.56 2007/03/12 13:22:49 ahze Exp $
 #

 PORTNAME=	at-spi
-PORTVERSION=	1.7.15
+PORTVERSION=	1.18.0
 PORTREVISION?=	0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/at-spi-1.7.15.tar.bz2) = b8af15556d24e850feb2ffb40eda1d31
-SHA256 (gnome2/at-spi-1.7.15.tar.bz2) = 84b54825c61177bbdba9e58f7f31a733c36ba721e729744fde7011f08f01d14d
-SIZE (gnome2/at-spi-1.7.15.tar.bz2) = 776710
+MD5 (gnome2/at-spi-1.18.0.tar.bz2) = d77f3b7111a847903f66f5cb111ee89e
+SHA256 (gnome2/at-spi-1.18.0.tar.bz2) = 1d77e06c4cea6111faee520beb3d2fbc0d746879e16eb9fb0782e7d3743a58eb
+SIZE (gnome2/at-spi-1.18.0.tar.bz2) = 778719
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@ -146,7 +146,7 @@ share/locale/zh_CN/LC_MESSAGES/at-spi.mo
 share/locale/zh_HK/LC_MESSAGES/at-spi.mo
 share/locale/zh_TW/LC_MESSAGES/at-spi.mo
@dirrm share/gnome/idl/at-spi-1.0
-@dirrm lib/orbit-2.0
+@dirrmtry lib/orbit-2.0
@dirrm include/at-spi-1.0/login-helper
@dirrm include/at-spi-1.0/libspi
@dirrm include/at-spi-1.0/cspi
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@ -3,11 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/atk/Makefile,v 1.73 2006/10/02 00:43:11 ahze Exp $
+#   $MCom: ports/accessibility/atk/Makefile,v 1.78 2007/03/12 13:28:58 ahze Exp $
 #

 PORTNAME=	atk
-PORTVERSION=	1.12.4
+PORTVERSION=	1.18.0
 PORTREVISION?=	0
 CATEGORIES=	accessibility devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/atk-1.12.4.tar.bz2) = 0a2c6a7bbc380e3a3d94e9061f76a849
-SHA256 (gnome2/atk-1.12.4.tar.bz2) = bb62ff3809785512b44d1a523056c28a79844df13e39bddac89045be4adc0500
-SIZE (gnome2/atk-1.12.4.tar.bz2) = 647699
+MD5 (gnome2/atk-1.18.0.tar.bz2) = 9fc33ec48fd32933f7f630479dfad667
+SHA256 (gnome2/atk-1.18.0.tar.bz2) = be2d537642a43b5a1e85a2d0f813167b8585781ff83203a4f68206c3ecd6a315
+SIZE (gnome2/atk-1.18.0.tar.bz2) = 655890
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@ -9,6 +9,7 @@ include/atk-1.0/atk/atkhyperlink.h
 include/atk-1.0/atk/atkhyperlinkimpl.h
 include/atk-1.0/atk/atkhypertext.h
 include/atk-1.0/atk/atkimage.h
+include/atk-1.0/atk/atkmisc.h
 include/atk-1.0/atk/atknoopobject.h
 include/atk-1.0/atk/atknoopobjectfactory.h
 include/atk-1.0/atk/atkobject.h
@ -36,6 +37,7 @@ share/locale/ar/LC_MESSAGES/atk10.mo
 share/locale/as/LC_MESSAGES/atk10.mo
 share/locale/az/LC_MESSAGES/atk10.mo
 share/locale/be/LC_MESSAGES/atk10.mo
+share/locale/be@latin/LC_MESSAGES/atk10.mo
 share/locale/bg/LC_MESSAGES/atk10.mo
 share/locale/bn/LC_MESSAGES/atk10.mo
 share/locale/bn_IN/LC_MESSAGES/atk10.mo
@ -177,6 +179,8 @@ share/locale/zh_TW/LC_MESSAGES/atk10.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
@dirrmtry share/locale/as/LC_MESSAGES
--- a/accessibility/dasher/Makefile
+++ b/accessibility/dasher/Makefile
@ -3,11 +3,11 @@
 # Whom:					lewiz <purple@lewiz.net>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/dasher/Makefile,v 1.44 2006/09/03 21:33:52 marcus Exp $
+#   $MCom: ports/accessibility/dasher/Makefile,v 1.50 2007/03/12 20:16:34 mezz Exp $
 #

 PORTNAME=	dasher
-PORTVERSION=	4.2.2
+PORTVERSION=	4.4.0
 PORTEPOCH=	1
 CATEGORIES=	accessibility editors x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@ -34,6 +34,7 @@ USE_GCC=	3.4+
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

+GCONF_SCHEMAS=	dasher.schemas
 MAN1=		dasher.1

 .include <bsd.port.pre.mk>
--- a/accessibility/dasher/distinfo
+++ b/accessibility/dasher/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/dasher-4.2.2.tar.bz2) = eff0aeda6c02b03263c4712f56bd3b1c
-SHA256 (gnome2/dasher-4.2.2.tar.bz2) = a51a3bf9a3a1b28a5e9dacc82bad14903a93389a0df92b289e8c2f4180e8bdcf
-SIZE (gnome2/dasher-4.2.2.tar.bz2) = 5625199
+MD5 (gnome2/dasher-4.4.0.tar.bz2) = e47684793d29904f64370393234cf604
+SHA256 (gnome2/dasher-4.4.0.tar.bz2) = 66fab7ac772fa1cb2fad1fe9183effa73d345fec364942e1dbc8084600d1d73a
+SIZE (gnome2/dasher-4.4.0.tar.bz2) = 6741569
--- a/accessibility/dasher/files/patch-Src_DasherCore_BasicLog.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_BasicLog.cpp
@ -0,0 +1,11 @@
+--- Src/DasherCore/BasicLog.cpp.orig	Tue Dec  5 22:01:38 2006
+++ Src/DasherCore/BasicLog.cpp	Tue Dec  5 22:02:14 2006
+@@ -87,7 +87,7 @@ std::string CBasicLog::GetDateStamp() {
+     szTimeLine = ctime(&(sTimeBuffer.time));
+ #else
+     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
+-    szTimeLine = ctime(&(sTimeBuffer.tv_sec));
+    szTimeLine = ctime((const time_t *)&(sTimeBuffer.tv_sec));
+ #endif
+ 
+     return std::string(szTimeLine).substr(0, 24);
--- a/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_FileLogger.cpp
@ -1,6 +1,6 @@
--- Src/DasherCore/FileLogger.cpp.orig	Fri Apr 21 17:41:01 2006
-+++ Src/DasherCore/FileLogger.cpp	Sun Jun 11 07:33:19 2006
-@@ -511,7 +511,7 @@
+--- Src/DasherCore/FileLogger.cpp.orig	Sun Dec  3 09:50:34 2006
+++ Src/DasherCore/FileLogger.cpp	Sun Dec  3 18:45:55 2006
+@@ -511,7 +511,7 @@ std::string CFileLogger::GetTimeDateStam
     szTimeLine = ctime(&(sTimeBuffer.time));
 #else
     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
@ -9,12 +9,3 @@
 #endif
  
     // Format is:
-@@ -538,7 +538,7 @@
- #ifdef _WIN32
-         sprintf(strMs, "%d", sTimeBuffer.millitm);
- #else
-        sprintf(strMs, "%d", sTimeBuffer.tv_usec / 1000);
-+        sprintf(strMs, "%d", (int) (sTimeBuffer.tv_usec / 1000));
- #endif
-         if (strlen(strMs) == 1)
-           strTimeStamp += "00";
--- a/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
+++ b/accessibility/dasher/files/patch-Src_DasherCore_TimeSpan.cpp
@ -1,6 +1,6 @@
--- Src/DasherCore/TimeSpan.cpp.orig	Fri Apr 21 17:41:02 2006
-+++ Src/DasherCore/TimeSpan.cpp	Sun Jun 11 09:21:30 2006
-@@ -122,7 +122,7 @@
+--- Src/DasherCore/TimeSpan.cpp.orig	Sun Dec  3 09:50:34 2006
+++ Src/DasherCore/TimeSpan.cpp	Sun Dec  3 18:47:02 2006
+@@ -122,7 +122,7 @@ string CTimeSpan::GetTimeStamp()
     szTimeLine = ctime(&(sTimeBuffer.time));
 #else
     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
@ -9,16 +9,7 @@
 #endif
   
   if ((szTimeLine != NULL) && (strlen(szTimeLine) > 18))
-@@ -134,7 +134,7 @@
- #ifdef _WIN32
-     sprintf(szMs, "%d", sTimeBuffer.millitm);
- #else
-    sprintf(szMs, "%d", sTimeBuffer.tv_usec / 1000);
-+    sprintf(szMs, "%d", (int) (sTimeBuffer.tv_usec / 1000));
- #endif
-     if (strlen(szMs) == 1)
-       strTimeStamp += "00";
-@@ -196,7 +196,7 @@
+@@ -196,7 +196,7 @@ string CTimeSpan::GetDateStamp()
     szTimeLine = ctime(&(sTimeBuffer.time));
 #else
     gettimeofday(&sTimeBuffer, &sTimezoneBuffer);
--- a/accessibility/dasher/files/patch-configure
+++ b/accessibility/dasher/files/patch-configure
@ -1,11 +1,11 @@
--- configure.orig	Wed May 17 00:00:16 2006
-+++ configure	Wed May 17 00:01:21 2006
-@@ -24000,7 +24000,7 @@ GTK2BUILD_CFLAGS="$GTK2_CFLAGS $SETTINGS
- if [ x"$WITHDARWIN" = xtrue ]; then
-       GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS"
+--- configure.orig	Sun Dec  3 18:59:04 2006
+++ configure	Sun Dec  3 18:59:15 2006
+@@ -23152,7 +23152,7 @@ echo "$as_me:$LINENO: result: $have_prog
+ echo "${ECHO_T}$have_prog_gnu_ld" >&6
+ 
+ if [ x"$have_prog_gnu_ld" = xyes ]; then
+-   ed_flags="-Wl,--export-dynamic,"
+   ed_flags="-Wl,--export-dynamic"
 else
-      GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic,"
-+      GTK2BUILD_LIBS="$X_LIBS $GTK2_LIBS $SETTINGS_LIBS $gthread_LIBS $gnome_speech_LIBS $gnome_a11y_LIBS $glade_LIBS $gnome_LIBS $wnck_LIBS $hildon_LIBS -Wl,--export-dynamic"
+    ed_flags=""
 fi
- 
- 
--- a/accessibility/dasher/pkg-plist
+++ b/accessibility/dasher/pkg-plist
@ -3,7 +3,6 @@ share/gnome/applications/dasher.desktop
 share/gnome/dasher/alphabet.AfaanOromo.xml
 share/gnome/dasher/alphabet.Armenian.xml
 share/gnome/dasher/alphabet.Assamese.xml
-share/gnome/dasher/alphabet.Austen.xml
 share/gnome/dasher/alphabet.Azerbaijani.xml
 share/gnome/dasher/alphabet.Belarusian.xml
 share/gnome/dasher/alphabet.Bulgarian.xml
@ -105,6 +104,7 @@ share/gnome/dasher/alphabet.latvian.xml
 share/gnome/dasher/alphabet.lithuanian.xml
 share/gnome/dasher/alphabet.luxembourgish.xml
 share/gnome/dasher/alphabet.macedonian.xml
+share/gnome/dasher/alphabet.malagasy.xml
 share/gnome/dasher/alphabet.maltese.xml
 share/gnome/dasher/alphabet.mongolian.xml
 share/gnome/dasher/alphabet.myanmar.xml
@ -113,7 +113,6 @@ share/gnome/dasher/alphabet.norwegian.xml
 share/gnome/dasher/alphabet.occitan.xml
 share/gnome/dasher/alphabet.ogham.xml
 share/gnome/dasher/alphabet.pashto.xml
-share/gnome/dasher/alphabet.perl.xml
 share/gnome/dasher/alphabet.persian.xml
 share/gnome/dasher/alphabet.pinyin.xml
 share/gnome/dasher/alphabet.polish.xml
@ -147,11 +146,15 @@ share/gnome/dasher/colour.vowels2.xml
 share/gnome/dasher/colour.xml
 share/gnome/dasher/controllabels.dtd
 share/gnome/dasher/controllabels.xml
-share/gnome/dasher/dasher.glade
+share/gnome/dasher/dasher.compose.glade
+share/gnome/dasher/dasher.direct.glade
+share/gnome/dasher/dasher.fullscreen.glade
+share/gnome/dasher/dasher.traditional.glade
+share/gnome/dasher/dashermaemo.glade
+share/gnome/dasher/dashermaemofullscreen.glade
 share/gnome/dasher/training_albanian_SQ.txt
 share/gnome/dasher/training_basque_EU.txt
 share/gnome/dasher/training_bengali_BD.txt
-share/gnome/dasher/training_bengali_bn.txt
 share/gnome/dasher/training_canna_JP.txt
 share/gnome/dasher/training_czech_CS.txt
 share/gnome/dasher/training_danish_DK.txt
@ -192,7 +195,41 @@ share/gnome/help/dasher/C/figures/prefs2.png
 share/gnome/help/dasher/C/figures/prefs3.png
 share/gnome/help/dasher/C/figures/prefs4.png
 share/gnome/help/dasher/C/figures/prefs5.png
+share/gnome/help/dasher/fr/dasher.xml
+share/gnome/help/dasher/fr/figures/a-z.gif
+share/gnome/help/dasher/fr/figures/aa-az.gif
+share/gnome/help/dasher/fr/figures/ala-alz.gif
+share/gnome/help/dasher/fr/figures/exampleHad2.png
+share/gnome/help/dasher/fr/figures/exampleHad2a.png
+share/gnome/help/dasher/fr/figures/exampleHad3a.png
+share/gnome/help/dasher/fr/figures/exampleHad4.png
+share/gnome/help/dasher/fr/figures/figure2.png
+share/gnome/help/dasher/fr/figures/main.png
+share/gnome/help/dasher/fr/figures/object.gif
+share/gnome/help/dasher/fr/figures/prefs1.png
+share/gnome/help/dasher/fr/figures/prefs2.png
+share/gnome/help/dasher/fr/figures/prefs3.png
+share/gnome/help/dasher/fr/figures/prefs4.png
+share/gnome/help/dasher/fr/figures/prefs5.png
+share/gnome/help/dasher/sv/dasher.xml
+share/gnome/help/dasher/sv/figures/a-z.gif
+share/gnome/help/dasher/sv/figures/aa-az.gif
+share/gnome/help/dasher/sv/figures/ala-alz.gif
+share/gnome/help/dasher/sv/figures/exampleHad2.png
+share/gnome/help/dasher/sv/figures/exampleHad2a.png
+share/gnome/help/dasher/sv/figures/exampleHad3a.png
+share/gnome/help/dasher/sv/figures/exampleHad4.png
+share/gnome/help/dasher/sv/figures/figure2.png
+share/gnome/help/dasher/sv/figures/main.png
+share/gnome/help/dasher/sv/figures/object.gif
+share/gnome/help/dasher/sv/figures/prefs1.png
+share/gnome/help/dasher/sv/figures/prefs2.png
+share/gnome/help/dasher/sv/figures/prefs3.png
+share/gnome/help/dasher/sv/figures/prefs4.png
+share/gnome/help/dasher/sv/figures/prefs5.png
 share/gnome/omf/dasher/dasher-C.omf
+share/gnome/omf/dasher/dasher-fr.omf
+share/gnome/omf/dasher/dasher-sv.omf
 share/icons/hicolor/48x48/apps/dasher.png
 share/icons/hicolor/scalable/apps/dasher.svg
 share/locale/ar/LC_MESSAGES/dasher.mo
@ -268,6 +305,10 @@ share/locale/zh_CN/LC_MESSAGES/dasher.mo
 share/locale/zh_HK/LC_MESSAGES/dasher.mo
 share/locale/zh_TW/LC_MESSAGES/dasher.mo
@dirrm share/gnome/omf/dasher
+@dirrm share/gnome/help/dasher/sv/figures
+@dirrm share/gnome/help/dasher/sv
+@dirrm share/gnome/help/dasher/fr/figures
+@dirrm share/gnome/help/dasher/fr
@dirrm share/gnome/help/dasher/C/figures
@dirrm share/gnome/help/dasher/C
@dirrm share/gnome/help/dasher
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@ -3,11 +3,11 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/gail/Makefile,v 1.52 2006/10/02 00:47:13 ahze Exp $
+#   $MCom: ports/accessibility/gail/Makefile,v 1.57 2007/03/12 13:34:38 ahze Exp $
 #

 PORTNAME=	gail
-PORTVERSION=	1.9.4
+PORTVERSION=	1.18.0
 PORTREVISION?=	0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/gail-1.9.4.tar.bz2) = eff7a5d2fffe914295ca937b128c5f40
-SHA256 (gnome2/gail-1.9.4.tar.bz2) = 7c5663e8429747b84b303a4369e20edc3e070be0b96246e36ab2f0b9e4ada50e
-SIZE (gnome2/gail-1.9.4.tar.bz2) = 603416
+MD5 (gnome2/gail-1.18.0.tar.bz2) = d58ad8cc79d3cb6778bc015ef69fb499
+SHA256 (gnome2/gail-1.18.0.tar.bz2) = 1a047f1aa43ad455baff1e9a0abf94c957c42490d365ffde19707d0f039a9705
+SIZE (gnome2/gail-1.18.0.tar.bz2) = 610187
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@ -14,6 +14,7 @@ share/locale/ar/LC_MESSAGES/gail.mo
 share/locale/as/LC_MESSAGES/gail.mo
 share/locale/az/LC_MESSAGES/gail.mo
 share/locale/be/LC_MESSAGES/gail.mo
+share/locale/be@latin/LC_MESSAGES/gail.mo
 share/locale/bg/LC_MESSAGES/gail.mo
 share/locale/bn/LC_MESSAGES/gail.mo
 share/locale/bn_IN/LC_MESSAGES/gail.mo
@ -49,6 +50,7 @@ share/locale/ko/LC_MESSAGES/gail.mo
 share/locale/ku/LC_MESSAGES/gail.mo
 share/locale/lt/LC_MESSAGES/gail.mo
 share/locale/lv/LC_MESSAGES/gail.mo
+share/locale/mg/LC_MESSAGES/gail.mo
 share/locale/mi/LC_MESSAGES/gail.mo
 share/locale/mk/LC_MESSAGES/gail.mo
 share/locale/ml/LC_MESSAGES/gail.mo
@ -117,6 +119,8 @@ share/locale/zh_TW/LC_MESSAGES/gail.mo
@dirrmtry share/locale/ne
@dirrmtry share/locale/mi/LC_MESSAGES
@dirrmtry share/locale/mi
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
@dirrmtry share/locale/ko/LC_MESSAGES
@ -135,6 +139,8 @@ share/locale/zh_TW/LC_MESSAGES/gail.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
@dirrmtry share/locale/be/LC_MESSAGES
@dirrmtry share/locale/be
@dirrmtry share/locale/as/LC_MESSAGES
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@ -3,11 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/gnome-mag/Makefile,v 1.22 2006/09/10 00:51:05 mezz Exp $
+#   $MCom: ports/accessibility/gnome-mag/Makefile,v 1.27 2007/03/11 06:58:01 marcus Exp $
 #

 PORTNAME=	gnome-mag
-PORTVERSION=	0.13.2
+PORTVERSION=	0.14.3
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@ -28,4 +28,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \

 DOCSDIR=	${PREFIX}/share/doc/gnome-mag-${PORTVERSION}

+MAN1=		magnifier.1
+
 .include <bsd.port.mk>
--- a/accessibility/gnome-mag/distinfo
+++ b/accessibility/gnome-mag/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-mag-0.13.2.tar.bz2) = 093c153c0d8bad40d40d4f7c21be8975
-SHA256 (gnome2/gnome-mag-0.13.2.tar.bz2) = 077a5d8e9dfb42413de54e188fddf88535b48b009754b0780c119a23de639eab
-SIZE (gnome2/gnome-mag-0.13.2.tar.bz2) = 731140
+MD5 (gnome2/gnome-mag-0.14.3.tar.bz2) = db9660614f7948a12b18464683a5704f
+SHA256 (gnome2/gnome-mag-0.14.3.tar.bz2) = 70796a74ff38a4ef61e32c1f153ca0d650b3f4fa12bcc15bdfafb44cdec116f1
+SIZE (gnome2/gnome-mag-0.14.3.tar.bz2) = 789808
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@ -22,13 +22,9 @@ libdata/pkgconfig/gnome-mag-1.0.pc
 %%DOCSDIR%%/reference/html/GNOME__Magnifier_8idl-source.html
 %%DOCSDIR%%/reference/html/GNOME__Magnifier_8idl.html
 %%DOCSDIR%%/reference/html/annotated.html
-%%DOCSDIR%%/reference/html/damage-client_8c-source.html
-%%DOCSDIR%%/reference/html/damage-client_8c.html
-%%DOCSDIR%%/reference/html/damage-client_8h-source.html
-%%DOCSDIR%%/reference/html/damage-client_8h.html
-%%DOCSDIR%%/reference/html/dir_87465088ddb33e7a87f93e298b526e3e.html
-%%DOCSDIR%%/reference/html/dir_be9d3086025220affea426c40de4e445.html
 %%DOCSDIR%%/reference/html/dirs.html
+%%DOCSDIR%%/reference/html/dir_6873ac4aad386abfe4dc85b1c4c7162f.html
+%%DOCSDIR%%/reference/html/dir_ed2a549a3a7169145b90da06827de1bb.html
 %%DOCSDIR%%/reference/html/doxygen.css
 %%DOCSDIR%%/reference/html/doxygen.png
 %%DOCSDIR%%/reference/html/files.html
@ -45,6 +41,7 @@ libdata/pkgconfig/gnome-mag-1.0.pc
 %%DOCSDIR%%/reference/html/functions_0x6c.html
 %%DOCSDIR%%/reference/html/functions_0x6d.html
 %%DOCSDIR%%/reference/html/functions_0x6e.html
+%%DOCSDIR%%/reference/html/functions_0x6f.html
 %%DOCSDIR%%/reference/html/functions_0x70.html
 %%DOCSDIR%%/reference/html/functions_0x71.html
 %%DOCSDIR%%/reference/html/functions_0x72.html
@ -72,6 +69,7 @@ libdata/pkgconfig/gnome-mag-1.0.pc
 %%DOCSDIR%%/reference/html/functions_vars_0x6c.html
 %%DOCSDIR%%/reference/html/functions_vars_0x6d.html
 %%DOCSDIR%%/reference/html/functions_vars_0x6e.html
+%%DOCSDIR%%/reference/html/functions_vars_0x6f.html
 %%DOCSDIR%%/reference/html/functions_vars_0x70.html
 %%DOCSDIR%%/reference/html/functions_vars_0x71.html
 %%DOCSDIR%%/reference/html/functions_vars_0x72.html
@ -128,6 +126,10 @@ libdata/pkgconfig/gnome-mag-1.0.pc
 %%DOCSDIR%%/reference/html/globals_func_0x7a.html
 %%DOCSDIR%%/reference/html/globals_type.html
 %%DOCSDIR%%/reference/html/globals_vars.html
+%%DOCSDIR%%/reference/html/gmag-events_8c-source.html
+%%DOCSDIR%%/reference/html/gmag-events_8c.html
+%%DOCSDIR%%/reference/html/gmag-events_8h-source.html
+%%DOCSDIR%%/reference/html/gmag-events_8h.html
 %%DOCSDIR%%/reference/html/index.html
 %%DOCSDIR%%/reference/html/interfaceGNOME_1_1Magnifier_1_1Magnifier.html
 %%DOCSDIR%%/reference/html/interfaceGNOME_1_1Magnifier_1_1ZoomRegion.html
@ -183,6 +185,7 @@ libdata/pkgconfig/gnome-mag-1.0.pc
 %%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__ZoomRegion____vepv.html
 %%DOCSDIR%%/reference/html/structZoomRegion.html
 %%DOCSDIR%%/reference/html/structZoomRegionClass.html
+%%DOCSDIR%%/reference/html/struct__GmagWin.html
 %%DOCSDIR%%/reference/html/struct__MagnifierPrivate.html
 %%DOCSDIR%%/reference/html/struct__ZoomRegionPrivate.html
 %%DOCSDIR%%/reference/html/structtiming.html
--- a/accessibility/java-access-bridge/Makefile
+++ b/accessibility/java-access-bridge/Makefile
@ -0,0 +1,35 @@
+# New ports collection makefile for:	java-access-bridge
+# Date created:		2006-11-04
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/accessibility/java-access-bridge/Makefile,v 1.2 2007/03/06 14:03:02 ahze Exp $
+
+PORTNAME=	java-access-bridge
+PORTVERSION=	1.18.0
+CATEGORIES=	accessibility java gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Gnome Java Accessibility Bridge
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	atspi gnomehack
+USE_JAVA=	1.4+
+JAVA_OS=	native
+USE_GMAKE=	yes
+CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
+
+PLIST_FILES=	share/jar/JNav.jar \
+		share/jar/accessibility.properties \
+		share/java/classes/gnome-java-bridge.jar
+
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${prefix}/share/jar|${JAVAJARDIR}|' \
+		${WRKSRC}/Makefile.in \
+		${WRKSRC}/bridge/Makefile.in
+
+.include <bsd.port.mk>
--- a/accessibility/java-access-bridge/distinfo
+++ b/accessibility/java-access-bridge/distinfo
@ -0,0 +1,3 @@
+MD5 (gnome2/java-access-bridge-1.18.0.tar.bz2) = 9d250af333d03a091be06d2baab8cad4
+SHA256 (gnome2/java-access-bridge-1.18.0.tar.bz2) = 1cabcdd4b81882bc3489912596532922c21a51a9d404664375252aafacc5f197
+SIZE (gnome2/java-access-bridge-1.18.0.tar.bz2) = 108895
--- a/accessibility/java-access-bridge/pkg-descr
+++ b/accessibility/java-access-bridge/pkg-descr
@ -0,0 +1,3 @@
+Connects the built-in GNOME accessibility support in Java Swing apps to the
+GNOME Accessibility framework, specifically the Assistive Technology Service
+Provider Interface (AT-SPI).
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/orca/Makefile,v 1.4 2006/09/04 02:19:06 marcus Exp $
+#   $MCom: ports/accessibility/orca/Makefile,v 1.15 2007/03/13 00:05:30 marcus Exp $
 #

 PORTNAME=	orca
-PORTVERSION=	1.0.1
+PORTVERSION=	2.18.0
 CATEGORIES=	accessibility x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@ -31,4 +31,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

+MAN1=		orca.1
+
 .include <bsd.port.mk>
--- a/accessibility/orca/distinfo
+++ b/accessibility/orca/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/orca-1.0.1.tar.bz2) = 860172c6dadf6a655d8e0b2b3df90628
-SHA256 (gnome2/orca-1.0.1.tar.bz2) = 6e68fb41118c91fa17c20df6315d86a3ac6aeae147d53ff5874e1ac3c2a954de
-SIZE (gnome2/orca-1.0.1.tar.bz2) = 742059
+MD5 (gnome2/orca-2.18.0.tar.bz2) = 900500c94f8870882b0842556bb3f3b3
+SHA256 (gnome2/orca-2.18.0.tar.bz2) = 407eedadc7cab4eb0bd6326e840f433e3cfbe37316ed3b764be9c3b14f42594c
+SIZE (gnome2/orca-2.18.0.tar.bz2) = 962736
--- a/accessibility/orca/pkg-plist
+++ b/accessibility/orca/pkg-plist
@ -1,4 +1,7 @@
 bin/orca
+%%PYTHON_SITELIBDIR%%/orca/Gecko.py
+%%PYTHON_SITELIBDIR%%/orca/Gecko.pyc
+%%PYTHON_SITELIBDIR%%/orca/Gecko.pyo
 %%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.py
 %%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.pyc
 %%PYTHON_SITELIBDIR%%/orca/J2SE-access-bridge.pyo
@ -40,6 +43,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/eventsynthesizer.py
 %%PYTHON_SITELIBDIR%%/orca/eventsynthesizer.pyc
 %%PYTHON_SITELIBDIR%%/orca/eventsynthesizer.pyo
+%%PYTHON_SITELIBDIR%%/orca/find.py
+%%PYTHON_SITELIBDIR%%/orca/find.pyc
+%%PYTHON_SITELIBDIR%%/orca/find.pyo
 %%PYTHON_SITELIBDIR%%/orca/flat_review.py
 %%PYTHON_SITELIBDIR%%/orca/flat_review.pyc
 %%PYTHON_SITELIBDIR%%/orca/flat_review.pyo
@ -73,6 +79,15 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.py
 %%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.pyc
 %%PYTHON_SITELIBDIR%%/orca/orca_console_prefs.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_glade.py
+%%PYTHON_SITELIBDIR%%/orca/orca_glade.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_glade.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_find.py
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_find.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_find.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_main.py
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_main.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_gui_main.pyo
 %%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.py
 %%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.pyc
 %%PYTHON_SITELIBDIR%%/orca/orca_gui_prefs.pyo
@ -82,18 +97,27 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/orca_prefs.py
 %%PYTHON_SITELIBDIR%%/orca/orca_prefs.pyc
 %%PYTHON_SITELIBDIR%%/orca/orca_prefs.pyo
+%%PYTHON_SITELIBDIR%%/orca/orca_quit.py
+%%PYTHON_SITELIBDIR%%/orca/orca_quit.pyc
+%%PYTHON_SITELIBDIR%%/orca/orca_quit.pyo
 %%PYTHON_SITELIBDIR%%/orca/orca_state.py
 %%PYTHON_SITELIBDIR%%/orca/orca_state.pyc
 %%PYTHON_SITELIBDIR%%/orca/orca_state.pyo
 %%PYTHON_SITELIBDIR%%/orca/outloud.py
 %%PYTHON_SITELIBDIR%%/orca/outloud.pyc
 %%PYTHON_SITELIBDIR%%/orca/outloud.pyo
+%%PYTHON_SITELIBDIR%%/orca/phonnames.py
+%%PYTHON_SITELIBDIR%%/orca/phonnames.pyc
+%%PYTHON_SITELIBDIR%%/orca/phonnames.pyo
 %%PYTHON_SITELIBDIR%%/orca/platform.py
 %%PYTHON_SITELIBDIR%%/orca/platform.pyc
 %%PYTHON_SITELIBDIR%%/orca/platform.pyo
 %%PYTHON_SITELIBDIR%%/orca/presentation_manager.py
 %%PYTHON_SITELIBDIR%%/orca/presentation_manager.pyc
 %%PYTHON_SITELIBDIR%%/orca/presentation_manager.pyo
+%%PYTHON_SITELIBDIR%%/orca/pronunciation_dict.py
+%%PYTHON_SITELIBDIR%%/orca/pronunciation_dict.pyc
+%%PYTHON_SITELIBDIR%%/orca/pronunciation_dict.pyo
 %%PYTHON_SITELIBDIR%%/orca/punctuation_settings.py
 %%PYTHON_SITELIBDIR%%/orca/punctuation_settings.pyc
 %%PYTHON_SITELIBDIR%%/orca/punctuation_settings.pyo
@ -112,9 +136,15 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/StarOffice.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/Thunderbird.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/Thunderbird.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/Thunderbird.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/__init__.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/acroread.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/acroread.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/acroread.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/gaim.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/gaim.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/gaim.pyo
@ -127,12 +157,27 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/gedit.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/gedit.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/gedit.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-keyring-ask.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-power-manager.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-power-manager.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-power-manager.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome-search-tool.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-terminal.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/gnome-window-properties.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome_segv2.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome_segv2.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/gnome_segv2.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/liferea.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/liferea.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/liferea.pyo
 %%PYTHON_SITELIBDIR%%/orca/scripts/metacity.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/metacity.pyo
@ -142,6 +187,9 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.py
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyc
 %%PYTHON_SITELIBDIR%%/orca/scripts/self_voicing.pyo
+%%PYTHON_SITELIBDIR%%/orca/scripts/users-admin.py
+%%PYTHON_SITELIBDIR%%/orca/scripts/users-admin.pyc
+%%PYTHON_SITELIBDIR%%/orca/scripts/users-admin.pyo
 %%PYTHON_SITELIBDIR%%/orca/settings.py
 %%PYTHON_SITELIBDIR%%/orca/settings.pyc
 %%PYTHON_SITELIBDIR%%/orca/settings.pyo
@ -157,7 +205,13 @@ bin/orca
 %%PYTHON_SITELIBDIR%%/orca/util.py
 %%PYTHON_SITELIBDIR%%/orca/util.pyc
 %%PYTHON_SITELIBDIR%%/orca/util.pyo
+%%PYTHON_SITELIBDIR%%/orca/where_am_I.py
+%%PYTHON_SITELIBDIR%%/orca/where_am_I.pyc
+%%PYTHON_SITELIBDIR%%/orca/where_am_I.pyo
 share/gnome/applications/orca.desktop
+share/gnome/orca/glade/orca-find.glade
+share/gnome/orca/glade/orca-mainwin.glade
+share/gnome/orca/glade/orca-quit.glade
 share/gnome/orca/glade/orca-setup.glade
 share/icons/hicolor/48x48/apps/orca.png
 share/locale/ar/LC_MESSAGES/orca.mo
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@ -3,11 +3,11 @@
 # Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/archivers/file-roller/Makefile,v 1.104 2006/10/03 20:20:38 mezz Exp $
+#   $MCom: ports/archivers/file-roller/Makefile,v 1.117 2007/03/12 23:23:57 marcus Exp $
 #

 PORTNAME=	file-roller
-PORTVERSION=	2.16.3
+PORTVERSION=	2.18.0
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.16.3.tar.bz2) = 3ee134c04b73a584c9ec494d5e542c6d
-SHA256 (gnome2/file-roller-2.16.3.tar.bz2) = ac9a0c671c64cc1ee59f4a82655b68f917e204143c9d77c252f5cf4af0a71f6b
-SIZE (gnome2/file-roller-2.16.3.tar.bz2) = 1130693
+MD5 (gnome2/file-roller-2.18.0.tar.bz2) = 8f8b6b0e4598f2773f6948a631ca8721
+SHA256 (gnome2/file-roller-2.18.0.tar.bz2) = 3305c9a4b832576d0cf63d6040b6aba9e350d6214fba802e4a94d3a0afac4e88
+SIZE (gnome2/file-roller-2.18.0.tar.bz2) = 1126681
--- a/archivers/file-roller/files/patch-src_file-utils.h
+++ b/archivers/file-roller/files/patch-src_file-utils.h
@ -1,16 +0,0 @@
--- src/file-utils.h.orig	Sun Jul  3 19:11:59 2005
-+++ src/file-utils.h	Sun Jul  3 19:12:52 2005
-@@ -25,8 +25,13 @@
- 
- #include <sys/types.h>
- #include <time.h>
-+#include <stdlib.h>
-+#include <limits.h>
- #include <libgnomevfs/gnome-vfs-file-size.h>
- #include <libgnomevfs/gnome-vfs-mime-handlers.h>
-+
-+#undef fr_atoll
-+#define fr_atoll(nptr) strtoll(nptr, (char **)NULL, 10)
- 
- 
- #define FILENAME_MAX_LENGTH 30 /* FIXME: find out the best value */
--- a/archivers/file-roller/files/patch-src_fr-command-tar.c
+++ b/archivers/file-roller/files/patch-src_fr-command-tar.c
@ -1,13 +1,12 @@
--- src/fr-command-tar.c.orig	Fri Jul  1 14:41:32 2005
-+++ src/fr-command-tar.c	Sun Jul  3 19:03:01 2005
-@@ -222,6 +223,10 @@ begin_tar_command (FRCommand *comm)
+--- src/fr-command-tar.c.orig	Sun Oct 15 12:33:56 2006
+++ src/fr-command-tar.c	Mon Oct 16 19:18:03 2006
+@@ -231,6 +231,9 @@
 #if defined (__SVR4) && defined (__sun)
- 	if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) {
+ 	if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE))
 		command = g_strdup ("/usr/sfw/bin/gtar");
-+	}
 +#elif defined(__FreeBSD__)
-+	if (g_file_test ("%%LOCALBASE%%/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) {
+	if (g_file_test ("%%LOCALBASE%%/bin/gtar", G_FILE_TEST_IS_EXECUTABLE))
 +		command = g_strdup ("%%LOCALBASE%%/bin/gtar");
- 	}
 #endif
 	if (command != NULL)
+ 		fr_process_begin_command (comm->process, command);
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@ -2,13 +2,22 @@ bin/file-roller
 lib/nautilus/extensions-1.0/libnautilus-fileroller.a
 lib/nautilus/extensions-1.0/libnautilus-fileroller.la
 lib/nautilus/extensions-1.0/libnautilus-fileroller.so
+libexec/file-roller/isoinfo.sh
+libexec/file-roller/move-here.sh
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/applications/file-roller.desktop
-share/gnome/file-roller/glade/file-roller-extract.glade
+share/gnome/file-roller/glade/ask-password.glade
 share/gnome/file-roller/glade/file-roller.glade
+share/gnome/file-roller/icons/hicolor/16x16/actions/add-files-to-archive.png
+share/gnome/file-roller/icons/hicolor/16x16/actions/add-folder-to-archive.png
+share/gnome/file-roller/icons/hicolor/16x16/actions/extract-archive.png
+share/gnome/file-roller/icons/hicolor/24x24/actions/add-files-to-archive.png
+share/gnome/file-roller/icons/hicolor/24x24/actions/add-folder-to-archive.png
+share/gnome/file-roller/icons/hicolor/24x24/actions/extract-archive.png
+share/gnome/file-roller/icons/hicolor/24x24/actions/preview-file.png
 share/gnome/help/file-roller/C/figures/file-roller_home.png
 share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/C/figures/file-roller_main_window.png
@ -46,18 +55,6 @@ share/gnome/help/file-roller/it/figures/file-roller_main_window.png
 share/gnome/help/file-roller/it/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/it/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/it/file-roller.xml
-share/gnome/help/file-roller/ja/figures/file-roller_home.png
-share/gnome/help/file-roller/ja/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/ja/figures/file-roller_main_window.png
-share/gnome/help/file-roller/ja/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/ja/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/ja/file-roller.xml
-share/gnome/help/file-roller/ko/figures/file-roller_home.png
-share/gnome/help/file-roller/ko/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/ko/figures/file-roller_main_window.png
-share/gnome/help/file-roller/ko/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/ko/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/ko/file-roller.xml
 share/gnome/help/file-roller/nl/figures/file-roller_home.png
 share/gnome/help/file-roller/nl/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/nl/figures/file-roller_main_window.png
@ -82,40 +79,20 @@ share/gnome/help/file-roller/uk/figures/file-roller_main_window.png
 share/gnome/help/file-roller/uk/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/uk/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/uk/file-roller.xml
-share/gnome/help/file-roller/zh_CN/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_CN/file-roller.xml
-share/gnome/help/file-roller/zh_HK/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_HK/file-roller.xml
-share/gnome/help/file-roller/zh_TW/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_TW/file-roller.xml
 share/gnome/omf/file-roller/file-roller-C.omf
 share/gnome/omf/file-roller/file-roller-bg.omf
 share/gnome/omf/file-roller/file-roller-de.omf
 share/gnome/omf/file-roller/file-roller-es.omf
 share/gnome/omf/file-roller/file-roller-fr.omf
 share/gnome/omf/file-roller/file-roller-it.omf
-share/gnome/omf/file-roller/file-roller-ja.omf
-share/gnome/omf/file-roller/file-roller-ko.omf
 share/gnome/omf/file-roller/file-roller-nl.omf
 share/gnome/omf/file-roller/file-roller-ru.omf
 share/gnome/omf/file-roller/file-roller-sv.omf
 share/gnome/omf/file-roller/file-roller-uk.omf
-share/gnome/omf/file-roller/file-roller-zh_CN.omf
-share/gnome/omf/file-roller/file-roller-zh_HK.omf
-share/gnome/omf/file-roller/file-roller-zh_TW.omf
-share/icons/hicolor/48x48/apps/file-roller.png
+share/icons/hicolor/16x16/apps/file-roller.png
+share/icons/hicolor/22x22/apps/file-roller.png
+share/icons/hicolor/32x32/apps/file-roller.png
+share/icons/hicolor/scalable/apps/file-roller.svg
 share/locale/am/LC_MESSAGES/file-roller.mo
 share/locale/ar/LC_MESSAGES/file-roller.mo
 share/locale/az/LC_MESSAGES/file-roller.mo
@ -195,12 +172,6 @@ share/locale/zh_CN/LC_MESSAGES/file-roller.mo
 share/locale/zh_HK/LC_MESSAGES/file-roller.mo
 share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/omf/file-roller
-@dirrm share/gnome/help/file-roller/zh_TW/figures
-@dirrm share/gnome/help/file-roller/zh_TW
-@dirrm share/gnome/help/file-roller/zh_HK/figures
-@dirrm share/gnome/help/file-roller/zh_HK
-@dirrm share/gnome/help/file-roller/zh_CN/figures
-@dirrm share/gnome/help/file-roller/zh_CN
@dirrm share/gnome/help/file-roller/uk/figures
@dirrm share/gnome/help/file-roller/uk
@dirrm share/gnome/help/file-roller/sv/figures
@ -209,10 +180,6 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/help/file-roller/ru
@dirrm share/gnome/help/file-roller/nl/figures
@dirrm share/gnome/help/file-roller/nl
-@dirrm share/gnome/help/file-roller/ko/figures
-@dirrm share/gnome/help/file-roller/ko
-@dirrm share/gnome/help/file-roller/ja/figures
-@dirrm share/gnome/help/file-roller/ja
@dirrm share/gnome/help/file-roller/it/figures
@dirrm share/gnome/help/file-roller/it
@dirrm share/gnome/help/file-roller/fr/figures
@ -226,9 +193,16 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/help/file-roller/C/figures
@dirrm share/gnome/help/file-roller/C
@dirrm share/gnome/help/file-roller
+@dirrm share/gnome/file-roller/icons/hicolor/24x24/actions
+@dirrm share/gnome/file-roller/icons/hicolor/24x24
+@dirrm share/gnome/file-roller/icons/hicolor/16x16/actions
+@dirrm share/gnome/file-roller/icons/hicolor/16x16
+@dirrm share/gnome/file-roller/icons/hicolor
+@dirrm share/gnome/file-roller/icons
@dirrm share/gnome/file-roller/glade
@dirrm share/gnome/file-roller
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm libexec/file-roller
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@dirrmtry share/locale/zh_TW/LC_MESSAGES
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-media/Makefile,v 1.98 2006/09/04 15:30:37 ahze Exp $
+#   $MCom: ports/audio/gnome-media/Makefile,v 1.105 2007/03/12 12:00:20 ahze Exp $
 #

 PORTNAME=	gnome-media
-PORTVERSION=	2.16.1
-PORTREVISION=	2
+PORTVERSION=	2.18.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-media/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.16.1.tar.bz2) = 4fa1e8e8bd31e2db1cb49679170a98a8
-SHA256 (gnome2/gnome-media-2.16.1.tar.bz2) = a8f343b772c509c7e44bf792b2df97378b91e6cd85f8b4c82d8d7937bae6d007
-SIZE (gnome2/gnome-media-2.16.1.tar.bz2) = 2973824
+MD5 (gnome2/gnome-media-2.18.0.tar.bz2) = a472d8c7733b119376bc6127ee55a82d
+SHA256 (gnome2/gnome-media-2.18.0.tar.bz2) = 9d52a03f98c5ad9230ac2bcf1cb65644786c71a1ded2f47f7c46a79ad7d769e3
+SIZE (gnome2/gnome-media-2.18.0.tar.bz2) = 3007639
--- a/audio/gnome-media/files/patch-configure
+++ b/audio/gnome-media/files/patch-configure
@ -0,0 +1,74 @@
+--- configure.orig	Mon Feb 12 16:07:48 2007
+++ configure	Mon Feb 12 16:08:23 2007
+@@ -5808,7 +5808,7 @@ if test "${enable_cddbslave+set}" = set;
+ else
+   enable_cddbslave=yes
+ fi;
+-if test "x$enable_cddbslave" == "xyes"; then
+if test "x$enable_cddbslave" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for CDDBSLAVE" >&5
+@@ -6750,7 +6750,7 @@ if test "${enable_profiles+set}" = set; 
+ else
+   enable_profiles=yes
+ fi;
+-if test "x$enable_profiles" == "xyes"; then
+if test "x$enable_profiles" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for GMP" >&5
+@@ -6967,7 +6967,7 @@ echo "$as_me: WARNING:  Grecord will be 
+   PROGRAMS_GRECORD_ERROR="	gnome media profiles is disabled"
+ fi
+ 
+-if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" == "xyes"; then
+if test "x$HAVE_GST" = "xyes" && test "x$enable_grecord" = "xyes"; then
+   PROGRAMS_GRECORD="grecord"
+ 
+   gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
+@@ -24186,7 +24186,7 @@ if test "${enable_vumeter+set}" = set; t
+ else
+   enable_vumeter=yes
+ fi;
+-if test -n "$we_have_esd" && test "x$enable_vumeter" == "xyes"; then
+if test -n "$we_have_esd" && test "x$enable_vumeter" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for VUMETER" >&5
+@@ -24304,7 +24304,7 @@ if test "${enable_gnomecd+set}" = set; t
+ else
+   enable_gnomecd=yes
+ fi;
+-if test "x$enable_gnomecd" == "xyes"; then
+if test "x$enable_gnomecd" = "xyes"; then
+ 
+ pkg_failed=no
+ echo "$as_me:$LINENO: checking for GNOMECD" >&5
+@@ -24640,7 +24640,7 @@ fi
+ 
+ 
+ 
+-if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" == "xyes" ; then
+if test "x$HAVE_GNOMECD" = "xyes" && test "x$enable_gnomecd" = "xyes" ; then
+   cdrom_header=""
+ 
+ for ac_header in linux/cdrom.h
+@@ -25510,7 +25510,7 @@ if test "${enable_gstprops+set}" = set; 
+ else
+   enable_gstprops=yes
+ fi;
+-if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" == "xyes";
+if test "x$HAVE_GST" = "xyes" && test "x$enable_gstprops" = "xyes";
+ then
+       COMMON_MODULES="gconf-2.0 libgnomeui-2.0 libglade-2.0 >= 1.99.12 gstreamer-$GST_MAJORMINOR"
+ 
+@@ -25673,7 +25673,7 @@ if test "${enable_gstmix+set}" = set; th
+ else
+   enable_gstmix=yes
+ fi;
+-if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" == "xyes";
+if test "x$HAVE_GST" = "xyes" && test "x$enable_gstmix" = "xyes";
+ then
+ 
+ pkg_failed=no
--- a/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c
+++ b/audio/gnome-media/files/patch-gnome-cd_gst-cdrom.c
@ -1,9 +1,9 @@
--- gnome-cd/gst-cdrom.c.orig	Tue Dec 12 00:18:40 2006
-+++ gnome-cd/gst-cdrom.c	Tue Dec 12 00:23:17 2006
-@@ -41,13 +41,17 @@
+--- gnome-cd/gst-cdrom.c.orig	Mon Jan 22 09:01:38 2007
+++ gnome-cd/gst-cdrom.c	Mon Feb 12 15:59:18 2007
+@@ -44,13 +44,17 @@
 #endif
 
- #if defined(__FreeBSD__)
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 -# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST  CDIOCCAPABILITY
 +# define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST  CDIOCGETVOL
 +struct ioc_vol vol_value;
@ -19,10 +19,10 @@
 # define GST_CDROM_IOCTL_EJECT_REQUEST         CDROMEJECT
 #endif
 
-@@ -184,7 +188,7 @@ gst_cdrom_is_cdrom_device (GnomeCDRom * 
- 
-     fd = open (device, O_RDONLY | O_NONBLOCK);
-     if (fd >= 0) {
+@@ -190,7 +194,7 @@ gst_cdrom_is_cdrom_device (GnomeCDRom * 
+ #ifdef __sun
+       res = TRUE;
+ #else
 -      if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, 0) >= 0) {
 +      if (ioctl (fd, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST, GST_CDROM_IOCTL_CDCAPABILITY_REQUEST_ADDR) >= 0) {
         res = TRUE;
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@ -3,11 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.67 2006/10/12 19:04:47 marcus Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.70 2007/03/07 17:00:36 adamw Exp $
 #

 PORTNAME=	rhythmbox
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
@ -18,7 +19,7 @@ COMMENT=	Audio player for GNOME

 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+		totem-plparser.1:${PORTSDIR}/multimedia/totem \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
 		soup-2.2.8:${PORTSDIR}/devel/libsoup \
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@ -3,11 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.67 2006/10/12 19:04:47 marcus Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.70 2007/03/07 17:00:36 adamw Exp $
 #

 PORTNAME=	rhythmbox
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
@ -18,7 +19,7 @@ COMMENT=	Audio player for GNOME

 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+		totem-plparser.1:${PORTSDIR}/multimedia/totem \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
 		soup-2.2.8:${PORTSDIR}/devel/libsoup \
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.99 2006/10/03 00:13:42 ahze Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.112 2007/03/13 04:35:01 marcus Exp $
 #

 PORTNAME=	evolution-data-server
-PORTVERSION=	1.8.3
+PORTVERSION=	1.10.0
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@ -34,16 +34,12 @@ USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--enable-nss=yes \
 		--with-openldap=yes \
-		--with-nss-includes=${LOCALBASE}/include/nss/nss \
-		--with-nss-libs=${LOCALBASE}/lib \
-		--with-nspr-includes=${LOCALBASE}/include/nspr \
-		--with-nspr-libs=${LOCALBASE}/lib \
 		--with-krb5=/usr \
 		--with-libdb=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"

-PLIST_SUB=	VERSION="1.8" EVO_VERSION="1.2"
+PLIST_SUB=	VERSION="1.10" EVO_VERSION="1.2"

 OPTIONS=	IMAP4	"Enable experimental IMAP4 backend" off

--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-1.8.3.tar.bz2) = f6a824f2553fd97555b8785a452fb6ab
-SHA256 (gnome2/evolution-data-server-1.8.3.tar.bz2) = cbc067d87722afef84e8c4914787d990015e0c69b3bf3576fc15c8193ffd2fcc
-SIZE (gnome2/evolution-data-server-1.8.3.tar.bz2) = 7024111
+MD5 (gnome2/evolution-data-server-1.10.0.tar.bz2) = 390ea134306b667a2d77b7e859c8cba0
+SHA256 (gnome2/evolution-data-server-1.10.0.tar.bz2) = 0a2ee6540ffa767d3c841993300fb4320cffc3738230e2a2ad1c566de35b1214
+SIZE (gnome2/evolution-data-server-1.10.0.tar.bz2) = 7095934
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@ -351,11 +351,11 @@ lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.so
 lib/libcamel-%%EVO_VERSION%%.a
 lib/libcamel-%%EVO_VERSION%%.la
 lib/libcamel-%%EVO_VERSION%%.so
-lib/libcamel-%%EVO_VERSION%%.so.0
+lib/libcamel-%%EVO_VERSION%%.so.10
 lib/libcamel-provider-%%EVO_VERSION%%.a
 lib/libcamel-provider-%%EVO_VERSION%%.la
 lib/libcamel-provider-%%EVO_VERSION%%.so
-lib/libcamel-provider-%%EVO_VERSION%%.so.8
+lib/libcamel-provider-%%EVO_VERSION%%.so.10
 lib/libebook-%%EVO_VERSION%%.a
 lib/libebook-%%EVO_VERSION%%.la
 lib/libebook-%%EVO_VERSION%%.so
@ -375,7 +375,7 @@ lib/libedata-cal-%%EVO_VERSION%%.so.6
 lib/libedataserver-%%EVO_VERSION%%.a
 lib/libedataserver-%%EVO_VERSION%%.la
 lib/libedataserver-%%EVO_VERSION%%.so
-lib/libedataserver-%%EVO_VERSION%%.so.7
+lib/libedataserver-%%EVO_VERSION%%.so.9
 lib/libedataserverui-%%EVO_VERSION%%.a
 lib/libedataserverui-%%EVO_VERSION%%.la
 lib/libedataserverui-%%EVO_VERSION%%.so
@ -383,11 +383,11 @@ lib/libedataserverui-%%EVO_VERSION%%.so.8
 lib/libegroupwise-%%EVO_VERSION%%.a
 lib/libegroupwise-%%EVO_VERSION%%.la
 lib/libegroupwise-%%EVO_VERSION%%.so
-lib/libegroupwise-%%EVO_VERSION%%.so.12
+lib/libegroupwise-%%EVO_VERSION%%.so.13
 lib/libexchange-storage-%%EVO_VERSION%%.a
 lib/libexchange-storage-%%EVO_VERSION%%.la
 lib/libexchange-storage-%%EVO_VERSION%%.so
-lib/libexchange-storage-%%EVO_VERSION%%.so.2
+lib/libexchange-storage-%%EVO_VERSION%%.so.3
 libdata/bonobo/servers/GNOME_Evolution_DataServer_%%EVO_VERSION%%.server
 libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
 libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc
@ -413,6 +413,7 @@ share/doc/libebook/ch01.html
 share/doc/libebook/home.png
 share/doc/libebook/index.html
 share/doc/libebook/index.sgml
+share/doc/libebook/ix01.html
 share/doc/libebook/left.png
 share/doc/libebook/libebook-EAddressWestern.html
 share/doc/libebook/libebook-ENameWestern.html
@ -425,15 +426,16 @@ share/doc/libebook/right.png
 share/doc/libebook/style.css
 share/doc/libebook/up.png
 share/doc/libecal/ECal.html
+share/doc/libecal/ECalListener.html
 share/doc/libecal/ECalComponent.html
+share/doc/libecal/ECalView.html
+share/doc/libecal/ECalViewListener.html
 share/doc/libecal/ch01.html
 share/doc/libecal/home.png
 share/doc/libecal/index.html
 share/doc/libecal/index.sgml
+share/doc/libecal/ix01.html
 share/doc/libecal/left.png
-share/doc/libecal/libecal-ECalListener.html
-share/doc/libecal/libecal-ECalView.html
-share/doc/libecal/libecal-ECalViewListener.html
 share/doc/libecal/libecal-e-cal-recur.html
 share/doc/libecal/libecal-e-cal-time-util.html
 share/doc/libecal/libecal-e-cal-types.html
@ -443,19 +445,43 @@ share/doc/libecal/libecal.devhelp2
 share/doc/libecal/right.png
 share/doc/libecal/style.css
 share/doc/libecal/up.png
+share/doc/libedata-book/EBookBackend.html
+share/doc/libedata-book/EBookBackendCache.html
+share/doc/libedata-book/EBookBackendFactory.html
+share/doc/libedata-book/EBookBackendSExp.html
+share/doc/libedata-book/EBookBackendSummary.html
+share/doc/libedata-book/EBookBackendSync.html
+share/doc/libedata-book/EDataBook.html
+share/doc/libedata-book/EDataBookView.html
+share/doc/libedata-book/ch01.html
+share/doc/libedata-book/home.png
+share/doc/libedata-book/index.html
+share/doc/libedata-book/index.sgml
+share/doc/libedata-book/ix01.html
+share/doc/libedata-book/left.png
+share/doc/libedata-book/libedata-book-EDataBookFactory.html
+share/doc/libedata-book/libedata-book-e-book-backend-db-cache.html
+share/doc/libedata-book/libedata-book-e-data-book-marshal.html
+share/doc/libedata-book/libedata-book-ximian-vcard.html
+share/doc/libedata-book/libedata-book.devhelp
+share/doc/libedata-book/libedata-book.devhelp2
+share/doc/libedata-book/right.png
+share/doc/libedata-book/style.css
+share/doc/libedata-book/up.png
 share/doc/libedata-cal/ECalBackend.html
+share/doc/libedata-cal/ECalBackendCache.html
+share/doc/libedata-cal/ECalBackendFactory.html
 share/doc/libedata-cal/ECalBackendSExp.html
+share/doc/libedata-cal/ECalBackendSync.html
 share/doc/libedata-cal/EDataCal.html
+share/doc/libedata-cal/EDataCalFactory.html
 share/doc/libedata-cal/EDataCalView.html
 share/doc/libedata-cal/ch01.html
 share/doc/libedata-cal/home.png
 share/doc/libedata-cal/index.html
 share/doc/libedata-cal/index.sgml
+share/doc/libedata-cal/ix01.html
 share/doc/libedata-cal/left.png
-share/doc/libedata-cal/libedata-cal-ECalBackendCache.html
-share/doc/libedata-cal/libedata-cal-ECalBackendFactory.html
-share/doc/libedata-cal/libedata-cal-ECalBackendSync.html
-share/doc/libedata-cal/libedata-cal-EDataCalFactory.html
 share/doc/libedata-cal/libedata-cal-e-cal-backend-util.html
 share/doc/libedata-cal/libedata-cal.devhelp
 share/doc/libedata-cal/libedata-cal.devhelp2
@ -467,17 +493,18 @@ share/doc/libedataserver/home.png
 share/doc/libedataserver/index.html
 share/doc/libedataserver/index.sgml
 share/doc/libedataserver/left.png
-share/doc/libedataserver/libedataserver-EAccount.html
-share/doc/libedataserver/libedataserver-EAccountList.html
-share/doc/libedataserver/libedataserver-EComponentListener.html
-share/doc/libedataserver/libedataserver-EFileCache.html
-share/doc/libedataserver/libedataserver-EIterator.html
-share/doc/libedataserver/libedataserver-EList.html
-share/doc/libedataserver/libedataserver-EListIterator.html
+share/doc/libedataserver/EAccount.html
+share/doc/libedataserver/EAccountList.html
+share/doc/libedataserver/EComponentListener.html
+share/doc/libedataserver/EFileCache.html
+share/doc/libedataserver/EIterator.html
+share/doc/libedataserver/EList.html
+share/doc/libedataserver/EListIterator.html
+share/doc/libedataserver/ESource.html
+share/doc/libedataserver/ESourceGroup.html
+share/doc/libedataserver/ESourceList.html
+share/doc/libedataserver/ix01.html
 share/doc/libedataserver/libedataserver-ESExp.html
-share/doc/libedataserver/libedataserver-ESource.html
-share/doc/libedataserver/libedataserver-ESourceGroup.html
-share/doc/libedataserver/libedataserver-ESourceList.html
 share/doc/libedataserver/libedataserver-e-categories.html
 share/doc/libedataserver/libedataserver-e-data-server-module.html
 share/doc/libedataserver/libedataserver-e-db3-utils.html
@ -497,6 +524,32 @@ share/doc/libedataserver/libedataserver.devhelp2
 share/doc/libedataserver/right.png
 share/doc/libedataserver/style.css
 share/doc/libedataserver/up.png
+share/doc/libedataserverui/ECategoriesDialog.html
+share/doc/libedataserverui/EContactStore.html
+share/doc/libedataserverui/EDestinationStore.html
+share/doc/libedataserverui/ENameSelector.html
+share/doc/libedataserverui/ENameSelectorDialog.html
+share/doc/libedataserverui/ENameSelectorEntry.html
+share/doc/libedataserverui/ENameSelectorList.html
+share/doc/libedataserverui/ENameSelectorModel.html
+share/doc/libedataserverui/ESourceOptionMenu.html
+share/doc/libedataserverui/ESourceSelector.html
+share/doc/libedataserverui/ESourceSelectorDialog.html
+share/doc/libedataserverui/ETreeModelGenerator.html
+share/doc/libedataserverui/ch01.html
+share/doc/libedataserverui/home.png
+share/doc/libedataserverui/index.html
+share/doc/libedataserverui/index.sgml
+share/doc/libedataserverui/ix01.html
+share/doc/libedataserverui/left.png
+share/doc/libedataserverui/libedataserverui-e-book-auth-util.html
+share/doc/libedataserverui/libedataserverui-e-data-server-ui-marshal.html
+share/doc/libedataserverui/libedataserverui-e-passwords.html
+share/doc/libedataserverui/libedataserverui.devhelp
+share/doc/libedataserverui/libedataserverui.devhelp2
+share/doc/libedataserverui/right.png
+share/doc/libedataserverui/style.css
+share/doc/libedataserverui/up.png
 share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema
 share/gnome/evolution-data-server-%%VERSION%%/glade/e-categories-dialog.glade
 share/gnome/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade
@ -883,24 +936,24 @@ share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/zones.tab
 share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Addressbook.idl
 share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer-Calendar.idl
 share/gnome/idl/evolution-data-server-%%EVO_VERSION%%/Evolution-DataServer.idl
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_birthday_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_business_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_favorites_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_gifts_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_goals_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_holiday-cards_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_holiday_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_hot-contacts_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_ideas_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_international_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_key-customer_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_miscellaneous_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_personal_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_phonecalls_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_status_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_strategies_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_suppliers_16.png
-share/gnome/pixmaps/evolution-data-server-%%VERSION%%/category_time-and-expenses_16.png
+share/gnome/pixmaps/evolution-data-server/category_birthday_16.png
+share/gnome/pixmaps/evolution-data-server/category_business_16.png
+share/gnome/pixmaps/evolution-data-server/category_favorites_16.png
+share/gnome/pixmaps/evolution-data-server/category_gifts_16.png
+share/gnome/pixmaps/evolution-data-server/category_goals_16.png
+share/gnome/pixmaps/evolution-data-server/category_holiday-cards_16.png
+share/gnome/pixmaps/evolution-data-server/category_holiday_16.png
+share/gnome/pixmaps/evolution-data-server/category_hot-contacts_16.png
+share/gnome/pixmaps/evolution-data-server/category_ideas_16.png
+share/gnome/pixmaps/evolution-data-server/category_international_16.png
+share/gnome/pixmaps/evolution-data-server/category_key-customer_16.png
+share/gnome/pixmaps/evolution-data-server/category_miscellaneous_16.png
+share/gnome/pixmaps/evolution-data-server/category_personal_16.png
+share/gnome/pixmaps/evolution-data-server/category_phonecalls_16.png
+share/gnome/pixmaps/evolution-data-server/category_status_16.png
+share/gnome/pixmaps/evolution-data-server/category_strategies_16.png
+share/gnome/pixmaps/evolution-data-server/category_suppliers_16.png
+share/gnome/pixmaps/evolution-data-server/category_time-and-expenses_16.png
 share/locale/am/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/ar/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/az/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@ -974,7 +1027,7 @@ share/locale/xh/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
-@dirrm share/gnome/pixmaps/evolution-data-server-%%VERSION%%
+@dirrm share/gnome/pixmaps/evolution-data-server
@dirrm share/gnome/idl/evolution-data-server-%%EVO_VERSION%%
@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Pacific
@dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Indian
@ -993,8 +1046,10 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%VERSION%%.mo
@dirrm share/gnome/evolution-data-server-%%VERSION%%/weather
@dirrm share/gnome/evolution-data-server-%%VERSION%%/glade
@dirrm share/gnome/evolution-data-server-%%VERSION%%
+@dirrm share/doc/libedataserverui
@dirrm share/doc/libedataserver
@dirrm share/doc/libedata-cal
+@dirrm share/doc/libedata-book
@dirrm share/doc/libecal
@dirrm share/doc/libebook
@dirrm lib/evolution-data-server-%%EVO_VERSION%%/extensions
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@ -3,10 +3,11 @@
 # Whom:					FreeBSD GNOME Team
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/alacarte/Makefile,v 1.10 2006/10/10 18:48:41 marcus Exp $
+#    $MCom: ports/deskutils/alacarte/Makefile,v 1.14 2007/02/13 06:29:20 mezz Exp $
+#

 PORTNAME=	alacarte
-PORTVERSION=	0.10.2
+PORTVERSION=	0.11.3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@ -30,7 +31,6 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
 		${WRKSRC}/Alacarte/MenuEditor.py
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
-	    ${WRKSRC}/Alacarte/DialogHandler.py \
 	    ${WRKSRC}/Alacarte/util.py
 	@${REINPLACE_CMD} -e 's|gmsgfmt|msgfmt|g ; \
 	    	s|python2.4|${PYTHON_VERSION}|g' \
--- a/deskutils/alacarte/distinfo
+++ b/deskutils/alacarte/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/alacarte-0.10.2.tar.bz2) = abf5d95b968a34d034c47e3bfab95719
-SHA256 (gnome2/alacarte-0.10.2.tar.bz2) = 40955f7a0bac25da5d576fea015dd9b35f62033004b01bdc000885b337bfef3d
-SIZE (gnome2/alacarte-0.10.2.tar.bz2) = 201452
+MD5 (gnome2/alacarte-0.11.3.tar.bz2) = 5ca9f07e839f64b7fcefc84cfb05aa17
+SHA256 (gnome2/alacarte-0.11.3.tar.bz2) = 9983e56cd43ee97e6f294145ea4420f7a8aa3f76284928f16e590b7d9b5039c0
+SIZE (gnome2/alacarte-0.11.3.tar.bz2) = 217547
--- a/deskutils/alacarte/files/patch-Alacarte_DialogHandler.py
+++ b/deskutils/alacarte/files/patch-Alacarte_DialogHandler.py
@ -1,11 +0,0 @@
--- Alacarte/DialogHandler.py.orig	Wed Jul 26 20:53:06 2006
-+++ Alacarte/DialogHandler.py	Wed Jul 26 20:53:14 2006
-@@ -84,7 +84,7 @@ class DialogHandler:
- 		if button.icon_path:
- 			dialog.set_current_folder(button.icon_path.rsplit('/', 1)[0])
- 		else:
-			dialog.set_current_folder('/usr/share/icons/')
-+			dialog.set_current_folder('/usr/local/share/icons/')
- 		preview = gtk.VBox()
- 		preview.set_spacing(8)
- 		preview.set_size_request(92, 92)
--- a/deskutils/alacarte/pkg-plist
+++ b/deskutils/alacarte/pkg-plist
@ -1,7 +1,4 @@
 bin/alacarte
-%%PYTHON_SITELIBDIR%%/Alacarte/DialogHandler.py
-%%PYTHON_SITELIBDIR%%/Alacarte/DialogHandler.pyc
-%%PYTHON_SITELIBDIR%%/Alacarte/DialogHandler.pyo
 %%PYTHON_SITELIBDIR%%/Alacarte/MainWindow.py
 %%PYTHON_SITELIBDIR%%/Alacarte/MainWindow.pyc
 %%PYTHON_SITELIBDIR%%/Alacarte/MainWindow.pyo
@ -24,6 +21,7 @@ share/icons/hicolor/22x22/apps/alacarte.png
 share/icons/hicolor/scalable/apps/alacarte.svg
 share/locale/ar/LC_MESSAGES/alacarte.mo
 share/locale/as/LC_MESSAGES/alacarte.mo
+share/locale/be/LC_MESSAGES/alacarte.mo
 share/locale/bg/LC_MESSAGES/alacarte.mo
 share/locale/bn/LC_MESSAGES/alacarte.mo
 share/locale/bn_IN/LC_MESSAGES/alacarte.mo
@ -33,6 +31,7 @@ share/locale/da/LC_MESSAGES/alacarte.mo
 share/locale/de/LC_MESSAGES/alacarte.mo
 share/locale/dz/LC_MESSAGES/alacarte.mo
 share/locale/el/LC_MESSAGES/alacarte.mo
+share/locale/en_CA/LC_MESSAGES/alacarte.mo
 share/locale/en_GB/LC_MESSAGES/alacarte.mo
 share/locale/eo/LC_MESSAGES/alacarte.mo
 share/locale/es/LC_MESSAGES/alacarte.mo
@ -64,6 +63,7 @@ share/locale/pa/LC_MESSAGES/alacarte.mo
 share/locale/pl/LC_MESSAGES/alacarte.mo
 share/locale/pt/LC_MESSAGES/alacarte.mo
 share/locale/pt_BR/LC_MESSAGES/alacarte.mo
+share/locale/ro/LC_MESSAGES/alacarte.mo
 share/locale/ru/LC_MESSAGES/alacarte.mo
 share/locale/si/LC_MESSAGES/alacarte.mo
 share/locale/sl/LC_MESSAGES/alacarte.mo
@ -96,6 +96,8 @@ share/locale/zh_TW/LC_MESSAGES/alacarte.mo
@dirrmtry share/locale/sl
@dirrmtry share/locale/si/LC_MESSAGES
@dirrmtry share/locale/si
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
@dirrmtry share/locale/pt/LC_MESSAGES
@dirrmtry share/locale/pt
@dirrmtry share/locale/pl/LC_MESSAGES
@ -122,6 +124,8 @@ share/locale/zh_TW/LC_MESSAGES/alacarte.mo
@dirrmtry share/locale/ca
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
@dirrm share/gnome/alacarte
--- a/deskutils/chmsee/Makefile
+++ b/deskutils/chmsee/Makefile
@ -7,6 +7,7 @@

 PORTNAME=	chmsee
 PORTVERSION=	0.9.6
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://chmsee.gro.clinux.org/

@ -26,4 +27,8 @@ USE_BZIP2=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"

+post-patch:
+	@${REINPLACE_CMD} -e 's|libgtkhtml-3.8|libgtkhtml-3.14|g' \
+	    	${WRKSRC}/configure
+
 .include <bsd.port.mk>
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.42 2006/09/07 19:05:16 marcus Exp $
+#    $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.54 2007/03/14 11:58:47 ahze Exp $
 #

 PORTNAME=	deskbar-applet
-PORTVERSION=	2.16.2
+PORTVERSION=	2.18.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@ -16,6 +16,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Omnipresent versatile search interface

+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/elementtree/__init__.py:${PORTSDIR}/devel/py-elementtree
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
@ -24,7 +27,7 @@ USE_PYTHON=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ARGS=	--disable-beagle
+INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

@ -34,10 +37,6 @@ OPTIONS=	EVO "Enable evolution support" on

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} < 500000
-BROKEN=	Does not build on 4.X
-.endif
-
 .if !defined(WITHOUT_EVO)
 USE_GNOME+=	evolutiondataserver
 PLIST_SUB+=	EVO=""
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-2.16.2.tar.bz2) = 6a4780813a55e2f464e69cdfac89894d
-SHA256 (gnome2/deskbar-applet-2.16.2.tar.bz2) = 60af4a2924bc67eb497b3df24b710cc5d586336eab9ef338f5538c07e3bff18f
-SIZE (gnome2/deskbar-applet-2.16.2.tar.bz2) = 617194
+MD5 (gnome2/deskbar-applet-2.18.0.tar.bz2) = 2fb3bfc4d1a657adf175fa444a2309f0
+SHA256 (gnome2/deskbar-applet-2.18.0.tar.bz2) = 51c6c8cd68793a92dc172d5cfb9bad9fbc80e9be49cdbcff449635c482931e5f
+SIZE (gnome2/deskbar-applet-2.18.0.tar.bz2) = 645787
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@ -17,18 +17,12 @@ lib/deskbar-applet/handlers/epiphany.pyo
 lib/deskbar-applet/handlers/files.py
 lib/deskbar-applet/handlers/files.pyc
 lib/deskbar-applet/handlers/files.pyo
-lib/deskbar-applet/handlers/galago.py
-lib/deskbar-applet/handlers/galago.pyc
-lib/deskbar-applet/handlers/galago.pyo
 lib/deskbar-applet/handlers/galeon.py
 lib/deskbar-applet/handlers/galeon.pyc
 lib/deskbar-applet/handlers/galeon.pyo
 lib/deskbar-applet/handlers/gdmactions.py
 lib/deskbar-applet/handlers/gdmactions.pyc
 lib/deskbar-applet/handlers/gdmactions.pyo
-lib/deskbar-applet/handlers/google-live.py
-lib/deskbar-applet/handlers/google-live.pyc
-lib/deskbar-applet/handlers/google-live.pyo
 lib/deskbar-applet/handlers/history.py
 lib/deskbar-applet/handlers/history.pyc
 lib/deskbar-applet/handlers/history.pyo
@ -41,6 +35,9 @@ lib/deskbar-applet/handlers/mozilla.pyo
 lib/deskbar-applet/handlers/programs.py
 lib/deskbar-applet/handlers/programs.pyc
 lib/deskbar-applet/handlers/programs.pyo
+lib/deskbar-applet/handlers/recent.py
+lib/deskbar-applet/handlers/recent.pyc
+lib/deskbar-applet/handlers/recent.pyo
 lib/deskbar-applet/handlers/web_address.py
 lib/deskbar-applet/handlers/web_address.pyc
 lib/deskbar-applet/handlers/web_address.pyo
@ -77,6 +74,9 @@ lib/deskbar-applet/handlers/yahoo.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.py
 %%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ModuleContext.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.py
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/ModuleInstaller.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ModuleList.py
 %%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ModuleList.pyo
@ -203,6 +203,18 @@ lib/deskbar-applet/handlers/yahoo.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.py
 %%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/ui/window/__init__.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.py
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ErrorDialog.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.py
+%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/updater/NewStuffUpdater.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.py
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/updater/ProgressbarDialog.pyo
+%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.py
+%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.pyc
+%%PYTHON_SITELIBDIR%%/deskbar/updater/__init__.pyo
 libdata/bonobo/servers/Deskbar_Applet.server
 libdata/pkgconfig/deskbar-applet.pc
 share/gnome/deskbar-applet/Deskbar_Applet.xml
@ -221,6 +233,10 @@ share/gnome/deskbar-applet/art/yahoo.png
 share/gnome/deskbar-applet/mozilla-search.glade
 share/gnome/deskbar-applet/prefs-dialog.glade
 share/gnome/deskbar-applet/smart-bookmarks.glade
+share/gnome/help/deskbar/C/deskbar.xml
+share/gnome/help/deskbar/C/figures/deskbar-applet.png
+share/gnome/help/deskbar/C/legal.xml
+share/gnome/omf/deskbar/deskbar-C.omf
 share/icons/hicolor/16x16/apps/deskbar-applet.png
 share/icons/hicolor/22x22/apps/deskbar-applet.png
 share/icons/hicolor/32x32/apps/deskbar-applet.png
@ -243,6 +259,7 @@ share/locale/en_GB/LC_MESSAGES/deskbar-applet.mo
 share/locale/es/LC_MESSAGES/deskbar-applet.mo
 share/locale/et/LC_MESSAGES/deskbar-applet.mo
 share/locale/eu/LC_MESSAGES/deskbar-applet.mo
+share/locale/fa/LC_MESSAGES/deskbar-applet.mo
 share/locale/fi/LC_MESSAGES/deskbar-applet.mo
 share/locale/fr/LC_MESSAGES/deskbar-applet.mo
 share/locale/gl/LC_MESSAGES/deskbar-applet.mo
@ -271,6 +288,7 @@ share/locale/pa/LC_MESSAGES/deskbar-applet.mo
 share/locale/pl/LC_MESSAGES/deskbar-applet.mo
 share/locale/pt/LC_MESSAGES/deskbar-applet.mo
 share/locale/pt_BR/LC_MESSAGES/deskbar-applet.mo
+share/locale/ro/LC_MESSAGES/deskbar-applet.mo
 share/locale/ru/LC_MESSAGES/deskbar-applet.mo
 share/locale/sk/LC_MESSAGES/deskbar-applet.mo
 share/locale/sl/LC_MESSAGES/deskbar-applet.mo
@ -286,8 +304,13 @@ share/locale/vi/LC_MESSAGES/deskbar-applet.mo
 share/locale/zh_CN/LC_MESSAGES/deskbar-applet.mo
 share/locale/zh_HK/LC_MESSAGES/deskbar-applet.mo
 share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
+@dirrm share/gnome/omf/deskbar
+@dirrm share/gnome/help/deskbar/C/figures
+@dirrm share/gnome/help/deskbar/C
+@dirrm share/gnome/help/deskbar
@dirrm share/gnome/deskbar-applet/art
@dirrm share/gnome/deskbar-applet
+@dirrm %%PYTHON_SITELIBDIR%%/deskbar/updater
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/window
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/entriac
@dirrm %%PYTHON_SITELIBDIR%%/deskbar/ui/cuemiac
@ -317,6 +340,8 @@ share/locale/zh_TW/LC_MESSAGES/deskbar-applet.mo
@dirrmtry share/locale/sl
@dirrmtry share/locale/sk/LC_MESSAGES
@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
@dirrmtry share/locale/pt/LC_MESSAGES
@dirrmtry share/locale/pt
@dirrmtry share/locale/pl/LC_MESSAGES
--- a/deskutils/evolution-jescs/Makefile
+++ b/deskutils/evolution-jescs/Makefile
@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.14 2006/09/29 20:24:23 ahze Exp $
+#   $MCom: ports/deskutils/evolution-jescs/Makefile,v 1.17 2007/03/12 04:55:09 marcus Exp $
 #

 PORTNAME=	jescs
-PORTVERSION=	2.8.2
+PORTVERSION=	2.9.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@ -29,8 +29,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

-EVO_VERSION=	2.8
-PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.8"
+EVO_VERSION=	2.10
+PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" VERSION="2.10"

 post-patch:
 	@${REINPLACE_CMD} -e 's|libdir/bonobo/servers|prefix/libdata/bonobo/servers|g' \
--- a/deskutils/evolution-jescs/distinfo
+++ b/deskutils/evolution-jescs/distinfo
@ -1,3 +1,3 @@
-MD5 (evolution-jescs-2.8.2.tar.bz2) = d1a103854ea1ee30f2186474a0d2bb73
-SHA256 (evolution-jescs-2.8.2.tar.bz2) = 2075b5a42b19ab0ad2343816aefc0d0f9707594fa6ffceaf7f82a0591efdb4e1
-SIZE (evolution-jescs-2.8.2.tar.bz2) = 499151
+MD5 (evolution-jescs-2.9.1.tar.bz2) = d29106ca0412e2397409813d46d094b7
+SHA256 (evolution-jescs-2.9.1.tar.bz2) = f1736e27ffcb9fc826cb5f946fc3e2f958b22fc518304d440bdd25d1b7164402
+SIZE (evolution-jescs-2.9.1.tar.bz2) = 519693
--- a/deskutils/evolution-jescs/pkg-plist
+++ b/deskutils/evolution-jescs/pkg-plist
@ -9,6 +9,7 @@ share/gnome/evolution/%%EVO_VERSION%%/images/sunone-invitations-mini.png
 share/gnome/evolution-jescs/glade/sunone-add-permission-dialog.glade
 share/gnome/evolution-jescs/glade/sunone-permissions-dialog.glade
 share/gnome/evolution-jescs/glade/sunone-subscription-dialog.glade
+share/locale/ar/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/evolution-jescs-%%VERSION%%.mo
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.108 2006/10/03 13:21:06 ahze Exp $
+#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.115 2007/03/11 20:46:37 mezz Exp $
 #

 PORTNAME=	gnome-utils
-PORTVERSION=	2.16.2
+PORTVERSION=	2.18.0
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.16.2.tar.bz2) = 4e70e667a78fc5bee4a4b8f2f3ae8440
-SHA256 (gnome2/gnome-utils-2.16.2.tar.bz2) = 40cf468e6393bc0840e1a38380742d9f91ad236440a4b240318c35f979809425
-SIZE (gnome2/gnome-utils-2.16.2.tar.bz2) = 3369888
+MD5 (gnome2/gnome-utils-2.18.0.tar.bz2) = 33fad81655eed993dea8b5bb7a5789bb
+SHA256 (gnome2/gnome-utils-2.18.0.tar.bz2) = de0d7d54d0c55f1712c7851fbaa9fb38af513ef0752c02532151e2a7b90480c8
+SIZE (gnome2/gnome-utils-2.18.0.tar.bz2) = 4077531
--- a/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c
+++ b/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c
@ -1,29 +0,0 @@
--- gnome-screenshot/screenshot-save.c.orig	Mon Nov  1 15:56:19 2004
-+++ gnome-screenshot/screenshot-save.c	Fri Dec 17 23:11:51 2004
-@@ -94,16 +94,20 @@
-       gchar *message = NULL;
-       gchar *error_message = NULL;
-       GtkWidget *dialog;
-+      GIOStatus status;
- 
-      g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
-      message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
-      dialog = gtk_message_dialog_new (NULL, 0,
-+      status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
-+      if (status == G_IO_STATUS_NORMAL)
-+        {
-+          message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
-+          dialog = gtk_message_dialog_new (NULL, 0,
- 				       GTK_MESSAGE_ERROR,
- 				       GTK_BUTTONS_OK,
- 				       message);
-      gtk_dialog_run (GTK_DIALOG (dialog));
-      gtk_widget_destroy (dialog);
-      exit (1);
-+          gtk_dialog_run (GTK_DIALOG (dialog));
-+          gtk_widget_destroy (dialog);
-+          exit (1);
-+	}
-     }
- 
-   (*save_callback) (save_user_data);
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@ -13,6 +13,7 @@ include/gdict-1.0/gdict/gdict-enum-types.h
 include/gdict-1.0/gdict/gdict-source-loader.h
 include/gdict-1.0/gdict/gdict-source.h
 include/gdict-1.0/gdict/gdict-speller.h
+include/gdict-1.0/gdict/gdict-strategy-chooser.h
 include/gdict-1.0/gdict/gdict-utils.h
 include/gdict-1.0/gdict/gdict-version.h
 include/gdict-1.0/gdict/gdict.h
@ -48,27 +49,11 @@ share/gnome/applications/gnome-dictionary.desktop
 share/gnome/applications/gnome-screenshot.desktop
 share/gnome/applications/gnome-search-tool.desktop
 share/gnome/applications/gnome-system-log.desktop
-share/gnome/baobab/pixmaps/alfa_sort.png
 share/gnome/baobab/pixmaps/baobab.glade
-share/gnome/baobab/pixmaps/baobab.xpm
-share/gnome/baobab/pixmaps/busy.gif
-share/gnome/baobab/pixmaps/done.png
-share/gnome/baobab/pixmaps/format_numeric.png
-share/gnome/baobab/pixmaps/format_percent.png
-share/gnome/baobab/pixmaps/green.png
-share/gnome/baobab/pixmaps/nautilus.png
-share/gnome/baobab/pixmaps/num_sort.png
-share/gnome/baobab/pixmaps/red.png
-share/gnome/baobab/pixmaps/scan_directory.png
-share/gnome/baobab/pixmaps/scan_harddisk.png
-share/gnome/baobab/pixmaps/search.png
-share/gnome/baobab/pixmaps/searchall.png
 share/gnome/baobab/pixmaps/shot.png
-share/gnome/baobab/pixmaps/stop.png
-share/gnome/baobab/pixmaps/white.png
-share/gnome/baobab/pixmaps/yellow.png
 share/gnome/gdict-1.0/sources/default.desktop
 share/gnome/gdict-1.0/sources/spanish.desktop
+share/gnome/gdict-1.0/sources/thai.desktop
 share/gnome/gnome-2.0/ui/GNOME_DictionaryApplet.xml
 share/gnome/gnome-dictionary/gnome-dictionary-preferences.glade
 share/gnome/gnome-dictionary/gnome-dictionary-ui.xml
@ -83,6 +68,18 @@ share/gnome/help/baobab/C/figures/baobab_remote.png
 share/gnome/help/baobab/C/figures/baobab_treemaps.png
 share/gnome/help/baobab/C/figures/baobab_window.png
 share/gnome/help/baobab/C/legal.xml
+share/gnome/help/baobab/en_GB/baobab.xml
+share/gnome/help/baobab/en_GB/figures/baobab_fullscan.png
+share/gnome/help/baobab/en_GB/figures/baobab_prefs.png
+share/gnome/help/baobab/en_GB/figures/baobab_remote.png
+share/gnome/help/baobab/en_GB/figures/baobab_treemaps.png
+share/gnome/help/baobab/en_GB/figures/baobab_window.png
+share/gnome/help/baobab/es/baobab.xml
+share/gnome/help/baobab/es/figures/baobab_fullscan.png
+share/gnome/help/baobab/es/figures/baobab_prefs.png
+share/gnome/help/baobab/es/figures/baobab_remote.png
+share/gnome/help/baobab/es/figures/baobab_treemaps.png
+share/gnome/help/baobab/es/figures/baobab_window.png
 share/gnome/help/baobab/fr/baobab.xml
 share/gnome/help/baobab/fr/figures/baobab_fullscan.png
 share/gnome/help/baobab/fr/figures/baobab_prefs.png
@ -132,6 +129,15 @@ share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-lookup.png
 share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-preferences-print.png
 share/gnome/help/gnome-dictionary/fr/figures/gnome-dictionary-preferences-source.png
 share/gnome/help/gnome-dictionary/fr/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/it/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/it/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-add-source.png
 share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-applet-window.png
 share/gnome/help/gnome-dictionary/ru/figures/gnome-dictionary-applet.png
@ -181,17 +187,22 @@ share/gnome/help/gnome-system-log/fr/figures/syslog_window.png
 share/gnome/help/gnome-system-log/fr/gnome-system-log.xml
 share/gnome/help/gnome-system-log/it/figures/syslog_window.png
 share/gnome/help/gnome-system-log/it/gnome-system-log.xml
+share/gnome/help/gnome-system-log/ru/figures/syslog_window.png
+share/gnome/help/gnome-system-log/ru/gnome-system-log.xml
 share/gnome/help/gnome-system-log/sv/figures/syslog_window.png
 share/gnome/help/gnome-system-log/sv/gnome-system-log.xml
 share/gnome/help/gnome-system-log/uk/figures/syslog_window.png
 share/gnome/help/gnome-system-log/uk/gnome-system-log.xml
 share/gnome/omf/baobab/baobab-C.omf
+share/gnome/omf/baobab/baobab-en_GB.omf
+share/gnome/omf/baobab/baobab-es.omf
 share/gnome/omf/baobab/baobab-fr.omf
 share/gnome/omf/baobab/baobab-sv.omf
 share/gnome/omf/gnome-dictionary/gnome-dictionary-C.omf
 share/gnome/omf/gnome-dictionary/gnome-dictionary-el.omf
 share/gnome/omf/gnome-dictionary/gnome-dictionary-es.omf
 share/gnome/omf/gnome-dictionary/gnome-dictionary-fr.omf
+share/gnome/omf/gnome-dictionary/gnome-dictionary-it.omf
 share/gnome/omf/gnome-dictionary/gnome-dictionary-ru.omf
 share/gnome/omf/gnome-dictionary/gnome-dictionary-sv.omf
 share/gnome/omf/gnome-dictionary/gnome-dictionary-uk.omf
@ -205,11 +216,13 @@ share/gnome/omf/gnome-system-log/gnome-system-log-C.omf
 share/gnome/omf/gnome-system-log/gnome-system-log-es.omf
 share/gnome/omf/gnome-system-log/gnome-system-log-fr.omf
 share/gnome/omf/gnome-system-log/gnome-system-log-it.omf
+share/gnome/omf/gnome-system-log/gnome-system-log-ru.omf
 share/gnome/omf/gnome-system-log/gnome-system-log-sv.omf
 share/gnome/omf/gnome-system-log/gnome-system-log-uk.omf
 share/gnome/pixmaps/gsearchtool/thumbnail_frame.png
-share/icons/hicolor/48x48/apps/baobab.png
+share/icons/hicolor/24x24/apps/baobab.png
 share/icons/hicolor/48x48/apps/gnome-dictionary.png
+share/icons/hicolor/scalable/apps/baobab.svg
 share/icons/hicolor/scalable/apps/gnome-dictionary.svg
 share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
@ -291,6 +304,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-system-log/uk
@dirrm share/gnome/help/gnome-system-log/sv/figures
@dirrm share/gnome/help/gnome-system-log/sv
+@dirrm share/gnome/help/gnome-system-log/ru/figures
+@dirrm share/gnome/help/gnome-system-log/ru
@dirrm share/gnome/help/gnome-system-log/it/figures
@dirrm share/gnome/help/gnome-system-log/it
@dirrm share/gnome/help/gnome-system-log/fr/figures
@ -319,6 +334,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-dictionary/sv
@dirrm share/gnome/help/gnome-dictionary/ru/figures
@dirrm share/gnome/help/gnome-dictionary/ru
+@dirrm share/gnome/help/gnome-dictionary/it/figures
+@dirrm share/gnome/help/gnome-dictionary/it
@dirrm share/gnome/help/gnome-dictionary/fr/figures
@dirrm share/gnome/help/gnome-dictionary/fr
@dirrm share/gnome/help/gnome-dictionary/es/figures
@ -332,6 +349,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/baobab/sv
@dirrm share/gnome/help/baobab/fr/figures
@dirrm share/gnome/help/baobab/fr
+@dirrm share/gnome/help/baobab/es/figures
+@dirrm share/gnome/help/baobab/es
+@dirrm share/gnome/help/baobab/en_GB/figures
+@dirrm share/gnome/help/baobab/en_GB
@dirrm share/gnome/help/baobab/C/figures
@dirrm share/gnome/help/baobab/C
@dirrm share/gnome/help/baobab
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@ -3,12 +3,12 @@
 # Whom:			Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/deskutils/gnotime/Makefile,v 1.18 2007/03/14 17:45:39 marcus Exp $
 #

 PORTNAME=	gnotime
 PORTVERSION=	2.2.2
-PORTREVISON=	2
+PORTREVISON=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gttr
@ -31,4 +31,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 MAN1=		gnotime.1
 GCONF_SCHEMAS=	gnotime.schemas

+post-patch:
+	@${REINPLACE_CMD} -e 's|libgtkhtml-3.8|libgtkhtml-3.14|g' \
+	    	${WRKSRC}/configure
+
 .include <bsd.port.mk>
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.30 2006/10/02 04:52:51 bland Exp $
+#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.35 2007/03/13 00:40:44 mezz Exp $
 #

 PORTNAME=	gucharmap
-PORTVERSION=	1.8.0
+PORTVERSION=	1.10.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
--- a/deskutils/gucharmap/distinfo
+++ b/deskutils/gucharmap/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/gucharmap-1.8.0.tar.bz2) = a75cc3dcc9fb3d2edecc4da936e80e3a
-SHA256 (gnome2/gucharmap-1.8.0.tar.bz2) = 54ca751dda9e187bab19a609d42159a656c2bb933a15024b27841bf08a2185ab
-SIZE (gnome2/gucharmap-1.8.0.tar.bz2) = 2542413
+MD5 (gnome2/gucharmap-1.10.0.tar.bz2) = a0e01bcff2bc5e35ec88f60a383051d3
+SHA256 (gnome2/gucharmap-1.10.0.tar.bz2) = 67efc04e6c70db7a342315a291a49869aff4c262b83233e3e4d1dd654a2d753b
+SIZE (gnome2/gucharmap-1.10.0.tar.bz2) = 2506883
--- a/deskutils/gucharmap/pkg-plist
+++ b/deskutils/gucharmap/pkg-plist
@ -15,7 +15,7 @@ include/gucharmap/gucharmap-window.h
 include/gucharmap/gucharmap.h
 lib/libgucharmap.la
 lib/libgucharmap.so
-lib/libgucharmap.so.5
+lib/libgucharmap.so.6
 libdata/pkgconfig/gucharmap.pc
 share/gnome/applications/gucharmap.desktop
 share/gnome/help/gucharmap/C/figures/gucharmap_start_window.png
@ -28,6 +28,9 @@ share/gnome/help/gucharmap/bg/gucharmap.xml
 share/gnome/help/gucharmap/de/figures/gucharmap_window.png
 share/gnome/help/gucharmap/de/gucharmap.xml
 share/gnome/help/gucharmap/de/legal.xml
+share/gnome/help/gucharmap/en_GB/figures/gucharmap_start_window.png
+share/gnome/help/gucharmap/en_GB/figures/gucharmap_window.png
+share/gnome/help/gucharmap/en_GB/gucharmap.xml
 share/gnome/help/gucharmap/es/figures/gucharmap_start_window.png
 share/gnome/help/gucharmap/es/figures/gucharmap_window.png
 share/gnome/help/gucharmap/es/gucharmap.xml
@ -61,6 +64,7 @@ share/gnome/help/gucharmap/zh_TW/legal.xml
 share/gnome/omf/gucharmap/gucharmap-C.omf
 share/gnome/omf/gucharmap/gucharmap-bg.omf
 share/gnome/omf/gucharmap/gucharmap-de.omf
+share/gnome/omf/gucharmap/gucharmap-en_GB.omf
 share/gnome/omf/gucharmap/gucharmap-es.omf
 share/gnome/omf/gucharmap/gucharmap-fi.omf
 share/gnome/omf/gucharmap/gucharmap-fr.omf
@ -165,6 +169,8 @@ share/locale/zh_TW/LC_MESSAGES/gucharmap.mo
@dirrm share/gnome/help/gucharmap/fi
@dirrm share/gnome/help/gucharmap/es/figures
@dirrm share/gnome/help/gucharmap/es
+@dirrm share/gnome/help/gucharmap/en_GB/figures
+@dirrm share/gnome/help/gucharmap/en_GB
@dirrm share/gnome/help/gucharmap/de/figures
@dirrm share/gnome/help/gucharmap/de
@dirrm share/gnome/help/gucharmap/bg/figures
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@ -7,7 +7,7 @@

 PORTNAME=	logjam
 PORTVERSION=	4.5.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils
 MASTER_SITES=	http://logjam.danga.com/download/

@ -69,6 +69,6 @@ pre-everything::
 	@${ECHO_MSG} ""

 post-patch:
-	@${REINPLACE_CMD} -e 's|libgtkhtml-3.0|libgtkhtml-3.1|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|libgtkhtml-3.0|libgtkhtml-3.18|g' ${WRKSRC}/configure

 .include <bsd.port.post.mk>
--- a/deskutils/nautilus-open-terminal/Makefile
+++ b/deskutils/nautilus-open-terminal/Makefile
@ -3,14 +3,13 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.7 2006/08/09 13:07:37 ahze Exp $
+#    $MCom: ports/deskutils/nautilus-open-terminal/Makefile,v 1.9 2007/03/05 13:36:03 ahze Exp $
 #

 PORTNAME=	nautilus-open-terminal
-PORTVERSION=	0.7
+PORTVERSION=	0.8
 CATEGORIES=	deskutils
-MASTER_SITES=	http://manny.cluecoder.org/packages/nautilus-open-terminal/ \
-    		http://www.marcuscom.com/downloads/
+MASTER_SITES=	GNOME

 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Nautilus extension which allows you to open a terminal
--- a/deskutils/nautilus-open-terminal/distinfo
+++ b/deskutils/nautilus-open-terminal/distinfo
@ -1,3 +1,3 @@
-MD5 (nautilus-open-terminal-0.7.tar.gz) = 318e9673017d9faf9a56aeeb74d36124
-SHA256 (nautilus-open-terminal-0.7.tar.gz) = 136adadbabed4b2436ddbff49f967c8dc17ad632aaaf1bff69f2fa17182e64eb
-SIZE (nautilus-open-terminal-0.7.tar.gz) = 360315
+MD5 (nautilus-open-terminal-0.8.tar.gz) = 4f335934935e2d53ebb893e7ad2bd9bd
+SHA256 (nautilus-open-terminal-0.8.tar.gz) = 3650860cacdaa0f2e3f97f7aca2620fd50163d12aca40d2fb48ba7e7581e854d
+SIZE (nautilus-open-terminal-0.8.tar.gz) = 365879
--- a/deskutils/nautilus-open-terminal/pkg-plist
+++ b/deskutils/nautilus-open-terminal/pkg-plist
@ -1,18 +1,24 @@
 lib/nautilus/extensions-1.0/libnautilus-open-terminal.a
 lib/nautilus/extensions-1.0/libnautilus-open-terminal.la
 lib/nautilus/extensions-1.0/libnautilus-open-terminal.so
+share/locale/ar/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/be/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/bg/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/bn_IN/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/ca/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/cs/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/da/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/de/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/dz/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/en_CA/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/en_GB/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/es/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/et/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/eu/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/fi/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/fr/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/gl/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/gu/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/he/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/hu/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/it/LC_MESSAGES/nautilus-open-terminal.mo
@ -31,6 +37,7 @@ share/locale/ro/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/ru/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/rw/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/sk/LC_MESSAGES/nautilus-open-terminal.mo
+share/locale/sl/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/sr/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/sr@Latn/LC_MESSAGES/nautilus-open-terminal.mo
 share/locale/sv/LC_MESSAGES/nautilus-open-terminal.mo
@ -48,6 +55,8 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-open-terminal.mo
@dirrmtry share/locale/uk
@dirrmtry share/locale/sr/LC_MESSAGES
@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
@dirrmtry share/locale/sk/LC_MESSAGES
@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@ -64,7 +73,13 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-open-terminal.mo
@dirrmtry share/locale/gl
@dirrmtry share/locale/fi/LC_MESSAGES
@dirrmtry share/locale/fi
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
@dirrmtry share/locale/cs/LC_MESSAGES
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@ -3,10 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.5 2006/10/12 16:46:23 marcus Exp $
+#    $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.7 2007/03/12 11:50:11 ahze Exp $

 PORTNAME=	nautilus-sendto
-PORTVERSION=	0.8
+PORTVERSION=	0.10
 CATEGORIES=	deskutils
 MASTER_SITES=	GNOME

--- a/deskutils/nautilus-sendto/distinfo
+++ b/deskutils/nautilus-sendto/distinfo
@ -1,3 +1,3 @@
-MD5 (nautilus-sendto-0.8.tar.bz2) = 19165c7404c4956efd4366a8ebe3ddfa
-SHA256 (nautilus-sendto-0.8.tar.bz2) = b046c9993029a0e5cc3976252420e5ba1413fa7174541a10815222a41c522c73
-SIZE (nautilus-sendto-0.8.tar.bz2) = 310098
+MD5 (nautilus-sendto-0.10.tar.bz2) = cc47d4364d71d6f35776c5634e2f1ed1
+SHA256 (nautilus-sendto-0.10.tar.bz2) = f5d3a654070464929c751775c767cf39ce27f8f37a7d9ef5f336598631d3ea8d
+SIZE (nautilus-sendto-0.10.tar.bz2) = 322104
--- a/deskutils/nautilus-sendto/pkg-plist
+++ b/deskutils/nautilus-sendto/pkg-plist
@ -1,6 +1,8 @@
 bin/nautilus-sendto
 lib/gaim/nautilus.la
 lib/gaim/nautilus.so
+lib/nautilus-sendto/plugins/libnstbluetooth.la
+lib/nautilus-sendto/plugins/libnstbluetooth.so
 lib/nautilus-sendto/plugins/libnstevolution.la
 lib/nautilus-sendto/plugins/libnstevolution.so
 lib/nautilus-sendto/plugins/libnstgaim.la
@ -9,8 +11,9 @@ lib/nautilus-sendto/plugins/libnstsylpheed.la
 lib/nautilus-sendto/plugins/libnstsylpheed.so
 lib/nautilus/extensions-1.0/libnautilus-sendto.la
 lib/nautilus/extensions-1.0/libnautilus-sendto.so
-share/gnome/nautilus-sendto/glade/nautilus-sendto-force.glade
 share/gnome/nautilus-sendto/glade/nautilus-sendto.glade
+share/locale/ar/LC_MESSAGES/nautilus-sendto.mo
+share/locale/be/LC_MESSAGES/nautilus-sendto.mo
 share/locale/bg/LC_MESSAGES/nautilus-sendto.mo
 share/locale/ca/LC_MESSAGES/nautilus-sendto.mo
 share/locale/cs/LC_MESSAGES/nautilus-sendto.mo
@ -44,6 +47,7 @@ share/locale/pt_BR/LC_MESSAGES/nautilus-sendto.mo
 share/locale/ru/LC_MESSAGES/nautilus-sendto.mo
 share/locale/rw/LC_MESSAGES/nautilus-sendto.mo
 share/locale/sk/LC_MESSAGES/nautilus-sendto.mo
+share/locale/sl/LC_MESSAGES/nautilus-sendto.mo
 share/locale/sq/LC_MESSAGES/nautilus-sendto.mo
 share/locale/sv/LC_MESSAGES/nautilus-sendto.mo
 share/locale/th/LC_MESSAGES/nautilus-sendto.mo
@ -57,6 +61,8 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo
@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/uk/LC_MESSAGES
@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
@dirrmtry share/locale/sk/LC_MESSAGES
@dirrmtry share/locale/sk
@dirrmtry share/locale/rw/LC_MESSAGES
@ -81,6 +87,8 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo
@dirrmtry share/locale/cs
@dirrmtry share/locale/ca/LC_MESSAGES
@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
@dirrm share/gnome/nautilus-sendto/glade
@dirrm share/gnome/nautilus-sendto
@dirrm lib/nautilus-sendto/plugins
--- a/deskutils/ontv/Makefile
+++ b/deskutils/ontv/Makefile
@ -3,30 +3,33 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/ontv/Makefile,v 1.3 2006/10/08 16:50:42 mezz Exp $
+#   $MCom: ports/deskutils/ontv/Makefile,v 1.5 2007/02/18 19:18:34 mezz Exp $
 #

 PORTNAME=	ontv
-PORTVERSION=	2.2.0
-PORTREVISION=	2
-CATEGORIES=	deskutils
+PORTVERSION=	2.4.0
+CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}

 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	GNOME Applet frontend of XMLTV
+COMMENT=	A GNOME Applet for monitoring current and upcoming TV programs

-LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementtree \
+		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cElementTree.so:${PORTSDIR}/devel/py-celementtree \
+		${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/__init__.py:${PORTSDIR}/devel/py-notify \
+		${PYTHON_SITELIBDIR}/gtk-2.0/vtemodule.so:${PORTSDIR}/x11-toolkits/py-vte \
 		tv_grab_be:${PORTSDIR}/textproc/p5-xmltv

 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	pygnomedesktop gnomeprefix pygnomeextras
+USE_GNOME=	gnomehack gnomeprefix pygnomedesktop pygnomeextras
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 GCONF_SCHEMAS=	ontv.schemas
+INSTALLS_ICONS=	yes

 .include <bsd.port.mk>
--- a/deskutils/ontv/distinfo
+++ b/deskutils/ontv/distinfo
@ -1,3 +1,3 @@
-MD5 (ontv-2.2.0.tar.bz2) = 10f72547a3026c2485a379a12301376c
-SHA256 (ontv-2.2.0.tar.bz2) = 4e7fb7fc70899b0cb16c7452a10ef2dd8f0d14c127137c08eed32283958b50cb
-SIZE (ontv-2.2.0.tar.bz2) = 406089
+MD5 (ontv-2.4.0.tar.bz2) = 9f59697b1785055a347bd8e6bba8b2d3
+SHA256 (ontv-2.4.0.tar.bz2) = 54160178096824ad66d365d4563434e9d60ba6794041d59df9500a5ff7456709
+SIZE (ontv-2.4.0.tar.bz2) = 411776
--- a/deskutils/ontv/files/patch-data_Makefile.in
+++ b/deskutils/ontv/files/patch-data_Makefile.in
@ -1,11 +0,0 @@
--- data/Makefile.in.orig	Mon Jul 24 23:13:40 2006
-+++ data/Makefile.in	Mon Jul 24 23:14:10 2006
-@@ -240,7 +240,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = images
-serverdir = $(libdir)/bonobo/servers
-+serverdir = @prefix@/libdata/bonobo/servers
- server_in_files = GNOME_OnTVApplet.server.in
- server_DATA = $(server_in_files:.server.in=.server)
- gladedir = $(datadir)/ontv
--- a/deskutils/ontv/files/patch-ontv_init.in.py
+++ b/deskutils/ontv/files/patch-ontv_init.in.py
@ -1,15 +1,15 @@
--- ontv/__init__.py.in.orig	Mon Jul 24 23:05:49 2006
-+++ ontv/__init__.py.in	Mon Jul 24 23:06:14 2006
+--- ontv/__init__.py.in.orig	Sun Feb 18 00:51:02 2007
+++ ontv/__init__.py.in	Sun Feb 18 00:51:12 2007
@@ -1,7 +1,7 @@
 NAME = 'OnTV'
 VERSION = '@VERSION@'
 -SERVERS_DIR = '@prefix@/lib/bonobo/servers'
 -DATA_DIR = '@prefix@/@DATADIRNAME@/ontv'
-PIXMAPS_DIR = '@prefix@/@DATADIRNAME@/pixmaps'
+-IMAGES_DIR = '@prefix@/@DATADIRNAME@/ontv/images'
 -UI_DIR = '@prefix@/@DATADIRNAME@/gnome-2.0/ui'
 -LOCALE_DIR = '@prefix@/@DATADIRNAME@/locale'
 +SERVERS_DIR = '@prefix@/libdata/bonobo/servers'
 +DATA_DIR = '@prefix@/share/gnome/ontv'
-+PIXMAPS_DIR = '@prefix@/share/gnome/pixmaps'
+IMAGES_DIR = '@prefix@/share/gnome/ontv/images'
 +UI_DIR = '@prefix@/share/gnome/gnome-2.0/ui'
 +LOCALE_DIR = '@prefix@/share/locale'
--- a/deskutils/ontv/pkg-descr
+++ b/deskutils/ontv/pkg-descr
@ -1 +1,4 @@
-GNOME Applet frontend of XMLTV
+OnTV is a GNOME Applet for monitoring current and upcoming TV programs. It
+uses XMLTV files to monitor them.
+
+WWW: http://johan.svedberg.com/projects/coding/ontv
--- a/deskutils/ontv/pkg-plist
+++ b/deskutils/ontv/pkg-plist
@ -10,9 +10,6 @@
 %%PYTHON_SITELIBDIR%%/ontv/Configuration.py
 %%PYTHON_SITELIBDIR%%/ontv/Configuration.pyc
 %%PYTHON_SITELIBDIR%%/ontv/Configuration.pyo
-%%PYTHON_SITELIBDIR%%/ontv/DBus.py
-%%PYTHON_SITELIBDIR%%/ontv/DBus.pyc
-%%PYTHON_SITELIBDIR%%/ontv/DBus.pyo
 %%PYTHON_SITELIBDIR%%/ontv/GUI.py
 %%PYTHON_SITELIBDIR%%/ontv/GUI.pyc
 %%PYTHON_SITELIBDIR%%/ontv/GUI.pyo
@ -52,6 +49,12 @@
 %%PYTHON_SITELIBDIR%%/ontv/TimeSpan.py
 %%PYTHON_SITELIBDIR%%/ontv/TimeSpan.pyc
 %%PYTHON_SITELIBDIR%%/ontv/TimeSpan.pyo
+%%PYTHON_SITELIBDIR%%/ontv/Utils.py
+%%PYTHON_SITELIBDIR%%/ontv/Utils.pyc
+%%PYTHON_SITELIBDIR%%/ontv/Utils.pyo
+%%PYTHON_SITELIBDIR%%/ontv/XMLTVAssistant.py
+%%PYTHON_SITELIBDIR%%/ontv/XMLTVAssistant.pyc
+%%PYTHON_SITELIBDIR%%/ontv/XMLTVAssistant.pyo
 %%PYTHON_SITELIBDIR%%/ontv/XMLTVFile.py
 %%PYTHON_SITELIBDIR%%/ontv/XMLTVFile.pyc
 %%PYTHON_SITELIBDIR%%/ontv/XMLTVFile.pyo
@ -70,11 +73,20 @@
 libdata/bonobo/servers/GNOME_OnTVApplet.server
 libexec/ontv
 share/gnome/gnome-2.0/ui/GNOME_OnTVApplet.xml
-share/gnome/ontv/ontv-logo-downloading.png
+share/gnome/ontv/images/ontv-logo-downloading.png
 share/gnome/ontv/ontv.glade
-share/gnome/pixmaps/ontv.png
+share/icons/hicolor/16x16/apps/ontv.png
+share/icons/hicolor/22x22/apps/ontv.png
+share/icons/hicolor/24x24/apps/ontv.png
+share/icons/hicolor/32x32/apps/ontv.png
+share/icons/hicolor/48x48/apps/ontv.png
+share/icons/hicolor/scalable/apps/ontv.svg
+share/locale/ar/LC_MESSAGES/ontv.mo
 share/locale/bg/LC_MESSAGES/ontv.mo
+share/locale/ca/LC_MESSAGES/ontv.mo
+share/locale/cs/LC_MESSAGES/ontv.mo
 share/locale/de/LC_MESSAGES/ontv.mo
+share/locale/dz/LC_MESSAGES/ontv.mo
 share/locale/en_CA/LC_MESSAGES/ontv.mo
 share/locale/en_GB/LC_MESSAGES/ontv.mo
 share/locale/es/LC_MESSAGES/ontv.mo
@ -86,10 +98,12 @@ share/locale/nl/LC_MESSAGES/ontv.mo
 share/locale/pa/LC_MESSAGES/ontv.mo
 share/locale/pl/LC_MESSAGES/ontv.mo
 share/locale/pt_BR/LC_MESSAGES/ontv.mo
+share/locale/sk/LC_MESSAGES/ontv.mo
 share/locale/sv/LC_MESSAGES/ontv.mo
 share/locale/uk/LC_MESSAGES/ontv.mo
 share/locale/vi/LC_MESSAGES/ontv.mo
 share/locale/zh_CN/LC_MESSAGES/ontv.mo
+@dirrm share/gnome/ontv/images
@dirrm share/gnome/ontv
@dirrm %%PYTHON_SITELIBDIR%%/ontv/keybinder
@dirrm %%PYTHON_SITELIBDIR%%/ontv
@ -97,7 +111,15 @@ share/locale/zh_CN/LC_MESSAGES/ontv.mo
@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/uk/LC_MESSAGES
@dirrmtry share/locale/uk
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
@dirrmtry share/locale/pl/LC_MESSAGES
@dirrmtry share/locale/pl
@dirrmtry share/locale/fi/LC_MESSAGES
@dirrmtry share/locale/fi
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
--- a/devel/Makefile
+++ b/devel/Makefile
@ -582,6 +582,7 @@
    SUBDIR += liboil
    SUBDIR += libol
    SUBDIR += libole2
+    SUBDIR += liboobs
    SUBDIR += liboop
    SUBDIR += libopendaap
    SUBDIR += libopensync
@ -2125,6 +2126,7 @@
    SUBDIR += wizardkit
    SUBDIR += wxGlade
    SUBDIR += wxGlade-devel
+    SUBDIR += xdg-user-dirs-gtk
    SUBDIR += xdg-utils
    SUBDIR += xfc
    SUBDIR += xfce4-dev-tools
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/bug-buddy/Makefile,v 1.38 2006/09/20 06:35:57 marcus Exp $
+#   $MCom: ports/devel/bug-buddy/Makefile,v 1.44 2007/03/13 12:27:23 ahze Exp $
 #

 PORTNAME=	bug-buddy
-PORTVERSION=	2.16.1
+PORTVERSION=	2.18.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/bug-buddy/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2

 MAINTAINER=	gnome@FreeBSD.org
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.16.1.tar.bz2) = c15641ebfd90a91f185179d67bde88e3
-SHA256 (gnome2/bug-buddy-2.16.1.tar.bz2) = fa20afc4ca7c2e0e03346bf608254e7c25eac4503ad05581caa971d54464daa8
-SIZE (gnome2/bug-buddy-2.16.1.tar.bz2) = 512914
+MD5 (gnome2/bug-buddy-2.18.0.tar.bz2) = 3b3d99f2450f300d73a201bc5c00498d
+SHA256 (gnome2/bug-buddy-2.18.0.tar.bz2) = aaa16927809b2cf96a5414461363ab325e3fb89bfa6d6822f0f015a2f853b3f2
+SIZE (gnome2/bug-buddy-2.18.0.tar.bz2) = 553486
--- a/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
+++ b/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
@ -1,11 +1,11 @@
--- src/bug-buddy.menu.in.orig	Wed Sep 20 02:28:05 2006
-+++ src/bug-buddy.menu.in	Wed Sep 20 02:28:12 2006
+--- src/bug-buddy.menu.in.orig	Tue Feb 27 13:46:40 2007
+++ src/bug-buddy.menu.in	Tue Feb 27 13:46:54 2007
@@ -6,7 +6,7 @@
   <Name>Bug Buddy programs</Name>
 
   <!-- Read only files in default .desktop file location -->
 -  <LegacyDir>@prefix@/@DATADIRNAME@/applications</LegacyDir>
 +  <LegacyDir>@prefix@/@DATADIRNAME@/gnome/applications</LegacyDir>
+   <LegacyDir>@prefix@/@DATADIRNAME@/gnome/autostart</LegacyDir>
 
   <!-- we want to process all desktop files; Unfortunately,
-        files with NoDisplay=true won't be returned by the 
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@ -12,8 +12,6 @@ share/gnome/bug-buddy/bugzilla/ximian/config
 share/gnome/bug-buddy/bugzilla/ximian/mostfreq
 share/gnome/bug-buddy/bugzilla/ximian/products
 share/gnome/bug-buddy/gdb-cmd
-share/gnome/bug-buddy/gnome.png
-share/gnome/bug-buddy/ximian.png
 share/icons/hicolor/48x48/apps/bug-buddy.png
 share/locale/am/LC_MESSAGES/bug-buddy.mo
 share/locale/ar/LC_MESSAGES/bug-buddy.mo
--- a/devel/gamin/Makefile
+++ b/devel/gamin/Makefile
@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/devel/gamin/Makefile,v 1.2 2007/02/02 18:57:01 mezz Exp $
 #

 PORTNAME=	gamin
-PORTVERSION=	0.1.7
-PORTREVISION?=	2
+PORTVERSION=	0.1.8
 CATEGORIES?=	devel
 MASTER_SITES=	http://www.gnome.org/~veillard/gamin/sources/

--- a/devel/gamin/distinfo
+++ b/devel/gamin/distinfo
@ -1,3 +1,3 @@
-MD5 (gamin-0.1.7.tar.gz) = 1a1991ffa749b7dc2cc0573d6a2867b8
-SHA256 (gamin-0.1.7.tar.gz) = 8272c64356e1310353f2411b2cabd211468edbf8ce312d58aeef55889e79361a
-SIZE (gamin-0.1.7.tar.gz) = 542061
+MD5 (gamin-0.1.8.tar.gz) = 985022c8b1b993e471d528fd0e14ffbe
+SHA256 (gamin-0.1.8.tar.gz) = be22f69b4797db510f4270ff0e228dd027e99e561ac5f5d38be595be7e82d203
+SIZE (gamin-0.1.8.tar.gz) = 564530
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gconf2/Makefile,v 1.79 2006/10/05 18:09:30 mezz Exp $
+#   $MCom: ports/devel/gconf2/Makefile,v 1.81 2007/03/06 17:05:38 marcus Exp $
 #

 PORTNAME=	gconf2
-PORTVERSION=	2.16.1
+PORTVERSION=	2.18.0.1
 PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/GConf-2.16.1.tar.bz2) = 60d2da294195abb8cac81b6ecceb7e5e
-SHA256 (gnome2/GConf-2.16.1.tar.bz2) = accedbd57f497be040055761b1553108a919cdde00986230434b9fe3925a6200
-SIZE (gnome2/GConf-2.16.1.tar.bz2) = 1321109
+MD5 (gnome2/GConf-2.18.0.1.tar.bz2) = aa0e0a0729fb021bab72b4166fd392f9
+SHA256 (gnome2/GConf-2.18.0.1.tar.bz2) = 58a738f34078de9b3906460a297e751e80a0846e4f3bf33e1884216d0da42bf1
+SIZE (gnome2/GConf-2.18.0.1.tar.bz2) = 1347765
--- a/devel/gconf2/files/patch-gconf_gconftool.c
+++ b/devel/gconf2/files/patch-gconf_gconftool.c
@ -1,20 +1,9 @@
--- gconf/gconftool.c.orig	Fri May  5 12:36:01 2006
-+++ gconf/gconftool.c	Fri May  5 12:39:29 2006
-@@ -3724,6 +3724,8 @@
- static int
- do_makefile_install(GConfEngine* conf, const gchar** args, gboolean unload)
- {
-+  int sync_result;
-+
-   if (args == NULL)
-     {
-       g_printerr (_("Must specify some schema files to install\n"));
-@@ -3738,7 +3740,15 @@
-       ++args;
+--- gconf/gconftool.c.orig	Fri Mar  2 17:10:13 2007
+++ gconf/gconftool.c	Tue Mar  6 12:01:04 2007
+@@ -3781,6 +3781,13 @@ do_makefile_install(GConfEngine* conf, c
     }
 
-  return do_sync (conf);
-+  sync_result = do_sync (conf);
+   retval |= do_sync (conf);
 +
 +  /*
 +   * Send all the gconfd-2 processes a SIGHUP so that they reload the
@ -22,7 +11,6 @@
 +   */
 +  system("/usr/bin/killall -SIGHUP gconfd-2 >/dev/null 2>&1");
 +
-+  return sync_result;
+   return retval;
 }
 
- typedef enum {
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@ -3,11 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gconfmm26/Makefile,v 1.14 2006/08/21 15:35:55 ahze Exp $
+#   $MCom: ports/devel/gconfmm26/Makefile,v 1.16 2007/03/10 05:27:50 marcus Exp $
 #

 PORTNAME=	gconfmm
-PORTVERSION=	2.16.0
+PORTVERSION=	2.18.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
--- a/devel/gconfmm26/distinfo
+++ b/devel/gconfmm26/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/gconfmm-2.16.0.tar.bz2) = 2b3aa57276f6f63c4effc585ba205a3d
-SHA256 (gnome2/gconfmm-2.16.0.tar.bz2) = 514f1062d85b7b3843f461b095b64551f20e647386dab6a513982af52e0392f2
-SIZE (gnome2/gconfmm-2.16.0.tar.bz2) = 275789
+MD5 (gnome2/gconfmm-2.18.0.tar.bz2) = 0771dde14af1443f9ac142010eb3d403
+SHA256 (gnome2/gconfmm-2.18.0.tar.bz2) = 0f82e951069395c28b86205233e2a061505544811448f1bd75a3ee76b44d9316
+SIZE (gnome2/gconfmm-2.18.0.tar.bz2) = 292484
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@ -3,11 +3,11 @@
 # Whom:			Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glade3/Makefile,v 1.21 2006/10/08 19:17:28 mezz Exp $
+#   $MCom: ports/devel/glade3/Makefile,v 1.29 2007/03/13 17:16:00 mezz Exp $
 #

 PORTNAME=	glade3
-PORTVERSION=	3.0.3
+PORTVERSION=	3.2.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@ -20,28 +20,40 @@ INSTALLS_ICONS=	yes
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget gtk20 libxml2 gnomeprefix gnomehack
+USE_GNOME=	gnometarget gtk20 libxml2 gnomeprefix gnomehack \
+		gnomedocutils desktopfileutils
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
+INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"

-DOCSDIR=	share/doc/gladeui
+DOCSDIR=	${PREFIX}/share/doc/gladeui

 .include <bsd.port.pre.mk>

-.if ${OSVERSION} < 500000
-IGNORE=	does not build on 4.X
-.endif
-
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 CONFIGURE_ARGS+=--enable-gnome
-PKGNAMESUFFIX:=	-gnome
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gnome
 .else
 CONFIGURE_ARGS+=--disable-gnome
 .endif

+.if ${HAVE_GNOME:Mpygtk2}!=""
+USE_PYTHON=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_GNOME+=	pygtk2
+PLIST_SUB+=	PYTHON:=""
+.else
+CONFIGURE_ARGS+=--disable-python
+PLIST_SUB+=	PYTHON:="@comment "
+.endif
+
+post-install:
+	${MKDIR} ${PREFIX}/lib/glade3/bindings
+	@-update-desktop-database
+
 .include <bsd.port.post.mk>
--- a/devel/glade3/distinfo
+++ b/devel/glade3/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/glade3-3.0.3.tar.bz2) = 1e965bbce1febdb6260a42467c0fd957
-SHA256 (gnome2/glade3-3.0.3.tar.bz2) = e31394ac998abde7dc1eb0951635430892e35bb82913e70d6d28c2d6b7c880e8
-SIZE (gnome2/glade3-3.0.3.tar.bz2) = 868366
+MD5 (gnome2/glade3-3.2.0.tar.bz2) = bee0aeb66b29ac40b24d9413aace15cc
+SHA256 (gnome2/glade3-3.2.0.tar.bz2) = 4ca06cc1ab8670858b0295fc126aa39f059a0b90f0c399022770ee0b522eb35e
+SIZE (gnome2/glade3-3.2.0.tar.bz2) = 1344693
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@ -1,51 +1,54 @@
 bin/glade-3
-include/libgladeui-1.0/libgladeui/atk.xpm
-include/libgladeui-1.0/libgladeui/fixed_bg.xpm
-include/libgladeui-1.0/libgladeui/glade-accumulators.h
-include/libgladeui-1.0/libgladeui/glade-app.h
-include/libgladeui-1.0/libgladeui/glade-base-editor.h
-include/libgladeui-1.0/libgladeui/glade-builtins.h
-include/libgladeui-1.0/libgladeui/glade-catalog.h
-include/libgladeui-1.0/libgladeui/glade-clipboard-view.h
-include/libgladeui-1.0/libgladeui/glade-clipboard.h
-include/libgladeui-1.0/libgladeui/glade-command.h
-include/libgladeui-1.0/libgladeui/glade-cursor.h
-include/libgladeui-1.0/libgladeui/glade-custom.h
-include/libgladeui-1.0/libgladeui/glade-debug.h
-include/libgladeui-1.0/libgladeui/glade-editor-property.h
-include/libgladeui-1.0/libgladeui/glade-editor.h
-include/libgladeui-1.0/libgladeui/glade-fixed.h
-include/libgladeui-1.0/libgladeui/glade-gtk.h
-include/libgladeui-1.0/libgladeui/glade-id-allocator.h
-include/libgladeui-1.0/libgladeui/glade-marshallers.h
-include/libgladeui-1.0/libgladeui/glade-palette-box.h
-include/libgladeui-1.0/libgladeui/glade-palette-expander.h
-include/libgladeui-1.0/libgladeui/glade-palette-item.h
-include/libgladeui-1.0/libgladeui/glade-palette.h
-include/libgladeui-1.0/libgladeui/glade-parameter.h
-include/libgladeui-1.0/libgladeui/glade-parser.h
-include/libgladeui-1.0/libgladeui/glade-placeholder.h
-include/libgladeui-1.0/libgladeui/glade-popup.h
-include/libgladeui-1.0/libgladeui/glade-project-view.h
-include/libgladeui-1.0/libgladeui/glade-project.h
-include/libgladeui-1.0/libgladeui/glade-property-class.h
-include/libgladeui-1.0/libgladeui/glade-property.h
-include/libgladeui-1.0/libgladeui/glade-signal-editor.h
-include/libgladeui-1.0/libgladeui/glade-signal.h
-include/libgladeui-1.0/libgladeui/glade-utils.h
-include/libgladeui-1.0/libgladeui/glade-widget-class.h
-include/libgladeui-1.0/libgladeui/glade-widget.h
-include/libgladeui-1.0/libgladeui/glade-xml-utils.h
-include/libgladeui-1.0/libgladeui/glade.h
+include/libgladeui-1.0/gladeui/atk.xpm
+include/libgladeui-1.0/gladeui/fixed_bg.xpm
+include/libgladeui-1.0/gladeui/glade-accumulators.h
+include/libgladeui-1.0/gladeui/glade-app.h
+include/libgladeui-1.0/gladeui/glade-base-editor.h
+include/libgladeui-1.0/gladeui/glade-binding.h
+include/libgladeui-1.0/gladeui/glade-builtins.h
+include/libgladeui-1.0/gladeui/glade-catalog.h
+include/libgladeui-1.0/gladeui/glade-clipboard-view.h
+include/libgladeui-1.0/gladeui/glade-clipboard.h
+include/libgladeui-1.0/gladeui/glade-command.h
+include/libgladeui-1.0/gladeui/glade-cursor.h
+include/libgladeui-1.0/gladeui/glade-custom.h
+include/libgladeui-1.0/gladeui/glade-debug.h
+include/libgladeui-1.0/gladeui/glade-design-layout.h
+include/libgladeui-1.0/gladeui/glade-design-view.h
+include/libgladeui-1.0/gladeui/glade-editor-property.h
+include/libgladeui-1.0/gladeui/glade-editor.h
+include/libgladeui-1.0/gladeui/glade-fixed.h
+include/libgladeui-1.0/gladeui/glade-id-allocator.h
+include/libgladeui-1.0/gladeui/glade-marshallers.h
+include/libgladeui-1.0/gladeui/glade-palette-box.h
+include/libgladeui-1.0/gladeui/glade-palette-expander.h
+include/libgladeui-1.0/gladeui/glade-palette-item.h
+include/libgladeui-1.0/gladeui/glade-palette.h
+include/libgladeui-1.0/gladeui/glade-parameter.h
+include/libgladeui-1.0/gladeui/glade-parser.h
+include/libgladeui-1.0/gladeui/glade-placeholder.h
+include/libgladeui-1.0/gladeui/glade-popup.h
+include/libgladeui-1.0/gladeui/glade-project-view.h
+include/libgladeui-1.0/gladeui/glade-project.h
+include/libgladeui-1.0/gladeui/glade-property-class.h
+include/libgladeui-1.0/gladeui/glade-property.h
+include/libgladeui-1.0/gladeui/glade-signal-editor.h
+include/libgladeui-1.0/gladeui/glade-signal.h
+include/libgladeui-1.0/gladeui/glade-utils.h
+include/libgladeui-1.0/gladeui/glade-widget-adaptor.h
+include/libgladeui-1.0/gladeui/glade-widget.h
+include/libgladeui-1.0/gladeui/glade-xml-utils.h
+include/libgladeui-1.0/gladeui/glade.h
+%%PYTHON:%%lib/glade3/bindings/libgladepython.la
+%%PYTHON:%%lib/glade3/bindings/libgladepython.so
 %%GNOME:%%lib/glade3/modules/libgladegnome.la
 %%GNOME:%%lib/glade3/modules/libgladegnome.so
 lib/glade3/modules/libgladegtk.la
 lib/glade3/modules/libgladegtk.so
 lib/libgladeui-1.la
 lib/libgladeui-1.so
-lib/libgladeui-1.so.4
-libdata/pkgconfig/glade-3.pc
-libdata/pkgconfig/libgladeui-1.0.pc
+lib/libgladeui-1.so.5
+libdata/pkgconfig/gladeui-1.0.pc
 %%DOCSDIR%%/GladeApp.html
 %%DOCSDIR%%/GladeClipboard.html
 %%DOCSDIR%%/GladeClipboardView.html
@ -97,6 +100,7 @@ share/gnome/glade3/pixmaps/16x16/accellabel.png
 share/gnome/glade3/pixmaps/16x16/alignment.png
 share/gnome/glade3/pixmaps/16x16/arrow.png
 share/gnome/glade3/pixmaps/16x16/aspectframe.png
+share/gnome/glade3/pixmaps/16x16/assistant.png
 %%GNOME:%%share/gnome/glade3/pixmaps/16x16/bonobodock.png
 %%GNOME:%%share/gnome/glade3/pixmaps/16x16/bonobodockitem.png
 share/gnome/glade3/pixmaps/16x16/button.png
@ -161,6 +165,7 @@ share/gnome/glade3/pixmaps/16x16/imagemenuitem.png
 share/gnome/glade3/pixmaps/16x16/inputdialog.png
 share/gnome/glade3/pixmaps/16x16/label.png
 share/gnome/glade3/pixmaps/16x16/layout.png
+share/gnome/glade3/pixmaps/16x16/linkbutton.png
 share/gnome/glade3/pixmaps/16x16/list.png
 share/gnome/glade3/pixmaps/16x16/listitem.png
 share/gnome/glade3/pixmaps/16x16/menu.png
@ -170,10 +175,14 @@ share/gnome/glade3/pixmaps/16x16/menutoolbutton.png
 share/gnome/glade3/pixmaps/16x16/messagedialog.png
 share/gnome/glade3/pixmaps/16x16/notebook.png
 share/gnome/glade3/pixmaps/16x16/optionmenu.png
+share/gnome/glade3/pixmaps/16x16/pagesetupdialog.png
+share/gnome/glade3/pixmaps/16x16/printdialog.png
 share/gnome/glade3/pixmaps/16x16/progressbar.png
 share/gnome/glade3/pixmaps/16x16/radiobutton.png
 share/gnome/glade3/pixmaps/16x16/radiomenuitem.png
 share/gnome/glade3/pixmaps/16x16/radiotoolbutton.png
+share/gnome/glade3/pixmaps/16x16/recentchooser.png
+share/gnome/glade3/pixmaps/16x16/recentchooserdialog.png
 share/gnome/glade3/pixmaps/16x16/ruler.png
 share/gnome/glade3/pixmaps/16x16/scrolledwindow.png
 share/gnome/glade3/pixmaps/16x16/separatormenuitem.png
@ -202,6 +211,7 @@ share/gnome/glade3/pixmaps/22x22/accellabel.png
 share/gnome/glade3/pixmaps/22x22/alignment.png
 share/gnome/glade3/pixmaps/22x22/arrow.png
 share/gnome/glade3/pixmaps/22x22/aspectframe.png
+share/gnome/glade3/pixmaps/22x22/assistant.png
 %%GNOME:%%share/gnome/glade3/pixmaps/22x22/bonobodock.png
 %%GNOME:%%share/gnome/glade3/pixmaps/22x22/bonobodockitem.png
 share/gnome/glade3/pixmaps/22x22/button.png
@ -266,6 +276,7 @@ share/gnome/glade3/pixmaps/22x22/imagemenuitem.png
 share/gnome/glade3/pixmaps/22x22/inputdialog.png
 share/gnome/glade3/pixmaps/22x22/label.png
 share/gnome/glade3/pixmaps/22x22/layout.png
+share/gnome/glade3/pixmaps/22x22/linkbutton.png
 share/gnome/glade3/pixmaps/22x22/list.png
 share/gnome/glade3/pixmaps/22x22/listitem.png
 share/gnome/glade3/pixmaps/22x22/menu.png
@ -275,10 +286,14 @@ share/gnome/glade3/pixmaps/22x22/menutoolbutton.png
 share/gnome/glade3/pixmaps/22x22/messagedialog.png
 share/gnome/glade3/pixmaps/22x22/notebook.png
 share/gnome/glade3/pixmaps/22x22/optionmenu.png
+share/gnome/glade3/pixmaps/22x22/pagesetupdialog.png
+share/gnome/glade3/pixmaps/22x22/printdialog.png
 share/gnome/glade3/pixmaps/22x22/progressbar.png
 share/gnome/glade3/pixmaps/22x22/radiobutton.png
 share/gnome/glade3/pixmaps/22x22/radiomenuitem.png
 share/gnome/glade3/pixmaps/22x22/radiotoolbutton.png
+share/gnome/glade3/pixmaps/22x22/recentchooser.png
+share/gnome/glade3/pixmaps/22x22/recentchooserdialog.png
 share/gnome/glade3/pixmaps/22x22/ruler.png
 share/gnome/glade3/pixmaps/22x22/scrolledwindow.png
 share/gnome/glade3/pixmaps/22x22/separatormenuitem.png
@ -305,20 +320,51 @@ share/gnome/glade3/pixmaps/22x22/window.png
 share/gnome/glade3/pixmaps/devhelp.png
 share/gnome/glade3/pixmaps/plus.png
 share/gnome/glade3/pixmaps/selector.png
+share/gnome/help/glade/C/figures/main-window.png
+share/gnome/help/glade/C/glade.xml
+share/gnome/help/glade/C/legal.xml
+share/gnome/help/glade/bg/figures/main-window.png
+share/gnome/help/glade/bg/glade.xml
+share/gnome/help/glade/bg/legal.xml
+share/gnome/help/glade/en_GB/figures/main-window.png
+share/gnome/help/glade/en_GB/glade.xml
+share/gnome/help/glade/en_GB/legal.xml
+share/gnome/help/glade/sv/figures/main-window.png
+share/gnome/help/glade/sv/glade.xml
+share/gnome/help/glade/sv/legal.xml
+share/gnome/omf/glade/glade-C.omf
+share/gnome/omf/glade/glade-bg.omf
+share/gnome/omf/glade/glade-en_GB.omf
+share/gnome/omf/glade/glade-sv.omf
+share/icons/hicolor/16x16/apps/glade-3.png
+share/icons/hicolor/22x22/apps/glade-3.png
+share/icons/hicolor/24x24/apps/glade-3.png
+share/icons/hicolor/32x32/apps/glade-3.png
 share/icons/hicolor/48x48/apps/glade-3.png
+share/icons/hicolor/scalable/apps/glade-3.svg
 share/locale/ar/LC_MESSAGES/glade3.mo
 share/locale/az/LC_MESSAGES/glade3.mo
+share/locale/bg/LC_MESSAGES/glade3.mo
+share/locale/ca/LC_MESSAGES/glade3.mo
 share/locale/da/LC_MESSAGES/glade3.mo
+share/locale/de/LC_MESSAGES/glade3.mo
+share/locale/el/LC_MESSAGES/glade3.mo
 share/locale/en_CA/LC_MESSAGES/glade3.mo
 share/locale/en_GB/LC_MESSAGES/glade3.mo
 share/locale/es/LC_MESSAGES/glade3.mo
 share/locale/fr/LC_MESSAGES/glade3.mo
 share/locale/gl/LC_MESSAGES/glade3.mo
+share/locale/hu/LC_MESSAGES/glade3.mo
+share/locale/it/LC_MESSAGES/glade3.mo
 share/locale/ja/LC_MESSAGES/glade3.mo
 share/locale/ko/LC_MESSAGES/glade3.mo
+share/locale/lt/LC_MESSAGES/glade3.mo
+share/locale/mk/LC_MESSAGES/glade3.mo
+share/locale/ml/LC_MESSAGES/glade3.mo
 share/locale/ms/LC_MESSAGES/glade3.mo
 share/locale/nb/LC_MESSAGES/glade3.mo
 share/locale/nn/LC_MESSAGES/glade3.mo
+share/locale/pa/LC_MESSAGES/glade3.mo
 share/locale/pl/LC_MESSAGES/glade3.mo
 share/locale/pt/LC_MESSAGES/glade3.mo
 share/locale/pt_BR/LC_MESSAGES/glade3.mo
@ -326,12 +372,23 @@ share/locale/ru/LC_MESSAGES/glade3.mo
 share/locale/sk/LC_MESSAGES/glade3.mo
 share/locale/sv/LC_MESSAGES/glade3.mo
 share/locale/ta/LC_MESSAGES/glade3.mo
+share/locale/th/LC_MESSAGES/glade3.mo
 share/locale/tr/LC_MESSAGES/glade3.mo
 share/locale/uk/LC_MESSAGES/glade3.mo
 share/locale/vi/LC_MESSAGES/glade3.mo
 share/locale/zh_CN/LC_MESSAGES/glade3.mo
 share/locale/zh_HK/LC_MESSAGES/glade3.mo
 share/locale/zh_TW/LC_MESSAGES/glade3.mo
+@dirrm share/gnome/omf/glade
+@dirrm share/gnome/help/glade/sv/figures
+@dirrm share/gnome/help/glade/sv
+@dirrm share/gnome/help/glade/en_GB/figures
+@dirrm share/gnome/help/glade/en_GB
+@dirrm share/gnome/help/glade/bg/figures
+@dirrm share/gnome/help/glade/bg
+@dirrm share/gnome/help/glade/C/figures
+@dirrm share/gnome/help/glade/C
+@dirrm share/gnome/help/glade
@dirrm share/gnome/glade3/pixmaps/22x22
@dirrm share/gnome/glade3/pixmaps/16x16
@dirrm share/gnome/glade3/pixmaps
@ -339,8 +396,9 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
@dirrm share/gnome/glade3
@dirrm %%DOCSDIR%%
@dirrm lib/glade3/modules
+@dirrm lib/glade3/bindings
@dirrm lib/glade3
-@dirrm include/libgladeui-1.0/libgladeui
+@dirrm include/libgladeui-1.0/gladeui
@dirrm include/libgladeui-1.0
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@ -364,3 +422,7 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
@dirrmtry share/locale/ko
@dirrmtry share/locale/gl/LC_MESSAGES
@dirrmtry share/locale/gl
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@ -3,11 +3,11 @@
 # Whom:                 		Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glibmm/Makefile,v 1.37 2006/09/29 20:47:23 ahze Exp $
+#   $MCom: ports/devel/glibmm/Makefile,v 1.39 2006/12/30 18:56:48 marcus Exp $
 #

 PORTNAME=	glibmm
-PORTVERSION=	2.12.6
+PORTVERSION=	2.13.3
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.12.6.tar.bz2) = e078ea7f710233e47e18e4cafbb61be5
-SHA256 (gnome2/glibmm-2.12.6.tar.bz2) = e231115fd032d7fb6da3332b2901abfcdde100f24f221aa386a076a952734347
-SIZE (gnome2/glibmm-2.12.6.tar.bz2) = 2339291
+MD5 (gnome2/glibmm-2.13.3.tar.bz2) = c4606b5e3d960d64c34580ca5119aec3
+SHA256 (gnome2/glibmm-2.13.3.tar.bz2) = bb2a621b92f4f0c1b1d314174a596e001e63694d71d154a00e1dfa6bd770f14d
+SIZE (gnome2/glibmm-2.13.3.tar.bz2) = 3980993
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@ -16,6 +16,7 @@ include/glibmm-%%API_VERSION%%/glibmm/i18n.h
 include/glibmm-%%API_VERSION%%/glibmm/init.h
 include/glibmm-%%API_VERSION%%/glibmm/interface.h
 include/glibmm-%%API_VERSION%%/glibmm/iochannel.h
+include/glibmm-%%API_VERSION%%/glibmm/keyfile.h
 include/glibmm-%%API_VERSION%%/glibmm/listhandle.h
 include/glibmm-%%API_VERSION%%/glibmm/main.h
 include/glibmm-%%API_VERSION%%/glibmm/markup.h
@ -32,6 +33,7 @@ include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/fileutils_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/interface_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/iochannel_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/keyfile_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/markup_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/module_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/object_p.h
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@ -3,23 +3,25 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/devel/gnome-build/Makefile,v 1.1 2007/02/12 05:30:37 mezz Exp $
 #

 PORTNAME=	gnome-build
-PORTVERSION=	0.1.3
+PORTVERSION=	0.1.5
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.1
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+DIST_SUBDIR=	gnome2

 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME Build Framework (GBF)

-LIB_DEPENDS=	gdl-1.0:${PORTSDIR}/x11-toolkits/gdl
+LIB_DEPENDS=	gdl-gnome-1.0:${PORTSDIR}/x11-toolkits/gdl

+USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui gnomevfs2
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
@ -30,12 +32,4 @@ CONFIGURE_ARGS=	--enable-compile-warnings=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lgnuregex"

-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500000
-EXTRA_PATCHES+=	${FILESDIR}/current-src_backends_libgbf_am_gbf-am-project.c
-.elif ${ARCH} != "i386"
-EXTRA_PATCHES+=	${FILESDIR}/stable-src_backends_libgbf_am_gbf-am-project.c
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/gnome-build/distinfo
+++ b/devel/gnome-build/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome-build-0.1.3.tar.bz2) = 7a879bfa906036c8546cea88eb6fe793
-SHA256 (gnome-build-0.1.3.tar.bz2) = 817d99a70f661b44186eac34d3cf8620df35f70373f0f24e7d677cb30073bb05
-SIZE (gnome-build-0.1.3.tar.bz2) = 444539
+MD5 (gnome2/gnome-build-0.1.5.tar.bz2) = 871521c7a78a2a0e6b684685e7925e8f
+SHA256 (gnome2/gnome-build-0.1.5.tar.bz2) = 5c329395da51353d5259fc64b5be9831afa5bbcecc5c28c1f7986368a316f50b
+SIZE (gnome2/gnome-build-0.1.5.tar.bz2) = 460191
--- a/devel/gnome-build/files/current-src_backends_libgbf_am_gbf-am-project.c
+++ b/devel/gnome-build/files/current-src_backends_libgbf_am_gbf-am-project.c
@ -1,11 +0,0 @@
--- src/backends/libgbf_am/gbf-am-project.c.orig	Fri May  2 06:12:51 2003
-+++ src/backends/libgbf_am/gbf-am-project.c	Sat Jan 31 13:22:04 2004
-@@ -1750,7 +1750,7 @@
- 
- 		switch (status) {
- 		    case G_IO_STATUS_NORMAL:
-			    DEBUG (g_message ("wrote %d bytes", bytes_written));
-+			    DEBUG (g_message ("wrote %zu bytes", bytes_written));
- 			    
- 			    if (data->input.length < data->input.size) {
- 				    /* don't remove the source */
--- a/devel/gnome-build/files/stable-src_backends_libgbf_am_gbf-am-project.c
+++ b/devel/gnome-build/files/stable-src_backends_libgbf_am_gbf-am-project.c
@ -1,11 +0,0 @@
--- src/backends/libgbf_am/gbf-am-project.c.orig	Fri May  2 06:12:51 2003
-+++ src/backends/libgbf_am/gbf-am-project.c	Sat Jan 31 13:22:04 2004
-@@ -1750,7 +1750,7 @@
- 
- 		switch (status) {
- 		    case G_IO_STATUS_NORMAL:
-			    DEBUG (g_message ("wrote %d bytes", bytes_written));
-+			    DEBUG (g_message ("wrote %lu bytes", bytes_written));
- 			    
- 			    if (data->input.length < data->input.size) {
- 				    /* don't remove the source */
--- a/devel/gnome-build/pkg-plist
+++ b/devel/gnome-build/pkg-plist
@ -20,8 +20,8 @@ lib/gnome-build-1.0/backends/libgbf-mkfile.so.0
 lib/libgbf-1.la
 lib/libgbf-1.so
 lib/libgbf-1.so.0
-lib/libgbf-widgets-1.so
 lib/libgbf-widgets-1.la
+lib/libgbf-widgets-1.so
 lib/libgbf-widgets-1.so.0
 libdata/pkgconfig/gnome-build-1.0.pc
 share/gnome/gnome-build/GBF/AmFiles.pm
@ -76,3 +76,31 @@ share/locale/zh_CN/LC_MESSAGES/gbf-1.mo
@dirrm lib/gnome-build-1.0
@dirrm include/gnome-build-1.0/gbf
@dirrm include/gnome-build-1.0
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@ -3,11 +3,11 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.160 2006/10/07 15:04:44 marcus Exp $
+#   $MCom: ports/devel/gnome-vfs/Makefile,v 1.167 2007/03/13 13:02:20 ahze Exp $
 #

 PORTNAME=	gnome-vfs
-PORTVERSION=	2.16.3
+PORTVERSION=	2.18.0.1
 PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-vfs-2.16.3.tar.bz2) = 586d6fe3740385c000a864d5e2cf8215
-SHA256 (gnome2/gnome-vfs-2.16.3.tar.bz2) = 657df4d40dd1c8cbc9a266b9f38fea36019ef8a917eafcd3c38c840b8e9c7777
-SIZE (gnome2/gnome-vfs-2.16.3.tar.bz2) = 1900424
+MD5 (gnome2/gnome-vfs-2.18.0.1.tar.bz2) = 0b7a6ab495c0d94c3db00a7b0321adbf
+SHA256 (gnome2/gnome-vfs-2.18.0.1.tar.bz2) = 9e881e9f9ea4fb8d1d55c804b55829ac3b349b0b8a5c11e66dee44898acc3227
+SIZE (gnome2/gnome-vfs-2.18.0.1.tar.bz2) = 1830575
--- a/devel/gnome-vfs/files/patch-configure
+++ b/devel/gnome-vfs/files/patch-configure
@ -1,6 +1,15 @@
--- configure.orig	Tue Nov  7 04:08:31 2006
-+++ configure	Mon Nov 20 10:52:37 2006
-@@ -21984,6 +21984,8 @@
+--- configure.orig	Mon Feb 12 14:15:37 2007
+++ configure	Mon Feb 12 14:15:37 2007
+@@ -5708,7 +5708,7 @@ fi
+ 
+ 
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+-		  inttypes.h stdint.h unistd.h
+		  inttypes.h stdint.h unistd.h sys/sysmacros.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+@@ -22101,6 +22101,8 @@ echo $ECHO_N "checking for LC_MESSAGES..
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@ -9,7 +18,7 @@
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
-@@ -22030,6 +22032,7 @@
+@@ -22147,6 +22149,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.err conftest.$ac_objext \
       conftest$ac_exeext conftest.$ac_ext
@ -17,7 +26,7 @@
 fi
 echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
-@@ -23495,6 +23498,7 @@
+@@ -23612,6 +23615,7 @@ if test `eval echo '${'$as_ac_var'}'` = 
   cat >>confdefs.h <<_ACEOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
@ -25,16 +34,7 @@
  have_ngettext=yes
 else
   echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-@@ -24892,7 +24896,7 @@
- 
- 
- 
-for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h
-+for ac_header in mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h sys/mntctl.h sys/vfs.h sys/vmount.h sys/sysctl.h fstab.h fnmatch.h sys/sysmacros.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -33245,7 +33249,7 @@
+@@ -33364,7 +33368,7 @@ if test "${openssl_libs+set}" = set; the
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@ -43,7 +43,7 @@
 		cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
-@@ -33543,7 +33547,7 @@
+@@ -33662,7 +33666,7 @@ if test "${openssl_libs+set}" = set; the
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
@ -52,23 +52,3 @@
 		cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
-@@ -39124,6 +39128,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/statfs.h>
- #include <sys/fstyp.h>
- _ACEOF
-@@ -39165,6 +39172,9 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/statfs.h>
- #include <sys/vmount.h>
- _ACEOF
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-address.c
@ -1,10 +0,0 @@
--- libgnomevfs/gnome-vfs-address.c.orig	Wed Apr 12 10:16:28 2006
-+++ libgnomevfs/gnome-vfs-address.c	Thu Apr 20 09:52:12 2006
-@@ -32,6 +32,7 @@
- #include <sys/types.h>
- 
- #ifndef G_OS_WIN32
-+#include <sys/socket.h>
- #include <sys/select.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-hal-mounts.c
@ -1,15 +1,5 @@
 --- libgnomevfs/gnome-vfs-hal-mounts.c.orig	Mon Aug  7 04:16:27 2006
 +++ libgnomevfs/gnome-vfs-hal-mounts.c	Sun Sep 17 17:39:48 2006
-@@ -32,7 +32,9 @@
- #include <stdlib.h>
- #include <string.h>
- #include <sys/stat.h>
-+#ifdef HAVE_SYS_SYSMACROS_H
- #include <sys/sysmacros.h>
-+#endif
- #include <sys/types.h>
- #include <unistd.h>
- #include <limits.h>
@@ -627,20 +629,30 @@ _hal_volume_policy_check (GnomeVFSVolume
 		"/",
 		"/bin",
--- a/Show More
+++ b/Show More