Use USE_GNOMENG.

11 files changed, 40 insertions, 137 deletions

diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 1feb76fecf54..bf2e734ab786 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -19,17 +19,15 @@ RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
+post-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
-		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/games/gcompris/files/patch-ac b/games/gcompris/files/patch-ac
index dbecd07d983b..bfa9668b8c08 100644
--- a/games/gcompris/files/patch-ac
+++ b/games/gcompris/files/patch-ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Thu Apr 18 14:49:06 2002
-+++ Makefile.in	Thu Apr 18 14:51:49 2002
-@@ -212,9 +212,9 @@
+--- Makefile.in.orig	Sun Aug  4 23:01:03 2002
++++ Makefile.in	Sun Aug  4 23:22:07 2002
+@@ -219,9 +219,9 @@
  		rm -f $(srcdir)/stamp-h.in; \
  		$(MAKE) $(srcdir)/stamp-h.in; \
  	else :; fi
@@ -16,7 +16,7 @@ $FreeBSD$
  
  mostlyclean-hdr:
  
-@@ -446,7 +446,7 @@
+@@ -453,7 +453,7 @@
  install-exec-am:
  install-exec: install-exec-recursive
  
@@ -25,19 +25,19 @@ $FreeBSD$
  		install-data-local
  install-data: install-data-recursive
  
-@@ -519,13 +519,13 @@
+@@ -526,13 +526,13 @@
  	@$(NORMAL_INSTALL)
  	if test -d @PACKAGE_DATA_DIR@; then \
  	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@; \
 -	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude "*.in" --exclude "*~" --exclude CVS --exclude .xvpics * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
-+	  cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.in" --exclude "*~" --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.in" --exclude "*.bak" --exclude "*~" --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
  	fi
  
  dist-hook:
  	if test -d @PACKAGE_DATA_DIR@; then \
  	  $(mkinstalldirs) $(distdir)/@PACKAGE_DATA_DIR@; \
 -	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
-+	  cd @PACKAGE_DATA_DIR@ ; tar --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.bak" --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
  	fi
  
  clean-local:
diff --git a/games/gcompris/pkg-plist b/games/gcompris/pkg-plist
index bca543125cca..d63f88755160 100644
--- a/games/gcompris/pkg-plist
+++ b/games/gcompris/pkg-plist
@@ -28,14 +28,10 @@ lib/gcompris/libwordsgame.so
 share/gnome/apps/Games/gcompris.desktop
 share/gnome/gcompris/boards/Makefile
 share/gnome/gcompris/boards/Makefile.am
-share/gnome/gcompris/boards/Makefile.in
 share/gnome/gcompris/boards/README
 share/gnome/gcompris/boards/algebra_by.xml
-share/gnome/gcompris/boards/algebra_by.xml.in
 share/gnome/gcompris/boards/algebra_div.xml
-share/gnome/gcompris/boards/algebra_div.xml.in
 share/gnome/gcompris/boards/algebra_guesscount.xml
-share/gnome/gcompris/boards/algebra_guesscount.xml.in
 share/gnome/gcompris/boards/algebra_guesscount/+.png
 share/gnome/gcompris/boards/algebra_guesscount/-.png
 share/gnome/gcompris/boards/algebra_guesscount/1.png
@@ -57,13 +53,9 @@ share/gnome/gcompris/boards/algebra_guesscount/algebra_guesscount-bg.jpg
 share/gnome/gcompris/boards/algebra_guesscount/button.png
 share/gnome/gcompris/boards/algebra_guesscount/x.png
 share/gnome/gcompris/boards/algebra_minus.xml
-share/gnome/gcompris/boards/algebra_minus.xml.in
 share/gnome/gcompris/boards/algebra_plus.xml
-share/gnome/gcompris/boards/algebra_plus.xml.in
 share/gnome/gcompris/boards/algebramenu.xml
-share/gnome/gcompris/boards/algebramenu.xml.in
 share/gnome/gcompris/boards/babymatch.xml
-share/gnome/gcompris/boards/babymatch.xml.in
 share/gnome/gcompris/boards/babymatch/Makefile
 share/gnome/gcompris/boards/babymatch/Makefile.am
 share/gnome/gcompris/boards/babymatch/board1_0.xml
@@ -73,7 +65,6 @@ share/gnome/gcompris/boards/babymatch/board4_0.xml
 share/gnome/gcompris/boards/babymatch/board5_0.xml
 share/gnome/gcompris/boards/babymatch/board6_0.xml
 share/gnome/gcompris/boards/babyshapes.xml
-share/gnome/gcompris/boards/babyshapes.xml.in
 share/gnome/gcompris/boards/babyshapes/T_banana.png
 share/gnome/gcompris/boards/babyshapes/T_circle.png
 share/gnome/gcompris/boards/babyshapes/T_colonne.png
@@ -166,24 +157,17 @@ share/gnome/gcompris/boards/boardicons/target.png
 share/gnome/gcompris/boards/boardicons/tuxpara.png
 share/gnome/gcompris/boards/boardicons/wordsgame.png
 share/gnome/gcompris/boards/canal_lock.xml
-share/gnome/gcompris/boards/canal_lock.xml.in
 share/gnome/gcompris/boards/canal_lock/canal_lock_bg.png
 share/gnome/gcompris/boards/click_on_letter.xml
-share/gnome/gcompris/boards/click_on_letter.xml.in
 share/gnome/gcompris/boards/clickgame.xml
-share/gnome/gcompris/boards/clickgame.xml.in
 share/gnome/gcompris/boards/clockgame.xml
-share/gnome/gcompris/boards/clockgame.xml.in
 share/gnome/gcompris/boards/clockgame/clockgame-bg.jpg
 share/gnome/gcompris/boards/colors.xml
-share/gnome/gcompris/boards/colors.xml.in
 share/gnome/gcompris/boards/colors/colors_bg.jpg
 share/gnome/gcompris/boards/colors/colors_highlight.png
 share/gnome/gcompris/boards/computer.xml
-share/gnome/gcompris/boards/computer.xml.in
 share/gnome/gcompris/boards/dataset/mrpatate.xml
 share/gnome/gcompris/boards/doubleentry.xml
-share/gnome/gcompris/boards/doubleentry.xml.in
 share/gnome/gcompris/boards/doubleentry/Makefile
 share/gnome/gcompris/boards/doubleentry/Makefile.am
 share/gnome/gcompris/boards/doubleentry/board1_0.xml
@@ -216,7 +200,6 @@ share/gnome/gcompris/boards/doubleentry/circle-red-2.png
 share/gnome/gcompris/boards/doubleentry/circle-red-3.png
 share/gnome/gcompris/boards/doubleentry/gcompris-bg.png
 share/gnome/gcompris/boards/draw.xml
-share/gnome/gcompris/boards/draw.xml.in
 share/gnome/gcompris/boards/draw/color-selector.jpg
 share/gnome/gcompris/boards/draw/draw-bg.jpg
 share/gnome/gcompris/boards/draw/tool-circle.png
@@ -247,7 +230,6 @@ share/gnome/gcompris/boards/draw/tool-select.png
 share/gnome/gcompris/boards/draw/tool-select_on.png
 share/gnome/gcompris/boards/draw/tool-selector.jpg
 share/gnome/gcompris/boards/erase.xml
-share/gnome/gcompris/boards/erase.xml.in
 share/gnome/gcompris/boards/fishes/QueenAngel_0.png
 share/gnome/gcompris/boards/fishes/QueenAngel_1.png
 share/gnome/gcompris/boards/fishes/blueking2_0.png
@@ -356,7 +338,6 @@ share/gnome/gcompris/boards/flags/tr.png
 share/gnome/gcompris/boards/flags/uy.png
 share/gnome/gcompris/boards/flags/yu.png
 share/gnome/gcompris/boards/fun.xml
-share/gnome/gcompris/boards/fun.xml.in
 share/gnome/gcompris/boards/gcompris/README
 share/gnome/gcompris/boards/gcompris/animals/bear001.jpg
 share/gnome/gcompris/boards/gcompris/animals/joybear001.jpg
@@ -585,7 +566,6 @@ share/gnome/gcompris/boards/gcompris/timers/sablier7.png
 share/gnome/gcompris/boards/gcompris/timers/sablier8.png
 share/gnome/gcompris/boards/gcompris/timers/sablier9.png
 share/gnome/gcompris/boards/geography.xml
-share/gnome/gcompris/boards/geography.xml.in
 share/gnome/gcompris/boards/geography/Makefile
 share/gnome/gcompris/boards/geography/Makefile.am
 share/gnome/gcompris/boards/geography/board1_0.xml
@@ -619,9 +599,7 @@ share/gnome/gcompris/boards/geography/southamerica/suriname.png
 share/gnome/gcompris/boards/geography/southamerica/uruguay.png
 share/gnome/gcompris/boards/geography/southamerica/venezuela.png
 share/gnome/gcompris/boards/gletters.xml
-share/gnome/gcompris/boards/gletters.xml.in
 share/gnome/gcompris/boards/imageid.xml
-share/gnome/gcompris/boards/imageid.xml.in
 share/gnome/gcompris/boards/imageid/Makefile
 share/gnome/gcompris/boards/imageid/Makefile.am
 share/gnome/gcompris/boards/imageid/ballon.png
@@ -635,7 +613,6 @@ share/gnome/gcompris/boards/imageid/imageid-bg.jpg
 share/gnome/gcompris/boards/imageid/maison.png
 share/gnome/gcompris/boards/imageid/pomme.png
 share/gnome/gcompris/boards/imagename.xml
-share/gnome/gcompris/boards/imagename.xml.in
 share/gnome/gcompris/boards/imagename/Makefile
 share/gnome/gcompris/boards/imagename/Makefile.am
 share/gnome/gcompris/boards/imagename/board1_0.xml
@@ -645,7 +622,6 @@ share/gnome/gcompris/boards/imagename/board4_0.xml
 share/gnome/gcompris/boards/imagename/board5_0.xml
 share/gnome/gcompris/boards/imagename/board6_0.xml
 share/gnome/gcompris/boards/leftright.xml
-share/gnome/gcompris/boards/leftright.xml.in
 share/gnome/gcompris/boards/leftright/background.kpm
 share/gnome/gcompris/boards/leftright/highlight_torus.png
 share/gnome/gcompris/boards/leftright/leftright-bg.jpg
@@ -666,13 +642,9 @@ share/gnome/gcompris/boards/leftright/main_gauche_paume_180.png
 share/gnome/gcompris/boards/leftright/main_gauche_paume_270.png
 share/gnome/gcompris/boards/leftright/main_gauche_paume_90.png
 share/gnome/gcompris/boards/maze.xml
-share/gnome/gcompris/boards/maze.xml.in
 share/gnome/gcompris/boards/memory.xml
-share/gnome/gcompris/boards/memory.xml.in
 share/gnome/gcompris/boards/menu.xml
-share/gnome/gcompris/boards/menu.xml.in
 share/gnome/gcompris/boards/missing_letter.xml
-share/gnome/gcompris/boards/missing_letter.xml.in
 share/gnome/gcompris/boards/missing_letter/Makefile
 share/gnome/gcompris/boards/missing_letter/Makefile.am
 share/gnome/gcompris/boards/missing_letter/board1.xml
@@ -713,7 +685,6 @@ share/gnome/gcompris/boards/mrpatate/sherif.png
 share/gnome/gcompris/boards/mrpatate/watch.png
 share/gnome/gcompris/boards/music/intro.ogg
 share/gnome/gcompris/boards/paintings.xml
-share/gnome/gcompris/boards/paintings.xml.in
 share/gnome/gcompris/boards/paintings/Makefile
 share/gnome/gcompris/boards/paintings/Makefile.am
 share/gnome/gcompris/boards/paintings/README
@@ -771,11 +742,8 @@ share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-6.png
 share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-7.png
 share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-8.png
 share/gnome/gcompris/boards/paratrooper.xml
-share/gnome/gcompris/boards/paratrooper.xml.in
 share/gnome/gcompris/boards/planegame.xml
-share/gnome/gcompris/boards/planegame.xml.in
 share/gnome/gcompris/boards/railroad.xml
-share/gnome/gcompris/boards/railroad.xml.in
 share/gnome/gcompris/boards/railroad/loco1.png
 share/gnome/gcompris/boards/railroad/loco2.png
 share/gnome/gcompris/boards/railroad/loco3.png
@@ -802,14 +770,10 @@ share/gnome/gcompris/boards/railroad/wagon7.png
 share/gnome/gcompris/boards/railroad/wagon8.png
 share/gnome/gcompris/boards/railroad/wagon9.png
 share/gnome/gcompris/boards/reading.xml
-share/gnome/gcompris/boards/reading.xml.in
 share/gnome/gcompris/boards/reading/gcompris-bg.jpg
 share/gnome/gcompris/boards/readingh.xml
-share/gnome/gcompris/boards/readingh.xml.in
 share/gnome/gcompris/boards/readingv.xml
-share/gnome/gcompris/boards/readingv.xml.in
 share/gnome/gcompris/boards/reversecount.xml
-share/gnome/gcompris/boards/reversecount.xml.in
 share/gnome/gcompris/boards/reversecount/iceblock.png
 share/gnome/gcompris/boards/scales/Makefile
 share/gnome/gcompris/boards/scales/Makefile.am
@@ -846,9 +810,7 @@ share/gnome/gcompris/boards/scales/masse8.png
 share/gnome/gcompris/boards/scales/masse9.png
 share/gnome/gcompris/boards/scales/scales.png
 share/gnome/gcompris/boards/scalesboard.xml
-share/gnome/gcompris/boards/scalesboard.xml.in
 share/gnome/gcompris/boards/smallnumbers.xml
-share/gnome/gcompris/boards/smallnumbers.xml.in
 share/gnome/gcompris/boards/sounds/HOWTO_ENCODE
 share/gnome/gcompris/boards/sounds/de/0.ogg
 share/gnome/gcompris/boards/sounds/de/1.ogg
@@ -1088,10 +1050,8 @@ share/gnome/gcompris/boards/sounds/fr/y.ogg
 share/gnome/gcompris/boards/sounds/fr/yellow.ogg
 share/gnome/gcompris/boards/sounds/fr/z.ogg
 share/gnome/gcompris/boards/target.xml
-share/gnome/gcompris/boards/target.xml.in
 share/gnome/gcompris/boards/target/boardicon.png
 share/gnome/gcompris/boards/wordsgame.xml
-share/gnome/gcompris/boards/wordsgame.xml.in
 share/gnome/gcompris/boards/wordsgame/README
 share/gnome/gcompris/boards/wordsgame/wordslevel1.de
 share/gnome/gcompris/boards/wordsgame/wordslevel1.el
diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile
index 1feb76fecf54..bf2e734ab786 100644
--- a/games/gcompris2/Makefile
+++ b/games/gcompris2/Makefile
@@ -19,17 +19,15 @@ RUN_DEPENDS=	ogg123:${PORTSDIR}/audio/vorbis-tools
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
+post-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
-		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/games/gcompris2/files/patch-ac b/games/gcompris2/files/patch-ac
index dbecd07d983b..bfa9668b8c08 100644
--- a/games/gcompris2/files/patch-ac
+++ b/games/gcompris2/files/patch-ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Thu Apr 18 14:49:06 2002
-+++ Makefile.in	Thu Apr 18 14:51:49 2002
-@@ -212,9 +212,9 @@
+--- Makefile.in.orig	Sun Aug  4 23:01:03 2002
++++ Makefile.in	Sun Aug  4 23:22:07 2002
+@@ -219,9 +219,9 @@
  		rm -f $(srcdir)/stamp-h.in; \
  		$(MAKE) $(srcdir)/stamp-h.in; \
  	else :; fi
@@ -16,7 +16,7 @@ $FreeBSD$
  
  mostlyclean-hdr:
  
-@@ -446,7 +446,7 @@
+@@ -453,7 +453,7 @@
  install-exec-am:
  install-exec: install-exec-recursive
  
@@ -25,19 +25,19 @@ $FreeBSD$
  		install-data-local
  install-data: install-data-recursive
  
-@@ -519,13 +519,13 @@
+@@ -526,13 +526,13 @@
  	@$(NORMAL_INSTALL)
  	if test -d @PACKAGE_DATA_DIR@; then \
  	  $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@; \
 -	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude "*.in" --exclude "*~" --exclude CVS --exclude .xvpics * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
-+	  cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.in" --exclude "*~" --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.in" --exclude "*.bak" --exclude "*~" --exclude CVS --exclude .xvpics -cf - * | ( cd $(DESTDIR)/$(pkgdatadir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
  	fi
  
  dist-hook:
  	if test -d @PACKAGE_DATA_DIR@; then \
  	  $(mkinstalldirs) $(distdir)/@PACKAGE_DATA_DIR@; \
 -	  cd @PACKAGE_DATA_DIR@ ; tar cf -  --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
-+	  cd @PACKAGE_DATA_DIR@ ; tar --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
++	  cd @PACKAGE_DATA_DIR@ ; tar --exclude "*.bak" --exclude "*~" --exclude ".*" --exclude CVS --exclude .xvpics -cf - * | ( cd ../$(distdir)/@PACKAGE_DATA_DIR@ ; tar xf -) ; cd .. ; \
  	fi
  
  clean-local:
diff --git a/games/gcompris2/pkg-plist b/games/gcompris2/pkg-plist
index bca543125cca..d63f88755160 100644
--- a/games/gcompris2/pkg-plist
+++ b/games/gcompris2/pkg-plist
@@ -28,14 +28,10 @@ lib/gcompris/libwordsgame.so
 share/gnome/apps/Games/gcompris.desktop
 share/gnome/gcompris/boards/Makefile
 share/gnome/gcompris/boards/Makefile.am
-share/gnome/gcompris/boards/Makefile.in
 share/gnome/gcompris/boards/README
 share/gnome/gcompris/boards/algebra_by.xml
-share/gnome/gcompris/boards/algebra_by.xml.in
 share/gnome/gcompris/boards/algebra_div.xml
-share/gnome/gcompris/boards/algebra_div.xml.in
 share/gnome/gcompris/boards/algebra_guesscount.xml
-share/gnome/gcompris/boards/algebra_guesscount.xml.in
 share/gnome/gcompris/boards/algebra_guesscount/+.png
 share/gnome/gcompris/boards/algebra_guesscount/-.png
 share/gnome/gcompris/boards/algebra_guesscount/1.png
@@ -57,13 +53,9 @@ share/gnome/gcompris/boards/algebra_guesscount/algebra_guesscount-bg.jpg
 share/gnome/gcompris/boards/algebra_guesscount/button.png
 share/gnome/gcompris/boards/algebra_guesscount/x.png
 share/gnome/gcompris/boards/algebra_minus.xml
-share/gnome/gcompris/boards/algebra_minus.xml.in
 share/gnome/gcompris/boards/algebra_plus.xml
-share/gnome/gcompris/boards/algebra_plus.xml.in
 share/gnome/gcompris/boards/algebramenu.xml
-share/gnome/gcompris/boards/algebramenu.xml.in
 share/gnome/gcompris/boards/babymatch.xml
-share/gnome/gcompris/boards/babymatch.xml.in
 share/gnome/gcompris/boards/babymatch/Makefile
 share/gnome/gcompris/boards/babymatch/Makefile.am
 share/gnome/gcompris/boards/babymatch/board1_0.xml
@@ -73,7 +65,6 @@ share/gnome/gcompris/boards/babymatch/board4_0.xml
 share/gnome/gcompris/boards/babymatch/board5_0.xml
 share/gnome/gcompris/boards/babymatch/board6_0.xml
 share/gnome/gcompris/boards/babyshapes.xml
-share/gnome/gcompris/boards/babyshapes.xml.in
 share/gnome/gcompris/boards/babyshapes/T_banana.png
 share/gnome/gcompris/boards/babyshapes/T_circle.png
 share/gnome/gcompris/boards/babyshapes/T_colonne.png
@@ -166,24 +157,17 @@ share/gnome/gcompris/boards/boardicons/target.png
 share/gnome/gcompris/boards/boardicons/tuxpara.png
 share/gnome/gcompris/boards/boardicons/wordsgame.png
 share/gnome/gcompris/boards/canal_lock.xml
-share/gnome/gcompris/boards/canal_lock.xml.in
 share/gnome/gcompris/boards/canal_lock/canal_lock_bg.png
 share/gnome/gcompris/boards/click_on_letter.xml
-share/gnome/gcompris/boards/click_on_letter.xml.in
 share/gnome/gcompris/boards/clickgame.xml
-share/gnome/gcompris/boards/clickgame.xml.in
 share/gnome/gcompris/boards/clockgame.xml
-share/gnome/gcompris/boards/clockgame.xml.in
 share/gnome/gcompris/boards/clockgame/clockgame-bg.jpg
 share/gnome/gcompris/boards/colors.xml
-share/gnome/gcompris/boards/colors.xml.in
 share/gnome/gcompris/boards/colors/colors_bg.jpg
 share/gnome/gcompris/boards/colors/colors_highlight.png
 share/gnome/gcompris/boards/computer.xml
-share/gnome/gcompris/boards/computer.xml.in
 share/gnome/gcompris/boards/dataset/mrpatate.xml
 share/gnome/gcompris/boards/doubleentry.xml
-share/gnome/gcompris/boards/doubleentry.xml.in
 share/gnome/gcompris/boards/doubleentry/Makefile
 share/gnome/gcompris/boards/doubleentry/Makefile.am
 share/gnome/gcompris/boards/doubleentry/board1_0.xml
@@ -216,7 +200,6 @@ share/gnome/gcompris/boards/doubleentry/circle-red-2.png
 share/gnome/gcompris/boards/doubleentry/circle-red-3.png
 share/gnome/gcompris/boards/doubleentry/gcompris-bg.png
 share/gnome/gcompris/boards/draw.xml
-share/gnome/gcompris/boards/draw.xml.in
 share/gnome/gcompris/boards/draw/color-selector.jpg
 share/gnome/gcompris/boards/draw/draw-bg.jpg
 share/gnome/gcompris/boards/draw/tool-circle.png
@@ -247,7 +230,6 @@ share/gnome/gcompris/boards/draw/tool-select.png
 share/gnome/gcompris/boards/draw/tool-select_on.png
 share/gnome/gcompris/boards/draw/tool-selector.jpg
 share/gnome/gcompris/boards/erase.xml
-share/gnome/gcompris/boards/erase.xml.in
 share/gnome/gcompris/boards/fishes/QueenAngel_0.png
 share/gnome/gcompris/boards/fishes/QueenAngel_1.png
 share/gnome/gcompris/boards/fishes/blueking2_0.png
@@ -356,7 +338,6 @@ share/gnome/gcompris/boards/flags/tr.png
 share/gnome/gcompris/boards/flags/uy.png
 share/gnome/gcompris/boards/flags/yu.png
 share/gnome/gcompris/boards/fun.xml
-share/gnome/gcompris/boards/fun.xml.in
 share/gnome/gcompris/boards/gcompris/README
 share/gnome/gcompris/boards/gcompris/animals/bear001.jpg
 share/gnome/gcompris/boards/gcompris/animals/joybear001.jpg
@@ -585,7 +566,6 @@ share/gnome/gcompris/boards/gcompris/timers/sablier7.png
 share/gnome/gcompris/boards/gcompris/timers/sablier8.png
 share/gnome/gcompris/boards/gcompris/timers/sablier9.png
 share/gnome/gcompris/boards/geography.xml
-share/gnome/gcompris/boards/geography.xml.in
 share/gnome/gcompris/boards/geography/Makefile
 share/gnome/gcompris/boards/geography/Makefile.am
 share/gnome/gcompris/boards/geography/board1_0.xml
@@ -619,9 +599,7 @@ share/gnome/gcompris/boards/geography/southamerica/suriname.png
 share/gnome/gcompris/boards/geography/southamerica/uruguay.png
 share/gnome/gcompris/boards/geography/southamerica/venezuela.png
 share/gnome/gcompris/boards/gletters.xml
-share/gnome/gcompris/boards/gletters.xml.in
 share/gnome/gcompris/boards/imageid.xml
-share/gnome/gcompris/boards/imageid.xml.in
 share/gnome/gcompris/boards/imageid/Makefile
 share/gnome/gcompris/boards/imageid/Makefile.am
 share/gnome/gcompris/boards/imageid/ballon.png
@@ -635,7 +613,6 @@ share/gnome/gcompris/boards/imageid/imageid-bg.jpg
 share/gnome/gcompris/boards/imageid/maison.png
 share/gnome/gcompris/boards/imageid/pomme.png
 share/gnome/gcompris/boards/imagename.xml
-share/gnome/gcompris/boards/imagename.xml.in
 share/gnome/gcompris/boards/imagename/Makefile
 share/gnome/gcompris/boards/imagename/Makefile.am
 share/gnome/gcompris/boards/imagename/board1_0.xml
@@ -645,7 +622,6 @@ share/gnome/gcompris/boards/imagename/board4_0.xml
 share/gnome/gcompris/boards/imagename/board5_0.xml
 share/gnome/gcompris/boards/imagename/board6_0.xml
 share/gnome/gcompris/boards/leftright.xml
-share/gnome/gcompris/boards/leftright.xml.in
 share/gnome/gcompris/boards/leftright/background.kpm
 share/gnome/gcompris/boards/leftright/highlight_torus.png
 share/gnome/gcompris/boards/leftright/leftright-bg.jpg
@@ -666,13 +642,9 @@ share/gnome/gcompris/boards/leftright/main_gauche_paume_180.png
 share/gnome/gcompris/boards/leftright/main_gauche_paume_270.png
 share/gnome/gcompris/boards/leftright/main_gauche_paume_90.png
 share/gnome/gcompris/boards/maze.xml
-share/gnome/gcompris/boards/maze.xml.in
 share/gnome/gcompris/boards/memory.xml
-share/gnome/gcompris/boards/memory.xml.in
 share/gnome/gcompris/boards/menu.xml
-share/gnome/gcompris/boards/menu.xml.in
 share/gnome/gcompris/boards/missing_letter.xml
-share/gnome/gcompris/boards/missing_letter.xml.in
 share/gnome/gcompris/boards/missing_letter/Makefile
 share/gnome/gcompris/boards/missing_letter/Makefile.am
 share/gnome/gcompris/boards/missing_letter/board1.xml
@@ -713,7 +685,6 @@ share/gnome/gcompris/boards/mrpatate/sherif.png
 share/gnome/gcompris/boards/mrpatate/watch.png
 share/gnome/gcompris/boards/music/intro.ogg
 share/gnome/gcompris/boards/paintings.xml
-share/gnome/gcompris/boards/paintings.xml.in
 share/gnome/gcompris/boards/paintings/Makefile
 share/gnome/gcompris/boards/paintings/Makefile.am
 share/gnome/gcompris/boards/paintings/README
@@ -771,11 +742,8 @@ share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-6.png
 share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-7.png
 share/gnome/gcompris/boards/paintings/level6/renoir-filles_piano-8.png
 share/gnome/gcompris/boards/paratrooper.xml
-share/gnome/gcompris/boards/paratrooper.xml.in
 share/gnome/gcompris/boards/planegame.xml
-share/gnome/gcompris/boards/planegame.xml.in
 share/gnome/gcompris/boards/railroad.xml
-share/gnome/gcompris/boards/railroad.xml.in
 share/gnome/gcompris/boards/railroad/loco1.png
 share/gnome/gcompris/boards/railroad/loco2.png
 share/gnome/gcompris/boards/railroad/loco3.png
@@ -802,14 +770,10 @@ share/gnome/gcompris/boards/railroad/wagon7.png
 share/gnome/gcompris/boards/railroad/wagon8.png
 share/gnome/gcompris/boards/railroad/wagon9.png
 share/gnome/gcompris/boards/reading.xml
-share/gnome/gcompris/boards/reading.xml.in
 share/gnome/gcompris/boards/reading/gcompris-bg.jpg
 share/gnome/gcompris/boards/readingh.xml
-share/gnome/gcompris/boards/readingh.xml.in
 share/gnome/gcompris/boards/readingv.xml
-share/gnome/gcompris/boards/readingv.xml.in
 share/gnome/gcompris/boards/reversecount.xml
-share/gnome/gcompris/boards/reversecount.xml.in
 share/gnome/gcompris/boards/reversecount/iceblock.png
 share/gnome/gcompris/boards/scales/Makefile
 share/gnome/gcompris/boards/scales/Makefile.am
@@ -846,9 +810,7 @@ share/gnome/gcompris/boards/scales/masse8.png
 share/gnome/gcompris/boards/scales/masse9.png
 share/gnome/gcompris/boards/scales/scales.png
 share/gnome/gcompris/boards/scalesboard.xml
-share/gnome/gcompris/boards/scalesboard.xml.in
 share/gnome/gcompris/boards/smallnumbers.xml
-share/gnome/gcompris/boards/smallnumbers.xml.in
 share/gnome/gcompris/boards/sounds/HOWTO_ENCODE
 share/gnome/gcompris/boards/sounds/de/0.ogg
 share/gnome/gcompris/boards/sounds/de/1.ogg
@@ -1088,10 +1050,8 @@ share/gnome/gcompris/boards/sounds/fr/y.ogg
 share/gnome/gcompris/boards/sounds/fr/yellow.ogg
 share/gnome/gcompris/boards/sounds/fr/z.ogg
 share/gnome/gcompris/boards/target.xml
-share/gnome/gcompris/boards/target.xml.in
 share/gnome/gcompris/boards/target/boardicon.png
 share/gnome/gcompris/boards/wordsgame.xml
-share/gnome/gcompris/boards/wordsgame.xml.in
 share/gnome/gcompris/boards/wordsgame/README
 share/gnome/gcompris/boards/wordsgame/wordslevel1.de
 share/gnome/gcompris/boards/wordsgame/wordslevel1.el
diff --git a/games/gniffel/Makefile b/games/gniffel/Makefile
index 7f7b256e1d61..5f403ad7a5e2 100644
--- a/games/gniffel/Makefile
+++ b/games/gniffel/Makefile
@@ -15,16 +15,14 @@ MAINTAINER=	sobomax@FreeBSD.org
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomelibs
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile
index 74556a3c7429..3b347d306ad1 100644
--- a/games/gnomebreakout/Makefile
+++ b/games/gnomebreakout/Makefile
@@ -15,16 +15,14 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomelibs
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-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|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index dc6e893732ff..7d067204d828 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/games/gnomememoryblocks/Makefile
@@ -16,16 +16,14 @@ MAINTAINER=	ports@FreeBSD.org
 
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-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|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/games/gnomermind/Makefile b/games/gnomermind/Makefile
index 519581ca7091..a069c6362f10 100644
--- a/games/gnomermind/Makefile
+++ b/games/gnomermind/Makefile
@@ -13,22 +13,17 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-BUILD_DEPENDS=	msgfmt-old:${PORTSDIR}/devel/gettext-old
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib" \
-		MSGFMT="${LOCALBASE}/bin/msgfmt-old" \
-		XGETTEXT="${LOCALBASE}/bin/xgettext-old"
+		LIBS="-L${LOCALBASE}/lib"
+MAKE_ENV=	OLD_PO_FILE_INPUT=1
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile
index 67a3576a6fd8..8e05776eb2dd 100644
--- a/games/gtktetcolor/Makefile
+++ b/games/gtktetcolor/Makefile
@@ -16,16 +16,14 @@ MAINTAINER=	sobomax@FreeBSD.org
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomelibs
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
 
 .include <bsd.port.mk>