Update to 2.0.1 and USE_GNOMENG.

9 files changed, 39 insertions, 39 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index dbf9f3fc0822..b3f55eee27a4 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnomeutils2
-PORTVERSION=	2.0.0
+PORTVERSION=	2.0.1
 PORTEPOCH=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-utils
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -22,9 +22,9 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
@@ -33,12 +33,8 @@ MAN1=	archive-generator.1 gnome-calculator.1 \
 	gnome-character-map.1 gnome-dictionary.1 \
 	gnome-search-tool.1 gnome-system-log.1
 
-pre-patch:
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 79f4232f20d8..09aa124de91c 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-2.0.0.tar.bz2) = bc2cf88b452e6c680a3d2dd247f85870
+MD5 (gnome2/gnome-utils-2.0.1.tar.bz2) = 5e8d265096a82dd1633ab1a0f6dc5a1a
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 72ef9ba0121c..b2fb230182a9 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -1,12 +1,14 @@
 bin/archive-generator
-bin/gdict-applet
 bin/gnome-calculator
 bin/gnome-character-map
 bin/gnome-dictionary
 bin/gnome-search-tool
 bin/gnome-system-log
+etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml
 etc/gconf/schemas/gdict.schemas
 libdata/bonobo/servers/GNOME_GDictApplet.server
+libexec/gdict-applet
 share/gnome/applications/archive-generator.desktop
 share/gnome/applications/gnome-calculator.desktop
 share/gnome/applications/gnome-character-map.desktop
@@ -18,13 +20,13 @@ 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/archive-generator/C/archive-generator.xml
-share/gnome/help/archive-generator/C/figures/archive-generator-addfile.png
 share/gnome/help/archive-generator/C/figures/archive-generator-contents.png
 share/gnome/help/archive-generator/C/figures/archive-generator.png
 share/gnome/help/archive-generator/C/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-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-dictionary/C/figures/gdict-find.png
@@ -95,7 +97,6 @@ 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/omf/gnome-utils
 @dirrm share/gnome/help/gnome-system-log/C/figures
 @dirrm share/gnome/help/gnome-system-log/C
 @dirrm share/gnome/help/gnome-system-log
@@ -105,9 +106,12 @@ 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/C/figures
 @dirrm share/gnome/help/gnome-character-map/C
 @dirrm share/gnome/help/gnome-character-map
 @dirrm share/gnome/help/gnome-calculator/C/figures
 @dirrm share/gnome/help/gnome-calculator/C
 @dirrm share/gnome/help/gnome-calculator
 @dirrm share/gnome/gnome-system-log
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index dbf9f3fc0822..b3f55eee27a4 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnomeutils2
-PORTVERSION=	2.0.0
+PORTVERSION=	2.0.1
 PORTEPOCH=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-utils
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -22,9 +22,9 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
@@ -33,12 +33,8 @@ MAN1=	archive-generator.1 gnome-calculator.1 \
 	gnome-character-map.1 gnome-dictionary.1 \
 	gnome-search-tool.1 gnome-system-log.1
 
-pre-patch:
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo
index 79f4232f20d8..09aa124de91c 100644
--- a/deskutils/gnomeutils2/distinfo
+++ b/deskutils/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-2.0.0.tar.bz2) = bc2cf88b452e6c680a3d2dd247f85870
+MD5 (gnome2/gnome-utils-2.0.1.tar.bz2) = 5e8d265096a82dd1633ab1a0f6dc5a1a
diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist
index 72ef9ba0121c..b2fb230182a9 100644
--- a/deskutils/gnomeutils2/pkg-plist
+++ b/deskutils/gnomeutils2/pkg-plist
@@ -1,12 +1,14 @@
 bin/archive-generator
-bin/gdict-applet
 bin/gnome-calculator
 bin/gnome-character-map
 bin/gnome-dictionary
 bin/gnome-search-tool
 bin/gnome-system-log
+etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml
 etc/gconf/schemas/gdict.schemas
 libdata/bonobo/servers/GNOME_GDictApplet.server
+libexec/gdict-applet
 share/gnome/applications/archive-generator.desktop
 share/gnome/applications/gnome-calculator.desktop
 share/gnome/applications/gnome-character-map.desktop
@@ -18,13 +20,13 @@ 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/archive-generator/C/archive-generator.xml
-share/gnome/help/archive-generator/C/figures/archive-generator-addfile.png
 share/gnome/help/archive-generator/C/figures/archive-generator-contents.png
 share/gnome/help/archive-generator/C/figures/archive-generator.png
 share/gnome/help/archive-generator/C/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-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-dictionary/C/figures/gdict-find.png
@@ -95,7 +97,6 @@ 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/omf/gnome-utils
 @dirrm share/gnome/help/gnome-system-log/C/figures
 @dirrm share/gnome/help/gnome-system-log/C
 @dirrm share/gnome/help/gnome-system-log
@@ -105,9 +106,12 @@ 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/C/figures
 @dirrm share/gnome/help/gnome-character-map/C
 @dirrm share/gnome/help/gnome-character-map
 @dirrm share/gnome/help/gnome-calculator/C/figures
 @dirrm share/gnome/help/gnome-calculator/C
 @dirrm share/gnome/help/gnome-calculator
 @dirrm share/gnome/gnome-system-log
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index dbf9f3fc0822..b3f55eee27a4 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnomeutils2
-PORTVERSION=	2.0.0
+PORTVERSION=	2.0.1
 PORTEPOCH=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-utils
 DISTNAME=	gnome-utils-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -22,9 +22,9 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
@@ -33,12 +33,8 @@ MAN1=	archive-generator.1 gnome-calculator.1 \
 	gnome-character-map.1 gnome-dictionary.1 \
 	gnome-search-tool.1 gnome-system-log.1
 
-pre-patch:
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/misc/gnomeutils2/distinfo b/misc/gnomeutils2/distinfo
index 79f4232f20d8..09aa124de91c 100644
--- a/misc/gnomeutils2/distinfo
+++ b/misc/gnomeutils2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-utils-2.0.0.tar.bz2) = bc2cf88b452e6c680a3d2dd247f85870
+MD5 (gnome2/gnome-utils-2.0.1.tar.bz2) = 5e8d265096a82dd1633ab1a0f6dc5a1a
diff --git a/misc/gnomeutils2/pkg-plist b/misc/gnomeutils2/pkg-plist
index 72ef9ba0121c..b2fb230182a9 100644
--- a/misc/gnomeutils2/pkg-plist
+++ b/misc/gnomeutils2/pkg-plist
@@ -1,12 +1,14 @@
 bin/archive-generator
-bin/gdict-applet
 bin/gnome-calculator
 bin/gnome-character-map
 bin/gnome-dictionary
 bin/gnome-search-tool
 bin/gnome-system-log
+etc/gconf/gconf.xml.defaults/apps/gnome-dictionary/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary/%gconf.xml
 etc/gconf/schemas/gdict.schemas
 libdata/bonobo/servers/GNOME_GDictApplet.server
+libexec/gdict-applet
 share/gnome/applications/archive-generator.desktop
 share/gnome/applications/gnome-calculator.desktop
 share/gnome/applications/gnome-character-map.desktop
@@ -18,13 +20,13 @@ 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/archive-generator/C/archive-generator.xml
-share/gnome/help/archive-generator/C/figures/archive-generator-addfile.png
 share/gnome/help/archive-generator/C/figures/archive-generator-contents.png
 share/gnome/help/archive-generator/C/figures/archive-generator.png
 share/gnome/help/archive-generator/C/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-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-dictionary/C/figures/gdict-find.png
@@ -95,7 +97,6 @@ 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/omf/gnome-utils
 @dirrm share/gnome/help/gnome-system-log/C/figures
 @dirrm share/gnome/help/gnome-system-log/C
 @dirrm share/gnome/help/gnome-system-log
@@ -105,9 +106,12 @@ 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/C/figures
 @dirrm share/gnome/help/gnome-character-map/C
 @dirrm share/gnome/help/gnome-character-map
 @dirrm share/gnome/help/gnome-calculator/C/figures
 @dirrm share/gnome/help/gnome-calculator/C
 @dirrm share/gnome/help/gnome-calculator
 @dirrm share/gnome/gnome-system-log
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-dictionary
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-dictionary