2 files changed, 56 insertions, 4 deletions

diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 9132d86597d3..359259f53762 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	squid
 PORTVERSION=	2.5.4
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	\
 	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -20,7 +21,30 @@ EXTRACT_SUFX=	.tar.bz2
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=
+PATCHFILES=	squid-2.5.STABLE4-reconfigure_message.patch \
+		squid-2.5.STABLE4-digest_auth_pwchange.patch \
+		squid-2.5.STABLE4-redirect_login_space.patch \
+		squid-2.5.STABLE4-fqdnnegcache.patch \
+		pam_auth-2.2.patch \
+		squid-2.5.STABLE4_auth_param_doc.patch \
+		squid-2.5.STABLE4-errorpages.patch \
+		squid-2.5.STABLE4-error_load_text.patch \
+		squid-2.5.STABLE4-xpi_mime.patch \
+		squid-2.5.STABLE4-size_overflow.patch \
+		squid-2.5.STABLE4-extacl_auth_loop.patch \
+		squid-2.5.STABLE4-squid_ldap_group.patch \
+		squid-2.5.STABLE4-positive_dns_ttl.patch \
+		squid-2.5.STABLE4-gopherhtml.patch \
+		squid-2.5.STABLE4-netroute.patch \
+		squid-2.5.STABLE4-synflood.patch \
+		squid-2.5.STABLE4-fqdn.patch \
+		squid-2.5.STABLE4-connect_cleanup.patch \
+		squid-2.5.STABLE4-pconn_post.patch \
+		squid-2.5.STABLE4-ftp_put.patch \
+		squid-2.5.STABLE4-pconn-load.patch \
+		squid-2.5.STABLE4-icon_urls.patch \
+		squid-2.5.STABLE4-redirector_access.patch \
+		squid-2.5.STABLE4-pconn-lifo.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	adrian@freebsd.org
@@ -83,7 +107,7 @@ MAN8=	pam_auth.8 squid_unix_group.8 squid.8
 #CONFIGURE_ARGS+= --enable-htcp
 #  - Enable Forw/Via database
 #CONFIGURE_ARGS+= --enable-forw-via-db
-#  - Use Cache Digests - see http://squid.nlanr.net/Squid/FAQ/FAQ-16.html
+#  - Use Cache Digests - see http://www.squid-cache.org/Doc/FAQ/FAQ-16.html
 #CONFIGURE_ARGS+= --enable-cache-digests
 #  - Select language for Error pages (see errors dir)
 #CONFIGURE_ARGS+= --enable-err-language=lang
@@ -107,6 +131,9 @@ MAN8=	pam_auth.8 squid_unix_group.8 squid.8
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/doc/squid.8
+	# Prevent installation of .orig files by deleting them.
+	@${FIND} ${WRKSRC} -name '*.bak' -delete
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
 post-install:
 #	I don't think many people use the pinger nowadays, and if you
@@ -125,12 +152,12 @@ post-install:
 .endfor
 	@if [ ! -d ${PREFIX}/squid/logs ]; then			\
 		${MKDIR} ${PREFIX}/squid/logs;		  	\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/logs;   \
 	fi
+#		${CHOWN} nobody:nogroup ${PREFIX}/squid/logs;   \
 	@if [ ! -d ${PREFIX}/squid/cache ]; then		\
 		${MKDIR} ${PREFIX}/squid/cache;			\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/cache;  \
 	fi
+#		${CHOWN} nobody:nogroup ${PREFIX}/squid/cache;  \
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
 		${INSTALL_SCRIPT} -m 751 ${FILESDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh; \
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 65e31c810913..ffafacfb0ccd 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1 +1,26 @@
 MD5 (squid2.5/squid-2.5.STABLE4.tar.bz2) = 9894a1fe855b0cccdc14fbf014060990
+MD5 (squid2.5/squid-2.5.STABLE4-reconfigure_message.patch) = a746143deab8b609730660916a297618
+MD5 (squid2.5/squid-2.5.STABLE4-digest_auth_pwchange.patch) = e5020f5b87a92c4d9621ce25403d691b
+MD5 (squid2.5/squid-2.5.STABLE4-redirect_login_space.patch) = 2374ed6dae7ef57c009e2428284d6b65
+MD5 (squid2.5/squid-2.5.STABLE4-fqdnnegcache.patch) = ae1b7cce41ca403ebd7115d4506b0c25
+MD5 (squid2.5/pam_auth-2.2.patch) = 3037a67d8f4b85cd7d51cb2dd5b4e8b8
+MD5 (squid2.5/squid-2.5.STABLE4_auth_param_doc.patch) = 3b35c424db58c71c541563cd5ae39d15
+MD5 (squid2.5/squid-2.5.STABLE4-errorpages.patch) = cd2afde3f233df8ab8015e045f304ee7
+MD5 (squid2.5/squid-2.5.STABLE4-error_load_text.patch) = 3935a3005d125f55cd78b228eba20647
+MD5 (squid2.5/squid-2.5.STABLE4-xpi_mime.patch) = 1143fb9244690a24450c3c9ce6105da4
+MD5 (squid2.5/squid-2.5.STABLE4-size_overflow.patch) = 7cd2d6b1ebbd86aa143fa5a57156d6ce
+MD5 (squid2.5/squid-2.5.STABLE4-extacl_auth_loop.patch) = de06bbc89f5408b7ab83733d894d4fe7
+MD5 (squid2.5/squid-2.5.STABLE4-squid_ldap_group.patch) = a5d0a8730aacf129401aabdfa61d60f7
+MD5 (squid2.5/squid-2.5.STABLE4-positive_dns_ttl.patch) = 7fca4475d86acc7db242c261b08751d7
+MD5 (squid2.5/squid-2.5.STABLE4-gopherhtml.patch) = 2c6c50a4a8f4d0d0017ab7c15bacfe26
+MD5 (squid2.5/squid-2.5.STABLE4-netroute.patch) = f83e66712f37f34a04571b31be6c2db8
+MD5 (squid2.5/squid-2.5.STABLE4-synflood.patch) = b92e7a56e87374ebf2eb50e044f07f6d
+MD5 (squid2.5/squid-2.5.STABLE4-fqdn.patch) = dbf2c020e3c3c52ae540d96a724fac87
+MD5 (squid2.5/squid-2.5.STABLE4-connect_cleanup.patch) = ee0398f51a22ab2c82048c8935d6d11c
+MD5 (squid2.5/squid-2.5.STABLE4-pconn_post.patch) = 4a5b7ab04fe8b73906db441448534bbb
+MD5 (squid2.5/squid-2.5.STABLE4-ftp_put.patch) = d3b69c8e79c96c13005d6dbeb72e5c76
+MD5 (squid2.5/squid-2.5.STABLE4-pconn-load.patch) = a432f9eff9e0963b7338e41a91230d95
+MD5 (squid2.5/squid-2.5.STABLE4-icon_urls.patch) = cf28143216b1364e56e820dddbb66dfc
+MD5 (squid2.5/squid-2.5.STABLE4-redirector_access.patch) = 9c534a3d58fe0e3545cd4ed9af92a0e8
+MD5 (squid2.5/squid-2.5.STABLE4-pconn-lifo.patch) = f41051c248764749d9d9ca5704925da7
+