bsd.pkg.install.mk calls the INSTALL script at the right times

automatically, so no need to do it ourselves.

32 files changed, 33 insertions, 128 deletions

diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 1c26e3c2a63..551a6d8f3e2 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2001/11/25 18:59:45 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2001/12/02 06:56:38 jlam Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp
 #
 
@@ -34,7 +34,6 @@ pre-configure:
 post-install:
 	${SED} ${FILES_SUBST_SED} ${FILESDIR}/rplayd.sh > ${WRKDIR}/rplayd
 	${INSTALL_SCRIPT} ${WRKDIR}/rplayd ${PREFIX}/etc/rc.d/rplayd
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../audio/gsm/buildlink.mk"
 .include "../../devel/readline/buildlink.mk"
diff --git a/chat/gale/Makefile b/chat/gale/Makefile
index 164175806be..80bb352e4ac 100644
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/11/26 20:38:31 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/12/02 06:56:39 jlam Exp $
 #
 
 DISTNAME=	gale-0.99a
@@ -38,14 +38,10 @@ OWN_DIRS_PERMS=		${PKG_SYSCONFDIR}/auth/cache			\
 OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/auth/local			\
 			${SHAREOWN} ${SHAREGRP} 1777
 
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
-
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/kutils/ROOT ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${EGDIR}
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../devel/boehm-gc/buildlink.mk"
 .include "../../devel/glib/buildlink.mk"
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 117ab1970c8..295e5fba84f 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/11/26 20:38:31 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/12/02 06:56:39 jlam Exp $
 
 .include "../../databases/postgresql/Makefile.common"
 .include "../../databases/postgresql/Makefile.ssl"
@@ -57,9 +57,7 @@ pre-install:
 		${FALSE};						\
 		;;							\
 	esac
-
 	${SED} ${FILES_SUBST_SED} ${FILESDIR}/pgsql.sh > ${WRKDIR}/pgsql.sh
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 do-install:
 .for DIR in ${DIRS_TO_BUILD}
@@ -71,7 +69,6 @@ post-install:
 	${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz		\
 		`${SED} -e "s|^#.*||" ${FILESDIR}/man.server`
 	${INSTALL_SCRIPT} ${WRKDIR}/pgsql.sh ${PREFIX}/etc/rc.d/pgsql
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../devel/libgetopt/buildlink.mk"
 .include "../../databases/postgresql-lib/buildlink.mk"
diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile
index 9f9418bf4bf..57d98e83835 100644
--- a/databases/unixodbc/Makefile
+++ b/databases/unixodbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/25 18:59:46 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/02 06:56:40 jlam Exp $
 
 PKGNAME=		unixodbc-${ODBC_VERS}
 ODBC_PKG_VERS=		# empty
@@ -25,12 +25,10 @@ post-patch: fix-driver-installation
 pre-install:
 	${SED} ${FILES_SUBST_SED} ${FILESDIR}/odbcinst.ini.in		\
 		> ${WRKDIR}/odbcinst.ini
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKDIR}/odbcinst.ini ${EGDIR}/odbcinst.ini
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../devel/readline/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index aeb98728e31..56f1038e477 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/11/19 23:27:51 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2001/12/02 06:56:40 jlam Exp $
 # FreeBSD: ports/games/xpat2/Makefile,v 1.11 2000/04/14 12:27:59 asami Exp
 
 DISTNAME=	xpat2-1.06
@@ -24,7 +24,6 @@ MAKE_DIRS=		/var/games
 post-install:
 	${CHOWN} root.games ${PREFIX}/bin/xpat2
 	${CHMOD} 2555 ${PREFIX}/bin/xpat2
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index 90b5de1c46c..8f75c82b060 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/11/19 23:33:03 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/12/02 06:56:40 jlam Exp $
 #
 
 DISTNAME=		xsoldier-0.96
@@ -21,9 +21,6 @@ SUPPORT_FILES_PERMS=	${PREFIX}/share/xsoldier/xsoldier.score.dist	\
 post-patch:
 	${TOUCH} ${WRKSRC}/xsoldier.man
 
-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"
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index c9fc8d2d267..6ad4501ad3f 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/11/25 18:59:46 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2001/12/02 06:56:40 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.0.16
 SVR4_PKGNAME=		cimap
@@ -99,7 +99,6 @@ post-install:
 	cd ${WRKSRC}/master/conf; ${INSTALL_DATA} *.conf ${EGDIR}
 	${INSTALL_DATA_DIR} ${HTMLDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html cyrusv2.mc ${HTMLDIR}
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../databases/db3/buildlink.mk"
 .include "../../lang/perl5/buildlink.mk"
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 24870ee6905..de1619452fc 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/11/25 18:59:46 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/12/02 06:56:41 jlam Exp $
 
 DISTNAME=	imp-2.2.7
 CATEGORIES=	mail www
@@ -88,7 +88,6 @@ do-build:
 pre-install:
 	${SED}	-e "s|@IMPDIR@|${IMPDIR}|g"				\
 		${FILESDIR}/imp.conf.dist > ${WRKDIR}/imp.conf.dist
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR} ${EGDIR} ${IMPDIR}
@@ -101,8 +100,5 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${IMPDIR}
 	${CHMOD} -R a-w ${IMPDIR}
 
-post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 987da23e0fd..8c1c2d4da54 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/11/29 01:12:40 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2001/12/02 06:56:41 jlam Exp $
 #
 
 DISTNAME=	popa3d-0.4.9.4
@@ -31,11 +31,5 @@ do-install:
 		${PREFIX}/share/doc/popa3d
 	${INSTALL_DATA_DIR} ${PREFIX}/share/empty
 
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
-
-post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail-users/Makefile b/mail/qmail-users/Makefile
index 18a8e0a1cf2..708795c1d31 100644
--- a/mail/qmail-users/Makefile
+++ b/mail/qmail-users/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/11/26 22:20:32 zuntum Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/02 06:56:41 jlam Exp $
 #
 
 DISTNAME=	qmail-users-1.0
@@ -26,13 +26,7 @@ NO_BUILD=	YES
 
 WRKSRC=		${WRKDIR}
 
-do-install:
-
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
-
-post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+do-install:	# empty
 
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sq-squirrelspell/Makefile b/mail/sq-squirrelspell/Makefile
index c5e6a5d2e75..dfdb5f77be2 100644
--- a/mail/sq-squirrelspell/Makefile
+++ b/mail/sq-squirrelspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/11/19 16:23:11 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2001/12/02 06:56:42 jlam Exp $
 
 DISTNAME=	squirrelspell.0.3.5-1.0.6
 PKGNAME=	sq-squirrelspell-0.3.5
@@ -23,14 +23,8 @@ CONF_FILES=	${SMDIR}/plugins/squirrelspell/sqspell_config.dist	\
 		${SMDIR}/plugins/squirrelspell/sqspell_config.php
 OWN_DIRS=	${SMDIR}/plugins/squirrelspell
 
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
-
 do-install:
 	${CP} -R ${WRKSRC} ${SMDIR}/plugins
 
-post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index eb5f264baeb..1a0d2b780ae 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/11/25 18:59:46 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/12/02 06:56:42 jlam Exp $
 
 DISTNAME=	squirrelmail-1.0.6
 CATEGORIES=	mail www
@@ -51,7 +51,6 @@ pre-install:
 	${SED}	${FILES_SUBST_SED}					\
 		${FILESDIR}/squirrelmail.conf.dist			\
 		> ${WRKDIR}/squirrelmail.conf.dist
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	${INSTALL_DATA_DIR} ${EGDIR} ${SMDIR}
@@ -61,8 +60,5 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${SMDIR}
 	${CHMOD} -R a-w ${SMDIR}
 
-post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index e92e1256527..8768c0fab88 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/11/25 22:55:04 zuntum Exp $
+# $NetBSD: Makefile,v 1.6 2001/12/02 06:56:42 jlam Exp $
 
 DISTNAME=	teapop-0.3.2
 CATEGORIES=	mail
@@ -28,13 +28,9 @@ CONFIGURE_ARGS+=--disable-apop
 CONFIGURE_ARGS+=--disable-vpop
 .endif
 
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL                                                           
-
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/teapop.passwd ${EGDIR}
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL 
 
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index a3dbcdcaf1e..c36bbb47dec 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/11/25 19:43:58 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/12/02 06:56:42 jlam Exp $
 #
 
 DISTNAME=		jwhois-3.0.1
@@ -24,7 +24,6 @@ CONF_FILES_PERMS=	/dev/null /var/db/jwhois.db			\
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/example/jwhois.conf ${PREFIX}/share/examples
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 9cd6eb31051..116bfc1e88a 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2001/11/26 23:55:06 taca Exp $
+# $NetBSD: Makefile,v 1.72 2001/12/02 06:56:43 jlam Exp $
 
 DISTNAME=		samba-2.2.2
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
@@ -117,8 +117,6 @@ post-install:
 		${FILESDIR}/smb.conf.sample > ${WRKDIR}/smb.conf.sample
 	${INSTALL_DATA} ${WRKDIR}/smb.conf.sample ${EXAMPLESDIR}
 
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../devel/readline/buildlink.mk"
 .include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/net/samba20/Makefile b/net/samba20/Makefile
index c7fcb73bce3..160ecb36fda 100644
--- a/net/samba20/Makefile
+++ b/net/samba20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/11/25 18:59:47 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/12/02 06:56:43 jlam Exp $
 
 DISTNAME=		samba-2.0.10
 WRKSRC=			${WRKDIR}/${DISTNAME}/source
@@ -98,8 +98,6 @@ post-install:
 		${FILESDIR}/smb.conf.sample > ${WRKDIR}/smb.conf.sample
 	${INSTALL_DATA} ${WRKDIR}/smb.conf.sample ${EXAMPLESDIR}
 
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/readline/buildlink.mk"
 .include "../../security/openssl/buildlink.mk"
diff --git a/print/cups/Makefile b/print/cups/Makefile
index e658fce68e7..b07d8be5e03 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2001/11/26 20:38:31 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2001/12/02 06:56:43 jlam Exp $
 
 DISTNAME=		cups-${DIST_VERS}-source
 PKGNAME=		cups-${VERS}
@@ -84,7 +84,6 @@ OWN_DIRS_PERMS+=	/var/spool/cups/tmp ${CUPS_USER} ${CUPS_GROUP} 1700
 pre-install:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/cupsd.sh > ${WRKDIR}/cupsd.sh
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/cupsd.sh ${PREFIX}/etc/rc.d/cupsd
@@ -97,7 +96,6 @@ post-install:
 .if defined(USE_PAM)
 	${INSTALL_DATA} ${WRKDIR}/cups.pam ${EGDIR}
 .endif
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../devel/zlib/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 08de350e018..6365267aad3 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/11/29 01:12:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.23 2001/12/02 06:56:43 jlam Exp $
 
 DISTNAME=		cyrus-sasl-1.5.24
 PKGREVISION=		3
@@ -97,14 +97,12 @@ pre-configure:
 pre-install:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/sasl_pwcheck.sh		\
 		> ${WRKDIR}/sasl_pwcheck.sh
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/sasl_pwcheck.sh \
 		${PREFIX}/etc/rc.d/sasl_pwcheck
 	${INSTALL_DATA_DIR} ${HTMLDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html *.txt ${HTMLDIR}
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/security/pks/Makefile b/security/pks/Makefile
index f2669bc5119..48322130c1d 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/11/25 18:59:47 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/12/02 06:56:44 jlam Exp $
 
 DISTNAME=		pks-0.9.4
 CATEGORIES=		security www
@@ -36,7 +36,6 @@ pre-install:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pksd.sh ${PREFIX}/etc/rc.d/pksd
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../databases/db/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index c22128e783b..caadc09efe8 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2001/11/25 18:59:47 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2001/12/02 06:56:44 jlam Exp $
 #
 
 DISTNAME=		sudo-1.6.3p7
@@ -48,7 +48,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/sudoers ${EGDIR}/sudoers
 	${INSTALL_DATA} ${WRKSRC}/sample.sudoers ${EGDIR}/sudoers.sample
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 5eec1c5adfe..7c1099308d0 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2001/11/26 20:38:32 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2001/12/02 06:56:44 jlam Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -40,11 +40,5 @@ PKG_USERS=		${AMANDA_USER}:${AMANDA_GROUP}::Amanda\\ user::${SH}
 OWN_DIRS_PERMS=		${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700
 OWN_DIRS_PERMS+=	${AMANDA_VAR}/gnutar-lists  ${AMANDA_USER} ${AMANDA_GROUP} 0700
 
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
-
-post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile
index f1efe442964..03b2f59c9eb 100644
--- a/sysutils/ups-nut/Makefile
+++ b/sysutils/ups-nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/11/26 20:38:32 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/12/02 06:56:44 jlam Exp $
 #
 
 DISTNAME=		nut-0.45.2
@@ -64,7 +64,6 @@ pre-install:
 		${SED} ${FILES_SUBST_SED} ${FILESDIR}/$${script}.sh	\
 			> ${WRKDIR}/$${script};				\
 	done
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 post-install:
 	for script in ${RCD_SCRIPTS}; do				\
@@ -77,7 +76,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${NUT_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/Changes.trust ${NUT_DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${NUT_DOCDIR}
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile
index 213b749d40a..988a7f62db7 100644
--- a/www/ap-ssl/Makefile
+++ b/www/ap-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2001/11/25 18:59:48 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2001/12/02 06:56:45 jlam Exp $
 
 DISTNAME=		mod_ssl-2.8.5-1.3.22
 PKGNAME=		ap-ssl-2.8.5
@@ -96,8 +96,6 @@ post-install:
 	cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.PRM *.prm	\
 		${EGDIR}/ssl.prm
 
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 002a8e0c5cf..c48378f9ccf 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2001/11/25 18:59:48 jlam Exp $
+# $NetBSD: Makefile,v 1.85 2001/12/02 06:56:45 jlam Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -160,7 +160,6 @@ post-install:
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
 	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
 	${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/httpd
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../textproc/expat/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 700bd365bfe..07019c158b8 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2001/11/29 01:12:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.48 2001/12/02 06:56:45 jlam Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -156,7 +156,6 @@ post-install:
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/httpd/htdocs
 	${INSTALL_SCRIPT} ${WRKDIR}/apache.sh ${PREFIX}/etc/rc.d/apache
 	${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PREFIX}/share/httpd
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../textproc/expat/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
diff --git a/www/apc-gui/Makefile b/www/apc-gui/Makefile
index b77c551d4e5..b5f02daa8b7 100644
--- a/www/apc-gui/Makefile
+++ b/www/apc-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/25 18:59:49 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/02 06:56:46 jlam Exp $
 
 DISTNAME=	apc_gui-1.0.3
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -27,7 +27,6 @@ OWN_DIRS=	${APC_GUI_DIR}
 pre-install:
 	${SED} ${FILES_SUBST_SED} ${FILESDIR}/apc_gui.conf.dist		\
 		> ${WRKDIR}/apc_gui.conf.dist
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	${INSTALL_DATA_DIR} ${APC_GUI_DIR} ${EGDIR}
@@ -37,8 +36,5 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${APC_GUI_DIR}
 	${CHMOD} -R a-w ${APC_GUI_DIR}
 
-post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index 8ab821f8274..d575a96a39c 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,5 +1,5 @@
 #
-# $NetBSD: Makefile,v 1.7 2001/11/28 14:00:47 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/12/02 06:56:46 jlam Exp $
 #
 
 DISTNAME=		cvsweb-1.112
@@ -33,9 +33,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cvsweb.conf \
 		${PREFIX}/share/examples/cvsweb/cvsweb.conf.default
 
-post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 97425efc322..2ccf6158699 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/11/25 18:59:49 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/12/02 06:56:46 jlam Exp $
 
 DISTNAME=	horde-1.2.7
 CATEGORIES=	www
@@ -74,7 +74,6 @@ pre-install:
 		${FILESDIR}/horde_setup.sh > ${WRKDIR}/horde_setup.sh
 	${SED}	-e "s|@HORDEDIR@|${HORDEDIR}|g"				\
 		${FILESDIR}/horde_secure.sh > ${WRKDIR}/horde_secure.sh
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/horde_setup.sh ${PREFIX}/sbin/horde_setup
@@ -90,8 +89,5 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${HORDEDIR}
 	${CHMOD} -R a-w ${HORDEDIR}
 
-post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php4/Makefile b/www/php4/Makefile
index a24153470ed..42e47a725c0 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/11/25 18:59:49 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2001/12/02 06:56:47 jlam Exp $
 
 .include "Makefile.php"
 
@@ -31,9 +31,6 @@ MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
 
 CONF_FILES=	${EGDIR}/php.ini-dist ${PKG_SYSCONFDIR}/php.ini
 
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
-
 post-install:
 	${INSTALL_DATA_DIR} ${CGIDIR}
 	${LN} -sf ../../bin/php ${CGIDIR}/php
@@ -42,7 +39,6 @@ post-install:
 	cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-optimized ${EGDIR}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/php
 	${INSTALL_DATA} ${WRKSRC}/php4.gif ${PREFIX}/share/php
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 40d1b058889..d2697f064d5 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/11/25 18:59:50 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/12/02 06:56:47 jlam Exp $
 #
 
 DISTNAME=	surfraw-1.0.5
@@ -30,13 +30,9 @@ SUPPORT_FILES=	${EGDIR}/surfraw_elvi.list ${PKG_SYSCONFDIR}/surfraw_elvi.list
 
 PLIST_SUBST+=	PKGBASE=${PKGBASE}
 
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
-
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index 5691f63c6a5..905ac48feb4 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/11/25 18:59:50 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/12/02 06:56:47 jlam Exp $
 
 DISTNAME=	thttpd-2.21b
 CATEGORIES=	www
@@ -37,14 +37,12 @@ post-build:
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/thttpd
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/thttpd.conf ${PREFIX}/share/examples
 	${INSTALL_SCRIPT} ${WRKDIR}/thttpd.sh ${PREFIX}/etc/rc.d/thttpd
 	${INSTALL_DATA} ${WRKSRC}/index.html ${PREFIX}/share/thttpd
 	${INSTALL_DATA} ${DISTDIR}/sitedrivenby.gif ${PREFIX}/share/thttpd
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 1dc2b01abca..c9ec8062fe6 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/12/01 15:08:02 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2001/12/02 06:56:47 jlam Exp $
 #
 
 DISTNAME=	webalizer-2.01-06-src
@@ -31,12 +31,6 @@ post-build:
 		${MV} -f ${WRKSRC}/$${file}.fixed ${WRKSRC}/$${file};	\
 	done
 
-pre-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
-
-post-install:
-	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
-
 .include "../../graphics/gd/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.install.mk"