4 files changed, 74 insertions, 30 deletions

diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 812357b71120..fc405c6b3f46 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -7,31 +7,55 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
-MASTER_SITES=  \
+MASTER_SITES=	\
 	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/%SUBDIR%/ \
 	ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
 	ftp://ftp.net.lut.ac.uk/squid/%SUBDIR%/ \
 	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
-DISTNAME=	squid-2.5.STABLE2
-EXTRACT_SUFX=	.tar.gz
+DISTNAME=	squid-2.5.STABLE3
+EXTRACT_SUFX=	.tar.bz2
+DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
+PATCHFILES=	squid-2.5.STABLE3-deny_info.patch \
+		squid-2.5.STABLE3-cache_dir_doc.patch \
+		squid-2.5.STABLE3-devnull.patch \
+		squid-2.5.STABLE3-log_quote.patch \
+		squid-2.5.STABLE3-rfc_reference.patch \
+		squid-2.5.STABLE3-external_acl_ident.patch \
+		squid-2.5.STABLE3-gcc-3_3.patch \
+		squid-2.5.STABLE3-carpfactor.patch \
+		squid-2.5.STABLE3-neighbor_type_domain.patch \
+		squid-2.5.STABLE3-header_access_peer.patch \
+		squid-2.5.STABLE3-memwarnsbrk.patch \
+		squid-2.5.STABLE3-hostscomments.patch \
+		squid-2.5.STABLE3-store_check_cachable_stats.patch \
+		squid-2.5.STABLE3-cachePeerPingsSentsnmp.patch \
+		squid-2.5.STABLE3-minimum_retry_timeout.patch \
+		squid-2.5.STABLE3-tcp_reset_leak.patch \
+		squid-2.5.STABLE3-hostheader.patch \
+		squid-2.5.STABLE3-reply_body_max_size.patch \
+		squid-2.5.STABLE3-ie_refresh.patch \
+		squid-2.5.STABLE3-http_reply_access-denied.patch \
+		squid-2.5.STABLE3-SENT_PASV.patch \
+		squid-2.5.STABLE3-peer_digest_not_found_assertion.patch \
+		squid-2.5.STABLE3-round_robin_max_size.patch
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	adrian@freebsd.org
 COMMENT=	The successful WWW proxy cache and accelerator
 
-DIST_SUBDIR=	squid2.5
-PATCH_DIST_STRIP= -p1
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
-		--datadir=${PREFIX}/etc/squid/ \
+		--datadir=${PREFIX}/etc/squid \
 		--localstatedir=${PREFIX}/squid \
 		--enable-storeio="ufs diskd null" \
 		--enable-removal-policies="lru heap" \
@@ -39,8 +63,8 @@ CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--enable-external-acl-helpers="ip_user unix_group" \
 		--enable-underscores
 
-STRIP=		# won't install scripts correctly otherwise.
 MAKEFILE=	Makefile
+MAN8=	pam_auth.8 squid_unix_group.8 squid.8
 
 # Some other configure options..
 #  - Compile and use the malloc package from Doug Lea
@@ -101,24 +125,25 @@ MAKEFILE=	Makefile
 #  - accept the illegal '_' character in hostnames.
 #CONFIGURE_ARGS+= --enable-underscores
 #  - Enable control of different heap replacement algorithms at runtime.
-#CONFIGURE_ARGS+= --enable-heap-replacement
+#CONFIGURE_ARGS+= --enable-removal-policies
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/doc/squid.8
 
 post-install:
 #	I don't think many people use the pinger nowadays, and if you
 #	do you'll want squid in its own group so as to restrict access
 #	to it.
 #	cd ${WRKSRC}/src; make install-pinger
-.for file in client squid
-	if [ -f ${PREFIX}/sbin/${file} ] ; then \
-		strip ${PREFIX}/sbin/${file} ; \
+.for sbin_file in client squid
+	if [ -f ${PREFIX}/sbin/${sbin_file} ] ; then \
+		${STRIP_CMD} ${PREFIX}/sbin/${sbin_file} ; \
 	fi
 .endfor
-.for file in cachemgr.cgi dnsserver pinger unlinkd
-	if [ -f ${PREFIX}/libexec/${file} ] ; then \
-		strip ${PREFIX}/libexec/${file} ; \
+.for libexec_file in cachemgr.cgi dnsserver pinger unlinkd
+	if [ -f ${PREFIX}/libexec/${libexec_file} ] ; then \
+		${STRIP_CMD} ${PREFIX}/libexec/${libexec_file} ; \
 	fi
 .endfor
 	@if [ ! -d ${PREFIX}/squid/logs ]; then			\
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 9c61b0c20e1f..34d32a2ff371 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -1 +1,24 @@
-MD5 (squid2.5/squid-2.5.STABLE2.tar.gz) = 806c27e2b5a7bd9d788390f5ea5a5dc1
+MD5 (squid2.5/squid-2.5.STABLE3.tar.bz2) = ed5eb7835d00fdecc7dd7c1837542df2
+MD5 (squid2.5/squid-2.5.STABLE3-deny_info.patch) = fd6d2d1a5a75b06e86b743f51866c861
+MD5 (squid2.5/squid-2.5.STABLE3-cache_dir_doc.patch) = e7f6d2bd28430e10999b12001cbb4cae
+MD5 (squid2.5/squid-2.5.STABLE3-devnull.patch) = a31d669461e2893996f27b5d10ab06b9
+MD5 (squid2.5/squid-2.5.STABLE3-log_quote.patch) = 9e391cbb39226abc89281cd4138ddb98
+MD5 (squid2.5/squid-2.5.STABLE3-rfc_reference.patch) = 48996215282d80caf3b5cbbbdb7965b7
+MD5 (squid2.5/squid-2.5.STABLE3-external_acl_ident.patch) = a7ab2152b202bf9941ee8200f20b3032
+MD5 (squid2.5/squid-2.5.STABLE3-gcc-3_3.patch) = 49195dd7f3745c0f54c0ca07068b2d67
+MD5 (squid2.5/squid-2.5.STABLE3-carpfactor.patch) = ac2a5f8304b29951ee3579cce10a6ea6
+MD5 (squid2.5/squid-2.5.STABLE3-neighbor_type_domain.patch) = 3edd72ec42e0b49b36096a6a8fff6b2a
+MD5 (squid2.5/squid-2.5.STABLE3-header_access_peer.patch) = 5015f95e0db20ddcb25082a92f8861a8
+MD5 (squid2.5/squid-2.5.STABLE3-memwarnsbrk.patch) = 47cc7566f9584c6f8c764afcb95ce636
+MD5 (squid2.5/squid-2.5.STABLE3-hostscomments.patch) = dabea14824e5b3d48b211c933471036a
+MD5 (squid2.5/squid-2.5.STABLE3-store_check_cachable_stats.patch) = 04477bf0722026a67bbd6954b02c9374
+MD5 (squid2.5/squid-2.5.STABLE3-cachePeerPingsSentsnmp.patch) = b0ecd095062a21d72b15a817f4e821b5
+MD5 (squid2.5/squid-2.5.STABLE3-minimum_retry_timeout.patch) = b265b000b2f5d48a385f68c6d987cbea
+MD5 (squid2.5/squid-2.5.STABLE3-tcp_reset_leak.patch) = 49c5aeb54467e7cbf44edd2271006bb3
+MD5 (squid2.5/squid-2.5.STABLE3-hostheader.patch) = b786122d2353e1e607d1d02e18a86b61
+MD5 (squid2.5/squid-2.5.STABLE3-reply_body_max_size.patch) = f869e793478ad6c3c706424d0236dcaa
+MD5 (squid2.5/squid-2.5.STABLE3-ie_refresh.patch) = 82bfba0cde950541c6aef5e8b52db010
+MD5 (squid2.5/squid-2.5.STABLE3-http_reply_access-denied.patch) = 2abe9bd50e6561251dfd96d2583d15bc
+MD5 (squid2.5/squid-2.5.STABLE3-SENT_PASV.patch) = c394ec388054b1f86d419006250400bd
+MD5 (squid2.5/squid-2.5.STABLE3-peer_digest_not_found_assertion.patch) = f071e6e3ba5a56ce5d0350d7528b597c
+MD5 (squid2.5/squid-2.5.STABLE3-round_robin_max_size.patch) = 081a220c874765395394baa4482a8913
diff --git a/www/squid27/pkg-install b/www/squid27/pkg-install
index 82f6605be3a2..7efd84949fd2 100644
--- a/www/squid27/pkg-install
+++ b/www/squid27/pkg-install
@@ -25,16 +25,16 @@ case $2 in
 	echo "    ACTUAL locations of cache \"spool\", logfiles, pidfile!"
 	tput me
 	if [ -z "${PACKAGE_BUILDING}" ]; then read skip; fi
-	chown root:wheel ${PREFIX:-/usr/local}/etc/squid/squid.conf*
-	chmod 644 ${PREFIX:-/usr/local}/etc/squid/squid.conf*
-	[ -f ${PREFIX:-/usr/local}/etc/squid/squid.conf ] || \
-		cp -fp	${PREFIX:-/usr/local}/etc/squid/squid.conf.default \
-			${PREFIX:-/usr/local}/etc/squid/squid.conf
-	[ -f ${PREFIX:-/usr/local}/etc/squid/mime.conf ] || \
-		cp -fp	${PREFIX:-/usr/local}/etc/squid/mime.conf.default \
-			${PREFIX:-/usr/local}/etc/squid/mime.conf
-	${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid/squid.conf \
-		      ${PREFIX:-/usr/local}/etc/squid/mime.conf
+	chown root:wheel ${PREFIX}/etc/squid/squid.conf*
+	chmod 644 ${PREFIX}/etc/squid/squid.conf*
+	[ -f ${PREFIX}/etc/squid/squid.conf ] || \
+		cp -fp	${PREFIX}/etc/squid/squid.conf.default \
+			${PREFIX}/etc/squid/squid.conf
+	[ -f ${PREFIX}/etc/squid/mime.conf ] || \
+		cp -fp	${PREFIX}/etc/squid/mime.conf.default \
+			${PREFIX}/etc/squid/mime.conf
+	${EDITOR:-vi} ${PREFIX}/etc/squid/squid.conf \
+		      ${PREFIX}/etc/squid/mime.conf
 	;;
     *)
 	echo "Unexpected Argument $2!!!"
@@ -42,4 +42,3 @@ case $2 in
 	;;
 esac
 exit 0
-
diff --git a/www/squid27/pkg-plist b/www/squid27/pkg-plist
index bf5ed94f3782..270dd86188ed 100644
--- a/www/squid27/pkg-plist
+++ b/www/squid27/pkg-plist
@@ -822,15 +822,12 @@ libexec/unlinkd
 libexec/ip_user_check
 libexec/yp_auth
 libexec/pam_auth
-man/man8/pam_auth.8
 libexec/ncsa_auth
 libexec/squid_unix_group
-man/man8/squid_unix_group.8
 sbin/RunAccel
 sbin/RunCache
 sbin/squidclient
 sbin/squid
-man/man8/squid.8
 @exec mkdir -p %D/squid/cache
 @exec chown nobody:nogroup %D/squid/cache
 @exec mkdir -p %D/squid/logs