Mechanical changes to use ${PKG_PREFIX} instead of substituting for

@PREFIX@ in DEINSTALL/INSTALL scripts.

11 files changed, 20 insertions, 37 deletions

diff --git a/games/nethack-lib/Makefile b/games/nethack-lib/Makefile
index 3dcb7b6d6ce..61bb69819a2 100644
--- a/games/nethack-lib/Makefile
+++ b/games/nethack-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/02/16 15:10:54 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2001/03/01 19:07:51 jlam Exp $
 #
 
 .include		"../nethack-lib/Makefile.common"
@@ -12,13 +12,8 @@ CONFIGURE_SCRIPT=	./sys/unix/setup.sh
 ALL_TARGET=		datastuff
 INSTALL_TARGET=		manpages install-dat
 
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
-
 .if ${OPSYS} == "SunOS"
 MAKE_FLAGS+=     	CC=gcc CPPFLAGS=
 .endif
 
-post-build:
-	${SED} -e 's|@PREFIX@|${PREFIX}|' ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/nethack-lib/pkg/DEINSTALL b/games/nethack-lib/pkg/DEINSTALL
index 66af9cc759f..4acd23a351e 100644
--- a/games/nethack-lib/pkg/DEINSTALL
+++ b/games/nethack-lib/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1 2000/04/14 14:06:54 pooka Exp $
+# $NetBSD: DEINSTALL,v 1.2 2001/03/01 19:07:52 jlam Exp $
 #
 
 case $2 in
@@ -9,7 +9,7 @@ case $2 in
 =============================================================
 The records, log and savegames were not wiped out by this
 deletion process. If you don't want them around, please
-remove @PREFIX@/share/nethackdir.
+remove ${PKG_PREFIX}/share/nethackdir.
 =============================================================
 
 EOF
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index 350f91fb5a1..fdf081c80e8 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/02/25 04:18:02 hubertf Exp $
+# $NetBSD: Makefile,v 1.18 2001/03/01 19:07:52 jlam Exp $
 
 DISTNAME=	jitterbug-1.6.2
 WRKSRC=		${WRKDIR}/${PKGNAME}/source
@@ -127,7 +127,6 @@ pre-install:
 		-e 's|@JB_USERID@|${JB_USERID}|g'                             \
 		-e 's|@JB_GROUP@|${JB_GROUP}|g'                               \
 		-e 's|@JB_GROUPID@|${JB_GROUPID}|g'                           \
-		-e 's|@PREFIX@|${PREFIX}|g'                                   \
 		-e 's|@ADDUSER@|${ADDUSER}|g'				      \
 		-e 's|@ADDGROUP@|${ADDGROUP}|g'				      \
 		-e 's|@CHGRP@|${CHGRP}|g'                                     \
@@ -158,7 +157,6 @@ pre-install:
 		-e 's|@JB_USER@|${JB_USER}|g'                                 \
 		-e 's|@JB_GROUP@|${JB_GROUP}|g'                               \
 		-e 's|@JB_PACKAGE@|${JB_PACKAGE}|g'                           \
-		-e 's|@PREFIX@|${PREFIX}|g'                                   \
 			<${PKGDIR}/DEINSTALL                                  \
 			>${DEINSTALL_FILE}
 	@${SED}								      \
@@ -167,7 +165,7 @@ pre-install:
 		-e 's|@PREFIX@|${PREFIX}|g'				      \
 			< ${FILESDIR}/httpd.conf			      \
 			> ${WRKDIR}/httpd.conf
-	${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${JB_CONFIGDIR}
diff --git a/misc/jitterbug/pkg/DEINSTALL b/misc/jitterbug/pkg/DEINSTALL
index 737a7105c84..9c1cf480707 100644
--- a/misc/jitterbug/pkg/DEINSTALL
+++ b/misc/jitterbug/pkg/DEINSTALL
@@ -1,11 +1,10 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.2 2000/09/12 17:23:02 wennmach Exp $
+# $NetBSD: DEINSTALL,v 1.3 2001/03/01 19:07:52 jlam Exp $
 
 JB_USER=@JB_USER@
 JB_GROUP=@JB_GROUP@
 JB_PACKAGE=@JB_PACKAGE@
-PREFIX=@PREFIX@
 
 PKG=$1
 STAGE=$2
@@ -18,7 +17,7 @@ fi
 echo "If you are removing jitterbug permanently, you may wish to"
 echo "  - remove user ${JB_USER}"
 echo "  - remove group ${JB_GROUP}"
-echo "  - remove entries in your httpd.conf (usually ${PREFIX}/etc/httpd/httpd.conf)"
+echo "  - remove entries in your httpd.conf (usually ${PKG_PREFIX}/etc/httpd/httpd.conf)"
 echo "  - remove mail alias for ${JB_PACKAGE}-bugs in your mail aliases"
 echo "           (typically /etc/aliases or /etc/mail/aliases)"
 echo "           and run \`newaliases' (if you use sendmail)"
diff --git a/misc/jitterbug/pkg/INSTALL b/misc/jitterbug/pkg/INSTALL
index d3bf6b19937..c2b9764fd41 100644
--- a/misc/jitterbug/pkg/INSTALL
+++ b/misc/jitterbug/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.1 2000/12/08 09:43:06 wiz Exp $
+# $NetBSD: INSTALL,v 1.2 2001/03/01 19:07:52 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -9,7 +9,6 @@ JB_USER=@JB_USER@
 JB_USERID=@JB_USERID@
 JB_GROUP=@JB_GROUP@
 JB_GROUPID=@JB_GROUPID@
-PREFIX=@PREFIX@
 ADDUSER=@ADDUSER@
 ADDGROUP=@ADDGROUP@
 CHGRP=@CHGRP@
@@ -47,7 +46,7 @@ if [ $? -eq 0 ]; then
 else
 	echo "Creating '${JB_USER}' user..."
 	${ADDUSER} -c "Jitterbug Administrator" -g ${JB_GROUP}          \
-		   -b ${PREFIX} -u ${JB_USERID} ${JB_USER}
+		   -b ${PKG_PREFIX} -u ${JB_USERID} ${JB_USER}
 	echo "Done."
 fi
 
diff --git a/misc/staroffice/Makefile b/misc/staroffice/Makefile
index 48ad900897f..d817fb326d4 100644
--- a/misc/staroffice/Makefile
+++ b/misc/staroffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/02/17 18:09:26 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/03/01 19:07:52 jlam Exp $
 #
 
 DISTNAME=		so51a_lnx_${LANGNO}
@@ -70,7 +70,6 @@ LANGSUB=		51AA9999
 
 PLIST_SUBST+=		LANGNO=${LANGNO}
 PLIST_SRC=		${WRKDIR}/PLIST
-INSTALL_FILE=		${WRKDIR}/INSTALL
 
 do-fetch:
 	@${MKDIR} ${WRKDIR}
@@ -135,7 +134,5 @@ post-install:
 		>${WRKDIR}/${file}
 	${INSTALL_SCRIPT} ${WRKDIR}/${file} ${PREFIX}/bin
 .endfor
-	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' < ${PKGDIR}/INSTALL \
-		>${WRKDIR}/INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/staroffice/pkg/INSTALL b/misc/staroffice/pkg/INSTALL
index 4986c0af8bd..0c20786ccca 100755
--- a/misc/staroffice/pkg/INSTALL
+++ b/misc/staroffice/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.2 1999/11/24 20:04:51 rh Exp $
+# $NetBSD: INSTALL,v 1.3 2001/03/01 19:07:52 jlam Exp $
 #
 
 case $2 in
@@ -8,7 +8,7 @@ case $2 in
         ;;
     POST-INSTALL)
     	for i in backup store store/trash download work ; do
-	    mkdir -p @@PREFIX@@/Office51/$i
+	    mkdir -p ${PKG_PREFIX}/Office51/$i
 	done
 	;;
     *)
diff --git a/net/6to4/Makefile b/net/6to4/Makefile
index c5985cf4441..cc758246f07 100644
--- a/net/6to4/Makefile
+++ b/net/6to4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/18 15:32:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/01 19:07:53 jlam Exp $
 #
 
 DISTNAME=		6to4-1.1
@@ -11,7 +11,6 @@ HOMEPAGE=		http://www.netbsd.org/packages/net/6to4/files/6to4.html
 COMMENT=		Enables 6to4 IPv6 automatic tunnels
 
 USE_PERL5=		YES
-DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 
 EXTRACT_ONLY=	# empty
 NO_WRKSUBDIR=	yes
@@ -26,9 +25,6 @@ do-build:
 		< ${FILESDIR}/${FILE}	 		\
 		> ${WRKSRC}/${FILE}
 .endfor
-	${SED} \
-		-e 's,@PREFIX@,${PREFIX},' \
-		<${PKGDIR}/DEINSTALL  >${DEINSTALL_FILE}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/6to4 ${PREFIX}/sbin/6to4
diff --git a/net/6to4/pkg/DEINSTALL b/net/6to4/pkg/DEINSTALL
index 7d573d8b752..adffbe269bc 100644
--- a/net/6to4/pkg/DEINSTALL
+++ b/net/6to4/pkg/DEINSTALL
@@ -1,15 +1,15 @@
 #! /bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.1.1.1 2001/02/11 05:24:29 hubertf Exp $
+# $NetBSD: DEINSTALL,v 1.2 2001/03/01 19:07:53 jlam Exp $
 #
 
 case "$2" in
 	DEINSTALL) 
-		if [ -f @PREFIX@/etc/6to4.conf ]; then
+		if [ -f ${PKG_PREFIX}/etc/6to4.conf ]; then
 		cat <<EOF
 
 =============================================================
-Note that the 6to4 configuration file (@PREFIX@/etc/6to4.conf)
+Note that the 6to4 configuration file (${PKG_PREFIX}/etc/6to4.conf)
 was not removed in the deinstallation process.  You should
 remove it by hand, if you no longer need it.
 =============================================================
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 744020ec6ca..8db4eccad5f 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2001/02/25 04:18:10 hubertf Exp $
+# $NetBSD: Makefile,v 1.26 2001/03/01 19:07:53 jlam Exp $
 
 DISTNAME=		inn-2.3.1
 CATEGORIES=		news
@@ -57,7 +57,6 @@ post-build:
 	        ${FILESDIR}/innd.sh >${WRKDIR}/innd.sh
 .for FILE in DEINSTALL INSTALL
 	${SED} -e 's#@@INN_DATA_DIR@@#${INN_DATA_DIR}#g' \
-	       -e 's#@@PREFIX@@#${PREFIX}#g' \
 	        ${PKGDIR}/${FILE} >${WRKDIR}/${FILE}
 .endfor
 	for DIR in backends expire frontends innd innfeed lib nnrpd	\
@@ -82,6 +81,6 @@ post-install:
 	done
 	cd ${WRKSRC}/site && \
 	${INSTALL_SCRIPT} ${WRKDIR}/innd.sh ${PREFIX}/etc/rc.d/innd
-	@${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/inn/pkg/INSTALL b/news/inn/pkg/INSTALL
index 5c7257beb73..774a791d7e2 100644
--- a/news/inn/pkg/INSTALL
+++ b/news/inn/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.3 2001/02/08 16:23:07 tron Exp $
+# $NetBSD: INSTALL,v 1.4 2001/03/01 19:07:53 jlam Exp $
 
 if [ "$2" != "POST-INSTALL" ]; then
   exit 0
@@ -30,7 +30,7 @@ ETC="actsync.cfg actsync.ign buffindexed.conf control.ctl cycbuff.conf distrib.p
 
 for FILE in $ETC; do 
 	if [ ! -f @@INN_DATA_DIR@@/etc/$FILE ]; then
-		install -c -o news -g news -m 664 @@PREFIX@@/share/examples/inn/$FILE @@INN_DATA_DIR@@/etc
+		install -c -o news -g news -m 664 ${PKG_PREIX}/share/examples/inn/$FILE @@INN_DATA_DIR@@/etc
 	fi
 done