Update to 2.3.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@954 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 109 insertions, 46 deletions

diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index 027f9dec8..49fe94c8f 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomegames2
-PORTVERSION=	2.3.3
+PORTVERSION=	2.3.4
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-games/2.3
@@ -28,10 +28,4 @@ INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|malloc\.h|stdlib.h|g'
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|games\.games|games:games|g'
-
 .include <bsd.port.mk>
diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo
index 6e2270a33..c45e449fe 100644
--- a/games/gnomegames2/distinfo
+++ b/games/gnomegames2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-games-2.3.3.tar.bz2) = 8d0211893f5cdcb641d5b815fca397b8
+MD5 (gnome2/gnome-games-2.3.4.tar.bz2) = 0102c4d1e18edf2b9092df2452c17f66
diff --git a/games/gnomegames2/files/patch-ae b/games/gnomegames2/files/patch-ae
deleted file mode 100644
index 397fca112..000000000
--- a/games/gnomegames2/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- aisleriot/menu.c.orig	Wed May  8 16:33:36 2002
-+++ aisleriot/menu.c	Wed May  8 16:33:47 2002
-@@ -18,6 +18,7 @@
-  */
- 
- #include <config.h>
-+#include <sys/types.h>
- #include <dirent.h>
- #include "gnome.h"
- #include "sol.h"
diff --git a/games/gnomegames2/files/patch-blackjack_data_Makefile.in b/games/gnomegames2/files/patch-blackjack_data_Makefile.in
new file mode 100644
index 000000000..6d80b6f40
--- /dev/null
+++ b/games/gnomegames2/files/patch-blackjack_data_Makefile.in
@@ -0,0 +1,11 @@
+--- blackjack/data/Makefile.in.orig	Wed Jul  2 14:21:58 2003
++++ blackjack/data/Makefile.in	Wed Jul  2 14:22:17 2003
+@@ -322,7 +322,7 @@
+ @INTLTOOL_SCHEMAS_RULE@
+ 
+ install-data-local:
+-@GCONF_SCHEMAS_INSTALL_TRUE@        GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
++@GCONF_SCHEMAS_INSTALL_TRUE@	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/games/gnomegames2/files/patch-mahjongg_Makefile.in b/games/gnomegames2/files/patch-mahjongg_Makefile.in
deleted file mode 100644
index b6977a948..000000000
--- a/games/gnomegames2/files/patch-mahjongg_Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- mahjongg/Makefile.in.orig	Sun Jun 15 20:31:43 2003
-+++ mahjongg/Makefile.in	Sun Jun 15 23:49:44 2003
-@@ -615,9 +615,12 @@
- 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
- 	-$(mkinstalldirs) $(DESTDIR)$(scoredir)
- 	$(mkinstalldirs) $(DESTDIR)$(bgdir)
--	touch $(DESTDIR)$(scoredir)/mahjongg.{easy,difficult}.scores
--	-chown $(scores_user).$(scores_group) $(DESTDIR)$(scoredir)/mahjongg.{easy,difficult}.scores
--	-chmod 664 $(DESTDIR)$(scoredir)/mahjongg.{easy,difficult}.scores
-+	touch $(DESTDIR)$(scoredir)/mahjongg.easy.scores
-+	touch $(DESTDIR)$(scoredir)/mahjongg.difficult.scores
-+	-chown games:games $(DESTDIR)$(scoredir)/mahjongg.easy.scores
-+	-chown games:games $(DESTDIR)$(scoredir)/mahjongg.difficult.scores
-+	-chmod 664 $(DESTDIR)$(scoredir)/mahjongg.easy.scores
-+	-chmod 664 $(DESTDIR)$(scoredir)/mahjongg.difficult.scores
- 	-if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/mahjongg && chmod 2555 $(DESTDIR)$(bindir)/mahjongg ; fi
- 	$(mkinstalldirs) $(DESTDIR)$(Gamesdir)
- 
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index c625a9de0..ecc5c5177 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -1,3 +1,4 @@
+bin/blackjack
 bin/gataxx
 bin/glines
 bin/gnect
@@ -13,30 +14,77 @@ bin/iagno
 bin/mahjongg
 bin/same-gnome
 bin/sol
+etc/gconf/gconf.xml.defaults/apps/aisleriot/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/blackjack/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/blackjack/deck/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/blackjack/global/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/blackjack/settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gataxx/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/glines/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/glines/preferences/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/glines/saved/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnect/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnibbles/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/0/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/1/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/2/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/3/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnobots2/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnobots2/preferences/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-stones/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome-stones/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnometris/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnometris/options/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomine/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnomine/geometry/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnotravex/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gtali/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/iagno/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/mahjongg/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/same-gnome/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/aisleriot/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/deck/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/global/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/settings/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gataxx/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/glines/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnect/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/0/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/1/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/2/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/3/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/preferences/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/preferences/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnotravex/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gtali/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/iagno/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/same-gnome/%gconf.xml
+etc/gconf/schemas/aisleriot.schemas
+etc/gconf/schemas/blackjack.schemas
 etc/gconf/schemas/gataxx.schemas
+etc/gconf/schemas/glines.schemas
 etc/gconf/schemas/gnect.schemas
+etc/gconf/schemas/gnibbles.schemas
+etc/gconf/schemas/gnobots2.schemas
+etc/gconf/schemas/gnome-stones.schemas
 etc/gconf/schemas/gnometris.schemas
 etc/gconf/schemas/gnomine.schemas
+etc/gconf/schemas/gnotravex.schemas
 etc/gconf/schemas/gtali.schemas
 etc/gconf/schemas/iagno.schemas
 etc/gconf/schemas/mahjongg.schemas
@@ -102,11 +150,11 @@ share/gnome/blackjack/Vegas_Strip.rules.dat
 @unexec [ -s %D/share/gnome/games/gnomine.Large.scores ] || rm -f %D/share/gnome/games/gnomine.Large.scores
 @unexec [ -s %D/share/gnome/games/gnomine.Medium.scores ] || rm -f %D/share/gnome/games/gnomine.Medium.scores
 @unexec [ -s %D/share/gnome/games/gnomine.Small.scores ] || rm -f %D/share/gnome/games/gnomine.Small.scores
-@unexec [ -s %D/share/gnome/games/gnotravex.2.scores ] || rm -f %D/share/gnome/games/gnotravex.2.scores
-@unexec [ -s %D/share/gnome/games/gnotravex.3.scores ] || rm -f %D/share/gnome/games/gnotravex.3.scores
-@unexec [ -s %D/share/gnome/games/gnotravex.4.scores ] || rm -f %D/share/gnome/games/gnotravex.4.scores
-@unexec [ -s %D/share/gnome/games/gnotravex.5.scores ] || rm -f %D/share/gnome/games/gnotravex.5.scores
-@unexec [ -s %D/share/gnome/games/gnotravex.6.scores ] || rm -f %D/share/gnome/games/gnotravex.6.scores
+@unexec [ -s %D/share/gnome/games/gnotravex.2x2.scores ] || rm -f %D/share/gnome/games/gnotravex.2x2.scores
+@unexec [ -s %D/share/gnome/games/gnotravex.3x3.scores ] || rm -f %D/share/gnome/games/gnotravex.3x3.scores
+@unexec [ -s %D/share/gnome/games/gnotravex.4x4.scores ] || rm -f %D/share/gnome/games/gnotravex.4x4.scores
+@unexec [ -s %D/share/gnome/games/gnotravex.5x5.scores ] || rm -f %D/share/gnome/games/gnotravex.5x5.scores
+@unexec [ -s %D/share/gnome/games/gnotravex.6x6.scores ] || rm -f %D/share/gnome/games/gnotravex.6x6.scores
 @unexec [ -s %D/share/gnome/games/gnotski.1.scores ] || rm -f %D/share/gnome/games/gnotski.1.scores
 @unexec [ -s %D/share/gnome/games/gnotski.11.scores ] || rm -f %D/share/gnome/games/gnotski.11.scores
 @unexec [ -s %D/share/gnome/games/gnotski.12.scores ] || rm -f %D/share/gnome/games/gnotski.12.scores
@@ -445,12 +493,10 @@ share/gnome/pixmaps/gataxx/sunmoon.png
 share/gnome/pixmaps/gataxx/woodtrim.png
 share/gnome/pixmaps/glines.png
 share/gnome/pixmaps/glines/ball.png
-share/gnome/pixmaps/glines/black.xpm
 share/gnome/pixmaps/glines/classic.png
 share/gnome/pixmaps/glines/dots.png
-share/gnome/pixmaps/glines/gray.xpm
+share/gnome/pixmaps/glines/gumball.png
 share/gnome/pixmaps/glines/pulse.png
-share/gnome/pixmaps/glines/woody.xpm
 share/gnome/pixmaps/gnect-icon.png
 share/gnome/pixmaps/gnect/bg_grotty.jpg
 share/gnome/pixmaps/gnect/bg_nightfall.jpg
@@ -511,7 +557,7 @@ share/gnome/pixmaps/gnome-stones/explosion.png
 share/gnome/pixmaps/gnome-stones/firefly.png
 share/gnome/pixmaps/gnome-stones/frame.png
 share/gnome/pixmaps/gnome-stones/gnome.png
-share/gnome/pixmaps/gnome-stones/title.png
+share/gnome/pixmaps/gnome-stones/title-tile.png
 share/gnome/pixmaps/gnome-stones/wall.png
 share/gnome/pixmaps/gnometris/5blocks-tig.png
 share/gnome/pixmaps/gnometris/5blocks-tim.png
@@ -542,7 +588,6 @@ share/gnome/pixmaps/gnomine/face-worried.xpm
 share/gnome/pixmaps/gnomine/flag-question.png
 share/gnome/pixmaps/gnomine/flag.png
 share/gnome/pixmaps/gnomine/mine.png
-share/gnome/pixmaps/gnotravex/gnotravex.png
 share/gnome/pixmaps/gnotski-icon.png
 share/gnome/pixmaps/gnotski.png
 share/gnome/pixmaps/iagno.png
@@ -684,6 +729,7 @@ share/locale/ga/LC_MESSAGES/gnome-games.mo
 share/locale/gl/LC_MESSAGES/gnome-games.mo
 share/locale/he/LC_MESSAGES/gnome-games.mo
 share/locale/hu/LC_MESSAGES/gnome-games.mo
+share/locale/id/LC_MESSAGES/gnome-games.mo
 share/locale/it/LC_MESSAGES/gnome-games.mo
 share/locale/ja/LC_MESSAGES/gnome-games.mo
 share/locale/ko/LC_MESSAGES/gnome-games.mo
@@ -730,22 +776,62 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/mahjongg
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/iagno
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gtali
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnotravex
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones/preferences
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-stones
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2/preferences
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnobots2
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine/geometry
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnomine
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris/options
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnometris
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/3
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/2
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/1
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm/0
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences/worm
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles/preferences
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnibbles
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnect
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/saved
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines/preferences
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/glines
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gataxx
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/settings
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/global
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack/deck
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/blackjack
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/aisleriot
 @dirrm etc/gconf/gconf.xml.defaults/apps/same-gnome
 @dirrm etc/gconf/gconf.xml.defaults/apps/mahjongg
 @dirrm etc/gconf/gconf.xml.defaults/apps/iagno
 @dirrm etc/gconf/gconf.xml.defaults/apps/gtali
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnotravex
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomine/geometry
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomine
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris/options
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnometris
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-stones/preferences
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome-stones
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnobots2/preferences
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnobots2
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/3
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/2
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/1
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm/0
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences/worm
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles/preferences
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnibbles
+@dirrm etc/gconf/gconf.xml.defaults/apps/glines/saved
+@dirrm etc/gconf/gconf.xml.defaults/apps/glines/preferences
+@dirrm etc/gconf/gconf.xml.defaults/apps/glines
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnect
 @dirrm etc/gconf/gconf.xml.defaults/apps/gataxx
+@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/settings
+@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/global
+@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack/deck
+@dirrm etc/gconf/gconf.xml.defaults/apps/blackjack
+@dirrm etc/gconf/gconf.xml.defaults/apps/aisleriot
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/aisleriot-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/blackjack-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-games/gataxx-C.omf 2>/dev/null || /usr/bin/true