From 4f728368e7795a6ddb5c11e40a0ef141802c521c Mon Sep 17 00:00:00 2001 From: bad Date: Fri, 29 Jan 1999 19:26:37 +0000 Subject: 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. --- www/squid/Makefile | 9 +++------ www/squid/pkg/INSTALL | 8 ++++---- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'www/squid') 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 -- cgit v1.2.3