diff options
| author | tron <tron> | 2001-11-23 10:22:53 +0000 |
|---|---|---|
| committer | tron <tron> | 2001-11-23 10:22:53 +0000 |
| commit | edffe8e76b0873b2502923d6184fc46fa321bb3b (patch) | |
| tree | 7749d0b4feb8b275810786b45587262a86870e8b /www/squid/Makefile | |
| parent | ffeab3b2da6e5eeea0dbe8c3d3debc3c31c8be1d (diff) | |
| download | pkgsrc-edffe8e76b0873b2502923d6184fc46fa321bb3b.tar.gz | |
Fix problems caused by recent changes: the example configuration files get
installed into "etc/squid" (and are not moved arround after installation).
The message of the install script matches the actual layout again and is
adapted to changes to "SQUID_SYSCONFDIR".
Diffstat (limited to 'www/squid/Makefile')
| -rw-r--r-- | www/squid/Makefile | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index e16f7f67c35..9dd24b4dba2 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2001/11/17 23:47:24 kim Exp $ +# $NetBSD: Makefile,v 1.56 2001/11/23 10:22:53 tron Exp $ DISTNAME= squid-2.4.STABLE2-src PKGNAME= squid-2.4.2 @@ -13,8 +13,8 @@ COMMENT= Post-Harvest_cached WWW proxy cache and accelerator BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 -GNU_CONFIGURE= # defined -SQUID_SYSCONFDIR?= ${PREFIX}/etc/squid +.include "../../mk/bsd.prefs.mk" +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${SQUID_SYSCONFDIR} \ --localstatedir=/var/squid \ ${SQUID_CONFIGURE_ARGS} @@ -23,10 +23,10 @@ CONFIGURE_ENV+= PERL=${PERL5} BUILD_DEFS+= SQUID_CONFIGURE_ARGS SQUID_SYSCONFDIR MAKEFILE= makefile MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" PKG_PREFIX="${PREFIX}" +INSTALL_FILE= ${WRKDIR}/INSTALL PLIST_SRC= ${WRKDIR}/PLIST WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} -.include "../../mk/bsd.prefs.mk" # Configuration options which can be overwritten by the user. SQUID_CONFIGURE_ARGS?= --enable-cachemgr-hostname=localhost \ --enable-delay-pools \ @@ -36,6 +36,9 @@ SQUID_CONFIGURE_ARGS?= --enable-cachemgr-hostname=localhost \ --enable-underscores \ --enable-storeio=ufs,diskd +# Configuration directory location which can be overwritten by the user. +SQUID_SYSCONFDIR?= ${PREFIX}/etc/squid + OPTIONAL_FILES= libexec/diskd libexec/pinger libexec/unlinkd post-configure: @@ -46,6 +49,8 @@ post-configure: post-build: ${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/squid.sh >${WRKDIR}/squid.sh + ${SED} s#@SYSCONFDIR@#${SQUID_SYSCONFDIR}#g <${PKGDIR}/INSTALL \ + >${WRKDIR}/INSTALL pre-install: @${INSTALL_DATA_DIR} ${PREFIX}/share/squid @@ -54,10 +59,6 @@ pre-install: post-install: cd ${WRKSRC}/src; ${TEST} ! -x pinger || ${MAKE} install-pinger - @for i in mime squid; do \ - ${MV} ${SQUID_SYSCONFDIR}/$$i.conf.default \ - ${PREFIX}/share/squid; \ - done ${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/squid @${SETENV} ${MAKE_ENV} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} |