-redo the scorefile install hacks

-disable ggz config file installation
This avoids installation of files in var and etc at install time.
bump PKGREVISION

6 files changed, 123 insertions, 54 deletions

diff --git a/games/gnome-games/INSTALL b/games/gnome-games/INSTALL
index 9bb1d7d9c99..d61e8eddd88 100644
--- a/games/gnome-games/INSTALL
+++ b/games/gnome-games/INSTALL
@@ -1,55 +1,8 @@
-# $NetBSD: INSTALL,v 1.3 2007/09/20 00:05:56 wiz Exp $
+# $NetBSD: INSTALL,v 1.4 2009/07/28 18:52:07 drochner Exp $
 
 case ${STAGE} in
 POST-INSTALL)
-	cat <<. |
-	glines.scores
-	gnibbles.1.0.scores
-	gnibbles.1.1.scores
-	gnibbles.2.0.scores
-	gnibbles.2.1.scores
-	gnibbles.3.0.scores
-	gnibbles.3.1.scores
-	gnibbles.4.0.scores
-	gnibbles.4.1.scores
-	gnobots2.classic_robots-safe.scores
-	gnobots2.classic_robots.scores
-	gnobots2.nightmare-safe.scores
-	gnobots2.nightmare.scores
-	gnobots2.robots2-safe.scores
-	gnobots2.robots2.scores
-	gnobots2.robots2_easy-safe.scores
-	gnobots2.robots2_easy.scores
-	gnobots2.robots_with_safe_teleport-safe.scores
-	gnobots2.robots_with_safe_teleport.scores
-	gnome-stones.scores
-	gnome-xbill.scores
-	gnometris.scores
-	gnomine.Biiiig.scores
-	gnomine.Custom.scores
-	gnomine.Medium.scores
-	gnomine.Tiny.scores
-	gnotravex.2x2.scores
-	gnotravex.3x3.scores
-	gnotravex.4x4.scores
-	gnotravex.5x5.scores
-	gnotravex.6x6.scores
-	gtali.scores
-	iagno.b1.scores
-	iagno.b2.scores
-	iagno.b3.scores
-	iagno.w1.scores
-	iagno.w2.scores
-	iagno.w3.scores
-	mahjongg.{easy,difficult}.scores
-	same-gnome.scores
-.
-	(while read FILE
-	 do
-		if [ ! -f $FILE ]
-		then
-			@INSTALL@ -c -o games -g games -m 664 /dev/null /var/games/$FILE
-		fi
-	 done)
+	(cd ${PREFIX}/share/gnome-games/scorefile-templates && \
+	 pax -rw -k -pop . /var/games)
 	;;
 esac
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index b7a0c7e743b..35b0ce9f7d4 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2009/07/22 09:01:28 wiz Exp $
+# $NetBSD: Makefile,v 1.101 2009/07/28 18:52:07 drochner Exp $
 
 DISTNAME=		gnome-games-2.26.3
+PKGREVISION=		1
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/2.26/}
 EXTRACT_SUFX=		.tar.bz2
@@ -62,6 +63,7 @@ BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.10.0
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../games/ggz-client-libs/buildlink3.mk"
+.include "../../games/ggz-client-libs/ggz-client.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 BUILDLINK_API_DEPENDS.librsvg+=	librsvg>=2.12.6
diff --git a/games/gnome-games/PLIST b/games/gnome-games/PLIST
index 518dfdb5246..a1e9c1261e4 100644
--- a/games/gnome-games/PLIST
+++ b/games/gnome-games/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2009/07/09 18:46:37 drochner Exp $
+@comment $NetBSD: PLIST,v 1.25 2009/07/28 18:52:07 drochner Exp $
 bin/blackjack
 bin/glchess
 bin/glines
@@ -491,6 +491,93 @@ share/gnome-games/pixmaps/baize.png
 share/gnome-games/pixmaps/slot.svg
 share/gnome-games/same-gnome/themes/2.10/planets.png
 share/gnome-games/same-gnome/themes/2.10/stones.png
+share/gnome-games/scorefile-templates/glines.Large.scores
+share/gnome-games/scorefile-templates/glines.Medium.scores
+share/gnome-games/scorefile-templates/glines.Small.scores
+share/gnome-games/scorefile-templates/gnibbles.1.0.scores
+share/gnome-games/scorefile-templates/gnibbles.1.1.scores
+share/gnome-games/scorefile-templates/gnibbles.2.0.scores
+share/gnome-games/scorefile-templates/gnibbles.2.1.scores
+share/gnome-games/scorefile-templates/gnibbles.3.0.scores
+share/gnome-games/scorefile-templates/gnibbles.3.1.scores
+share/gnome-games/scorefile-templates/gnibbles.4.0.scores
+share/gnome-games/scorefile-templates/gnibbles.4.1.scores
+share/gnome-games/scorefile-templates/gnobots2.classic_robots-safe.scores
+share/gnome-games/scorefile-templates/gnobots2.classic_robots-super-safe.scores
+share/gnome-games/scorefile-templates/gnobots2.classic_robots.scores
+share/gnome-games/scorefile-templates/gnobots2.nightmare-safe.scores
+share/gnome-games/scorefile-templates/gnobots2.nightmare-super-safe.scores
+share/gnome-games/scorefile-templates/gnobots2.nightmare.scores
+share/gnome-games/scorefile-templates/gnobots2.robots2-safe.scores
+share/gnome-games/scorefile-templates/gnobots2.robots2-super-safe.scores
+share/gnome-games/scorefile-templates/gnobots2.robots2.scores
+share/gnome-games/scorefile-templates/gnobots2.robots2_easy-safe.scores
+share/gnome-games/scorefile-templates/gnobots2.robots2_easy-super-safe.scores
+share/gnome-games/scorefile-templates/gnobots2.robots2_easy.scores
+share/gnome-games/scorefile-templates/gnobots2.robots_with_safe_teleport-safe.scores
+share/gnome-games/scorefile-templates/gnobots2.robots_with_safe_teleport-super-safe.scores
+share/gnome-games/scorefile-templates/gnobots2.robots_with_safe_teleport.scores
+share/gnome-games/scorefile-templates/gnometris.scores
+share/gnome-games/scorefile-templates/gnomine.Custom.scores
+share/gnome-games/scorefile-templates/gnomine.Large.scores
+share/gnome-games/scorefile-templates/gnomine.Medium.scores
+share/gnome-games/scorefile-templates/gnomine.Small.scores
+share/gnome-games/scorefile-templates/gnotravex.2x2.scores
+share/gnome-games/scorefile-templates/gnotravex.3x3.scores
+share/gnome-games/scorefile-templates/gnotravex.4x4.scores
+share/gnome-games/scorefile-templates/gnotravex.5x5.scores
+share/gnome-games/scorefile-templates/gnotravex.6x6.scores
+share/gnome-games/scorefile-templates/gnotski.1.scores
+share/gnome-games/scorefile-templates/gnotski.10.scores
+share/gnome-games/scorefile-templates/gnotski.11.scores
+share/gnome-games/scorefile-templates/gnotski.12.scores
+share/gnome-games/scorefile-templates/gnotski.13.scores
+share/gnome-games/scorefile-templates/gnotski.14.scores
+share/gnome-games/scorefile-templates/gnotski.15.scores
+share/gnome-games/scorefile-templates/gnotski.16.scores
+share/gnome-games/scorefile-templates/gnotski.17.scores
+share/gnome-games/scorefile-templates/gnotski.18.scores
+share/gnome-games/scorefile-templates/gnotski.19.scores
+share/gnome-games/scorefile-templates/gnotski.2.scores
+share/gnome-games/scorefile-templates/gnotski.20.scores
+share/gnome-games/scorefile-templates/gnotski.21.scores
+share/gnome-games/scorefile-templates/gnotski.22.scores
+share/gnome-games/scorefile-templates/gnotski.23.scores
+share/gnome-games/scorefile-templates/gnotski.24.scores
+share/gnome-games/scorefile-templates/gnotski.25.scores
+share/gnome-games/scorefile-templates/gnotski.26.scores
+share/gnome-games/scorefile-templates/gnotski.27.scores
+share/gnome-games/scorefile-templates/gnotski.28.scores
+share/gnome-games/scorefile-templates/gnotski.29.scores
+share/gnome-games/scorefile-templates/gnotski.3.scores
+share/gnome-games/scorefile-templates/gnotski.30.scores
+share/gnome-games/scorefile-templates/gnotski.31.scores
+share/gnome-games/scorefile-templates/gnotski.32.scores
+share/gnome-games/scorefile-templates/gnotski.33.scores
+share/gnome-games/scorefile-templates/gnotski.34.scores
+share/gnome-games/scorefile-templates/gnotski.35.scores
+share/gnome-games/scorefile-templates/gnotski.36.scores
+share/gnome-games/scorefile-templates/gnotski.37.scores
+share/gnome-games/scorefile-templates/gnotski.4.scores
+share/gnome-games/scorefile-templates/gnotski.5.scores
+share/gnome-games/scorefile-templates/gnotski.6.scores
+share/gnome-games/scorefile-templates/gnotski.7.scores
+share/gnome-games/scorefile-templates/gnotski.8.scores
+share/gnome-games/scorefile-templates/gnotski.9.scores
+share/gnome-games/scorefile-templates/gtali.Colors.scores
+share/gnome-games/scorefile-templates/gtali.Regular.scores
+share/gnome-games/scorefile-templates/mahjongg.bridges.scores
+share/gnome-games/scorefile-templates/mahjongg.cloud.scores
+share/gnome-games/scorefile-templates/mahjongg.confounding.scores
+share/gnome-games/scorefile-templates/mahjongg.difficult.scores
+share/gnome-games/scorefile-templates/mahjongg.dragon.scores
+share/gnome-games/scorefile-templates/mahjongg.easy.scores
+share/gnome-games/scorefile-templates/mahjongg.pyramid.scores
+share/gnome-games/scorefile-templates/mahjongg.tictactoe.scores
+share/gnome-games/scorefile-templates/mahjongg.ziggurat.scores
+share/gnome-games/scorefile-templates/same-gnome.Large.scores
+share/gnome-games/scorefile-templates/same-gnome.Medium.scores
+share/gnome-games/scorefile-templates/same-gnome.Small.scores
 share/gnome-games/sounds/appear.ogg
 share/gnome-games/sounds/bad.ogg
 share/gnome-games/sounds/bonus.ogg
@@ -2043,4 +2130,3 @@ share/omf/same-gnome/same-gnome-sv.omf
 share/pixmaps/glchess/board.png
 share/pixmaps/glchess/piece.png
 share/pixmaps/gnome-sudoku/footprints.png
-@pkgdir lib/ggz
diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo
index 510df786f2d..c40aa8dcfa6 100644
--- a/games/gnome-games/distinfo
+++ b/games/gnome-games/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.29 2009/07/09 18:46:37 drochner Exp $
+$NetBSD: distinfo,v 1.30 2009/07/28 18:52:07 drochner Exp $
 
 SHA1 (gnome-games-2.26.3.tar.bz2) = 0b859be03e6f25a43ed4ad41d6022b9bc83635fc
 RMD160 (gnome-games-2.26.3.tar.bz2) = 54ae263d943e2cf7dad2f1e160d7a2756e0ca573
 Size (gnome-games-2.26.3.tar.bz2) = 24664606 bytes
+SHA1 (patch-aa) = 8084ab8a5cf01019e8d8a0e3505bf825ed6d628c
+SHA1 (patch-ab) = 3bd7fbe20f0174e8a9afbe05d2ac804142355c41
diff --git a/games/gnome-games/patches/patch-aa b/games/gnome-games/patches/patch-aa
new file mode 100644
index 00000000000..07ba2ec21fb
--- /dev/null
+++ b/games/gnome-games/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2009/07/28 18:52:07 drochner Exp $
+
+--- configure.orig	2009-07-28 17:51:59.000000000 +0200
++++ configure
+@@ -32046,7 +32046,7 @@ fi
+ 
+ 
+ 
+-scoredir='${localstatedir}/games'
++scoredir='${prefix}/share/gnome-games/scorefile-templates'
+ 
+ 
+ ##############################################
diff --git a/games/gnome-games/patches/patch-ab b/games/gnome-games/patches/patch-ab
new file mode 100644
index 00000000000..f3600f93964
--- /dev/null
+++ b/games/gnome-games/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2009/07/28 18:52:07 drochner Exp $
+
+--- libgames-support/Makefile.in.orig	2009-07-28 17:53:51.000000000 +0200
++++ libgames-support/Makefile.in
+@@ -584,7 +584,7 @@ libgames_support_la_SOURCES = $(BUILT_SO
+ libgames_support_la_CPPFLAGS = -DPKGDATADIR="\"$(pkgdatadir)\"" \
+ 	-DDATADIR="\"$(datadir)\"" \
+ 	-DCOMMON_DATADIR="\"$(datadir)/gnome-games-common\"" \
+-	-DSCORESDIR="\"$(scoredir)\"" $(NULL) $(am__append_15)
++	-DSCORESDIR="\"/var/games\"" $(NULL) $(am__append_15)
+ libgames_support_la_CFLAGS = $(GTK_CFLAGS) $(AM_CFLAGS) \
+ 	$(am__append_12) $(am__append_18) $(am__append_20) \
+ 	$(am__append_21) $(am__append_23) $(am__append_25) \