diff options
| author | taca <taca@pkgsrc.org> | 2008-09-15 17:30:24 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2008-09-15 17:30:24 +0000 |
| commit | 156fb9dda203cc720d871629dae18d92a2581c4d (patch) | |
| tree | 74fd378ba4c59ad32cab93fd0e0186c92d8f1e69 /www | |
| parent | bb4c24893f3996ad0bf9b105a3b14126f45d5260 (diff) | |
| download | pkgsrc-156fb9dda203cc720d871629dae18d92a2581c4d.tar.gz | |
Fix (revert) some definitions exchage betweem Makefile.common and
Makefile.squid since previous change break squidGuard package.
Noted by joerg@ via private mail.
Diffstat (limited to 'www')
| -rw-r--r-- | www/squid/Makefile.common | 32 | ||||
| -rw-r--r-- | www/squid/Makefile.squid | 29 |
2 files changed, 30 insertions, 31 deletions
diff --git a/www/squid/Makefile.common b/www/squid/Makefile.common index 72e495cb65a..eca4e2f366e 100644 --- a/www/squid/Makefile.common +++ b/www/squid/Makefile.common @@ -1,26 +1,16 @@ -# $NetBSD: Makefile.common,v 1.2 2008/09/12 14:59:52 taca Exp $ - -BUILD_DEFS+= LOGDIR VARBASE -DOCDIR= share/doc/squid -EGDIR= share/examples/squid +# $NetBSD: Makefile.common,v 1.3 2008/09/15 17:30:24 taca Exp $ SQUID_DATADIR= ${VARBASE}/squid - LOGDIR?= ${SQUID_DATADIR}/logs -# -MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} -MAKE_ENV+= PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q} +PKG_SYSCONFSUBDIR?= squid + +SQUID_USER?= squid +SQUID_GROUP?= squid + +PKG_GROUPS_VARS+= SQUID_GROUP +PKG_USERS_VARS+= SQUID_USER -CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR:Q} \ - --localstatedir=${SQUID_DATADIR:Q} \ - --datarootdir=${PREFIX}/share/squid \ - --enable-auth=basic,digest,ntlm \ - --enable-cachemgr-hostname=localhost \ - --enable-delay-pools \ - --enable-icmp \ - --enable-removal-policies=lru,heap \ - --enable-poll \ - --enable-underscores \ - --enable-storeio=${SQUID_BACKENDS:Q} \ - --with-aio +PKG_GROUPS= ${SQUID_GROUP} +PKG_USERS= ${SQUID_USER}:${SQUID_GROUP} +PKG_GECOS.${SQUID_USER}= Squid Web-Cache pseudo-user diff --git a/www/squid/Makefile.squid b/www/squid/Makefile.squid index 5dad986aeeb..6a47b1ebcc6 100644 --- a/www/squid/Makefile.squid +++ b/www/squid/Makefile.squid @@ -1,18 +1,27 @@ -# $NetBSD: Makefile.squid,v 1.1 2008/09/12 16:03:05 taca Exp $ +# $NetBSD: Makefile.squid,v 1.2 2008/09/15 17:30:24 taca Exp $ .include "Makefile.common" -PKG_SYSCONFSUBDIR?= squid +DOCDIR= share/doc/squid +EGDIR= share/examples/squid +BUILD_DEFS+= LOGDIR VARBASE -SQUID_USER?= squid -SQUID_GROUP?= squid - -PKG_GROUPS_VARS+= SQUID_GROUP -PKG_USERS_VARS+= SQUID_USER +# +MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} +MAKE_ENV+= PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q} -PKG_GROUPS= ${SQUID_GROUP} -PKG_USERS= ${SQUID_USER}:${SQUID_GROUP} -PKG_GECOS.${SQUID_USER}= Squid Web-Cache pseudo-user +CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR:Q} \ + --localstatedir=${SQUID_DATADIR:Q} \ + --datarootdir=${PREFIX}/share/squid \ + --enable-auth=basic,digest,ntlm \ + --enable-cachemgr-hostname=localhost \ + --enable-delay-pools \ + --enable-icmp \ + --enable-removal-policies=lru,heap \ + --enable-poll \ + --enable-underscores \ + --enable-storeio=${SQUID_BACKENDS:Q} \ + --with-aio # PLIST_SRC= ${WRKDIR}/PLIST |