Honour PKG_SYSCONFDIR (which requires switching to USE_PKGINSTALL). This

change makes sound configuration schemas work in systems setting their own
sysconfdir.  Bump PKGREVISION to 1.

3 files changed, 29 insertions, 13 deletions

diff --git a/games/gnome2-games/INSTALL b/games/gnome2-games/INSTALL
index 1b12e6e8601..ec97b5df5a2 100644
--- a/games/gnome2-games/INSTALL
+++ b/games/gnome2-games/INSTALL
@@ -51,7 +51,7 @@ same-gnome.scores
  do
 	if [ ! -f $FILE ]
 	then
-		@@INSTALL@@ -c -o games -g games -m 664 /dev/null $FILE
+		@INSTALL@ -c -o games -g games -m 664 /dev/null $FILE
 	fi
  done)
 
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 2ddd643f9e0..2dc91c5beb8 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/04/21 02:28:57 rh Exp $
+# $NetBSD: Makefile,v 1.2 2003/05/01 11:21:25 jmmv Exp $
 
 DISTNAME=		gnome-games-2.2.1
+PKGREVISION=		1
 CATEGORIES=		games gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-games/2.2/}
 EXTRACT_SUFX=		.tar.bz2
@@ -14,6 +15,7 @@ BUILD_USES_MSGFMT=	yes
 CONFLICTS=		xbill-[0-9]*
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GMAKE=		yes
 USE_X11=		yes
@@ -24,8 +26,23 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 CONFIGURE_ARGS+=	--localstatedir=/var
+# This package installs files in sysconfdir but does not read them directly,
+# so the following configuration argument is safe.
+CONFIGURE_ARGS+=	--sysconfdir=${EGDIR}
 
-INSTALL_FILE=		${WRKDIR}/INSTALL
+EGDIR=			${PREFIX}/share/examples/gnome2-games
+CONF_FILES=
+.for conffile in	sound/events/gataxx.soundlist \
+			sound/events/gnect.soundlist \
+			sound/events/gnibbles.soundlist \
+			sound/events/gnobots2.soundlist \
+			sound/events/iagno.soundlist
+CONF_FILES+=		${EGDIR}/${conffile} ${PKG_SYSCONFDIR}/${conffile}
+.endfor
+.undef conffile
+
+FILES_SUBST+=		INSTALL="${INSTALL}"
+INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 post-patch:
 	cd ${WRKSRC} &&							\
@@ -33,10 +50,6 @@ post-patch:
 	${SED} -e 's|/usr/share|${PREFIX}/share|'			\
 		< gnect/src/connect4.c.broken > gnect/src/connect4.c
 
-post-build:
-	${SED} -e 's#@@INSTALL@@#${INSTALL}#' \
-	  ${PKGDIR}/INSTALL >${INSTALL_FILE}
-
 GCONF2_SCHEMAS=		freecell.schemas
 GCONF2_SCHEMAS+=	gataxx.schemas
 GCONF2_SCHEMAS+=	gnect.schemas
diff --git a/games/gnome2-games/PLIST b/games/gnome2-games/PLIST
index 98a6aa661a4..71f367ba7bc 100644
--- a/games/gnome2-games/PLIST
+++ b/games/gnome2-games/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/04/21 02:28:57 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/05/01 11:21:25 jmmv Exp $
 bin/ctali
 bin/freecell
 bin/gataxx
@@ -17,11 +17,6 @@ bin/iagno
 bin/mahjongg
 bin/same-gnome
 bin/sol
-etc/sound/events/gataxx.soundlist
-etc/sound/events/gnect.soundlist
-etc/sound/events/gnibbles.soundlist
-etc/sound/events/gnobots2.soundlist
-etc/sound/events/iagno.soundlist
 include/gdkcardimage/gdk-card-image.h
 lib/gnome-stones/objects/libgnome-stones.a
 lib/gnome-stones/objects/libgnome-stones.la
@@ -51,6 +46,11 @@ share/applications/mahjongg.desktop
 share/applications/same-gnome.desktop
 share/applications/sol.desktop
 share/applications/xbill.desktop
+share/examples/gnome2-games/sound/events/gataxx.soundlist
+share/examples/gnome2-games/sound/events/gnect.soundlist
+share/examples/gnome2-games/sound/events/gnibbles.soundlist
+share/examples/gnome2-games/sound/events/gnobots2.soundlist
+share/examples/gnome2-games/sound/events/iagno.soundlist
 share/gconf/schemas/freecell.schemas
 share/gconf/schemas/gataxx.schemas
 share/gconf/schemas/gnect.schemas
@@ -767,6 +767,9 @@ share/xbill/pixmaps/wingdows.xpm
 @dirrm share/gnobots2
 @dirrm share/gnibbles
 @dirrm share/gnect
+@dirrm share/examples/gnome2-games/sound/events
+@dirrm share/examples/gnome2-games/sound
+@dirrm share/examples/gnome2-games
 @dirrm lib/gnome-stones/objects
 @dirrm lib/gnome-stones
 @dirrm include/gdkcardimage