- update pkg-descr and remove some cruft

- consistently use "Squid" when referring to the software's name
- define COMMENT a bit less chatty
- replace the progeny.com mirror with the one hosted by Vistech
- fix a wrong path in pkg-message.in (thanks to "Tuc at the Beach House")
- pass ${squid_flags} when stopping or reconfiguring Squid (ports/100510)

PR:		ports/105023
Submitted by:	Thomas-Martin Seck <tmseck@netcologne.de> (maintainer)
Sponsored by:   FreeBSD Bug-a-thon #2

28 files changed, 128 insertions, 136 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index f1d21105325b..10954b8e5ab4 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -6,7 +6,7 @@
 #
 # Tunables not (yet) configurable via 'make config':
 # SQUID_{U,G}ID
-#   Which user/group squid should run as (default: squid/squid).
+#   Which user/group Squid should run as (default: squid/squid).
 #   The user and group will be created if they do not already exist using
 #   a uid:gid of 100:100.
 #   NOTE: before version 2.5.4_6, these settings defaulted to
@@ -68,16 +68,16 @@
 #     of filedescriptors the resulting binary is expected to support.
 #    --enable-ntlm-fail-open
 #     Enable NTLM fail open, where a helper that fails one of the
-#     Authentication steps can allow squid to still authenticate the user
+#     Authentication steps can allow Squid to still authenticate the user
 #
 
 PORTNAME=	squid
 PORTVERSION=	2.5.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://archive.progeny.com/squid/%SUBDIR%/ \
+		ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \
 		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
 		ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
 		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
@@ -105,7 +105,7 @@ PATCHFILES=	squid-2.5.STABLE14-httpReplyDestroy.patch \
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
-COMMENT=	The successful WWW proxy cache and accelerator
+COMMENT=	HTTP Caching Proxy
 
 CONFLICTS=	squid-2.[^5]*
 GNU_CONFIGURE=	yes
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 7d8154f05637..223532680f52 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,6 +1,9 @@
 MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c
+SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd
 SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745
 MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4
+SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285
 SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277
 MD5 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 9abe563ca3d01dc58502737edc6f3c60
+SHA256 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 6c98f1f2351b79cfc3f956ed1c46d86c7a53aac0ba28203a33f2dadc7d1e96fe
 SIZE (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 1319
diff --git a/www/squid/files/pkg-deinstall.in b/www/squid/files/pkg-deinstall.in
index 97cf4a1c0e26..e96398a3925f 100644
--- a/www/squid/files/pkg-deinstall.in
+++ b/www/squid/files/pkg-deinstall.in
@@ -16,7 +16,7 @@ POST-DEINSTALL)
 	echo "===> post-deinstallation information for $1:"
 	echo ""
 	echo "     Note:"
-	echo "     squid related user accounts and groups were not removed."
+	echo "     Squid related user accounts and groups were not removed."
 	echo ""
 	echo "     To remove the '%%SQUID_UID%%' user and the '%%SQUID_GID%%' group which were"
 	echo "     created by a default installation of this package, run"
@@ -29,7 +29,7 @@ POST-DEINSTALL)
 		echo "     all configuration files modified by you were preserved."
 		echo ""
 		echo "     Please remove them manually if you do not want to use"
-	       	echo "     squid any longer."
+	       	echo "     Squid any longer."
 	fi
 	echo ""
 	;;
diff --git a/www/squid/files/pkg-install.in b/www/squid/files/pkg-install.in
index e7c74d9293dc..5fc09b22e0e3 100644
--- a/www/squid/files/pkg-install.in
+++ b/www/squid/files/pkg-install.in
@@ -49,7 +49,7 @@ PRE-INSTALL)
 		echo "There is no account '${squid_user}' on this system, so I will try to create it:"
 		if ! pw useradd -q -n ${squid_user} \
 		    -u ${squid_uid} -g ${squid_group} \
-	  	    -c "squid caching-proxy pseudo user" \
+	  	    -c "Squid caching-proxy pseudo user" \
 		    -d "${squid_base}" -s "${nologin}" \
 		    -h - ; then
 			echo "Failed to create user '${squid_user}'!" >&2
@@ -72,19 +72,19 @@ PRE-INSTALL)
 		echo ""
 		echo " * NOTICE *"
 		echo ""
-		echo "The squid pseudo-user's uid and/or gid have been found"
+		echo "The Squid pseudo-user's uid and/or gid have been found"
 		echo "to be greater than or equal 3128."
 		echo ""
 		echo "This is not a problem as such, but violates the FreeBSD"
 		echo "ports' principle that a ports must not claim a uid greater"
 		echo "than 999."
 		echo ""
-		echo "Since version 2.5.4_11, the squid user is thus created"
+		echo "Since version 2.5.4_11, the Squid user is thus created"
 		echo "with an id of ${squid_uid}:${squid_gid} while earlier versions of this"
 		echo "port used the first unused uid/gid greater than or"
 		echo "equal 3128."
 		echo ""
-		echo "If you want to change the existing squid user's id, run"
+		echo "If you want to change the existing Squid user's id, run"
 		echo "'make changeuser' after the installation has completed."
 		echo "If you installed this port via a package, issue the"
 		echo "following commands as root:"
@@ -92,13 +92,13 @@ PRE-INSTALL)
 		echo "pw userdel -u ${current_uid}"
 		echo "pw groupadd -n ${squid_group} -g ${squid_gid}"
 		echo "pw useradd -n ${squid_user} -u ${squid_uid} \\"
-		echo "    -c \"squid caching-proxy pseudo user\" \\"
+		echo "    -c \"Squid caching-proxy pseudo user\" \\"
 		echo "    -g ${squid_group} -d ${squid_base} -s /sbin/nologin \\"
 		echo "    -h -"
 		echo "find -H ${PKG_PREFIX} -user ${current_uid} -exec chown ${squid_user} {} \\;"
 		echo "find -H ${PKG_PREFIX} -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
 		echo ""
-		echo "In case you have installed third party software for squid"
+		echo "In case you have installed third party software for Squid"
 		echo "like squidGuard, you should additionally run:"
 		echo "find -H /var -user ${current_uid} -exec chown ${squid_user} {} \\;"
 		echo "find -H /var -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
diff --git a/www/squid/files/pkg-message.in b/www/squid/files/pkg-message.in
index b6bd9eab049f..b6b81aa4760c 100644
--- a/www/squid/files/pkg-message.in
+++ b/www/squid/files/pkg-message.in
@@ -6,19 +6,19 @@
      
        Note:
        You must initialize new cache directories before you can start
-       squid.  Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
+       Squid.  Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
        If your cache directories are already initialized (e.g. after an
-       upgrade of squid) you do not need to initialize them again.
+       upgrade of Squid) you do not need to initialize them again.
 
      o The default configuration will deny everyone access to the
        proxy service. Edit the "http_access" directives in
-       %%PREFIX%%/etc/squid.conf to suit your needs.
+       %%PREFIX%%/etc/squid/squid.conf to suit your needs.
 --begin rcng
 
-     Please note that the squid start script is an rc.d style script.
-     This means that squid will not start automatically at boot time.
+     Please note that the Squid start script is an rc.d style script.
+     This means that Squid will not start automatically at boot time.
 
-     To enable squid, set squid_enable=yes in either
+     To enable Squid, set squid_enable=yes in either
      /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
      Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details.
 --end rcng
diff --git a/www/squid/files/squid.sh.in b/www/squid/files/squid.sh.in
index afe0fb6bb1e8..7d1414a2c8b0 100644
--- a/www/squid/files/squid.sh.in
+++ b/www/squid/files/squid.sh.in
@@ -20,7 +20,7 @@ name=squid
 command=%%PREFIX%%/sbin/squid
 # --begin rcng
 extra_commands=reload
-reload_cmd="${command} -k reconfigure"
+reload_cmd="${command} ${squid_flags} -k reconfigure"
 # --end rcng
 stop_cmd="squid_stop"
 squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}
@@ -44,7 +44,7 @@ squid_stop() {
 # --begin rcng
 squid_stop() {
 	echo "Stopping ${name}."
-	${command} -k shutdown
+	${command} ${squid_flags} -k shutdown
 	run_rc_command poll
 }
 
diff --git a/www/squid/pkg-descr b/www/squid/pkg-descr
index 88ba8ba2aff5..0cd02912d960 100644
--- a/www/squid/pkg-descr
+++ b/www/squid/pkg-descr
@@ -1,15 +1,10 @@
-This is the Squid Internet Object Cache developed by the National
-Laboratory for Applied Networking Research (NLANR) and Internet
-volunteers.  This software is freely available for anyone to use.
-
-This software is based on the Harvest Object Cache developed by
-the University of Colorado and the University of Southern California.
-The Harvest home page is http://harvest.cs.colorado.edu/.
-
-ARPA funding for the Harvest project has ended, the squid project has
-continued development of the cache where Harvest finished.
-
-This port provides many configuration options, most of which are
-available via 'make config'.
+Squid is a high-performance proxy caching server for web clients,
+supporting FTP, gopher, and HTTP data objects. Unlike traditional
+caching software, Squid handles all requests in a single, non-blocking,
+I/O-driven process.
+
+Squid supports SSL, extensive access controls, and full request logging.
+By using the lightweight Internet Cache Protocol, Squid caches can be
+arranged in a hierarchy or mesh for additional bandwidth savings.
 
 WWW: http://www.squid-cache.org/
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index f1d21105325b..10954b8e5ab4 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -6,7 +6,7 @@
 #
 # Tunables not (yet) configurable via 'make config':
 # SQUID_{U,G}ID
-#   Which user/group squid should run as (default: squid/squid).
+#   Which user/group Squid should run as (default: squid/squid).
 #   The user and group will be created if they do not already exist using
 #   a uid:gid of 100:100.
 #   NOTE: before version 2.5.4_6, these settings defaulted to
@@ -68,16 +68,16 @@
 #     of filedescriptors the resulting binary is expected to support.
 #    --enable-ntlm-fail-open
 #     Enable NTLM fail open, where a helper that fails one of the
-#     Authentication steps can allow squid to still authenticate the user
+#     Authentication steps can allow Squid to still authenticate the user
 #
 
 PORTNAME=	squid
 PORTVERSION=	2.5.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://archive.progeny.com/squid/%SUBDIR%/ \
+		ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \
 		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
 		ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
 		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
@@ -105,7 +105,7 @@ PATCHFILES=	squid-2.5.STABLE14-httpReplyDestroy.patch \
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
-COMMENT=	The successful WWW proxy cache and accelerator
+COMMENT=	HTTP Caching Proxy
 
 CONFLICTS=	squid-2.[^5]*
 GNU_CONFIGURE=	yes
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index 7d8154f05637..223532680f52 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -1,6 +1,9 @@
 MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c
+SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd
 SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745
 MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4
+SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285
 SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277
 MD5 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 9abe563ca3d01dc58502737edc6f3c60
+SHA256 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 6c98f1f2351b79cfc3f956ed1c46d86c7a53aac0ba28203a33f2dadc7d1e96fe
 SIZE (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 1319
diff --git a/www/squid25/files/pkg-deinstall.in b/www/squid25/files/pkg-deinstall.in
index 97cf4a1c0e26..e96398a3925f 100644
--- a/www/squid25/files/pkg-deinstall.in
+++ b/www/squid25/files/pkg-deinstall.in
@@ -16,7 +16,7 @@ POST-DEINSTALL)
 	echo "===> post-deinstallation information for $1:"
 	echo ""
 	echo "     Note:"
-	echo "     squid related user accounts and groups were not removed."
+	echo "     Squid related user accounts and groups were not removed."
 	echo ""
 	echo "     To remove the '%%SQUID_UID%%' user and the '%%SQUID_GID%%' group which were"
 	echo "     created by a default installation of this package, run"
@@ -29,7 +29,7 @@ POST-DEINSTALL)
 		echo "     all configuration files modified by you were preserved."
 		echo ""
 		echo "     Please remove them manually if you do not want to use"
-	       	echo "     squid any longer."
+	       	echo "     Squid any longer."
 	fi
 	echo ""
 	;;
diff --git a/www/squid25/files/pkg-install.in b/www/squid25/files/pkg-install.in
index e7c74d9293dc..5fc09b22e0e3 100644
--- a/www/squid25/files/pkg-install.in
+++ b/www/squid25/files/pkg-install.in
@@ -49,7 +49,7 @@ PRE-INSTALL)
 		echo "There is no account '${squid_user}' on this system, so I will try to create it:"
 		if ! pw useradd -q -n ${squid_user} \
 		    -u ${squid_uid} -g ${squid_group} \
-	  	    -c "squid caching-proxy pseudo user" \
+	  	    -c "Squid caching-proxy pseudo user" \
 		    -d "${squid_base}" -s "${nologin}" \
 		    -h - ; then
 			echo "Failed to create user '${squid_user}'!" >&2
@@ -72,19 +72,19 @@ PRE-INSTALL)
 		echo ""
 		echo " * NOTICE *"
 		echo ""
-		echo "The squid pseudo-user's uid and/or gid have been found"
+		echo "The Squid pseudo-user's uid and/or gid have been found"
 		echo "to be greater than or equal 3128."
 		echo ""
 		echo "This is not a problem as such, but violates the FreeBSD"
 		echo "ports' principle that a ports must not claim a uid greater"
 		echo "than 999."
 		echo ""
-		echo "Since version 2.5.4_11, the squid user is thus created"
+		echo "Since version 2.5.4_11, the Squid user is thus created"
 		echo "with an id of ${squid_uid}:${squid_gid} while earlier versions of this"
 		echo "port used the first unused uid/gid greater than or"
 		echo "equal 3128."
 		echo ""
-		echo "If you want to change the existing squid user's id, run"
+		echo "If you want to change the existing Squid user's id, run"
 		echo "'make changeuser' after the installation has completed."
 		echo "If you installed this port via a package, issue the"
 		echo "following commands as root:"
@@ -92,13 +92,13 @@ PRE-INSTALL)
 		echo "pw userdel -u ${current_uid}"
 		echo "pw groupadd -n ${squid_group} -g ${squid_gid}"
 		echo "pw useradd -n ${squid_user} -u ${squid_uid} \\"
-		echo "    -c \"squid caching-proxy pseudo user\" \\"
+		echo "    -c \"Squid caching-proxy pseudo user\" \\"
 		echo "    -g ${squid_group} -d ${squid_base} -s /sbin/nologin \\"
 		echo "    -h -"
 		echo "find -H ${PKG_PREFIX} -user ${current_uid} -exec chown ${squid_user} {} \\;"
 		echo "find -H ${PKG_PREFIX} -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
 		echo ""
-		echo "In case you have installed third party software for squid"
+		echo "In case you have installed third party software for Squid"
 		echo "like squidGuard, you should additionally run:"
 		echo "find -H /var -user ${current_uid} -exec chown ${squid_user} {} \\;"
 		echo "find -H /var -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
diff --git a/www/squid25/files/pkg-message.in b/www/squid25/files/pkg-message.in
index b6bd9eab049f..b6b81aa4760c 100644
--- a/www/squid25/files/pkg-message.in
+++ b/www/squid25/files/pkg-message.in
@@ -6,19 +6,19 @@
      
        Note:
        You must initialize new cache directories before you can start
-       squid.  Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
+       Squid.  Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
        If your cache directories are already initialized (e.g. after an
-       upgrade of squid) you do not need to initialize them again.
+       upgrade of Squid) you do not need to initialize them again.
 
      o The default configuration will deny everyone access to the
        proxy service. Edit the "http_access" directives in
-       %%PREFIX%%/etc/squid.conf to suit your needs.
+       %%PREFIX%%/etc/squid/squid.conf to suit your needs.
 --begin rcng
 
-     Please note that the squid start script is an rc.d style script.
-     This means that squid will not start automatically at boot time.
+     Please note that the Squid start script is an rc.d style script.
+     This means that Squid will not start automatically at boot time.
 
-     To enable squid, set squid_enable=yes in either
+     To enable Squid, set squid_enable=yes in either
      /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
      Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details.
 --end rcng
diff --git a/www/squid25/files/squid.sh.in b/www/squid25/files/squid.sh.in
index afe0fb6bb1e8..7d1414a2c8b0 100644
--- a/www/squid25/files/squid.sh.in
+++ b/www/squid25/files/squid.sh.in
@@ -20,7 +20,7 @@ name=squid
 command=%%PREFIX%%/sbin/squid
 # --begin rcng
 extra_commands=reload
-reload_cmd="${command} -k reconfigure"
+reload_cmd="${command} ${squid_flags} -k reconfigure"
 # --end rcng
 stop_cmd="squid_stop"
 squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}
@@ -44,7 +44,7 @@ squid_stop() {
 # --begin rcng
 squid_stop() {
 	echo "Stopping ${name}."
-	${command} -k shutdown
+	${command} ${squid_flags} -k shutdown
 	run_rc_command poll
 }
 
diff --git a/www/squid25/pkg-descr b/www/squid25/pkg-descr
index 88ba8ba2aff5..0cd02912d960 100644
--- a/www/squid25/pkg-descr
+++ b/www/squid25/pkg-descr
@@ -1,15 +1,10 @@
-This is the Squid Internet Object Cache developed by the National
-Laboratory for Applied Networking Research (NLANR) and Internet
-volunteers.  This software is freely available for anyone to use.
-
-This software is based on the Harvest Object Cache developed by
-the University of Colorado and the University of Southern California.
-The Harvest home page is http://harvest.cs.colorado.edu/.
-
-ARPA funding for the Harvest project has ended, the squid project has
-continued development of the cache where Harvest finished.
-
-This port provides many configuration options, most of which are
-available via 'make config'.
+Squid is a high-performance proxy caching server for web clients,
+supporting FTP, gopher, and HTTP data objects. Unlike traditional
+caching software, Squid handles all requests in a single, non-blocking,
+I/O-driven process.
+
+Squid supports SSL, extensive access controls, and full request logging.
+By using the lightweight Internet Cache Protocol, Squid caches can be
+arranged in a hierarchy or mesh for additional bandwidth savings.
 
 WWW: http://www.squid-cache.org/
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index f1d21105325b..10954b8e5ab4 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -6,7 +6,7 @@
 #
 # Tunables not (yet) configurable via 'make config':
 # SQUID_{U,G}ID
-#   Which user/group squid should run as (default: squid/squid).
+#   Which user/group Squid should run as (default: squid/squid).
 #   The user and group will be created if they do not already exist using
 #   a uid:gid of 100:100.
 #   NOTE: before version 2.5.4_6, these settings defaulted to
@@ -68,16 +68,16 @@
 #     of filedescriptors the resulting binary is expected to support.
 #    --enable-ntlm-fail-open
 #     Enable NTLM fail open, where a helper that fails one of the
-#     Authentication steps can allow squid to still authenticate the user
+#     Authentication steps can allow Squid to still authenticate the user
 #
 
 PORTNAME=	squid
 PORTVERSION=	2.5.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://archive.progeny.com/squid/%SUBDIR%/ \
+		ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \
 		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
 		ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
 		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
@@ -105,7 +105,7 @@ PATCHFILES=	squid-2.5.STABLE14-httpReplyDestroy.patch \
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
-COMMENT=	The successful WWW proxy cache and accelerator
+COMMENT=	HTTP Caching Proxy
 
 CONFLICTS=	squid-2.[^5]*
 GNU_CONFIGURE=	yes
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 7d8154f05637..223532680f52 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1,6 +1,9 @@
 MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c
+SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd
 SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745
 MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4
+SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285
 SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277
 MD5 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 9abe563ca3d01dc58502737edc6f3c60
+SHA256 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 6c98f1f2351b79cfc3f956ed1c46d86c7a53aac0ba28203a33f2dadc7d1e96fe
 SIZE (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 1319
diff --git a/www/squid30/files/pkg-deinstall.in b/www/squid30/files/pkg-deinstall.in
index 97cf4a1c0e26..e96398a3925f 100644
--- a/www/squid30/files/pkg-deinstall.in
+++ b/www/squid30/files/pkg-deinstall.in
@@ -16,7 +16,7 @@ POST-DEINSTALL)
 	echo "===> post-deinstallation information for $1:"
 	echo ""
 	echo "     Note:"
-	echo "     squid related user accounts and groups were not removed."
+	echo "     Squid related user accounts and groups were not removed."
 	echo ""
 	echo "     To remove the '%%SQUID_UID%%' user and the '%%SQUID_GID%%' group which were"
 	echo "     created by a default installation of this package, run"
@@ -29,7 +29,7 @@ POST-DEINSTALL)
 		echo "     all configuration files modified by you were preserved."
 		echo ""
 		echo "     Please remove them manually if you do not want to use"
-	       	echo "     squid any longer."
+	       	echo "     Squid any longer."
 	fi
 	echo ""
 	;;
diff --git a/www/squid30/files/pkg-install.in b/www/squid30/files/pkg-install.in
index e7c74d9293dc..5fc09b22e0e3 100644
--- a/www/squid30/files/pkg-install.in
+++ b/www/squid30/files/pkg-install.in
@@ -49,7 +49,7 @@ PRE-INSTALL)
 		echo "There is no account '${squid_user}' on this system, so I will try to create it:"
 		if ! pw useradd -q -n ${squid_user} \
 		    -u ${squid_uid} -g ${squid_group} \
-	  	    -c "squid caching-proxy pseudo user" \
+	  	    -c "Squid caching-proxy pseudo user" \
 		    -d "${squid_base}" -s "${nologin}" \
 		    -h - ; then
 			echo "Failed to create user '${squid_user}'!" >&2
@@ -72,19 +72,19 @@ PRE-INSTALL)
 		echo ""
 		echo " * NOTICE *"
 		echo ""
-		echo "The squid pseudo-user's uid and/or gid have been found"
+		echo "The Squid pseudo-user's uid and/or gid have been found"
 		echo "to be greater than or equal 3128."
 		echo ""
 		echo "This is not a problem as such, but violates the FreeBSD"
 		echo "ports' principle that a ports must not claim a uid greater"
 		echo "than 999."
 		echo ""
-		echo "Since version 2.5.4_11, the squid user is thus created"
+		echo "Since version 2.5.4_11, the Squid user is thus created"
 		echo "with an id of ${squid_uid}:${squid_gid} while earlier versions of this"
 		echo "port used the first unused uid/gid greater than or"
 		echo "equal 3128."
 		echo ""
-		echo "If you want to change the existing squid user's id, run"
+		echo "If you want to change the existing Squid user's id, run"
 		echo "'make changeuser' after the installation has completed."
 		echo "If you installed this port via a package, issue the"
 		echo "following commands as root:"
@@ -92,13 +92,13 @@ PRE-INSTALL)
 		echo "pw userdel -u ${current_uid}"
 		echo "pw groupadd -n ${squid_group} -g ${squid_gid}"
 		echo "pw useradd -n ${squid_user} -u ${squid_uid} \\"
-		echo "    -c \"squid caching-proxy pseudo user\" \\"
+		echo "    -c \"Squid caching-proxy pseudo user\" \\"
 		echo "    -g ${squid_group} -d ${squid_base} -s /sbin/nologin \\"
 		echo "    -h -"
 		echo "find -H ${PKG_PREFIX} -user ${current_uid} -exec chown ${squid_user} {} \\;"
 		echo "find -H ${PKG_PREFIX} -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
 		echo ""
-		echo "In case you have installed third party software for squid"
+		echo "In case you have installed third party software for Squid"
 		echo "like squidGuard, you should additionally run:"
 		echo "find -H /var -user ${current_uid} -exec chown ${squid_user} {} \\;"
 		echo "find -H /var -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
diff --git a/www/squid30/files/pkg-message.in b/www/squid30/files/pkg-message.in
index b6bd9eab049f..b6b81aa4760c 100644
--- a/www/squid30/files/pkg-message.in
+++ b/www/squid30/files/pkg-message.in
@@ -6,19 +6,19 @@
      
        Note:
        You must initialize new cache directories before you can start
-       squid.  Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
+       Squid.  Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
        If your cache directories are already initialized (e.g. after an
-       upgrade of squid) you do not need to initialize them again.
+       upgrade of Squid) you do not need to initialize them again.
 
      o The default configuration will deny everyone access to the
        proxy service. Edit the "http_access" directives in
-       %%PREFIX%%/etc/squid.conf to suit your needs.
+       %%PREFIX%%/etc/squid/squid.conf to suit your needs.
 --begin rcng
 
-     Please note that the squid start script is an rc.d style script.
-     This means that squid will not start automatically at boot time.
+     Please note that the Squid start script is an rc.d style script.
+     This means that Squid will not start automatically at boot time.
 
-     To enable squid, set squid_enable=yes in either
+     To enable Squid, set squid_enable=yes in either
      /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
      Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details.
 --end rcng
diff --git a/www/squid30/files/squid.sh.in b/www/squid30/files/squid.sh.in
index afe0fb6bb1e8..7d1414a2c8b0 100644
--- a/www/squid30/files/squid.sh.in
+++ b/www/squid30/files/squid.sh.in
@@ -20,7 +20,7 @@ name=squid
 command=%%PREFIX%%/sbin/squid
 # --begin rcng
 extra_commands=reload
-reload_cmd="${command} -k reconfigure"
+reload_cmd="${command} ${squid_flags} -k reconfigure"
 # --end rcng
 stop_cmd="squid_stop"
 squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}
@@ -44,7 +44,7 @@ squid_stop() {
 # --begin rcng
 squid_stop() {
 	echo "Stopping ${name}."
-	${command} -k shutdown
+	${command} ${squid_flags} -k shutdown
 	run_rc_command poll
 }
 
diff --git a/www/squid30/pkg-descr b/www/squid30/pkg-descr
index 88ba8ba2aff5..0cd02912d960 100644
--- a/www/squid30/pkg-descr
+++ b/www/squid30/pkg-descr
@@ -1,15 +1,10 @@
-This is the Squid Internet Object Cache developed by the National
-Laboratory for Applied Networking Research (NLANR) and Internet
-volunteers.  This software is freely available for anyone to use.
-
-This software is based on the Harvest Object Cache developed by
-the University of Colorado and the University of Southern California.
-The Harvest home page is http://harvest.cs.colorado.edu/.
-
-ARPA funding for the Harvest project has ended, the squid project has
-continued development of the cache where Harvest finished.
-
-This port provides many configuration options, most of which are
-available via 'make config'.
+Squid is a high-performance proxy caching server for web clients,
+supporting FTP, gopher, and HTTP data objects. Unlike traditional
+caching software, Squid handles all requests in a single, non-blocking,
+I/O-driven process.
+
+Squid supports SSL, extensive access controls, and full request logging.
+By using the lightweight Internet Cache Protocol, Squid caches can be
+arranged in a hierarchy or mesh for additional bandwidth savings.
 
 WWW: http://www.squid-cache.org/
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index f1d21105325b..10954b8e5ab4 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -6,7 +6,7 @@
 #
 # Tunables not (yet) configurable via 'make config':
 # SQUID_{U,G}ID
-#   Which user/group squid should run as (default: squid/squid).
+#   Which user/group Squid should run as (default: squid/squid).
 #   The user and group will be created if they do not already exist using
 #   a uid:gid of 100:100.
 #   NOTE: before version 2.5.4_6, these settings defaulted to
@@ -68,16 +68,16 @@
 #     of filedescriptors the resulting binary is expected to support.
 #    --enable-ntlm-fail-open
 #     Enable NTLM fail open, where a helper that fails one of the
-#     Authentication steps can allow squid to still authenticate the user
+#     Authentication steps can allow Squid to still authenticate the user
 #
 
 PORTNAME=	squid
 PORTVERSION=	2.5.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
-		ftp://archive.progeny.com/squid/%SUBDIR%/ \
+		ftp://ftp.vistech.net/pub/squid/%SUBDIR%/ \
 		ftp://mirrors.24-7-solutions.net/pub/squid/%SUBDIR%/ \
 		ftp://sunsite.auc.dk/pub/infosystems/squid/%SUBDIR%/ \
 		ftp://ftp.nl.uu.net/pub/unix/www/squid/%SUBDIR%/ \
@@ -105,7 +105,7 @@ PATCHFILES=	squid-2.5.STABLE14-httpReplyDestroy.patch \
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
-COMMENT=	The successful WWW proxy cache and accelerator
+COMMENT=	HTTP Caching Proxy
 
 CONFLICTS=	squid-2.[^5]*
 GNU_CONFIGURE=	yes
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 7d8154f05637..223532680f52 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,6 +1,9 @@
 MD5 (squid2.5/squid-2.5.STABLE14.tar.bz2) = f413e0b887a5f9b2a75350243ed5564c
+SHA256 (squid2.5/squid-2.5.STABLE14.tar.bz2) = c4eaee0e5ee42f46060217df9a88d628d244c0a543feab8296e44269e57ec7bd
 SIZE (squid2.5/squid-2.5.STABLE14.tar.bz2) = 1073745
 MD5 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1529f8b0170e24b26353578778435bd4
+SHA256 (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 9e99132b8efb07e3465d5e33749aa450daecfa3acde73755b6a3589d09d19285
 SIZE (squid2.5/squid-2.5.STABLE14-httpReplyDestroy.patch) = 1277
 MD5 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 9abe563ca3d01dc58502737edc6f3c60
+SHA256 (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 6c98f1f2351b79cfc3f956ed1c46d86c7a53aac0ba28203a33f2dadc7d1e96fe
 SIZE (squid2.5/squid-2.5.STABLE14-hierarchy_tag.patch) = 1319
diff --git a/www/squid31/files/pkg-deinstall.in b/www/squid31/files/pkg-deinstall.in
index 97cf4a1c0e26..e96398a3925f 100644
--- a/www/squid31/files/pkg-deinstall.in
+++ b/www/squid31/files/pkg-deinstall.in
@@ -16,7 +16,7 @@ POST-DEINSTALL)
 	echo "===> post-deinstallation information for $1:"
 	echo ""
 	echo "     Note:"
-	echo "     squid related user accounts and groups were not removed."
+	echo "     Squid related user accounts and groups were not removed."
 	echo ""
 	echo "     To remove the '%%SQUID_UID%%' user and the '%%SQUID_GID%%' group which were"
 	echo "     created by a default installation of this package, run"
@@ -29,7 +29,7 @@ POST-DEINSTALL)
 		echo "     all configuration files modified by you were preserved."
 		echo ""
 		echo "     Please remove them manually if you do not want to use"
-	       	echo "     squid any longer."
+	       	echo "     Squid any longer."
 	fi
 	echo ""
 	;;
diff --git a/www/squid31/files/pkg-install.in b/www/squid31/files/pkg-install.in
index e7c74d9293dc..5fc09b22e0e3 100644
--- a/www/squid31/files/pkg-install.in
+++ b/www/squid31/files/pkg-install.in
@@ -49,7 +49,7 @@ PRE-INSTALL)
 		echo "There is no account '${squid_user}' on this system, so I will try to create it:"
 		if ! pw useradd -q -n ${squid_user} \
 		    -u ${squid_uid} -g ${squid_group} \
-	  	    -c "squid caching-proxy pseudo user" \
+	  	    -c "Squid caching-proxy pseudo user" \
 		    -d "${squid_base}" -s "${nologin}" \
 		    -h - ; then
 			echo "Failed to create user '${squid_user}'!" >&2
@@ -72,19 +72,19 @@ PRE-INSTALL)
 		echo ""
 		echo " * NOTICE *"
 		echo ""
-		echo "The squid pseudo-user's uid and/or gid have been found"
+		echo "The Squid pseudo-user's uid and/or gid have been found"
 		echo "to be greater than or equal 3128."
 		echo ""
 		echo "This is not a problem as such, but violates the FreeBSD"
 		echo "ports' principle that a ports must not claim a uid greater"
 		echo "than 999."
 		echo ""
-		echo "Since version 2.5.4_11, the squid user is thus created"
+		echo "Since version 2.5.4_11, the Squid user is thus created"
 		echo "with an id of ${squid_uid}:${squid_gid} while earlier versions of this"
 		echo "port used the first unused uid/gid greater than or"
 		echo "equal 3128."
 		echo ""
-		echo "If you want to change the existing squid user's id, run"
+		echo "If you want to change the existing Squid user's id, run"
 		echo "'make changeuser' after the installation has completed."
 		echo "If you installed this port via a package, issue the"
 		echo "following commands as root:"
@@ -92,13 +92,13 @@ PRE-INSTALL)
 		echo "pw userdel -u ${current_uid}"
 		echo "pw groupadd -n ${squid_group} -g ${squid_gid}"
 		echo "pw useradd -n ${squid_user} -u ${squid_uid} \\"
-		echo "    -c \"squid caching-proxy pseudo user\" \\"
+		echo "    -c \"Squid caching-proxy pseudo user\" \\"
 		echo "    -g ${squid_group} -d ${squid_base} -s /sbin/nologin \\"
 		echo "    -h -"
 		echo "find -H ${PKG_PREFIX} -user ${current_uid} -exec chown ${squid_user} {} \\;"
 		echo "find -H ${PKG_PREFIX} -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
 		echo ""
-		echo "In case you have installed third party software for squid"
+		echo "In case you have installed third party software for Squid"
 		echo "like squidGuard, you should additionally run:"
 		echo "find -H /var -user ${current_uid} -exec chown ${squid_user} {} \\;"
 		echo "find -H /var -group ${current_gid} -exec chgrp ${squid_group} {} \\;"
diff --git a/www/squid31/files/pkg-message.in b/www/squid31/files/pkg-message.in
index b6bd9eab049f..b6b81aa4760c 100644
--- a/www/squid31/files/pkg-message.in
+++ b/www/squid31/files/pkg-message.in
@@ -6,19 +6,19 @@
      
        Note:
        You must initialize new cache directories before you can start
-       squid.  Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
+       Squid.  Do this by running "squid -z" as 'root' or '%%SQUID_UID%%'.
        If your cache directories are already initialized (e.g. after an
-       upgrade of squid) you do not need to initialize them again.
+       upgrade of Squid) you do not need to initialize them again.
 
      o The default configuration will deny everyone access to the
        proxy service. Edit the "http_access" directives in
-       %%PREFIX%%/etc/squid.conf to suit your needs.
+       %%PREFIX%%/etc/squid/squid.conf to suit your needs.
 --begin rcng
 
-     Please note that the squid start script is an rc.d style script.
-     This means that squid will not start automatically at boot time.
+     Please note that the Squid start script is an rc.d style script.
+     This means that Squid will not start automatically at boot time.
 
-     To enable squid, set squid_enable=yes in either
+     To enable Squid, set squid_enable=yes in either
      /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/squid
      Please see %%PREFIX%%/etc/rc.d/squid(.sh) for further details.
 --end rcng
diff --git a/www/squid31/files/squid.sh.in b/www/squid31/files/squid.sh.in
index afe0fb6bb1e8..7d1414a2c8b0 100644
--- a/www/squid31/files/squid.sh.in
+++ b/www/squid31/files/squid.sh.in
@@ -20,7 +20,7 @@ name=squid
 command=%%PREFIX%%/sbin/squid
 # --begin rcng
 extra_commands=reload
-reload_cmd="${command} -k reconfigure"
+reload_cmd="${command} ${squid_flags} -k reconfigure"
 # --end rcng
 stop_cmd="squid_stop"
 squid_chdir=${squid_chdir:-%%PREFIX%%/squid/logs}
@@ -44,7 +44,7 @@ squid_stop() {
 # --begin rcng
 squid_stop() {
 	echo "Stopping ${name}."
-	${command} -k shutdown
+	${command} ${squid_flags} -k shutdown
 	run_rc_command poll
 }
 
diff --git a/www/squid31/pkg-descr b/www/squid31/pkg-descr
index 88ba8ba2aff5..0cd02912d960 100644
--- a/www/squid31/pkg-descr
+++ b/www/squid31/pkg-descr
@@ -1,15 +1,10 @@
-This is the Squid Internet Object Cache developed by the National
-Laboratory for Applied Networking Research (NLANR) and Internet
-volunteers.  This software is freely available for anyone to use.
-
-This software is based on the Harvest Object Cache developed by
-the University of Colorado and the University of Southern California.
-The Harvest home page is http://harvest.cs.colorado.edu/.
-
-ARPA funding for the Harvest project has ended, the squid project has
-continued development of the cache where Harvest finished.
-
-This port provides many configuration options, most of which are
-available via 'make config'.
+Squid is a high-performance proxy caching server for web clients,
+supporting FTP, gopher, and HTTP data objects. Unlike traditional
+caching software, Squid handles all requests in a single, non-blocking,
+I/O-driven process.
+
+Squid supports SSL, extensive access controls, and full request logging.
+By using the lightweight Internet Cache Protocol, Squid caches can be
+arranged in a hierarchy or mesh for additional bandwidth savings.
 
 WWW: http://www.squid-cache.org/