Update to 2.0.2.

6 files changed, 10 insertions, 166 deletions

diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index d7f5d2e..8cd8c5e 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomegames2
-PORTVERSION=	2.0.1.1
+PORTVERSION=	2.0.2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-games
@@ -22,21 +22,17 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	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}
 
-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'
 	@find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
 
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index b59a008..49c0e94 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-games-2.0.1.1.tar.bz2) = 24803e993961709548c70fe8ecb15787
+MD5 (gnome2/gnome-games-2.0.2.tar.bz2) = 2efdc3bb2d2dc0d83b8973762d1fd532
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index e3d6149..271ed51 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -745,92 +745,18 @@ share/locale/vi/LC_MESSAGES/gnome-games.mo
 share/locale/wa/LC_MESSAGES/gnome-games.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-games.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
-@dirrm share/gnome/xbill/pixmaps
-@dirrm share/gnome/xbill/cursors
-@dirrm share/gnome/xbill
-@dirrm share/gnome/sounds/iagno
 @dirrm share/gnome/sounds/gnome-stones
-@dirrm share/gnome/sounds/gnobots2
-@dirrm share/gnome/sounds/gnibbles
-@dirrm share/gnome/sounds/gataxx
-@dirrm share/gnome/sol-games
-@dirrm share/gnome/pixmaps/same-gnome
-@dirrm share/gnome/pixmaps/mahjongg/bg
-@dirrm share/gnome/pixmaps/mahjongg
-@dirrm share/gnome/pixmaps/iagno
-@dirrm share/gnome/pixmaps/gnotravex
 @dirrm share/gnome/pixmaps/gnomine
-@dirrm share/gnome/pixmaps/gnometris/bg
-@dirrm share/gnome/pixmaps/gnometris
-@dirrm share/gnome/pixmaps/gnome-stones
-@dirrm share/gnome/pixmaps/gnobots2
-@dirrm share/gnome/pixmaps/gnibbles
-@dirrm share/gnome/pixmaps/gnect
-@dirrm share/gnome/pixmaps/glines
-@dirrm share/gnome/pixmaps/gataxx
-@dirrm share/gnome/pixmaps/cards/suits_small
-@dirrm share/gnome/pixmaps/cards/suits_medium
-@dirrm share/gnome/pixmaps/cards/suits_large
-@dirrm share/gnome/pixmaps/cards/slots
-@dirrm share/gnome/pixmaps/cards/ranks
-@dirrm share/gnome/pixmaps/cards/jokers
-@dirrm share/gnome/pixmaps/cards/honors
-@dirrm share/gnome/pixmaps/cards/backs
-@dirrm share/gnome/pixmaps/cards
-@dirrm share/gnome/omf/gnome-games
 @dirrm share/gnome/help/xbill/C/figures
 @dirrm share/gnome/help/xbill/C
 @dirrm share/gnome/help/xbill
 @dirrm share/gnome/help/same-gnome/C/figures
-@dirrm share/gnome/help/same-gnome/C
-@dirrm share/gnome/help/same-gnome
-@dirrm share/gnome/help/mahjongg/C/figures
-@dirrm share/gnome/help/mahjongg/C
-@dirrm share/gnome/help/mahjongg
-@dirrm share/gnome/help/iagno/C/figures
-@dirrm share/gnome/help/iagno/C
-@dirrm share/gnome/help/iagno
-@dirrm share/gnome/help/gtali/da
-@dirrm share/gnome/help/gtali/C/figures
-@dirrm share/gnome/help/gtali/C
-@dirrm share/gnome/help/gtali
-@dirrm share/gnome/help/gnotravex/C/figures
-@dirrm share/gnome/help/gnotravex/C
-@dirrm share/gnome/help/gnotravex
 @dirrm share/gnome/help/gnomine/C/figures
 @dirrm share/gnome/help/gnomine/C
 @dirrm share/gnome/help/gnomine
-@dirrm share/gnome/help/gnome-stones/C/figures
-@dirrm share/gnome/help/gnome-stones/C
-@dirrm share/gnome/help/gnome-stones
-@dirrm share/gnome/help/gnobots2/it
-@dirrm share/gnome/help/gnobots2/es
-@dirrm share/gnome/help/gnobots2/da
-@dirrm share/gnome/help/gnobots2/C/figures
-@dirrm share/gnome/help/gnobots2/C
-@dirrm share/gnome/help/gnobots2
-@dirrm share/gnome/help/gnibbles/C/figures
-@dirrm share/gnome/help/gnibbles/C
-@dirrm share/gnome/help/gnibbles
-@dirrm share/gnome/help/gnect/C/figures
-@dirrm share/gnome/help/gnect/C
-@dirrm share/gnome/help/gnect
 @dirrm share/gnome/help/glines/C/figures
 @dirrm share/gnome/help/glines/C
 @dirrm share/gnome/help/glines
-@dirrm share/gnome/help/gataxx/C/figures
-@dirrm share/gnome/help/gataxx/C
-@dirrm share/gnome/help/gataxx
-@dirrm share/gnome/help/aisleriot/C/figures
-@dirrm share/gnome/help/aisleriot/C
-@dirrm share/gnome/help/aisleriot
-@dirrm share/gnome/gnome-stones/objects
-@dirrm share/gnome/gnome-stones
-@dirrm share/gnome/gnobots2
-@dirrm share/gnome/gnibbles
-@dirrm share/gnome/gnect
-@dirrm share/gnome/games
-@dirrm include/gdkcardimage
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/iagno
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index d7f5d2e..8cd8c5e 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomegames2
-PORTVERSION=	2.0.1.1
+PORTVERSION=	2.0.2
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-games
@@ -22,21 +22,17 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	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}
 
-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'
 	@find ${WRKSRC} -name "*.[ch]" | xargs ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
 
diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo
index b59a008..49c0e94 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-games-2.0.1.1.tar.bz2) = 24803e993961709548c70fe8ecb15787
+MD5 (gnome2/gnome-games-2.0.2.tar.bz2) = 2efdc3bb2d2dc0d83b8973762d1fd532
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index e3d6149..271ed51 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -745,92 +745,18 @@ share/locale/vi/LC_MESSAGES/gnome-games.mo
 share/locale/wa/LC_MESSAGES/gnome-games.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-games.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
-@dirrm share/gnome/xbill/pixmaps
-@dirrm share/gnome/xbill/cursors
-@dirrm share/gnome/xbill
-@dirrm share/gnome/sounds/iagno
 @dirrm share/gnome/sounds/gnome-stones
-@dirrm share/gnome/sounds/gnobots2
-@dirrm share/gnome/sounds/gnibbles
-@dirrm share/gnome/sounds/gataxx
-@dirrm share/gnome/sol-games
-@dirrm share/gnome/pixmaps/same-gnome
-@dirrm share/gnome/pixmaps/mahjongg/bg
-@dirrm share/gnome/pixmaps/mahjongg
-@dirrm share/gnome/pixmaps/iagno
-@dirrm share/gnome/pixmaps/gnotravex
 @dirrm share/gnome/pixmaps/gnomine
-@dirrm share/gnome/pixmaps/gnometris/bg
-@dirrm share/gnome/pixmaps/gnometris
-@dirrm share/gnome/pixmaps/gnome-stones
-@dirrm share/gnome/pixmaps/gnobots2
-@dirrm share/gnome/pixmaps/gnibbles
-@dirrm share/gnome/pixmaps/gnect
-@dirrm share/gnome/pixmaps/glines
-@dirrm share/gnome/pixmaps/gataxx
-@dirrm share/gnome/pixmaps/cards/suits_small
-@dirrm share/gnome/pixmaps/cards/suits_medium
-@dirrm share/gnome/pixmaps/cards/suits_large
-@dirrm share/gnome/pixmaps/cards/slots
-@dirrm share/gnome/pixmaps/cards/ranks
-@dirrm share/gnome/pixmaps/cards/jokers
-@dirrm share/gnome/pixmaps/cards/honors
-@dirrm share/gnome/pixmaps/cards/backs
-@dirrm share/gnome/pixmaps/cards
-@dirrm share/gnome/omf/gnome-games
 @dirrm share/gnome/help/xbill/C/figures
 @dirrm share/gnome/help/xbill/C
 @dirrm share/gnome/help/xbill
 @dirrm share/gnome/help/same-gnome/C/figures
-@dirrm share/gnome/help/same-gnome/C
-@dirrm share/gnome/help/same-gnome
-@dirrm share/gnome/help/mahjongg/C/figures
-@dirrm share/gnome/help/mahjongg/C
-@dirrm share/gnome/help/mahjongg
-@dirrm share/gnome/help/iagno/C/figures
-@dirrm share/gnome/help/iagno/C
-@dirrm share/gnome/help/iagno
-@dirrm share/gnome/help/gtali/da
-@dirrm share/gnome/help/gtali/C/figures
-@dirrm share/gnome/help/gtali/C
-@dirrm share/gnome/help/gtali
-@dirrm share/gnome/help/gnotravex/C/figures
-@dirrm share/gnome/help/gnotravex/C
-@dirrm share/gnome/help/gnotravex
 @dirrm share/gnome/help/gnomine/C/figures
 @dirrm share/gnome/help/gnomine/C
 @dirrm share/gnome/help/gnomine
-@dirrm share/gnome/help/gnome-stones/C/figures
-@dirrm share/gnome/help/gnome-stones/C
-@dirrm share/gnome/help/gnome-stones
-@dirrm share/gnome/help/gnobots2/it
-@dirrm share/gnome/help/gnobots2/es
-@dirrm share/gnome/help/gnobots2/da
-@dirrm share/gnome/help/gnobots2/C/figures
-@dirrm share/gnome/help/gnobots2/C
-@dirrm share/gnome/help/gnobots2
-@dirrm share/gnome/help/gnibbles/C/figures
-@dirrm share/gnome/help/gnibbles/C
-@dirrm share/gnome/help/gnibbles
-@dirrm share/gnome/help/gnect/C/figures
-@dirrm share/gnome/help/gnect/C
-@dirrm share/gnome/help/gnect
 @dirrm share/gnome/help/glines/C/figures
 @dirrm share/gnome/help/glines/C
 @dirrm share/gnome/help/glines
-@dirrm share/gnome/help/gataxx/C/figures
-@dirrm share/gnome/help/gataxx/C
-@dirrm share/gnome/help/gataxx
-@dirrm share/gnome/help/aisleriot/C/figures
-@dirrm share/gnome/help/aisleriot/C
-@dirrm share/gnome/help/aisleriot
-@dirrm share/gnome/gnome-stones/objects
-@dirrm share/gnome/gnome-stones
-@dirrm share/gnome/gnobots2
-@dirrm share/gnome/gnibbles
-@dirrm share/gnome/gnect
-@dirrm share/gnome/games
-@dirrm include/gdkcardimage
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/iagno