[pkgsrc/trunk]: pkgsrc/www/squid Fix (revert) some definitions exchage betwee...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7ae6f68c082e
branches:  trunk
changeset: 547357:7ae6f68c082e
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon Sep 15 17:30:24 2008 +0000

description:
Fix (revert) some definitions exchage betweem Makefile.common and
Makefile.squid since previous change break squidGuard package.

Noted by joerg@ via private mail.

diffstat:

 www/squid/Makefile.common |  32 +++++++++++---------------------
 www/squid/Makefile.squid  |  29 +++++++++++++++++++----------
 2 files changed, 30 insertions(+), 31 deletions(-)

diffs (82 lines):

diff -r 7511655158ba -r 7ae6f68c082e www/squid/Makefile.common
--- a/www/squid/Makefile.common Mon Sep 15 16:32:26 2008 +0000
+++ b/www/squid/Makefile.common Mon Sep 15 17:30:24 2008 +0000
@@ -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
 
-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_VARS+=              SQUID_GROUP
+PKG_USERS_VARS+=               SQUID_USER
+
+PKG_GROUPS=                    ${SQUID_GROUP}
+PKG_USERS=                     ${SQUID_USER}:${SQUID_GROUP}
+PKG_GECOS.${SQUID_USER}=       Squid Web-Cache pseudo-user
diff -r 7511655158ba -r 7ae6f68c082e www/squid/Makefile.squid
--- a/www/squid/Makefile.squid  Mon Sep 15 16:32:26 2008 +0000
+++ b/www/squid/Makefile.squid  Mon Sep 15 17:30:24 2008 +0000
@@ -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
+#
+MAKE_ENV+=     INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
+MAKE_ENV+=     PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q}
 
-PKG_GROUPS_VARS+=              SQUID_GROUP
-PKG_USERS_VARS+=               SQUID_USER
-
-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