Prepare for pkgviews by making sure that passing VIEW-INSTALL or

VIEW-DEINSTALL to the INSTALL/DEINSTALL scripts don't cause errors.

4 files changed, 58 insertions, 76 deletions

diff --git a/games/gnome2-games/INSTALL b/games/gnome2-games/INSTALL
index ec97b5df5a2..45e385327b7 100644
--- a/games/gnome2-games/INSTALL
+++ b/games/gnome2-games/INSTALL
@@ -1,58 +1,56 @@
-#!/bin/sh
-if [ "$2" != POST-INSTALL ]
-then
-	exit 0
-fi
+# $NetBSD: INSTALL,v 1.3 2003/08/30 20:22:53 jlam Exp $
 
-cd /var/games
-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 $FILE
-	fi
- done)
-
-exit 0
+case ${STAGE} in
+POST-INSTALL)
+	cd /var/games
+	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 $FILE
+		fi
+	 done)
+	;;
+esac
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index e3baf8bb540..53ded648d12 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:38:32 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/30 20:22:53 jlam Exp $
 
 DISTNAME=		gnome-games-2.2.1
 PKGREVISION=		4
@@ -43,7 +43,6 @@ CONF_FILES+=		${EGDIR}/${conffile} ${PKG_SYSCONFDIR}/${conffile}
 .undef conffile
 
 FILES_SUBST+=		INSTALL="${INSTALL}"
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 post-patch:
 	cd ${WRKSRC} &&							\
diff --git a/games/gtkballs/DEINSTALL b/games/gtkballs/DEINSTALL
index cd76cb8583f..afaa179eda7 100644
--- a/games/gtkballs/DEINSTALL
+++ b/games/gtkballs/DEINSTALL
@@ -1,13 +1,8 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2002/08/30 23:28:49 wiz Exp $
-#
+# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:54 jlam Exp $
 
 PKGNAME=$1
 
 case $2 in
-DEINSTALL)
-	;;
 POST-DEINSTALL)
 	cat << EOF
 =============================================================================
@@ -16,9 +11,5 @@ score file ${PKG_PREFIX}/var/gtkballs-scores.
 =============================================================================
 EOF
 	;;
-*)
-	echo "Unexpected argument: $2"
-	exit 1
-	;;
 esac
 exit 0
diff --git a/games/xscavenger/DEINSTALL b/games/xscavenger/DEINSTALL
index cd8b4ce2211..1f8bf360997 100644
--- a/games/xscavenger/DEINSTALL
+++ b/games/xscavenger/DEINSTALL
@@ -1,13 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1 2001/11/01 00:57:45 zuntum Exp $
+# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:54 jlam Exp $
 #
 
 PKGNAME=$1
 
 case $2 in
-DEINSTALL)
-	;;
 POST-DEINSTALL)
 	cat << EOF
 =============================================================================
@@ -17,9 +15,5 @@ user playing it.
 =============================================================================
 EOF
 	;;
-*)
-	echo "Unexpected argument: $2"
-	exit 1
-	;;
 esac
 exit 0