Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/. This commit represents work done by adamw, bland, and myself as well as many other contributers: Koop Mast <einekoai@chello.nl> Akifyev Sergey <asa@gascom.ru> Franz Klammer <klammer@webonaut.com> Øyvind Kolbu <oyvind@kebab.gaffel.nu> Thomas E. Zander <riggs@rrr.de> Jeremy Messenger <mezz7@cox.net> Without these contirbuters, and our faithful users, GNOME 2.4.0 would not be possible. Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as general FAQs and documentation (GNOME 2.4 updates to be posted soon). The best way to upgrade so that you get all shared library dependencies is: portupgrade -rf -m BATCH=yes atk portupgrade -R -m BATCH=yes gnome2 Approved by: portmgr (kris, will, myself implicitly) Requested by: re as well as many other users
svn path=/head/; revision=89023
2025-01-08 06:48:28 +00:00 · 2003-09-18 06:49:37 +00:00 · 2003-09-18 06:49:37 +00:00 · 9c0caae1c2 · 2021-03-31 03:12:20 +00:00
commit 9c0caae1c2
parent 27d17afba2
358 changed files with 4617 additions and 5539 deletions
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@ -6,10 +6,10 @@
 #

 PORTNAME=	at-spi
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3.7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.3
 DIST_SUBDIR=	gnome2

 MAINTAINER=	gnome@FreeBSD.org
--- a/accessibility/at-spi/distinfo
+++ b/accessibility/at-spi/distinfo
@ -1 +1 @@
-MD5 (gnome2/at-spi-1.2.1.tar.bz2) = 562620310d9150e4803a275311f0088d
+MD5 (gnome2/at-spi-1.3.7.tar.bz2) = c5ee8c9ae592c547ac557fa58003b021
--- a/accessibility/at-spi/files/patch-atk-bridge_Makefile.in
+++ b/accessibility/at-spi/files/patch-atk-bridge_Makefile.in
@ -0,0 +1,11 @@
+--- atk-bridge/Makefile.in.orig	Sat Apr 12 01:06:28 2003
+++ atk-bridge/Makefile.in	Sat Apr 12 01:06:48 2003
+@@ -147,7 +147,7 @@
+ 
+ LDFLAGS = @LDFLAGS@ -no-undefined -module -avoid-version
+ 
+-libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) $(top_builddir)/libspi/libspi.la
+libatk_bridge_la_LIBADD = $(ATK_BRIDGE_LIBS) -L$(top_builddir)/libspi/.libs $(top_builddir)/libspi/libspi.la
+ 
+ CFLAGS = @CFLAGS@ $(ATK_BRIDGE_CFLAGS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- a/accessibility/at-spi/files/patch-libspi_Makefile.in
+++ b/accessibility/at-spi/files/patch-libspi_Makefile.in
@ -0,0 +1,11 @@
+--- libspi/Makefile.in.orig	Fri May  2 13:36:07 2003
+++ libspi/Makefile.in	Fri May  2 13:36:37 2003
+@@ -539,7 +539,7 @@
+ mostlyclean distclean maintainer-clean
+ 
+ 
+-$(top_srcdir)/libspi/accessible.c $(top_srcdir)/libspi/base.h $(top_srcdir)/libspi/keystrokelistener.h $(top_srcdir)/libspi/libspi.h $(top_srcdir)/libspi/listener.h $(top_srcdir)/libspi/remoteobject.h : Accessibility.h
+accessible.c base.h keystrokelistener.h libspi.h listener.h remoteobject.h : Accessibility.h
+ 
+ $(IDL_OUT) Accessibility-imodule.c : $(IDL_DEPS) $(ORBIT_IDL)
+ 	$(ORBIT_IDL) -D__ACCESSIBILITY_COMPILATION__ $(IDLFLAGS) $(top_srcdir)/idl/Accessibility.idl
--- a/accessibility/at-spi/files/patch-registryd_Makefile.in
+++ b/accessibility/at-spi/files/patch-registryd_Makefile.in
@ -0,0 +1,11 @@
+--- registryd/Makefile.in.orig	Fri Aug  8 12:15:34 2003
+++ registryd/Makefile.in	Fri Aug  8 12:20:05 2003
+@@ -150,7 +150,7 @@
+ at_spi_registryd_SOURCES =  	desktop.c			desktop.h			deviceeventcontroller.c		deviceeventcontroller.h		registry-main.c			registry.c			registry.h
+ 
+ 
+-LDADD = $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) 
+LDADD = -L$(top_builddir)/libspi/.libs $(top_builddir)/libspi/libspi.la $(X_LIBS) $(XTST_LIBS) $(XEVIE_LIBS) $(REGISTRYD_LIBS) 
+ 
+ serverinfodir = $(prefix)/libdata/bonobo/servers
+ serverinfo_DATA = Accessibility_Registry.server
--- a/accessibility/at-spi/pkg-plist
+++ b/accessibility/at-spi/pkg-plist
@ -23,42 +23,41 @@ include/at-spi-1.0/libspi/relation.h
 include/at-spi-1.0/libspi/remoteobject.h
 include/at-spi-1.0/libspi/selection.h
 include/at-spi-1.0/libspi/stateset.h
+include/at-spi-1.0/libspi/streamablecontent.h
 include/at-spi-1.0/libspi/table.h
 include/at-spi-1.0/libspi/text.h
 include/at-spi-1.0/libspi/value.h
 lib/libcspi.a
 lib/libcspi.so
-lib/libcspi.so.0
+lib/libcspi.so.9
 lib/libspi.a
 lib/libspi.so
-lib/libspi.so.0
+lib/libspi.so.9
 lib/gtk-2.0/modules/libatk-bridge.so
 lib/orbit-2.0/Accessibility_module.so
 libdata/bonobo/servers/Accessibility_Registry.server
 libdata/pkgconfig/cspi-1.0.pc
 libdata/pkgconfig/libspi-1.0.pc
 libexec/at-spi-registryd
-share/doc/at-spi-cspi/at-spi-cspi-accessible-objects.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleaction-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleapplication-api.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblecomponent-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleeditabletext-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblehyperlink-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblehypertext-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleimage-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblerelations-and-relationsets.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibleselection-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibletable-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessibletext-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-accessiblevalue-interface.html
-share/doc/at-spi-cspi/at-spi-cspi-event-listener-support.html
-share/doc/at-spi-cspi/at-spi-cspi-registry-queries.html
-share/doc/at-spi-cspi/at-spi-cspi-spi-main-loop-and-initialization.html
-share/doc/at-spi-cspi/at-spi-cspi-state-and-statesets.html
-share/doc/at-spi-cspi/book1.html
-share/doc/at-spi-cspi/c5968.html
-share/doc/at-spi-cspi/c7152.html
-share/doc/at-spi-cspi/index.sgml
+share/doc/at-spi-cspi/at-spi-cspi-Accessible-Objects.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleAction-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleApplication-API.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleComponent-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleEditableText-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleHyperlink-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleHypertext-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleImage-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleRelations-and-RelationSets.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleSelection-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleTable-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleText-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-AccessibleValue-Interface.html
+share/doc/at-spi-cspi/at-spi-cspi-Event-Listener-Support.html
+share/doc/at-spi-cspi/at-spi-cspi-Registry-queries.html
+share/doc/at-spi-cspi/at-spi-cspi-SPI-main-loop-and-initialization.html
+share/doc/at-spi-cspi/at-spi-cspi-State-and-StateSets.html
+share/doc/at-spi-cspi/ch05.html
+share/doc/at-spi-cspi/index.html
 share/doc/at-spi-cspi/spi-accessible.html
 share/doc/at-spi-cspi/spi-application.html
 share/doc/at-spi-cspi/spi-component.html
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@ -6,16 +6,11 @@
 #

 PORTNAME=	atk
-PORTVERSION=	1.2.4
+PORTVERSION=	1.4.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
-#MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
-#		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
-#		http://www.ameth.org/gimp/%SUBDIR%/ \
-#		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-#MASTER_SITE_SUBDIR=	gtk/v1.3
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
 DIST_SUBDIR=	gnome2

 MAINTAINER=	gnome@FreeBSD.org
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@ -1 +1 @@
-MD5 (gnome2/atk-1.2.4.tar.bz2) = 2d6d50df31abe0e8892b5d3e7676a02d
+MD5 (gnome2/atk-1.4.0.tar.bz2) = e501dde880fb2bbe77e428cfa2ee25f6
--- a/accessibility/atk/pkg-descr
+++ b/accessibility/atk/pkg-descr
@ -1,3 +1,12 @@
-GNOME accessibility toolkit (ATK).
+Accessibility means helping people with disabilities to participate in
+substantial life activities. That includes work, and the use of services,
+products, and information. GNOME includes libraries and a support framework
+that allow people with disabilities to utilize all of the functionality of the
+GNOME user environment.
+
+The GNOME Accessibility Toolkit (ATK) describes a set of interfaces that need
+to be implemented by GUI components to make them accessible. The interfaces are
+toolkit-independent-- implementations could be written for any widget set, such
+as GTK, Motif or Qt.

 WWW: http://developer.gnome.org/projects/gap/
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@ -26,38 +26,39 @@ include/atk-1.0/atk/atkutil.h
 include/atk-1.0/atk/atkvalue.h
 lib/libatk-1.0.a
 lib/libatk-1.0.so
-lib/libatk-1.0.so.200
+lib/libatk-1.0.so.400
 libdata/pkgconfig/atk.pc
-share/doc/atk/atk-atkstate.html
-share/doc/atk/atk.html
-share/doc/atk/atkaction.html
-share/doc/atk/atkcomponent.html
-share/doc/atk/atkdocument.html
-share/doc/atk/atkeditabletext.html
-share/doc/atk/atkgobjectaccessible.html
-share/doc/atk/atkhyperlink.html
-share/doc/atk/atkhypertext.html
-share/doc/atk/atkimage.html
-share/doc/atk/atknoopobject.html
-share/doc/atk/atknoopobjectfactory.html
-share/doc/atk/atkobject.html
-share/doc/atk/atkobjectfactory.html
-share/doc/atk/atkregistry.html
-share/doc/atk/atkrelation.html
-share/doc/atk/atkrelationset.html
-share/doc/atk/atkselection.html
-share/doc/atk/atkstateset.html
-share/doc/atk/atkstreamablecontent.html
-share/doc/atk/atktable.html
-share/doc/atk/atktext.html
-share/doc/atk/atkutil.html
-share/doc/atk/atkvalue.html
-share/doc/atk/book1.html
-share/doc/atk/home.png
-share/doc/atk/index.sgml
-share/doc/atk/left.png
-share/doc/atk/right.png
-share/doc/atk/up.png
+%%DOCSDIR%%/AtkAction.html
+%%DOCSDIR%%/AtkComponent.html
+%%DOCSDIR%%/AtkDocument.html
+%%DOCSDIR%%/AtkEditableText.html
+%%DOCSDIR%%/AtkGObjectAccessible.html
+%%DOCSDIR%%/AtkHyperlink.html
+%%DOCSDIR%%/AtkHypertext.html
+%%DOCSDIR%%/AtkImage.html
+%%DOCSDIR%%/AtkNoOpObject.html
+%%DOCSDIR%%/AtkNoOpObjectFactory.html
+%%DOCSDIR%%/AtkObject.html
+%%DOCSDIR%%/AtkObjectFactory.html
+%%DOCSDIR%%/AtkRegistry.html
+%%DOCSDIR%%/AtkRelation.html
+%%DOCSDIR%%/AtkRelationSet.html
+%%DOCSDIR%%/AtkSelection.html
+%%DOCSDIR%%/AtkStateSet.html
+%%DOCSDIR%%/AtkStreamableContent.html
+%%DOCSDIR%%/AtkTable.html
+%%DOCSDIR%%/AtkText.html
+%%DOCSDIR%%/AtkUtil.html
+%%DOCSDIR%%/AtkValue.html
+%%DOCSDIR%%/atk-AtkState.html
+%%DOCSDIR%%/atk.devhelp
+%%DOCSDIR%%/atk.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/up.png
 share/locale/am/LC_MESSAGES/atk10.mo
 share/locale/az/LC_MESSAGES/atk10.mo
 share/locale/be/LC_MESSAGES/atk10.mo
@ -65,6 +66,7 @@ share/locale/bg/LC_MESSAGES/atk10.mo
 share/locale/bn/LC_MESSAGES/atk10.mo
 share/locale/ca/LC_MESSAGES/atk10.mo
 share/locale/cs/LC_MESSAGES/atk10.mo
+share/locale/cy/LC_MESSAGES/atk10.mo
 share/locale/da/LC_MESSAGES/atk10.mo
 share/locale/de/LC_MESSAGES/atk10.mo
 share/locale/el/LC_MESSAGES/atk10.mo
@ -74,6 +76,7 @@ share/locale/es/LC_MESSAGES/atk10.mo
 share/locale/fa/LC_MESSAGES/atk10.mo
 share/locale/fi/LC_MESSAGES/atk10.mo
 share/locale/fr/LC_MESSAGES/atk10.mo
+share/locale/ga/LC_MESSAGES/atk10.mo
 share/locale/he/LC_MESSAGES/atk10.mo
 share/locale/hi/LC_MESSAGES/atk10.mo
 share/locale/hu/LC_MESSAGES/atk10.mo
@ -83,11 +86,13 @@ share/locale/it/LC_MESSAGES/atk10.mo
 share/locale/ja/LC_MESSAGES/atk10.mo
 share/locale/kn/LC_MESSAGES/atk10.mo
 share/locale/ko/LC_MESSAGES/atk10.mo
+share/locale/li/LC_MESSAGES/atk10.mo
 share/locale/lv/LC_MESSAGES/atk10.mo
 share/locale/mk/LC_MESSAGES/atk10.mo
 share/locale/ml/LC_MESSAGES/atk10.mo
 share/locale/mn/LC_MESSAGES/atk10.mo
 share/locale/ms/LC_MESSAGES/atk10.mo
+share/locale/ne/LC_MESSAGES/atk10.mo
 share/locale/nl/LC_MESSAGES/atk10.mo
 share/locale/no/LC_MESSAGES/atk10.mo
 share/locale/pl/LC_MESSAGES/atk10.mo
@ -108,6 +113,6 @@ share/locale/vi/LC_MESSAGES/atk10.mo
 share/locale/yi/LC_MESSAGES/atk10.mo
 share/locale/zh_CN/LC_MESSAGES/atk10.mo
 share/locale/zh_TW/LC_MESSAGES/atk10.mo
-@dirrm share/doc/atk
+@dirrm %%DOCSDIR%%
@dirrm include/atk-1.0/atk
@dirrm include/atk-1.0
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@ -6,10 +6,10 @@
 #

 PORTNAME=	gail
-PORTVERSION=	1.2.2
+PORTVERSION=	1.4.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
 DIST_SUBDIR=	gnome2

 MAINTAINER=	gnome@FreeBSD.org
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@ -1 +1 @@
-MD5 (gnome2/gail-1.2.2.tar.bz2) = cace76d052501c10f57c145618205509
+MD5 (gnome2/gail-1.4.0.tar.bz2) = 6eba35f812cf007da332a9fef4865e71
--- a/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in
+++ b/accessibility/gail/files/patch-docs_reference_libgail-util_Makefile.in
@ -0,0 +1,11 @@
+--- docs/reference/libgail-util/Makefile.in.orig	Thu May 15 14:45:49 2003
+++ docs/reference/libgail-util/Makefile.in	Thu May 15 14:47:43 2003
+@@ -299,8 +299,6 @@
+ 	echo '-- Installing '$$i ; \
+ 	$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
+ 	  done; \
+-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
+-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
+ 	fi)
+ 
+ #
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@ -8,9 +8,11 @@ lib/libgailutil.so
 lib/libgailutil.so.17
 libdata/pkgconfig/gail.pc
 share/doc/gail-libgail-util/book1.html
+share/doc/gail-libgail-util/gail-libgail-util-GailMisc.html
+share/doc/gail-libgail-util/gail-libgail-util-GailTextUtil.html
 share/doc/gail-libgail-util/gail-libgail-util-gailmisc.html
 share/doc/gail-libgail-util/gail-libgail-util-gailtextutil.html
-share/doc/gail-libgail-util/index.sgml
+share/doc/gail-libgail-util/index.html
 share/doc/gail-libgail-util/libgail-util-main.html
@dirrm share/doc/gail-libgail-util
@dirrm lib/gtk-2.0/modules
--- a/accessibility/gok/Makefile
+++ b/accessibility/gok/Makefile
@ -6,15 +6,16 @@
 #

 PORTNAME=	gok
-PORTVERSION=	0.7.5
-CATEGORIES=	sysutils gnome
+PORTVERSION=	0.8.2
+CATEGORIES=	sysutils gnome accessibility
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.7
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
 DIST_SUBDIR=	gnome2

 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME On-Screen Keyboard (GOK)

+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix libgnomeui atspi libwnck
 USE_REINPLACE=	yes
--- a/accessibility/gok/distinfo
+++ b/accessibility/gok/distinfo
@ -1 +1 @@
-MD5 (gnome2/gok-0.7.5.tar.gz) = 8ae32031b253371eb76be5f59c26bafd
+MD5 (gnome2/gok-0.8.2.tar.bz2) = 3b495c7b8f8e10e370246c95d75f58eb
--- a/accessibility/gok/files/patch-gok_gok-data.c
+++ b/accessibility/gok/files/patch-gok_gok-data.c
@ -1,12 +0,0 @@
--- gok/gok-data.c.orig	Mon Jun  2 21:49:16 2003
-+++ gok/gok-data.c	Mon Jun  2 21:49:26 2003
-@@ -707,8 +707,8 @@
-  */
- void gok_data_set_is_dock (GokDockType val)
- {
-	m_eDockType = val;
- 	gchar *typestring;
-+	m_eDockType = val;
- 	switch (val) {
- 	case GOK_DOCK_TOP:
- 	  typestring = "top";
--- a/accessibility/gok/pkg-plist
+++ b/accessibility/gok/pkg-plist
@ -19,6 +19,7 @@ etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/goksound2/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gok/layout/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gok/spy/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell/%gconf.xml
@ -39,65 +40,77 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/goksound2/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy/%gconf.xml
 etc/gconf/schemas/gok.schemas
 libdata/pkgconfig/gok-1.0.pc
-share/doc/gok/c4.html
-share/doc/gok/gok-arraylist.html
-share/doc/gok/gok-callbacks.html
-share/doc/gok/gok-command-common.html
-share/doc/gok/gok-command-edge-data.html
-share/doc/gok/gok-command-edge.html
-share/doc/gok/gok-command-graph.html
-share/doc/gok/gok-command-predictor.html
-share/doc/gok/gok-command-vertex-data.html
-share/doc/gok/gok-command-vertex.html
-share/doc/gok/gok-global.html
-share/doc/gok/gok-gok-action.html
-share/doc/gok/gok-gok-branchback-stack.html
-share/doc/gok/gok-gok-chunker.html
-share/doc/gok/gok-gok-control.html
-share/doc/gok/gok-gok-data.html
-share/doc/gok/gok-gok-editor.html
-share/doc/gok/gok-gok-feedback.html
-share/doc/gok/gok-gok-file-util.html
-share/doc/gok/gok-gok-gconf-keys.html
-share/doc/gok/gok-gok-gconf.html
-share/doc/gok/gok-gok-key.html
-share/doc/gok/gok-gok-keyboard.html
-share/doc/gok/gok-gok-keyslotter.html
-share/doc/gok/gok-gok-log-priv.html
-share/doc/gok/gok-gok-log-reader.html
-share/doc/gok/gok-gok-log.html
-share/doc/gok/gok-gok-modifier.html
-share/doc/gok/gok-gok-output.html
-share/doc/gok/gok-gok-page-accessmethod.html
-share/doc/gok/gok-gok-page-actions.html
-share/doc/gok/gok-gok-page-feedbacks.html
-share/doc/gok/gok-gok-page-keysizespace.html
-share/doc/gok/gok-gok-page-wordcomplete.html
-share/doc/gok/gok-gok-predictor.html
-share/doc/gok/gok-gok-scanner.html
-share/doc/gok/gok-gok-settings-dialog.html
-share/doc/gok/gok-gok-sound.html
-share/doc/gok/gok-gok-spy-priv.html
-share/doc/gok/gok-gok-spy.html
-share/doc/gok/gok-gok-word-complete.html
-share/doc/gok/gok-gok.html
-share/doc/gok/gok-gokbutton.html
-share/doc/gok/gok-gtkjoyswitch.html
-share/doc/gok/gok-interface.html
-share/doc/gok/gok-main.html
-share/doc/gok/gok-support.html
-share/doc/gok/gok-switchapi.html
-share/doc/gok/gok-word-complete.html
-share/doc/gok/index.html
-share/doc/gok/index.sgml
+%%DOCSDIR%%/c4.html
+%%DOCSDIR%%/gok-arraylist.html
+%%DOCSDIR%%/gok-callbacks.html
+%%DOCSDIR%%/gok-command-common.html
+%%DOCSDIR%%/gok-command-edge-data.html
+%%DOCSDIR%%/gok-command-edge.html
+%%DOCSDIR%%/gok-command-graph.html
+%%DOCSDIR%%/gok-command-predictor.html
+%%DOCSDIR%%/gok-command-vertex-data.html
+%%DOCSDIR%%/gok-command-vertex.html
+%%DOCSDIR%%/gok-global.html
+%%DOCSDIR%%/gok-gok-action.html
+%%DOCSDIR%%/gok-gok-branchback-stack.html
+%%DOCSDIR%%/gok-gok-chunker.html
+%%DOCSDIR%%/gok-gok-control.html
+%%DOCSDIR%%/gok-gok-data.html
+%%DOCSDIR%%/gok-gok-editor.html
+%%DOCSDIR%%/gok-gok-feedback.html
+%%DOCSDIR%%/gok-gok-file-util.html
+%%DOCSDIR%%/gok-gok-gconf-keys.html
+%%DOCSDIR%%/gok-gok-gconf.html
+%%DOCSDIR%%/gok-gok-key.html
+%%DOCSDIR%%/gok-gok-keyboard.html
+%%DOCSDIR%%/gok-gok-keyslotter.html
+%%DOCSDIR%%/gok-gok-log-priv.html
+%%DOCSDIR%%/gok-gok-log-reader.html
+%%DOCSDIR%%/gok-gok-log.html
+%%DOCSDIR%%/gok-gok-modifier.html
+%%DOCSDIR%%/gok-gok-output.html
+%%DOCSDIR%%/gok-gok-page-accessmethod.html
+%%DOCSDIR%%/gok-gok-page-actions.html
+%%DOCSDIR%%/gok-gok-page-feedbacks.html
+%%DOCSDIR%%/gok-gok-page-keysizespace.html
+%%DOCSDIR%%/gok-gok-page-wordcomplete.html
+%%DOCSDIR%%/gok-gok-predictor.html
+%%DOCSDIR%%/gok-gok-scanner.html
+%%DOCSDIR%%/gok-gok-settings-dialog.html
+%%DOCSDIR%%/gok-gok-sound.html
+%%DOCSDIR%%/gok-gok-spy-priv.html
+%%DOCSDIR%%/gok-gok-spy.html
+%%DOCSDIR%%/gok-gok-word-complete.html
+%%DOCSDIR%%/gok-gok.html
+%%DOCSDIR%%/gok-gokbutton.html
+%%DOCSDIR%%/gok-gtkjoyswitch.html
+%%DOCSDIR%%/gok-interface.html
+%%DOCSDIR%%/gok-main.html
+%%DOCSDIR%%/gok-support.html
+%%DOCSDIR%%/gok-switchapi.html
+%%DOCSDIR%%/gok-word-complete.html
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+share/gnome/applications/gok.desktop
+share/gnome/gok/East.png
 share/gnome/gok/Keyboard.kbd
+share/gnome/gok/NE.png
+share/gnome/gok/NW.png
+share/gnome/gok/North.png
+share/gnome/gok/SE.png
+share/gnome/gok/SW.png
+share/gnome/gok/South.png
+share/gnome/gok/West.png
 share/gnome/gok/alphabet.kbd
 share/gnome/gok/automatic-scanning.xam
 share/gnome/gok/dictionary.txt
 share/gnome/gok/direct-selection.xam
 share/gnome/gok/dwell-selection.xam
+share/gnome/gok/empty.png
+share/gnome/gok/gok.png
 share/gnome/gok/gok.rc
 share/gnome/gok/gok-controls.kbd
 share/gnome/gok/goklogo.png
@ -105,38 +118,60 @@ share/gnome/gok/goksound1.wav
 share/gnome/gok/goksound2.wav
 share/gnome/gok/inverse-scanning.xam
 share/gnome/gok/hide.kbd
+share/gnome/gok/latched.png
 share/gnome/gok/launcher.kbd
+share/gnome/gok/locked.png
 share/gnome/gok/main.kbd
 share/gnome/gok/manage.kbd
+share/gnome/gok/mouse.kbd
 share/gnome/gok/move-resize.kbd
+share/gnome/gok/quit.kbd
 share/gnome/gok/qwerty.kbd
+share/gnome/gok/small-empty.png
+share/gnome/gok/text-operations.kbd
 share/gnome/help/gok/C/gok.xml
 share/gnome/omf/gok/gok-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true
+share/gnome/pixmaps/gok.png
 share/locale/am/LC_MESSAGES/gok.mo
+share/locale/az/LC_MESSAGES/gok.mo
+share/locale/be/LC_MESSAGES/gok.mo
 share/locale/ca/LC_MESSAGES/gok.mo
 share/locale/cs/LC_MESSAGES/gok.mo
+share/locale/cy/LC_MESSAGES/gok.mo
 share/locale/da/LC_MESSAGES/gok.mo
 share/locale/de/LC_MESSAGES/gok.mo
+share/locale/el/LC_MESSAGES/gok.mo
 share/locale/es/LC_MESSAGES/gok.mo
 share/locale/fr/LC_MESSAGES/gok.mo
+share/locale/hi/LC_MESSAGES/gok.mo
 share/locale/it/LC_MESSAGES/gok.mo
 share/locale/ja/LC_MESSAGES/gok.mo
+share/locale/ko/LC_MESSAGES/gok.mo
+share/locale/mk/LC_MESSAGES/gok.mo
+share/locale/ml/LC_MESSAGES/gok.mo
+share/locale/ms/LC_MESSAGES/gok.mo
 share/locale/nl/LC_MESSAGES/gok.mo
 share/locale/no/LC_MESSAGES/gok.mo
+share/locale/pl/LC_MESSAGES/gok.mo
 share/locale/pt/LC_MESSAGES/gok.mo
 share/locale/pt_BR/LC_MESSAGES/gok.mo
+share/locale/sl/LC_MESSAGES/gok.mo
+share/locale/sq/LC_MESSAGES/gok.mo
 share/locale/sr/LC_MESSAGES/gok.mo
 share/locale/sr@Latn/LC_MESSAGES/gok.mo
 share/locale/sv/LC_MESSAGES/gok.mo
 share/locale/uk/LC_MESSAGES/gok.mo
 share/locale/vi/LC_MESSAGES/gok.mo
+share/locale/zh_CN/LC_MESSAGES/gok.mo
+share/locale/zh_TW/LC_MESSAGES/gok.mo
@dirrm share/gnome/omf/gok
@dirrm share/gnome/help/gok/C/figures
@dirrm share/gnome/help/gok/C
@dirrm share/gnome/help/gok
@dirrm share/gnome/gok
-@dirrm share/doc/gok
+@dirrm %%DOCSDIR%%
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/spy
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/layout
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/none
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/feedbacks/key_flashing
@ -157,6 +192,7 @@ share/locale/vi/LC_MESSAGES/gok.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions/dwell
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok/actions
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gok
+@dirrm etc/gconf/gconf.xml.defaults/apps/gok/spy
@dirrm etc/gconf/gconf.xml.defaults/apps/gok/layout
@dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/none
@dirrm etc/gconf/gconf.xml.defaults/apps/gok/feedbacks/key_flashing
@ -177,4 +213,4 @@ share/locale/vi/LC_MESSAGES/gok.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions/dwell
@dirrm etc/gconf/gconf.xml.defaults/apps/gok/actions
@dirrm etc/gconf/gconf.xml.defaults/apps/gok
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gok/gok-C.omf || /usr/bin/true
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@ -6,11 +6,11 @@
 #

 PORTNAME=	fileroller
-PORTVERSION=	2.2.5
+PORTVERSION=	2.4.0.1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/file-roller/2.2
+MASTER_SITE_SUBDIR=	sources/file-roller/2.4
 DISTNAME=	file-roller-${PORTVERSION}
 DIST_SUBDIR=	gnome2

@ -18,11 +18,13 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An archive manager for zip files, tar, etc

 RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha \
-		lzop:${PORTSDIR}/archivers/lzop
+		lzop:${PORTSDIR}/archivers/lzop \
+		zoo:${PORTSDIR}/archivers/zoo
 .if !exists(/usr/bin/bzip2)
 RUN_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
 .endif

+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@ -1 +1 @@
-MD5 (gnome2/file-roller-2.2.5.tar.gz) = 161aa4e9d7032d298115d0386635a9e9
+MD5 (gnome2/file-roller-2.4.0.1.tar.bz2) = d268975b20679bc6b8f4f88492e7bfdf
--- a/archivers/file-roller/files/patch-src_fr-command-tar.c
+++ b/archivers/file-roller/files/patch-src_fr-command-tar.c
@ -1,32 +1,24 @@
--- src/fr-command-tar.c.orig	Fri Aug  9 09:10:51 2002
-+++ src/fr-command-tar.c	Fri Oct 11 12:14:40 2002
-@@ -117,7 +117,7 @@
- {
- 	int   i;
- 	char *field;
-	int   n = 6;
-+	int   n = 8;
- 
- 	n--;
- 	field = eat_spaces (line);
-@@ -129,6 +129,10 @@
- 	return field;
+--- src/fr-command-tar.c.orig	Mon May 19 14:15:50 2003
+++ src/fr-command-tar.c	Tue May 20 20:43:39 2003
+@@ -83,6 +83,11 @@
+ 	return mktime (&tm);
 }
 
-+static char *months[] = { 
+static char *months[] = {
 +    "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
 +    "Nov", "Dec"
 +};
+
 
 static void
 process_line (char     *line, 
-@@ -138,15 +142,30 @@
- 	FRCommand  *comm = FR_COMMAND (data);
- 	char      **fields;
- 	char       *name_field;
-+	int        i;
-+	struct tm  tm = {0, };
-+	char      **time_fields;
+@@ -92,19 +97,34 @@
+ 	FRCommand   *comm = FR_COMMAND (data);
+ 	char       **fields;
+ 	const char  *name_field;
+	int          i;
+	struct tm    tm = {0, };
+	char       **time_fields;
 
 	g_return_if_fail (line != NULL);
 
@ -53,3 +45,8 @@
 
 	/* Full path */
 
+-	name_field = get_last_field (line, 6);
+	name_field = get_last_field (line, 8);
+ 	fields = g_strsplit (name_field, " -> ", 2);
+ 
+ 	if (fields[1] == NULL) {
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@ -10,10 +10,10 @@ etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui/%gconf.xml
 etc/gconf/schemas/file-roller.schemas
 lib/bonobo/libfile-roller-component.so
 libdata/bonobo/servers/File_Roller_Component.server
-%%PORTDOCS%%share/doc/fileroller/AUTHORS
-%%PORTDOCS%%share/doc/fileroller/NEWS
-%%PORTDOCS%%share/doc/fileroller/README
-%%PORTDOCS%%share/doc/fileroller/TODO
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/application-registry/file-roller.applications
 share/gnome/applications/file-roller.desktop
 share/gnome/file-roller/glade/file_roller.glade
@ -27,20 +27,29 @@ share/gnome/help/file-roller/ru/figures/fr-mainwindow.png
 share/gnome/help/file-roller/ru/figures/fr-prefs.png
 share/gnome/help/file-roller/ru/file-roller.xml
 share/gnome/help/file-roller/ru/legal.xml
+share/gnome/help/file-roller/uk/figures/fr-add-dialog.png
+share/gnome/help/file-roller/uk/figures/fr-extract.png
+share/gnome/help/file-roller/uk/figures/fr-mainwindow.png
+share/gnome/help/file-roller/uk/figures/fr-prefs.png
+share/gnome/help/file-roller/uk/file-roller.xml
+share/gnome/help/file-roller/uk/legal.xml
 share/gnome/mime-info/file-roller.keys
 share/gnome/mime-info/file-roller.mime
 share/gnome/omf/file-roller/file-roller-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-ru.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/file-roller/file-roller-uk.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/file-roller.png
 share/locale/am/LC_MESSAGES/file-roller.mo
-share/locale/ar/LC_MESSAGES/file-roller.mo
 share/locale/az/LC_MESSAGES/file-roller.mo
 share/locale/be/LC_MESSAGES/file-roller.mo
 share/locale/bg/LC_MESSAGES/file-roller.mo
+share/locale/bn/LC_MESSAGES/file-roller.mo
 share/locale/ca/LC_MESSAGES/file-roller.mo
 share/locale/cs/LC_MESSAGES/file-roller.mo
+share/locale/cy/LC_MESSAGES/file-roller.mo
 share/locale/da/LC_MESSAGES/file-roller.mo
 share/locale/de/LC_MESSAGES/file-roller.mo
 share/locale/el/LC_MESSAGES/file-roller.mo
@ -77,12 +86,15 @@ share/locale/sq/LC_MESSAGES/file-roller.mo
 share/locale/sr/LC_MESSAGES/file-roller.mo
 share/locale/sr@Latn/LC_MESSAGES/file-roller.mo
 share/locale/sv/LC_MESSAGES/file-roller.mo
+share/locale/th/LC_MESSAGES/file-roller.mo
 share/locale/tr/LC_MESSAGES/file-roller.mo
 share/locale/uk/LC_MESSAGES/file-roller.mo
 share/locale/vi/LC_MESSAGES/file-roller.mo
 share/locale/zh_CN/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/uk/figures
+@dirrm share/gnome/help/file-roller/uk
@dirrm share/gnome/help/file-roller/ru/figures
@dirrm share/gnome/help/file-roller/ru
@dirrm share/gnome/help/file-roller/C/figures
@ -90,7 +102,7 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/help/file-roller
@dirrm share/gnome/file-roller/glade
@dirrm share/gnome/file-roller
-%%PORTDOCS%%@dirrm share/doc/fileroller
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general
@ -99,5 +111,6 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/listing
@dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/general
@dirrm etc/gconf/gconf.xml.defaults/apps/file-roller
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@ -6,11 +6,11 @@
 #

 PORTNAME=	fileroller
-PORTVERSION=	2.2.5
+PORTVERSION=	2.4.0.1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/file-roller/2.2
+MASTER_SITE_SUBDIR=	sources/file-roller/2.4
 DISTNAME=	file-roller-${PORTVERSION}
 DIST_SUBDIR=	gnome2

@ -18,11 +18,13 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An archive manager for zip files, tar, etc

 RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha \
-		lzop:${PORTSDIR}/archivers/lzop
+		lzop:${PORTSDIR}/archivers/lzop \
+		zoo:${PORTSDIR}/archivers/zoo
 .if !exists(/usr/bin/bzip2)
 RUN_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
 .endif

+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
--- a/archivers/fileroller/distinfo
+++ b/archivers/fileroller/distinfo
@ -1 +1 @@
-MD5 (gnome2/file-roller-2.2.5.tar.gz) = 161aa4e9d7032d298115d0386635a9e9
+MD5 (gnome2/file-roller-2.4.0.1.tar.bz2) = d268975b20679bc6b8f4f88492e7bfdf
--- a/archivers/fileroller/files/patch-src_fr-command-tar.c
+++ b/archivers/fileroller/files/patch-src_fr-command-tar.c
@ -1,32 +1,24 @@
--- src/fr-command-tar.c.orig	Fri Aug  9 09:10:51 2002
-+++ src/fr-command-tar.c	Fri Oct 11 12:14:40 2002
-@@ -117,7 +117,7 @@
- {
- 	int   i;
- 	char *field;
-	int   n = 6;
-+	int   n = 8;
- 
- 	n--;
- 	field = eat_spaces (line);
-@@ -129,6 +129,10 @@
- 	return field;
+--- src/fr-command-tar.c.orig	Mon May 19 14:15:50 2003
+++ src/fr-command-tar.c	Tue May 20 20:43:39 2003
+@@ -83,6 +83,11 @@
+ 	return mktime (&tm);
 }
 
-+static char *months[] = { 
+static char *months[] = {
 +    "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
 +    "Nov", "Dec"
 +};
+
 
 static void
 process_line (char     *line, 
-@@ -138,15 +142,30 @@
- 	FRCommand  *comm = FR_COMMAND (data);
- 	char      **fields;
- 	char       *name_field;
-+	int        i;
-+	struct tm  tm = {0, };
-+	char      **time_fields;
+@@ -92,19 +97,34 @@
+ 	FRCommand   *comm = FR_COMMAND (data);
+ 	char       **fields;
+ 	const char  *name_field;
+	int          i;
+	struct tm    tm = {0, };
+	char       **time_fields;
 
 	g_return_if_fail (line != NULL);
 
@ -53,3 +45,8 @@
 
 	/* Full path */
 
+-	name_field = get_last_field (line, 6);
+	name_field = get_last_field (line, 8);
+ 	fields = g_strsplit (name_field, " -> ", 2);
+ 
+ 	if (fields[1] == NULL) {
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@ -10,10 +10,10 @@ etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui/%gconf.xml
 etc/gconf/schemas/file-roller.schemas
 lib/bonobo/libfile-roller-component.so
 libdata/bonobo/servers/File_Roller_Component.server
-%%PORTDOCS%%share/doc/fileroller/AUTHORS
-%%PORTDOCS%%share/doc/fileroller/NEWS
-%%PORTDOCS%%share/doc/fileroller/README
-%%PORTDOCS%%share/doc/fileroller/TODO
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/application-registry/file-roller.applications
 share/gnome/applications/file-roller.desktop
 share/gnome/file-roller/glade/file_roller.glade
@ -27,20 +27,29 @@ share/gnome/help/file-roller/ru/figures/fr-mainwindow.png
 share/gnome/help/file-roller/ru/figures/fr-prefs.png
 share/gnome/help/file-roller/ru/file-roller.xml
 share/gnome/help/file-roller/ru/legal.xml
+share/gnome/help/file-roller/uk/figures/fr-add-dialog.png
+share/gnome/help/file-roller/uk/figures/fr-extract.png
+share/gnome/help/file-roller/uk/figures/fr-mainwindow.png
+share/gnome/help/file-roller/uk/figures/fr-prefs.png
+share/gnome/help/file-roller/uk/file-roller.xml
+share/gnome/help/file-roller/uk/legal.xml
 share/gnome/mime-info/file-roller.keys
 share/gnome/mime-info/file-roller.mime
 share/gnome/omf/file-roller/file-roller-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-ru.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/file-roller/file-roller-uk.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/file-roller.png
 share/locale/am/LC_MESSAGES/file-roller.mo
-share/locale/ar/LC_MESSAGES/file-roller.mo
 share/locale/az/LC_MESSAGES/file-roller.mo
 share/locale/be/LC_MESSAGES/file-roller.mo
 share/locale/bg/LC_MESSAGES/file-roller.mo
+share/locale/bn/LC_MESSAGES/file-roller.mo
 share/locale/ca/LC_MESSAGES/file-roller.mo
 share/locale/cs/LC_MESSAGES/file-roller.mo
+share/locale/cy/LC_MESSAGES/file-roller.mo
 share/locale/da/LC_MESSAGES/file-roller.mo
 share/locale/de/LC_MESSAGES/file-roller.mo
 share/locale/el/LC_MESSAGES/file-roller.mo
@ -77,12 +86,15 @@ share/locale/sq/LC_MESSAGES/file-roller.mo
 share/locale/sr/LC_MESSAGES/file-roller.mo
 share/locale/sr@Latn/LC_MESSAGES/file-roller.mo
 share/locale/sv/LC_MESSAGES/file-roller.mo
+share/locale/th/LC_MESSAGES/file-roller.mo
 share/locale/tr/LC_MESSAGES/file-roller.mo
 share/locale/uk/LC_MESSAGES/file-roller.mo
 share/locale/vi/LC_MESSAGES/file-roller.mo
 share/locale/zh_CN/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/uk/figures
+@dirrm share/gnome/help/file-roller/uk
@dirrm share/gnome/help/file-roller/ru/figures
@dirrm share/gnome/help/file-roller/ru
@dirrm share/gnome/help/file-roller/C/figures
@ -90,7 +102,7 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/help/file-roller
@dirrm share/gnome/file-roller/glade
@dirrm share/gnome/file-roller
-%%PORTDOCS%%@dirrm share/doc/fileroller
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general
@ -99,5 +111,6 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/listing
@dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/general
@dirrm etc/gconf/gconf.xml.defaults/apps/file-roller
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@ -6,15 +6,15 @@
 #

 PORTNAME=	gnomemedia2
-PORTVERSION=	2.2.2
+PORTVERSION=	2.4.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/2.2
+MASTER_SITE_SUBDIR=	sources/gnome-media/2.4
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2

 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Multimedia applications for the GNOME 2.0 desktop
+COMMENT=	Multimedia applications for the GNOME 2 desktop

 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
 LIB_DEPENDS=	gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins
@ -22,11 +22,11 @@ LIB_DEPENDS=	gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier gail gnomedesktop
+GNOME_DESKTOP_VERSION=2
+USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop gail
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"

 .include <bsd.port.mk>
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@ -1 +1 @@
-MD5 (gnome2/gnome-media-2.2.2.tar.bz2) = 54b8e29b07de4a86abb1bc349d5c2145
+MD5 (gnome2/gnome-media-2.4.0.tar.bz2) = aa5d6a04049ea7552086a6bea47bf375
--- a/audio/gnome-media/files/patch-gmix_gmix.c
+++ b/audio/gnome-media/files/patch-gmix_gmix.c
@ -1,42 +0,0 @@
--- gmix/gmix.c.orig	Sun Mar 16 16:09:01 2003
-+++ gmix/gmix.c	Sun Mar 16 16:13:09 2003
-@@ -591,6 +591,11 @@
- 	/* Masks for the channel data - OSS blows compared to ALSA */
- 	int recmask, recsrc, stereodee;
- 
-+	/* FreeBSD device name detection */
-+	FILE *sndstat;
-+	char line[256];
-+	char *devname, *p;
-+
- 	/*
- 	 * create new device configureation
- 	 */
-@@ -659,7 +665,26 @@
- 	} 
- #else
- 	new_device->card_name = g_strdup_printf ("OSS-%d-%d", num + 1, num + 1);
-	g_snprintf (new_device->info.name, 31, "Card %d", num+1);
-+	/* get soundcard name from /dev/sndstat on FreeBSD */
-+	sndstat = fopen("/dev/sndstat", "r");
-+	if (!sndstat)
-+		g_snprintf (new_device->info.name, 31, "Card %d", num+1);
-+	else {
-+		while (fgets (line, 255, sndstat)) {
-+			if (!strncmp (line, "pcm", 3) && (atoi (&line[3]) == num))
-+			{
-+				devname = line;
-+				while (*devname++ != '<')
-+					;
-+				p = devname;
-+				while (*p != '>')
-+					p++;
-+				*p = '\0';
-+				g_snprintf (new_device->info.name, 31, devname);
-+			}
-+		}
-+		fclose(sndstat);
-+	}
- #endif
- 	/* 
- 	 * several bitmasks describing the mixer
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@ -39,9 +39,6 @@ share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
 share/gnome/help/gnome-cd/C/figures/eject_button.png
 share/gnome/help/gnome-cd/C/figures/forward_button.png
-share/gnome/help/gnome-cd/C/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/C/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/C/figures/gnome-cd.png
 share/gnome/help/gnome-cd/C/figures/next_button.png
 share/gnome/help/gnome-cd/C/figures/pause_button.png
 share/gnome/help/gnome-cd/C/figures/play_button.png
@ -51,6 +48,8 @@ share/gnome/help/gnome-cd/C/figures/rewind_button.png
 share/gnome/help/gnome-cd/C/figures/stop_button.png
 share/gnome/help/gnome-cd/C/gnome-cd.xml
 share/gnome/help/gnome-cd/C/legal.xml
+share/gnome/help/gnome-cd/de/legal.xml
+share/gnome/help/gnome-cd/de/gnome-cd.xml
 share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/de/figures/cdplayer_window.png
@ -66,8 +65,8 @@ share/gnome/help/gnome-cd/de/figures/preferences_button.png
 share/gnome/help/gnome-cd/de/figures/previous_button.png
 share/gnome/help/gnome-cd/de/figures/rewind_button.png
 share/gnome/help/gnome-cd/de/figures/stop_button.png
-share/gnome/help/gnome-cd/de/gnome-cd.xml
-share/gnome/help/gnome-cd/de/legal.xml
+share/gnome/help/gnome-cd/es/legal.xml
+share/gnome/help/gnome-cd/es/gnome-cd.xml
 share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/es/figures/cdplayer_window.png
@ -83,8 +82,8 @@ share/gnome/help/gnome-cd/es/figures/preferences_button.png
 share/gnome/help/gnome-cd/es/figures/previous_button.png
 share/gnome/help/gnome-cd/es/figures/rewind_button.png
 share/gnome/help/gnome-cd/es/figures/stop_button.png
-share/gnome/help/gnome-cd/es/gnome-cd.xml
-share/gnome/help/gnome-cd/es/legal.xml
+share/gnome/help/gnome-cd/fr/legal.xml
+share/gnome/help/gnome-cd/fr/gnome-cd.xml
 share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/fr/figures/cdplayer_window.png
@ -100,8 +99,8 @@ share/gnome/help/gnome-cd/fr/figures/preferences_button.png
 share/gnome/help/gnome-cd/fr/figures/previous_button.png
 share/gnome/help/gnome-cd/fr/figures/rewind_button.png
 share/gnome/help/gnome-cd/fr/figures/stop_button.png
-share/gnome/help/gnome-cd/fr/gnome-cd.xml
-share/gnome/help/gnome-cd/fr/legal.xml
+share/gnome/help/gnome-cd/it/legal.xml
+share/gnome/help/gnome-cd/it/gnome-cd.xml
 share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/it/figures/cdplayer_window.png
@ -117,42 +116,8 @@ share/gnome/help/gnome-cd/it/figures/preferences_button.png
 share/gnome/help/gnome-cd/it/figures/previous_button.png
 share/gnome/help/gnome-cd/it/figures/rewind_button.png
 share/gnome/help/gnome-cd/it/figures/stop_button.png
-share/gnome/help/gnome-cd/it/gnome-cd.xml
-share/gnome/help/gnome-cd/it/legal.xml
-share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ja/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ja/figures/eject_button.png
-share/gnome/help/gnome-cd/ja/figures/forward_button.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd.png
-share/gnome/help/gnome-cd/ja/figures/next_button.png
-share/gnome/help/gnome-cd/ja/figures/pause_button.png
-share/gnome/help/gnome-cd/ja/figures/play_button.png
-share/gnome/help/gnome-cd/ja/figures/preferences_button.png
-share/gnome/help/gnome-cd/ja/figures/previous_button.png
-share/gnome/help/gnome-cd/ja/figures/rewind_button.png
-share/gnome/help/gnome-cd/ja/figures/stop_button.png
-share/gnome/help/gnome-cd/ja/gnome-cd.xml
-share/gnome/help/gnome-cd/ja/legal.xml
-share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ko/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ko/figures/eject_button.png
-share/gnome/help/gnome-cd/ko/figures/forward_button.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd.png
-share/gnome/help/gnome-cd/ko/figures/next_button.png
-share/gnome/help/gnome-cd/ko/figures/pause_button.png
-share/gnome/help/gnome-cd/ko/figures/play_button.png
-share/gnome/help/gnome-cd/ko/figures/preferences_button.png
-share/gnome/help/gnome-cd/ko/figures/previous_button.png
-share/gnome/help/gnome-cd/ko/figures/rewind_button.png
-share/gnome/help/gnome-cd/ko/figures/stop_button.png
-share/gnome/help/gnome-cd/ko/gnome-cd.xml
-share/gnome/help/gnome-cd/ko/legal.xml
+share/gnome/help/gnome-cd/sv/legal.xml
+share/gnome/help/gnome-cd/sv/gnome-cd.xml
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png
@ -168,8 +133,42 @@ share/gnome/help/gnome-cd/sv/figures/preferences_button.png
 share/gnome/help/gnome-cd/sv/figures/previous_button.png
 share/gnome/help/gnome-cd/sv/figures/rewind_button.png
 share/gnome/help/gnome-cd/sv/figures/stop_button.png
-share/gnome/help/gnome-cd/sv/gnome-cd.xml
-share/gnome/help/gnome-cd/sv/legal.xml
+share/gnome/help/gnome-cd/ja/legal.xml
+share/gnome/help/gnome-cd/ja/gnome-cd.xml
+share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/ja/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/ja/figures/eject_button.png
+share/gnome/help/gnome-cd/ja/figures/forward_button.png
+share/gnome/help/gnome-cd/ja/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/ja/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/ja/figures/gnome-cd.png
+share/gnome/help/gnome-cd/ja/figures/next_button.png
+share/gnome/help/gnome-cd/ja/figures/pause_button.png
+share/gnome/help/gnome-cd/ja/figures/play_button.png
+share/gnome/help/gnome-cd/ja/figures/preferences_button.png
+share/gnome/help/gnome-cd/ja/figures/previous_button.png
+share/gnome/help/gnome-cd/ja/figures/rewind_button.png
+share/gnome/help/gnome-cd/ja/figures/stop_button.png
+share/gnome/help/gnome-cd/ko/legal.xml
+share/gnome/help/gnome-cd/ko/gnome-cd.xml
+share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/ko/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/ko/figures/eject_button.png
+share/gnome/help/gnome-cd/ko/figures/forward_button.png
+share/gnome/help/gnome-cd/ko/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/ko/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/ko/figures/gnome-cd.png
+share/gnome/help/gnome-cd/ko/figures/next_button.png
+share/gnome/help/gnome-cd/ko/figures/pause_button.png
+share/gnome/help/gnome-cd/ko/figures/play_button.png
+share/gnome/help/gnome-cd/ko/figures/preferences_button.png
+share/gnome/help/gnome-cd/ko/figures/previous_button.png
+share/gnome/help/gnome-cd/ko/figures/rewind_button.png
+share/gnome/help/gnome-cd/ko/figures/stop_button.png
+share/gnome/help/gnome-cd/zh_CN/legal.xml
+share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png
@ -185,8 +184,8 @@ share/gnome/help/gnome-cd/zh_CN/figures/preferences_button.png
 share/gnome/help/gnome-cd/zh_CN/figures/previous_button.png
 share/gnome/help/gnome-cd/zh_CN/figures/rewind_button.png
 share/gnome/help/gnome-cd/zh_CN/figures/stop_button.png
-share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml
-share/gnome/help/gnome-cd/zh_CN/legal.xml
+share/gnome/help/gnome-cd/zh_TW/legal.xml
+share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml
 share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_window.png
@ -202,14 +201,6 @@ share/gnome/help/gnome-cd/zh_TW/figures/preferences_button.png
 share/gnome/help/gnome-cd/zh_TW/figures/previous_button.png
 share/gnome/help/gnome-cd/zh_TW/figures/rewind_button.png
 share/gnome/help/gnome-cd/zh_TW/figures/stop_button.png
-share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml
-share/gnome/help/gnome-cd/zh_TW/legal.xml
-share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-path.png
-share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-play.png
-share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-rec.png
-share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-sound.png
-share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-ui.png
-share/gnome/help/gnome-sound-recorder/C/figures/grecord.png
 share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/C/legal.xml
@ -217,6 +208,8 @@ share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
 share/gnome/help/gnome-volume-control/C/figures/gmix.png
 share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
 share/gnome/help/gnome-volume-control/C/legal.xml
+share/gnome/help/grecord/de/legal.xml
+share/gnome/help/grecord/de/grecord.xml
 share/gnome/help/grecord/de/figures/grecord-prefs-path.png
 share/gnome/help/grecord/de/figures/grecord-prefs-play.png
 share/gnome/help/grecord/de/figures/grecord-prefs-rec.png
@ -224,8 +217,8 @@ share/gnome/help/grecord/de/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/de/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/de/figures/grecord.png
 share/gnome/help/grecord/de/figures/grecord_window.png
-share/gnome/help/grecord/de/grecord.xml
-share/gnome/help/grecord/de/legal.xml
+share/gnome/help/grecord/es/legal.xml
+share/gnome/help/grecord/es/grecord.xml
 share/gnome/help/grecord/es/figures/grecord-prefs-path.png
 share/gnome/help/grecord/es/figures/grecord-prefs-play.png
 share/gnome/help/grecord/es/figures/grecord-prefs-rec.png
@ -233,8 +226,8 @@ share/gnome/help/grecord/es/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/es/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/es/figures/grecord.png
 share/gnome/help/grecord/es/figures/grecord_window.png
-share/gnome/help/grecord/es/grecord.xml
-share/gnome/help/grecord/es/legal.xml
+share/gnome/help/grecord/fr/legal.xml
+share/gnome/help/grecord/fr/grecord.xml
 share/gnome/help/grecord/fr/figures/grecord-prefs-path.png
 share/gnome/help/grecord/fr/figures/grecord-prefs-play.png
 share/gnome/help/grecord/fr/figures/grecord-prefs-rec.png
@ -242,8 +235,8 @@ share/gnome/help/grecord/fr/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/fr/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/fr/figures/grecord.png
 share/gnome/help/grecord/fr/figures/grecord_window.png
-share/gnome/help/grecord/fr/grecord.xml
-share/gnome/help/grecord/fr/legal.xml
+share/gnome/help/grecord/it/legal.xml
+share/gnome/help/grecord/it/grecord.xml
 share/gnome/help/grecord/it/figures/grecord-prefs-path.png
 share/gnome/help/grecord/it/figures/grecord-prefs-play.png
 share/gnome/help/grecord/it/figures/grecord-prefs-rec.png
@ -251,26 +244,8 @@ share/gnome/help/grecord/it/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/it/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/it/figures/grecord.png
 share/gnome/help/grecord/it/figures/grecord_window.png
-share/gnome/help/grecord/it/grecord.xml
-share/gnome/help/grecord/it/legal.xml
-share/gnome/help/grecord/ja/figures/grecord-prefs-path.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-play.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/ja/figures/grecord.png
-share/gnome/help/grecord/ja/figures/grecord_window.png
-share/gnome/help/grecord/ja/grecord.xml
-share/gnome/help/grecord/ja/legal.xml
-share/gnome/help/grecord/ko/figures/grecord-prefs-path.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-play.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/ko/figures/grecord.png
-share/gnome/help/grecord/ko/figures/grecord_window.png
-share/gnome/help/grecord/ko/grecord.xml
-share/gnome/help/grecord/ko/legal.xml
+share/gnome/help/grecord/sv/legal.xml
+share/gnome/help/grecord/sv/grecord.xml
 share/gnome/help/grecord/sv/figures/grecord-prefs-path.png
 share/gnome/help/grecord/sv/figures/grecord-prefs-play.png
 share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png
@ -278,8 +253,26 @@ share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/sv/figures/grecord.png
 share/gnome/help/grecord/sv/figures/grecord_window.png
-share/gnome/help/grecord/sv/grecord.xml
-share/gnome/help/grecord/sv/legal.xml
+share/gnome/help/grecord/ja/legal.xml
+share/gnome/help/grecord/ja/grecord.xml
+share/gnome/help/grecord/ja/figures/grecord-prefs-path.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-play.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/ja/figures/grecord.png
+share/gnome/help/grecord/ja/figures/grecord_window.png
+share/gnome/help/grecord/ko/legal.xml
+share/gnome/help/grecord/ko/grecord.xml
+share/gnome/help/grecord/ko/figures/grecord-prefs-path.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-play.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/ko/figures/grecord.png
+share/gnome/help/grecord/ko/figures/grecord_window.png
+share/gnome/help/grecord/zh_CN/legal.xml
+share/gnome/help/grecord/zh_CN/grecord.xml
 share/gnome/help/grecord/zh_CN/figures/grecord-prefs-path.png
 share/gnome/help/grecord/zh_CN/figures/grecord-prefs-play.png
 share/gnome/help/grecord/zh_CN/figures/grecord-prefs-rec.png
@ -287,8 +280,8 @@ share/gnome/help/grecord/zh_CN/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/zh_CN/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/zh_CN/figures/grecord.png
 share/gnome/help/grecord/zh_CN/figures/grecord_window.png
-share/gnome/help/grecord/zh_CN/grecord.xml
-share/gnome/help/grecord/zh_CN/legal.xml
+share/gnome/help/grecord/zh_TW/legal.xml
+share/gnome/help/grecord/zh_TW/grecord.xml
 share/gnome/help/grecord/zh_TW/figures/grecord-prefs-path.png
 share/gnome/help/grecord/zh_TW/figures/grecord-prefs-play.png
 share/gnome/help/grecord/zh_TW/figures/grecord-prefs-rec.png
@ -296,8 +289,6 @@ share/gnome/help/grecord/zh_TW/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/zh_TW/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/zh_TW/figures/grecord.png
 share/gnome/help/grecord/zh_TW/figures/grecord_window.png
-share/gnome/help/grecord/zh_TW/grecord.xml
-share/gnome/help/grecord/zh_TW/legal.xml
 share/gnome/idl/GNOME_Media_CDDBSlave2.idl
 share/gnome/omf/gnome-media/gnome-cd-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
@ -309,12 +300,12 @@ share/gnome/omf/gnome-media/gnome-cd-fr.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gnome-cd-it.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/gnome-cd-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gnome-cd-ja.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gnome-cd-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-media/gnome-cd-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf
@ -331,12 +322,12 @@ share/gnome/omf/gnome-media/grecord-fr.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/grecord-it.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/grecord-ja.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/grecord-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-media/grecord-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/grecord-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/grecord-zh_TW.omf
@ -355,6 +346,29 @@ share/gnome/pixmaps/gnome-cd/media-rewind.png
 share/gnome/pixmaps/gnome-cd/media-stop.png
 share/gnome/pixmaps/gnome-cd/once.png
 share/gnome/pixmaps/gnome-cd/repeat.png
+share/gnome/pixmaps/gnome-cd/themes/None/None.theme
+share/gnome/pixmaps/gnome-cd/themes/None/a-eject-menu.png
+share/gnome/pixmaps/gnome-cd/themes/None/a-first-menu.png
+share/gnome/pixmaps/gnome-cd/themes/None/a-last-menu.png
+share/gnome/pixmaps/gnome-cd/themes/None/a-play-menu.png
+share/gnome/pixmaps/gnome-cd/themes/None/a-stop-menu.png
+share/gnome/pixmaps/gnome-cd/themes/None/bottom-left.png
+share/gnome/pixmaps/gnome-cd/themes/None/bottom-right.png
+share/gnome/pixmaps/gnome-cd/themes/None/bottom.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-eject.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-fwd.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-next.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-pause.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-play.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-prev.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-rew.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-stop.png
+share/gnome/pixmaps/gnome-cd/themes/None/middle-left.png
+share/gnome/pixmaps/gnome-cd/themes/None/middle-right.png
+share/gnome/pixmaps/gnome-cd/themes/None/middle.png
+share/gnome/pixmaps/gnome-cd/themes/None/top-left.png
+share/gnome/pixmaps/gnome-cd/themes/None/top-right.png
+share/gnome/pixmaps/gnome-cd/themes/None/top.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-left.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-right.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/bottom.png
@ -399,6 +413,7 @@ share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo
@ -423,6 +438,7 @@ share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
@ -451,19 +467,57 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd
@dirrm share/gnome/pixmaps/gnome-cd/themes/media
@dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
+@dirrm share/gnome/pixmaps/gnome-cd/themes/None
@dirrm share/gnome/pixmaps/gnome-cd/themes
@dirrm share/gnome/pixmaps/gnome-cd
-@dirrm share/gnome/gnome-sound-recorder/ui
-@dirrm share/gnome/gnome-sound-recorder
@dirrm share/gnome/gnome-media-2.0/interfaces
@dirrm share/gnome/gnome-media-2.0/icons
@dirrm share/gnome/gnome-media-2.0
+@dirrm share/gnome/gnome-sound-recorder/ui
+@dirrm share/gnome/gnome-sound-recorder
+@dirrm share/gnome/help/grecord/zh_TW/figures
+@dirrm share/gnome/help/grecord/zh_TW
+@dirrm share/gnome/help/grecord/zh_CN/figures
+@dirrm share/gnome/help/grecord/zh_CN
+@dirrm share/gnome/help/grecord/sv/figures
+@dirrm share/gnome/help/grecord/sv
+@dirrm share/gnome/help/grecord/ko/figures
+@dirrm share/gnome/help/grecord/ko
+@dirrm share/gnome/help/grecord/ja/figures
+@dirrm share/gnome/help/grecord/ja
+@dirrm share/gnome/help/grecord/it/figures
+@dirrm share/gnome/help/grecord/it
+@dirrm share/gnome/help/grecord/fr/figures
+@dirrm share/gnome/help/grecord/fr
+@dirrm share/gnome/help/grecord/es/figures
+@dirrm share/gnome/help/grecord/es
+@dirrm share/gnome/help/grecord/de/figures
+@dirrm share/gnome/help/grecord/de
+@dirrm share/gnome/help/grecord
@dirrm share/gnome/help/gnome-volume-control/C/figures
@dirrm share/gnome/help/gnome-volume-control/C
@dirrm share/gnome/help/gnome-volume-control
@dirrm share/gnome/help/gnome-sound-recorder/C/figures
@dirrm share/gnome/help/gnome-sound-recorder/C
@dirrm share/gnome/help/gnome-sound-recorder
+@dirrm share/gnome/help/gnome-cd/zh_TW/figures
+@dirrm share/gnome/help/gnome-cd/zh_TW
+@dirrm share/gnome/help/gnome-cd/zh_CN/figures
+@dirrm share/gnome/help/gnome-cd/zh_CN
+@dirrm share/gnome/help/gnome-cd/sv/figures
+@dirrm share/gnome/help/gnome-cd/sv
+@dirrm share/gnome/help/gnome-cd/ko/figures
+@dirrm share/gnome/help/gnome-cd/ko
+@dirrm share/gnome/help/gnome-cd/ja/figures
+@dirrm share/gnome/help/gnome-cd/ja
+@dirrm share/gnome/help/gnome-cd/it/figures
+@dirrm share/gnome/help/gnome-cd/it
+@dirrm share/gnome/help/gnome-cd/fr/figures
+@dirrm share/gnome/help/gnome-cd/fr
+@dirrm share/gnome/help/gnome-cd/es/figures
+@dirrm share/gnome/help/gnome-cd/es
+@dirrm share/gnome/help/gnome-cd/de/figures
+@dirrm share/gnome/help/gnome-cd/de
@dirrm share/gnome/help/gnome-cd/C/figures
@dirrm share/gnome/help/gnome-cd/C
@dirrm share/gnome/help/gnome-cd
@ -479,23 +533,23 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-cd
@dirrm etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@ -6,15 +6,15 @@
 #

 PORTNAME=	gnomemedia2
-PORTVERSION=	2.2.2
+PORTVERSION=	2.4.0
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-media/2.2
+MASTER_SITE_SUBDIR=	sources/gnome-media/2.4
 DISTNAME=	gnome-media-${PORTVERSION}
 DIST_SUBDIR=	gnome2

 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Multimedia applications for the GNOME 2.0 desktop
+COMMENT=	Multimedia applications for the GNOME 2 desktop

 RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
 LIB_DEPENDS=	gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins
@ -22,11 +22,11 @@ LIB_DEPENDS=	gstplay-0.6.1:${PORTSDIR}/multimedia/gstreamer-plugins
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier gail gnomedesktop
+GNOME_DESKTOP_VERSION=2
+USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop gail
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"

 .include <bsd.port.mk>
--- a/audio/gnomemedia2/distinfo
+++ b/audio/gnomemedia2/distinfo
@ -1 +1 @@
-MD5 (gnome2/gnome-media-2.2.2.tar.bz2) = 54b8e29b07de4a86abb1bc349d5c2145
+MD5 (gnome2/gnome-media-2.4.0.tar.bz2) = aa5d6a04049ea7552086a6bea47bf375
--- a/audio/gnomemedia2/files/patch-gmix_gmix.c
+++ b/audio/gnomemedia2/files/patch-gmix_gmix.c
@ -1,42 +0,0 @@
--- gmix/gmix.c.orig	Sun Mar 16 16:09:01 2003
-+++ gmix/gmix.c	Sun Mar 16 16:13:09 2003
-@@ -591,6 +591,11 @@
- 	/* Masks for the channel data - OSS blows compared to ALSA */
- 	int recmask, recsrc, stereodee;
- 
-+	/* FreeBSD device name detection */
-+	FILE *sndstat;
-+	char line[256];
-+	char *devname, *p;
-+
- 	/*
- 	 * create new device configureation
- 	 */
-@@ -659,7 +665,26 @@
- 	} 
- #else
- 	new_device->card_name = g_strdup_printf ("OSS-%d-%d", num + 1, num + 1);
-	g_snprintf (new_device->info.name, 31, "Card %d", num+1);
-+	/* get soundcard name from /dev/sndstat on FreeBSD */
-+	sndstat = fopen("/dev/sndstat", "r");
-+	if (!sndstat)
-+		g_snprintf (new_device->info.name, 31, "Card %d", num+1);
-+	else {
-+		while (fgets (line, 255, sndstat)) {
-+			if (!strncmp (line, "pcm", 3) && (atoi (&line[3]) == num))
-+			{
-+				devname = line;
-+				while (*devname++ != '<')
-+					;
-+				p = devname;
-+				while (*p != '>')
-+					p++;
-+				*p = '\0';
-+				g_snprintf (new_device->info.name, 31, devname);
-+			}
-+		}
-+		fclose(sndstat);
-+	}
- #endif
- 	/* 
- 	 * several bitmasks describing the mixer
--- a/audio/gnomemedia2/pkg-plist
+++ b/audio/gnomemedia2/pkg-plist
@ -39,9 +39,6 @@ share/gnome/help/gnome-cd/C/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/C/figures/cdplayer_window.png
 share/gnome/help/gnome-cd/C/figures/eject_button.png
 share/gnome/help/gnome-cd/C/figures/forward_button.png
-share/gnome/help/gnome-cd/C/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/C/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/C/figures/gnome-cd.png
 share/gnome/help/gnome-cd/C/figures/next_button.png
 share/gnome/help/gnome-cd/C/figures/pause_button.png
 share/gnome/help/gnome-cd/C/figures/play_button.png
@ -51,6 +48,8 @@ share/gnome/help/gnome-cd/C/figures/rewind_button.png
 share/gnome/help/gnome-cd/C/figures/stop_button.png
 share/gnome/help/gnome-cd/C/gnome-cd.xml
 share/gnome/help/gnome-cd/C/legal.xml
+share/gnome/help/gnome-cd/de/legal.xml
+share/gnome/help/gnome-cd/de/gnome-cd.xml
 share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/de/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/de/figures/cdplayer_window.png
@ -66,8 +65,8 @@ share/gnome/help/gnome-cd/de/figures/preferences_button.png
 share/gnome/help/gnome-cd/de/figures/previous_button.png
 share/gnome/help/gnome-cd/de/figures/rewind_button.png
 share/gnome/help/gnome-cd/de/figures/stop_button.png
-share/gnome/help/gnome-cd/de/gnome-cd.xml
-share/gnome/help/gnome-cd/de/legal.xml
+share/gnome/help/gnome-cd/es/legal.xml
+share/gnome/help/gnome-cd/es/gnome-cd.xml
 share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/es/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/es/figures/cdplayer_window.png
@ -83,8 +82,8 @@ share/gnome/help/gnome-cd/es/figures/preferences_button.png
 share/gnome/help/gnome-cd/es/figures/previous_button.png
 share/gnome/help/gnome-cd/es/figures/rewind_button.png
 share/gnome/help/gnome-cd/es/figures/stop_button.png
-share/gnome/help/gnome-cd/es/gnome-cd.xml
-share/gnome/help/gnome-cd/es/legal.xml
+share/gnome/help/gnome-cd/fr/legal.xml
+share/gnome/help/gnome-cd/fr/gnome-cd.xml
 share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/fr/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/fr/figures/cdplayer_window.png
@ -100,8 +99,8 @@ share/gnome/help/gnome-cd/fr/figures/preferences_button.png
 share/gnome/help/gnome-cd/fr/figures/previous_button.png
 share/gnome/help/gnome-cd/fr/figures/rewind_button.png
 share/gnome/help/gnome-cd/fr/figures/stop_button.png
-share/gnome/help/gnome-cd/fr/gnome-cd.xml
-share/gnome/help/gnome-cd/fr/legal.xml
+share/gnome/help/gnome-cd/it/legal.xml
+share/gnome/help/gnome-cd/it/gnome-cd.xml
 share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/it/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/it/figures/cdplayer_window.png
@ -117,42 +116,8 @@ share/gnome/help/gnome-cd/it/figures/preferences_button.png
 share/gnome/help/gnome-cd/it/figures/previous_button.png
 share/gnome/help/gnome-cd/it/figures/rewind_button.png
 share/gnome/help/gnome-cd/it/figures/stop_button.png
-share/gnome/help/gnome-cd/it/gnome-cd.xml
-share/gnome/help/gnome-cd/it/legal.xml
-share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ja/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ja/figures/eject_button.png
-share/gnome/help/gnome-cd/ja/figures/forward_button.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/ja/figures/gnome-cd.png
-share/gnome/help/gnome-cd/ja/figures/next_button.png
-share/gnome/help/gnome-cd/ja/figures/pause_button.png
-share/gnome/help/gnome-cd/ja/figures/play_button.png
-share/gnome/help/gnome-cd/ja/figures/preferences_button.png
-share/gnome/help/gnome-cd/ja/figures/previous_button.png
-share/gnome/help/gnome-cd/ja/figures/rewind_button.png
-share/gnome/help/gnome-cd/ja/figures/stop_button.png
-share/gnome/help/gnome-cd/ja/gnome-cd.xml
-share/gnome/help/gnome-cd/ja/legal.xml
-share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_button.png
-share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_window.png
-share/gnome/help/gnome-cd/ko/figures/cdplayer_window.png
-share/gnome/help/gnome-cd/ko/figures/eject_button.png
-share/gnome/help/gnome-cd/ko/figures/forward_button.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd-prefs.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd-track.png
-share/gnome/help/gnome-cd/ko/figures/gnome-cd.png
-share/gnome/help/gnome-cd/ko/figures/next_button.png
-share/gnome/help/gnome-cd/ko/figures/pause_button.png
-share/gnome/help/gnome-cd/ko/figures/play_button.png
-share/gnome/help/gnome-cd/ko/figures/preferences_button.png
-share/gnome/help/gnome-cd/ko/figures/previous_button.png
-share/gnome/help/gnome-cd/ko/figures/rewind_button.png
-share/gnome/help/gnome-cd/ko/figures/stop_button.png
-share/gnome/help/gnome-cd/ko/gnome-cd.xml
-share/gnome/help/gnome-cd/ko/legal.xml
+share/gnome/help/gnome-cd/sv/legal.xml
+share/gnome/help/gnome-cd/sv/gnome-cd.xml
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/sv/figures/cdplayer_window.png
@ -168,8 +133,42 @@ share/gnome/help/gnome-cd/sv/figures/preferences_button.png
 share/gnome/help/gnome-cd/sv/figures/previous_button.png
 share/gnome/help/gnome-cd/sv/figures/rewind_button.png
 share/gnome/help/gnome-cd/sv/figures/stop_button.png
-share/gnome/help/gnome-cd/sv/gnome-cd.xml
-share/gnome/help/gnome-cd/sv/legal.xml
+share/gnome/help/gnome-cd/ja/legal.xml
+share/gnome/help/gnome-cd/ja/gnome-cd.xml
+share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/ja/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/ja/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/ja/figures/eject_button.png
+share/gnome/help/gnome-cd/ja/figures/forward_button.png
+share/gnome/help/gnome-cd/ja/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/ja/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/ja/figures/gnome-cd.png
+share/gnome/help/gnome-cd/ja/figures/next_button.png
+share/gnome/help/gnome-cd/ja/figures/pause_button.png
+share/gnome/help/gnome-cd/ja/figures/play_button.png
+share/gnome/help/gnome-cd/ja/figures/preferences_button.png
+share/gnome/help/gnome-cd/ja/figures/previous_button.png
+share/gnome/help/gnome-cd/ja/figures/rewind_button.png
+share/gnome/help/gnome-cd/ja/figures/stop_button.png
+share/gnome/help/gnome-cd/ko/legal.xml
+share/gnome/help/gnome-cd/ko/gnome-cd.xml
+share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_button.png
+share/gnome/help/gnome-cd/ko/figures/cdplayer_trackeditor_window.png
+share/gnome/help/gnome-cd/ko/figures/cdplayer_window.png
+share/gnome/help/gnome-cd/ko/figures/eject_button.png
+share/gnome/help/gnome-cd/ko/figures/forward_button.png
+share/gnome/help/gnome-cd/ko/figures/gnome-cd-prefs.png
+share/gnome/help/gnome-cd/ko/figures/gnome-cd-track.png
+share/gnome/help/gnome-cd/ko/figures/gnome-cd.png
+share/gnome/help/gnome-cd/ko/figures/next_button.png
+share/gnome/help/gnome-cd/ko/figures/pause_button.png
+share/gnome/help/gnome-cd/ko/figures/play_button.png
+share/gnome/help/gnome-cd/ko/figures/preferences_button.png
+share/gnome/help/gnome-cd/ko/figures/previous_button.png
+share/gnome/help/gnome-cd/ko/figures/rewind_button.png
+share/gnome/help/gnome-cd/ko/figures/stop_button.png
+share/gnome/help/gnome-cd/zh_CN/legal.xml
+share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/zh_CN/figures/cdplayer_window.png
@ -185,8 +184,8 @@ share/gnome/help/gnome-cd/zh_CN/figures/preferences_button.png
 share/gnome/help/gnome-cd/zh_CN/figures/previous_button.png
 share/gnome/help/gnome-cd/zh_CN/figures/rewind_button.png
 share/gnome/help/gnome-cd/zh_CN/figures/stop_button.png
-share/gnome/help/gnome-cd/zh_CN/gnome-cd.xml
-share/gnome/help/gnome-cd/zh_CN/legal.xml
+share/gnome/help/gnome-cd/zh_TW/legal.xml
+share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml
 share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_button.png
 share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_trackeditor_window.png
 share/gnome/help/gnome-cd/zh_TW/figures/cdplayer_window.png
@ -202,14 +201,6 @@ share/gnome/help/gnome-cd/zh_TW/figures/preferences_button.png
 share/gnome/help/gnome-cd/zh_TW/figures/previous_button.png
 share/gnome/help/gnome-cd/zh_TW/figures/rewind_button.png
 share/gnome/help/gnome-cd/zh_TW/figures/stop_button.png
-share/gnome/help/gnome-cd/zh_TW/gnome-cd.xml
-share/gnome/help/gnome-cd/zh_TW/legal.xml
-share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-path.png
-share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-play.png
-share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-rec.png
-share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-sound.png
-share/gnome/help/gnome-sound-recorder/C/figures/grecord-prefs-ui.png
-share/gnome/help/gnome-sound-recorder/C/figures/grecord.png
 share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
 share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
 share/gnome/help/gnome-sound-recorder/C/legal.xml
@ -217,6 +208,8 @@ share/gnome/help/gnome-volume-control/C/figures/gmix-prefs.png
 share/gnome/help/gnome-volume-control/C/figures/gmix.png
 share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
 share/gnome/help/gnome-volume-control/C/legal.xml
+share/gnome/help/grecord/de/legal.xml
+share/gnome/help/grecord/de/grecord.xml
 share/gnome/help/grecord/de/figures/grecord-prefs-path.png
 share/gnome/help/grecord/de/figures/grecord-prefs-play.png
 share/gnome/help/grecord/de/figures/grecord-prefs-rec.png
@ -224,8 +217,8 @@ share/gnome/help/grecord/de/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/de/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/de/figures/grecord.png
 share/gnome/help/grecord/de/figures/grecord_window.png
-share/gnome/help/grecord/de/grecord.xml
-share/gnome/help/grecord/de/legal.xml
+share/gnome/help/grecord/es/legal.xml
+share/gnome/help/grecord/es/grecord.xml
 share/gnome/help/grecord/es/figures/grecord-prefs-path.png
 share/gnome/help/grecord/es/figures/grecord-prefs-play.png
 share/gnome/help/grecord/es/figures/grecord-prefs-rec.png
@ -233,8 +226,8 @@ share/gnome/help/grecord/es/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/es/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/es/figures/grecord.png
 share/gnome/help/grecord/es/figures/grecord_window.png
-share/gnome/help/grecord/es/grecord.xml
-share/gnome/help/grecord/es/legal.xml
+share/gnome/help/grecord/fr/legal.xml
+share/gnome/help/grecord/fr/grecord.xml
 share/gnome/help/grecord/fr/figures/grecord-prefs-path.png
 share/gnome/help/grecord/fr/figures/grecord-prefs-play.png
 share/gnome/help/grecord/fr/figures/grecord-prefs-rec.png
@ -242,8 +235,8 @@ share/gnome/help/grecord/fr/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/fr/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/fr/figures/grecord.png
 share/gnome/help/grecord/fr/figures/grecord_window.png
-share/gnome/help/grecord/fr/grecord.xml
-share/gnome/help/grecord/fr/legal.xml
+share/gnome/help/grecord/it/legal.xml
+share/gnome/help/grecord/it/grecord.xml
 share/gnome/help/grecord/it/figures/grecord-prefs-path.png
 share/gnome/help/grecord/it/figures/grecord-prefs-play.png
 share/gnome/help/grecord/it/figures/grecord-prefs-rec.png
@ -251,26 +244,8 @@ share/gnome/help/grecord/it/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/it/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/it/figures/grecord.png
 share/gnome/help/grecord/it/figures/grecord_window.png
-share/gnome/help/grecord/it/grecord.xml
-share/gnome/help/grecord/it/legal.xml
-share/gnome/help/grecord/ja/figures/grecord-prefs-path.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-play.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/ja/figures/grecord.png
-share/gnome/help/grecord/ja/figures/grecord_window.png
-share/gnome/help/grecord/ja/grecord.xml
-share/gnome/help/grecord/ja/legal.xml
-share/gnome/help/grecord/ko/figures/grecord-prefs-path.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-play.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png
-share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png
-share/gnome/help/grecord/ko/figures/grecord.png
-share/gnome/help/grecord/ko/figures/grecord_window.png
-share/gnome/help/grecord/ko/grecord.xml
-share/gnome/help/grecord/ko/legal.xml
+share/gnome/help/grecord/sv/legal.xml
+share/gnome/help/grecord/sv/grecord.xml
 share/gnome/help/grecord/sv/figures/grecord-prefs-path.png
 share/gnome/help/grecord/sv/figures/grecord-prefs-play.png
 share/gnome/help/grecord/sv/figures/grecord-prefs-rec.png
@ -278,8 +253,26 @@ share/gnome/help/grecord/sv/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/sv/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/sv/figures/grecord.png
 share/gnome/help/grecord/sv/figures/grecord_window.png
-share/gnome/help/grecord/sv/grecord.xml
-share/gnome/help/grecord/sv/legal.xml
+share/gnome/help/grecord/ja/legal.xml
+share/gnome/help/grecord/ja/grecord.xml
+share/gnome/help/grecord/ja/figures/grecord-prefs-path.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-play.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/ja/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/ja/figures/grecord.png
+share/gnome/help/grecord/ja/figures/grecord_window.png
+share/gnome/help/grecord/ko/legal.xml
+share/gnome/help/grecord/ko/grecord.xml
+share/gnome/help/grecord/ko/figures/grecord-prefs-path.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-play.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-rec.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-sound.png
+share/gnome/help/grecord/ko/figures/grecord-prefs-ui.png
+share/gnome/help/grecord/ko/figures/grecord.png
+share/gnome/help/grecord/ko/figures/grecord_window.png
+share/gnome/help/grecord/zh_CN/legal.xml
+share/gnome/help/grecord/zh_CN/grecord.xml
 share/gnome/help/grecord/zh_CN/figures/grecord-prefs-path.png
 share/gnome/help/grecord/zh_CN/figures/grecord-prefs-play.png
 share/gnome/help/grecord/zh_CN/figures/grecord-prefs-rec.png
@ -287,8 +280,8 @@ share/gnome/help/grecord/zh_CN/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/zh_CN/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/zh_CN/figures/grecord.png
 share/gnome/help/grecord/zh_CN/figures/grecord_window.png
-share/gnome/help/grecord/zh_CN/grecord.xml
-share/gnome/help/grecord/zh_CN/legal.xml
+share/gnome/help/grecord/zh_TW/legal.xml
+share/gnome/help/grecord/zh_TW/grecord.xml
 share/gnome/help/grecord/zh_TW/figures/grecord-prefs-path.png
 share/gnome/help/grecord/zh_TW/figures/grecord-prefs-play.png
 share/gnome/help/grecord/zh_TW/figures/grecord-prefs-rec.png
@ -296,8 +289,6 @@ share/gnome/help/grecord/zh_TW/figures/grecord-prefs-sound.png
 share/gnome/help/grecord/zh_TW/figures/grecord-prefs-ui.png
 share/gnome/help/grecord/zh_TW/figures/grecord.png
 share/gnome/help/grecord/zh_TW/figures/grecord_window.png
-share/gnome/help/grecord/zh_TW/grecord.xml
-share/gnome/help/grecord/zh_TW/legal.xml
 share/gnome/idl/GNOME_Media_CDDBSlave2.idl
 share/gnome/omf/gnome-media/gnome-cd-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
@ -309,12 +300,12 @@ share/gnome/omf/gnome-media/gnome-cd-fr.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gnome-cd-it.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/gnome-cd-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gnome-cd-ja.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gnome-cd-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-media/gnome-cd-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf
@ -331,12 +322,12 @@ share/gnome/omf/gnome-media/grecord-fr.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/grecord-it.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-media/grecord-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/grecord-ja.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/grecord-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-media/grecord-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/grecord-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-media/grecord-zh_TW.omf
@ -355,6 +346,29 @@ share/gnome/pixmaps/gnome-cd/media-rewind.png
 share/gnome/pixmaps/gnome-cd/media-stop.png
 share/gnome/pixmaps/gnome-cd/once.png
 share/gnome/pixmaps/gnome-cd/repeat.png
+share/gnome/pixmaps/gnome-cd/themes/None/None.theme
+share/gnome/pixmaps/gnome-cd/themes/None/a-eject-menu.png
+share/gnome/pixmaps/gnome-cd/themes/None/a-first-menu.png
+share/gnome/pixmaps/gnome-cd/themes/None/a-last-menu.png
+share/gnome/pixmaps/gnome-cd/themes/None/a-play-menu.png
+share/gnome/pixmaps/gnome-cd/themes/None/a-stop-menu.png
+share/gnome/pixmaps/gnome-cd/themes/None/bottom-left.png
+share/gnome/pixmaps/gnome-cd/themes/None/bottom-right.png
+share/gnome/pixmaps/gnome-cd/themes/None/bottom.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-eject.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-fwd.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-next.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-pause.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-play.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-prev.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-rew.png
+share/gnome/pixmaps/gnome-cd/themes/None/media-stop.png
+share/gnome/pixmaps/gnome-cd/themes/None/middle-left.png
+share/gnome/pixmaps/gnome-cd/themes/None/middle-right.png
+share/gnome/pixmaps/gnome-cd/themes/None/middle.png
+share/gnome/pixmaps/gnome-cd/themes/None/top-left.png
+share/gnome/pixmaps/gnome-cd/themes/None/top-right.png
+share/gnome/pixmaps/gnome-cd/themes/None/top.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-left.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/bottom-right.png
 share/gnome/pixmaps/gnome-cd/themes/lcd/bottom.png
@ -399,6 +413,7 @@ share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo
@ -423,6 +438,7 @@ share/locale/ja/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-media-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-media-2.0.mo
@ -451,19 +467,57 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm share/gnome/pixmaps/gnome-cd/themes/red-lcd
@dirrm share/gnome/pixmaps/gnome-cd/themes/media
@dirrm share/gnome/pixmaps/gnome-cd/themes/lcd
+@dirrm share/gnome/pixmaps/gnome-cd/themes/None
@dirrm share/gnome/pixmaps/gnome-cd/themes
@dirrm share/gnome/pixmaps/gnome-cd
-@dirrm share/gnome/gnome-sound-recorder/ui
-@dirrm share/gnome/gnome-sound-recorder
@dirrm share/gnome/gnome-media-2.0/interfaces
@dirrm share/gnome/gnome-media-2.0/icons
@dirrm share/gnome/gnome-media-2.0
+@dirrm share/gnome/gnome-sound-recorder/ui
+@dirrm share/gnome/gnome-sound-recorder
+@dirrm share/gnome/help/grecord/zh_TW/figures
+@dirrm share/gnome/help/grecord/zh_TW
+@dirrm share/gnome/help/grecord/zh_CN/figures
+@dirrm share/gnome/help/grecord/zh_CN
+@dirrm share/gnome/help/grecord/sv/figures
+@dirrm share/gnome/help/grecord/sv
+@dirrm share/gnome/help/grecord/ko/figures
+@dirrm share/gnome/help/grecord/ko
+@dirrm share/gnome/help/grecord/ja/figures
+@dirrm share/gnome/help/grecord/ja
+@dirrm share/gnome/help/grecord/it/figures
+@dirrm share/gnome/help/grecord/it
+@dirrm share/gnome/help/grecord/fr/figures
+@dirrm share/gnome/help/grecord/fr
+@dirrm share/gnome/help/grecord/es/figures
+@dirrm share/gnome/help/grecord/es
+@dirrm share/gnome/help/grecord/de/figures
+@dirrm share/gnome/help/grecord/de
+@dirrm share/gnome/help/grecord
@dirrm share/gnome/help/gnome-volume-control/C/figures
@dirrm share/gnome/help/gnome-volume-control/C
@dirrm share/gnome/help/gnome-volume-control
@dirrm share/gnome/help/gnome-sound-recorder/C/figures
@dirrm share/gnome/help/gnome-sound-recorder/C
@dirrm share/gnome/help/gnome-sound-recorder
+@dirrm share/gnome/help/gnome-cd/zh_TW/figures
+@dirrm share/gnome/help/gnome-cd/zh_TW
+@dirrm share/gnome/help/gnome-cd/zh_CN/figures
+@dirrm share/gnome/help/gnome-cd/zh_CN
+@dirrm share/gnome/help/gnome-cd/sv/figures
+@dirrm share/gnome/help/gnome-cd/sv
+@dirrm share/gnome/help/gnome-cd/ko/figures
+@dirrm share/gnome/help/gnome-cd/ko
+@dirrm share/gnome/help/gnome-cd/ja/figures
+@dirrm share/gnome/help/gnome-cd/ja
+@dirrm share/gnome/help/gnome-cd/it/figures
+@dirrm share/gnome/help/gnome-cd/it
+@dirrm share/gnome/help/gnome-cd/fr/figures
+@dirrm share/gnome/help/gnome-cd/fr
+@dirrm share/gnome/help/gnome-cd/es/figures
+@dirrm share/gnome/help/gnome-cd/es
+@dirrm share/gnome/help/gnome-cd/de/figures
+@dirrm share/gnome/help/gnome-cd/de
@dirrm share/gnome/help/gnome-cd/C/figures
@dirrm share/gnome/help/gnome-cd/C
@dirrm share/gnome/help/gnome-cd
@ -479,23 +533,23 @@ share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-cd
@dirrm etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-de.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-es.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-fr.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-it.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-sv.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ja.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-ko.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_CN.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-cd-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/gnome-volume-control-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-de.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-es.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-fr.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-it.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-sv.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ja.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-ko.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_CN.omf 2>/dev/null || /usr/bin/true
+@exec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-media/grecord-zh_TW.omf 2>/dev/null || /usr/bin/true
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@ -6,11 +6,11 @@
 #

 PORTNAME=	gnomeutils2
-PORTVERSION=	2.2.3
+PORTVERSION=	2.4.0
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-utils/2.2
+MASTER_SITE_SUBDIR=	sources/gnome-utils/2.4
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2

@ -27,8 +27,6 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

-MAN1=	gnome-calculator.1 \
-	gnome-character-map.1 gnome-dictionary.1 \
-	gnome-search-tool.1 gnome-system-log.1 gdialog.1
+MAN1=	gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1

 .include <bsd.port.mk>
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@ -1 +1 @@
-MD5 (gnome2/gnome-utils-2.2.3.tar.bz2) = 2bde68d39e135a99dfd308a7ec7b6c4a
+MD5 (gnome2/gnome-utils-2.4.0.tar.bz2) = 6986c0b7b5898f1f515add00b946ae48
--- a/deskutils/gnome-utils/files/patch-ad
+++ b/deskutils/gnome-utils/files/patch-ad
@ -1,28 +0,0 @@
--- gdialog/dialog.h.orig	Tue Jul  6 16:23:33 1999
-+++ gdialog/dialog.h	Wed Aug 18 11:34:23 1999
-@@ -36,24 +36,7 @@
- #include <gnome.h>
- #endif
- 
-#ifdef ultrix
-#  include <cursesX.h>
-#else
-#  if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
-#    include <ncurses.h>
-#  else
-#    if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(__sgi)
-#        define hacked 1
-#        define _XOPEN_SOURCE_EXTENDED
-#        define _ACS_COMPAT_CODE
-#    endif
-#    include <curses.h>
-#    ifdef hacked
-#        undef _XOPEN_SOURCE_EXTENDED
-#        undef _ACS_COMPAT_CODE
-#    endif
-#  endif
-#endif
-+#include <ncurses.h>
- 
- /*
-  * Change these if you want
--- a/deskutils/gnome-utils/files/patch-ai
+++ b/deskutils/gnome-utils/files/patch-ai
@ -1,11 +1,11 @@
--- sgmldocs.make.orig	Mon May  6 23:46:55 2002
-+++ sgmldocs.make	Mon May  6 23:47:10 2002
-@@ -32,7 +32,7 @@
- #   dist-hook: app-dist-hook
- #
- 
+--- xmldocs.make.orig	Thu Aug  7 09:56:16 2003
+++ xmldocs.make	Thu Aug  7 13:55:58 2003
+@@ -36,7 +36,7 @@
+ # **********  Begin of section some packagers may need to modify  **********
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
 -docdir = $(datadir)/gnome/help/$(docname)/$(lang)
 +docdir = $(datadir)/help/$(docname)/$(lang)
 
- doc_DATA = index.html
- 
+ # **********  You should not have to edit below this line  **********
+ xml_files = $(entities) $(docname).xml
--- a/deskutils/gnome-utils/files/patch-logview_logview.c
+++ b/deskutils/gnome-utils/files/patch-logview_logview.c
@ -1,5 +1,5 @@
--- logview/logview.c.orig	Sun Feb 16 15:34:59 2003
-+++ logview/logview.c	Wed Apr 23 14:51:26 2003
+--- logview/logview.c.orig	Sun Feb 16 15:36:07 2003
+++ logview/logview.c	Thu Apr 24 12:53:35 2003
@@ -774,7 +774,7 @@
 
 	if ( ! found) {
@ -27,11 +27,3 @@
 		if (access (full_name, R_OK) == 0) {
 			found = TRUE;
 			g_free (cfg->action_db_path);
-@@ -882,7 +882,6 @@
- 		else
- 			prefs->logfile = NULL;
- 	}
-	g_free (logfile);	
- }
- 
- void SaveUserPrefs(UserPrefsStruct *prefs)
--- a/deskutils/gnome-utils/pkg-descr
+++ b/deskutils/gnome-utils/pkg-descr
@ -1,3 +1,3 @@
-GNOME 2 support utilities, including an on-the-fly dialog box tool
-(like Zenity), a dictionary, a frontend for find(1), and a system log
-viewer.
+GNOME 2.0 support utilities, including an on-the-fly dialog box tool
+(like Zenity), a dictionary, a frontend for find(1), a system log
+viewer, and more.
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@ -1,19 +1,23 @@
-bin/gdialog
-bin/gnome-calculator
-bin/gnome-character-map
 bin/gnome-dictionary
 bin/gnome-search-tool
 bin/gnome-system-log
+etc/gconf/gconf.xml.defaults/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml
 etc/gconf/schemas/gdict.schemas
+etc/gconf/schemas/gnome-search-tool.schemas
 etc/gconf/schemas/logview.schemas
 libdata/bonobo/servers/GNOME_GDictApplet.server
 libexec/gdict-applet
-share/gnome/applications/gnome-calculator.desktop
-share/gnome/applications/gnome-character-map.desktop
 share/gnome/applications/gnome-dictionary.desktop
 share/gnome/applications/gnome-search-tool.desktop
 share/gnome/applications/gnome-system-log.desktop
@ -21,76 +25,6 @@ share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml
 share/gnome/gnome-system-log/gnome-system-log-actions.db
 share/gnome/gnome-system-log/gnome-system-log-descript.db
 share/gnome/gnome-system-log/gnome-system-log-regexp.db
-share/gnome/help/gdialog/C/figures/example-dialog.png
-share/gnome/help/gdialog/C/figures/gdialog-msgbox.png
-share/gnome/help/gdialog/C/figures/gdialog-yesno.png
-share/gnome/help/gdialog/C/gdialog.xml
-share/gnome/help/gdialog/C/legal.xml
-share/gnome/help/gdialog/ja/figures/example-dialog.png
-share/gnome/help/gdialog/ja/figures/gdialog-msgbox.png
-share/gnome/help/gdialog/ja/figures/gdialog-yesno.png
-share/gnome/help/gdialog/ja/gdialog.xml
-share/gnome/help/gdialog/ja/legal.xml
-share/gnome/help/gnome-calculator/C/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/C/gnome-calculator.xml
-share/gnome/help/gnome-calculator/C/legal.xml
-share/gnome/help/gnome-calculator/de/figures/gcalc-main.png
-share/gnome/help/gnome-calculator/de/gnome-calculator.xml
-share/gnome/help/gnome-calculator/de/legal.xml
-share/gnome/help/gnome-calculator/es/figures/gcalc-main.png
-share/gnome/help/gnome-calculator/es/gnome-calculator.xml
-share/gnome/help/gnome-calculator/es/legal.xml
-share/gnome/help/gnome-calculator/fr/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/fr/gnome-calculator.xml
-share/gnome/help/gnome-calculator/fr/legal.xml
-share/gnome/help/gnome-calculator/it/figures/gcalc-main.png
-share/gnome/help/gnome-calculator/it/gnome-calculator.xml
-share/gnome/help/gnome-calculator/it/legal.xml
-share/gnome/help/gnome-calculator/ja/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/ja/gnome-calculator.xml
-share/gnome/help/gnome-calculator/ja/legal.xml
-share/gnome/help/gnome-calculator/ko/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/ko/gnome-calculator.xml
-share/gnome/help/gnome-calculator/ko/legal.xml
-share/gnome/help/gnome-calculator/sv/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/sv/gnome-calculator.xml
-share/gnome/help/gnome-calculator/sv/legal.xml
-share/gnome/help/gnome-calculator/zh_CN/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/zh_CN/gnome-calculator.xml
-share/gnome/help/gnome-calculator/zh_CN/legal.xml
-share/gnome/help/gnome-calculator/zh_TW/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/zh_TW/gnome-calculator.xml
-share/gnome/help/gnome-calculator/zh_TW/legal.xml
-share/gnome/help/gnome-character-map/C/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/C/gnome-character-map.xml
-share/gnome/help/gnome-character-map/C/legal.xml
-share/gnome/help/gnome-character-map/de/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/de/gnome-character-map.xml
-share/gnome/help/gnome-character-map/de/legal.xml
-share/gnome/help/gnome-character-map/es/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/es/gnome-character-map.xml
-share/gnome/help/gnome-character-map/es/legal.xml
-share/gnome/help/gnome-character-map/fr/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/fr/gnome-character-map.xml
-share/gnome/help/gnome-character-map/fr/legal.xml
-share/gnome/help/gnome-character-map/it/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/it/gnome-character-map.xml
-share/gnome/help/gnome-character-map/it/legal.xml
-share/gnome/help/gnome-character-map/ja/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/ja/gnome-character-map.xml
-share/gnome/help/gnome-character-map/ja/legal.xml
-share/gnome/help/gnome-character-map/ko/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/ko/gnome-character-map.xml
-share/gnome/help/gnome-character-map/ko/legal.xml
-share/gnome/help/gnome-character-map/sv/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/sv/gnome-character-map.xml
-share/gnome/help/gnome-character-map/sv/legal.xml
-share/gnome/help/gnome-character-map/zh_CN/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/zh_CN/gnome-character-map.xml
-share/gnome/help/gnome-character-map/zh_CN/legal.xml
-share/gnome/help/gnome-character-map/zh_TW/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/zh_TW/gnome-character-map.xml
-share/gnome/help/gnome-character-map/zh_TW/legal.xml
 share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png
 share/gnome/help/gnome-dictionary/C/figures/gdict_window.png
 share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
@ -102,9 +36,6 @@ share/gnome/help/gnome-dictionary/ja/legal.xml
 share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/C/legal.xml
-share/gnome/help/gnome-search-tool/de/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/de/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/de/legal.xml
 share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/es/legal.xml
@ -159,58 +90,12 @@ share/gnome/help/gnome-system-log/zh_CN/legal.xml
 share/gnome/help/gnome-system-log/zh_TW/figures/syslog_window.png
 share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml
 share/gnome/help/gnome-system-log/zh_TW/legal.xml
-share/gnome/omf/gnome-utils/gdialog-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gdialog-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-ja.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-de.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-es.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-es.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-fr.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-fr.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-it.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-it.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ja.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-ko.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ko.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-de.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-es.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-es.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-fr.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-fr.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-it.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-it.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ja.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-ko.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ko.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-dictionary-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-search-tool-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-search-tool-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-de.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-search-tool-es.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-es.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf
@ -248,15 +133,17 @@ share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf
 share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gdict.png
-share/gnome/pixmaps/gnome-character-map.png
+share/gnome/pixmaps/gnome-search-tool/gnome-search-tool-animation.png
 share/gnome/pixmaps/gnome-searchtool.png
 share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-utils-2.0.mo
@ -272,6 +159,7 @@ share/locale/gl/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
@ -291,6 +179,7 @@ share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-utils-2.0.mo
@ -301,7 +190,7 @@ share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
-@dirrm share/gnome/pixmaps/gnome-system-log
+@dirrm share/gnome/pixmaps/gnome-search-tool
@dirrm share/gnome/help/gnome-system-log/zh_TW/figures
@dirrm share/gnome/help/gnome-system-log/zh_TW
@dirrm share/gnome/help/gnome-system-log/zh_CN/figures
@ -339,8 +228,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-search-tool/fr
@dirrm share/gnome/help/gnome-search-tool/es/figures
@dirrm share/gnome/help/gnome-search-tool/es
-@dirrm share/gnome/help/gnome-search-tool/de/figures
-@dirrm share/gnome/help/gnome-search-tool/de
@dirrm share/gnome/help/gnome-search-tool/C/figures
@dirrm share/gnome/help/gnome-search-tool/C
@dirrm share/gnome/help/gnome-search-tool
@ -349,83 +236,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-dictionary/C/figures
@dirrm share/gnome/help/gnome-dictionary/C
@dirrm share/gnome/help/gnome-dictionary
-@dirrm share/gnome/help/gnome-character-map/zh_TW/figures
-@dirrm share/gnome/help/gnome-character-map/zh_TW
-@dirrm share/gnome/help/gnome-character-map/zh_CN/figures
-@dirrm share/gnome/help/gnome-character-map/zh_CN
-@dirrm share/gnome/help/gnome-character-map/sv/figures
-@dirrm share/gnome/help/gnome-character-map/sv
-@dirrm share/gnome/help/gnome-character-map/ko/figures
-@dirrm share/gnome/help/gnome-character-map/ko
-@dirrm share/gnome/help/gnome-character-map/ja/figures
-@dirrm share/gnome/help/gnome-character-map/ja
-@dirrm share/gnome/help/gnome-character-map/it/figures
-@dirrm share/gnome/help/gnome-character-map/it
-@dirrm share/gnome/help/gnome-character-map/fr/figures
-@dirrm share/gnome/help/gnome-character-map/fr
-@dirrm share/gnome/help/gnome-character-map/es/figures
-@dirrm share/gnome/help/gnome-character-map/es
-@dirrm share/gnome/help/gnome-character-map/de/figures
-@dirrm share/gnome/help/gnome-character-map/de
-@dirrm share/gnome/help/gnome-character-map/C/figures
-@dirrm share/gnome/help/gnome-character-map/C
-@dirrm share/gnome/help/gnome-character-map
-@dirrm share/gnome/help/gnome-calculator/zh_TW/figures
-@dirrm share/gnome/help/gnome-calculator/zh_TW
-@dirrm share/gnome/help/gnome-calculator/zh_CN/figures
-@dirrm share/gnome/help/gnome-calculator/zh_CN
-@dirrm share/gnome/help/gnome-calculator/sv/figures
-@dirrm share/gnome/help/gnome-calculator/sv
-@dirrm share/gnome/help/gnome-calculator/ko/figures
-@dirrm share/gnome/help/gnome-calculator/ko
-@dirrm share/gnome/help/gnome-calculator/ja/figures
-@dirrm share/gnome/help/gnome-calculator/ja
-@dirrm share/gnome/help/gnome-calculator/it/figures
-@dirrm share/gnome/help/gnome-calculator/it
-@dirrm share/gnome/help/gnome-calculator/fr/figures
-@dirrm share/gnome/help/gnome-calculator/fr
-@dirrm share/gnome/help/gnome-calculator/es/figures
-@dirrm share/gnome/help/gnome-calculator/es
-@dirrm share/gnome/help/gnome-calculator/de/figures
-@dirrm share/gnome/help/gnome-calculator/de
-@dirrm share/gnome/help/gnome-calculator/C/figures
-@dirrm share/gnome/help/gnome-calculator/C
-@dirrm share/gnome/help/gnome-calculator
-@dirrm share/gnome/help/gdialog/ja/figures
-@dirrm share/gnome/help/gdialog/ja
-@dirrm share/gnome/help/gdialog/C/figures
-@dirrm share/gnome/help/gdialog/C
@dirrm share/gnome/gnome-system-log
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-system-log
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-es.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-it.omf 2>/dev/null || /usr/bin/true
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@ -6,11 +6,11 @@
 #

 PORTNAME=	gnomeutils2
-PORTVERSION=	2.2.3
+PORTVERSION=	2.4.0
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-utils/2.2
+MASTER_SITE_SUBDIR=	sources/gnome-utils/2.4
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2

@ -27,8 +27,6 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

-MAN1=	gnome-calculator.1 \
-	gnome-character-map.1 gnome-dictionary.1 \
-	gnome-search-tool.1 gnome-system-log.1 gdialog.1
+MAN1=	gnome-dictionary.1 gnome-search-tool.1 gnome-system-log.1

 .include <bsd.port.mk>
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@ -1 +1 @@
-MD5 (gnome2/gnome-utils-2.2.3.tar.bz2) = 2bde68d39e135a99dfd308a7ec7b6c4a
+MD5 (gnome2/gnome-utils-2.4.0.tar.bz2) = 6986c0b7b5898f1f515add00b946ae48
--- a/deskutils/gnomeutils2/files/patch-ad
+++ b/deskutils/gnomeutils2/files/patch-ad
@ -1,28 +0,0 @@
--- gdialog/dialog.h.orig	Tue Jul  6 16:23:33 1999
-+++ gdialog/dialog.h	Wed Aug 18 11:34:23 1999
-@@ -36,24 +36,7 @@
- #include <gnome.h>
- #endif
- 
-#ifdef ultrix
-#  include <cursesX.h>
-#else
-#  if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
-#    include <ncurses.h>
-#  else
-#    if !defined(_XOPEN_SOURCE_EXTENDED) && !defined(__sgi)
-#        define hacked 1
-#        define _XOPEN_SOURCE_EXTENDED
-#        define _ACS_COMPAT_CODE
-#    endif
-#    include <curses.h>
-#    ifdef hacked
-#        undef _XOPEN_SOURCE_EXTENDED
-#        undef _ACS_COMPAT_CODE
-#    endif
-#  endif
-#endif
-+#include <ncurses.h>
- 
- /*
-  * Change these if you want
--- a/deskutils/gnomeutils2/files/patch-ai
+++ b/deskutils/gnomeutils2/files/patch-ai
@ -1,11 +1,11 @@
--- sgmldocs.make.orig	Mon May  6 23:46:55 2002
-+++ sgmldocs.make	Mon May  6 23:47:10 2002
-@@ -32,7 +32,7 @@
- #   dist-hook: app-dist-hook
- #
- 
+--- xmldocs.make.orig	Thu Aug  7 09:56:16 2003
+++ xmldocs.make	Thu Aug  7 13:55:58 2003
+@@ -36,7 +36,7 @@
+ # **********  Begin of section some packagers may need to modify  **********
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
 -docdir = $(datadir)/gnome/help/$(docname)/$(lang)
 +docdir = $(datadir)/help/$(docname)/$(lang)
 
- doc_DATA = index.html
- 
+ # **********  You should not have to edit below this line  **********
+ xml_files = $(entities) $(docname).xml
--- a/deskutils/gnomeutils2/files/patch-logview_logview.c
+++ b/deskutils/gnomeutils2/files/patch-logview_logview.c
@ -1,5 +1,5 @@
--- logview/logview.c.orig	Sun Feb 16 15:34:59 2003
-+++ logview/logview.c	Wed Apr 23 14:51:26 2003
+--- logview/logview.c.orig	Sun Feb 16 15:36:07 2003
+++ logview/logview.c	Thu Apr 24 12:53:35 2003
@@ -774,7 +774,7 @@
 
 	if ( ! found) {
@ -27,11 +27,3 @@
 		if (access (full_name, R_OK) == 0) {
 			found = TRUE;
 			g_free (cfg->action_db_path);
-@@ -882,7 +882,6 @@
- 		else
- 			prefs->logfile = NULL;
- 	}
-	g_free (logfile);	
- }
- 
- void SaveUserPrefs(UserPrefsStruct *prefs)
--- a/deskutils/gnomeutils2/pkg-descr
+++ b/deskutils/gnomeutils2/pkg-descr
@ -1,3 +1,3 @@
-GNOME 2 support utilities, including an on-the-fly dialog box tool
-(like Zenity), a dictionary, a frontend for find(1), and a system log
-viewer.
+GNOME 2.0 support utilities, including an on-the-fly dialog box tool
+(like Zenity), a dictionary, a frontend for find(1), a system log
+viewer, and more.
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@ -1,19 +1,23 @@
-bin/gdialog
-bin/gnome-calculator
-bin/gnome-character-map
 bin/gnome-dictionary
 bin/gnome-search-tool
 bin/gnome-system-log
+etc/gconf/gconf.xml.defaults/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome-system-log/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log/%gconf.xml
 etc/gconf/schemas/gdict.schemas
+etc/gconf/schemas/gnome-search-tool.schemas
 etc/gconf/schemas/logview.schemas
 libdata/bonobo/servers/GNOME_GDictApplet.server
 libexec/gdict-applet
-share/gnome/applications/gnome-calculator.desktop
-share/gnome/applications/gnome-character-map.desktop
 share/gnome/applications/gnome-dictionary.desktop
 share/gnome/applications/gnome-search-tool.desktop
 share/gnome/applications/gnome-system-log.desktop
@ -21,76 +25,6 @@ share/gnome/gnome-2.0/ui/GNOME_GDictApplet.xml
 share/gnome/gnome-system-log/gnome-system-log-actions.db
 share/gnome/gnome-system-log/gnome-system-log-descript.db
 share/gnome/gnome-system-log/gnome-system-log-regexp.db
-share/gnome/help/gdialog/C/figures/example-dialog.png
-share/gnome/help/gdialog/C/figures/gdialog-msgbox.png
-share/gnome/help/gdialog/C/figures/gdialog-yesno.png
-share/gnome/help/gdialog/C/gdialog.xml
-share/gnome/help/gdialog/C/legal.xml
-share/gnome/help/gdialog/ja/figures/example-dialog.png
-share/gnome/help/gdialog/ja/figures/gdialog-msgbox.png
-share/gnome/help/gdialog/ja/figures/gdialog-yesno.png
-share/gnome/help/gdialog/ja/gdialog.xml
-share/gnome/help/gdialog/ja/legal.xml
-share/gnome/help/gnome-calculator/C/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/C/gnome-calculator.xml
-share/gnome/help/gnome-calculator/C/legal.xml
-share/gnome/help/gnome-calculator/de/figures/gcalc-main.png
-share/gnome/help/gnome-calculator/de/gnome-calculator.xml
-share/gnome/help/gnome-calculator/de/legal.xml
-share/gnome/help/gnome-calculator/es/figures/gcalc-main.png
-share/gnome/help/gnome-calculator/es/gnome-calculator.xml
-share/gnome/help/gnome-calculator/es/legal.xml
-share/gnome/help/gnome-calculator/fr/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/fr/gnome-calculator.xml
-share/gnome/help/gnome-calculator/fr/legal.xml
-share/gnome/help/gnome-calculator/it/figures/gcalc-main.png
-share/gnome/help/gnome-calculator/it/gnome-calculator.xml
-share/gnome/help/gnome-calculator/it/legal.xml
-share/gnome/help/gnome-calculator/ja/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/ja/gnome-calculator.xml
-share/gnome/help/gnome-calculator/ja/legal.xml
-share/gnome/help/gnome-calculator/ko/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/ko/gnome-calculator.xml
-share/gnome/help/gnome-calculator/ko/legal.xml
-share/gnome/help/gnome-calculator/sv/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/sv/gnome-calculator.xml
-share/gnome/help/gnome-calculator/sv/legal.xml
-share/gnome/help/gnome-calculator/zh_CN/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/zh_CN/gnome-calculator.xml
-share/gnome/help/gnome-calculator/zh_CN/legal.xml
-share/gnome/help/gnome-calculator/zh_TW/figures/gcalc_window.png
-share/gnome/help/gnome-calculator/zh_TW/gnome-calculator.xml
-share/gnome/help/gnome-calculator/zh_TW/legal.xml
-share/gnome/help/gnome-character-map/C/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/C/gnome-character-map.xml
-share/gnome/help/gnome-character-map/C/legal.xml
-share/gnome/help/gnome-character-map/de/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/de/gnome-character-map.xml
-share/gnome/help/gnome-character-map/de/legal.xml
-share/gnome/help/gnome-character-map/es/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/es/gnome-character-map.xml
-share/gnome/help/gnome-character-map/es/legal.xml
-share/gnome/help/gnome-character-map/fr/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/fr/gnome-character-map.xml
-share/gnome/help/gnome-character-map/fr/legal.xml
-share/gnome/help/gnome-character-map/it/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/it/gnome-character-map.xml
-share/gnome/help/gnome-character-map/it/legal.xml
-share/gnome/help/gnome-character-map/ja/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/ja/gnome-character-map.xml
-share/gnome/help/gnome-character-map/ja/legal.xml
-share/gnome/help/gnome-character-map/ko/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/ko/gnome-character-map.xml
-share/gnome/help/gnome-character-map/ko/legal.xml
-share/gnome/help/gnome-character-map/sv/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/sv/gnome-character-map.xml
-share/gnome/help/gnome-character-map/sv/legal.xml
-share/gnome/help/gnome-character-map/zh_CN/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/zh_CN/gnome-character-map.xml
-share/gnome/help/gnome-character-map/zh_CN/legal.xml
-share/gnome/help/gnome-character-map/zh_TW/figures/gnome-character-map.png
-share/gnome/help/gnome-character-map/zh_TW/gnome-character-map.xml
-share/gnome/help/gnome-character-map/zh_TW/legal.xml
 share/gnome/help/gnome-dictionary/C/figures/gdict_applet.png
 share/gnome/help/gnome-dictionary/C/figures/gdict_window.png
 share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
@ -102,9 +36,6 @@ share/gnome/help/gnome-dictionary/ja/legal.xml
 share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/C/legal.xml
-share/gnome/help/gnome-search-tool/de/figures/gnome-search-tool_window.png
-share/gnome/help/gnome-search-tool/de/gnome-search-tool.xml
-share/gnome/help/gnome-search-tool/de/legal.xml
 share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/es/legal.xml
@ -159,58 +90,12 @@ share/gnome/help/gnome-system-log/zh_CN/legal.xml
 share/gnome/help/gnome-system-log/zh_TW/figures/syslog_window.png
 share/gnome/help/gnome-system-log/zh_TW/gnome-system-log.xml
 share/gnome/help/gnome-system-log/zh_TW/legal.xml
-share/gnome/omf/gnome-utils/gdialog-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gdialog-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gdialog-ja.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-de.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-es.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-es.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-fr.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-fr.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-it.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-it.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ja.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-ko.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ko.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-de.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-es.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-es.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-fr.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-fr.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-it.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-it.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-ja.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ja.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-ko.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ko.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-sv.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-sv.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-dictionary-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-search-tool-C.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
-share/gnome/omf/gnome-utils/gnome-search-tool-de.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-de.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-search-tool-es.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-es.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf
@ -248,15 +133,17 @@ share/gnome/omf/gnome-utils/gnome-system-log-zh_CN.omf
 share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-utils/gnome-system-log-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gdict.png
-share/gnome/pixmaps/gnome-character-map.png
+share/gnome/pixmaps/gnome-search-tool/gnome-search-tool-animation.png
 share/gnome/pixmaps/gnome-searchtool.png
 share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/bn/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/cy/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-utils-2.0.mo
@ -272,6 +159,7 @@ share/locale/gl/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/he/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/hi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/id/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-utils-2.0.mo
@ -291,6 +179,7 @@ share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-utils-2.0.mo
@ -301,7 +190,7 @@ share/locale/vi/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
-@dirrm share/gnome/pixmaps/gnome-system-log
+@dirrm share/gnome/pixmaps/gnome-search-tool
@dirrm share/gnome/help/gnome-system-log/zh_TW/figures
@dirrm share/gnome/help/gnome-system-log/zh_TW
@dirrm share/gnome/help/gnome-system-log/zh_CN/figures
@ -339,8 +228,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-search-tool/fr
@dirrm share/gnome/help/gnome-search-tool/es/figures
@dirrm share/gnome/help/gnome-search-tool/es
-@dirrm share/gnome/help/gnome-search-tool/de/figures
-@dirrm share/gnome/help/gnome-search-tool/de
@dirrm share/gnome/help/gnome-search-tool/C/figures
@dirrm share/gnome/help/gnome-search-tool/C
@dirrm share/gnome/help/gnome-search-tool
@ -349,83 +236,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
@dirrm share/gnome/help/gnome-dictionary/C/figures
@dirrm share/gnome/help/gnome-dictionary/C
@dirrm share/gnome/help/gnome-dictionary
-@dirrm share/gnome/help/gnome-character-map/zh_TW/figures
-@dirrm share/gnome/help/gnome-character-map/zh_TW
-@dirrm share/gnome/help/gnome-character-map/zh_CN/figures
-@dirrm share/gnome/help/gnome-character-map/zh_CN
-@dirrm share/gnome/help/gnome-character-map/sv/figures
-@dirrm share/gnome/help/gnome-character-map/sv
-@dirrm share/gnome/help/gnome-character-map/ko/figures
-@dirrm share/gnome/help/gnome-character-map/ko
-@dirrm share/gnome/help/gnome-character-map/ja/figures
-@dirrm share/gnome/help/gnome-character-map/ja
-@dirrm share/gnome/help/gnome-character-map/it/figures
-@dirrm share/gnome/help/gnome-character-map/it
-@dirrm share/gnome/help/gnome-character-map/fr/figures
-@dirrm share/gnome/help/gnome-character-map/fr
-@dirrm share/gnome/help/gnome-character-map/es/figures
-@dirrm share/gnome/help/gnome-character-map/es
-@dirrm share/gnome/help/gnome-character-map/de/figures
-@dirrm share/gnome/help/gnome-character-map/de
-@dirrm share/gnome/help/gnome-character-map/C/figures
-@dirrm share/gnome/help/gnome-character-map/C
-@dirrm share/gnome/help/gnome-character-map
-@dirrm share/gnome/help/gnome-calculator/zh_TW/figures
-@dirrm share/gnome/help/gnome-calculator/zh_TW
-@dirrm share/gnome/help/gnome-calculator/zh_CN/figures
-@dirrm share/gnome/help/gnome-calculator/zh_CN
-@dirrm share/gnome/help/gnome-calculator/sv/figures
-@dirrm share/gnome/help/gnome-calculator/sv
-@dirrm share/gnome/help/gnome-calculator/ko/figures
-@dirrm share/gnome/help/gnome-calculator/ko
-@dirrm share/gnome/help/gnome-calculator/ja/figures
-@dirrm share/gnome/help/gnome-calculator/ja
-@dirrm share/gnome/help/gnome-calculator/it/figures
-@dirrm share/gnome/help/gnome-calculator/it
-@dirrm share/gnome/help/gnome-calculator/fr/figures
-@dirrm share/gnome/help/gnome-calculator/fr
-@dirrm share/gnome/help/gnome-calculator/es/figures
-@dirrm share/gnome/help/gnome-calculator/es
-@dirrm share/gnome/help/gnome-calculator/de/figures
-@dirrm share/gnome/help/gnome-calculator/de
-@dirrm share/gnome/help/gnome-calculator/C/figures
-@dirrm share/gnome/help/gnome-calculator/C
-@dirrm share/gnome/help/gnome-calculator
-@dirrm share/gnome/help/gdialog/ja/figures
-@dirrm share/gnome/help/gdialog/ja
-@dirrm share/gnome/help/gdialog/C/figures
-@dirrm share/gnome/help/gdialog/C
@dirrm share/gnome/gnome-system-log
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-system-log
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool/select
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-search-tool
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-system-log
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool/select
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-search-tool
@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gdialog-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-calculator-zh_TW.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-character-map-zh_TW.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-C.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-dictionary-ja.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-es.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-fr.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-utils/gnome-search-tool-it.omf 2>/dev/null || /usr/bin/true
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@ -6,10 +6,10 @@
 #

 PORTNAME=	ORBit2
-PORTVERSION=	2.6.3
+PORTVERSION=	2.8.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
 DIST_SUBDIR=	gnome2

 MAINTAINER=	gnome@FreeBSD.org
@ -22,8 +22,10 @@ USE_GMAKE=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomehack libidl linc
-CONFIGURE_ARGS= --disable-indent
+USE_GNOME=	gnomehack libidl
+CONFIGURE_ARGS= --disable-indent \
+		--with-html-dir=${PREFIX}/share/doc \
+		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

--- a/devel/ORBit2/distinfo
+++ b/devel/ORBit2/distinfo
@ -1 +1 @@
-MD5 (gnome2/ORBit2-2.6.3.tar.bz2) = b6fc2b71018c46b2da607510492c597f
+MD5 (gnome2/ORBit2-2.8.1.tar.bz2) = 062674985948deebf9f8a9117c3c7754
--- a/devel/ORBit2/files/patch-ORBit-2.0.pc.in
+++ b/devel/ORBit2/files/patch-ORBit-2.0.pc.in
@ -0,0 +1,10 @@
+--- ORBit-2.0.pc.in.orig	Sat May 31 11:04:33 2003
+++ ORBit-2.0.pc.in	Sun Jun 15 01:31:20 2003
+@@ -8,6 +8,6 @@
+ Name: ORBit-2.0
+ Description: High-performance CORBA Object Request Broker.
+ Version: @ORBIT_VERSION@
+-Requires: glib-2.0 gmodule-2.0
+Requires: glib-2.0 gmodule-2.0 gthread-2.0
+ Libs: -L${libdir} -lORBit-2 @ORBIT_LIBS@ @LIBS@ -lm
+ Cflags: -I${includedir}/orbit-2.0 -DORBIT2=1
--- a/devel/ORBit2/files/patch-ab
+++ b/devel/ORBit2/files/patch-ab
@ -1,5 +1,5 @@
--- Makefile.in.orig	Sat Oct 19 15:24:09 2002
-+++ Makefile.in	Sat Oct 19 15:25:58 2002
+--- Makefile.in.orig	Sat Jun 14 01:50:29 2003
+++ Makefile.in	Sat Jun 14 01:51:03 2003
@@ -35,7 +35,7 @@
 DESTDIR =
 
@ -9,16 +9,12 @@
 pkgincludedir = $(includedir)/@PACKAGE@
 
 top_builddir = .
-@@ -97,11 +97,10 @@
- STRIP = @STRIP@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
-pkglibdir = @pkglibdir@
+@@ -115,7 +115,7 @@
 
 AUTOMAKE_OPTIONS = 1.3
 
-SUBDIRS = src include test docs
-+SUBDIRS = src include docs
+-SUBDIRS = linc2 src include test docs
+SUBDIRS = linc2 src include docs
 
 bin_SCRIPTS = orbit2-config
 
--- a/devel/ORBit2/files/patch-src::orb::util::Makefile.in
+++ b/devel/ORBit2/files/patch-src::orb::util::Makefile.in
@ -1,6 +1,6 @@
--- src/orb/util/Makefile.in.orig	Mon Jul 21 11:21:48 2003
-+++ src/orb/util/Makefile.in	Mon Jul 21 11:22:19 2003
-@@ -104,7 +104,7 @@
+--- src/orb/util/Makefile.in.orig	Tue Jul 15 13:16:53 2003
+++ src/orb/util/Makefile.in	Tue Jul 15 13:17:32 2003
+@@ -189,7 +189,7 @@
 INCLUDES = \
 	-I$(top_srcdir)/include				\
 	-I$(top_builddir)/include			\
--- a/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c
+++ b/devel/ORBit2/files/patch-src_idl-compiler_orbit-idl-backend.c
@ -4,7 +4,7 @@
 	char **strv;
 	int    i;
 
-+	paths = g_slist_prepend (paths, "/usr/X11R6/lib/orbit-2.0/idl-backends");
+	paths = g_slist_prepend (paths, "%%X11BASE%%/lib/orbit-2.0/idl-backends");
 +
 	if (!(val = getenv ("GNOME2_PATH")))
 		return paths;
--- a/devel/ORBit2/pkg-plist
+++ b/devel/ORBit2/pkg-plist
@ -1,3 +1,4 @@
+bin/linc-cleanup-sockets
 bin/orbit-idl-2
 bin/orbit2-config
@unexec if cmp -s %D/etc/orbit2rc.default %D/etc/orbit2rc; then rm -f %D/etc/orbit2rc; fi
@ -7,14 +8,6 @@ include/orbit-2.0/ORBitservices/CosNaming.h
 include/orbit-2.0/ORBitservices/CosNaming_impl.h
 include/orbit-2.0/ORBitservices/orbit-imodule.h
 include/orbit-2.0/orbit-idl/orbit-idl-backend.h
-include/orbit-2.0/orbit/GIOP/giop-basics.h
-include/orbit-2.0/orbit/GIOP/giop-connection.h
-include/orbit-2.0/orbit/GIOP/giop-endian.h
-include/orbit-2.0/orbit/GIOP/giop-recv-buffer.h
-include/orbit-2.0/orbit/GIOP/giop-send-buffer.h
-include/orbit-2.0/orbit/GIOP/giop-server.h
-include/orbit-2.0/orbit/GIOP/giop-types.h
-include/orbit-2.0/orbit/GIOP/giop.h
 include/orbit-2.0/orbit/dynamic/dynamic-defs.h
 include/orbit-2.0/orbit/dynamic/dynamic.h
 include/orbit-2.0/orbit/orb-core/allocators.h
@ -71,14 +64,24 @@ libdata/pkgconfig/ORBit-idl-2.0.pc
 libdata/pkgconfig/ORBit-imodule-2.0.pc
 libdata/pkgconfig/ORBit-CosNaming-2.0.pc
 share/aclocal/ORBit2.m4
+share/doc/ORBit2/ORBit2-orbit2-allocators.html
+share/doc/ORBit2/ORBit2-orbit2-small.html
+share/doc/ORBit2/ORBit2.devhelp
+share/doc/ORBit2/general.html
+share/doc/ORBit2/home.png
+share/doc/ORBit2/index.html
+share/doc/ORBit2/index.sgml
+share/doc/ORBit2/left.png
+share/doc/ORBit2/right.png
+share/doc/ORBit2/up.png
 share/idl/orbit-2.0/CosNaming.idl
@dirrm share/idl/orbit-2.0
+@dirrm share/doc/ORBit2
@unexec /bin/rmdir %D/share/idl 2>/dev/null || /usr/bin/true
@dirrm include/orbit-2.0/orbit/util
@dirrm include/orbit-2.0/orbit/poa
@dirrm include/orbit-2.0/orbit/orb-core
@dirrm include/orbit-2.0/orbit/dynamic
-@dirrm include/orbit-2.0/orbit/GIOP
@dirrm include/orbit-2.0/orbit
@dirrm include/orbit-2.0/orbit-idl
@dirrm include/orbit-2.0/ORBitservices
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@ -6,16 +6,11 @@
 #

 PORTNAME=	atk
-PORTVERSION=	1.2.4
+PORTVERSION=	1.4.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		ftp://ftp.gtk.org/pub/gtk/v2.0/
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
-#MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
-#		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
-#		http://www.ameth.org/gimp/%SUBDIR%/ \
-#		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-#MASTER_SITE_SUBDIR=	gtk/v1.3
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
 DIST_SUBDIR=	gnome2

 MAINTAINER=	gnome@FreeBSD.org
--- a/devel/atk/distinfo
+++ b/devel/atk/distinfo
@ -1 +1 @@
-MD5 (gnome2/atk-1.2.4.tar.bz2) = 2d6d50df31abe0e8892b5d3e7676a02d
+MD5 (gnome2/atk-1.4.0.tar.bz2) = e501dde880fb2bbe77e428cfa2ee25f6
--- a/devel/atk/pkg-descr
+++ b/devel/atk/pkg-descr
@ -1,3 +1,12 @@
-GNOME accessibility toolkit (ATK).
+Accessibility means helping people with disabilities to participate in
+substantial life activities. That includes work, and the use of services,
+products, and information. GNOME includes libraries and a support framework
+that allow people with disabilities to utilize all of the functionality of the
+GNOME user environment.
+
+The GNOME Accessibility Toolkit (ATK) describes a set of interfaces that need
+to be implemented by GUI components to make them accessible. The interfaces are
+toolkit-independent-- implementations could be written for any widget set, such
+as GTK, Motif or Qt.

 WWW: http://developer.gnome.org/projects/gap/
--- a/devel/atk/pkg-plist
+++ b/devel/atk/pkg-plist
@ -26,38 +26,39 @@ include/atk-1.0/atk/atkutil.h
 include/atk-1.0/atk/atkvalue.h
 lib/libatk-1.0.a
 lib/libatk-1.0.so
-lib/libatk-1.0.so.200
+lib/libatk-1.0.so.400
 libdata/pkgconfig/atk.pc
-share/doc/atk/atk-atkstate.html
-share/doc/atk/atk.html
-share/doc/atk/atkaction.html
-share/doc/atk/atkcomponent.html
-share/doc/atk/atkdocument.html
-share/doc/atk/atkeditabletext.html
-share/doc/atk/atkgobjectaccessible.html
-share/doc/atk/atkhyperlink.html
-share/doc/atk/atkhypertext.html
-share/doc/atk/atkimage.html
-share/doc/atk/atknoopobject.html
-share/doc/atk/atknoopobjectfactory.html
-share/doc/atk/atkobject.html
-share/doc/atk/atkobjectfactory.html
-share/doc/atk/atkregistry.html
-share/doc/atk/atkrelation.html
-share/doc/atk/atkrelationset.html
-share/doc/atk/atkselection.html
-share/doc/atk/atkstateset.html
-share/doc/atk/atkstreamablecontent.html
-share/doc/atk/atktable.html
-share/doc/atk/atktext.html
-share/doc/atk/atkutil.html
-share/doc/atk/atkvalue.html
-share/doc/atk/book1.html
-share/doc/atk/home.png
-share/doc/atk/index.sgml
-share/doc/atk/left.png
-share/doc/atk/right.png
-share/doc/atk/up.png
+%%DOCSDIR%%/AtkAction.html
+%%DOCSDIR%%/AtkComponent.html
+%%DOCSDIR%%/AtkDocument.html
+%%DOCSDIR%%/AtkEditableText.html
+%%DOCSDIR%%/AtkGObjectAccessible.html
+%%DOCSDIR%%/AtkHyperlink.html
+%%DOCSDIR%%/AtkHypertext.html
+%%DOCSDIR%%/AtkImage.html
+%%DOCSDIR%%/AtkNoOpObject.html
+%%DOCSDIR%%/AtkNoOpObjectFactory.html
+%%DOCSDIR%%/AtkObject.html
+%%DOCSDIR%%/AtkObjectFactory.html
+%%DOCSDIR%%/AtkRegistry.html
+%%DOCSDIR%%/AtkRelation.html
+%%DOCSDIR%%/AtkRelationSet.html
+%%DOCSDIR%%/AtkSelection.html
+%%DOCSDIR%%/AtkStateSet.html
+%%DOCSDIR%%/AtkStreamableContent.html
+%%DOCSDIR%%/AtkTable.html
+%%DOCSDIR%%/AtkText.html
+%%DOCSDIR%%/AtkUtil.html
+%%DOCSDIR%%/AtkValue.html
+%%DOCSDIR%%/atk-AtkState.html
+%%DOCSDIR%%/atk.devhelp
+%%DOCSDIR%%/atk.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/up.png
 share/locale/am/LC_MESSAGES/atk10.mo
 share/locale/az/LC_MESSAGES/atk10.mo
 share/locale/be/LC_MESSAGES/atk10.mo
@ -65,6 +66,7 @@ share/locale/bg/LC_MESSAGES/atk10.mo
 share/locale/bn/LC_MESSAGES/atk10.mo
 share/locale/ca/LC_MESSAGES/atk10.mo
 share/locale/cs/LC_MESSAGES/atk10.mo
+share/locale/cy/LC_MESSAGES/atk10.mo
 share/locale/da/LC_MESSAGES/atk10.mo
 share/locale/de/LC_MESSAGES/atk10.mo
 share/locale/el/LC_MESSAGES/atk10.mo
@ -74,6 +76,7 @@ share/locale/es/LC_MESSAGES/atk10.mo
 share/locale/fa/LC_MESSAGES/atk10.mo
 share/locale/fi/LC_MESSAGES/atk10.mo
 share/locale/fr/LC_MESSAGES/atk10.mo
+share/locale/ga/LC_MESSAGES/atk10.mo
 share/locale/he/LC_MESSAGES/atk10.mo
 share/locale/hi/LC_MESSAGES/atk10.mo
 share/locale/hu/LC_MESSAGES/atk10.mo
@ -83,11 +86,13 @@ share/locale/it/LC_MESSAGES/atk10.mo
 share/locale/ja/LC_MESSAGES/atk10.mo
 share/locale/kn/LC_MESSAGES/atk10.mo
 share/locale/ko/LC_MESSAGES/atk10.mo
+share/locale/li/LC_MESSAGES/atk10.mo
 share/locale/lv/LC_MESSAGES/atk10.mo
 share/locale/mk/LC_MESSAGES/atk10.mo
 share/locale/ml/LC_MESSAGES/atk10.mo
 share/locale/mn/LC_MESSAGES/atk10.mo
 share/locale/ms/LC_MESSAGES/atk10.mo
+share/locale/ne/LC_MESSAGES/atk10.mo
 share/locale/nl/LC_MESSAGES/atk10.mo
 share/locale/no/LC_MESSAGES/atk10.mo
 share/locale/pl/LC_MESSAGES/atk10.mo
@ -108,6 +113,6 @@ share/locale/vi/LC_MESSAGES/atk10.mo
 share/locale/yi/LC_MESSAGES/atk10.mo
 share/locale/zh_CN/LC_MESSAGES/atk10.mo
 share/locale/zh_TW/LC_MESSAGES/atk10.mo
-@dirrm share/doc/atk
+@dirrm %%DOCSDIR%%
@dirrm include/atk-1.0/atk
@dirrm include/atk-1.0
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@ -6,10 +6,10 @@
 #

 PORTNAME=	bugbuddy2
-PORTVERSION=	2.2.106
+PORTVERSION=	2.4.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/bug-buddy/2.2
+MASTER_SITE_SUBDIR=	sources/bug-buddy/2.4
 DISTNAME=	bug-buddy-${PORTVERSION}
 DIST_SUBDIR=	gnome2

--- a/devel/bugbuddy2/distinfo
+++ b/devel/bugbuddy2/distinfo
@ -1 +1 @@
-MD5 (gnome2/bug-buddy-2.2.106.tar.bz2) = 6f3ed4b1d3c6aed67cb74615f36b9cf6
+MD5 (gnome2/bug-buddy-2.4.0.tar.bz2) = 505e0d53826f0159ac101f0eef936c5f
--- a/devel/bugbuddy2/pkg-plist
+++ b/devel/bugbuddy2/pkg-plist
@ -26,8 +26,10 @@ share/locale/ar/LC_MESSAGES/bug-buddy.mo
 share/locale/az/LC_MESSAGES/bug-buddy.mo
 share/locale/be/LC_MESSAGES/bug-buddy.mo
 share/locale/bg/LC_MESSAGES/bug-buddy.mo
+share/locale/bn/LC_MESSAGES/bug-buddy.mo
 share/locale/ca/LC_MESSAGES/bug-buddy.mo
 share/locale/cs/LC_MESSAGES/bug-buddy.mo
+share/locale/cy/LC_MESSAGES/bug-buddy.mo
 share/locale/da/LC_MESSAGES/bug-buddy.mo
 share/locale/de/LC_MESSAGES/bug-buddy.mo
 share/locale/el/LC_MESSAGES/bug-buddy.mo
@ -40,6 +42,7 @@ share/locale/fr/LC_MESSAGES/bug-buddy.mo
 share/locale/ga/LC_MESSAGES/bug-buddy.mo
 share/locale/gl/LC_MESSAGES/bug-buddy.mo
 share/locale/he/LC_MESSAGES/bug-buddy.mo
+share/locale/hi/LC_MESSAGES/bug-buddy.mo
 share/locale/hu/LC_MESSAGES/bug-buddy.mo
 share/locale/id/LC_MESSAGES/bug-buddy.mo
 share/locale/it/LC_MESSAGES/bug-buddy.mo
@ -65,6 +68,7 @@ share/locale/sq/LC_MESSAGES/bug-buddy.mo
 share/locale/sr/LC_MESSAGES/bug-buddy.mo
 share/locale/sr@Latn/LC_MESSAGES/bug-buddy.mo
 share/locale/sv/LC_MESSAGES/bug-buddy.mo
+share/locale/th/LC_MESSAGES/bug-buddy.mo
 share/locale/tr/LC_MESSAGES/bug-buddy.mo
 share/locale/uk/LC_MESSAGES/bug-buddy.mo
 share/locale/vi/LC_MESSAGES/bug-buddy.mo
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@ -6,10 +6,10 @@
 #

 PORTNAME=	gconf2
-PORTVERSION=	2.2.1
+PORTVERSION=	2.4.0.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/GConf/2.2
+MASTER_SITE_SUBDIR=	sources/GConf/2.4
 DISTNAME=	GConf-${PORTVERSION}
 DIST_SUBDIR=	gnome2

@ -20,10 +20,11 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomehack gnomehier orbit2 libxml2 gtk20
+USE_GNOME=	gnomehack gnomehier orbit2 gtk20 libxml2 linc
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
+		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@ -1 +1 @@
-MD5 (gnome2/GConf-2.2.1.tar.bz2) = 3788a2e63f200478caf2b16059327076
+MD5 (gnome2/GConf-2.4.0.1.tar.bz2) = 2f7548d0bad24d7c4beba54d0ec98a20
--- a/devel/gconf2/files/patch-backends::bdb-backend.c
+++ b/devel/gconf2/files/patch-backends::bdb-backend.c
@ -1,17 +0,0 @@
-
-$FreeBSD$
-
--- backends/bdb-backend.c	2002/02/15 19:10:46	1.1
-+++ backends/bdb-backend.c	2002/02/15 19:11:25
-@@ -29,10 +29,9 @@
- #include <gconf/gconf-internals.h>
- #include <gconf/gconf.h>
- 
-+#include "config.h"
- #include "bdb.h"
- #include "dir-utils.h"
-
-#include <db.h>
- 
- #include <stdio.h>
- #include <time.h>
--- a/devel/gconf2/files/patch-configure
+++ b/devel/gconf2/files/patch-configure
@ -1,9 +1,6 @@
-
-$FreeBSD$
-
--- configure.orig	Fri Apr 26 12:18:08 2002
-+++ configure	Fri Apr 26 12:18:36 2002
-@@ -6797,6 +6797,7 @@
+--- configure.orig	Sat May  3 13:11:21 2003
+++ configure	Sun Jun 15 01:22:52 2003
+@@ -8029,6 +8029,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@ -11,12 +8,3 @@ $FreeBSD$
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -7513,7 +7514,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-	    for db3libs in "-ldb-3.3" "-ldb-3.2" "-ldb-3.1" "-ldb-3"; do
-+	    for db3libs in "-ldb-3.3" "-ldb-3.2" "-ldb-3.1" "-ldb-3" "-ldb3"; do
- 		if test "x${with_db3_libs}" != "x"; then
- 			LIBS="$LIBS -L$with_db3_libs $db3libs"
- 		else
--- a/devel/gconf2/files/patch-gconf::gconf-internals.c
+++ b/devel/gconf2/files/patch-gconf::gconf-internals.c
@ -1,15 +0,0 @@
-
-$FreeBSD$
-
--- gconf/gconf-internals.c	2002/02/15 19:13:07	1.1
-+++ gconf/gconf-internals.c	2002/02/15 19:13:32
-@@ -26,6 +26,9 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#include <arpa/inet.h>
- #include <unistd.h>
- #include <stdlib.h>
- #include <stdio.h>
--- a/devel/gconf2/pkg-descr
+++ b/devel/gconf2/pkg-descr
@ -1,4 +1,22 @@
-GConf is a configuration database system for the GNOME desktop,
-functionally similar to the Windows registry but lots better :-)
+GConf attempts to leapfrog the registry concept. It's a library which provides
+a simple configuration data storage interface to applications, and also an
+architecture that tries to make things easy for system administrators.
+
+Here are some of the features of GConf:
+
+    * Replaceable backend architecture.
+
+    * Configuration key documentation. Applications can install documentation
+      along with their configuration data, explaining the possible settings and
+      the effect of each configuration key.
+
+    * Data change notification service. If configuration data is changed, all
+      interested applications are notified. The notification service works
+      across the network, affecting all login sessions for a single user.
+
+    * The client API is very abstract.
+
+    * GConf does proper locking so that the configuration data doesn't get
+      corrupted when multiple applications try to use it.

 WWW: http://www.gnome.org/projects/gconf/
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@ -22,8 +22,10 @@ share/locale/ar/LC_MESSAGES/GConf2.mo
 share/locale/az/LC_MESSAGES/GConf2.mo
 share/locale/be/LC_MESSAGES/GConf2.mo
 share/locale/bg/LC_MESSAGES/GConf2.mo
+share/locale/bn/LC_MESSAGES/GConf2.mo
 share/locale/ca/LC_MESSAGES/GConf2.mo
 share/locale/cs/LC_MESSAGES/GConf2.mo
+share/locale/cy/LC_MESSAGES/GConf2.mo
 share/locale/da/LC_MESSAGES/GConf2.mo
 share/locale/de/LC_MESSAGES/GConf2.mo
 share/locale/el/LC_MESSAGES/GConf2.mo
@ -36,6 +38,7 @@ share/locale/ga/LC_MESSAGES/GConf2.mo
 share/locale/gl/LC_MESSAGES/GConf2.mo
 share/locale/hi/LC_MESSAGES/GConf2.mo
 share/locale/hu/LC_MESSAGES/GConf2.mo
+share/locale/id/LC_MESSAGES/GConf2.mo
 share/locale/it/LC_MESSAGES/GConf2.mo
 share/locale/ja/LC_MESSAGES/GConf2.mo
 share/locale/ko/LC_MESSAGES/GConf2.mo
@ -54,6 +57,7 @@ share/locale/ro/LC_MESSAGES/GConf2.mo
 share/locale/ru/LC_MESSAGES/GConf2.mo
 share/locale/sk/LC_MESSAGES/GConf2.mo
 share/locale/sl/LC_MESSAGES/GConf2.mo
+share/locale/sq/LC_MESSAGES/GConf2.mo
 share/locale/sr/LC_MESSAGES/GConf2.mo
 share/locale/sr@Latn/LC_MESSAGES/GConf2.mo
 share/locale/sv/LC_MESSAGES/GConf2.mo
@ -64,8 +68,8 @@ share/locale/yi/LC_MESSAGES/GConf2.mo
 share/locale/zh_CN/LC_MESSAGES/GConf2.mo
 share/locale/zh_TW/LC_MESSAGES/GConf2.mo
 share/sgml/gconf/gconf-1.0.dtd
-@dirrm share/sgml/gconf
@dirrm share/doc/gconf
+@dirrm share/sgml/gconf
@dirrm lib/GConf/2
@dirrm include/gconf/2/gconf
@dirrm include/gconf/2
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@ -6,10 +6,10 @@
 #

 PORTNAME=	gnomevfs2
-PORTVERSION=	2.2.5
+PORTVERSION=	2.4.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.2
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.4
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2

@ -23,7 +23,6 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier gnomemimedata gconf2 libbonobo
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
--- a/devel/gnome-vfs/distinfo
+++ b/devel/gnome-vfs/distinfo
@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.2.5.tar.bz2) = 6ed2702382675c78eed6a96b2296e51d
+MD5 (gnome2/gnome-vfs-2.4.0.tar.bz2) = 2c7908e98b482add387e305619cfe4aa
--- a/devel/gnome-vfs/files/patch-ab
+++ b/devel/gnome-vfs/files/patch-ab
@ -1,11 +1,10 @@
--- Makefile.in.orig	Wed May 21 12:53:27 2003
-+++ Makefile.in	Wed May 21 12:53:59 2003
-@@ -173,7 +173,7 @@
+--- Makefile.in.orig	Mon Aug 11 11:55:08 2003
+++ Makefile.in	Mon Aug 11 12:09:13 2003
+@@ -183,7 +183,6 @@
+ 	devel-docs				\
+ 	doc					\
+ 	programs				\
+-	test					\
+ 	monikers				\
+ 	po
 
- SUBDIRS_GNOME = monikers doc schemas
- 
-SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc						test						monikers					po
-+SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc											monikers					po
- 
- 
- EXTRA_DIST =  	HACKING						TODO						autogen.sh					gnome-vfs.spec					gnome-vfs-2.0.pc.in				gnome-vfs-module-2.0.pc.in			intltool-extract.in				intltool-merge.in				intltool-update.in
--- a/devel/gnome-vfs/files/patch-ac
+++ b/devel/gnome-vfs/files/patch-ac
@ -1,11 +1,11 @@
--- modules/Makefile.in.orig	Thu Aug 29 15:57:06 2002
-+++ modules/Makefile.in	Thu Aug 29 15:58:00 2002
-@@ -180,7 +180,7 @@
- @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la
+--- modules/Makefile.in.orig	Tue May  6 15:39:48 2003
+++ modules/Makefile.in	Tue May  6 15:41:28 2003
+@@ -210,7 +210,7 @@
+ @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la
 @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = 
 
-module_flags = -export_dynamic -avoid-version -module
-+module_flags = -export_dynamic -avoid-version -module $(PTHREAD_LIB)
+-module_flags = -export_dynamic -avoid-version -module -no-undefined
+module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB)
 modulesdir = $(libdir)/gnome-vfs-2.0/modules
 
- modules_LTLIBRARIES =  	$(CDDA_LTLIBS)					libextfs.la					libfile.la					libnntp.la					libvfs-test.la					$(HTTP_LTLIBS)					libbzip2.la					libgzip.la					libftp.la					libvfs-pipe.la					libvfs-translate.la				$(CDEMENU_LTLIBS)                       	libssh.la					libtar.la					$(NULL)
+ modules_LTLIBRARIES = \
--- a/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnome-vfs/files/patch-libgnomevfs::Makefile.in
@ -1,11 +1,11 @@
--- libgnomevfs/Makefile.in.orig	Wed May 21 12:54:14 2003
-+++ libgnomevfs/Makefile.in	Wed May 21 12:55:26 2003
-@@ -216,7 +216,7 @@
+--- libgnomevfs/Makefile.in.orig	Mon Aug 11 12:09:33 2003
+++ libgnomevfs/Makefile.in	Mon Aug 11 12:10:10 2003
+@@ -352,7 +352,7 @@
 # CLEANFILES = $(BUILT_SOURCES)
 
 # Platform specific includes
 -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
 +libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
- libgnomevfsplatforminclude_HEADERS =  	gnome-vfs-file-size.h
- 
+ libgnomevfsplatforminclude_HEADERS = \
+ 	gnome-vfs-file-size.h
 
--- a/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnome-vfs/files/patch-libgnomevfs_gnome-vfs-utils.c
@ -1,6 +1,6 @@
--- libgnomevfs/gnome-vfs-utils.c.orig	Fri Dec 20 16:15:06 2002
-+++ libgnomevfs/gnome-vfs-utils.c	Tue Jan 14 00:54:10 2003
-@@ -40,6 +40,7 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig	Fri Apr 25 06:52:18 2003
+++ libgnomevfs/gnome-vfs-utils.c	Tue May  6 15:44:27 2003
+@@ -42,6 +42,7 @@
 #include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
@ -8,12 +8,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-@@ -861,7 +862,7 @@
+@@ -840,7 +841,7 @@
 	paths = g_strsplit (gnome_var, ":", 0); 
 
 	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
 -		full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL);
 +		full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL);
- 		if (hack_file_exists (full_filename)) {
+ 		if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) {
 			g_strfreev (paths);
 			return full_filename;
--- a/devel/gnome-vfs/pkg-plist
+++ b/devel/gnome-vfs/pkg-plist
@ -1,7 +1,24 @@
+bin/gnomevfs-cat
+bin/gnomevfs-copy
+bin/gnomevfs-info
+bin/gnomevfs-ls
+bin/gnomevfs-mkdir
+etc/gconf/gconf.xml.defaults/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
+etc/gconf/schemas/desktop_default_applications.schemas
 etc/gconf/schemas/system_http_proxy.schemas
 %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
 etc/gnome-vfs-2.0/modules/default-modules.conf
@ -66,7 +83,7 @@ lib/gnome-vfs-2.0/modules/libvfs-test.so
 lib/gnome-vfs-2.0/modules/libvfs-translate.so
 lib/libgnomevfs-2.a
 lib/libgnomevfs-2.so
-lib/libgnomevfs-2.so.0
+lib/libgnomevfs-2.so.400
 lib/vfs/2.0/extfs/README
 lib/vfs/2.0/extfs/a
 lib/vfs/2.0/extfs/ar
@ -89,10 +106,59 @@ libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
 share/doc/gnome-vfs-2.0/about.html
 share/doc/gnome-vfs-2.0/advanced-operations.html
+share/doc/gnome-vfs-2.0/c9456.html
+share/doc/gnome-vfs-2.0/c9466.html
 share/doc/gnome-vfs-2.0/ch08.html
 share/doc/gnome-vfs-2.0/data-types.html
+share/doc/gnome-vfs-2.0/directory-operations.html
+share/doc/gnome-vfs-2.0/everything-else.html
+share/doc/gnome-vfs-2.0/file-operations.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-application-registry.html
+share/doc/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html
+share/doc/gnome-vfs-2.0/gnome-vfs-cancellation.html
+share/doc/gnome-vfs-2.0/gnome-vfs-configuration.html
+share/doc/gnome-vfs-2.0/gnome-vfs-context.html
 share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
+share/doc/gnome-vfs-2.0/gnome-vfs-directory.html
+share/doc/gnome-vfs-2.0/gnome-vfs-file-info.html
 share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html
+share/doc/gnome-vfs-2.0/gnome-vfs-file-size.html
+share/doc/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html
 share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-application-registry.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-async-ops.html
@ -101,6 +167,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-context.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-basic-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-find-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-list-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-advanced-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-basic-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info-ops.html
@ -108,6 +175,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-rw-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-size.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-trunc-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-find-directory.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-inet-connection.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-init.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-method.html
@ -119,6 +187,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-shared.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-parse-ls.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-result.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket-buffer.html
@ -129,11 +198,39 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-transform.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-uri.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-utils.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-xfer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmetadata.html
+share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmimemonitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-inet-connection.html
+share/doc/gnome-vfs-2.0/gnome-vfs-initialization.html
+share/doc/gnome-vfs-2.0/gnome-vfs-iobuf.html
+share/doc/gnome-vfs-2.0/gnome-vfs-method.html
+share/doc/gnome-vfs-2.0/gnome-vfs-mime-handlers.html
+share/doc/gnome-vfs-2.0/gnome-vfs-mime-info.html
+share/doc/gnome-vfs-2.0/gnome-vfs-mime-magic.html
+share/doc/gnome-vfs-2.0/gnome-vfs-mime-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-mime.html
+share/doc/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html
+share/doc/gnome-vfs-2.0/gnome-vfs-module-callbacks.html
+share/doc/gnome-vfs-2.0/gnome-vfs-module-shared.html
+share/doc/gnome-vfs-2.0/gnome-vfs-module.html
+share/doc/gnome-vfs-2.0/gnome-vfs-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-parse-ls.html
+share/doc/gnome-vfs-2.0/gnome-vfs-process.html
+share/doc/gnome-vfs-2.0/gnome-vfs-result.html
+share/doc/gnome-vfs-2.0/gnome-vfs-ssl.html
+share/doc/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html
+share/doc/gnome-vfs-2.0/gnome-vfs-types.html
+share/doc/gnome-vfs-2.0/gnome-vfs-uri.html
+share/doc/gnome-vfs-2.0/gnome-vfs-utils.html
 share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html
+share/doc/gnome-vfs-2.0/gnome-vfs-xfer.html
 share/doc/gnome-vfs-2.0/index.html
 share/doc/gnome-vfs-2.0/index.sgml
 share/doc/gnome-vfs-2.0/mime-registry.html
 share/doc/gnome-vfs-2.0/modules.html
+share/doc/gnome-vfs-2.0/writing-modules.html
+share/doc/gnome-vfs-2.0/x27.html
 share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
@ -143,6 +240,7 @@ share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
@ -163,12 +261,14 @@ share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
@ -202,3 +302,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/system
@dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy
@dirrm etc/gconf/gconf.xml.defaults/schemas/system
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome
+@dirrm etc/gconf/gconf.xml.defaults/desktop
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@ -6,10 +6,10 @@
 #

 PORTNAME=	gnomevfs2
-PORTVERSION=	2.2.5
+PORTVERSION=	2.4.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.2
+MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.4
 DISTNAME=	gnome-vfs-${PORTVERSION}
 DIST_SUBDIR=	gnome2

@ -23,7 +23,6 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier gnomemimedata gconf2 libbonobo
 USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--with-gconf-source=xml::${PREFIX}/etc/gconf/gconf.xml.defaults
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
--- a/devel/gnomevfs2/distinfo
+++ b/devel/gnomevfs2/distinfo
@ -1 +1 @@
-MD5 (gnome2/gnome-vfs-2.2.5.tar.bz2) = 6ed2702382675c78eed6a96b2296e51d
+MD5 (gnome2/gnome-vfs-2.4.0.tar.bz2) = 2c7908e98b482add387e305619cfe4aa
--- a/devel/gnomevfs2/files/patch-ab
+++ b/devel/gnomevfs2/files/patch-ab
@ -1,11 +1,10 @@
--- Makefile.in.orig	Wed May 21 12:53:27 2003
-+++ Makefile.in	Wed May 21 12:53:59 2003
-@@ -173,7 +173,7 @@
+--- Makefile.in.orig	Mon Aug 11 11:55:08 2003
+++ Makefile.in	Mon Aug 11 12:09:13 2003
+@@ -183,7 +183,6 @@
+ 	devel-docs				\
+ 	doc					\
+ 	programs				\
+-	test					\
+ 	monikers				\
+ 	po
 
- SUBDIRS_GNOME = monikers doc schemas
- 
-SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc						test						monikers					po
-+SUBDIRS =  	libgnomevfs					modules						schemas						devel-docs					doc											monikers					po
- 
- 
- EXTRA_DIST =  	HACKING						TODO						autogen.sh					gnome-vfs.spec					gnome-vfs-2.0.pc.in				gnome-vfs-module-2.0.pc.in			intltool-extract.in				intltool-merge.in				intltool-update.in
--- a/devel/gnomevfs2/files/patch-ac
+++ b/devel/gnomevfs2/files/patch-ac
@ -1,11 +1,11 @@
--- modules/Makefile.in.orig	Thu Aug 29 15:57:06 2002
-+++ modules/Makefile.in	Thu Aug 29 15:58:00 2002
-@@ -180,7 +180,7 @@
- @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = libcdemenu-desktop.la
+--- modules/Makefile.in.orig	Tue May  6 15:39:48 2003
+++ modules/Makefile.in	Tue May  6 15:41:28 2003
+@@ -210,7 +210,7 @@
+ @BUILD_CDEMENU_MODULE_TRUE@CDEMENU_LTLIBS = @BUILD_CDEMENU_MODULE_TRUE@libcdemenu-desktop.la
 @BUILD_CDEMENU_MODULE_FALSE@CDEMENU_LTLIBS = 
 
-module_flags = -export_dynamic -avoid-version -module
-+module_flags = -export_dynamic -avoid-version -module $(PTHREAD_LIB)
+-module_flags = -export_dynamic -avoid-version -module -no-undefined
+module_flags = -export_dynamic -avoid-version -module -no-undefined $(PTHREAD_LIB)
 modulesdir = $(libdir)/gnome-vfs-2.0/modules
 
- modules_LTLIBRARIES =  	$(CDDA_LTLIBS)					libextfs.la					libfile.la					libnntp.la					libvfs-test.la					$(HTTP_LTLIBS)					libbzip2.la					libgzip.la					libftp.la					libvfs-pipe.la					libvfs-translate.la				$(CDEMENU_LTLIBS)                       	libssh.la					libtar.la					$(NULL)
+ modules_LTLIBRARIES = \
--- a/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
+++ b/devel/gnomevfs2/files/patch-libgnomevfs::Makefile.in
@ -1,11 +1,11 @@
--- libgnomevfs/Makefile.in.orig	Wed May 21 12:54:14 2003
-+++ libgnomevfs/Makefile.in	Wed May 21 12:55:26 2003
-@@ -216,7 +216,7 @@
+--- libgnomevfs/Makefile.in.orig	Mon Aug 11 12:09:33 2003
+++ libgnomevfs/Makefile.in	Mon Aug 11 12:10:10 2003
+@@ -352,7 +352,7 @@
 # CLEANFILES = $(BUILT_SOURCES)
 
 # Platform specific includes
 -libgnomevfsplatformincludedir = $(libdir)/gnome-vfs-2.0/include
 +libgnomevfsplatformincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
- libgnomevfsplatforminclude_HEADERS =  	gnome-vfs-file-size.h
- 
+ libgnomevfsplatforminclude_HEADERS = \
+ 	gnome-vfs-file-size.h
 
--- a/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
+++ b/devel/gnomevfs2/files/patch-libgnomevfs_gnome-vfs-utils.c
@ -1,6 +1,6 @@
--- libgnomevfs/gnome-vfs-utils.c.orig	Fri Dec 20 16:15:06 2002
-+++ libgnomevfs/gnome-vfs-utils.c	Tue Jan 14 00:54:10 2003
-@@ -40,6 +40,7 @@
+--- libgnomevfs/gnome-vfs-utils.c.orig	Fri Apr 25 06:52:18 2003
+++ libgnomevfs/gnome-vfs-utils.c	Tue May  6 15:44:27 2003
+@@ -42,6 +42,7 @@
 #include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
@ -8,12 +8,12 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-@@ -861,7 +862,7 @@
+@@ -840,7 +841,7 @@
 	paths = g_strsplit (gnome_var, ":", 0); 
 
 	for (temp_paths = paths; *temp_paths != NULL; temp_paths++) {
 -		full_filename = g_strconcat (*temp_paths, "/share/pixmaps/", relative_filename, NULL);
 +		full_filename = g_strconcat (*temp_paths, "/share/gnome/pixmaps/", relative_filename, NULL);
- 		if (hack_file_exists (full_filename)) {
+ 		if (g_file_test (full_filename, G_FILE_TEST_EXISTS)) {
 			g_strfreev (paths);
 			return full_filename;
--- a/devel/gnomevfs2/pkg-plist
+++ b/devel/gnomevfs2/pkg-plist
@ -1,7 +1,24 @@
+bin/gnomevfs-cat
+bin/gnomevfs-copy
+bin/gnomevfs-info
+bin/gnomevfs-ls
+bin/gnomevfs-mkdir
+etc/gconf/gconf.xml.defaults/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/system/http_proxy/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/%gconf.xml
 etc/gconf/gconf.xml.defaults/system/http_proxy/%gconf.xml
+etc/gconf/schemas/desktop_default_applications.schemas
 etc/gconf/schemas/system_http_proxy.schemas
 %%CDPARANOIA%%etc/gnome-vfs-2.0/modules/cdda-module.conf
 etc/gnome-vfs-2.0/modules/default-modules.conf
@ -66,7 +83,7 @@ lib/gnome-vfs-2.0/modules/libvfs-test.so
 lib/gnome-vfs-2.0/modules/libvfs-translate.so
 lib/libgnomevfs-2.a
 lib/libgnomevfs-2.so
-lib/libgnomevfs-2.so.0
+lib/libgnomevfs-2.so.400
 lib/vfs/2.0/extfs/README
 lib/vfs/2.0/extfs/a
 lib/vfs/2.0/extfs/ar
@ -89,10 +106,59 @@ libdata/pkgconfig/gnome-vfs-2.0.pc
 libdata/pkgconfig/gnome-vfs-module-2.0.pc
 share/doc/gnome-vfs-2.0/about.html
 share/doc/gnome-vfs-2.0/advanced-operations.html
+share/doc/gnome-vfs-2.0/c9456.html
+share/doc/gnome-vfs-2.0/c9466.html
 share/doc/gnome-vfs-2.0/ch08.html
 share/doc/gnome-vfs-2.0/data-types.html
+share/doc/gnome-vfs-2.0/directory-operations.html
+share/doc/gnome-vfs-2.0/everything-else.html
+share/doc/gnome-vfs-2.0/file-operations.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-application-registry.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-async-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-cancellation.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-context.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-basic-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-find-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-directory-list-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-advanced-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-basic-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-info.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-rw-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-size.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-file-trunc-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-inet-connection.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-init.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-method.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-database.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-mime.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback-module-api.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-callback.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module-shared.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-module.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-parse-ls.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-result.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket-buffer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-socket.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-ssl.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-standard-callbacks.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-transform.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-uri.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-utils.html
+share/doc/gnome-vfs-2.0/gnome-vfs-20-gnome-vfs-xfer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-application-registry.html
+share/doc/gnome-vfs-2.0/gnome-vfs-asynchronous-operations.html
+share/doc/gnome-vfs-2.0/gnome-vfs-cancellation.html
+share/doc/gnome-vfs-2.0/gnome-vfs-configuration.html
+share/doc/gnome-vfs-2.0/gnome-vfs-context.html
 share/doc/gnome-vfs-2.0/gnome-vfs-directory-operations.html
+share/doc/gnome-vfs-2.0/gnome-vfs-directory.html
+share/doc/gnome-vfs-2.0/gnome-vfs-file-info.html
 share/doc/gnome-vfs-2.0/gnome-vfs-file-operations.html
+share/doc/gnome-vfs-2.0/gnome-vfs-file-size.html
+share/doc/gnome-vfs-2.0/gnome-vfs-finding-special-directories.html
 share/doc/gnome-vfs-2.0/gnome-vfs-first-steps.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-application-registry.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-async-ops.html
@ -101,6 +167,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-context.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-basic-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-find-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory-list-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-directory.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-advanced-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-basic-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info-ops.html
@ -108,6 +175,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-info.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-rw-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-size.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-file-trunc-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-find-directory.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-inet-connection.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-init.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-method.html
@ -119,6 +187,7 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-callback.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module-shared.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-module.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-ops.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-parse-ls.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-result.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-socket-buffer.html
@ -129,11 +198,39 @@ share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-transform.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-uri.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-utils.html
 share/doc/gnome-vfs-2.0/gnome-vfs-gnome-vfs-xfer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmetadata.html
+share/doc/gnome-vfs-2.0/gnome-vfs-gnomevfsmimemonitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-inet-connection.html
+share/doc/gnome-vfs-2.0/gnome-vfs-initialization.html
+share/doc/gnome-vfs-2.0/gnome-vfs-iobuf.html
+share/doc/gnome-vfs-2.0/gnome-vfs-method.html
+share/doc/gnome-vfs-2.0/gnome-vfs-mime-handlers.html
+share/doc/gnome-vfs-2.0/gnome-vfs-mime-info.html
+share/doc/gnome-vfs-2.0/gnome-vfs-mime-magic.html
+share/doc/gnome-vfs-2.0/gnome-vfs-mime-monitor.html
+share/doc/gnome-vfs-2.0/gnome-vfs-mime-sniff-buffer.html
+share/doc/gnome-vfs-2.0/gnome-vfs-mime.html
+share/doc/gnome-vfs-2.0/gnome-vfs-module-callback-module-api.html
+share/doc/gnome-vfs-2.0/gnome-vfs-module-callbacks.html
+share/doc/gnome-vfs-2.0/gnome-vfs-module-shared.html
+share/doc/gnome-vfs-2.0/gnome-vfs-module.html
+share/doc/gnome-vfs-2.0/gnome-vfs-ops.html
+share/doc/gnome-vfs-2.0/gnome-vfs-parse-ls.html
+share/doc/gnome-vfs-2.0/gnome-vfs-process.html
+share/doc/gnome-vfs-2.0/gnome-vfs-result.html
+share/doc/gnome-vfs-2.0/gnome-vfs-ssl.html
+share/doc/gnome-vfs-2.0/gnome-vfs-standard-callbacks.html
+share/doc/gnome-vfs-2.0/gnome-vfs-types.html
+share/doc/gnome-vfs-2.0/gnome-vfs-uri.html
+share/doc/gnome-vfs-2.0/gnome-vfs-utils.html
 share/doc/gnome-vfs-2.0/gnome-vfs-writing-modules.html
+share/doc/gnome-vfs-2.0/gnome-vfs-xfer.html
 share/doc/gnome-vfs-2.0/index.html
 share/doc/gnome-vfs-2.0/index.sgml
 share/doc/gnome-vfs-2.0/mime-registry.html
 share/doc/gnome-vfs-2.0/modules.html
+share/doc/gnome-vfs-2.0/writing-modules.html
+share/doc/gnome-vfs-2.0/x27.html
 share/locale/am/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-vfs-2.0.mo
@ -143,6 +240,7 @@ share/locale/bn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/cy/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-vfs-2.0.mo
@ -163,12 +261,14 @@ share/locale/is/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-vfs-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-vfs-2.0.mo
@ -202,3 +302,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/system
@dirrm etc/gconf/gconf.xml.defaults/schemas/system/http_proxy
@dirrm etc/gconf/gconf.xml.defaults/schemas/system
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/component_viewer
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/component_viewer
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome
+@dirrm etc/gconf/gconf.xml.defaults/desktop
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@ -6,10 +6,10 @@
 #

 PORTNAME=	libbonobo
-PORTVERSION=	2.2.3
+PORTVERSION=	2.4.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
 DIST_SUBDIR=	gnome2

 MAINTAINER=	gnome@FreeBSD.org
@ -18,17 +18,16 @@ COMMENT=	A component and compound document system for GNOME2
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
-USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL=	yes
-USE_GNOME=	gnomehack bonoboactivation
+GNU_CONFIGURE=	yes
+USE_PERL5=	yes
+USE_GNOME=	gnomehack libxml2 orbit2
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 MAKE_ENV=	gnomelocaledir=${PREFIX}/share/locale

-post-patch:
-	@${REINPLACE_CMD} -e "/^SUBDIRS/s/tests//" ${WRKSRC}/Makefile.in
+MAN1=		bonobo-activation-server.1

 .include <bsd.port.mk>
--- a/devel/libbonobo/distinfo
+++ b/devel/libbonobo/distinfo
@ -1 +1 @@
-MD5 (gnome2/libbonobo-2.2.3.tar.bz2) = 706e3f722dc5ece02ae27c14984d9810
+MD5 (gnome2/libbonobo-2.4.0.tar.bz2) = 243a4914ae90d08da7cd34ae41e9cac6
--- a/devel/libbonobo/files/patch-Makefile.in
+++ b/devel/libbonobo/files/patch-Makefile.in
@ -0,0 +1,11 @@
+--- Makefile.in.orig	Wed May  7 13:42:52 2003
+++ Makefile.in	Wed May  7 13:43:30 2003
+@@ -149,7 +149,7 @@
+ SUBDIRS = \
+ 	idl bonobo-activation bonobo \
+ 	activation-server monikers \
+-	utils samples tests doc po
+	utils samples doc po
+ 
+ 
+ libincludedir = $(includedir)/libbonobo-2.0
--- a/devel/libbonobo/files/patch-bonobo-activation::bonobo-activation-fork-server.c
+++ b/devel/libbonobo/files/patch-bonobo-activation::bonobo-activation-fork-server.c
@ -0,0 +1,11 @@
+--- bonobo-activation/bonobo-activation-fork-server.c.orig	Fri Oct 18 06:15:11 2002
+++ bonobo-activation/bonobo-activation-fork-server.c	Sat Oct 19 15:35:03 2002
+@@ -364,6 +364,8 @@
+ 	} else if ((childpid = fork ())) {
+ 		_exit (0);	/* de-zombifier process, just exit */
+ 	} else {
+	    	sigprocmask (SIG_SETMASK, &omask, NULL);
+
+ 		setenv_activation_environment (environment);
+ 
+ 		if (od_iorstr != NULL) {
--- a/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-init.c
+++ b/devel/libbonobo/files/patch-bonobo-activation_bonobo-activation-init.c
@ -0,0 +1,18 @@
+--- bonobo-activation/bonobo-activation-init.c.orig	Sat Jun 14 02:09:52 2003
+++ bonobo-activation/bonobo-activation-init.c	Sat Jun 14 02:10:13 2003
+@@ -34,6 +34,7 @@
+ #include "bonobo-activation-private.h"
+ #include "bonobo-activation-register.h"
+ #include "bonobo-activation-version.h"
+#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <fcntl.h>
+@@ -44,7 +45,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/socket.h>
+-#include <sys/types.h>
+ #include <sys/wait.h>
+ #include <unistd.h>
+ 
--- a/devel/libbonobo/files/patch-ltmain.sh
+++ b/devel/libbonobo/files/patch-ltmain.sh
@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Thu Jun  5 08:09:04 2003
+++ ltmain.sh	Sat Jun 14 01:36:34 2003
+@@ -1280,7 +1280,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
+	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1290,8 +1290,16 @@
+ 	continue
+ 	;;
+ 
+      -pthread)
+      compile_command="$compile_command -pthread"
+      finalize_command="$finalize_command -pthread"
+      compiler_flags="$compiler_flags -pthread"
+      continue
+      ;;
+
+       -module)
+ 	module=yes
+	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -3000,6 +3008,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
+	  *-*-freebsd*)
+	    # FreeBSD doesn't need this...
+	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5428,10 +5439,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
+	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
+	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
--- a/devel/libbonobo/files/patch-server::Makefile.in
+++ b/devel/libbonobo/files/patch-server::Makefile.in
@ -0,0 +1,11 @@
+--- activation-server/Makefile.in.orig	Wed May  7 16:36:09 2003
+++ activation-server/Makefile.in	Wed May  7 16:36:51 2003
+@@ -159,7 +159,7 @@
+ 	-I$(top_builddir) 			\
+ 	-I$(top_builddir)/bonobo-activation	\
+ 	-I$(top_srcdir)/bonobo-activation	\
+-	-DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers\" \
+	-DSERVERINFODIR=\"$(prefix)/libdata/bonobo/servers:${X11BASE}/libdata/bonobo/servers:${LOCALBASE}/libdata/bonobo/servers\" \
+         -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \
+ 	$(SERVER_CFLAGS)			\
+ 	-DSERVER_CONFDIR=\"$(sysconfdir)\"	\
--- a/devel/libbonobo/files/patch-server::activation-server-main.c
+++ b/devel/libbonobo/files/patch-server::activation-server-main.c
@ -0,0 +1,11 @@
+--- activation-server/activation-server-main.c.orig	Fri Oct 18 06:15:12 2002
+++ activation-server/activation-server-main.c	Sat Nov  9 01:50:36 2002
+@@ -127,7 +127,7 @@
+                         g_string_append (gnome_od_source_dir,
+                                          gnome_dirs[i]);
+                         g_string_append (gnome_od_source_dir,
+-                                         "/lib/bonobo/servers:");
+                                         "/libdata/bonobo/servers:");
+                 }
+                 g_strfreev (gnome_dirs);
+                 g_string_append_c (real_od_source_dir, ':');
--- a/devel/libbonobo/files/patch-utils::bonobo-slay.in
+++ b/devel/libbonobo/files/patch-utils::bonobo-slay.in
@ -0,0 +1,21 @@
+--- utils/bonobo-slay.in.orig	Mon Mar 11 12:16:43 2002
+++ utils/bonobo-slay.in	Tue Apr  2 18:30:30 2002
+@@ -56,15 +56,15 @@
+ 
+ # get Bonobo files
+ #
+-@bonobo_dirs = ( "@prefix@/lib/bonobo/servers" );
+@bonobo_dirs = ( "@prefix@/libdata/bonobo/servers" );
+ foreach $dir (split(':', $ENV{'BONOBO_ACTIVATION_INFO_PATH'})) {
+ 	if (-d $dir) {
+ 		push @bonobo_dirs, $dir;
+ 	}
+ }
+ foreach $dir (split(':', $ENV{'GNOME2_PATH'})) {
+-	if (-d "$dir/lib/bonobo/servers") {
+-		push @bonobo_dirs, "$dir/lib/bonobo/servers";
+	if (-d "$dir/libdata/bonobo/servers") {
+		push @bonobo_dirs, "$dir/libdata/bonobo/servers";
+ 	}
+ }
+ 
--- a/devel/libbonobo/pkg-plist
+++ b/devel/libbonobo/pkg-plist
@ -1,9 +1,24 @@
+bin/activation-client
+bin/bonobo-slay
 bin/echo-client-2
+etc/bonobo-activation/bonobo-activation-config.xml
+include/bonobo-activation-2.0/bonobo-activation/Bonobo_Activation_types.h
+include/bonobo-activation-2.0/bonobo-activation/Bonobo_GenericFactory.h
+include/bonobo-activation-2.0/bonobo-activation/Bonobo_Unknown.h
+include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-activate.h
+include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-async.h
+include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-init.h
+include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-register.h
+include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-server-info.h
+include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-shlib.h
+include/bonobo-activation-2.0/bonobo-activation/bonobo-activation-version.h
+include/bonobo-activation-2.0/bonobo-activation/bonobo-activation.h
 include/libbonobo-2.0/bonobo/Bonobo.h
 include/libbonobo-2.0/bonobo/bonobo-arg.h
 include/libbonobo-2.0/bonobo/bonobo-context.h
 include/libbonobo-2.0/bonobo/bonobo-event-source.h
 include/libbonobo-2.0/bonobo/bonobo-exception.h
+include/libbonobo-2.0/bonobo/bonobo-foreign-object.h
 include/libbonobo-2.0/bonobo/bonobo-generic-factory.h
 include/libbonobo-2.0/bonobo/bonobo-i18n.h
 include/libbonobo-2.0/bonobo/bonobo-item-container.h
@ -36,10 +51,112 @@ lib/bonobo/monikers/libmoniker_std_2.so
 lib/libbonobo-2.a
 lib/libbonobo-2.so
 lib/libbonobo-2.so.0
+lib/libbonobo-activation.a
+lib/libbonobo-activation.so
+lib/libbonobo-activation.so.4
 lib/orbit-2.0/Bonobo_module.so
+libdata/bonobo/servers/Bonobo_CosNaming_NamingContext.server
 libdata/bonobo/servers/Bonobo_Moniker_std.server
 libdata/bonobo/servers/Bonobo_Sample_Echo.server
+libdata/pkgconfig/bonobo-activation-2.0.pc
 libdata/pkgconfig/libbonobo-2.0.pc
+libexec/bonobo-activation-server
+sbin/bonobo-activation-sysconf
+share/doc/bonobo-activation/api-reference.html
+share/doc/bonobo-activation/architecture.html
+share/doc/bonobo-activation/async-activation.html
+share/doc/bonobo-activation/attribute-tag.html
+share/doc/bonobo-activation/bonobo-activation-Debugging.html
+share/doc/bonobo-activation/bonobo-activation-Initialization.html
+share/doc/bonobo-activation/bonobo-activation-Query-and-Activation.html
+share/doc/bonobo-activation/bonobo-activation-Registration.html
+share/doc/bonobo-activation/bonobo-activation-Utilities.html
+share/doc/bonobo-activation/bonobo-activation.devhelp
+share/doc/bonobo-activation/bonobo-activation.png
+share/doc/bonobo-activation/checklist.html
+share/doc/bonobo-activation/configuring.html
+share/doc/bonobo-activation/fdl-section1.html
+share/doc/bonobo-activation/fdl-section10.html
+share/doc/bonobo-activation/fdl-section2.html
+share/doc/bonobo-activation/fdl-section3.html
+share/doc/bonobo-activation/fdl-section4.html
+share/doc/bonobo-activation/fdl-section5.html
+share/doc/bonobo-activation/fdl-section6.html
+share/doc/bonobo-activation/fdl-section7.html
+share/doc/bonobo-activation/fdl-section8.html
+share/doc/bonobo-activation/fdl-section9.html
+share/doc/bonobo-activation/fdl-using.html
+share/doc/bonobo-activation/fdl.html
+share/doc/bonobo-activation/home.png
+share/doc/bonobo-activation/index.html
+share/doc/bonobo-activation/index.sgml
+share/doc/bonobo-activation/left.png
+share/doc/bonobo-activation/migrating.html
+share/doc/bonobo-activation/query-langage.html
+share/doc/bonobo-activation/query-syntax.html
+share/doc/bonobo-activation/right.png
+share/doc/bonobo-activation/server-arch.html
+share/doc/bonobo-activation/server-xml-reference.html
+share/doc/bonobo-activation/tutorial.html
+share/doc/bonobo-activation/up.png
+share/doc/libbonobo/debugging.html
+share/doc/libbonobo/factories.html
+share/doc/libbonobo/general.html
+share/doc/libbonobo/home.png
+share/doc/libbonobo/index.html
+share/doc/libbonobo/index.sgml
+share/doc/libbonobo/left.png
+share/doc/libbonobo/libbonobo-bonobo-arg.html
+share/doc/libbonobo/libbonobo-bonobo-config-database.html
+share/doc/libbonobo/libbonobo-bonobo-context.html
+share/doc/libbonobo/libbonobo-bonobo-event-source.html
+share/doc/libbonobo/libbonobo-bonobo-exception.html
+share/doc/libbonobo/libbonobo-bonobo-generic-factory.html
+share/doc/libbonobo/libbonobo-bonobo-i18n.html
+share/doc/libbonobo/libbonobo-bonobo-item-container.html
+share/doc/libbonobo/libbonobo-bonobo-item-handler.html
+share/doc/libbonobo/libbonobo-bonobo-listener.html
+share/doc/libbonobo/libbonobo-bonobo-main.html
+share/doc/libbonobo/libbonobo-bonobo-moniker-context.html
+share/doc/libbonobo/libbonobo-bonobo-moniker-extender.html
+share/doc/libbonobo/libbonobo-bonobo-moniker-simple.html
+share/doc/libbonobo/libbonobo-bonobo-moniker-util.html
+share/doc/libbonobo/libbonobo-bonobo-moniker.html
+share/doc/libbonobo/libbonobo-bonobo-object.html
+share/doc/libbonobo/libbonobo-bonobo-persist-client.html
+share/doc/libbonobo/libbonobo-bonobo-persist-file.html
+share/doc/libbonobo/libbonobo-bonobo-persist-stream.html
+share/doc/libbonobo/libbonobo-bonobo-persist.html
+share/doc/libbonobo/libbonobo-bonobo-property-bag-client.html
+share/doc/libbonobo/libbonobo-bonobo-property-bag.html
+share/doc/libbonobo/libbonobo-bonobo-running-context.html
+share/doc/libbonobo/libbonobo-bonobo-shlib-factory.html
+share/doc/libbonobo/libbonobo-bonobo-shutdown.html
+share/doc/libbonobo/libbonobo-bonobo-storage-memory.html
+share/doc/libbonobo/libbonobo-bonobo-storage.html
+share/doc/libbonobo/libbonobo-bonobo-stream-client.html
+share/doc/libbonobo/libbonobo-bonobo-stream-memory.html
+share/doc/libbonobo/libbonobo-bonobo-types.html
+share/doc/libbonobo/libbonobo-faq.html
+share/doc/libbonobo/libbonobo.devhelp
+share/doc/libbonobo/misc.html
+share/doc/libbonobo/monikers-overview.html
+share/doc/libbonobo/monikers.html
+share/doc/libbonobo/persist-file.png
+share/doc/libbonobo/persist-storage.png
+share/doc/libbonobo/persist-stream.png
+share/doc/libbonobo/persist.html
+share/doc/libbonobo/persist.png
+share/doc/libbonobo/properties.html
+share/doc/libbonobo/property-bags.html
+share/doc/libbonobo/refcounting.html
+share/doc/libbonobo/right.png
+share/doc/libbonobo/running-context.png
+share/doc/libbonobo/storage.png
+share/doc/libbonobo/stream.png
+share/doc/libbonobo/streams.html
+share/doc/libbonobo/unknown.png
+share/doc/libbonobo/up.png
 share/idl/bonobo-2.0/Bonobo.idl
 share/idl/bonobo-2.0/Bonobo_Canvas.idl
 share/idl/bonobo-2.0/Bonobo_Clipboard.idl
@ -58,11 +175,17 @@ share/idl/bonobo-2.0/Bonobo_Sample_Echo.idl
 share/idl/bonobo-2.0/Bonobo_Storage.idl
 share/idl/bonobo-2.0/Bonobo_UI.idl
 share/idl/bonobo-2.0/Bonobo_Zoomable.idl
+share/idl/bonobo-activation-2.0/Bonobo_ActivationContext.idl
+share/idl/bonobo-activation-2.0/Bonobo_Activation_types.idl
+share/idl/bonobo-activation-2.0/Bonobo_GenericFactory.idl
+share/idl/bonobo-activation-2.0/Bonobo_ObjectDirectory.idl
+share/idl/bonobo-activation-2.0/Bonobo_Unknown.idl
 share/locale/am/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ar/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/az/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/be/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/bg/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/bn/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ca/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/cs/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/cy/LC_MESSAGES/libbonobo-2.0.mo
@ -74,13 +197,17 @@ share/locale/es/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/fa/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/fi/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/fr/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/ga/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/gl/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/he/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/hi/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/hu/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/id/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/is/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/it/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ja/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ko/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/li/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/lv/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/mk/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/ml/LC_MESSAGES/libbonobo-2.0.mo
@ -104,15 +231,22 @@ share/locale/ta/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/tr/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/uk/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/vi/LC_MESSAGES/libbonobo-2.0.mo
+share/locale/wa/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/yi/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libbonobo-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libbonobo-2.0.mo
+@dirrm share/idl/bonobo-activation-2.0
@dirrm share/idl/bonobo-2.0
+@dirrm share/doc/bonobo-activation
@dirrm share/doc/libbonobo
-@dirrm lib/orbit-2.0
+@dirrm libdata/bonobo/servers
+@dirrm libdata/bonobo
@dirrm lib/bonobo-2.0/samples
@dirrm lib/bonobo-2.0
@dirrm include/libbonobo-2.0/bonobo
@dirrm include/libbonobo-2.0
+@dirrm include/bonobo-activation-2.0/bonobo-activation
+@dirrm include/bonobo-activation-2.0
+@dirrm etc/bonobo-activation
@unexec /bin/rmdir %D/lib/bonobo/monikers 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/lib/bonobo 2>/dev/null || /usr/bin/true
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@ -6,29 +6,30 @@
 #

 PORTNAME=	gedit2
-PORTVERSION=	2.2.2
+PORTVERSION=	2.4.0
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
 DISTNAME=	gedit-${PORTVERSION}
 DIST_SUBDIR=	gnome2

 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A small but powerful text editor for Gnome 2.0 Desktop Environment
+COMMENT=	A small but powerful text editor for Gnome 2 Desktop Environment

 LIB_DEPENDS=	pspell.15:${PORTSDIR}/textproc/aspell

-WRKSRC=	${WRKDIR}/gedit-${PORTVERSION}
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
+INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeprintui eel2
+USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeprintui libgnomeui \
+	   	eel2 gtksourceview
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
+PLIST_SUB=	VERSION="2.4"

-MAN1=	gedit.1
+MAN1=		gedit.1

 .include <bsd.port.mk>
--- a/editors/gedit2/distinfo
+++ b/editors/gedit2/distinfo
@ -1 +1 @@
-MD5 (gnome2/gedit-2.2.2.tar.bz2) = 9cd866f6e331fb3e5c65ed8200d9d154
+MD5 (gnome2/gedit-2.4.0.tar.bz2) = 0d8039773fd2f533bec4c9653854a4de
--- a/editors/gedit2/pkg-descr
+++ b/editors/gedit2/pkg-descr
@ -2,20 +2,20 @@ gEdit is a text editor for X using the GTK+ and GNOME libraries.
 It is being developed by Alex Roberts, Evan Lawrence and Chris Lahey
 (among others).

-This version is quite a neat text editor, it contains the following
+gEdit is quite a neat text editor. It contains the following
 features:
-	* Opening/Saving/Creating of files;
-	* File Revert;
-	* Cut/Copy/Paste and Select All text;
-	* Complete integration with the GNOME Environment, including GnomeMDI;
-	* Search and Replace;
-	* Global search;	
-	* A complete preferences interface;
-	* Dynamically loading fonts;
-	* Splitscreen Mode;
-	* Printing support; 
-	* Configurable Plugins system;
-	* Configurable window sizing;
-	* Unlimited Undo/Redo.
+	* Opening/Saving/Creating files
+	* File Revert
+	* Cut/Copy/Paste and Select All text
+	* Complete integration with the GNOME Environment, including GnomeMDI
+	* Search and Replace
+	* Global search
+	* A complete preferences interface
+	* Dynamically loading fonts
+	* Splitscreen Mode
+	* Printing support 
+	* Configurable Plugins system
+	* Configurable window sizing
+	* Unlimited Undo/Redo

 WWW: http://gedit.sourceforge.net/
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit2/pkg-plist
@ -7,11 +7,11 @@ etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/auto_indent/%gconf.
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/colors/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/font/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/line_numbers/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/load/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/save/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/tabs/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/undo/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/wrap_mode/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/encodings/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/fonts/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/page/%gconf.xml
@ -26,11 +26,11 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/auto_indent
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/colors/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/font/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/line_numbers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/load/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/save/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/tabs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/undo/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/wrap_mode/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/encodings/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/fonts/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/page/%gconf.xml
@ -39,14 +39,35 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/recents/%gconf.
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/statusbar/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/toolbar/%gconf.xml
 etc/gconf/schemas/gedit.schemas
-lib/gedit-2/plugins/ascii.gedit-plugin
-lib/gedit-2/plugins/cvschangelog.gedit-plugin
-lib/gedit-2/plugins/diff.gedit-plugin
+include/gedit-%%VERSION%%/gedit/bonobo-mdi-child.h
+include/gedit-%%VERSION%%/gedit/bonobo-mdi.h
+include/gedit-%%VERSION%%/gedit/gedit-convert.h
+include/gedit-%%VERSION%%/gedit/gedit-debug.h
+include/gedit-%%VERSION%%/gedit/gedit-document.h
+include/gedit-%%VERSION%%/gedit/gedit-encodings.h
+include/gedit-%%VERSION%%/gedit/gedit-file.h
+include/gedit-%%VERSION%%/gedit/gedit-mdi-child.h
+include/gedit-%%VERSION%%/gedit/gedit-mdi.h
+include/gedit-%%VERSION%%/gedit/gedit-menus.h
+include/gedit-%%VERSION%%/gedit/gedit-metadata-manager.h
+include/gedit-%%VERSION%%/gedit/gedit-output-window.h
+include/gedit-%%VERSION%%/gedit/gedit-plugin.h
+include/gedit-%%VERSION%%/gedit/gedit-prefs-manager-app.h
+include/gedit-%%VERSION%%/gedit/gedit-prefs-manager.h
+include/gedit-%%VERSION%%/gedit/gedit-print.h
+include/gedit-%%VERSION%%/gedit/gedit-recent.h
+include/gedit-%%VERSION%%/gedit/gedit-utils.h
+include/gedit-%%VERSION%%/gedit/gedit-view.h
+include/gedit-%%VERSION%%/gedit/gedit2.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-item.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-model.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-util.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-bonobo.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-gtk.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view.h
+lib/bonobo/libgedit-control.so
 lib/gedit-2/plugins/docinfo.gedit-plugin
 lib/gedit-2/plugins/indent.gedit-plugin
-lib/gedit-2/plugins/libasciitable.so
-lib/gedit-2/plugins/libcvschangelog.so
-lib/gedit-2/plugins/libdiff.so
 lib/gedit-2/plugins/libdocinfo.so
 lib/gedit-2/plugins/libindent.so
 lib/gedit-2/plugins/libsample.so
@ -62,15 +83,15 @@ lib/gedit-2/plugins/spell.gedit-plugin
 lib/gedit-2/plugins/taglist.gedit-plugin
 lib/gedit-2/plugins/time.gedit-plugin
 libdata/bonobo/servers/GNOME_Gedit.server
+libdata/pkgconfig/gedit-%%VERSION%%.pc
 share/gnome/application-registry/gedit.applications
 share/gnome/applications/gedit.desktop
-share/gnome/gedit-2/glade/asciitable.glade2
-share/gnome/gedit-2/glade/diff.glade2
 share/gnome/gedit-2/glade/docinfo.glade2
 share/gnome/gedit-2/glade/gedit-encodings-dialog.glade2
 share/gnome/gedit-2/glade/gedit-preferences.glade2
 share/gnome/gedit-2/glade/goto-line.glade2
 share/gnome/gedit-2/glade/languages-dialog.glade2
+share/gnome/gedit-2/glade/page-setup-dialog.glade2
 share/gnome/gedit-2/glade/plugin-manager.glade2
 share/gnome/gedit-2/glade/program-location-dialog.glade2
 share/gnome/gedit-2/glade/replace.glade2
@ -83,116 +104,121 @@ share/gnome/gedit-2/taglist/HTML.tags
 share/gnome/gedit-2/taglist/Latex.tags
 share/gnome/gedit-2/taglist/XSLT.tags
 share/gnome/gedit-2/ui/gedit-ui.xml
+share/gnome/gnome-2.0/ui/gedit-viewer-ui.xml
 share/gnome/help/gedit/C/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/C/figures/gedit_window.png
 share/gnome/help/gedit/C/gedit.xml
 share/gnome/help/gedit/C/legal.xml
-share/gnome/help/gedit/de/legal.xml
 share/gnome/help/gedit/de/gedit.xml
-share/gnome/help/gedit/es/legal.xml
+share/gnome/help/gedit/de/legal.xml
 share/gnome/help/gedit/es/gedit.xml
-share/gnome/help/gedit/fr/legal.xml
+share/gnome/help/gedit/es/legal.xml
 share/gnome/help/gedit/fr/gedit.xml
-share/gnome/help/gedit/it/legal.xml
+share/gnome/help/gedit/fr/legal.xml
 share/gnome/help/gedit/it/gedit.xml
-share/gnome/help/gedit/sv/legal.xml
-share/gnome/help/gedit/sv/gedit.xml
-share/gnome/help/gedit/ja/legal.xml
+share/gnome/help/gedit/it/legal.xml
 share/gnome/help/gedit/ja/gedit.xml
-share/gnome/help/gedit/ko/legal.xml
+share/gnome/help/gedit/ja/legal.xml
 share/gnome/help/gedit/ko/gedit.xml
+share/gnome/help/gedit/ko/legal.xml
 share/gnome/help/gedit/ro/figures/gedit_window.png
 share/gnome/help/gedit/ro/gedit.xml
 share/gnome/help/gedit/ro/legal.xml
-share/gnome/help/gedit/zh_CN/legal.xml
+share/gnome/help/gedit/sv/gedit.xml
+share/gnome/help/gedit/sv/legal.xml
 share/gnome/help/gedit/zh_CN/gedit.xml
-share/gnome/help/gedit/zh_TW/legal.xml
+share/gnome/help/gedit/zh_CN/legal.xml
 share/gnome/help/gedit/zh_TW/gedit.xml
+share/gnome/help/gedit/zh_TW/legal.xml
 share/gnome/idl/GNOME_Gedit.idl
 share/gnome/mime-info/gedit.keys
 share/gnome/omf/gedit/gedit-C.omf
-share/gnome/omf/gedit/gedit-de.omf
-share/gnome/omf/gedit/gedit-es.omf
-share/gnome/omf/gedit/gedit-fr.omf
-share/gnome/omf/gedit/gedit-it.omf
-share/gnome/omf/gedit/gedit-sv.omf
-share/gnome/omf/gedit/gedit-ja.omf
-share/gnome/omf/gedit/gedit-ko.omf
-share/gnome/omf/gedit/gedit-ro.omf
-share/gnome/omf/gedit/gedit-zh_CN.omf
-share/gnome/omf/gedit/gedit-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-de.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-es.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-fr.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-it.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-ja.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-ko.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-ro.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-zh_CN.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-zh_TW.omf
@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gedit-icon.png
 share/gnome/pixmaps/gedit-logo.png
 share/gnome/pixmaps/gedit-plugin-manager.png
-share/locale/am/LC_MESSAGES/gedit-2.2.mo
-share/locale/ar/LC_MESSAGES/gedit-2.2.mo
-share/locale/az/LC_MESSAGES/gedit-2.2.mo
-share/locale/be/LC_MESSAGES/gedit-2.2.mo
-share/locale/bg/LC_MESSAGES/gedit-2.2.mo
-share/locale/ca/LC_MESSAGES/gedit-2.2.mo
-share/locale/cs/LC_MESSAGES/gedit-2.2.mo
-share/locale/da/LC_MESSAGES/gedit-2.2.mo
-share/locale/de/LC_MESSAGES/gedit-2.2.mo
-share/locale/el/LC_MESSAGES/gedit-2.2.mo
-share/locale/es/LC_MESSAGES/gedit-2.2.mo
-share/locale/et/LC_MESSAGES/gedit-2.2.mo
-share/locale/eu/LC_MESSAGES/gedit-2.2.mo
-share/locale/fa/LC_MESSAGES/gedit-2.2.mo
-share/locale/fi/LC_MESSAGES/gedit-2.2.mo
-share/locale/fr/LC_MESSAGES/gedit-2.2.mo
-share/locale/ga/LC_MESSAGES/gedit-2.2.mo
-share/locale/gl/LC_MESSAGES/gedit-2.2.mo
-share/locale/he/LC_MESSAGES/gedit-2.2.mo
-share/locale/hi/LC_MESSAGES/gedit-2.2.mo
-share/locale/hu/LC_MESSAGES/gedit-2.2.mo
-share/locale/it/LC_MESSAGES/gedit-2.2.mo
-share/locale/ja/LC_MESSAGES/gedit-2.2.mo
-share/locale/kn/LC_MESSAGES/gedit-2.2.mo
-share/locale/ko/LC_MESSAGES/gedit-2.2.mo
-share/locale/lt/LC_MESSAGES/gedit-2.2.mo
-share/locale/lv/LC_MESSAGES/gedit-2.2.mo
-share/locale/mk/LC_MESSAGES/gedit-2.2.mo
-share/locale/ml/LC_MESSAGES/gedit-2.2.mo
-share/locale/mn/LC_MESSAGES/gedit-2.2.mo
-share/locale/ms/LC_MESSAGES/gedit-2.2.mo
-share/locale/nl/LC_MESSAGES/gedit-2.2.mo
-share/locale/nn/LC_MESSAGES/gedit-2.2.mo
-share/locale/no/LC_MESSAGES/gedit-2.2.mo
-share/locale/pl/LC_MESSAGES/gedit-2.2.mo
-share/locale/pt/LC_MESSAGES/gedit-2.2.mo
-share/locale/pt_BR/LC_MESSAGES/gedit-2.2.mo
-share/locale/ro/LC_MESSAGES/gedit-2.2.mo
-share/locale/ru/LC_MESSAGES/gedit-2.2.mo
-share/locale/sk/LC_MESSAGES/gedit-2.2.mo
-share/locale/sl/LC_MESSAGES/gedit-2.2.mo
-share/locale/sr/LC_MESSAGES/gedit-2.2.mo
-share/locale/sr@Latn/LC_MESSAGES/gedit-2.2.mo
-share/locale/sv/LC_MESSAGES/gedit-2.2.mo
-share/locale/ta/LC_MESSAGES/gedit-2.2.mo
-share/locale/th/LC_MESSAGES/gedit-2.2.mo
-share/locale/tr/LC_MESSAGES/gedit-2.2.mo
-share/locale/uk/LC_MESSAGES/gedit-2.2.mo
-share/locale/vi/LC_MESSAGES/gedit-2.2.mo
-share/locale/wa/LC_MESSAGES/gedit-2.2.mo
-share/locale/zh_CN/LC_MESSAGES/gedit-2.2.mo
-share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo
+share/locale/am/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ar/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/be/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/bn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/cy/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/eu/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/fa/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/kn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/lt/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/lv/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/mk/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/mn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ne/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/no/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sl/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/wa/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo
@dirrm share/gnome/omf/gedit
@dirrm share/gnome/help/gedit/zh_TW
@dirrm share/gnome/help/gedit/zh_CN
+@dirrm share/gnome/help/gedit/sv
@dirrm share/gnome/help/gedit/ro/figures
@dirrm share/gnome/help/gedit/ro
-@dirrm share/gnome/help/gedit/sv
@dirrm share/gnome/help/gedit/ko
@dirrm share/gnome/help/gedit/ja
@dirrm share/gnome/help/gedit/it
@ -206,6 +232,9 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo
@dirrm share/gnome/gedit-2
@dirrm lib/gedit-2/plugins
@dirrm lib/gedit-2
+@dirrm include/gedit-%%VERSION%%/gedit/recent-files
+@dirrm include/gedit-%%VERSION%%/gedit
+@dirrm include/gedit-%%VERSION%%
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/toolbar
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/statusbar
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/recents
@ -213,12 +242,12 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/page
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/fonts
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/encodings
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/wrap_mode
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/undo
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/tabs
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/save
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/line_numbers
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/load
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/font
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/colors
@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/auto_indent
@ -232,26 +261,26 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/page
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/fonts
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print
+@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/encodings
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/wrap_mode
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/undo
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/tabs
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/save
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/line_numbers
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/load
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/font
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/colors
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/auto_indent
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences
@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true
--- a/editors/ghex2/Makefile
+++ b/editors/ghex2/Makefile
@ -6,11 +6,10 @@
 #

 PORTNAME=	ghex2
-PORTVERSION=	2.2.1
-PORTREVISION=	2
+PORTVERSION=	2.4.0.1
 CATEGORIES=	editors gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.4
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2

@ -20,10 +19,11 @@ COMMENT=	GNOME 2 hex editor
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack gail libgnomeprintui libgnomeui
 USE_LIBTOOL=	yes
-USE_REINPLACE=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"

 .include <bsd.port.mk>
--- a/editors/ghex2/distinfo
+++ b/editors/ghex2/distinfo
@ -1 +1 @@
-MD5 (gnome2/ghex-2.2.1.tar.bz2) = a10ef7db355d2c7790b5d999d0b3087a
+MD5 (gnome2/ghex-2.4.0.1.tar.bz2) = 2add675fa3d8d61e71616d49bb7d861e
--- a/devel/libbonobo/files/patch-configure
+++ b/devel/libbonobo/files/patch-configure
@ -1,9 +1,6 @@
-
-$FreeBSD$
-
--- configure	2002/04/26 08:08:30	1.1
-+++ configure	2002/04/26 08:09:00
-@@ -7015,6 +7015,7 @@
+--- configure.orig	Wed Dec 11 18:31:51 2002
+++ configure	Thu Dec 12 12:07:17 2002
+@@ -7414,6 +7414,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
--- a/Show More
+++ b/Show More