diff options
| author | kim <kim@pkgsrc.org> | 2001-11-17 23:47:24 +0000 |
|---|---|---|
| committer | kim <kim@pkgsrc.org> | 2001-11-17 23:47:24 +0000 |
| commit | 7aceab22791b82faf0f529153745814864313bf3 (patch) | |
| tree | b7be738a662e3b81fe609f93ea01cbe0e1c49c1b /www | |
| parent | 5984fe563b2f73bf9fff84f851b549b04837d6a2 (diff) | |
| download | pkgsrc-7aceab22791b82faf0f529153745814864313bf3.tar.gz | |
Config files cannot be forced into ${PREFIX}.
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid/Makefile | 11 | ||||
| -rw-r--r-- | www/squid/PLIST | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index b1974b4687b..e16f7f67c35 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2001/11/06 07:22:13 tron Exp $ +# $NetBSD: Makefile,v 1.55 2001/11/17 23:47:24 kim Exp $ DISTNAME= squid-2.4.STABLE2-src PKGNAME= squid-2.4.2 @@ -14,12 +14,13 @@ COMMENT= Post-Harvest_cached WWW proxy cache and accelerator BUILD_DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 GNU_CONFIGURE= # defined -CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/squid \ +SQUID_SYSCONFDIR?= ${PREFIX}/etc/squid +CONFIGURE_ARGS+= --sysconfdir=${SQUID_SYSCONFDIR} \ --localstatedir=/var/squid \ ${SQUID_CONFIGURE_ARGS} CONFIGURE_ENV+= PERL=${PERL5} -BUILD_DEFS+= SQUID_CONFIGURE_ARGS +BUILD_DEFS+= SQUID_CONFIGURE_ARGS SQUID_SYSCONFDIR MAKEFILE= makefile MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" PKG_PREFIX="${PREFIX}" PLIST_SRC= ${WRKDIR}/PLIST @@ -53,6 +54,10 @@ 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} diff --git a/www/squid/PLIST b/www/squid/PLIST index 14f08e18faf..e242307d564 100644 --- a/www/squid/PLIST +++ b/www/squid/PLIST @@ -1,8 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:18:53 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/11/17 23:47:24 kim Exp $ etc/rc.d/squid -etc/squid/mime.conf.default -etc/squid/squid.conf.default -@unexec rmdir %D/etc/squid 2>/dev/null || true +share/squid/mime.conf.default +share/squid/squid.conf.default +@unexec rmdir %D/share/squid 2>/dev/null || true libexec/cachemgr.cgi sbin/RunAccel sbin/RunCache |