Use the general INSTALL/DEINSTALL scripts instead of the homegrown ones.

3 files changed, 5 insertions, 133 deletions

diff --git a/games/xsoldier/DEINSTALL b/games/xsoldier/DEINSTALL
deleted file mode 100644
index d59d1e468e7..00000000000
--- a/games/xsoldier/DEINSTALL
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.1 2001/11/01 00:58:01 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CAT="@CAT@"
-CMP="@CMP@"
-ECHO="@ECHO@"
-RM="@RM@"
-
-SCOREDISTDIR=${PKG_PREFIX}/share/xsoldier
-SCOREDIR=/var/games
-
-SCOREFILES="	${SCOREDISTDIR}/xsoldier.score.dist ${SCOREDIR}/xsoldier"
-
-case ${STAGE} in
-DEINSTALL)
-	# Remove score files if they don't differ from the default
-	# score files.
-	#
-	${ECHO} ${SCOREFILES} | while read SAMPLEFILE FILE
-	do
-		if ${CMP} -s ${FILE} ${SAMPLEFILE}
-		then
-			${RM} -f ${FILE}
-		fi
-	done
-	;;
-
-POST-DEINSTALL)
-	modified_files=''
-	for FILE in ${SCOREFILES}
-	do
-		if [ -f ${FILE} ]
-		then
-			modified_files="${modified_files} ${FILE}"
-		fi
-	done
-
-	if [ -n "${modified_files}" ]
-	then
-		${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove:
-EOF
-		if [ -n "${modified_files}" ]
-		then
-			${CAT} << EOF
-
-  * the following files:
-
-EOF
-			for file in ${modified_files}
-			do
-				echo "	${file}"
-			done
-		fi
-		${CAT} << EOF
-===========================================================================
-EOF
-	fi
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/games/xsoldier/INSTALL b/games/xsoldier/INSTALL
deleted file mode 100644
index a6015018d31..00000000000
--- a/games/xsoldier/INSTALL
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: INSTALL,v 1.1 2001/11/01 00:58:01 zuntum Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-CHGRP="@CHGRP@"
-CHMOD="@CHMOD@"
-CHOWN="@CHOWN@"
-CP="@CP@"
-ECHO="@ECHO@"
-
-SCOREDIR=/var/games
-SCOREDISTDIR=${PKG_PREFIX}/share/xsoldier
-
-SCOREFILES="	${SCOREDISTDIR}/xsoldier.score.dist ${SCOREDIR}/xsoldier"
-
-case ${STAGE} in
-PRE-INSTALL)
-	;;
-
-POST-INSTALL)
-	echo "Installing score files:"
-	${ECHO} ${SCOREFILES} | while read SAMPLEFILE FILE
-	do
-		if [ -f ${FILE} ]
-		then
-			echo "    ${FILE} already exists"
-		else
-			echo "    ${FILE}"
-			${CP} ${SAMPLEFILE} ${FILE}
-			${CHOWN} games ${FILE}
-			${CHGRP} games ${FILE}
-			${CHMOD} 664 ${FILE}
-		fi
-	done
-	;;
-
-*)
-	echo "Unexpected argument: ${STAGE}"
-	exit 1
-	;;
-esac
-exit 0
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index 6a24f94ed8b..90b5de1c46c 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/09/14 03:48:06 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/11/19 23:33:03 jlam Exp $
 #
 
 DISTNAME=		xsoldier-0.96
@@ -12,30 +12,18 @@ COMMENT=		Updated xgalaga type game with awesome graphics
 USE_IMAKE=		YES
 NO_INSTALL_MANPAGES=	YES
 
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-INSTALL_FILE=		${WRKDIR}/INSTALL
-
 MAKE_ENV+=		BINOWN=${BINOWN}
 
-FILES_SUBST=		CAT=${CAT:Q}
-FILES_SUBST+=		CHGRP=${CHGRP:Q}
-FILES_SUBST+=		CHMOD=${CHMOD:Q}
-FILES_SUBST+=		CHOWN=${CHOWN:Q}
-FILES_SUBST+=		CMP=${CMP:Q}
-FILES_SUBST+=		CP=${CP:Q}
-FILES_SUBST+=		ECHO=${ECHO:Q}
-FILES_SUBST+=		RM=${RM:Q}
-FILES_SUBST_SED=	${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+SUPPORT_FILES_PERMS=	${PREFIX}/share/xsoldier/xsoldier.score.dist	\
+			/var/games/xsoldier				\
+			games games 0664
 
 post-patch:
 	${TOUCH} ${WRKSRC}/xsoldier.man
 
-pre-install:
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-	${SED} ${FILES_SUBST_SED} ${PKGDIR}/INSTALL > ${INSTALL_FILE}
-
 post-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"