diff options
| -rw-r--r-- | www/squid/Makefile | 24 | ||||
| -rw-r--r-- | www/squid/distinfo | 17 |
2 files changed, 22 insertions, 19 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index fcfa19e11ab..5eddca983b2 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.169 2006/02/26 15:03:53 taca Exp $ +# $NetBSD: Makefile,v 1.170 2006/03/04 13:40:07 taca Exp $ DISTNAME= squid-2.5.STABLE12 PKGNAME= squid-2.5.12 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= www MASTER_SITES= http://www.squid-cache.org/Versions/v2/2.5/ \ ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \ @@ -11,13 +11,14 @@ EXTRACT_SUFX= .tar.bz2 PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/ PATCHFILES= squid-2.5.STABLE12-setenv.patch \ + squid-2.5.STABLE12-REPORT.patch \ squid-2.5.STABLE12-SMB_BadFetch.patch \ squid-2.5.STABLE12-wbinfo_group.patch \ squid-2.5.STABLE12-asyncio_counters.patch \ squid-2.5.STABLE12-prctl_args.patch \ squid-2.5.STABLE12-irix_timezone.patch \ - squid-2.5.STABLE12-log_206.patch \ - squid-2.5.STABLE12-range2GB.patch \ + squid-2.5.STABLE12-log_206-4.patch \ + squid-2.5.STABLE12-range2GB-2.patch \ squid-2.5.STABLE12-empty_proxy_auth_acl.patch \ squid-2.5.STABLE12-ident_acl.patch \ squid-2.5.STABLE12-ntlm_nonpersistent.patch \ @@ -43,9 +44,6 @@ DATADIR= ${VARBASE}/squid DOCFILES= ChangeLog RELEASENOTES.html doc/debug-sections.txt -# Configuration directory location which can be overwritten by the user. -PKG_SYSCONFSUBDIR?= squid - USE_TOOLS+= perl GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ @@ -69,6 +67,8 @@ EXAMPLES_FILES= src/mime.conf.default src/squid.conf.default \ .include "../../mk/bsd.prefs.mk" +PKG_SYSCONFSUBDIR?= squid + SQUID_USER?= squid SQUID_GROUP?= squid BUILD_DEFS+= SQUID_USER SQUID_GROUP @@ -120,18 +120,18 @@ post-install: ${INSTALL_DATA_DIR} ${DOCDIR} @cd ${WRKSRC}; \ for i in ${DOCFILES}; do \ - ${INSTALL_DATA} $$i ${DOCDIR}; \ + ${INSTALL_DATA} ${i} ${DOCDIR}; \ done @( \ for FILE in ${OPTIONAL_FILES}; do \ - ${TEST} ! -r ${PREFIX}/$$FILE || ${ECHO} $$FILE; \ + ${TEST} ! -r ${PREFIX}/${FILE} || ${ECHO} ${FILE}; \ done; \ cd ${WRKSRC}/errors; \ for i in *; do \ - ${TEST} -d $$i && \ - (${LS} $$i/ERR_* | \ + ${TEST} -d ${i} && \ + (${LS} ${i}/ERR_* | \ ${SED} -e 's@^@share/squid/errors/@'; \ - ${ECHO} "@dirrm share/squid/errors/$$i"); \ + ${ECHO} "@dirrm share/squid/errors/${i}"); \ done; \ ${ECHO} "@dirrm share/squid/errors"; \ cd ${WRKSRC}/icons; \ diff --git a/www/squid/distinfo b/www/squid/distinfo index a855bfe51e5..7b070b7705a 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.111 2006/02/26 15:03:54 taca Exp $ +$NetBSD: distinfo,v 1.112 2006/03/04 13:40:07 taca Exp $ SHA1 (squid-2.5.12/squid-2.5.STABLE12.tar.bz2) = 57a046ca0eda0f649d259c2c161dc95c81a5dc09 RMD160 (squid-2.5.12/squid-2.5.STABLE12.tar.bz2) = 0b332612d90d74681e47505a2afbfb6c962807a4 @@ -6,6 +6,9 @@ Size (squid-2.5.12/squid-2.5.STABLE12.tar.bz2) = 1075111 bytes SHA1 (squid-2.5.12/squid-2.5.STABLE12-setenv.patch) = d59827280c5e1a73e659a1d127484e0901d34b48 RMD160 (squid-2.5.12/squid-2.5.STABLE12-setenv.patch) = 8698afef7b19402baffd81cecd0dbe143c500556 Size (squid-2.5.12/squid-2.5.STABLE12-setenv.patch) = 934 bytes +SHA1 (squid-2.5.12/squid-2.5.STABLE12-REPORT.patch) = 9d50ebc364a7923afab46f123084c588450d2c1e +RMD160 (squid-2.5.12/squid-2.5.STABLE12-REPORT.patch) = ac65bcd9654c6acf836a6cfedf75c151da2c67dc +Size (squid-2.5.12/squid-2.5.STABLE12-REPORT.patch) = 743 bytes SHA1 (squid-2.5.12/squid-2.5.STABLE12-SMB_BadFetch.patch) = 028199a2be0c9541dce99da84d7c0f0be3f055fa RMD160 (squid-2.5.12/squid-2.5.STABLE12-SMB_BadFetch.patch) = 4f4e017062afd27235949882ca336d857e72f866 Size (squid-2.5.12/squid-2.5.STABLE12-SMB_BadFetch.patch) = 826 bytes @@ -21,12 +24,12 @@ Size (squid-2.5.12/squid-2.5.STABLE12-prctl_args.patch) = 1657 bytes SHA1 (squid-2.5.12/squid-2.5.STABLE12-irix_timezone.patch) = c12c9ba7c7d2077ead828d4b884e6ddfe0ca3adf RMD160 (squid-2.5.12/squid-2.5.STABLE12-irix_timezone.patch) = b7e4f091faad235b4d961b861d725d3647cd6154 Size (squid-2.5.12/squid-2.5.STABLE12-irix_timezone.patch) = 410 bytes -SHA1 (squid-2.5.12/squid-2.5.STABLE12-log_206.patch) = 26604c2551bad393fbe3aebc294c46251d6572dd -RMD160 (squid-2.5.12/squid-2.5.STABLE12-log_206.patch) = bbec6999839278e28bcdadcae81d301c1dea67e2 -Size (squid-2.5.12/squid-2.5.STABLE12-log_206.patch) = 8583 bytes -SHA1 (squid-2.5.12/squid-2.5.STABLE12-range2GB.patch) = deb14496b7af9014e77325e1275112c39a5761a4 -RMD160 (squid-2.5.12/squid-2.5.STABLE12-range2GB.patch) = 99f0d325f79a9990446a1751c9f990eea1333583 -Size (squid-2.5.12/squid-2.5.STABLE12-range2GB.patch) = 5689 bytes +SHA1 (squid-2.5.12/squid-2.5.STABLE12-log_206-4.patch) = dda085fe5acab0d3a963955b4141d3bffb6d2e70 +RMD160 (squid-2.5.12/squid-2.5.STABLE12-log_206-4.patch) = f13e8540a46dbba96e181e630d94f3bb68508037 +Size (squid-2.5.12/squid-2.5.STABLE12-log_206-4.patch) = 3786 bytes +SHA1 (squid-2.5.12/squid-2.5.STABLE12-range2GB-2.patch) = 83b255b2c183b14bd7467a830e9a076eddc9d8ed +RMD160 (squid-2.5.12/squid-2.5.STABLE12-range2GB-2.patch) = b34b8f5db3b8233a5c33e617d2ae2ef3f038d28a +Size (squid-2.5.12/squid-2.5.STABLE12-range2GB-2.patch) = 5014 bytes SHA1 (squid-2.5.12/squid-2.5.STABLE12-empty_proxy_auth_acl.patch) = fb140f5064e233f92ba08a7fc5e816d8216afa50 RMD160 (squid-2.5.12/squid-2.5.STABLE12-empty_proxy_auth_acl.patch) = 50f3870f0737e9087b5076c54ffe60ed09e91ea4 Size (squid-2.5.12/squid-2.5.STABLE12-empty_proxy_auth_acl.patch) = 1252 bytes |