pkg/INSTALL gets invoked with two well defined arguments by pkg_add.

Change it so that it works with pkg_add.  Change Makefile to invoke it
the same way pkg_add does.

4 files changed, 13 insertions, 18 deletions

diff --git a/www/squid-current/Makefile b/www/squid-current/Makefile
index 88da5afc51f..6c5a0ab96de 100644
--- a/www/squid-current/Makefile
+++ b/www/squid-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/01/08 15:29:46 bad Exp $
+# $NetBSD: Makefile,v 1.7 1999/01/29 19:26:37 bad Exp $
 #
 
 DISTNAME=	squid-2.1.PATCH2
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=	--enable-icmp
 CONFIGURE_ARGS+=	--enable-cache-digests
 
 MAKEFILE=	makefile
-MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" PKG_PREFIX="${PREFIX}"
 
 post-build:
 	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/squid.sh >${WRKDIR}/squid.sh
@@ -63,12 +63,9 @@ pre-install:
 	${ECHO} "@dirrm share/squid";				\
 	) > ${WRKDIR}/PLIST.share
 
-# This is GNU ${datadir}/squid/squid.conf
-DEFCONF=	${PREFIX}/share/squid/squid.conf.default
-
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
 	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh
-	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} ${DEFCONF} POST-INSTALL
+	@${SETENV} ${MAKE_ENV} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <../../mk/bsd.pkg.mk>
diff --git a/www/squid-current/pkg/INSTALL b/www/squid-current/pkg/INSTALL
index 74ddeeaa340..a447c5754f4 100644
--- a/www/squid-current/pkg/INSTALL
+++ b/www/squid-current/pkg/INSTALL
@@ -1,9 +1,10 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.2 1999/01/28 15:39:59 bad Exp $
+# $NetBSD: INSTALL,v 1.3 1999/01/29 19:26:37 bad Exp $
 #
 
 PKGNAME=$1
+DEFCONF=${PKG_PREFIX}/share/squid/squid.conf.default
 
 case $2 in
     PRE-INSTALL)
@@ -16,7 +17,7 @@ case $2 in
 	echo "      configuring your WWW Navigator (Netscape, Mosaic,...)"
 	echo "      to use it as a proxy server."
 	echo ""
-	echo "    o copy \"squid.conf.default\" to \"/etc/squid.conf\""
+	echo "    o copy \"${DEFCONF}\" to \"/etc/squid.conf\""
 	echo "      and edit it as required. You should pay attention to"
 	echo "      the ACTUAL locations of the cache \"spool\" logfiles"
 	echo "      and pidfile."
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 64a09a34906..085c6defd7a 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1998/12/06 12:42:00 tron Exp $
+# $NetBSD: Makefile,v 1.5 1999/01/29 19:26:37 bad Exp $
 #
 
 DISTNAME=	squid-2.0.PATCH2
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--enable-icmp
 #CONFIGURE_ARGS+=	--enable-snmp
 
 MAKEFILE=	makefile
-MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
+MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" PKG_PREFIX="${PREFIX}"
 
 post-build:
 	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/squid.sh >${WRKDIR}/squid.sh
@@ -56,12 +56,9 @@ pre-install:
 	echo "@dirrm share/squid";				\
 	) > ${WRKDIR}/PLIST.share
 
-# This is GNU ${datadir}/squid/squid.conf
-DEFCONF=	${PREFIX}/share/squid/squid.conf.default
-
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
 	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh
-	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} ${DEFCONF} POST-INSTALL
+	@${SETENV} ${MAKE_ENV} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
 
 .include <../../mk/bsd.pkg.mk>
diff --git a/www/squid/pkg/INSTALL b/www/squid/pkg/INSTALL
index 386f738c067..ec4d6eb172d 100644
--- a/www/squid/pkg/INSTALL
+++ b/www/squid/pkg/INSTALL
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.3 1998/12/06 12:42:01 tron Exp $
+# $NetBSD: INSTALL,v 1.4 1999/01/29 19:26:37 bad Exp $
 #
 
 PKGNAME=$1
-DEFCONF=$2
+DEFCONF=${PKG_PREFIX}/share/squid/squid.conf.default
 
-case $3 in
+case $2 in
     PRE-INSTALL)
 	;;
     POST-INSTALL)
@@ -24,7 +24,7 @@ case $3 in
 	echo ""
 	;;
     *)
-	echo "Unexpected Argument $3!!!"
+	echo "Unexpected Argument $2!!"
 	exit 1
 	;;
 esac