Drop use of INSTALL_SRC and DEINSTALL_SRC and instead set the proper

variables so that the default INSTALL/DEINSTALL scripts from the
pkginstall framework do the right thing.  Where possible, move some
post-install directions for package setup into MESSAGE files so that
they may be re-inspected by querying the installed package using
"pkg_info -D ...".

7 files changed, 35 insertions, 71 deletions

diff --git a/games/ivan/DEINSTALL b/games/ivan/DEINSTALL
index 64aa3ef6ea5..7df10f257c8 100644
--- a/games/ivan/DEINSTALL
+++ b/games/ivan/DEINSTALL
@@ -1,17 +1,19 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2004/08/18 17:52:25 ben Exp $
-#
+# $NetBSD: DEINSTALL,v 1.2 2006/07/05 06:53:12 jlam Exp $
 
-case $2 in
-	DEINSTALL) cat << EOF
-
-=============================================================
-The records, log and bones were not wiped out by this
-deletion process. If you don't want them around, please
-remove ${PKG_PREFIX}/share/ivan.
-=============================================================
+case "${STAGE}" in
+DEINSTALL)
+	DATADIR="${PKG_PREFIX}/share/ivan"
+	${RMDIR} -p ${DATADIR} 2>/dev/null || ${TRUE}
+	if ${TEST} -d ${DATADIR}; then
+		${CAT} << EOF
+======================================================================
+The records, log and bones were not wiped out by this deletion process.
+If you don't want them around, then please remove the following
+directory:
 
+	${DATADIR}
+======================================================================
 EOF
+	fi
 	;;
 esac
diff --git a/games/ivan/Makefile b/games/ivan/Makefile
index 61a28725aee..48455b13f0c 100644
--- a/games/ivan/Makefile
+++ b/games/ivan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/06/12 16:28:09 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/05 06:53:12 jlam Exp $
 #
 
 DISTNAME=		ivan-0.50
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ivan/}
 
@@ -17,9 +17,7 @@ CONFIGURE_ARGS+=	--localstatedir=${PREFIX}/share
 
 USE_LANGUAGES=		c++
 
-DEINSTALL_SRC=		${PKGDIR}/DEINSTALL
-INSTALL_SRC=		# empty
-
+REQD_DIRS+=		share/ivan
 CONF_FILES_PERMS+=	/dev/null ${PREFIX}/share/ivan/ivan-highscore.scores \
 			${ROOT_USER} games 664
 
diff --git a/games/ivan/PLIST b/games/ivan/PLIST
index 3693c25023d..47197d9cf60 100644
--- a/games/ivan/PLIST
+++ b/games/ivan/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/05/19 07:15:24 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/07/05 06:53:13 jlam Exp $
 bin/ivan
 share/ivan/Graphics/Char.pcx
 share/ivan/Graphics/Cursor.pcx
@@ -23,4 +23,3 @@ share/ivan/Script/olterra.dat
 @dirrm share/ivan/Bone
 @dirrm share/ivan/Graphics
 @dirrm share/ivan/Script
-@dirrm share/ivan
diff --git a/games/tetrinetx/DEINSTALL b/games/tetrinetx/DEINSTALL
index 498faaf2c8c..e21e71ecd38 100644
--- a/games/tetrinetx/DEINSTALL
+++ b/games/tetrinetx/DEINSTALL
@@ -1,27 +1,14 @@
-#!/bin/sh
-# $NetBSD: DEINSTALL,v 1.1.1.1 2006/02/14 17:03:54 rillig Exp $
-
-PKGNAME=$1
-STAGE=$2
-LIST="${PKG_PREFIX}/share/tetrinetx/game.log"
-
-case ${STAGE} in
-	DEINSTALL)
-		for to_trash in ${LIST}; do
-			if [ -d "${to_trash}" ]; then
-				rm -rf ${to_trash}/*
-			elif [ -f "${to_trash}" ]; then
-				rm ${to_trash}
-			fi
-		done
-		;;
-
-	POST-DEINSTALL)
-		;;
-
-	*)
-		echo "Unexpected argument: ${STAGE}"
-		exit 1
-		;;
+# $NetBSD: DEINSTALL,v 1.2 2006/07/05 06:53:13 jlam Exp $
+
+case "${STAGE}" in
+DEINSTALL)
+	LIST="${PKG_PREFIX}/share/tetrinetx/game.log"
+	for to_trash in ${LIST}; do
+		if ${TEST} -d "$to_trash"; then
+			${RM} -fr $to_trash/*
+		elif ${TEST} -f "$to_trash"; then
+			${RM} -f $to_trash
+		fi
+	done
+	;;
 esac
-exit 0
diff --git a/games/tetrinetx/Makefile b/games/tetrinetx/Makefile
index 3ea2b62dc9d..261d15230b0 100644
--- a/games/tetrinetx/Makefile
+++ b/games/tetrinetx/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2006/03/14 01:14:29 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2006/07/05 06:53:13 jlam Exp $
 
 DISTNAME=	tetrinetx-1.13.16+qirc-1.40c
 PKGNAME=	tetrinetx-1.13.16
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://tetrinetx.sourceforge.net/
 
@@ -13,8 +14,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 SHAREDIR=	${PREFIX}/share/tetrinetx
 BINARY=		tetrix.netbsd
 RCD_SCRIPTS=	tetrinetx
-DEINSTALL_SRC=	${PKGDIR}/DEINSTALL
-INSTALL_SRC=	# empty
 
 LIBS.SunOS+=	-lsocket -lnsl -lresolv
 
diff --git a/games/xscavenger/DEINSTALL b/games/xscavenger/DEINSTALL
deleted file mode 100644
index 1f8bf360997..00000000000
--- a/games/xscavenger/DEINSTALL
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:54 jlam Exp $
-#
-
-PKGNAME=$1
-
-case $2 in
-POST-DEINSTALL)
-	cat << EOF
-=============================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove the
-scores and progress files that were copied to ~/.scavenger/ of every
-user playing it.
-=============================================================================
-EOF
-	;;
-esac
-exit 0
diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index f25fd20d46f..aa19cdfffea 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2006/06/15 13:31:29 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/07/05 06:53:13 jlam Exp $
 #
 
 DISTNAME=	xscavenger-1.4.4
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.xdr.com/dash/
 EXTRACT_SUFX=	.tgz
@@ -17,8 +17,6 @@ USE_IMAKE=		yes
 CONFIGURE_DIRS=		src
 BUILD_DIRS=		${CONFIGURE_DIRS}
 NO_INSTALL_MANPAGES=	yes
-DEINSTALL_SRC=		${PKGDIR}/DEINSTALL
-INSTALL_SRC=		# empty
 
 CPPFLAGS+=	-DSOUNDDEV="\"${DEVOSSSOUND}\""