- configure squid to run under a dedicated "squid" user by default; make use

  of SQUID_{UID,GID} which other squid-related ports already implemented.
  The user/group will be created on the fly if they do not already exist.
- introduce WITH_SQUID_LDAP_AUTH to pull in the necessary bits to compile and
  use the ldap_auth helper
- install some more authentication helper applications by default
- install helper applications to ${PREFIX}/libexec/squid instead of
  ${PREFIX}/libexec, add notes about it in pkg-install and pkg-descr
- cleanup the pre-installation tasks and move them from Makefile and pkg-plist
  into the pkg-install script; make 'make install' and 'pkg_add' actually do
  the same thing
- introduce a pkg-deinstall script
- make squid.sh rcNG compatible (when either /etc/rc_subr or
  ${PREFIX}/etc/rc_subr is present, the first one will be used, otherwise the
  script will work as a "rc classic" script so no additional dependency on
  the rc_subr port should be needed)
- some Makefile cleanups:
  + the squid installation procedure now correctly strips binaries, so there
    is no need to do this manually anymore
  + generate those parts of pkg-plist dynamically that may be affected by user
    set tunables (currently the localized error pages and helper applications)
  + document the available configuration options in a slightly different style
  + remove some obsolete variable declarations and comments
  + honor NOPORTDOCS
- add CONFLICTS
- add another vendor patch, see
  http://www.squid-cache.org/bugs/show_bug.cgi?id=890 for a thorough
  explanation of what has been fixed.
- since we can no longer take the presence of Lithuanian error pages for
  granted, wrap the workaround for the errorpages.patch with '.if exists()'
- bump PORTREVISION

PR:		61315
Submitted by:	maintainer

48 files changed, 2514 insertions, 6102 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index baf1c842a527..bed437c96f56 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -4,10 +4,31 @@
 #
 # $FreeBSD$
 #
+# Tunables:
+# WITH_SQUID_PINGER
+#   install the external icmp helper program (`pinger') for hierarchy stats and
+#   selection
+# WITH_SQUID_LDAP_AUTH
+#   install external modules for authentication against LDAP servers
+# SQUID_{U,G}ID
+#   Which user/group squid should run as (default: squid/squid).
+#   The user and group will be created if they do not already exist.
+#   NOTE: before version 2.5.4_6, these settings defaulted to
+#   nobody/nogroup.
+#   If you wish to keep these settings, please define SQUID_UID=nobody and
+#   SQUID_GID=nogroup in your make environment before you start the update.
+# SQUID_LANGUAGES
+#   A list of languages for which error page files should be installed
+#   (default: all)
+# SQUID_DEFAULT_LANG
+#   If you define SQUID_LANGUAGES, select which language should be the default
+#   (default: English)
+# SQUID_CONFIGURE_ARGS
+#   Additional configuration options, see below for a list
 
 PORTNAME=	squid
 PORTVERSION=	2.5.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -17,7 +38,6 @@ MASTER_SITES=	\
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.5.STABLE4
-EXTRACT_SUFX=	.tar.bz2
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
@@ -54,89 +74,131 @@ PATCHFILES=	squid-2.5.STABLE4-reconfigure_message.patch \
 		squid-2.5.STABLE4-pinger.patch \
 		squid-2.5.STABLE4-partial_reload.patch \
 		squid-2.5.STABLE4-ldap_tls.patch \
-		squid-2.5.STABLE4-ldap_group_bufsize.patch
+		squid-2.5.STABLE4-ldap_group_bufsize.patch \
+		squid-2.5.STABLE4-http_workarounds.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
 COMMENT=	The successful WWW proxy cache and accelerator
 
+CONFLICTS=	squid-*
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
-# Follow the apache port's lead...
+
+SQUID_UID?=	squid
+SQUID_GID?=	squid
+
+MAN8=		squid.8
+DOCS=		QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
+
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--datadir=${PREFIX}/etc/squid \
+		--libexecdir=${PREFIX}/libexec/squid \
 		--localstatedir=${PREFIX}/squid \
 		--enable-storeio="ufs diskd null" \
 		--enable-removal-policies="lru heap" \
-		--enable-auth=basic --enable-basic-auth-helpers="NCSA PAM YP" \
-		--enable-external-acl-helpers="ip_user unix_group" \
-		--enable-underscores ${SQUID_CONFIGURE_ARGS}
-
-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
-#CONFIGURE_ARGS+= --enable-dlmalloc
-#  - Compile and use the supplied GNUregex routines instead of BSD regex.
-#CONFIGURE_ARGS+= --enable-gnuregex
-#  - Enable simple malloc debugging
-#CONFIGURE_ARGS+= --enable-xmalloc-debug
-#  - Detailed trace of memory allocations
-#CONFIGURE_ARGS+= --enable-xmalloc-debug-count
-#  - Show malloc statistics in cachemgr status pages
-#CONFIGURE_ARGS+= --enable-xmalloc-statistics
-#  - Enable CARP support
-#CONFIGURE_ARGS+= --enable-carp
-#  - Enable ICMP pinging for heirarchy stats and selection
-#CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay pools to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-pools
-#  - Enable generic memory use tracing
-#CONFIGURE_ARGS+= --enable-mem-gen-trace
-#  - Enable logging of the User-Agent header
-#CONFIGURE_ARGS+= --enable-useragent-log
-#  - Disable Web Cache Coordination Protocol
-#CONFIGURE_ARGS+= --disable-wccp
-#  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent-hack
-#  - Turn on SNMP server support
-#CONFIGURE_ARGS+= --enable-snmp
-#  - Turn on SSL server support for reverse proxies
-#CONFIGURE_ARGS+= --enable-ssl
-#  - Optimize time updates to one per second rather than calling gettimeofday()
-#CONFIGURE_ARGS+= --enable-time-hack
-#  - Set an explicit hostname in cachemgr.cgi
-#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-#  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
-#    assigned IP addresses)
-#CONFIGURE_ARGS+= --enable-arp-acl
-#  - Enable HTCP protocol
-#CONFIGURE_ARGS+= --enable-htcp
-#  - Enable Forw/Via database
-#CONFIGURE_ARGS+= --enable-forw-via-db
-#  - 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
-#  (--enable-poll is not needed, it's detected correctly on 3.0)
-#  - Strict HTTP compliance
-#CONFIGURE_ARGS+= --disable-http-violations
-#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
-#CONFIGURE_ARGS+= --enable-ipf-transparent
-# (--enable-leakfinder is a developer support tool only)
-#  - Compile out code that does optional Ident (RFC931) lookups
-#CONFIGURE_ARGS+= --disable-ident-lookups
-#  - Disable squid's internal async DNS lookup code.
-#CONFIGURE_ARGS+= --disable-internal-dns
-#  - Use truncate() rather than unlink()
-#CONFIGURE_ARGS+= --enable-truncate
-#  - accept the illegal '_' character in hostnames.
-#CONFIGURE_ARGS+= --enable-underscores
-#  - Enable control of different heap replacement algorithms at runtime.
-#CONFIGURE_ARGS+= --enable-removal-policies
+		--enable-underscores
+
+.if defined(WITH_SQUID_PINGER)
+CONFIGURE_ARGS+=	--enable-icmp
+.endif
+
+# Authentication methods and modules:
+
+basic_auth=	NCSA PAM YP MSNT winbind
+external_acl=	ip_user unix_group wbinfo_group winbind_group
+MAN8+=		pam_auth.8 squid_unix_group.8
+.if defined(WITH_SQUID_LDAP_AUTH)
+USE_OPENLDAP=	yes
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+MAN8+=		squid_ldap_auth.8 squid_ldap_group.8
+basic_auth+=	LDAP
+external_acl+=	ldap_group
+.endif
+CONFIGURE_ARGS+=	--enable-auth="basic ntlm digest" \
+			--enable-basic-auth-helpers="${basic_auth}" \
+			--enable-digest-auth-helpers="password" \
+			--enable-external-acl-helpers="${external_acl}" \
+			--enable-ntlm-auth-helpers="winbind"
+
+# Languages:
+#
+# If you do not define SQUID_LANGUAGES yourself, all available language files
+# will be installed; the default language will be english.
+
+SQUID_LANGUAGES?=	\
+	Bulgarian Catalan Czech Danish Dutch English Estonian Finnish      \
+	French German Hebrew Hungarian Italian Japanese Korean Lithuanian  \
+	Polish Portuguese Romanian Russian-1251 Russian-koi8-r Serbian     \
+	Simplify_Chinese Slovak Spanish Swedish Traditional_Chinese Turkish
+SQUID_DEFAULT_LANG?=	English
+CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
+			--enable-default-err-language=${SQUID_DEFAULT_LANG}
+
+# Other configure options you might want to set using SQUID_CONFIGURE_ARGS:
+# Please see the configure script in the squid source distribution for a
+# complete list.
+#
+# --enable-dlmalloc
+#  Compile and use the malloc package from Doug Lea
+# --enable-gnuregex
+#  Compile and use the supplied GNUregex routines instead of BSD regex.
+# --enable-xmalloc-statistics
+#  Show malloc statistics in status page
+# --enable-carp
+#  Enable CARP support
+# --enable-delay-pools
+#  Enable delay pools to limit bandwidth usage
+# --enable-useragent-log
+#  Enable logging of the User-Agent header
+# --disable-wccp
+#  Disable Web Cache Coordination Protocol
+# --enable-snmp
+#  Turn on SNMP server support
+# --enable-ssl
+#  Turn on SSL server support for reverse proxies
+# --enable-time-hack
+#  Optimize time updates to one per second rather than calling gettimeofday()
+# --enable-cachemgr-hostname=some.hostname
+#  Set an explicit hostname in cachemgr.cgi
+# --enable-arp-acl
+#  Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+#  assigned IP addresses)
+# --enable-htcp
+#  Enable HTCP protocol
+# --enable-forw-via-db
+#  Enable Forw/Via database
+# --enable-cache-digests
+#  Use Cache Digests - see http://www.squid-cache.org/Doc/FAQ/FAQ-16.html
+# --disable-http-violations
+#  Strict HTTP compliance
+# --enable-ipf-transparent
+#  Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#  (Note: this is currently broken due to ipf headers not being installed to
+#  the base system, see PRs ports/60700 and misc/44148 for details)
+#  Note: see http://www.squid-cache.org/Doc/FAQ/FAQ-17.html for information
+#  about how to do transparent proxying with ipfw(8).
+# --disable-ident-lookups
+#  Compile out code that does optional Ident (RFC931) lookups
+# --disable-internal-dns
+#  Install the old external "dnsserver" binary
+# --enable-truncate
+#  Use truncate() rather than unlink()
+# --disable-hostname-checks
+#  Squid by default rejects any host names with odd characters in their name
+#  to conform with internet standards. If you disagree with this you may use
+#  this switch to turn off any such checks, provided that the resolver used by
+#  Squid does not reject such host names. This may be required to participate
+#  in testbeds for international domain names.
+# --disable-unlinkd
+#  Do not use "unlinkd"
+# --enable-stacktraces
+#  Enable automatic call backtrace on fatal errors
+
+CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@@ -145,37 +207,53 @@ post-patch:
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
+pre-configure:
+	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
+	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' ${WRKSRC}/src/cf.data.pre
+
+pre-install:
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	    -e 's|%%SQUID_UID%%|${SQUID_UID}|g' ${FILESDIR}/squid.sh \
+	    >${WRKDIR}/squid.sh
+
+pre-su-install:
+	@${SETENV} SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID} \
+	    PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+
 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 sbin_file in client squid
-	if [ -f ${PREFIX}/sbin/${sbin_file} ] ; then \
-		${STRIP_CMD} ${PREFIX}/sbin/${sbin_file} ; \
-	fi
-.endfor
-.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			\
-		${MKDIR} ${PREFIX}/squid/logs;		  	\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/logs;   \
-	fi
-	@if [ ! -d ${PREFIX}/squid/cache ]; then		\
-		${MKDIR} ${PREFIX}/squid/cache;			\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/cache;  \
-	fi
-	@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; \
-	fi
+.if defined(WITH_SQUID_PINGER)
+	${CHMOD} 4710 ${PREFIX}/libexec/squid/pinger; \
+	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
+.endif
+	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
+.if exists(${PREFIX}/etc/squid/errors/Lithuanian)
 # Work around the fact that the errorpages.patch creates files in
 # an "Attic" subdir:
 	@${FIND} ${WRKSRC}/errors/Lithuanian/Attic -type f \
-	-exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \;
+   	    -exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \;
+.endif
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+# Generate parts of pkg-plist on the fly:
+	@cd ${PREFIX} && ${FIND} libexec/squid -type f -o -type l \
+	    >${WRKDIR}/plist.dynamic
+	@${ECHO_CMD} "@dirrm libexec/squid" >>${WRKDIR}/plist.dynamic
+# Only register what we should have installed, there may be local additions
+# present:
+.for d in ${SQUID_LANGUAGES}
+	@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f \
+	    >>${WRKDIR}/plist.dynamic
+	@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
+.endfor
+	@${ECHO_CMD} "r ${TMPPLIST}" >${WRKDIR}/ex.script
+	@${ECHO_CMD} "/Start of dynamically generated plist" >>${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${WRKDIR}/plist.dynamic" >>${WRKDIR}/ex.script
+	@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
+	@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
+	@cd ${WRKDIR} && ex <ex.script >/dev/null
 
 .include <bsd.port.mk>
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 76f9e296de4d..893a0e19d67a 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -33,3 +33,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5
 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34
 MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284
 MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c
+MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac
diff --git a/www/squid/files/patch-src-cf.data.pre b/www/squid/files/patch-src-cf.data.pre
new file mode 100644
index 000000000000..2a8e1eff429f
--- /dev/null
+++ b/www/squid/files/patch-src-cf.data.pre
@@ -0,0 +1,20 @@
+--- src/cf.data.pre.orig	Thu May  1 14:07:51 2003
++++ src/cf.data.pre	Thu May  1 14:13:12 2003
+@@ -2325,7 +2325,7 @@
+ 
+ NAME: cache_effective_user
+ TYPE: string
+-DEFAULT: nobody
++DEFAULT: %%SQUID_UID%%
+ LOC: Config.effectiveUser
+ DOC_NONE
+ 
+@@ -2337,7 +2337,7 @@
+ 
+ 	If you start Squid as root, it will change its effective/real
+ 	UID/GID to the UID/GID specified below.  The default is to
+-	change to UID to nobody.  If you define cache_effective_user,
++	change to UID to %%SQUID_UID%%.  If you define cache_effective_user,
+ 	but not cache_effective_group, Squid sets the GID the
+ 	effective user's default group ID (taken from the password
+ 	file).
diff --git a/www/squid/files/squid.sh b/www/squid/files/squid.sh
index 40f655b04f27..ec92a10bc3fc 100644
--- a/www/squid/files/squid.sh
+++ b/www/squid/files/squid.sh
@@ -1,26 +1,75 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: squid
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD
+# 
+# Note:
+# If you are running an rcNG-System (i.e. FreeBSD 5 and later or after
+# having installed the rc_subr-port on an earlier system) you must set
+# "squid_enable=YES" in either /etc/rc.conf, /etc/rc.conf.local or
+# /etc/rc.conf.d/squid to make this script actually do something. There
+# you can also set squid_chdir, squid_user, and squid_flags.
+#
+# Please see squid(8), rc.conf(5) and rc(8) for further details.
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+unset rcNG
+name="squid"
+command=%%PREFIX%%/sbin/squid
+extra_commands=reload
+reload_cmd="${command} -k reconfigure"
+stop_cmd="${command} -k shutdown"
+: ${squid_chdir:=%%PREFIX%%/squid/logs}
+: ${squid_user:=%%SQUID_UID%%}
+: ${squid_flags:="-D"}
+default_config=%%PREFIX%%/etc/squid/squid.conf
 
-case "$1" in
-start)
-	if [ -x ${PREFIX}/sbin/squid -a -f ${PREFIX}/etc/squid/squid.conf ]; then
-		(cd /${PREFIX}/squid/logs; ${PREFIX}/sbin/squid >/dev/null 2>&1 &) ; echo -n ' squid'
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr && rcNG=yes
+else
+	if [ -f %%PREFIX%%/etc/rc.subr ]; then
+		. %%PREFIX%%/etc/rc.subr && rcNG=yes
 	fi
-	;;
-stop)
-		${PREFIX}/sbin/squid -k shutdown 2>&1
-		# Uncomment this if you'd like the system to (attempt to
-		# wait for) squid to shut down cleanly
-		#echo "Sleeping for 45 seconds to allow squid to shutdown.."
-		#sleep 45 
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
+fi
 
-exit 0
+if [ "${rcNG}" ]; then
+	rcvar=`set_rcvar`
+	load_rc_config ${name}
+	# check that squid's default configuration is present when
+	# squid_flags is not set. We assume that you specify at
+	# least the path to your non-default configuration with
+	# '-f /path/to/config.file' in squid_flags if you delete this file.
+	if [ -z "${squid_flags}" ]; then
+		required_files=${default_config}
+	fi
+	required_dirs=${squid_chdir}
+	run_rc_command "$1"
+else
+	case $1 in
+	start)
+		if [ -x "${command}" -a \
+			\( -f "${default_config}" -o "${squid_flags}" \) ]; then
+			echo -n ' squid'
+			(cd ${squid_chdir} && exec su -fm ${squid_user} -c \
+				"${command} ${squid_flags}")
+		fi
+		;;
+	stop)
+		if [ -x "${command}" ]; then
+			echo -n ' squid'
+			${stop_cmd}
+			while ps -xcU ${squid_user} | grep -q squid; do
+				sleep 2
+			done
+		fi
+		;;
+		*)
+		echo "usage: `basename $0` {start|stop}" >&2
+		exit 64
+		;;
+	esac
+	exit 0
+fi
diff --git a/www/squid/pkg-deinstall b/www/squid/pkg-deinstall
new file mode 100644
index 000000000000..3a95b4f50e0d
--- /dev/null
+++ b/www/squid/pkg-deinstall
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/bin:/usr/bin:/usr/sbin
+pkgname=$1
+
+case $2 in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	echo "===> post-deinstallation information for ${pkgname}"
+	echo ""
+	echo "     Please note that ${pkgname} was not completely removed"
+	echo "     from this system."
+	echo ""
+	echo "     The cache and log directories, squid's user account,"
+	echo "     and any modified configuration files have been preserved"
+	echo "     in case you want to install an updated version of squid"
+	echo "     on this system. You must remove them manually if you do"
+	echo "     not want to use squid any longer."
+	echo ""
+	;;
+*)
+	exit 64
+	;;
+esac
+exit 0
diff --git a/www/squid/pkg-descr b/www/squid/pkg-descr
index a030d6c271b8..f2674655d01e 100644
--- a/www/squid/pkg-descr
+++ b/www/squid/pkg-descr
@@ -9,9 +9,15 @@ 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.
 
-FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
-But you aren't lost in space: there is a mailing list,
-<squid-users@squid-cache.org>, where you will find some support and help.
-We also _strongly_ suggest you to examine Web pages noted above.
+Please see this port's Makefile for a list of compilation options.
+
+*** UPDATE NOTICE ***
+Starting from Version 2.5.4_6 the default user:group changed from
+nobody:nogroup to squid:squid. You can restore the old behavior
+of this port by specifying SQUID_UID=nobody SQUID_GID=nogroup in
+your make environment. Helper applications are now installed to
+$PREFIX/libexec/squid instead of $PREFIX/libexec, too.
+
+You can find further information on the project's website at
 
 WWW: http://www.squid-cache.org/
diff --git a/www/squid/pkg-install b/www/squid/pkg-install
index 7efd84949fd2..3b16eee43fda 100644
--- a/www/squid/pkg-install
+++ b/www/squid/pkg-install
@@ -1,44 +1,105 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
 
-PKGNAME=$1
+PATH=/bin:/usr/bin:/usr/sbin
+pkgname=$1
+squid_base=${PKG_PREFIX:-/usr/local}/squid
+squid_confdir=${PKG_PREFIX:-/usr/local}/etc/squid
+squid_user=${SQUID_UID:=squid}
+squid_group=${SQUID_GID:=squid}
+squid_gid=3128
+squid_uid=3128
 
 case $2 in
-    PRE-INSTALL)
+PRE-INSTALL)
+	echo "===> Pre-installation configuration for ${pkgname}"
+	if ! pw groupshow ${squid_group} -q >/dev/null ; then
+		while pw groupshow -g ${squid_gid} -q >/dev/null; do
+			squid_gid=`expr ${squid_gid} + 1`
+		done
+		echo "There is no group '${squid_group}' on this system, so I will try to create it:"
+		if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
+			echo "Failed to create group \"${squid_group}\"!" >&2
+			echo "Please create it manually." >&2
+			exit 1
+		else
+			echo "Group '${squid_group}' created successfully:"
+		fi
+	else
+		echo "I will use the existing group '${squid_group}':"
+	fi
+	pw groupshow ${squid_group}
+	if ! pw usershow ${squid_user} -q >/dev/null ; then
+		while pw usershow -u ${squid_uid} -q >/dev/null; do
+			squid_uid=`expr ${squid_uid} + 1`
+		done
+		echo "There is no account '${squid_user}' on this system, so I will try to create it:"
+		if ! pw useradd ${squid_user} -u ${squid_uid} -q \
+	  	    -c "squid caching-proxy pseudo user" -g ${squid_group} \
+		    -d "${squid_base}" -s "/sbin/nologin" -h - ; then
+			echo "Failed to create user '${squid_user}'!" >&2
+			echo "Please create it manually." >&2
+			exit 1
+		else
+			echo "User '${squid_user}' created successfully:"
+		fi
+	else
+		echo "I will use the existing user '${squid_user}':"
+	fi
+	pw usershow ${squid_user}
+	for dir in cache logs; do
+	if [ ! -d ${squid_base}/${dir} ]; then
+		echo "Creating ${squid_base}/${dir}..."
+		install -d -o ${squid_user} -g ${squid_group} \
+		    -m 0750 ${squid_base}/${dir}
+	fi
+	done
+	if [ ! -d ${squid_confdir} ]; then
+		echo "Creating ${squid_confdir}..."
+		install -d -o root -g ${squid_group} \
+		    -m 0750 ${squid_confdir}
+	fi
 	;;
-    POST-INSTALL)
-	echo "==> Post-installation configuration of ${PKGNAME}"
+POST-INSTALL)
+	for file in mime.conf squid.conf; do
+		if [ ! -f ${squid_confdir}/${file} \
+		    -a -f ${squid_confdir}/${file}.default ]; then
+		echo "Creating ${file} from default..."
+		install -c -o root -g ${squid_group} -m 0640 \
+		    ${squid_confdir}/${file}.default ${squid_confdir}/${file}
+	fi
+	done
+
+	echo "===> Post-installation informations for ${pkgname}"
+	echo ""
+	echo "     o You can find the configuration files for this package"
+	echo "       in the directory ${squid_confdir}."
 	echo ""
-	echo "    o you DO need running nameservice to start and run ${PKGNAME}"
+	echo "     o A cache directory has been created in ${squid_base}/cache."
+	echo "       Log files will be written to ${squid_base}/logs."
 	echo ""
-	echo "    o use the ${PKGNAME} proxy and caching WWW Server by"
-	echo "      configuring your WWW Navigator (Netscape, Mosaic,...)"
-	echo "      to use it as a proxy server."
+	echo "     o The default configuration will deny everyone access to the"
+	echo "       proxy service. Edit the \"http_access\" directives in"
+	echo "       ${squid_confdir}/squid.conf to suit your needs."
 	echo ""
-	echo "    o Note that before you can run ${PKGNAME} you will"
-	echo "      need to initialise the cache directory."
-	echo "      You can do this by typing \"squid -z\"."
+	echo "     o If you never ran squid on this system before, you need to"
+	echo "       initialize the cache directory by running \"squid -z\""
+	echo "       as 'root' or '${squid_user}' before starting squid."
 	echo ""
-	echo "==> Press Enter to edit the ${PKGNAME} config file."
-	echo "    (The defaults are reasonable; and the file is well commented)"
 	tput md
-	echo "    You'd certainly like to pay attention to the"
-	echo "    ACTUAL locations of cache \"spool\", logfiles, pidfile!"
+	echo "     *** UPDATE NOTICE ***"
+	echo ""
+	echo "     Starting with version 2.5.4_6, all helper applications are"
+	echo "     installed to ${PKG_PREFIX}/libexec/squid instead of"
+	echo "     ${PKG_PREFIX}/libexec."
+	echo "     Please check your squid.conf and update it if necessary."
 	tput me
-	if [ -z "${PACKAGE_BUILDING}" ]; then read skip; fi
-	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 ""
 	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
+*)
+	exit 64
 	;;
 esac
 exit 0
diff --git a/www/squid/pkg-plist b/www/squid/pkg-plist
index fa28b0b99d1d..f04c2fc92436 100644
--- a/www/squid/pkg-plist
+++ b/www/squid/pkg-plist
@@ -1,4 +1,12 @@
+@comment $FreeBSD$
 etc/rc.d/squid.sh
+etc/squid/mib.txt
+@unexec if cmp -s %D/etc/squid/mime.conf %D/etc/squid/mime.conf.default; then rm -f %D/etc/squid/mime.conf; fi
+etc/squid/mime.conf.default
+@unexec if cmp -s %D/etc/squid/msntauth.conf %D/etc/squid/msntauth.conf.default; then rm -f %D/etc/squid/msntauth.conf; fi
+etc/squid/msntauth.conf.default
+@unexec if cmp -s %D/etc/squid/squid.conf %D/etc/squid/squid.conf.default; then rm -f %D/etc/squid/squid.conf; fi
+etc/squid/squid.conf.default
 etc/squid/icons/anthony-binhex.gif
 etc/squid/icons/anthony-bomb.gif
 etc/squid/icons/anthony-box.gif
@@ -26,872 +34,22 @@ etc/squid/icons/anthony-text.gif
 etc/squid/icons/anthony-unknown.gif
 etc/squid/icons/anthony-xbm.gif
 etc/squid/icons/anthony-xpm.gif
-etc/squid/errors/Bulgarian/ERR_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CANNOT_FORWARD
-etc/squid/errors/Bulgarian/ERR_CONNECT_FAIL
-etc/squid/errors/Bulgarian/ERR_DNS_FAIL
-etc/squid/errors/Bulgarian/ERR_FORWARDING_DENIED
-etc/squid/errors/Bulgarian/ERR_FTP_DISABLED
-etc/squid/errors/Bulgarian/ERR_FTP_FAILURE
-etc/squid/errors/Bulgarian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Bulgarian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Bulgarian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Bulgarian/ERR_INVALID_REQ
-etc/squid/errors/Bulgarian/ERR_INVALID_URL
-etc/squid/errors/Bulgarian/ERR_LIFETIME_EXP
-etc/squid/errors/Bulgarian/ERR_NO_RELAY
-etc/squid/errors/Bulgarian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Bulgarian/ERR_READ_ERROR
-etc/squid/errors/Bulgarian/ERR_READ_TIMEOUT
-etc/squid/errors/Bulgarian/ERR_SHUTTING_DOWN
-etc/squid/errors/Bulgarian/ERR_SOCKET_FAILURE
-etc/squid/errors/Bulgarian/ERR_TOO_BIG
-etc/squid/errors/Bulgarian/ERR_UNSUP_REQ
-etc/squid/errors/Bulgarian/ERR_URN_RESOLVE
-etc/squid/errors/Bulgarian/ERR_WRITE_ERROR
-etc/squid/errors/Bulgarian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Catalan/ERR_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CANNOT_FORWARD
-etc/squid/errors/Catalan/ERR_CONNECT_FAIL
-etc/squid/errors/Catalan/ERR_DNS_FAIL
-etc/squid/errors/Catalan/ERR_FORWARDING_DENIED
-etc/squid/errors/Catalan/ERR_FTP_DISABLED
-etc/squid/errors/Catalan/ERR_FTP_FAILURE
-etc/squid/errors/Catalan/ERR_FTP_FORBIDDEN
-etc/squid/errors/Catalan/ERR_FTP_NOT_FOUND
-etc/squid/errors/Catalan/ERR_FTP_PUT_CREATED
-etc/squid/errors/Catalan/ERR_FTP_PUT_ERROR
-etc/squid/errors/Catalan/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Catalan/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Catalan/ERR_INVALID_REQ
-etc/squid/errors/Catalan/ERR_INVALID_URL
-etc/squid/errors/Catalan/ERR_LIFETIME_EXP
-etc/squid/errors/Catalan/ERR_NO_RELAY
-etc/squid/errors/Catalan/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Catalan/ERR_READ_ERROR
-etc/squid/errors/Catalan/ERR_READ_TIMEOUT
-etc/squid/errors/Catalan/ERR_SHUTTING_DOWN
-etc/squid/errors/Catalan/ERR_SOCKET_FAILURE
-etc/squid/errors/Catalan/ERR_TOO_BIG
-etc/squid/errors/Catalan/ERR_UNSUP_REQ
-etc/squid/errors/Catalan/ERR_URN_RESOLVE
-etc/squid/errors/Catalan/ERR_WRITE_ERROR
-etc/squid/errors/Catalan/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Czech/ERR_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CANNOT_FORWARD
-etc/squid/errors/Czech/ERR_CONNECT_FAIL
-etc/squid/errors/Czech/ERR_DNS_FAIL
-etc/squid/errors/Czech/ERR_FORWARDING_DENIED
-etc/squid/errors/Czech/ERR_FTP_DISABLED
-etc/squid/errors/Czech/ERR_FTP_FAILURE
-etc/squid/errors/Czech/ERR_FTP_FORBIDDEN
-etc/squid/errors/Czech/ERR_FTP_NOT_FOUND
-etc/squid/errors/Czech/ERR_FTP_PUT_CREATED
-etc/squid/errors/Czech/ERR_FTP_PUT_ERROR
-etc/squid/errors/Czech/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Czech/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Czech/ERR_INVALID_REQ
-etc/squid/errors/Czech/ERR_INVALID_URL
-etc/squid/errors/Czech/ERR_LIFETIME_EXP
-etc/squid/errors/Czech/ERR_NO_RELAY
-etc/squid/errors/Czech/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Czech/ERR_READ_ERROR
-etc/squid/errors/Czech/ERR_READ_TIMEOUT
-etc/squid/errors/Czech/ERR_SHUTTING_DOWN
-etc/squid/errors/Czech/ERR_SOCKET_FAILURE
-etc/squid/errors/Czech/ERR_TOO_BIG
-etc/squid/errors/Czech/ERR_UNSUP_REQ
-etc/squid/errors/Czech/ERR_URN_RESOLVE
-etc/squid/errors/Czech/ERR_WRITE_ERROR
-etc/squid/errors/Czech/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Danish/ERR_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CANNOT_FORWARD
-etc/squid/errors/Danish/ERR_CONNECT_FAIL
-etc/squid/errors/Danish/ERR_DNS_FAIL
-etc/squid/errors/Danish/ERR_FORWARDING_DENIED
-etc/squid/errors/Danish/ERR_FTP_DISABLED
-etc/squid/errors/Danish/ERR_FTP_FAILURE
-etc/squid/errors/Danish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Danish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Danish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Danish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Danish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Danish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Danish/ERR_INVALID_REQ
-etc/squid/errors/Danish/ERR_INVALID_URL
-etc/squid/errors/Danish/ERR_LIFETIME_EXP
-etc/squid/errors/Danish/ERR_NO_RELAY
-etc/squid/errors/Danish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Danish/ERR_READ_ERROR
-etc/squid/errors/Danish/ERR_READ_TIMEOUT
-etc/squid/errors/Danish/ERR_SHUTTING_DOWN
-etc/squid/errors/Danish/ERR_SOCKET_FAILURE
-etc/squid/errors/Danish/ERR_TOO_BIG
-etc/squid/errors/Danish/ERR_UNSUP_REQ
-etc/squid/errors/Danish/ERR_URN_RESOLVE
-etc/squid/errors/Danish/ERR_WRITE_ERROR
-etc/squid/errors/Danish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Dutch/ERR_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CANNOT_FORWARD
-etc/squid/errors/Dutch/ERR_CONNECT_FAIL
-etc/squid/errors/Dutch/ERR_DNS_FAIL
-etc/squid/errors/Dutch/ERR_FORWARDING_DENIED
-etc/squid/errors/Dutch/ERR_FTP_DISABLED
-etc/squid/errors/Dutch/ERR_FTP_FAILURE
-etc/squid/errors/Dutch/ERR_FTP_FORBIDDEN
-etc/squid/errors/Dutch/ERR_FTP_NOT_FOUND
-etc/squid/errors/Dutch/ERR_FTP_PUT_CREATED
-etc/squid/errors/Dutch/ERR_FTP_PUT_ERROR
-etc/squid/errors/Dutch/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Dutch/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Dutch/ERR_INVALID_REQ
-etc/squid/errors/Dutch/ERR_INVALID_URL
-etc/squid/errors/Dutch/ERR_LIFETIME_EXP
-etc/squid/errors/Dutch/ERR_NO_RELAY
-etc/squid/errors/Dutch/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Dutch/ERR_READ_ERROR
-etc/squid/errors/Dutch/ERR_READ_TIMEOUT
-etc/squid/errors/Dutch/ERR_SHUTTING_DOWN
-etc/squid/errors/Dutch/ERR_SOCKET_FAILURE
-etc/squid/errors/Dutch/ERR_TOO_BIG
-etc/squid/errors/Dutch/ERR_UNSUP_REQ
-etc/squid/errors/Dutch/ERR_URN_RESOLVE
-etc/squid/errors/Dutch/ERR_WRITE_ERROR
-etc/squid/errors/Dutch/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/English/ERR_ACCESS_DENIED
-etc/squid/errors/English/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/English/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/English/ERR_CANNOT_FORWARD
-etc/squid/errors/English/ERR_CONNECT_FAIL
-etc/squid/errors/English/ERR_DNS_FAIL
-etc/squid/errors/English/ERR_FORWARDING_DENIED
-etc/squid/errors/English/ERR_FTP_DISABLED
-etc/squid/errors/English/ERR_FTP_FAILURE
-etc/squid/errors/English/ERR_FTP_FORBIDDEN
-etc/squid/errors/English/ERR_FTP_NOT_FOUND
-etc/squid/errors/English/ERR_FTP_PUT_CREATED
-etc/squid/errors/English/ERR_FTP_PUT_ERROR
-etc/squid/errors/English/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/English/ERR_FTP_UNAVAILABLE
-etc/squid/errors/English/ERR_INVALID_REQ
-etc/squid/errors/English/ERR_INVALID_URL
-etc/squid/errors/English/ERR_LIFETIME_EXP
-etc/squid/errors/English/ERR_NO_RELAY
-etc/squid/errors/English/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/English/ERR_READ_ERROR
-etc/squid/errors/English/ERR_READ_TIMEOUT
-etc/squid/errors/English/ERR_SHUTTING_DOWN
-etc/squid/errors/English/ERR_SOCKET_FAILURE
-etc/squid/errors/English/ERR_TOO_BIG
-etc/squid/errors/English/ERR_UNSUP_REQ
-etc/squid/errors/English/ERR_URN_RESOLVE
-etc/squid/errors/English/ERR_WRITE_ERROR
-etc/squid/errors/English/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Estonian/ERR_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CANNOT_FORWARD
-etc/squid/errors/Estonian/ERR_CONNECT_FAIL
-etc/squid/errors/Estonian/ERR_DNS_FAIL
-etc/squid/errors/Estonian/ERR_FORWARDING_DENIED
-etc/squid/errors/Estonian/ERR_FTP_DISABLED
-etc/squid/errors/Estonian/ERR_FTP_FAILURE
-etc/squid/errors/Estonian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Estonian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Estonian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Estonian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Estonian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Estonian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Estonian/ERR_INVALID_REQ
-etc/squid/errors/Estonian/ERR_INVALID_URL
-etc/squid/errors/Estonian/ERR_LIFETIME_EXP
-etc/squid/errors/Estonian/ERR_NO_RELAY
-etc/squid/errors/Estonian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Estonian/ERR_READ_ERROR
-etc/squid/errors/Estonian/ERR_READ_TIMEOUT
-etc/squid/errors/Estonian/ERR_SHUTTING_DOWN
-etc/squid/errors/Estonian/ERR_SOCKET_FAILURE
-etc/squid/errors/Estonian/ERR_TOO_BIG
-etc/squid/errors/Estonian/ERR_UNSUP_REQ
-etc/squid/errors/Estonian/ERR_URN_RESOLVE
-etc/squid/errors/Estonian/ERR_WRITE_ERROR
-etc/squid/errors/Estonian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Finnish/ERR_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CANNOT_FORWARD
-etc/squid/errors/Finnish/ERR_CONNECT_FAIL
-etc/squid/errors/Finnish/ERR_DNS_FAIL
-etc/squid/errors/Finnish/ERR_FORWARDING_DENIED
-etc/squid/errors/Finnish/ERR_FTP_DISABLED
-etc/squid/errors/Finnish/ERR_FTP_FAILURE
-etc/squid/errors/Finnish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Finnish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Finnish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Finnish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Finnish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Finnish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Finnish/ERR_INVALID_REQ
-etc/squid/errors/Finnish/ERR_INVALID_URL
-etc/squid/errors/Finnish/ERR_LIFETIME_EXP
-etc/squid/errors/Finnish/ERR_NO_RELAY
-etc/squid/errors/Finnish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Finnish/ERR_READ_ERROR
-etc/squid/errors/Finnish/ERR_READ_TIMEOUT
-etc/squid/errors/Finnish/ERR_SHUTTING_DOWN
-etc/squid/errors/Finnish/ERR_SOCKET_FAILURE
-etc/squid/errors/Finnish/ERR_TOO_BIG
-etc/squid/errors/Finnish/ERR_UNSUP_REQ
-etc/squid/errors/Finnish/ERR_URN_RESOLVE
-etc/squid/errors/Finnish/ERR_WRITE_ERROR
-etc/squid/errors/Finnish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/French/ERR_ACCESS_DENIED
-etc/squid/errors/French/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/French/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/French/ERR_CANNOT_FORWARD
-etc/squid/errors/French/ERR_CONNECT_FAIL
-etc/squid/errors/French/ERR_DNS_FAIL
-etc/squid/errors/French/ERR_FORWARDING_DENIED
-etc/squid/errors/French/ERR_FTP_DISABLED
-etc/squid/errors/French/ERR_FTP_FAILURE
-etc/squid/errors/French/ERR_FTP_FORBIDDEN
-etc/squid/errors/French/ERR_FTP_NOT_FOUND
-etc/squid/errors/French/ERR_FTP_PUT_CREATED
-etc/squid/errors/French/ERR_FTP_PUT_ERROR
-etc/squid/errors/French/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/French/ERR_FTP_UNAVAILABLE
-etc/squid/errors/French/ERR_INVALID_REQ
-etc/squid/errors/French/ERR_INVALID_URL
-etc/squid/errors/French/ERR_LIFETIME_EXP
-etc/squid/errors/French/ERR_NO_RELAY
-etc/squid/errors/French/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/French/ERR_READ_ERROR
-etc/squid/errors/French/ERR_READ_TIMEOUT
-etc/squid/errors/French/ERR_SHUTTING_DOWN
-etc/squid/errors/French/ERR_SOCKET_FAILURE
-etc/squid/errors/French/ERR_TOO_BIG
-etc/squid/errors/French/ERR_UNSUP_REQ
-etc/squid/errors/French/ERR_URN_RESOLVE
-etc/squid/errors/French/ERR_WRITE_ERROR
-etc/squid/errors/French/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/German/ERR_ACCESS_DENIED
-etc/squid/errors/German/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/German/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/German/ERR_CANNOT_FORWARD
-etc/squid/errors/German/ERR_CONNECT_FAIL
-etc/squid/errors/German/ERR_DNS_FAIL
-etc/squid/errors/German/ERR_FORWARDING_DENIED
-etc/squid/errors/German/ERR_FTP_DISABLED
-etc/squid/errors/German/ERR_FTP_FAILURE
-etc/squid/errors/German/ERR_FTP_FORBIDDEN
-etc/squid/errors/German/ERR_FTP_NOT_FOUND
-etc/squid/errors/German/ERR_FTP_PUT_CREATED
-etc/squid/errors/German/ERR_FTP_PUT_ERROR
-etc/squid/errors/German/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/German/ERR_FTP_UNAVAILABLE
-etc/squid/errors/German/ERR_INVALID_REQ
-etc/squid/errors/German/ERR_INVALID_URL
-etc/squid/errors/German/ERR_LIFETIME_EXP
-etc/squid/errors/German/ERR_NO_RELAY
-etc/squid/errors/German/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/German/ERR_READ_ERROR
-etc/squid/errors/German/ERR_READ_TIMEOUT
-etc/squid/errors/German/ERR_SHUTTING_DOWN
-etc/squid/errors/German/ERR_SOCKET_FAILURE
-etc/squid/errors/German/ERR_TOO_BIG
-etc/squid/errors/German/ERR_UNSUP_REQ
-etc/squid/errors/German/ERR_URN_RESOLVE
-etc/squid/errors/German/ERR_WRITE_ERROR
-etc/squid/errors/German/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Hebrew/ERR_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CANNOT_FORWARD
-etc/squid/errors/Hebrew/ERR_CONNECT_FAIL
-etc/squid/errors/Hebrew/ERR_DNS_FAIL
-etc/squid/errors/Hebrew/ERR_FORWARDING_DENIED
-etc/squid/errors/Hebrew/ERR_FTP_DISABLED
-etc/squid/errors/Hebrew/ERR_FTP_FAILURE
-etc/squid/errors/Hebrew/ERR_FTP_FORBIDDEN
-etc/squid/errors/Hebrew/ERR_FTP_NOT_FOUND
-etc/squid/errors/Hebrew/ERR_FTP_PUT_CREATED
-etc/squid/errors/Hebrew/ERR_FTP_PUT_ERROR
-etc/squid/errors/Hebrew/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Hebrew/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Hebrew/ERR_INVALID_REQ
-etc/squid/errors/Hebrew/ERR_INVALID_URL
-etc/squid/errors/Hebrew/ERR_LIFETIME_EXP
-etc/squid/errors/Hebrew/ERR_NO_RELAY
-etc/squid/errors/Hebrew/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Hebrew/ERR_READ_ERROR
-etc/squid/errors/Hebrew/ERR_READ_TIMEOUT
-etc/squid/errors/Hebrew/ERR_SHUTTING_DOWN
-etc/squid/errors/Hebrew/ERR_SOCKET_FAILURE
-etc/squid/errors/Hebrew/ERR_TOO_BIG
-etc/squid/errors/Hebrew/ERR_UNSUP_REQ
-etc/squid/errors/Hebrew/ERR_URN_RESOLVE
-etc/squid/errors/Hebrew/ERR_WRITE_ERROR
-etc/squid/errors/Hebrew/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Hungarian/ERR_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CANNOT_FORWARD
-etc/squid/errors/Hungarian/ERR_CONNECT_FAIL
-etc/squid/errors/Hungarian/ERR_DNS_FAIL
-etc/squid/errors/Hungarian/ERR_FORWARDING_DENIED
-etc/squid/errors/Hungarian/ERR_FTP_DISABLED
-etc/squid/errors/Hungarian/ERR_FTP_FAILURE
-etc/squid/errors/Hungarian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Hungarian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Hungarian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Hungarian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Hungarian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Hungarian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Hungarian/ERR_INVALID_REQ
-etc/squid/errors/Hungarian/ERR_INVALID_URL
-etc/squid/errors/Hungarian/ERR_LIFETIME_EXP
-etc/squid/errors/Hungarian/ERR_NO_RELAY
-etc/squid/errors/Hungarian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Hungarian/ERR_READ_ERROR
-etc/squid/errors/Hungarian/ERR_READ_TIMEOUT
-etc/squid/errors/Hungarian/ERR_SHUTTING_DOWN
-etc/squid/errors/Hungarian/ERR_SOCKET_FAILURE
-etc/squid/errors/Hungarian/ERR_TOO_BIG
-etc/squid/errors/Hungarian/ERR_UNSUP_REQ
-etc/squid/errors/Hungarian/ERR_URN_RESOLVE
-etc/squid/errors/Hungarian/ERR_WRITE_ERROR
-etc/squid/errors/Hungarian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Italian/ERR_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CANNOT_FORWARD
-etc/squid/errors/Italian/ERR_CONNECT_FAIL
-etc/squid/errors/Italian/ERR_DNS_FAIL
-etc/squid/errors/Italian/ERR_FORWARDING_DENIED
-etc/squid/errors/Italian/ERR_FTP_DISABLED
-etc/squid/errors/Italian/ERR_FTP_FAILURE
-etc/squid/errors/Italian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Italian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Italian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Italian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Italian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Italian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Italian/ERR_INVALID_REQ
-etc/squid/errors/Italian/ERR_INVALID_URL
-etc/squid/errors/Italian/ERR_LIFETIME_EXP
-etc/squid/errors/Italian/ERR_NO_RELAY
-etc/squid/errors/Italian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Italian/ERR_READ_ERROR
-etc/squid/errors/Italian/ERR_READ_TIMEOUT
-etc/squid/errors/Italian/ERR_SHUTTING_DOWN
-etc/squid/errors/Italian/ERR_SOCKET_FAILURE
-etc/squid/errors/Italian/ERR_TOO_BIG
-etc/squid/errors/Italian/ERR_UNSUP_REQ
-etc/squid/errors/Italian/ERR_URN_RESOLVE
-etc/squid/errors/Italian/ERR_WRITE_ERROR
-etc/squid/errors/Italian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Japanese/ERR_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CANNOT_FORWARD
-etc/squid/errors/Japanese/ERR_CONNECT_FAIL
-etc/squid/errors/Japanese/ERR_DNS_FAIL
-etc/squid/errors/Japanese/ERR_FORWARDING_DENIED
-etc/squid/errors/Japanese/ERR_FTP_DISABLED
-etc/squid/errors/Japanese/ERR_FTP_FAILURE
-etc/squid/errors/Japanese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Japanese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Japanese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Japanese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Japanese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Japanese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Japanese/ERR_INVALID_REQ
-etc/squid/errors/Japanese/ERR_INVALID_URL
-etc/squid/errors/Japanese/ERR_LIFETIME_EXP
-etc/squid/errors/Japanese/ERR_NO_RELAY
-etc/squid/errors/Japanese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Japanese/ERR_READ_ERROR
-etc/squid/errors/Japanese/ERR_READ_TIMEOUT
-etc/squid/errors/Japanese/ERR_SHUTTING_DOWN
-etc/squid/errors/Japanese/ERR_SOCKET_FAILURE
-etc/squid/errors/Japanese/ERR_TOO_BIG
-etc/squid/errors/Japanese/ERR_UNSUP_REQ
-etc/squid/errors/Japanese/ERR_URN_RESOLVE
-etc/squid/errors/Japanese/ERR_WRITE_ERROR
-etc/squid/errors/Japanese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Korean/ERR_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CANNOT_FORWARD
-etc/squid/errors/Korean/ERR_CONNECT_FAIL
-etc/squid/errors/Korean/ERR_DNS_FAIL
-etc/squid/errors/Korean/ERR_FORWARDING_DENIED
-etc/squid/errors/Korean/ERR_FTP_DISABLED
-etc/squid/errors/Korean/ERR_FTP_FAILURE
-etc/squid/errors/Korean/ERR_FTP_FORBIDDEN
-etc/squid/errors/Korean/ERR_FTP_NOT_FOUND
-etc/squid/errors/Korean/ERR_FTP_PUT_CREATED
-etc/squid/errors/Korean/ERR_FTP_PUT_ERROR
-etc/squid/errors/Korean/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Korean/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Korean/ERR_INVALID_REQ
-etc/squid/errors/Korean/ERR_INVALID_URL
-etc/squid/errors/Korean/ERR_LIFETIME_EXP
-etc/squid/errors/Korean/ERR_NO_RELAY
-etc/squid/errors/Korean/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Korean/ERR_READ_ERROR
-etc/squid/errors/Korean/ERR_READ_TIMEOUT
-etc/squid/errors/Korean/ERR_SHUTTING_DOWN
-etc/squid/errors/Korean/ERR_SOCKET_FAILURE
-etc/squid/errors/Korean/ERR_TOO_BIG
-etc/squid/errors/Korean/ERR_UNSUP_REQ
-etc/squid/errors/Korean/ERR_URN_RESOLVE
-etc/squid/errors/Korean/ERR_WRITE_ERROR
-etc/squid/errors/Korean/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Lithuanian/ERR_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CANNOT_FORWARD
-etc/squid/errors/Lithuanian/ERR_CONNECT_FAIL
-etc/squid/errors/Lithuanian/ERR_DNS_FAIL
-etc/squid/errors/Lithuanian/ERR_FORWARDING_DENIED
-etc/squid/errors/Lithuanian/ERR_FTP_DISABLED
-etc/squid/errors/Lithuanian/ERR_FTP_FAILURE
-etc/squid/errors/Lithuanian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Lithuanian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Lithuanian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Lithuanian/ERR_INVALID_REQ
-etc/squid/errors/Lithuanian/ERR_INVALID_URL
-etc/squid/errors/Lithuanian/ERR_LIFETIME_EXP
-etc/squid/errors/Lithuanian/ERR_NO_RELAY
-etc/squid/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Lithuanian/ERR_READ_ERROR
-etc/squid/errors/Lithuanian/ERR_READ_TIMEOUT
-etc/squid/errors/Lithuanian/ERR_SHUTTING_DOWN
-etc/squid/errors/Lithuanian/ERR_SOCKET_FAILURE
-etc/squid/errors/Lithuanian/ERR_TOO_BIG
-etc/squid/errors/Lithuanian/ERR_UNSUP_REQ
-etc/squid/errors/Lithuanian/ERR_URN_RESOLVE
-etc/squid/errors/Lithuanian/ERR_WRITE_ERROR
-etc/squid/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Polish/ERR_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CANNOT_FORWARD
-etc/squid/errors/Polish/ERR_CONNECT_FAIL
-etc/squid/errors/Polish/ERR_DNS_FAIL
-etc/squid/errors/Polish/ERR_FORWARDING_DENIED
-etc/squid/errors/Polish/ERR_FTP_DISABLED
-etc/squid/errors/Polish/ERR_FTP_FAILURE
-etc/squid/errors/Polish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Polish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Polish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Polish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Polish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Polish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Polish/ERR_INVALID_REQ
-etc/squid/errors/Polish/ERR_INVALID_URL
-etc/squid/errors/Polish/ERR_LIFETIME_EXP
-etc/squid/errors/Polish/ERR_NO_RELAY
-etc/squid/errors/Polish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Polish/ERR_READ_ERROR
-etc/squid/errors/Polish/ERR_READ_TIMEOUT
-etc/squid/errors/Polish/ERR_SHUTTING_DOWN
-etc/squid/errors/Polish/ERR_SOCKET_FAILURE
-etc/squid/errors/Polish/ERR_TOO_BIG
-etc/squid/errors/Polish/ERR_UNSUP_REQ
-etc/squid/errors/Polish/ERR_URN_RESOLVE
-etc/squid/errors/Polish/ERR_WRITE_ERROR
-etc/squid/errors/Polish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Portuguese/ERR_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CANNOT_FORWARD
-etc/squid/errors/Portuguese/ERR_CONNECT_FAIL
-etc/squid/errors/Portuguese/ERR_DNS_FAIL
-etc/squid/errors/Portuguese/ERR_FORWARDING_DENIED
-etc/squid/errors/Portuguese/ERR_FTP_DISABLED
-etc/squid/errors/Portuguese/ERR_FTP_FAILURE
-etc/squid/errors/Portuguese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Portuguese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Portuguese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Portuguese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Portuguese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Portuguese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Portuguese/ERR_INVALID_REQ
-etc/squid/errors/Portuguese/ERR_INVALID_URL
-etc/squid/errors/Portuguese/ERR_LIFETIME_EXP
-etc/squid/errors/Portuguese/ERR_NO_RELAY
-etc/squid/errors/Portuguese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Portuguese/ERR_READ_ERROR
-etc/squid/errors/Portuguese/ERR_READ_TIMEOUT
-etc/squid/errors/Portuguese/ERR_SHUTTING_DOWN
-etc/squid/errors/Portuguese/ERR_SOCKET_FAILURE
-etc/squid/errors/Portuguese/ERR_TOO_BIG
-etc/squid/errors/Portuguese/ERR_UNSUP_REQ
-etc/squid/errors/Portuguese/ERR_URN_RESOLVE
-etc/squid/errors/Portuguese/ERR_WRITE_ERROR
-etc/squid/errors/Portuguese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Romanian/ERR_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CANNOT_FORWARD
-etc/squid/errors/Romanian/ERR_CONNECT_FAIL
-etc/squid/errors/Romanian/ERR_DNS_FAIL
-etc/squid/errors/Romanian/ERR_FORWARDING_DENIED
-etc/squid/errors/Romanian/ERR_FTP_DISABLED
-etc/squid/errors/Romanian/ERR_FTP_FAILURE
-etc/squid/errors/Romanian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Romanian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Romanian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Romanian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Romanian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Romanian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Romanian/ERR_INVALID_REQ
-etc/squid/errors/Romanian/ERR_INVALID_URL
-etc/squid/errors/Romanian/ERR_LIFETIME_EXP
-etc/squid/errors/Romanian/ERR_NO_RELAY
-etc/squid/errors/Romanian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Romanian/ERR_READ_ERROR
-etc/squid/errors/Romanian/ERR_READ_TIMEOUT
-etc/squid/errors/Romanian/ERR_SHUTTING_DOWN
-etc/squid/errors/Romanian/ERR_SOCKET_FAILURE
-etc/squid/errors/Romanian/ERR_TOO_BIG
-etc/squid/errors/Romanian/ERR_UNSUP_REQ
-etc/squid/errors/Romanian/ERR_URN_RESOLVE
-etc/squid/errors/Romanian/ERR_WRITE_ERROR
-etc/squid/errors/Romanian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Russian-1251/ERR_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CANNOT_FORWARD
-etc/squid/errors/Russian-1251/ERR_CONNECT_FAIL
-etc/squid/errors/Russian-1251/ERR_DNS_FAIL
-etc/squid/errors/Russian-1251/ERR_FORWARDING_DENIED
-etc/squid/errors/Russian-1251/ERR_FTP_DISABLED
-etc/squid/errors/Russian-1251/ERR_FTP_FAILURE
-etc/squid/errors/Russian-1251/ERR_FTP_FORBIDDEN
-etc/squid/errors/Russian-1251/ERR_FTP_NOT_FOUND
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_CREATED
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_ERROR
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Russian-1251/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Russian-1251/ERR_INVALID_REQ
-etc/squid/errors/Russian-1251/ERR_INVALID_URL
-etc/squid/errors/Russian-1251/ERR_LIFETIME_EXP
-etc/squid/errors/Russian-1251/ERR_NO_RELAY
-etc/squid/errors/Russian-1251/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Russian-1251/ERR_READ_ERROR
-etc/squid/errors/Russian-1251/ERR_READ_TIMEOUT
-etc/squid/errors/Russian-1251/ERR_SHUTTING_DOWN
-etc/squid/errors/Russian-1251/ERR_SOCKET_FAILURE
-etc/squid/errors/Russian-1251/ERR_TOO_BIG
-etc/squid/errors/Russian-1251/ERR_UNSUP_REQ
-etc/squid/errors/Russian-1251/ERR_URN_RESOLVE
-etc/squid/errors/Russian-1251/ERR_WRITE_ERROR
-etc/squid/errors/Russian-1251/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Russian-koi8-r/ERR_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CANNOT_FORWARD
-etc/squid/errors/Russian-koi8-r/ERR_CONNECT_FAIL
-etc/squid/errors/Russian-koi8-r/ERR_DNS_FAIL
-etc/squid/errors/Russian-koi8-r/ERR_FORWARDING_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_DISABLED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_FAILURE
-etc/squid/errors/Russian-koi8-r/ERR_FTP_FORBIDDEN
-etc/squid/errors/Russian-koi8-r/ERR_FTP_NOT_FOUND
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_CREATED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Russian-koi8-r/ERR_INVALID_REQ
-etc/squid/errors/Russian-koi8-r/ERR_INVALID_URL
-etc/squid/errors/Russian-koi8-r/ERR_LIFETIME_EXP
-etc/squid/errors/Russian-koi8-r/ERR_NO_RELAY
-etc/squid/errors/Russian-koi8-r/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Russian-koi8-r/ERR_READ_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_READ_TIMEOUT
-etc/squid/errors/Russian-koi8-r/ERR_SHUTTING_DOWN
-etc/squid/errors/Russian-koi8-r/ERR_SOCKET_FAILURE
-etc/squid/errors/Russian-koi8-r/ERR_TOO_BIG
-etc/squid/errors/Russian-koi8-r/ERR_UNSUP_REQ
-etc/squid/errors/Russian-koi8-r/ERR_URN_RESOLVE
-etc/squid/errors/Russian-koi8-r/ERR_WRITE_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Serbian/ERR_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CANNOT_FORWARD
-etc/squid/errors/Serbian/ERR_CONNECT_FAIL
-etc/squid/errors/Serbian/ERR_DNS_FAIL
-etc/squid/errors/Serbian/ERR_FORWARDING_DENIED
-etc/squid/errors/Serbian/ERR_FTP_DISABLED
-etc/squid/errors/Serbian/ERR_FTP_FAILURE
-etc/squid/errors/Serbian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Serbian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Serbian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Serbian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Serbian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Serbian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Serbian/ERR_INVALID_REQ
-etc/squid/errors/Serbian/ERR_INVALID_URL
-etc/squid/errors/Serbian/ERR_LIFETIME_EXP
-etc/squid/errors/Serbian/ERR_NO_RELAY
-etc/squid/errors/Serbian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Serbian/ERR_READ_ERROR
-etc/squid/errors/Serbian/ERR_READ_TIMEOUT
-etc/squid/errors/Serbian/ERR_SHUTTING_DOWN
-etc/squid/errors/Serbian/ERR_SOCKET_FAILURE
-etc/squid/errors/Serbian/ERR_TOO_BIG
-etc/squid/errors/Serbian/ERR_UNSUP_REQ
-etc/squid/errors/Serbian/ERR_URN_RESOLVE
-etc/squid/errors/Serbian/ERR_WRITE_ERROR
-etc/squid/errors/Serbian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Simplify_Chinese/ERR_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CANNOT_FORWARD
-etc/squid/errors/Simplify_Chinese/ERR_CONNECT_FAIL
-etc/squid/errors/Simplify_Chinese/ERR_DNS_FAIL
-etc/squid/errors/Simplify_Chinese/ERR_FORWARDING_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_DISABLED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_FAILURE
-etc/squid/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Simplify_Chinese/ERR_INVALID_REQ
-etc/squid/errors/Simplify_Chinese/ERR_INVALID_URL
-etc/squid/errors/Simplify_Chinese/ERR_LIFETIME_EXP
-etc/squid/errors/Simplify_Chinese/ERR_NO_RELAY
-etc/squid/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Simplify_Chinese/ERR_READ_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_READ_TIMEOUT
-etc/squid/errors/Simplify_Chinese/ERR_SHUTTING_DOWN
-etc/squid/errors/Simplify_Chinese/ERR_SOCKET_FAILURE
-etc/squid/errors/Simplify_Chinese/ERR_TOO_BIG
-etc/squid/errors/Simplify_Chinese/ERR_UNSUP_REQ
-etc/squid/errors/Simplify_Chinese/ERR_URN_RESOLVE
-etc/squid/errors/Simplify_Chinese/ERR_WRITE_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Slovak/ERR_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CANNOT_FORWARD
-etc/squid/errors/Slovak/ERR_CONNECT_FAIL
-etc/squid/errors/Slovak/ERR_DNS_FAIL
-etc/squid/errors/Slovak/ERR_FORWARDING_DENIED
-etc/squid/errors/Slovak/ERR_FTP_DISABLED
-etc/squid/errors/Slovak/ERR_FTP_FAILURE
-etc/squid/errors/Slovak/ERR_FTP_FORBIDDEN
-etc/squid/errors/Slovak/ERR_FTP_NOT_FOUND
-etc/squid/errors/Slovak/ERR_FTP_PUT_CREATED
-etc/squid/errors/Slovak/ERR_FTP_PUT_ERROR
-etc/squid/errors/Slovak/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Slovak/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Slovak/ERR_INVALID_REQ
-etc/squid/errors/Slovak/ERR_INVALID_URL
-etc/squid/errors/Slovak/ERR_LIFETIME_EXP
-etc/squid/errors/Slovak/ERR_NO_RELAY
-etc/squid/errors/Slovak/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Slovak/ERR_READ_ERROR
-etc/squid/errors/Slovak/ERR_READ_TIMEOUT
-etc/squid/errors/Slovak/ERR_SHUTTING_DOWN
-etc/squid/errors/Slovak/ERR_SOCKET_FAILURE
-etc/squid/errors/Slovak/ERR_TOO_BIG
-etc/squid/errors/Slovak/ERR_UNSUP_REQ
-etc/squid/errors/Slovak/ERR_URN_RESOLVE
-etc/squid/errors/Slovak/ERR_WRITE_ERROR
-etc/squid/errors/Slovak/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Spanish/ERR_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CANNOT_FORWARD
-etc/squid/errors/Spanish/ERR_CONNECT_FAIL
-etc/squid/errors/Spanish/ERR_DNS_FAIL
-etc/squid/errors/Spanish/ERR_FORWARDING_DENIED
-etc/squid/errors/Spanish/ERR_FTP_DISABLED
-etc/squid/errors/Spanish/ERR_FTP_FAILURE
-etc/squid/errors/Spanish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Spanish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Spanish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Spanish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Spanish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Spanish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Spanish/ERR_INVALID_REQ
-etc/squid/errors/Spanish/ERR_INVALID_URL
-etc/squid/errors/Spanish/ERR_LIFETIME_EXP
-etc/squid/errors/Spanish/ERR_NO_RELAY
-etc/squid/errors/Spanish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Spanish/ERR_READ_ERROR
-etc/squid/errors/Spanish/ERR_READ_TIMEOUT
-etc/squid/errors/Spanish/ERR_SHUTTING_DOWN
-etc/squid/errors/Spanish/ERR_SOCKET_FAILURE
-etc/squid/errors/Spanish/ERR_TOO_BIG
-etc/squid/errors/Spanish/ERR_UNSUP_REQ
-etc/squid/errors/Spanish/ERR_URN_RESOLVE
-etc/squid/errors/Spanish/ERR_WRITE_ERROR
-etc/squid/errors/Spanish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Swedish/ERR_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CANNOT_FORWARD
-etc/squid/errors/Swedish/ERR_CONNECT_FAIL
-etc/squid/errors/Swedish/ERR_DNS_FAIL
-etc/squid/errors/Swedish/ERR_FORWARDING_DENIED
-etc/squid/errors/Swedish/ERR_FTP_DISABLED
-etc/squid/errors/Swedish/ERR_FTP_FAILURE
-etc/squid/errors/Swedish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Swedish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Swedish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Swedish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Swedish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Swedish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Swedish/ERR_INVALID_REQ
-etc/squid/errors/Swedish/ERR_INVALID_URL
-etc/squid/errors/Swedish/ERR_LIFETIME_EXP
-etc/squid/errors/Swedish/ERR_NO_RELAY
-etc/squid/errors/Swedish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Swedish/ERR_READ_ERROR
-etc/squid/errors/Swedish/ERR_READ_TIMEOUT
-etc/squid/errors/Swedish/ERR_SHUTTING_DOWN
-etc/squid/errors/Swedish/ERR_SOCKET_FAILURE
-etc/squid/errors/Swedish/ERR_TOO_BIG
-etc/squid/errors/Swedish/ERR_UNSUP_REQ
-etc/squid/errors/Swedish/ERR_URN_RESOLVE
-etc/squid/errors/Swedish/ERR_WRITE_ERROR
-etc/squid/errors/Swedish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Traditional_Chinese/ERR_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CANNOT_FORWARD
-etc/squid/errors/Traditional_Chinese/ERR_CONNECT_FAIL
-etc/squid/errors/Traditional_Chinese/ERR_DNS_FAIL
-etc/squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_DISABLED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_FAILURE
-etc/squid/errors/Traditional_Chinese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Traditional_Chinese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Traditional_Chinese/ERR_INVALID_REQ
-etc/squid/errors/Traditional_Chinese/ERR_INVALID_URL
-etc/squid/errors/Traditional_Chinese/ERR_LIFETIME_EXP
-etc/squid/errors/Traditional_Chinese/ERR_NO_RELAY
-etc/squid/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Traditional_Chinese/ERR_READ_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_READ_TIMEOUT
-etc/squid/errors/Traditional_Chinese/ERR_SHUTTING_DOWN
-etc/squid/errors/Traditional_Chinese/ERR_SOCKET_FAILURE
-etc/squid/errors/Traditional_Chinese/ERR_TOO_BIG
-etc/squid/errors/Traditional_Chinese/ERR_UNSUP_REQ
-etc/squid/errors/Traditional_Chinese/ERR_URN_RESOLVE
-etc/squid/errors/Traditional_Chinese/ERR_WRITE_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Turkish/ERR_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CANNOT_FORWARD
-etc/squid/errors/Turkish/ERR_CONNECT_FAIL
-etc/squid/errors/Turkish/ERR_DNS_FAIL
-etc/squid/errors/Turkish/ERR_FORWARDING_DENIED
-etc/squid/errors/Turkish/ERR_FTP_DISABLED
-etc/squid/errors/Turkish/ERR_FTP_FAILURE
-etc/squid/errors/Turkish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Turkish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Turkish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Turkish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Turkish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Turkish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Turkish/ERR_INVALID_REQ
-etc/squid/errors/Turkish/ERR_INVALID_URL
-etc/squid/errors/Turkish/ERR_LIFETIME_EXP
-etc/squid/errors/Turkish/ERR_NO_RELAY
-etc/squid/errors/Turkish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Turkish/ERR_READ_ERROR
-etc/squid/errors/Turkish/ERR_READ_TIMEOUT
-etc/squid/errors/Turkish/ERR_SHUTTING_DOWN
-etc/squid/errors/Turkish/ERR_SOCKET_FAILURE
-etc/squid/errors/Turkish/ERR_TOO_BIG
-etc/squid/errors/Turkish/ERR_UNSUP_REQ
-etc/squid/errors/Turkish/ERR_URN_RESOLVE
-etc/squid/errors/Turkish/ERR_WRITE_ERROR
-etc/squid/errors/Turkish/ERR_ZERO_SIZE_OBJECT
-etc/squid/mib.txt
-@unexec if cmp -s %D/etc/squid/mime.conf %D/etc/squid/mime.conf.default; then rm -f %D/etc/squid/mime.conf; fi
-etc/squid/mime.conf.default
-@exec [ -f %B/mime.conf ] || cp %B/%f %B/mime.conf
-@unexec if cmp -s %D/etc/squid/squid.conf %D/etc/squid/squid.conf.default; then rm -f %D/etc/squid/squid.conf; fi
-etc/squid/squid.conf.default
-@exec [ -f %B/squid.conf ] || cp %B/%f %B/squid.conf
-libexec/cachemgr.cgi
-libexec/diskd
-libexec/unlinkd
-libexec/ip_user_check
-libexec/yp_auth
-libexec/pam_auth
-libexec/ncsa_auth
-libexec/squid_unix_group
 sbin/RunAccel
 sbin/RunCache
 sbin/squidclient
 sbin/squid
-@exec mkdir -p %D/squid/cache
-@exec chown nobody:nogroup %D/squid/cache
-@exec mkdir -p %D/squid/logs
-@exec chown nobody:nogroup %D/squid/logs
-@dirrm etc/squid/errors/Bulgarian
-@dirrm etc/squid/errors/Catalan
-@dirrm etc/squid/errors/Czech
-@dirrm etc/squid/errors/Danish
-@dirrm etc/squid/errors/Dutch
-@dirrm etc/squid/errors/English
-@dirrm etc/squid/errors/Estonian
-@dirrm etc/squid/errors/Finnish
-@dirrm etc/squid/errors/French
-@dirrm etc/squid/errors/German
-@dirrm etc/squid/errors/Hebrew
-@dirrm etc/squid/errors/Hungarian
-@dirrm etc/squid/errors/Italian
-@dirrm etc/squid/errors/Japanese
-@dirrm etc/squid/errors/Korean
-@dirrm etc/squid/errors/Lithuanian
-@dirrm etc/squid/errors/Polish
-@dirrm etc/squid/errors/Portuguese
-@dirrm etc/squid/errors/Romanian
-@dirrm etc/squid/errors/Russian-1251
-@dirrm etc/squid/errors/Russian-koi8-r
-@dirrm etc/squid/errors/Serbian
-@dirrm etc/squid/errors/Simplify_Chinese
-@dirrm etc/squid/errors/Slovak
-@dirrm etc/squid/errors/Spanish
-@dirrm etc/squid/errors/Swedish
-@dirrm etc/squid/errors/Traditional_Chinese
-@dirrm etc/squid/errors/Turkish
-@dirrm etc/squid/icons
-@dirrm etc/squid/errors
-@dirrm etc/squid
-@dirrm squid/logs
-@dirrm squid/cache
-@dirrm squid
+%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES.html
+%%PORTDOCS%%%%DOCSDIR%%/debug-sections.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@comment Start of dynamically generated plist
+@comment End of dynamically generated plist
+@comment These directories are maybe not empty at deinstallation time.
+@comment Since we try to preserve the data in there for updates anyway, be quiet.
+@unexec rmdir %D/etc/squid/icons 2>/dev/null || true
+@unexec rmdir %D/etc/squid/errors 2>/dev/null || true
+@unexec rmdir %D/etc/squid 2>/dev/null || true
+@unexec rmdir %D/squid/logs 2>/dev/null || true
+@unexec rmdir %D/squid/cache 2>/dev/null || true
+@unexec rmdir %D/squid 2>/dev/null || true
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index baf1c842a527..bed437c96f56 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -4,10 +4,31 @@
 #
 # $FreeBSD$
 #
+# Tunables:
+# WITH_SQUID_PINGER
+#   install the external icmp helper program (`pinger') for hierarchy stats and
+#   selection
+# WITH_SQUID_LDAP_AUTH
+#   install external modules for authentication against LDAP servers
+# SQUID_{U,G}ID
+#   Which user/group squid should run as (default: squid/squid).
+#   The user and group will be created if they do not already exist.
+#   NOTE: before version 2.5.4_6, these settings defaulted to
+#   nobody/nogroup.
+#   If you wish to keep these settings, please define SQUID_UID=nobody and
+#   SQUID_GID=nogroup in your make environment before you start the update.
+# SQUID_LANGUAGES
+#   A list of languages for which error page files should be installed
+#   (default: all)
+# SQUID_DEFAULT_LANG
+#   If you define SQUID_LANGUAGES, select which language should be the default
+#   (default: English)
+# SQUID_CONFIGURE_ARGS
+#   Additional configuration options, see below for a list
 
 PORTNAME=	squid
 PORTVERSION=	2.5.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -17,7 +38,6 @@ MASTER_SITES=	\
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.5.STABLE4
-EXTRACT_SUFX=	.tar.bz2
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
@@ -54,89 +74,131 @@ PATCHFILES=	squid-2.5.STABLE4-reconfigure_message.patch \
 		squid-2.5.STABLE4-pinger.patch \
 		squid-2.5.STABLE4-partial_reload.patch \
 		squid-2.5.STABLE4-ldap_tls.patch \
-		squid-2.5.STABLE4-ldap_group_bufsize.patch
+		squid-2.5.STABLE4-ldap_group_bufsize.patch \
+		squid-2.5.STABLE4-http_workarounds.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
 COMMENT=	The successful WWW proxy cache and accelerator
 
+CONFLICTS=	squid-*
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
-# Follow the apache port's lead...
+
+SQUID_UID?=	squid
+SQUID_GID?=	squid
+
+MAN8=		squid.8
+DOCS=		QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
+
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--datadir=${PREFIX}/etc/squid \
+		--libexecdir=${PREFIX}/libexec/squid \
 		--localstatedir=${PREFIX}/squid \
 		--enable-storeio="ufs diskd null" \
 		--enable-removal-policies="lru heap" \
-		--enable-auth=basic --enable-basic-auth-helpers="NCSA PAM YP" \
-		--enable-external-acl-helpers="ip_user unix_group" \
-		--enable-underscores ${SQUID_CONFIGURE_ARGS}
-
-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
-#CONFIGURE_ARGS+= --enable-dlmalloc
-#  - Compile and use the supplied GNUregex routines instead of BSD regex.
-#CONFIGURE_ARGS+= --enable-gnuregex
-#  - Enable simple malloc debugging
-#CONFIGURE_ARGS+= --enable-xmalloc-debug
-#  - Detailed trace of memory allocations
-#CONFIGURE_ARGS+= --enable-xmalloc-debug-count
-#  - Show malloc statistics in cachemgr status pages
-#CONFIGURE_ARGS+= --enable-xmalloc-statistics
-#  - Enable CARP support
-#CONFIGURE_ARGS+= --enable-carp
-#  - Enable ICMP pinging for heirarchy stats and selection
-#CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay pools to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-pools
-#  - Enable generic memory use tracing
-#CONFIGURE_ARGS+= --enable-mem-gen-trace
-#  - Enable logging of the User-Agent header
-#CONFIGURE_ARGS+= --enable-useragent-log
-#  - Disable Web Cache Coordination Protocol
-#CONFIGURE_ARGS+= --disable-wccp
-#  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent-hack
-#  - Turn on SNMP server support
-#CONFIGURE_ARGS+= --enable-snmp
-#  - Turn on SSL server support for reverse proxies
-#CONFIGURE_ARGS+= --enable-ssl
-#  - Optimize time updates to one per second rather than calling gettimeofday()
-#CONFIGURE_ARGS+= --enable-time-hack
-#  - Set an explicit hostname in cachemgr.cgi
-#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-#  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
-#    assigned IP addresses)
-#CONFIGURE_ARGS+= --enable-arp-acl
-#  - Enable HTCP protocol
-#CONFIGURE_ARGS+= --enable-htcp
-#  - Enable Forw/Via database
-#CONFIGURE_ARGS+= --enable-forw-via-db
-#  - 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
-#  (--enable-poll is not needed, it's detected correctly on 3.0)
-#  - Strict HTTP compliance
-#CONFIGURE_ARGS+= --disable-http-violations
-#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
-#CONFIGURE_ARGS+= --enable-ipf-transparent
-# (--enable-leakfinder is a developer support tool only)
-#  - Compile out code that does optional Ident (RFC931) lookups
-#CONFIGURE_ARGS+= --disable-ident-lookups
-#  - Disable squid's internal async DNS lookup code.
-#CONFIGURE_ARGS+= --disable-internal-dns
-#  - Use truncate() rather than unlink()
-#CONFIGURE_ARGS+= --enable-truncate
-#  - accept the illegal '_' character in hostnames.
-#CONFIGURE_ARGS+= --enable-underscores
-#  - Enable control of different heap replacement algorithms at runtime.
-#CONFIGURE_ARGS+= --enable-removal-policies
+		--enable-underscores
+
+.if defined(WITH_SQUID_PINGER)
+CONFIGURE_ARGS+=	--enable-icmp
+.endif
+
+# Authentication methods and modules:
+
+basic_auth=	NCSA PAM YP MSNT winbind
+external_acl=	ip_user unix_group wbinfo_group winbind_group
+MAN8+=		pam_auth.8 squid_unix_group.8
+.if defined(WITH_SQUID_LDAP_AUTH)
+USE_OPENLDAP=	yes
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+MAN8+=		squid_ldap_auth.8 squid_ldap_group.8
+basic_auth+=	LDAP
+external_acl+=	ldap_group
+.endif
+CONFIGURE_ARGS+=	--enable-auth="basic ntlm digest" \
+			--enable-basic-auth-helpers="${basic_auth}" \
+			--enable-digest-auth-helpers="password" \
+			--enable-external-acl-helpers="${external_acl}" \
+			--enable-ntlm-auth-helpers="winbind"
+
+# Languages:
+#
+# If you do not define SQUID_LANGUAGES yourself, all available language files
+# will be installed; the default language will be english.
+
+SQUID_LANGUAGES?=	\
+	Bulgarian Catalan Czech Danish Dutch English Estonian Finnish      \
+	French German Hebrew Hungarian Italian Japanese Korean Lithuanian  \
+	Polish Portuguese Romanian Russian-1251 Russian-koi8-r Serbian     \
+	Simplify_Chinese Slovak Spanish Swedish Traditional_Chinese Turkish
+SQUID_DEFAULT_LANG?=	English
+CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
+			--enable-default-err-language=${SQUID_DEFAULT_LANG}
+
+# Other configure options you might want to set using SQUID_CONFIGURE_ARGS:
+# Please see the configure script in the squid source distribution for a
+# complete list.
+#
+# --enable-dlmalloc
+#  Compile and use the malloc package from Doug Lea
+# --enable-gnuregex
+#  Compile and use the supplied GNUregex routines instead of BSD regex.
+# --enable-xmalloc-statistics
+#  Show malloc statistics in status page
+# --enable-carp
+#  Enable CARP support
+# --enable-delay-pools
+#  Enable delay pools to limit bandwidth usage
+# --enable-useragent-log
+#  Enable logging of the User-Agent header
+# --disable-wccp
+#  Disable Web Cache Coordination Protocol
+# --enable-snmp
+#  Turn on SNMP server support
+# --enable-ssl
+#  Turn on SSL server support for reverse proxies
+# --enable-time-hack
+#  Optimize time updates to one per second rather than calling gettimeofday()
+# --enable-cachemgr-hostname=some.hostname
+#  Set an explicit hostname in cachemgr.cgi
+# --enable-arp-acl
+#  Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+#  assigned IP addresses)
+# --enable-htcp
+#  Enable HTCP protocol
+# --enable-forw-via-db
+#  Enable Forw/Via database
+# --enable-cache-digests
+#  Use Cache Digests - see http://www.squid-cache.org/Doc/FAQ/FAQ-16.html
+# --disable-http-violations
+#  Strict HTTP compliance
+# --enable-ipf-transparent
+#  Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#  (Note: this is currently broken due to ipf headers not being installed to
+#  the base system, see PRs ports/60700 and misc/44148 for details)
+#  Note: see http://www.squid-cache.org/Doc/FAQ/FAQ-17.html for information
+#  about how to do transparent proxying with ipfw(8).
+# --disable-ident-lookups
+#  Compile out code that does optional Ident (RFC931) lookups
+# --disable-internal-dns
+#  Install the old external "dnsserver" binary
+# --enable-truncate
+#  Use truncate() rather than unlink()
+# --disable-hostname-checks
+#  Squid by default rejects any host names with odd characters in their name
+#  to conform with internet standards. If you disagree with this you may use
+#  this switch to turn off any such checks, provided that the resolver used by
+#  Squid does not reject such host names. This may be required to participate
+#  in testbeds for international domain names.
+# --disable-unlinkd
+#  Do not use "unlinkd"
+# --enable-stacktraces
+#  Enable automatic call backtrace on fatal errors
+
+CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@@ -145,37 +207,53 @@ post-patch:
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
+pre-configure:
+	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
+	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' ${WRKSRC}/src/cf.data.pre
+
+pre-install:
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	    -e 's|%%SQUID_UID%%|${SQUID_UID}|g' ${FILESDIR}/squid.sh \
+	    >${WRKDIR}/squid.sh
+
+pre-su-install:
+	@${SETENV} SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID} \
+	    PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+
 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 sbin_file in client squid
-	if [ -f ${PREFIX}/sbin/${sbin_file} ] ; then \
-		${STRIP_CMD} ${PREFIX}/sbin/${sbin_file} ; \
-	fi
-.endfor
-.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			\
-		${MKDIR} ${PREFIX}/squid/logs;		  	\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/logs;   \
-	fi
-	@if [ ! -d ${PREFIX}/squid/cache ]; then		\
-		${MKDIR} ${PREFIX}/squid/cache;			\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/cache;  \
-	fi
-	@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; \
-	fi
+.if defined(WITH_SQUID_PINGER)
+	${CHMOD} 4710 ${PREFIX}/libexec/squid/pinger; \
+	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
+.endif
+	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
+.if exists(${PREFIX}/etc/squid/errors/Lithuanian)
 # Work around the fact that the errorpages.patch creates files in
 # an "Attic" subdir:
 	@${FIND} ${WRKSRC}/errors/Lithuanian/Attic -type f \
-	-exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \;
+   	    -exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \;
+.endif
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+# Generate parts of pkg-plist on the fly:
+	@cd ${PREFIX} && ${FIND} libexec/squid -type f -o -type l \
+	    >${WRKDIR}/plist.dynamic
+	@${ECHO_CMD} "@dirrm libexec/squid" >>${WRKDIR}/plist.dynamic
+# Only register what we should have installed, there may be local additions
+# present:
+.for d in ${SQUID_LANGUAGES}
+	@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f \
+	    >>${WRKDIR}/plist.dynamic
+	@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
+.endfor
+	@${ECHO_CMD} "r ${TMPPLIST}" >${WRKDIR}/ex.script
+	@${ECHO_CMD} "/Start of dynamically generated plist" >>${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${WRKDIR}/plist.dynamic" >>${WRKDIR}/ex.script
+	@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
+	@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
+	@cd ${WRKDIR} && ex <ex.script >/dev/null
 
 .include <bsd.port.mk>
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index 76f9e296de4d..893a0e19d67a 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -33,3 +33,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5
 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34
 MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284
 MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c
+MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac
diff --git a/www/squid25/files/patch-src-cf.data.pre b/www/squid25/files/patch-src-cf.data.pre
new file mode 100644
index 000000000000..2a8e1eff429f
--- /dev/null
+++ b/www/squid25/files/patch-src-cf.data.pre
@@ -0,0 +1,20 @@
+--- src/cf.data.pre.orig	Thu May  1 14:07:51 2003
++++ src/cf.data.pre	Thu May  1 14:13:12 2003
+@@ -2325,7 +2325,7 @@
+ 
+ NAME: cache_effective_user
+ TYPE: string
+-DEFAULT: nobody
++DEFAULT: %%SQUID_UID%%
+ LOC: Config.effectiveUser
+ DOC_NONE
+ 
+@@ -2337,7 +2337,7 @@
+ 
+ 	If you start Squid as root, it will change its effective/real
+ 	UID/GID to the UID/GID specified below.  The default is to
+-	change to UID to nobody.  If you define cache_effective_user,
++	change to UID to %%SQUID_UID%%.  If you define cache_effective_user,
+ 	but not cache_effective_group, Squid sets the GID the
+ 	effective user's default group ID (taken from the password
+ 	file).
diff --git a/www/squid25/files/squid.sh b/www/squid25/files/squid.sh
index 40f655b04f27..ec92a10bc3fc 100644
--- a/www/squid25/files/squid.sh
+++ b/www/squid25/files/squid.sh
@@ -1,26 +1,75 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: squid
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD
+# 
+# Note:
+# If you are running an rcNG-System (i.e. FreeBSD 5 and later or after
+# having installed the rc_subr-port on an earlier system) you must set
+# "squid_enable=YES" in either /etc/rc.conf, /etc/rc.conf.local or
+# /etc/rc.conf.d/squid to make this script actually do something. There
+# you can also set squid_chdir, squid_user, and squid_flags.
+#
+# Please see squid(8), rc.conf(5) and rc(8) for further details.
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+unset rcNG
+name="squid"
+command=%%PREFIX%%/sbin/squid
+extra_commands=reload
+reload_cmd="${command} -k reconfigure"
+stop_cmd="${command} -k shutdown"
+: ${squid_chdir:=%%PREFIX%%/squid/logs}
+: ${squid_user:=%%SQUID_UID%%}
+: ${squid_flags:="-D"}
+default_config=%%PREFIX%%/etc/squid/squid.conf
 
-case "$1" in
-start)
-	if [ -x ${PREFIX}/sbin/squid -a -f ${PREFIX}/etc/squid/squid.conf ]; then
-		(cd /${PREFIX}/squid/logs; ${PREFIX}/sbin/squid >/dev/null 2>&1 &) ; echo -n ' squid'
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr && rcNG=yes
+else
+	if [ -f %%PREFIX%%/etc/rc.subr ]; then
+		. %%PREFIX%%/etc/rc.subr && rcNG=yes
 	fi
-	;;
-stop)
-		${PREFIX}/sbin/squid -k shutdown 2>&1
-		# Uncomment this if you'd like the system to (attempt to
-		# wait for) squid to shut down cleanly
-		#echo "Sleeping for 45 seconds to allow squid to shutdown.."
-		#sleep 45 
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
+fi
 
-exit 0
+if [ "${rcNG}" ]; then
+	rcvar=`set_rcvar`
+	load_rc_config ${name}
+	# check that squid's default configuration is present when
+	# squid_flags is not set. We assume that you specify at
+	# least the path to your non-default configuration with
+	# '-f /path/to/config.file' in squid_flags if you delete this file.
+	if [ -z "${squid_flags}" ]; then
+		required_files=${default_config}
+	fi
+	required_dirs=${squid_chdir}
+	run_rc_command "$1"
+else
+	case $1 in
+	start)
+		if [ -x "${command}" -a \
+			\( -f "${default_config}" -o "${squid_flags}" \) ]; then
+			echo -n ' squid'
+			(cd ${squid_chdir} && exec su -fm ${squid_user} -c \
+				"${command} ${squid_flags}")
+		fi
+		;;
+	stop)
+		if [ -x "${command}" ]; then
+			echo -n ' squid'
+			${stop_cmd}
+			while ps -xcU ${squid_user} | grep -q squid; do
+				sleep 2
+			done
+		fi
+		;;
+		*)
+		echo "usage: `basename $0` {start|stop}" >&2
+		exit 64
+		;;
+	esac
+	exit 0
+fi
diff --git a/www/squid25/pkg-deinstall b/www/squid25/pkg-deinstall
new file mode 100644
index 000000000000..3a95b4f50e0d
--- /dev/null
+++ b/www/squid25/pkg-deinstall
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/bin:/usr/bin:/usr/sbin
+pkgname=$1
+
+case $2 in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	echo "===> post-deinstallation information for ${pkgname}"
+	echo ""
+	echo "     Please note that ${pkgname} was not completely removed"
+	echo "     from this system."
+	echo ""
+	echo "     The cache and log directories, squid's user account,"
+	echo "     and any modified configuration files have been preserved"
+	echo "     in case you want to install an updated version of squid"
+	echo "     on this system. You must remove them manually if you do"
+	echo "     not want to use squid any longer."
+	echo ""
+	;;
+*)
+	exit 64
+	;;
+esac
+exit 0
diff --git a/www/squid25/pkg-descr b/www/squid25/pkg-descr
index a030d6c271b8..f2674655d01e 100644
--- a/www/squid25/pkg-descr
+++ b/www/squid25/pkg-descr
@@ -9,9 +9,15 @@ 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.
 
-FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
-But you aren't lost in space: there is a mailing list,
-<squid-users@squid-cache.org>, where you will find some support and help.
-We also _strongly_ suggest you to examine Web pages noted above.
+Please see this port's Makefile for a list of compilation options.
+
+*** UPDATE NOTICE ***
+Starting from Version 2.5.4_6 the default user:group changed from
+nobody:nogroup to squid:squid. You can restore the old behavior
+of this port by specifying SQUID_UID=nobody SQUID_GID=nogroup in
+your make environment. Helper applications are now installed to
+$PREFIX/libexec/squid instead of $PREFIX/libexec, too.
+
+You can find further information on the project's website at
 
 WWW: http://www.squid-cache.org/
diff --git a/www/squid25/pkg-install b/www/squid25/pkg-install
index 7efd84949fd2..3b16eee43fda 100644
--- a/www/squid25/pkg-install
+++ b/www/squid25/pkg-install
@@ -1,44 +1,105 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
 
-PKGNAME=$1
+PATH=/bin:/usr/bin:/usr/sbin
+pkgname=$1
+squid_base=${PKG_PREFIX:-/usr/local}/squid
+squid_confdir=${PKG_PREFIX:-/usr/local}/etc/squid
+squid_user=${SQUID_UID:=squid}
+squid_group=${SQUID_GID:=squid}
+squid_gid=3128
+squid_uid=3128
 
 case $2 in
-    PRE-INSTALL)
+PRE-INSTALL)
+	echo "===> Pre-installation configuration for ${pkgname}"
+	if ! pw groupshow ${squid_group} -q >/dev/null ; then
+		while pw groupshow -g ${squid_gid} -q >/dev/null; do
+			squid_gid=`expr ${squid_gid} + 1`
+		done
+		echo "There is no group '${squid_group}' on this system, so I will try to create it:"
+		if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
+			echo "Failed to create group \"${squid_group}\"!" >&2
+			echo "Please create it manually." >&2
+			exit 1
+		else
+			echo "Group '${squid_group}' created successfully:"
+		fi
+	else
+		echo "I will use the existing group '${squid_group}':"
+	fi
+	pw groupshow ${squid_group}
+	if ! pw usershow ${squid_user} -q >/dev/null ; then
+		while pw usershow -u ${squid_uid} -q >/dev/null; do
+			squid_uid=`expr ${squid_uid} + 1`
+		done
+		echo "There is no account '${squid_user}' on this system, so I will try to create it:"
+		if ! pw useradd ${squid_user} -u ${squid_uid} -q \
+	  	    -c "squid caching-proxy pseudo user" -g ${squid_group} \
+		    -d "${squid_base}" -s "/sbin/nologin" -h - ; then
+			echo "Failed to create user '${squid_user}'!" >&2
+			echo "Please create it manually." >&2
+			exit 1
+		else
+			echo "User '${squid_user}' created successfully:"
+		fi
+	else
+		echo "I will use the existing user '${squid_user}':"
+	fi
+	pw usershow ${squid_user}
+	for dir in cache logs; do
+	if [ ! -d ${squid_base}/${dir} ]; then
+		echo "Creating ${squid_base}/${dir}..."
+		install -d -o ${squid_user} -g ${squid_group} \
+		    -m 0750 ${squid_base}/${dir}
+	fi
+	done
+	if [ ! -d ${squid_confdir} ]; then
+		echo "Creating ${squid_confdir}..."
+		install -d -o root -g ${squid_group} \
+		    -m 0750 ${squid_confdir}
+	fi
 	;;
-    POST-INSTALL)
-	echo "==> Post-installation configuration of ${PKGNAME}"
+POST-INSTALL)
+	for file in mime.conf squid.conf; do
+		if [ ! -f ${squid_confdir}/${file} \
+		    -a -f ${squid_confdir}/${file}.default ]; then
+		echo "Creating ${file} from default..."
+		install -c -o root -g ${squid_group} -m 0640 \
+		    ${squid_confdir}/${file}.default ${squid_confdir}/${file}
+	fi
+	done
+
+	echo "===> Post-installation informations for ${pkgname}"
+	echo ""
+	echo "     o You can find the configuration files for this package"
+	echo "       in the directory ${squid_confdir}."
 	echo ""
-	echo "    o you DO need running nameservice to start and run ${PKGNAME}"
+	echo "     o A cache directory has been created in ${squid_base}/cache."
+	echo "       Log files will be written to ${squid_base}/logs."
 	echo ""
-	echo "    o use the ${PKGNAME} proxy and caching WWW Server by"
-	echo "      configuring your WWW Navigator (Netscape, Mosaic,...)"
-	echo "      to use it as a proxy server."
+	echo "     o The default configuration will deny everyone access to the"
+	echo "       proxy service. Edit the \"http_access\" directives in"
+	echo "       ${squid_confdir}/squid.conf to suit your needs."
 	echo ""
-	echo "    o Note that before you can run ${PKGNAME} you will"
-	echo "      need to initialise the cache directory."
-	echo "      You can do this by typing \"squid -z\"."
+	echo "     o If you never ran squid on this system before, you need to"
+	echo "       initialize the cache directory by running \"squid -z\""
+	echo "       as 'root' or '${squid_user}' before starting squid."
 	echo ""
-	echo "==> Press Enter to edit the ${PKGNAME} config file."
-	echo "    (The defaults are reasonable; and the file is well commented)"
 	tput md
-	echo "    You'd certainly like to pay attention to the"
-	echo "    ACTUAL locations of cache \"spool\", logfiles, pidfile!"
+	echo "     *** UPDATE NOTICE ***"
+	echo ""
+	echo "     Starting with version 2.5.4_6, all helper applications are"
+	echo "     installed to ${PKG_PREFIX}/libexec/squid instead of"
+	echo "     ${PKG_PREFIX}/libexec."
+	echo "     Please check your squid.conf and update it if necessary."
 	tput me
-	if [ -z "${PACKAGE_BUILDING}" ]; then read skip; fi
-	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 ""
 	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
+*)
+	exit 64
 	;;
 esac
 exit 0
diff --git a/www/squid25/pkg-plist b/www/squid25/pkg-plist
index fa28b0b99d1d..f04c2fc92436 100644
--- a/www/squid25/pkg-plist
+++ b/www/squid25/pkg-plist
@@ -1,4 +1,12 @@
+@comment $FreeBSD$
 etc/rc.d/squid.sh
+etc/squid/mib.txt
+@unexec if cmp -s %D/etc/squid/mime.conf %D/etc/squid/mime.conf.default; then rm -f %D/etc/squid/mime.conf; fi
+etc/squid/mime.conf.default
+@unexec if cmp -s %D/etc/squid/msntauth.conf %D/etc/squid/msntauth.conf.default; then rm -f %D/etc/squid/msntauth.conf; fi
+etc/squid/msntauth.conf.default
+@unexec if cmp -s %D/etc/squid/squid.conf %D/etc/squid/squid.conf.default; then rm -f %D/etc/squid/squid.conf; fi
+etc/squid/squid.conf.default
 etc/squid/icons/anthony-binhex.gif
 etc/squid/icons/anthony-bomb.gif
 etc/squid/icons/anthony-box.gif
@@ -26,872 +34,22 @@ etc/squid/icons/anthony-text.gif
 etc/squid/icons/anthony-unknown.gif
 etc/squid/icons/anthony-xbm.gif
 etc/squid/icons/anthony-xpm.gif
-etc/squid/errors/Bulgarian/ERR_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CANNOT_FORWARD
-etc/squid/errors/Bulgarian/ERR_CONNECT_FAIL
-etc/squid/errors/Bulgarian/ERR_DNS_FAIL
-etc/squid/errors/Bulgarian/ERR_FORWARDING_DENIED
-etc/squid/errors/Bulgarian/ERR_FTP_DISABLED
-etc/squid/errors/Bulgarian/ERR_FTP_FAILURE
-etc/squid/errors/Bulgarian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Bulgarian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Bulgarian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Bulgarian/ERR_INVALID_REQ
-etc/squid/errors/Bulgarian/ERR_INVALID_URL
-etc/squid/errors/Bulgarian/ERR_LIFETIME_EXP
-etc/squid/errors/Bulgarian/ERR_NO_RELAY
-etc/squid/errors/Bulgarian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Bulgarian/ERR_READ_ERROR
-etc/squid/errors/Bulgarian/ERR_READ_TIMEOUT
-etc/squid/errors/Bulgarian/ERR_SHUTTING_DOWN
-etc/squid/errors/Bulgarian/ERR_SOCKET_FAILURE
-etc/squid/errors/Bulgarian/ERR_TOO_BIG
-etc/squid/errors/Bulgarian/ERR_UNSUP_REQ
-etc/squid/errors/Bulgarian/ERR_URN_RESOLVE
-etc/squid/errors/Bulgarian/ERR_WRITE_ERROR
-etc/squid/errors/Bulgarian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Catalan/ERR_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CANNOT_FORWARD
-etc/squid/errors/Catalan/ERR_CONNECT_FAIL
-etc/squid/errors/Catalan/ERR_DNS_FAIL
-etc/squid/errors/Catalan/ERR_FORWARDING_DENIED
-etc/squid/errors/Catalan/ERR_FTP_DISABLED
-etc/squid/errors/Catalan/ERR_FTP_FAILURE
-etc/squid/errors/Catalan/ERR_FTP_FORBIDDEN
-etc/squid/errors/Catalan/ERR_FTP_NOT_FOUND
-etc/squid/errors/Catalan/ERR_FTP_PUT_CREATED
-etc/squid/errors/Catalan/ERR_FTP_PUT_ERROR
-etc/squid/errors/Catalan/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Catalan/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Catalan/ERR_INVALID_REQ
-etc/squid/errors/Catalan/ERR_INVALID_URL
-etc/squid/errors/Catalan/ERR_LIFETIME_EXP
-etc/squid/errors/Catalan/ERR_NO_RELAY
-etc/squid/errors/Catalan/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Catalan/ERR_READ_ERROR
-etc/squid/errors/Catalan/ERR_READ_TIMEOUT
-etc/squid/errors/Catalan/ERR_SHUTTING_DOWN
-etc/squid/errors/Catalan/ERR_SOCKET_FAILURE
-etc/squid/errors/Catalan/ERR_TOO_BIG
-etc/squid/errors/Catalan/ERR_UNSUP_REQ
-etc/squid/errors/Catalan/ERR_URN_RESOLVE
-etc/squid/errors/Catalan/ERR_WRITE_ERROR
-etc/squid/errors/Catalan/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Czech/ERR_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CANNOT_FORWARD
-etc/squid/errors/Czech/ERR_CONNECT_FAIL
-etc/squid/errors/Czech/ERR_DNS_FAIL
-etc/squid/errors/Czech/ERR_FORWARDING_DENIED
-etc/squid/errors/Czech/ERR_FTP_DISABLED
-etc/squid/errors/Czech/ERR_FTP_FAILURE
-etc/squid/errors/Czech/ERR_FTP_FORBIDDEN
-etc/squid/errors/Czech/ERR_FTP_NOT_FOUND
-etc/squid/errors/Czech/ERR_FTP_PUT_CREATED
-etc/squid/errors/Czech/ERR_FTP_PUT_ERROR
-etc/squid/errors/Czech/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Czech/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Czech/ERR_INVALID_REQ
-etc/squid/errors/Czech/ERR_INVALID_URL
-etc/squid/errors/Czech/ERR_LIFETIME_EXP
-etc/squid/errors/Czech/ERR_NO_RELAY
-etc/squid/errors/Czech/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Czech/ERR_READ_ERROR
-etc/squid/errors/Czech/ERR_READ_TIMEOUT
-etc/squid/errors/Czech/ERR_SHUTTING_DOWN
-etc/squid/errors/Czech/ERR_SOCKET_FAILURE
-etc/squid/errors/Czech/ERR_TOO_BIG
-etc/squid/errors/Czech/ERR_UNSUP_REQ
-etc/squid/errors/Czech/ERR_URN_RESOLVE
-etc/squid/errors/Czech/ERR_WRITE_ERROR
-etc/squid/errors/Czech/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Danish/ERR_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CANNOT_FORWARD
-etc/squid/errors/Danish/ERR_CONNECT_FAIL
-etc/squid/errors/Danish/ERR_DNS_FAIL
-etc/squid/errors/Danish/ERR_FORWARDING_DENIED
-etc/squid/errors/Danish/ERR_FTP_DISABLED
-etc/squid/errors/Danish/ERR_FTP_FAILURE
-etc/squid/errors/Danish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Danish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Danish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Danish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Danish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Danish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Danish/ERR_INVALID_REQ
-etc/squid/errors/Danish/ERR_INVALID_URL
-etc/squid/errors/Danish/ERR_LIFETIME_EXP
-etc/squid/errors/Danish/ERR_NO_RELAY
-etc/squid/errors/Danish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Danish/ERR_READ_ERROR
-etc/squid/errors/Danish/ERR_READ_TIMEOUT
-etc/squid/errors/Danish/ERR_SHUTTING_DOWN
-etc/squid/errors/Danish/ERR_SOCKET_FAILURE
-etc/squid/errors/Danish/ERR_TOO_BIG
-etc/squid/errors/Danish/ERR_UNSUP_REQ
-etc/squid/errors/Danish/ERR_URN_RESOLVE
-etc/squid/errors/Danish/ERR_WRITE_ERROR
-etc/squid/errors/Danish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Dutch/ERR_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CANNOT_FORWARD
-etc/squid/errors/Dutch/ERR_CONNECT_FAIL
-etc/squid/errors/Dutch/ERR_DNS_FAIL
-etc/squid/errors/Dutch/ERR_FORWARDING_DENIED
-etc/squid/errors/Dutch/ERR_FTP_DISABLED
-etc/squid/errors/Dutch/ERR_FTP_FAILURE
-etc/squid/errors/Dutch/ERR_FTP_FORBIDDEN
-etc/squid/errors/Dutch/ERR_FTP_NOT_FOUND
-etc/squid/errors/Dutch/ERR_FTP_PUT_CREATED
-etc/squid/errors/Dutch/ERR_FTP_PUT_ERROR
-etc/squid/errors/Dutch/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Dutch/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Dutch/ERR_INVALID_REQ
-etc/squid/errors/Dutch/ERR_INVALID_URL
-etc/squid/errors/Dutch/ERR_LIFETIME_EXP
-etc/squid/errors/Dutch/ERR_NO_RELAY
-etc/squid/errors/Dutch/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Dutch/ERR_READ_ERROR
-etc/squid/errors/Dutch/ERR_READ_TIMEOUT
-etc/squid/errors/Dutch/ERR_SHUTTING_DOWN
-etc/squid/errors/Dutch/ERR_SOCKET_FAILURE
-etc/squid/errors/Dutch/ERR_TOO_BIG
-etc/squid/errors/Dutch/ERR_UNSUP_REQ
-etc/squid/errors/Dutch/ERR_URN_RESOLVE
-etc/squid/errors/Dutch/ERR_WRITE_ERROR
-etc/squid/errors/Dutch/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/English/ERR_ACCESS_DENIED
-etc/squid/errors/English/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/English/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/English/ERR_CANNOT_FORWARD
-etc/squid/errors/English/ERR_CONNECT_FAIL
-etc/squid/errors/English/ERR_DNS_FAIL
-etc/squid/errors/English/ERR_FORWARDING_DENIED
-etc/squid/errors/English/ERR_FTP_DISABLED
-etc/squid/errors/English/ERR_FTP_FAILURE
-etc/squid/errors/English/ERR_FTP_FORBIDDEN
-etc/squid/errors/English/ERR_FTP_NOT_FOUND
-etc/squid/errors/English/ERR_FTP_PUT_CREATED
-etc/squid/errors/English/ERR_FTP_PUT_ERROR
-etc/squid/errors/English/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/English/ERR_FTP_UNAVAILABLE
-etc/squid/errors/English/ERR_INVALID_REQ
-etc/squid/errors/English/ERR_INVALID_URL
-etc/squid/errors/English/ERR_LIFETIME_EXP
-etc/squid/errors/English/ERR_NO_RELAY
-etc/squid/errors/English/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/English/ERR_READ_ERROR
-etc/squid/errors/English/ERR_READ_TIMEOUT
-etc/squid/errors/English/ERR_SHUTTING_DOWN
-etc/squid/errors/English/ERR_SOCKET_FAILURE
-etc/squid/errors/English/ERR_TOO_BIG
-etc/squid/errors/English/ERR_UNSUP_REQ
-etc/squid/errors/English/ERR_URN_RESOLVE
-etc/squid/errors/English/ERR_WRITE_ERROR
-etc/squid/errors/English/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Estonian/ERR_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CANNOT_FORWARD
-etc/squid/errors/Estonian/ERR_CONNECT_FAIL
-etc/squid/errors/Estonian/ERR_DNS_FAIL
-etc/squid/errors/Estonian/ERR_FORWARDING_DENIED
-etc/squid/errors/Estonian/ERR_FTP_DISABLED
-etc/squid/errors/Estonian/ERR_FTP_FAILURE
-etc/squid/errors/Estonian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Estonian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Estonian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Estonian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Estonian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Estonian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Estonian/ERR_INVALID_REQ
-etc/squid/errors/Estonian/ERR_INVALID_URL
-etc/squid/errors/Estonian/ERR_LIFETIME_EXP
-etc/squid/errors/Estonian/ERR_NO_RELAY
-etc/squid/errors/Estonian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Estonian/ERR_READ_ERROR
-etc/squid/errors/Estonian/ERR_READ_TIMEOUT
-etc/squid/errors/Estonian/ERR_SHUTTING_DOWN
-etc/squid/errors/Estonian/ERR_SOCKET_FAILURE
-etc/squid/errors/Estonian/ERR_TOO_BIG
-etc/squid/errors/Estonian/ERR_UNSUP_REQ
-etc/squid/errors/Estonian/ERR_URN_RESOLVE
-etc/squid/errors/Estonian/ERR_WRITE_ERROR
-etc/squid/errors/Estonian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Finnish/ERR_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CANNOT_FORWARD
-etc/squid/errors/Finnish/ERR_CONNECT_FAIL
-etc/squid/errors/Finnish/ERR_DNS_FAIL
-etc/squid/errors/Finnish/ERR_FORWARDING_DENIED
-etc/squid/errors/Finnish/ERR_FTP_DISABLED
-etc/squid/errors/Finnish/ERR_FTP_FAILURE
-etc/squid/errors/Finnish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Finnish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Finnish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Finnish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Finnish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Finnish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Finnish/ERR_INVALID_REQ
-etc/squid/errors/Finnish/ERR_INVALID_URL
-etc/squid/errors/Finnish/ERR_LIFETIME_EXP
-etc/squid/errors/Finnish/ERR_NO_RELAY
-etc/squid/errors/Finnish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Finnish/ERR_READ_ERROR
-etc/squid/errors/Finnish/ERR_READ_TIMEOUT
-etc/squid/errors/Finnish/ERR_SHUTTING_DOWN
-etc/squid/errors/Finnish/ERR_SOCKET_FAILURE
-etc/squid/errors/Finnish/ERR_TOO_BIG
-etc/squid/errors/Finnish/ERR_UNSUP_REQ
-etc/squid/errors/Finnish/ERR_URN_RESOLVE
-etc/squid/errors/Finnish/ERR_WRITE_ERROR
-etc/squid/errors/Finnish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/French/ERR_ACCESS_DENIED
-etc/squid/errors/French/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/French/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/French/ERR_CANNOT_FORWARD
-etc/squid/errors/French/ERR_CONNECT_FAIL
-etc/squid/errors/French/ERR_DNS_FAIL
-etc/squid/errors/French/ERR_FORWARDING_DENIED
-etc/squid/errors/French/ERR_FTP_DISABLED
-etc/squid/errors/French/ERR_FTP_FAILURE
-etc/squid/errors/French/ERR_FTP_FORBIDDEN
-etc/squid/errors/French/ERR_FTP_NOT_FOUND
-etc/squid/errors/French/ERR_FTP_PUT_CREATED
-etc/squid/errors/French/ERR_FTP_PUT_ERROR
-etc/squid/errors/French/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/French/ERR_FTP_UNAVAILABLE
-etc/squid/errors/French/ERR_INVALID_REQ
-etc/squid/errors/French/ERR_INVALID_URL
-etc/squid/errors/French/ERR_LIFETIME_EXP
-etc/squid/errors/French/ERR_NO_RELAY
-etc/squid/errors/French/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/French/ERR_READ_ERROR
-etc/squid/errors/French/ERR_READ_TIMEOUT
-etc/squid/errors/French/ERR_SHUTTING_DOWN
-etc/squid/errors/French/ERR_SOCKET_FAILURE
-etc/squid/errors/French/ERR_TOO_BIG
-etc/squid/errors/French/ERR_UNSUP_REQ
-etc/squid/errors/French/ERR_URN_RESOLVE
-etc/squid/errors/French/ERR_WRITE_ERROR
-etc/squid/errors/French/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/German/ERR_ACCESS_DENIED
-etc/squid/errors/German/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/German/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/German/ERR_CANNOT_FORWARD
-etc/squid/errors/German/ERR_CONNECT_FAIL
-etc/squid/errors/German/ERR_DNS_FAIL
-etc/squid/errors/German/ERR_FORWARDING_DENIED
-etc/squid/errors/German/ERR_FTP_DISABLED
-etc/squid/errors/German/ERR_FTP_FAILURE
-etc/squid/errors/German/ERR_FTP_FORBIDDEN
-etc/squid/errors/German/ERR_FTP_NOT_FOUND
-etc/squid/errors/German/ERR_FTP_PUT_CREATED
-etc/squid/errors/German/ERR_FTP_PUT_ERROR
-etc/squid/errors/German/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/German/ERR_FTP_UNAVAILABLE
-etc/squid/errors/German/ERR_INVALID_REQ
-etc/squid/errors/German/ERR_INVALID_URL
-etc/squid/errors/German/ERR_LIFETIME_EXP
-etc/squid/errors/German/ERR_NO_RELAY
-etc/squid/errors/German/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/German/ERR_READ_ERROR
-etc/squid/errors/German/ERR_READ_TIMEOUT
-etc/squid/errors/German/ERR_SHUTTING_DOWN
-etc/squid/errors/German/ERR_SOCKET_FAILURE
-etc/squid/errors/German/ERR_TOO_BIG
-etc/squid/errors/German/ERR_UNSUP_REQ
-etc/squid/errors/German/ERR_URN_RESOLVE
-etc/squid/errors/German/ERR_WRITE_ERROR
-etc/squid/errors/German/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Hebrew/ERR_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CANNOT_FORWARD
-etc/squid/errors/Hebrew/ERR_CONNECT_FAIL
-etc/squid/errors/Hebrew/ERR_DNS_FAIL
-etc/squid/errors/Hebrew/ERR_FORWARDING_DENIED
-etc/squid/errors/Hebrew/ERR_FTP_DISABLED
-etc/squid/errors/Hebrew/ERR_FTP_FAILURE
-etc/squid/errors/Hebrew/ERR_FTP_FORBIDDEN
-etc/squid/errors/Hebrew/ERR_FTP_NOT_FOUND
-etc/squid/errors/Hebrew/ERR_FTP_PUT_CREATED
-etc/squid/errors/Hebrew/ERR_FTP_PUT_ERROR
-etc/squid/errors/Hebrew/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Hebrew/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Hebrew/ERR_INVALID_REQ
-etc/squid/errors/Hebrew/ERR_INVALID_URL
-etc/squid/errors/Hebrew/ERR_LIFETIME_EXP
-etc/squid/errors/Hebrew/ERR_NO_RELAY
-etc/squid/errors/Hebrew/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Hebrew/ERR_READ_ERROR
-etc/squid/errors/Hebrew/ERR_READ_TIMEOUT
-etc/squid/errors/Hebrew/ERR_SHUTTING_DOWN
-etc/squid/errors/Hebrew/ERR_SOCKET_FAILURE
-etc/squid/errors/Hebrew/ERR_TOO_BIG
-etc/squid/errors/Hebrew/ERR_UNSUP_REQ
-etc/squid/errors/Hebrew/ERR_URN_RESOLVE
-etc/squid/errors/Hebrew/ERR_WRITE_ERROR
-etc/squid/errors/Hebrew/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Hungarian/ERR_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CANNOT_FORWARD
-etc/squid/errors/Hungarian/ERR_CONNECT_FAIL
-etc/squid/errors/Hungarian/ERR_DNS_FAIL
-etc/squid/errors/Hungarian/ERR_FORWARDING_DENIED
-etc/squid/errors/Hungarian/ERR_FTP_DISABLED
-etc/squid/errors/Hungarian/ERR_FTP_FAILURE
-etc/squid/errors/Hungarian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Hungarian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Hungarian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Hungarian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Hungarian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Hungarian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Hungarian/ERR_INVALID_REQ
-etc/squid/errors/Hungarian/ERR_INVALID_URL
-etc/squid/errors/Hungarian/ERR_LIFETIME_EXP
-etc/squid/errors/Hungarian/ERR_NO_RELAY
-etc/squid/errors/Hungarian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Hungarian/ERR_READ_ERROR
-etc/squid/errors/Hungarian/ERR_READ_TIMEOUT
-etc/squid/errors/Hungarian/ERR_SHUTTING_DOWN
-etc/squid/errors/Hungarian/ERR_SOCKET_FAILURE
-etc/squid/errors/Hungarian/ERR_TOO_BIG
-etc/squid/errors/Hungarian/ERR_UNSUP_REQ
-etc/squid/errors/Hungarian/ERR_URN_RESOLVE
-etc/squid/errors/Hungarian/ERR_WRITE_ERROR
-etc/squid/errors/Hungarian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Italian/ERR_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CANNOT_FORWARD
-etc/squid/errors/Italian/ERR_CONNECT_FAIL
-etc/squid/errors/Italian/ERR_DNS_FAIL
-etc/squid/errors/Italian/ERR_FORWARDING_DENIED
-etc/squid/errors/Italian/ERR_FTP_DISABLED
-etc/squid/errors/Italian/ERR_FTP_FAILURE
-etc/squid/errors/Italian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Italian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Italian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Italian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Italian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Italian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Italian/ERR_INVALID_REQ
-etc/squid/errors/Italian/ERR_INVALID_URL
-etc/squid/errors/Italian/ERR_LIFETIME_EXP
-etc/squid/errors/Italian/ERR_NO_RELAY
-etc/squid/errors/Italian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Italian/ERR_READ_ERROR
-etc/squid/errors/Italian/ERR_READ_TIMEOUT
-etc/squid/errors/Italian/ERR_SHUTTING_DOWN
-etc/squid/errors/Italian/ERR_SOCKET_FAILURE
-etc/squid/errors/Italian/ERR_TOO_BIG
-etc/squid/errors/Italian/ERR_UNSUP_REQ
-etc/squid/errors/Italian/ERR_URN_RESOLVE
-etc/squid/errors/Italian/ERR_WRITE_ERROR
-etc/squid/errors/Italian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Japanese/ERR_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CANNOT_FORWARD
-etc/squid/errors/Japanese/ERR_CONNECT_FAIL
-etc/squid/errors/Japanese/ERR_DNS_FAIL
-etc/squid/errors/Japanese/ERR_FORWARDING_DENIED
-etc/squid/errors/Japanese/ERR_FTP_DISABLED
-etc/squid/errors/Japanese/ERR_FTP_FAILURE
-etc/squid/errors/Japanese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Japanese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Japanese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Japanese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Japanese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Japanese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Japanese/ERR_INVALID_REQ
-etc/squid/errors/Japanese/ERR_INVALID_URL
-etc/squid/errors/Japanese/ERR_LIFETIME_EXP
-etc/squid/errors/Japanese/ERR_NO_RELAY
-etc/squid/errors/Japanese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Japanese/ERR_READ_ERROR
-etc/squid/errors/Japanese/ERR_READ_TIMEOUT
-etc/squid/errors/Japanese/ERR_SHUTTING_DOWN
-etc/squid/errors/Japanese/ERR_SOCKET_FAILURE
-etc/squid/errors/Japanese/ERR_TOO_BIG
-etc/squid/errors/Japanese/ERR_UNSUP_REQ
-etc/squid/errors/Japanese/ERR_URN_RESOLVE
-etc/squid/errors/Japanese/ERR_WRITE_ERROR
-etc/squid/errors/Japanese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Korean/ERR_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CANNOT_FORWARD
-etc/squid/errors/Korean/ERR_CONNECT_FAIL
-etc/squid/errors/Korean/ERR_DNS_FAIL
-etc/squid/errors/Korean/ERR_FORWARDING_DENIED
-etc/squid/errors/Korean/ERR_FTP_DISABLED
-etc/squid/errors/Korean/ERR_FTP_FAILURE
-etc/squid/errors/Korean/ERR_FTP_FORBIDDEN
-etc/squid/errors/Korean/ERR_FTP_NOT_FOUND
-etc/squid/errors/Korean/ERR_FTP_PUT_CREATED
-etc/squid/errors/Korean/ERR_FTP_PUT_ERROR
-etc/squid/errors/Korean/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Korean/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Korean/ERR_INVALID_REQ
-etc/squid/errors/Korean/ERR_INVALID_URL
-etc/squid/errors/Korean/ERR_LIFETIME_EXP
-etc/squid/errors/Korean/ERR_NO_RELAY
-etc/squid/errors/Korean/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Korean/ERR_READ_ERROR
-etc/squid/errors/Korean/ERR_READ_TIMEOUT
-etc/squid/errors/Korean/ERR_SHUTTING_DOWN
-etc/squid/errors/Korean/ERR_SOCKET_FAILURE
-etc/squid/errors/Korean/ERR_TOO_BIG
-etc/squid/errors/Korean/ERR_UNSUP_REQ
-etc/squid/errors/Korean/ERR_URN_RESOLVE
-etc/squid/errors/Korean/ERR_WRITE_ERROR
-etc/squid/errors/Korean/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Lithuanian/ERR_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CANNOT_FORWARD
-etc/squid/errors/Lithuanian/ERR_CONNECT_FAIL
-etc/squid/errors/Lithuanian/ERR_DNS_FAIL
-etc/squid/errors/Lithuanian/ERR_FORWARDING_DENIED
-etc/squid/errors/Lithuanian/ERR_FTP_DISABLED
-etc/squid/errors/Lithuanian/ERR_FTP_FAILURE
-etc/squid/errors/Lithuanian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Lithuanian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Lithuanian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Lithuanian/ERR_INVALID_REQ
-etc/squid/errors/Lithuanian/ERR_INVALID_URL
-etc/squid/errors/Lithuanian/ERR_LIFETIME_EXP
-etc/squid/errors/Lithuanian/ERR_NO_RELAY
-etc/squid/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Lithuanian/ERR_READ_ERROR
-etc/squid/errors/Lithuanian/ERR_READ_TIMEOUT
-etc/squid/errors/Lithuanian/ERR_SHUTTING_DOWN
-etc/squid/errors/Lithuanian/ERR_SOCKET_FAILURE
-etc/squid/errors/Lithuanian/ERR_TOO_BIG
-etc/squid/errors/Lithuanian/ERR_UNSUP_REQ
-etc/squid/errors/Lithuanian/ERR_URN_RESOLVE
-etc/squid/errors/Lithuanian/ERR_WRITE_ERROR
-etc/squid/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Polish/ERR_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CANNOT_FORWARD
-etc/squid/errors/Polish/ERR_CONNECT_FAIL
-etc/squid/errors/Polish/ERR_DNS_FAIL
-etc/squid/errors/Polish/ERR_FORWARDING_DENIED
-etc/squid/errors/Polish/ERR_FTP_DISABLED
-etc/squid/errors/Polish/ERR_FTP_FAILURE
-etc/squid/errors/Polish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Polish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Polish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Polish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Polish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Polish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Polish/ERR_INVALID_REQ
-etc/squid/errors/Polish/ERR_INVALID_URL
-etc/squid/errors/Polish/ERR_LIFETIME_EXP
-etc/squid/errors/Polish/ERR_NO_RELAY
-etc/squid/errors/Polish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Polish/ERR_READ_ERROR
-etc/squid/errors/Polish/ERR_READ_TIMEOUT
-etc/squid/errors/Polish/ERR_SHUTTING_DOWN
-etc/squid/errors/Polish/ERR_SOCKET_FAILURE
-etc/squid/errors/Polish/ERR_TOO_BIG
-etc/squid/errors/Polish/ERR_UNSUP_REQ
-etc/squid/errors/Polish/ERR_URN_RESOLVE
-etc/squid/errors/Polish/ERR_WRITE_ERROR
-etc/squid/errors/Polish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Portuguese/ERR_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CANNOT_FORWARD
-etc/squid/errors/Portuguese/ERR_CONNECT_FAIL
-etc/squid/errors/Portuguese/ERR_DNS_FAIL
-etc/squid/errors/Portuguese/ERR_FORWARDING_DENIED
-etc/squid/errors/Portuguese/ERR_FTP_DISABLED
-etc/squid/errors/Portuguese/ERR_FTP_FAILURE
-etc/squid/errors/Portuguese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Portuguese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Portuguese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Portuguese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Portuguese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Portuguese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Portuguese/ERR_INVALID_REQ
-etc/squid/errors/Portuguese/ERR_INVALID_URL
-etc/squid/errors/Portuguese/ERR_LIFETIME_EXP
-etc/squid/errors/Portuguese/ERR_NO_RELAY
-etc/squid/errors/Portuguese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Portuguese/ERR_READ_ERROR
-etc/squid/errors/Portuguese/ERR_READ_TIMEOUT
-etc/squid/errors/Portuguese/ERR_SHUTTING_DOWN
-etc/squid/errors/Portuguese/ERR_SOCKET_FAILURE
-etc/squid/errors/Portuguese/ERR_TOO_BIG
-etc/squid/errors/Portuguese/ERR_UNSUP_REQ
-etc/squid/errors/Portuguese/ERR_URN_RESOLVE
-etc/squid/errors/Portuguese/ERR_WRITE_ERROR
-etc/squid/errors/Portuguese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Romanian/ERR_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CANNOT_FORWARD
-etc/squid/errors/Romanian/ERR_CONNECT_FAIL
-etc/squid/errors/Romanian/ERR_DNS_FAIL
-etc/squid/errors/Romanian/ERR_FORWARDING_DENIED
-etc/squid/errors/Romanian/ERR_FTP_DISABLED
-etc/squid/errors/Romanian/ERR_FTP_FAILURE
-etc/squid/errors/Romanian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Romanian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Romanian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Romanian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Romanian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Romanian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Romanian/ERR_INVALID_REQ
-etc/squid/errors/Romanian/ERR_INVALID_URL
-etc/squid/errors/Romanian/ERR_LIFETIME_EXP
-etc/squid/errors/Romanian/ERR_NO_RELAY
-etc/squid/errors/Romanian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Romanian/ERR_READ_ERROR
-etc/squid/errors/Romanian/ERR_READ_TIMEOUT
-etc/squid/errors/Romanian/ERR_SHUTTING_DOWN
-etc/squid/errors/Romanian/ERR_SOCKET_FAILURE
-etc/squid/errors/Romanian/ERR_TOO_BIG
-etc/squid/errors/Romanian/ERR_UNSUP_REQ
-etc/squid/errors/Romanian/ERR_URN_RESOLVE
-etc/squid/errors/Romanian/ERR_WRITE_ERROR
-etc/squid/errors/Romanian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Russian-1251/ERR_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CANNOT_FORWARD
-etc/squid/errors/Russian-1251/ERR_CONNECT_FAIL
-etc/squid/errors/Russian-1251/ERR_DNS_FAIL
-etc/squid/errors/Russian-1251/ERR_FORWARDING_DENIED
-etc/squid/errors/Russian-1251/ERR_FTP_DISABLED
-etc/squid/errors/Russian-1251/ERR_FTP_FAILURE
-etc/squid/errors/Russian-1251/ERR_FTP_FORBIDDEN
-etc/squid/errors/Russian-1251/ERR_FTP_NOT_FOUND
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_CREATED
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_ERROR
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Russian-1251/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Russian-1251/ERR_INVALID_REQ
-etc/squid/errors/Russian-1251/ERR_INVALID_URL
-etc/squid/errors/Russian-1251/ERR_LIFETIME_EXP
-etc/squid/errors/Russian-1251/ERR_NO_RELAY
-etc/squid/errors/Russian-1251/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Russian-1251/ERR_READ_ERROR
-etc/squid/errors/Russian-1251/ERR_READ_TIMEOUT
-etc/squid/errors/Russian-1251/ERR_SHUTTING_DOWN
-etc/squid/errors/Russian-1251/ERR_SOCKET_FAILURE
-etc/squid/errors/Russian-1251/ERR_TOO_BIG
-etc/squid/errors/Russian-1251/ERR_UNSUP_REQ
-etc/squid/errors/Russian-1251/ERR_URN_RESOLVE
-etc/squid/errors/Russian-1251/ERR_WRITE_ERROR
-etc/squid/errors/Russian-1251/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Russian-koi8-r/ERR_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CANNOT_FORWARD
-etc/squid/errors/Russian-koi8-r/ERR_CONNECT_FAIL
-etc/squid/errors/Russian-koi8-r/ERR_DNS_FAIL
-etc/squid/errors/Russian-koi8-r/ERR_FORWARDING_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_DISABLED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_FAILURE
-etc/squid/errors/Russian-koi8-r/ERR_FTP_FORBIDDEN
-etc/squid/errors/Russian-koi8-r/ERR_FTP_NOT_FOUND
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_CREATED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Russian-koi8-r/ERR_INVALID_REQ
-etc/squid/errors/Russian-koi8-r/ERR_INVALID_URL
-etc/squid/errors/Russian-koi8-r/ERR_LIFETIME_EXP
-etc/squid/errors/Russian-koi8-r/ERR_NO_RELAY
-etc/squid/errors/Russian-koi8-r/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Russian-koi8-r/ERR_READ_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_READ_TIMEOUT
-etc/squid/errors/Russian-koi8-r/ERR_SHUTTING_DOWN
-etc/squid/errors/Russian-koi8-r/ERR_SOCKET_FAILURE
-etc/squid/errors/Russian-koi8-r/ERR_TOO_BIG
-etc/squid/errors/Russian-koi8-r/ERR_UNSUP_REQ
-etc/squid/errors/Russian-koi8-r/ERR_URN_RESOLVE
-etc/squid/errors/Russian-koi8-r/ERR_WRITE_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Serbian/ERR_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CANNOT_FORWARD
-etc/squid/errors/Serbian/ERR_CONNECT_FAIL
-etc/squid/errors/Serbian/ERR_DNS_FAIL
-etc/squid/errors/Serbian/ERR_FORWARDING_DENIED
-etc/squid/errors/Serbian/ERR_FTP_DISABLED
-etc/squid/errors/Serbian/ERR_FTP_FAILURE
-etc/squid/errors/Serbian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Serbian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Serbian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Serbian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Serbian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Serbian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Serbian/ERR_INVALID_REQ
-etc/squid/errors/Serbian/ERR_INVALID_URL
-etc/squid/errors/Serbian/ERR_LIFETIME_EXP
-etc/squid/errors/Serbian/ERR_NO_RELAY
-etc/squid/errors/Serbian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Serbian/ERR_READ_ERROR
-etc/squid/errors/Serbian/ERR_READ_TIMEOUT
-etc/squid/errors/Serbian/ERR_SHUTTING_DOWN
-etc/squid/errors/Serbian/ERR_SOCKET_FAILURE
-etc/squid/errors/Serbian/ERR_TOO_BIG
-etc/squid/errors/Serbian/ERR_UNSUP_REQ
-etc/squid/errors/Serbian/ERR_URN_RESOLVE
-etc/squid/errors/Serbian/ERR_WRITE_ERROR
-etc/squid/errors/Serbian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Simplify_Chinese/ERR_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CANNOT_FORWARD
-etc/squid/errors/Simplify_Chinese/ERR_CONNECT_FAIL
-etc/squid/errors/Simplify_Chinese/ERR_DNS_FAIL
-etc/squid/errors/Simplify_Chinese/ERR_FORWARDING_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_DISABLED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_FAILURE
-etc/squid/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Simplify_Chinese/ERR_INVALID_REQ
-etc/squid/errors/Simplify_Chinese/ERR_INVALID_URL
-etc/squid/errors/Simplify_Chinese/ERR_LIFETIME_EXP
-etc/squid/errors/Simplify_Chinese/ERR_NO_RELAY
-etc/squid/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Simplify_Chinese/ERR_READ_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_READ_TIMEOUT
-etc/squid/errors/Simplify_Chinese/ERR_SHUTTING_DOWN
-etc/squid/errors/Simplify_Chinese/ERR_SOCKET_FAILURE
-etc/squid/errors/Simplify_Chinese/ERR_TOO_BIG
-etc/squid/errors/Simplify_Chinese/ERR_UNSUP_REQ
-etc/squid/errors/Simplify_Chinese/ERR_URN_RESOLVE
-etc/squid/errors/Simplify_Chinese/ERR_WRITE_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Slovak/ERR_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CANNOT_FORWARD
-etc/squid/errors/Slovak/ERR_CONNECT_FAIL
-etc/squid/errors/Slovak/ERR_DNS_FAIL
-etc/squid/errors/Slovak/ERR_FORWARDING_DENIED
-etc/squid/errors/Slovak/ERR_FTP_DISABLED
-etc/squid/errors/Slovak/ERR_FTP_FAILURE
-etc/squid/errors/Slovak/ERR_FTP_FORBIDDEN
-etc/squid/errors/Slovak/ERR_FTP_NOT_FOUND
-etc/squid/errors/Slovak/ERR_FTP_PUT_CREATED
-etc/squid/errors/Slovak/ERR_FTP_PUT_ERROR
-etc/squid/errors/Slovak/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Slovak/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Slovak/ERR_INVALID_REQ
-etc/squid/errors/Slovak/ERR_INVALID_URL
-etc/squid/errors/Slovak/ERR_LIFETIME_EXP
-etc/squid/errors/Slovak/ERR_NO_RELAY
-etc/squid/errors/Slovak/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Slovak/ERR_READ_ERROR
-etc/squid/errors/Slovak/ERR_READ_TIMEOUT
-etc/squid/errors/Slovak/ERR_SHUTTING_DOWN
-etc/squid/errors/Slovak/ERR_SOCKET_FAILURE
-etc/squid/errors/Slovak/ERR_TOO_BIG
-etc/squid/errors/Slovak/ERR_UNSUP_REQ
-etc/squid/errors/Slovak/ERR_URN_RESOLVE
-etc/squid/errors/Slovak/ERR_WRITE_ERROR
-etc/squid/errors/Slovak/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Spanish/ERR_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CANNOT_FORWARD
-etc/squid/errors/Spanish/ERR_CONNECT_FAIL
-etc/squid/errors/Spanish/ERR_DNS_FAIL
-etc/squid/errors/Spanish/ERR_FORWARDING_DENIED
-etc/squid/errors/Spanish/ERR_FTP_DISABLED
-etc/squid/errors/Spanish/ERR_FTP_FAILURE
-etc/squid/errors/Spanish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Spanish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Spanish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Spanish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Spanish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Spanish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Spanish/ERR_INVALID_REQ
-etc/squid/errors/Spanish/ERR_INVALID_URL
-etc/squid/errors/Spanish/ERR_LIFETIME_EXP
-etc/squid/errors/Spanish/ERR_NO_RELAY
-etc/squid/errors/Spanish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Spanish/ERR_READ_ERROR
-etc/squid/errors/Spanish/ERR_READ_TIMEOUT
-etc/squid/errors/Spanish/ERR_SHUTTING_DOWN
-etc/squid/errors/Spanish/ERR_SOCKET_FAILURE
-etc/squid/errors/Spanish/ERR_TOO_BIG
-etc/squid/errors/Spanish/ERR_UNSUP_REQ
-etc/squid/errors/Spanish/ERR_URN_RESOLVE
-etc/squid/errors/Spanish/ERR_WRITE_ERROR
-etc/squid/errors/Spanish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Swedish/ERR_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CANNOT_FORWARD
-etc/squid/errors/Swedish/ERR_CONNECT_FAIL
-etc/squid/errors/Swedish/ERR_DNS_FAIL
-etc/squid/errors/Swedish/ERR_FORWARDING_DENIED
-etc/squid/errors/Swedish/ERR_FTP_DISABLED
-etc/squid/errors/Swedish/ERR_FTP_FAILURE
-etc/squid/errors/Swedish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Swedish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Swedish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Swedish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Swedish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Swedish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Swedish/ERR_INVALID_REQ
-etc/squid/errors/Swedish/ERR_INVALID_URL
-etc/squid/errors/Swedish/ERR_LIFETIME_EXP
-etc/squid/errors/Swedish/ERR_NO_RELAY
-etc/squid/errors/Swedish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Swedish/ERR_READ_ERROR
-etc/squid/errors/Swedish/ERR_READ_TIMEOUT
-etc/squid/errors/Swedish/ERR_SHUTTING_DOWN
-etc/squid/errors/Swedish/ERR_SOCKET_FAILURE
-etc/squid/errors/Swedish/ERR_TOO_BIG
-etc/squid/errors/Swedish/ERR_UNSUP_REQ
-etc/squid/errors/Swedish/ERR_URN_RESOLVE
-etc/squid/errors/Swedish/ERR_WRITE_ERROR
-etc/squid/errors/Swedish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Traditional_Chinese/ERR_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CANNOT_FORWARD
-etc/squid/errors/Traditional_Chinese/ERR_CONNECT_FAIL
-etc/squid/errors/Traditional_Chinese/ERR_DNS_FAIL
-etc/squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_DISABLED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_FAILURE
-etc/squid/errors/Traditional_Chinese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Traditional_Chinese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Traditional_Chinese/ERR_INVALID_REQ
-etc/squid/errors/Traditional_Chinese/ERR_INVALID_URL
-etc/squid/errors/Traditional_Chinese/ERR_LIFETIME_EXP
-etc/squid/errors/Traditional_Chinese/ERR_NO_RELAY
-etc/squid/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Traditional_Chinese/ERR_READ_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_READ_TIMEOUT
-etc/squid/errors/Traditional_Chinese/ERR_SHUTTING_DOWN
-etc/squid/errors/Traditional_Chinese/ERR_SOCKET_FAILURE
-etc/squid/errors/Traditional_Chinese/ERR_TOO_BIG
-etc/squid/errors/Traditional_Chinese/ERR_UNSUP_REQ
-etc/squid/errors/Traditional_Chinese/ERR_URN_RESOLVE
-etc/squid/errors/Traditional_Chinese/ERR_WRITE_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Turkish/ERR_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CANNOT_FORWARD
-etc/squid/errors/Turkish/ERR_CONNECT_FAIL
-etc/squid/errors/Turkish/ERR_DNS_FAIL
-etc/squid/errors/Turkish/ERR_FORWARDING_DENIED
-etc/squid/errors/Turkish/ERR_FTP_DISABLED
-etc/squid/errors/Turkish/ERR_FTP_FAILURE
-etc/squid/errors/Turkish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Turkish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Turkish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Turkish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Turkish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Turkish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Turkish/ERR_INVALID_REQ
-etc/squid/errors/Turkish/ERR_INVALID_URL
-etc/squid/errors/Turkish/ERR_LIFETIME_EXP
-etc/squid/errors/Turkish/ERR_NO_RELAY
-etc/squid/errors/Turkish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Turkish/ERR_READ_ERROR
-etc/squid/errors/Turkish/ERR_READ_TIMEOUT
-etc/squid/errors/Turkish/ERR_SHUTTING_DOWN
-etc/squid/errors/Turkish/ERR_SOCKET_FAILURE
-etc/squid/errors/Turkish/ERR_TOO_BIG
-etc/squid/errors/Turkish/ERR_UNSUP_REQ
-etc/squid/errors/Turkish/ERR_URN_RESOLVE
-etc/squid/errors/Turkish/ERR_WRITE_ERROR
-etc/squid/errors/Turkish/ERR_ZERO_SIZE_OBJECT
-etc/squid/mib.txt
-@unexec if cmp -s %D/etc/squid/mime.conf %D/etc/squid/mime.conf.default; then rm -f %D/etc/squid/mime.conf; fi
-etc/squid/mime.conf.default
-@exec [ -f %B/mime.conf ] || cp %B/%f %B/mime.conf
-@unexec if cmp -s %D/etc/squid/squid.conf %D/etc/squid/squid.conf.default; then rm -f %D/etc/squid/squid.conf; fi
-etc/squid/squid.conf.default
-@exec [ -f %B/squid.conf ] || cp %B/%f %B/squid.conf
-libexec/cachemgr.cgi
-libexec/diskd
-libexec/unlinkd
-libexec/ip_user_check
-libexec/yp_auth
-libexec/pam_auth
-libexec/ncsa_auth
-libexec/squid_unix_group
 sbin/RunAccel
 sbin/RunCache
 sbin/squidclient
 sbin/squid
-@exec mkdir -p %D/squid/cache
-@exec chown nobody:nogroup %D/squid/cache
-@exec mkdir -p %D/squid/logs
-@exec chown nobody:nogroup %D/squid/logs
-@dirrm etc/squid/errors/Bulgarian
-@dirrm etc/squid/errors/Catalan
-@dirrm etc/squid/errors/Czech
-@dirrm etc/squid/errors/Danish
-@dirrm etc/squid/errors/Dutch
-@dirrm etc/squid/errors/English
-@dirrm etc/squid/errors/Estonian
-@dirrm etc/squid/errors/Finnish
-@dirrm etc/squid/errors/French
-@dirrm etc/squid/errors/German
-@dirrm etc/squid/errors/Hebrew
-@dirrm etc/squid/errors/Hungarian
-@dirrm etc/squid/errors/Italian
-@dirrm etc/squid/errors/Japanese
-@dirrm etc/squid/errors/Korean
-@dirrm etc/squid/errors/Lithuanian
-@dirrm etc/squid/errors/Polish
-@dirrm etc/squid/errors/Portuguese
-@dirrm etc/squid/errors/Romanian
-@dirrm etc/squid/errors/Russian-1251
-@dirrm etc/squid/errors/Russian-koi8-r
-@dirrm etc/squid/errors/Serbian
-@dirrm etc/squid/errors/Simplify_Chinese
-@dirrm etc/squid/errors/Slovak
-@dirrm etc/squid/errors/Spanish
-@dirrm etc/squid/errors/Swedish
-@dirrm etc/squid/errors/Traditional_Chinese
-@dirrm etc/squid/errors/Turkish
-@dirrm etc/squid/icons
-@dirrm etc/squid/errors
-@dirrm etc/squid
-@dirrm squid/logs
-@dirrm squid/cache
-@dirrm squid
+%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES.html
+%%PORTDOCS%%%%DOCSDIR%%/debug-sections.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@comment Start of dynamically generated plist
+@comment End of dynamically generated plist
+@comment These directories are maybe not empty at deinstallation time.
+@comment Since we try to preserve the data in there for updates anyway, be quiet.
+@unexec rmdir %D/etc/squid/icons 2>/dev/null || true
+@unexec rmdir %D/etc/squid/errors 2>/dev/null || true
+@unexec rmdir %D/etc/squid 2>/dev/null || true
+@unexec rmdir %D/squid/logs 2>/dev/null || true
+@unexec rmdir %D/squid/cache 2>/dev/null || true
+@unexec rmdir %D/squid 2>/dev/null || true
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index baf1c842a527..bed437c96f56 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -4,10 +4,31 @@
 #
 # $FreeBSD$
 #
+# Tunables:
+# WITH_SQUID_PINGER
+#   install the external icmp helper program (`pinger') for hierarchy stats and
+#   selection
+# WITH_SQUID_LDAP_AUTH
+#   install external modules for authentication against LDAP servers
+# SQUID_{U,G}ID
+#   Which user/group squid should run as (default: squid/squid).
+#   The user and group will be created if they do not already exist.
+#   NOTE: before version 2.5.4_6, these settings defaulted to
+#   nobody/nogroup.
+#   If you wish to keep these settings, please define SQUID_UID=nobody and
+#   SQUID_GID=nogroup in your make environment before you start the update.
+# SQUID_LANGUAGES
+#   A list of languages for which error page files should be installed
+#   (default: all)
+# SQUID_DEFAULT_LANG
+#   If you define SQUID_LANGUAGES, select which language should be the default
+#   (default: English)
+# SQUID_CONFIGURE_ARGS
+#   Additional configuration options, see below for a list
 
 PORTNAME=	squid
 PORTVERSION=	2.5.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -17,7 +38,6 @@ MASTER_SITES=	\
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.5.STABLE4
-EXTRACT_SUFX=	.tar.bz2
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
@@ -54,89 +74,131 @@ PATCHFILES=	squid-2.5.STABLE4-reconfigure_message.patch \
 		squid-2.5.STABLE4-pinger.patch \
 		squid-2.5.STABLE4-partial_reload.patch \
 		squid-2.5.STABLE4-ldap_tls.patch \
-		squid-2.5.STABLE4-ldap_group_bufsize.patch
+		squid-2.5.STABLE4-ldap_group_bufsize.patch \
+		squid-2.5.STABLE4-http_workarounds.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
 COMMENT=	The successful WWW proxy cache and accelerator
 
+CONFLICTS=	squid-*
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
-# Follow the apache port's lead...
+
+SQUID_UID?=	squid
+SQUID_GID?=	squid
+
+MAN8=		squid.8
+DOCS=		QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
+
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--datadir=${PREFIX}/etc/squid \
+		--libexecdir=${PREFIX}/libexec/squid \
 		--localstatedir=${PREFIX}/squid \
 		--enable-storeio="ufs diskd null" \
 		--enable-removal-policies="lru heap" \
-		--enable-auth=basic --enable-basic-auth-helpers="NCSA PAM YP" \
-		--enable-external-acl-helpers="ip_user unix_group" \
-		--enable-underscores ${SQUID_CONFIGURE_ARGS}
-
-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
-#CONFIGURE_ARGS+= --enable-dlmalloc
-#  - Compile and use the supplied GNUregex routines instead of BSD regex.
-#CONFIGURE_ARGS+= --enable-gnuregex
-#  - Enable simple malloc debugging
-#CONFIGURE_ARGS+= --enable-xmalloc-debug
-#  - Detailed trace of memory allocations
-#CONFIGURE_ARGS+= --enable-xmalloc-debug-count
-#  - Show malloc statistics in cachemgr status pages
-#CONFIGURE_ARGS+= --enable-xmalloc-statistics
-#  - Enable CARP support
-#CONFIGURE_ARGS+= --enable-carp
-#  - Enable ICMP pinging for heirarchy stats and selection
-#CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay pools to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-pools
-#  - Enable generic memory use tracing
-#CONFIGURE_ARGS+= --enable-mem-gen-trace
-#  - Enable logging of the User-Agent header
-#CONFIGURE_ARGS+= --enable-useragent-log
-#  - Disable Web Cache Coordination Protocol
-#CONFIGURE_ARGS+= --disable-wccp
-#  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent-hack
-#  - Turn on SNMP server support
-#CONFIGURE_ARGS+= --enable-snmp
-#  - Turn on SSL server support for reverse proxies
-#CONFIGURE_ARGS+= --enable-ssl
-#  - Optimize time updates to one per second rather than calling gettimeofday()
-#CONFIGURE_ARGS+= --enable-time-hack
-#  - Set an explicit hostname in cachemgr.cgi
-#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-#  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
-#    assigned IP addresses)
-#CONFIGURE_ARGS+= --enable-arp-acl
-#  - Enable HTCP protocol
-#CONFIGURE_ARGS+= --enable-htcp
-#  - Enable Forw/Via database
-#CONFIGURE_ARGS+= --enable-forw-via-db
-#  - 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
-#  (--enable-poll is not needed, it's detected correctly on 3.0)
-#  - Strict HTTP compliance
-#CONFIGURE_ARGS+= --disable-http-violations
-#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
-#CONFIGURE_ARGS+= --enable-ipf-transparent
-# (--enable-leakfinder is a developer support tool only)
-#  - Compile out code that does optional Ident (RFC931) lookups
-#CONFIGURE_ARGS+= --disable-ident-lookups
-#  - Disable squid's internal async DNS lookup code.
-#CONFIGURE_ARGS+= --disable-internal-dns
-#  - Use truncate() rather than unlink()
-#CONFIGURE_ARGS+= --enable-truncate
-#  - accept the illegal '_' character in hostnames.
-#CONFIGURE_ARGS+= --enable-underscores
-#  - Enable control of different heap replacement algorithms at runtime.
-#CONFIGURE_ARGS+= --enable-removal-policies
+		--enable-underscores
+
+.if defined(WITH_SQUID_PINGER)
+CONFIGURE_ARGS+=	--enable-icmp
+.endif
+
+# Authentication methods and modules:
+
+basic_auth=	NCSA PAM YP MSNT winbind
+external_acl=	ip_user unix_group wbinfo_group winbind_group
+MAN8+=		pam_auth.8 squid_unix_group.8
+.if defined(WITH_SQUID_LDAP_AUTH)
+USE_OPENLDAP=	yes
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+MAN8+=		squid_ldap_auth.8 squid_ldap_group.8
+basic_auth+=	LDAP
+external_acl+=	ldap_group
+.endif
+CONFIGURE_ARGS+=	--enable-auth="basic ntlm digest" \
+			--enable-basic-auth-helpers="${basic_auth}" \
+			--enable-digest-auth-helpers="password" \
+			--enable-external-acl-helpers="${external_acl}" \
+			--enable-ntlm-auth-helpers="winbind"
+
+# Languages:
+#
+# If you do not define SQUID_LANGUAGES yourself, all available language files
+# will be installed; the default language will be english.
+
+SQUID_LANGUAGES?=	\
+	Bulgarian Catalan Czech Danish Dutch English Estonian Finnish      \
+	French German Hebrew Hungarian Italian Japanese Korean Lithuanian  \
+	Polish Portuguese Romanian Russian-1251 Russian-koi8-r Serbian     \
+	Simplify_Chinese Slovak Spanish Swedish Traditional_Chinese Turkish
+SQUID_DEFAULT_LANG?=	English
+CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
+			--enable-default-err-language=${SQUID_DEFAULT_LANG}
+
+# Other configure options you might want to set using SQUID_CONFIGURE_ARGS:
+# Please see the configure script in the squid source distribution for a
+# complete list.
+#
+# --enable-dlmalloc
+#  Compile and use the malloc package from Doug Lea
+# --enable-gnuregex
+#  Compile and use the supplied GNUregex routines instead of BSD regex.
+# --enable-xmalloc-statistics
+#  Show malloc statistics in status page
+# --enable-carp
+#  Enable CARP support
+# --enable-delay-pools
+#  Enable delay pools to limit bandwidth usage
+# --enable-useragent-log
+#  Enable logging of the User-Agent header
+# --disable-wccp
+#  Disable Web Cache Coordination Protocol
+# --enable-snmp
+#  Turn on SNMP server support
+# --enable-ssl
+#  Turn on SSL server support for reverse proxies
+# --enable-time-hack
+#  Optimize time updates to one per second rather than calling gettimeofday()
+# --enable-cachemgr-hostname=some.hostname
+#  Set an explicit hostname in cachemgr.cgi
+# --enable-arp-acl
+#  Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+#  assigned IP addresses)
+# --enable-htcp
+#  Enable HTCP protocol
+# --enable-forw-via-db
+#  Enable Forw/Via database
+# --enable-cache-digests
+#  Use Cache Digests - see http://www.squid-cache.org/Doc/FAQ/FAQ-16.html
+# --disable-http-violations
+#  Strict HTTP compliance
+# --enable-ipf-transparent
+#  Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#  (Note: this is currently broken due to ipf headers not being installed to
+#  the base system, see PRs ports/60700 and misc/44148 for details)
+#  Note: see http://www.squid-cache.org/Doc/FAQ/FAQ-17.html for information
+#  about how to do transparent proxying with ipfw(8).
+# --disable-ident-lookups
+#  Compile out code that does optional Ident (RFC931) lookups
+# --disable-internal-dns
+#  Install the old external "dnsserver" binary
+# --enable-truncate
+#  Use truncate() rather than unlink()
+# --disable-hostname-checks
+#  Squid by default rejects any host names with odd characters in their name
+#  to conform with internet standards. If you disagree with this you may use
+#  this switch to turn off any such checks, provided that the resolver used by
+#  Squid does not reject such host names. This may be required to participate
+#  in testbeds for international domain names.
+# --disable-unlinkd
+#  Do not use "unlinkd"
+# --enable-stacktraces
+#  Enable automatic call backtrace on fatal errors
+
+CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@@ -145,37 +207,53 @@ post-patch:
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
+pre-configure:
+	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
+	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' ${WRKSRC}/src/cf.data.pre
+
+pre-install:
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	    -e 's|%%SQUID_UID%%|${SQUID_UID}|g' ${FILESDIR}/squid.sh \
+	    >${WRKDIR}/squid.sh
+
+pre-su-install:
+	@${SETENV} SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID} \
+	    PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+
 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 sbin_file in client squid
-	if [ -f ${PREFIX}/sbin/${sbin_file} ] ; then \
-		${STRIP_CMD} ${PREFIX}/sbin/${sbin_file} ; \
-	fi
-.endfor
-.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			\
-		${MKDIR} ${PREFIX}/squid/logs;		  	\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/logs;   \
-	fi
-	@if [ ! -d ${PREFIX}/squid/cache ]; then		\
-		${MKDIR} ${PREFIX}/squid/cache;			\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/cache;  \
-	fi
-	@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; \
-	fi
+.if defined(WITH_SQUID_PINGER)
+	${CHMOD} 4710 ${PREFIX}/libexec/squid/pinger; \
+	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
+.endif
+	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
+.if exists(${PREFIX}/etc/squid/errors/Lithuanian)
 # Work around the fact that the errorpages.patch creates files in
 # an "Attic" subdir:
 	@${FIND} ${WRKSRC}/errors/Lithuanian/Attic -type f \
-	-exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \;
+   	    -exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \;
+.endif
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+# Generate parts of pkg-plist on the fly:
+	@cd ${PREFIX} && ${FIND} libexec/squid -type f -o -type l \
+	    >${WRKDIR}/plist.dynamic
+	@${ECHO_CMD} "@dirrm libexec/squid" >>${WRKDIR}/plist.dynamic
+# Only register what we should have installed, there may be local additions
+# present:
+.for d in ${SQUID_LANGUAGES}
+	@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f \
+	    >>${WRKDIR}/plist.dynamic
+	@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
+.endfor
+	@${ECHO_CMD} "r ${TMPPLIST}" >${WRKDIR}/ex.script
+	@${ECHO_CMD} "/Start of dynamically generated plist" >>${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${WRKDIR}/plist.dynamic" >>${WRKDIR}/ex.script
+	@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
+	@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
+	@cd ${WRKDIR} && ex <ex.script >/dev/null
 
 .include <bsd.port.mk>
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index 76f9e296de4d..893a0e19d67a 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -33,3 +33,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5
 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34
 MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284
 MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c
+MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac
diff --git a/www/squid26/files/patch-src-cf.data.pre b/www/squid26/files/patch-src-cf.data.pre
new file mode 100644
index 000000000000..2a8e1eff429f
--- /dev/null
+++ b/www/squid26/files/patch-src-cf.data.pre
@@ -0,0 +1,20 @@
+--- src/cf.data.pre.orig	Thu May  1 14:07:51 2003
++++ src/cf.data.pre	Thu May  1 14:13:12 2003
+@@ -2325,7 +2325,7 @@
+ 
+ NAME: cache_effective_user
+ TYPE: string
+-DEFAULT: nobody
++DEFAULT: %%SQUID_UID%%
+ LOC: Config.effectiveUser
+ DOC_NONE
+ 
+@@ -2337,7 +2337,7 @@
+ 
+ 	If you start Squid as root, it will change its effective/real
+ 	UID/GID to the UID/GID specified below.  The default is to
+-	change to UID to nobody.  If you define cache_effective_user,
++	change to UID to %%SQUID_UID%%.  If you define cache_effective_user,
+ 	but not cache_effective_group, Squid sets the GID the
+ 	effective user's default group ID (taken from the password
+ 	file).
diff --git a/www/squid26/files/squid.sh b/www/squid26/files/squid.sh
index 40f655b04f27..ec92a10bc3fc 100644
--- a/www/squid26/files/squid.sh
+++ b/www/squid26/files/squid.sh
@@ -1,26 +1,75 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: squid
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD
+# 
+# Note:
+# If you are running an rcNG-System (i.e. FreeBSD 5 and later or after
+# having installed the rc_subr-port on an earlier system) you must set
+# "squid_enable=YES" in either /etc/rc.conf, /etc/rc.conf.local or
+# /etc/rc.conf.d/squid to make this script actually do something. There
+# you can also set squid_chdir, squid_user, and squid_flags.
+#
+# Please see squid(8), rc.conf(5) and rc(8) for further details.
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+unset rcNG
+name="squid"
+command=%%PREFIX%%/sbin/squid
+extra_commands=reload
+reload_cmd="${command} -k reconfigure"
+stop_cmd="${command} -k shutdown"
+: ${squid_chdir:=%%PREFIX%%/squid/logs}
+: ${squid_user:=%%SQUID_UID%%}
+: ${squid_flags:="-D"}
+default_config=%%PREFIX%%/etc/squid/squid.conf
 
-case "$1" in
-start)
-	if [ -x ${PREFIX}/sbin/squid -a -f ${PREFIX}/etc/squid/squid.conf ]; then
-		(cd /${PREFIX}/squid/logs; ${PREFIX}/sbin/squid >/dev/null 2>&1 &) ; echo -n ' squid'
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr && rcNG=yes
+else
+	if [ -f %%PREFIX%%/etc/rc.subr ]; then
+		. %%PREFIX%%/etc/rc.subr && rcNG=yes
 	fi
-	;;
-stop)
-		${PREFIX}/sbin/squid -k shutdown 2>&1
-		# Uncomment this if you'd like the system to (attempt to
-		# wait for) squid to shut down cleanly
-		#echo "Sleeping for 45 seconds to allow squid to shutdown.."
-		#sleep 45 
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
+fi
 
-exit 0
+if [ "${rcNG}" ]; then
+	rcvar=`set_rcvar`
+	load_rc_config ${name}
+	# check that squid's default configuration is present when
+	# squid_flags is not set. We assume that you specify at
+	# least the path to your non-default configuration with
+	# '-f /path/to/config.file' in squid_flags if you delete this file.
+	if [ -z "${squid_flags}" ]; then
+		required_files=${default_config}
+	fi
+	required_dirs=${squid_chdir}
+	run_rc_command "$1"
+else
+	case $1 in
+	start)
+		if [ -x "${command}" -a \
+			\( -f "${default_config}" -o "${squid_flags}" \) ]; then
+			echo -n ' squid'
+			(cd ${squid_chdir} && exec su -fm ${squid_user} -c \
+				"${command} ${squid_flags}")
+		fi
+		;;
+	stop)
+		if [ -x "${command}" ]; then
+			echo -n ' squid'
+			${stop_cmd}
+			while ps -xcU ${squid_user} | grep -q squid; do
+				sleep 2
+			done
+		fi
+		;;
+		*)
+		echo "usage: `basename $0` {start|stop}" >&2
+		exit 64
+		;;
+	esac
+	exit 0
+fi
diff --git a/www/squid26/pkg-deinstall b/www/squid26/pkg-deinstall
new file mode 100644
index 000000000000..3a95b4f50e0d
--- /dev/null
+++ b/www/squid26/pkg-deinstall
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/bin:/usr/bin:/usr/sbin
+pkgname=$1
+
+case $2 in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	echo "===> post-deinstallation information for ${pkgname}"
+	echo ""
+	echo "     Please note that ${pkgname} was not completely removed"
+	echo "     from this system."
+	echo ""
+	echo "     The cache and log directories, squid's user account,"
+	echo "     and any modified configuration files have been preserved"
+	echo "     in case you want to install an updated version of squid"
+	echo "     on this system. You must remove them manually if you do"
+	echo "     not want to use squid any longer."
+	echo ""
+	;;
+*)
+	exit 64
+	;;
+esac
+exit 0
diff --git a/www/squid26/pkg-descr b/www/squid26/pkg-descr
index a030d6c271b8..f2674655d01e 100644
--- a/www/squid26/pkg-descr
+++ b/www/squid26/pkg-descr
@@ -9,9 +9,15 @@ 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.
 
-FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
-But you aren't lost in space: there is a mailing list,
-<squid-users@squid-cache.org>, where you will find some support and help.
-We also _strongly_ suggest you to examine Web pages noted above.
+Please see this port's Makefile for a list of compilation options.
+
+*** UPDATE NOTICE ***
+Starting from Version 2.5.4_6 the default user:group changed from
+nobody:nogroup to squid:squid. You can restore the old behavior
+of this port by specifying SQUID_UID=nobody SQUID_GID=nogroup in
+your make environment. Helper applications are now installed to
+$PREFIX/libexec/squid instead of $PREFIX/libexec, too.
+
+You can find further information on the project's website at
 
 WWW: http://www.squid-cache.org/
diff --git a/www/squid26/pkg-install b/www/squid26/pkg-install
index 7efd84949fd2..3b16eee43fda 100644
--- a/www/squid26/pkg-install
+++ b/www/squid26/pkg-install
@@ -1,44 +1,105 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
 
-PKGNAME=$1
+PATH=/bin:/usr/bin:/usr/sbin
+pkgname=$1
+squid_base=${PKG_PREFIX:-/usr/local}/squid
+squid_confdir=${PKG_PREFIX:-/usr/local}/etc/squid
+squid_user=${SQUID_UID:=squid}
+squid_group=${SQUID_GID:=squid}
+squid_gid=3128
+squid_uid=3128
 
 case $2 in
-    PRE-INSTALL)
+PRE-INSTALL)
+	echo "===> Pre-installation configuration for ${pkgname}"
+	if ! pw groupshow ${squid_group} -q >/dev/null ; then
+		while pw groupshow -g ${squid_gid} -q >/dev/null; do
+			squid_gid=`expr ${squid_gid} + 1`
+		done
+		echo "There is no group '${squid_group}' on this system, so I will try to create it:"
+		if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
+			echo "Failed to create group \"${squid_group}\"!" >&2
+			echo "Please create it manually." >&2
+			exit 1
+		else
+			echo "Group '${squid_group}' created successfully:"
+		fi
+	else
+		echo "I will use the existing group '${squid_group}':"
+	fi
+	pw groupshow ${squid_group}
+	if ! pw usershow ${squid_user} -q >/dev/null ; then
+		while pw usershow -u ${squid_uid} -q >/dev/null; do
+			squid_uid=`expr ${squid_uid} + 1`
+		done
+		echo "There is no account '${squid_user}' on this system, so I will try to create it:"
+		if ! pw useradd ${squid_user} -u ${squid_uid} -q \
+	  	    -c "squid caching-proxy pseudo user" -g ${squid_group} \
+		    -d "${squid_base}" -s "/sbin/nologin" -h - ; then
+			echo "Failed to create user '${squid_user}'!" >&2
+			echo "Please create it manually." >&2
+			exit 1
+		else
+			echo "User '${squid_user}' created successfully:"
+		fi
+	else
+		echo "I will use the existing user '${squid_user}':"
+	fi
+	pw usershow ${squid_user}
+	for dir in cache logs; do
+	if [ ! -d ${squid_base}/${dir} ]; then
+		echo "Creating ${squid_base}/${dir}..."
+		install -d -o ${squid_user} -g ${squid_group} \
+		    -m 0750 ${squid_base}/${dir}
+	fi
+	done
+	if [ ! -d ${squid_confdir} ]; then
+		echo "Creating ${squid_confdir}..."
+		install -d -o root -g ${squid_group} \
+		    -m 0750 ${squid_confdir}
+	fi
 	;;
-    POST-INSTALL)
-	echo "==> Post-installation configuration of ${PKGNAME}"
+POST-INSTALL)
+	for file in mime.conf squid.conf; do
+		if [ ! -f ${squid_confdir}/${file} \
+		    -a -f ${squid_confdir}/${file}.default ]; then
+		echo "Creating ${file} from default..."
+		install -c -o root -g ${squid_group} -m 0640 \
+		    ${squid_confdir}/${file}.default ${squid_confdir}/${file}
+	fi
+	done
+
+	echo "===> Post-installation informations for ${pkgname}"
+	echo ""
+	echo "     o You can find the configuration files for this package"
+	echo "       in the directory ${squid_confdir}."
 	echo ""
-	echo "    o you DO need running nameservice to start and run ${PKGNAME}"
+	echo "     o A cache directory has been created in ${squid_base}/cache."
+	echo "       Log files will be written to ${squid_base}/logs."
 	echo ""
-	echo "    o use the ${PKGNAME} proxy and caching WWW Server by"
-	echo "      configuring your WWW Navigator (Netscape, Mosaic,...)"
-	echo "      to use it as a proxy server."
+	echo "     o The default configuration will deny everyone access to the"
+	echo "       proxy service. Edit the \"http_access\" directives in"
+	echo "       ${squid_confdir}/squid.conf to suit your needs."
 	echo ""
-	echo "    o Note that before you can run ${PKGNAME} you will"
-	echo "      need to initialise the cache directory."
-	echo "      You can do this by typing \"squid -z\"."
+	echo "     o If you never ran squid on this system before, you need to"
+	echo "       initialize the cache directory by running \"squid -z\""
+	echo "       as 'root' or '${squid_user}' before starting squid."
 	echo ""
-	echo "==> Press Enter to edit the ${PKGNAME} config file."
-	echo "    (The defaults are reasonable; and the file is well commented)"
 	tput md
-	echo "    You'd certainly like to pay attention to the"
-	echo "    ACTUAL locations of cache \"spool\", logfiles, pidfile!"
+	echo "     *** UPDATE NOTICE ***"
+	echo ""
+	echo "     Starting with version 2.5.4_6, all helper applications are"
+	echo "     installed to ${PKG_PREFIX}/libexec/squid instead of"
+	echo "     ${PKG_PREFIX}/libexec."
+	echo "     Please check your squid.conf and update it if necessary."
 	tput me
-	if [ -z "${PACKAGE_BUILDING}" ]; then read skip; fi
-	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 ""
 	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
+*)
+	exit 64
 	;;
 esac
 exit 0
diff --git a/www/squid26/pkg-plist b/www/squid26/pkg-plist
index fa28b0b99d1d..f04c2fc92436 100644
--- a/www/squid26/pkg-plist
+++ b/www/squid26/pkg-plist
@@ -1,4 +1,12 @@
+@comment $FreeBSD$
 etc/rc.d/squid.sh
+etc/squid/mib.txt
+@unexec if cmp -s %D/etc/squid/mime.conf %D/etc/squid/mime.conf.default; then rm -f %D/etc/squid/mime.conf; fi
+etc/squid/mime.conf.default
+@unexec if cmp -s %D/etc/squid/msntauth.conf %D/etc/squid/msntauth.conf.default; then rm -f %D/etc/squid/msntauth.conf; fi
+etc/squid/msntauth.conf.default
+@unexec if cmp -s %D/etc/squid/squid.conf %D/etc/squid/squid.conf.default; then rm -f %D/etc/squid/squid.conf; fi
+etc/squid/squid.conf.default
 etc/squid/icons/anthony-binhex.gif
 etc/squid/icons/anthony-bomb.gif
 etc/squid/icons/anthony-box.gif
@@ -26,872 +34,22 @@ etc/squid/icons/anthony-text.gif
 etc/squid/icons/anthony-unknown.gif
 etc/squid/icons/anthony-xbm.gif
 etc/squid/icons/anthony-xpm.gif
-etc/squid/errors/Bulgarian/ERR_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CANNOT_FORWARD
-etc/squid/errors/Bulgarian/ERR_CONNECT_FAIL
-etc/squid/errors/Bulgarian/ERR_DNS_FAIL
-etc/squid/errors/Bulgarian/ERR_FORWARDING_DENIED
-etc/squid/errors/Bulgarian/ERR_FTP_DISABLED
-etc/squid/errors/Bulgarian/ERR_FTP_FAILURE
-etc/squid/errors/Bulgarian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Bulgarian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Bulgarian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Bulgarian/ERR_INVALID_REQ
-etc/squid/errors/Bulgarian/ERR_INVALID_URL
-etc/squid/errors/Bulgarian/ERR_LIFETIME_EXP
-etc/squid/errors/Bulgarian/ERR_NO_RELAY
-etc/squid/errors/Bulgarian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Bulgarian/ERR_READ_ERROR
-etc/squid/errors/Bulgarian/ERR_READ_TIMEOUT
-etc/squid/errors/Bulgarian/ERR_SHUTTING_DOWN
-etc/squid/errors/Bulgarian/ERR_SOCKET_FAILURE
-etc/squid/errors/Bulgarian/ERR_TOO_BIG
-etc/squid/errors/Bulgarian/ERR_UNSUP_REQ
-etc/squid/errors/Bulgarian/ERR_URN_RESOLVE
-etc/squid/errors/Bulgarian/ERR_WRITE_ERROR
-etc/squid/errors/Bulgarian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Catalan/ERR_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CANNOT_FORWARD
-etc/squid/errors/Catalan/ERR_CONNECT_FAIL
-etc/squid/errors/Catalan/ERR_DNS_FAIL
-etc/squid/errors/Catalan/ERR_FORWARDING_DENIED
-etc/squid/errors/Catalan/ERR_FTP_DISABLED
-etc/squid/errors/Catalan/ERR_FTP_FAILURE
-etc/squid/errors/Catalan/ERR_FTP_FORBIDDEN
-etc/squid/errors/Catalan/ERR_FTP_NOT_FOUND
-etc/squid/errors/Catalan/ERR_FTP_PUT_CREATED
-etc/squid/errors/Catalan/ERR_FTP_PUT_ERROR
-etc/squid/errors/Catalan/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Catalan/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Catalan/ERR_INVALID_REQ
-etc/squid/errors/Catalan/ERR_INVALID_URL
-etc/squid/errors/Catalan/ERR_LIFETIME_EXP
-etc/squid/errors/Catalan/ERR_NO_RELAY
-etc/squid/errors/Catalan/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Catalan/ERR_READ_ERROR
-etc/squid/errors/Catalan/ERR_READ_TIMEOUT
-etc/squid/errors/Catalan/ERR_SHUTTING_DOWN
-etc/squid/errors/Catalan/ERR_SOCKET_FAILURE
-etc/squid/errors/Catalan/ERR_TOO_BIG
-etc/squid/errors/Catalan/ERR_UNSUP_REQ
-etc/squid/errors/Catalan/ERR_URN_RESOLVE
-etc/squid/errors/Catalan/ERR_WRITE_ERROR
-etc/squid/errors/Catalan/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Czech/ERR_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CANNOT_FORWARD
-etc/squid/errors/Czech/ERR_CONNECT_FAIL
-etc/squid/errors/Czech/ERR_DNS_FAIL
-etc/squid/errors/Czech/ERR_FORWARDING_DENIED
-etc/squid/errors/Czech/ERR_FTP_DISABLED
-etc/squid/errors/Czech/ERR_FTP_FAILURE
-etc/squid/errors/Czech/ERR_FTP_FORBIDDEN
-etc/squid/errors/Czech/ERR_FTP_NOT_FOUND
-etc/squid/errors/Czech/ERR_FTP_PUT_CREATED
-etc/squid/errors/Czech/ERR_FTP_PUT_ERROR
-etc/squid/errors/Czech/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Czech/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Czech/ERR_INVALID_REQ
-etc/squid/errors/Czech/ERR_INVALID_URL
-etc/squid/errors/Czech/ERR_LIFETIME_EXP
-etc/squid/errors/Czech/ERR_NO_RELAY
-etc/squid/errors/Czech/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Czech/ERR_READ_ERROR
-etc/squid/errors/Czech/ERR_READ_TIMEOUT
-etc/squid/errors/Czech/ERR_SHUTTING_DOWN
-etc/squid/errors/Czech/ERR_SOCKET_FAILURE
-etc/squid/errors/Czech/ERR_TOO_BIG
-etc/squid/errors/Czech/ERR_UNSUP_REQ
-etc/squid/errors/Czech/ERR_URN_RESOLVE
-etc/squid/errors/Czech/ERR_WRITE_ERROR
-etc/squid/errors/Czech/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Danish/ERR_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CANNOT_FORWARD
-etc/squid/errors/Danish/ERR_CONNECT_FAIL
-etc/squid/errors/Danish/ERR_DNS_FAIL
-etc/squid/errors/Danish/ERR_FORWARDING_DENIED
-etc/squid/errors/Danish/ERR_FTP_DISABLED
-etc/squid/errors/Danish/ERR_FTP_FAILURE
-etc/squid/errors/Danish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Danish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Danish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Danish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Danish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Danish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Danish/ERR_INVALID_REQ
-etc/squid/errors/Danish/ERR_INVALID_URL
-etc/squid/errors/Danish/ERR_LIFETIME_EXP
-etc/squid/errors/Danish/ERR_NO_RELAY
-etc/squid/errors/Danish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Danish/ERR_READ_ERROR
-etc/squid/errors/Danish/ERR_READ_TIMEOUT
-etc/squid/errors/Danish/ERR_SHUTTING_DOWN
-etc/squid/errors/Danish/ERR_SOCKET_FAILURE
-etc/squid/errors/Danish/ERR_TOO_BIG
-etc/squid/errors/Danish/ERR_UNSUP_REQ
-etc/squid/errors/Danish/ERR_URN_RESOLVE
-etc/squid/errors/Danish/ERR_WRITE_ERROR
-etc/squid/errors/Danish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Dutch/ERR_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CANNOT_FORWARD
-etc/squid/errors/Dutch/ERR_CONNECT_FAIL
-etc/squid/errors/Dutch/ERR_DNS_FAIL
-etc/squid/errors/Dutch/ERR_FORWARDING_DENIED
-etc/squid/errors/Dutch/ERR_FTP_DISABLED
-etc/squid/errors/Dutch/ERR_FTP_FAILURE
-etc/squid/errors/Dutch/ERR_FTP_FORBIDDEN
-etc/squid/errors/Dutch/ERR_FTP_NOT_FOUND
-etc/squid/errors/Dutch/ERR_FTP_PUT_CREATED
-etc/squid/errors/Dutch/ERR_FTP_PUT_ERROR
-etc/squid/errors/Dutch/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Dutch/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Dutch/ERR_INVALID_REQ
-etc/squid/errors/Dutch/ERR_INVALID_URL
-etc/squid/errors/Dutch/ERR_LIFETIME_EXP
-etc/squid/errors/Dutch/ERR_NO_RELAY
-etc/squid/errors/Dutch/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Dutch/ERR_READ_ERROR
-etc/squid/errors/Dutch/ERR_READ_TIMEOUT
-etc/squid/errors/Dutch/ERR_SHUTTING_DOWN
-etc/squid/errors/Dutch/ERR_SOCKET_FAILURE
-etc/squid/errors/Dutch/ERR_TOO_BIG
-etc/squid/errors/Dutch/ERR_UNSUP_REQ
-etc/squid/errors/Dutch/ERR_URN_RESOLVE
-etc/squid/errors/Dutch/ERR_WRITE_ERROR
-etc/squid/errors/Dutch/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/English/ERR_ACCESS_DENIED
-etc/squid/errors/English/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/English/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/English/ERR_CANNOT_FORWARD
-etc/squid/errors/English/ERR_CONNECT_FAIL
-etc/squid/errors/English/ERR_DNS_FAIL
-etc/squid/errors/English/ERR_FORWARDING_DENIED
-etc/squid/errors/English/ERR_FTP_DISABLED
-etc/squid/errors/English/ERR_FTP_FAILURE
-etc/squid/errors/English/ERR_FTP_FORBIDDEN
-etc/squid/errors/English/ERR_FTP_NOT_FOUND
-etc/squid/errors/English/ERR_FTP_PUT_CREATED
-etc/squid/errors/English/ERR_FTP_PUT_ERROR
-etc/squid/errors/English/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/English/ERR_FTP_UNAVAILABLE
-etc/squid/errors/English/ERR_INVALID_REQ
-etc/squid/errors/English/ERR_INVALID_URL
-etc/squid/errors/English/ERR_LIFETIME_EXP
-etc/squid/errors/English/ERR_NO_RELAY
-etc/squid/errors/English/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/English/ERR_READ_ERROR
-etc/squid/errors/English/ERR_READ_TIMEOUT
-etc/squid/errors/English/ERR_SHUTTING_DOWN
-etc/squid/errors/English/ERR_SOCKET_FAILURE
-etc/squid/errors/English/ERR_TOO_BIG
-etc/squid/errors/English/ERR_UNSUP_REQ
-etc/squid/errors/English/ERR_URN_RESOLVE
-etc/squid/errors/English/ERR_WRITE_ERROR
-etc/squid/errors/English/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Estonian/ERR_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CANNOT_FORWARD
-etc/squid/errors/Estonian/ERR_CONNECT_FAIL
-etc/squid/errors/Estonian/ERR_DNS_FAIL
-etc/squid/errors/Estonian/ERR_FORWARDING_DENIED
-etc/squid/errors/Estonian/ERR_FTP_DISABLED
-etc/squid/errors/Estonian/ERR_FTP_FAILURE
-etc/squid/errors/Estonian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Estonian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Estonian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Estonian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Estonian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Estonian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Estonian/ERR_INVALID_REQ
-etc/squid/errors/Estonian/ERR_INVALID_URL
-etc/squid/errors/Estonian/ERR_LIFETIME_EXP
-etc/squid/errors/Estonian/ERR_NO_RELAY
-etc/squid/errors/Estonian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Estonian/ERR_READ_ERROR
-etc/squid/errors/Estonian/ERR_READ_TIMEOUT
-etc/squid/errors/Estonian/ERR_SHUTTING_DOWN
-etc/squid/errors/Estonian/ERR_SOCKET_FAILURE
-etc/squid/errors/Estonian/ERR_TOO_BIG
-etc/squid/errors/Estonian/ERR_UNSUP_REQ
-etc/squid/errors/Estonian/ERR_URN_RESOLVE
-etc/squid/errors/Estonian/ERR_WRITE_ERROR
-etc/squid/errors/Estonian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Finnish/ERR_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CANNOT_FORWARD
-etc/squid/errors/Finnish/ERR_CONNECT_FAIL
-etc/squid/errors/Finnish/ERR_DNS_FAIL
-etc/squid/errors/Finnish/ERR_FORWARDING_DENIED
-etc/squid/errors/Finnish/ERR_FTP_DISABLED
-etc/squid/errors/Finnish/ERR_FTP_FAILURE
-etc/squid/errors/Finnish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Finnish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Finnish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Finnish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Finnish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Finnish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Finnish/ERR_INVALID_REQ
-etc/squid/errors/Finnish/ERR_INVALID_URL
-etc/squid/errors/Finnish/ERR_LIFETIME_EXP
-etc/squid/errors/Finnish/ERR_NO_RELAY
-etc/squid/errors/Finnish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Finnish/ERR_READ_ERROR
-etc/squid/errors/Finnish/ERR_READ_TIMEOUT
-etc/squid/errors/Finnish/ERR_SHUTTING_DOWN
-etc/squid/errors/Finnish/ERR_SOCKET_FAILURE
-etc/squid/errors/Finnish/ERR_TOO_BIG
-etc/squid/errors/Finnish/ERR_UNSUP_REQ
-etc/squid/errors/Finnish/ERR_URN_RESOLVE
-etc/squid/errors/Finnish/ERR_WRITE_ERROR
-etc/squid/errors/Finnish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/French/ERR_ACCESS_DENIED
-etc/squid/errors/French/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/French/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/French/ERR_CANNOT_FORWARD
-etc/squid/errors/French/ERR_CONNECT_FAIL
-etc/squid/errors/French/ERR_DNS_FAIL
-etc/squid/errors/French/ERR_FORWARDING_DENIED
-etc/squid/errors/French/ERR_FTP_DISABLED
-etc/squid/errors/French/ERR_FTP_FAILURE
-etc/squid/errors/French/ERR_FTP_FORBIDDEN
-etc/squid/errors/French/ERR_FTP_NOT_FOUND
-etc/squid/errors/French/ERR_FTP_PUT_CREATED
-etc/squid/errors/French/ERR_FTP_PUT_ERROR
-etc/squid/errors/French/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/French/ERR_FTP_UNAVAILABLE
-etc/squid/errors/French/ERR_INVALID_REQ
-etc/squid/errors/French/ERR_INVALID_URL
-etc/squid/errors/French/ERR_LIFETIME_EXP
-etc/squid/errors/French/ERR_NO_RELAY
-etc/squid/errors/French/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/French/ERR_READ_ERROR
-etc/squid/errors/French/ERR_READ_TIMEOUT
-etc/squid/errors/French/ERR_SHUTTING_DOWN
-etc/squid/errors/French/ERR_SOCKET_FAILURE
-etc/squid/errors/French/ERR_TOO_BIG
-etc/squid/errors/French/ERR_UNSUP_REQ
-etc/squid/errors/French/ERR_URN_RESOLVE
-etc/squid/errors/French/ERR_WRITE_ERROR
-etc/squid/errors/French/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/German/ERR_ACCESS_DENIED
-etc/squid/errors/German/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/German/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/German/ERR_CANNOT_FORWARD
-etc/squid/errors/German/ERR_CONNECT_FAIL
-etc/squid/errors/German/ERR_DNS_FAIL
-etc/squid/errors/German/ERR_FORWARDING_DENIED
-etc/squid/errors/German/ERR_FTP_DISABLED
-etc/squid/errors/German/ERR_FTP_FAILURE
-etc/squid/errors/German/ERR_FTP_FORBIDDEN
-etc/squid/errors/German/ERR_FTP_NOT_FOUND
-etc/squid/errors/German/ERR_FTP_PUT_CREATED
-etc/squid/errors/German/ERR_FTP_PUT_ERROR
-etc/squid/errors/German/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/German/ERR_FTP_UNAVAILABLE
-etc/squid/errors/German/ERR_INVALID_REQ
-etc/squid/errors/German/ERR_INVALID_URL
-etc/squid/errors/German/ERR_LIFETIME_EXP
-etc/squid/errors/German/ERR_NO_RELAY
-etc/squid/errors/German/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/German/ERR_READ_ERROR
-etc/squid/errors/German/ERR_READ_TIMEOUT
-etc/squid/errors/German/ERR_SHUTTING_DOWN
-etc/squid/errors/German/ERR_SOCKET_FAILURE
-etc/squid/errors/German/ERR_TOO_BIG
-etc/squid/errors/German/ERR_UNSUP_REQ
-etc/squid/errors/German/ERR_URN_RESOLVE
-etc/squid/errors/German/ERR_WRITE_ERROR
-etc/squid/errors/German/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Hebrew/ERR_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CANNOT_FORWARD
-etc/squid/errors/Hebrew/ERR_CONNECT_FAIL
-etc/squid/errors/Hebrew/ERR_DNS_FAIL
-etc/squid/errors/Hebrew/ERR_FORWARDING_DENIED
-etc/squid/errors/Hebrew/ERR_FTP_DISABLED
-etc/squid/errors/Hebrew/ERR_FTP_FAILURE
-etc/squid/errors/Hebrew/ERR_FTP_FORBIDDEN
-etc/squid/errors/Hebrew/ERR_FTP_NOT_FOUND
-etc/squid/errors/Hebrew/ERR_FTP_PUT_CREATED
-etc/squid/errors/Hebrew/ERR_FTP_PUT_ERROR
-etc/squid/errors/Hebrew/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Hebrew/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Hebrew/ERR_INVALID_REQ
-etc/squid/errors/Hebrew/ERR_INVALID_URL
-etc/squid/errors/Hebrew/ERR_LIFETIME_EXP
-etc/squid/errors/Hebrew/ERR_NO_RELAY
-etc/squid/errors/Hebrew/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Hebrew/ERR_READ_ERROR
-etc/squid/errors/Hebrew/ERR_READ_TIMEOUT
-etc/squid/errors/Hebrew/ERR_SHUTTING_DOWN
-etc/squid/errors/Hebrew/ERR_SOCKET_FAILURE
-etc/squid/errors/Hebrew/ERR_TOO_BIG
-etc/squid/errors/Hebrew/ERR_UNSUP_REQ
-etc/squid/errors/Hebrew/ERR_URN_RESOLVE
-etc/squid/errors/Hebrew/ERR_WRITE_ERROR
-etc/squid/errors/Hebrew/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Hungarian/ERR_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CANNOT_FORWARD
-etc/squid/errors/Hungarian/ERR_CONNECT_FAIL
-etc/squid/errors/Hungarian/ERR_DNS_FAIL
-etc/squid/errors/Hungarian/ERR_FORWARDING_DENIED
-etc/squid/errors/Hungarian/ERR_FTP_DISABLED
-etc/squid/errors/Hungarian/ERR_FTP_FAILURE
-etc/squid/errors/Hungarian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Hungarian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Hungarian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Hungarian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Hungarian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Hungarian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Hungarian/ERR_INVALID_REQ
-etc/squid/errors/Hungarian/ERR_INVALID_URL
-etc/squid/errors/Hungarian/ERR_LIFETIME_EXP
-etc/squid/errors/Hungarian/ERR_NO_RELAY
-etc/squid/errors/Hungarian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Hungarian/ERR_READ_ERROR
-etc/squid/errors/Hungarian/ERR_READ_TIMEOUT
-etc/squid/errors/Hungarian/ERR_SHUTTING_DOWN
-etc/squid/errors/Hungarian/ERR_SOCKET_FAILURE
-etc/squid/errors/Hungarian/ERR_TOO_BIG
-etc/squid/errors/Hungarian/ERR_UNSUP_REQ
-etc/squid/errors/Hungarian/ERR_URN_RESOLVE
-etc/squid/errors/Hungarian/ERR_WRITE_ERROR
-etc/squid/errors/Hungarian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Italian/ERR_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CANNOT_FORWARD
-etc/squid/errors/Italian/ERR_CONNECT_FAIL
-etc/squid/errors/Italian/ERR_DNS_FAIL
-etc/squid/errors/Italian/ERR_FORWARDING_DENIED
-etc/squid/errors/Italian/ERR_FTP_DISABLED
-etc/squid/errors/Italian/ERR_FTP_FAILURE
-etc/squid/errors/Italian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Italian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Italian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Italian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Italian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Italian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Italian/ERR_INVALID_REQ
-etc/squid/errors/Italian/ERR_INVALID_URL
-etc/squid/errors/Italian/ERR_LIFETIME_EXP
-etc/squid/errors/Italian/ERR_NO_RELAY
-etc/squid/errors/Italian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Italian/ERR_READ_ERROR
-etc/squid/errors/Italian/ERR_READ_TIMEOUT
-etc/squid/errors/Italian/ERR_SHUTTING_DOWN
-etc/squid/errors/Italian/ERR_SOCKET_FAILURE
-etc/squid/errors/Italian/ERR_TOO_BIG
-etc/squid/errors/Italian/ERR_UNSUP_REQ
-etc/squid/errors/Italian/ERR_URN_RESOLVE
-etc/squid/errors/Italian/ERR_WRITE_ERROR
-etc/squid/errors/Italian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Japanese/ERR_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CANNOT_FORWARD
-etc/squid/errors/Japanese/ERR_CONNECT_FAIL
-etc/squid/errors/Japanese/ERR_DNS_FAIL
-etc/squid/errors/Japanese/ERR_FORWARDING_DENIED
-etc/squid/errors/Japanese/ERR_FTP_DISABLED
-etc/squid/errors/Japanese/ERR_FTP_FAILURE
-etc/squid/errors/Japanese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Japanese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Japanese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Japanese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Japanese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Japanese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Japanese/ERR_INVALID_REQ
-etc/squid/errors/Japanese/ERR_INVALID_URL
-etc/squid/errors/Japanese/ERR_LIFETIME_EXP
-etc/squid/errors/Japanese/ERR_NO_RELAY
-etc/squid/errors/Japanese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Japanese/ERR_READ_ERROR
-etc/squid/errors/Japanese/ERR_READ_TIMEOUT
-etc/squid/errors/Japanese/ERR_SHUTTING_DOWN
-etc/squid/errors/Japanese/ERR_SOCKET_FAILURE
-etc/squid/errors/Japanese/ERR_TOO_BIG
-etc/squid/errors/Japanese/ERR_UNSUP_REQ
-etc/squid/errors/Japanese/ERR_URN_RESOLVE
-etc/squid/errors/Japanese/ERR_WRITE_ERROR
-etc/squid/errors/Japanese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Korean/ERR_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CANNOT_FORWARD
-etc/squid/errors/Korean/ERR_CONNECT_FAIL
-etc/squid/errors/Korean/ERR_DNS_FAIL
-etc/squid/errors/Korean/ERR_FORWARDING_DENIED
-etc/squid/errors/Korean/ERR_FTP_DISABLED
-etc/squid/errors/Korean/ERR_FTP_FAILURE
-etc/squid/errors/Korean/ERR_FTP_FORBIDDEN
-etc/squid/errors/Korean/ERR_FTP_NOT_FOUND
-etc/squid/errors/Korean/ERR_FTP_PUT_CREATED
-etc/squid/errors/Korean/ERR_FTP_PUT_ERROR
-etc/squid/errors/Korean/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Korean/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Korean/ERR_INVALID_REQ
-etc/squid/errors/Korean/ERR_INVALID_URL
-etc/squid/errors/Korean/ERR_LIFETIME_EXP
-etc/squid/errors/Korean/ERR_NO_RELAY
-etc/squid/errors/Korean/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Korean/ERR_READ_ERROR
-etc/squid/errors/Korean/ERR_READ_TIMEOUT
-etc/squid/errors/Korean/ERR_SHUTTING_DOWN
-etc/squid/errors/Korean/ERR_SOCKET_FAILURE
-etc/squid/errors/Korean/ERR_TOO_BIG
-etc/squid/errors/Korean/ERR_UNSUP_REQ
-etc/squid/errors/Korean/ERR_URN_RESOLVE
-etc/squid/errors/Korean/ERR_WRITE_ERROR
-etc/squid/errors/Korean/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Lithuanian/ERR_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CANNOT_FORWARD
-etc/squid/errors/Lithuanian/ERR_CONNECT_FAIL
-etc/squid/errors/Lithuanian/ERR_DNS_FAIL
-etc/squid/errors/Lithuanian/ERR_FORWARDING_DENIED
-etc/squid/errors/Lithuanian/ERR_FTP_DISABLED
-etc/squid/errors/Lithuanian/ERR_FTP_FAILURE
-etc/squid/errors/Lithuanian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Lithuanian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Lithuanian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Lithuanian/ERR_INVALID_REQ
-etc/squid/errors/Lithuanian/ERR_INVALID_URL
-etc/squid/errors/Lithuanian/ERR_LIFETIME_EXP
-etc/squid/errors/Lithuanian/ERR_NO_RELAY
-etc/squid/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Lithuanian/ERR_READ_ERROR
-etc/squid/errors/Lithuanian/ERR_READ_TIMEOUT
-etc/squid/errors/Lithuanian/ERR_SHUTTING_DOWN
-etc/squid/errors/Lithuanian/ERR_SOCKET_FAILURE
-etc/squid/errors/Lithuanian/ERR_TOO_BIG
-etc/squid/errors/Lithuanian/ERR_UNSUP_REQ
-etc/squid/errors/Lithuanian/ERR_URN_RESOLVE
-etc/squid/errors/Lithuanian/ERR_WRITE_ERROR
-etc/squid/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Polish/ERR_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CANNOT_FORWARD
-etc/squid/errors/Polish/ERR_CONNECT_FAIL
-etc/squid/errors/Polish/ERR_DNS_FAIL
-etc/squid/errors/Polish/ERR_FORWARDING_DENIED
-etc/squid/errors/Polish/ERR_FTP_DISABLED
-etc/squid/errors/Polish/ERR_FTP_FAILURE
-etc/squid/errors/Polish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Polish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Polish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Polish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Polish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Polish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Polish/ERR_INVALID_REQ
-etc/squid/errors/Polish/ERR_INVALID_URL
-etc/squid/errors/Polish/ERR_LIFETIME_EXP
-etc/squid/errors/Polish/ERR_NO_RELAY
-etc/squid/errors/Polish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Polish/ERR_READ_ERROR
-etc/squid/errors/Polish/ERR_READ_TIMEOUT
-etc/squid/errors/Polish/ERR_SHUTTING_DOWN
-etc/squid/errors/Polish/ERR_SOCKET_FAILURE
-etc/squid/errors/Polish/ERR_TOO_BIG
-etc/squid/errors/Polish/ERR_UNSUP_REQ
-etc/squid/errors/Polish/ERR_URN_RESOLVE
-etc/squid/errors/Polish/ERR_WRITE_ERROR
-etc/squid/errors/Polish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Portuguese/ERR_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CANNOT_FORWARD
-etc/squid/errors/Portuguese/ERR_CONNECT_FAIL
-etc/squid/errors/Portuguese/ERR_DNS_FAIL
-etc/squid/errors/Portuguese/ERR_FORWARDING_DENIED
-etc/squid/errors/Portuguese/ERR_FTP_DISABLED
-etc/squid/errors/Portuguese/ERR_FTP_FAILURE
-etc/squid/errors/Portuguese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Portuguese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Portuguese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Portuguese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Portuguese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Portuguese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Portuguese/ERR_INVALID_REQ
-etc/squid/errors/Portuguese/ERR_INVALID_URL
-etc/squid/errors/Portuguese/ERR_LIFETIME_EXP
-etc/squid/errors/Portuguese/ERR_NO_RELAY
-etc/squid/errors/Portuguese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Portuguese/ERR_READ_ERROR
-etc/squid/errors/Portuguese/ERR_READ_TIMEOUT
-etc/squid/errors/Portuguese/ERR_SHUTTING_DOWN
-etc/squid/errors/Portuguese/ERR_SOCKET_FAILURE
-etc/squid/errors/Portuguese/ERR_TOO_BIG
-etc/squid/errors/Portuguese/ERR_UNSUP_REQ
-etc/squid/errors/Portuguese/ERR_URN_RESOLVE
-etc/squid/errors/Portuguese/ERR_WRITE_ERROR
-etc/squid/errors/Portuguese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Romanian/ERR_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CANNOT_FORWARD
-etc/squid/errors/Romanian/ERR_CONNECT_FAIL
-etc/squid/errors/Romanian/ERR_DNS_FAIL
-etc/squid/errors/Romanian/ERR_FORWARDING_DENIED
-etc/squid/errors/Romanian/ERR_FTP_DISABLED
-etc/squid/errors/Romanian/ERR_FTP_FAILURE
-etc/squid/errors/Romanian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Romanian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Romanian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Romanian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Romanian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Romanian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Romanian/ERR_INVALID_REQ
-etc/squid/errors/Romanian/ERR_INVALID_URL
-etc/squid/errors/Romanian/ERR_LIFETIME_EXP
-etc/squid/errors/Romanian/ERR_NO_RELAY
-etc/squid/errors/Romanian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Romanian/ERR_READ_ERROR
-etc/squid/errors/Romanian/ERR_READ_TIMEOUT
-etc/squid/errors/Romanian/ERR_SHUTTING_DOWN
-etc/squid/errors/Romanian/ERR_SOCKET_FAILURE
-etc/squid/errors/Romanian/ERR_TOO_BIG
-etc/squid/errors/Romanian/ERR_UNSUP_REQ
-etc/squid/errors/Romanian/ERR_URN_RESOLVE
-etc/squid/errors/Romanian/ERR_WRITE_ERROR
-etc/squid/errors/Romanian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Russian-1251/ERR_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CANNOT_FORWARD
-etc/squid/errors/Russian-1251/ERR_CONNECT_FAIL
-etc/squid/errors/Russian-1251/ERR_DNS_FAIL
-etc/squid/errors/Russian-1251/ERR_FORWARDING_DENIED
-etc/squid/errors/Russian-1251/ERR_FTP_DISABLED
-etc/squid/errors/Russian-1251/ERR_FTP_FAILURE
-etc/squid/errors/Russian-1251/ERR_FTP_FORBIDDEN
-etc/squid/errors/Russian-1251/ERR_FTP_NOT_FOUND
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_CREATED
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_ERROR
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Russian-1251/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Russian-1251/ERR_INVALID_REQ
-etc/squid/errors/Russian-1251/ERR_INVALID_URL
-etc/squid/errors/Russian-1251/ERR_LIFETIME_EXP
-etc/squid/errors/Russian-1251/ERR_NO_RELAY
-etc/squid/errors/Russian-1251/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Russian-1251/ERR_READ_ERROR
-etc/squid/errors/Russian-1251/ERR_READ_TIMEOUT
-etc/squid/errors/Russian-1251/ERR_SHUTTING_DOWN
-etc/squid/errors/Russian-1251/ERR_SOCKET_FAILURE
-etc/squid/errors/Russian-1251/ERR_TOO_BIG
-etc/squid/errors/Russian-1251/ERR_UNSUP_REQ
-etc/squid/errors/Russian-1251/ERR_URN_RESOLVE
-etc/squid/errors/Russian-1251/ERR_WRITE_ERROR
-etc/squid/errors/Russian-1251/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Russian-koi8-r/ERR_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CANNOT_FORWARD
-etc/squid/errors/Russian-koi8-r/ERR_CONNECT_FAIL
-etc/squid/errors/Russian-koi8-r/ERR_DNS_FAIL
-etc/squid/errors/Russian-koi8-r/ERR_FORWARDING_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_DISABLED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_FAILURE
-etc/squid/errors/Russian-koi8-r/ERR_FTP_FORBIDDEN
-etc/squid/errors/Russian-koi8-r/ERR_FTP_NOT_FOUND
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_CREATED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Russian-koi8-r/ERR_INVALID_REQ
-etc/squid/errors/Russian-koi8-r/ERR_INVALID_URL
-etc/squid/errors/Russian-koi8-r/ERR_LIFETIME_EXP
-etc/squid/errors/Russian-koi8-r/ERR_NO_RELAY
-etc/squid/errors/Russian-koi8-r/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Russian-koi8-r/ERR_READ_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_READ_TIMEOUT
-etc/squid/errors/Russian-koi8-r/ERR_SHUTTING_DOWN
-etc/squid/errors/Russian-koi8-r/ERR_SOCKET_FAILURE
-etc/squid/errors/Russian-koi8-r/ERR_TOO_BIG
-etc/squid/errors/Russian-koi8-r/ERR_UNSUP_REQ
-etc/squid/errors/Russian-koi8-r/ERR_URN_RESOLVE
-etc/squid/errors/Russian-koi8-r/ERR_WRITE_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Serbian/ERR_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CANNOT_FORWARD
-etc/squid/errors/Serbian/ERR_CONNECT_FAIL
-etc/squid/errors/Serbian/ERR_DNS_FAIL
-etc/squid/errors/Serbian/ERR_FORWARDING_DENIED
-etc/squid/errors/Serbian/ERR_FTP_DISABLED
-etc/squid/errors/Serbian/ERR_FTP_FAILURE
-etc/squid/errors/Serbian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Serbian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Serbian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Serbian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Serbian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Serbian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Serbian/ERR_INVALID_REQ
-etc/squid/errors/Serbian/ERR_INVALID_URL
-etc/squid/errors/Serbian/ERR_LIFETIME_EXP
-etc/squid/errors/Serbian/ERR_NO_RELAY
-etc/squid/errors/Serbian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Serbian/ERR_READ_ERROR
-etc/squid/errors/Serbian/ERR_READ_TIMEOUT
-etc/squid/errors/Serbian/ERR_SHUTTING_DOWN
-etc/squid/errors/Serbian/ERR_SOCKET_FAILURE
-etc/squid/errors/Serbian/ERR_TOO_BIG
-etc/squid/errors/Serbian/ERR_UNSUP_REQ
-etc/squid/errors/Serbian/ERR_URN_RESOLVE
-etc/squid/errors/Serbian/ERR_WRITE_ERROR
-etc/squid/errors/Serbian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Simplify_Chinese/ERR_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CANNOT_FORWARD
-etc/squid/errors/Simplify_Chinese/ERR_CONNECT_FAIL
-etc/squid/errors/Simplify_Chinese/ERR_DNS_FAIL
-etc/squid/errors/Simplify_Chinese/ERR_FORWARDING_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_DISABLED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_FAILURE
-etc/squid/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Simplify_Chinese/ERR_INVALID_REQ
-etc/squid/errors/Simplify_Chinese/ERR_INVALID_URL
-etc/squid/errors/Simplify_Chinese/ERR_LIFETIME_EXP
-etc/squid/errors/Simplify_Chinese/ERR_NO_RELAY
-etc/squid/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Simplify_Chinese/ERR_READ_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_READ_TIMEOUT
-etc/squid/errors/Simplify_Chinese/ERR_SHUTTING_DOWN
-etc/squid/errors/Simplify_Chinese/ERR_SOCKET_FAILURE
-etc/squid/errors/Simplify_Chinese/ERR_TOO_BIG
-etc/squid/errors/Simplify_Chinese/ERR_UNSUP_REQ
-etc/squid/errors/Simplify_Chinese/ERR_URN_RESOLVE
-etc/squid/errors/Simplify_Chinese/ERR_WRITE_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Slovak/ERR_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CANNOT_FORWARD
-etc/squid/errors/Slovak/ERR_CONNECT_FAIL
-etc/squid/errors/Slovak/ERR_DNS_FAIL
-etc/squid/errors/Slovak/ERR_FORWARDING_DENIED
-etc/squid/errors/Slovak/ERR_FTP_DISABLED
-etc/squid/errors/Slovak/ERR_FTP_FAILURE
-etc/squid/errors/Slovak/ERR_FTP_FORBIDDEN
-etc/squid/errors/Slovak/ERR_FTP_NOT_FOUND
-etc/squid/errors/Slovak/ERR_FTP_PUT_CREATED
-etc/squid/errors/Slovak/ERR_FTP_PUT_ERROR
-etc/squid/errors/Slovak/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Slovak/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Slovak/ERR_INVALID_REQ
-etc/squid/errors/Slovak/ERR_INVALID_URL
-etc/squid/errors/Slovak/ERR_LIFETIME_EXP
-etc/squid/errors/Slovak/ERR_NO_RELAY
-etc/squid/errors/Slovak/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Slovak/ERR_READ_ERROR
-etc/squid/errors/Slovak/ERR_READ_TIMEOUT
-etc/squid/errors/Slovak/ERR_SHUTTING_DOWN
-etc/squid/errors/Slovak/ERR_SOCKET_FAILURE
-etc/squid/errors/Slovak/ERR_TOO_BIG
-etc/squid/errors/Slovak/ERR_UNSUP_REQ
-etc/squid/errors/Slovak/ERR_URN_RESOLVE
-etc/squid/errors/Slovak/ERR_WRITE_ERROR
-etc/squid/errors/Slovak/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Spanish/ERR_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CANNOT_FORWARD
-etc/squid/errors/Spanish/ERR_CONNECT_FAIL
-etc/squid/errors/Spanish/ERR_DNS_FAIL
-etc/squid/errors/Spanish/ERR_FORWARDING_DENIED
-etc/squid/errors/Spanish/ERR_FTP_DISABLED
-etc/squid/errors/Spanish/ERR_FTP_FAILURE
-etc/squid/errors/Spanish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Spanish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Spanish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Spanish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Spanish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Spanish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Spanish/ERR_INVALID_REQ
-etc/squid/errors/Spanish/ERR_INVALID_URL
-etc/squid/errors/Spanish/ERR_LIFETIME_EXP
-etc/squid/errors/Spanish/ERR_NO_RELAY
-etc/squid/errors/Spanish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Spanish/ERR_READ_ERROR
-etc/squid/errors/Spanish/ERR_READ_TIMEOUT
-etc/squid/errors/Spanish/ERR_SHUTTING_DOWN
-etc/squid/errors/Spanish/ERR_SOCKET_FAILURE
-etc/squid/errors/Spanish/ERR_TOO_BIG
-etc/squid/errors/Spanish/ERR_UNSUP_REQ
-etc/squid/errors/Spanish/ERR_URN_RESOLVE
-etc/squid/errors/Spanish/ERR_WRITE_ERROR
-etc/squid/errors/Spanish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Swedish/ERR_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CANNOT_FORWARD
-etc/squid/errors/Swedish/ERR_CONNECT_FAIL
-etc/squid/errors/Swedish/ERR_DNS_FAIL
-etc/squid/errors/Swedish/ERR_FORWARDING_DENIED
-etc/squid/errors/Swedish/ERR_FTP_DISABLED
-etc/squid/errors/Swedish/ERR_FTP_FAILURE
-etc/squid/errors/Swedish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Swedish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Swedish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Swedish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Swedish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Swedish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Swedish/ERR_INVALID_REQ
-etc/squid/errors/Swedish/ERR_INVALID_URL
-etc/squid/errors/Swedish/ERR_LIFETIME_EXP
-etc/squid/errors/Swedish/ERR_NO_RELAY
-etc/squid/errors/Swedish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Swedish/ERR_READ_ERROR
-etc/squid/errors/Swedish/ERR_READ_TIMEOUT
-etc/squid/errors/Swedish/ERR_SHUTTING_DOWN
-etc/squid/errors/Swedish/ERR_SOCKET_FAILURE
-etc/squid/errors/Swedish/ERR_TOO_BIG
-etc/squid/errors/Swedish/ERR_UNSUP_REQ
-etc/squid/errors/Swedish/ERR_URN_RESOLVE
-etc/squid/errors/Swedish/ERR_WRITE_ERROR
-etc/squid/errors/Swedish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Traditional_Chinese/ERR_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CANNOT_FORWARD
-etc/squid/errors/Traditional_Chinese/ERR_CONNECT_FAIL
-etc/squid/errors/Traditional_Chinese/ERR_DNS_FAIL
-etc/squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_DISABLED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_FAILURE
-etc/squid/errors/Traditional_Chinese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Traditional_Chinese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Traditional_Chinese/ERR_INVALID_REQ
-etc/squid/errors/Traditional_Chinese/ERR_INVALID_URL
-etc/squid/errors/Traditional_Chinese/ERR_LIFETIME_EXP
-etc/squid/errors/Traditional_Chinese/ERR_NO_RELAY
-etc/squid/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Traditional_Chinese/ERR_READ_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_READ_TIMEOUT
-etc/squid/errors/Traditional_Chinese/ERR_SHUTTING_DOWN
-etc/squid/errors/Traditional_Chinese/ERR_SOCKET_FAILURE
-etc/squid/errors/Traditional_Chinese/ERR_TOO_BIG
-etc/squid/errors/Traditional_Chinese/ERR_UNSUP_REQ
-etc/squid/errors/Traditional_Chinese/ERR_URN_RESOLVE
-etc/squid/errors/Traditional_Chinese/ERR_WRITE_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Turkish/ERR_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CANNOT_FORWARD
-etc/squid/errors/Turkish/ERR_CONNECT_FAIL
-etc/squid/errors/Turkish/ERR_DNS_FAIL
-etc/squid/errors/Turkish/ERR_FORWARDING_DENIED
-etc/squid/errors/Turkish/ERR_FTP_DISABLED
-etc/squid/errors/Turkish/ERR_FTP_FAILURE
-etc/squid/errors/Turkish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Turkish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Turkish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Turkish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Turkish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Turkish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Turkish/ERR_INVALID_REQ
-etc/squid/errors/Turkish/ERR_INVALID_URL
-etc/squid/errors/Turkish/ERR_LIFETIME_EXP
-etc/squid/errors/Turkish/ERR_NO_RELAY
-etc/squid/errors/Turkish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Turkish/ERR_READ_ERROR
-etc/squid/errors/Turkish/ERR_READ_TIMEOUT
-etc/squid/errors/Turkish/ERR_SHUTTING_DOWN
-etc/squid/errors/Turkish/ERR_SOCKET_FAILURE
-etc/squid/errors/Turkish/ERR_TOO_BIG
-etc/squid/errors/Turkish/ERR_UNSUP_REQ
-etc/squid/errors/Turkish/ERR_URN_RESOLVE
-etc/squid/errors/Turkish/ERR_WRITE_ERROR
-etc/squid/errors/Turkish/ERR_ZERO_SIZE_OBJECT
-etc/squid/mib.txt
-@unexec if cmp -s %D/etc/squid/mime.conf %D/etc/squid/mime.conf.default; then rm -f %D/etc/squid/mime.conf; fi
-etc/squid/mime.conf.default
-@exec [ -f %B/mime.conf ] || cp %B/%f %B/mime.conf
-@unexec if cmp -s %D/etc/squid/squid.conf %D/etc/squid/squid.conf.default; then rm -f %D/etc/squid/squid.conf; fi
-etc/squid/squid.conf.default
-@exec [ -f %B/squid.conf ] || cp %B/%f %B/squid.conf
-libexec/cachemgr.cgi
-libexec/diskd
-libexec/unlinkd
-libexec/ip_user_check
-libexec/yp_auth
-libexec/pam_auth
-libexec/ncsa_auth
-libexec/squid_unix_group
 sbin/RunAccel
 sbin/RunCache
 sbin/squidclient
 sbin/squid
-@exec mkdir -p %D/squid/cache
-@exec chown nobody:nogroup %D/squid/cache
-@exec mkdir -p %D/squid/logs
-@exec chown nobody:nogroup %D/squid/logs
-@dirrm etc/squid/errors/Bulgarian
-@dirrm etc/squid/errors/Catalan
-@dirrm etc/squid/errors/Czech
-@dirrm etc/squid/errors/Danish
-@dirrm etc/squid/errors/Dutch
-@dirrm etc/squid/errors/English
-@dirrm etc/squid/errors/Estonian
-@dirrm etc/squid/errors/Finnish
-@dirrm etc/squid/errors/French
-@dirrm etc/squid/errors/German
-@dirrm etc/squid/errors/Hebrew
-@dirrm etc/squid/errors/Hungarian
-@dirrm etc/squid/errors/Italian
-@dirrm etc/squid/errors/Japanese
-@dirrm etc/squid/errors/Korean
-@dirrm etc/squid/errors/Lithuanian
-@dirrm etc/squid/errors/Polish
-@dirrm etc/squid/errors/Portuguese
-@dirrm etc/squid/errors/Romanian
-@dirrm etc/squid/errors/Russian-1251
-@dirrm etc/squid/errors/Russian-koi8-r
-@dirrm etc/squid/errors/Serbian
-@dirrm etc/squid/errors/Simplify_Chinese
-@dirrm etc/squid/errors/Slovak
-@dirrm etc/squid/errors/Spanish
-@dirrm etc/squid/errors/Swedish
-@dirrm etc/squid/errors/Traditional_Chinese
-@dirrm etc/squid/errors/Turkish
-@dirrm etc/squid/icons
-@dirrm etc/squid/errors
-@dirrm etc/squid
-@dirrm squid/logs
-@dirrm squid/cache
-@dirrm squid
+%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES.html
+%%PORTDOCS%%%%DOCSDIR%%/debug-sections.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@comment Start of dynamically generated plist
+@comment End of dynamically generated plist
+@comment These directories are maybe not empty at deinstallation time.
+@comment Since we try to preserve the data in there for updates anyway, be quiet.
+@unexec rmdir %D/etc/squid/icons 2>/dev/null || true
+@unexec rmdir %D/etc/squid/errors 2>/dev/null || true
+@unexec rmdir %D/etc/squid 2>/dev/null || true
+@unexec rmdir %D/squid/logs 2>/dev/null || true
+@unexec rmdir %D/squid/cache 2>/dev/null || true
+@unexec rmdir %D/squid 2>/dev/null || true
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index baf1c842a527..bed437c96f56 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -4,10 +4,31 @@
 #
 # $FreeBSD$
 #
+# Tunables:
+# WITH_SQUID_PINGER
+#   install the external icmp helper program (`pinger') for hierarchy stats and
+#   selection
+# WITH_SQUID_LDAP_AUTH
+#   install external modules for authentication against LDAP servers
+# SQUID_{U,G}ID
+#   Which user/group squid should run as (default: squid/squid).
+#   The user and group will be created if they do not already exist.
+#   NOTE: before version 2.5.4_6, these settings defaulted to
+#   nobody/nogroup.
+#   If you wish to keep these settings, please define SQUID_UID=nobody and
+#   SQUID_GID=nogroup in your make environment before you start the update.
+# SQUID_LANGUAGES
+#   A list of languages for which error page files should be installed
+#   (default: all)
+# SQUID_DEFAULT_LANG
+#   If you define SQUID_LANGUAGES, select which language should be the default
+#   (default: English)
+# SQUID_CONFIGURE_ARGS
+#   Additional configuration options, see below for a list
 
 PORTNAME=	squid
 PORTVERSION=	2.5.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -17,7 +38,6 @@ MASTER_SITES=	\
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.5.STABLE4
-EXTRACT_SUFX=	.tar.bz2
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
@@ -54,89 +74,131 @@ PATCHFILES=	squid-2.5.STABLE4-reconfigure_message.patch \
 		squid-2.5.STABLE4-pinger.patch \
 		squid-2.5.STABLE4-partial_reload.patch \
 		squid-2.5.STABLE4-ldap_tls.patch \
-		squid-2.5.STABLE4-ldap_group_bufsize.patch
+		squid-2.5.STABLE4-ldap_group_bufsize.patch \
+		squid-2.5.STABLE4-http_workarounds.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
 COMMENT=	The successful WWW proxy cache and accelerator
 
+CONFLICTS=	squid-*
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
-# Follow the apache port's lead...
+
+SQUID_UID?=	squid
+SQUID_GID?=	squid
+
+MAN8=		squid.8
+DOCS=		QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
+
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--datadir=${PREFIX}/etc/squid \
+		--libexecdir=${PREFIX}/libexec/squid \
 		--localstatedir=${PREFIX}/squid \
 		--enable-storeio="ufs diskd null" \
 		--enable-removal-policies="lru heap" \
-		--enable-auth=basic --enable-basic-auth-helpers="NCSA PAM YP" \
-		--enable-external-acl-helpers="ip_user unix_group" \
-		--enable-underscores ${SQUID_CONFIGURE_ARGS}
-
-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
-#CONFIGURE_ARGS+= --enable-dlmalloc
-#  - Compile and use the supplied GNUregex routines instead of BSD regex.
-#CONFIGURE_ARGS+= --enable-gnuregex
-#  - Enable simple malloc debugging
-#CONFIGURE_ARGS+= --enable-xmalloc-debug
-#  - Detailed trace of memory allocations
-#CONFIGURE_ARGS+= --enable-xmalloc-debug-count
-#  - Show malloc statistics in cachemgr status pages
-#CONFIGURE_ARGS+= --enable-xmalloc-statistics
-#  - Enable CARP support
-#CONFIGURE_ARGS+= --enable-carp
-#  - Enable ICMP pinging for heirarchy stats and selection
-#CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay pools to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-pools
-#  - Enable generic memory use tracing
-#CONFIGURE_ARGS+= --enable-mem-gen-trace
-#  - Enable logging of the User-Agent header
-#CONFIGURE_ARGS+= --enable-useragent-log
-#  - Disable Web Cache Coordination Protocol
-#CONFIGURE_ARGS+= --disable-wccp
-#  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent-hack
-#  - Turn on SNMP server support
-#CONFIGURE_ARGS+= --enable-snmp
-#  - Turn on SSL server support for reverse proxies
-#CONFIGURE_ARGS+= --enable-ssl
-#  - Optimize time updates to one per second rather than calling gettimeofday()
-#CONFIGURE_ARGS+= --enable-time-hack
-#  - Set an explicit hostname in cachemgr.cgi
-#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-#  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
-#    assigned IP addresses)
-#CONFIGURE_ARGS+= --enable-arp-acl
-#  - Enable HTCP protocol
-#CONFIGURE_ARGS+= --enable-htcp
-#  - Enable Forw/Via database
-#CONFIGURE_ARGS+= --enable-forw-via-db
-#  - 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
-#  (--enable-poll is not needed, it's detected correctly on 3.0)
-#  - Strict HTTP compliance
-#CONFIGURE_ARGS+= --disable-http-violations
-#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
-#CONFIGURE_ARGS+= --enable-ipf-transparent
-# (--enable-leakfinder is a developer support tool only)
-#  - Compile out code that does optional Ident (RFC931) lookups
-#CONFIGURE_ARGS+= --disable-ident-lookups
-#  - Disable squid's internal async DNS lookup code.
-#CONFIGURE_ARGS+= --disable-internal-dns
-#  - Use truncate() rather than unlink()
-#CONFIGURE_ARGS+= --enable-truncate
-#  - accept the illegal '_' character in hostnames.
-#CONFIGURE_ARGS+= --enable-underscores
-#  - Enable control of different heap replacement algorithms at runtime.
-#CONFIGURE_ARGS+= --enable-removal-policies
+		--enable-underscores
+
+.if defined(WITH_SQUID_PINGER)
+CONFIGURE_ARGS+=	--enable-icmp
+.endif
+
+# Authentication methods and modules:
+
+basic_auth=	NCSA PAM YP MSNT winbind
+external_acl=	ip_user unix_group wbinfo_group winbind_group
+MAN8+=		pam_auth.8 squid_unix_group.8
+.if defined(WITH_SQUID_LDAP_AUTH)
+USE_OPENLDAP=	yes
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+MAN8+=		squid_ldap_auth.8 squid_ldap_group.8
+basic_auth+=	LDAP
+external_acl+=	ldap_group
+.endif
+CONFIGURE_ARGS+=	--enable-auth="basic ntlm digest" \
+			--enable-basic-auth-helpers="${basic_auth}" \
+			--enable-digest-auth-helpers="password" \
+			--enable-external-acl-helpers="${external_acl}" \
+			--enable-ntlm-auth-helpers="winbind"
+
+# Languages:
+#
+# If you do not define SQUID_LANGUAGES yourself, all available language files
+# will be installed; the default language will be english.
+
+SQUID_LANGUAGES?=	\
+	Bulgarian Catalan Czech Danish Dutch English Estonian Finnish      \
+	French German Hebrew Hungarian Italian Japanese Korean Lithuanian  \
+	Polish Portuguese Romanian Russian-1251 Russian-koi8-r Serbian     \
+	Simplify_Chinese Slovak Spanish Swedish Traditional_Chinese Turkish
+SQUID_DEFAULT_LANG?=	English
+CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
+			--enable-default-err-language=${SQUID_DEFAULT_LANG}
+
+# Other configure options you might want to set using SQUID_CONFIGURE_ARGS:
+# Please see the configure script in the squid source distribution for a
+# complete list.
+#
+# --enable-dlmalloc
+#  Compile and use the malloc package from Doug Lea
+# --enable-gnuregex
+#  Compile and use the supplied GNUregex routines instead of BSD regex.
+# --enable-xmalloc-statistics
+#  Show malloc statistics in status page
+# --enable-carp
+#  Enable CARP support
+# --enable-delay-pools
+#  Enable delay pools to limit bandwidth usage
+# --enable-useragent-log
+#  Enable logging of the User-Agent header
+# --disable-wccp
+#  Disable Web Cache Coordination Protocol
+# --enable-snmp
+#  Turn on SNMP server support
+# --enable-ssl
+#  Turn on SSL server support for reverse proxies
+# --enable-time-hack
+#  Optimize time updates to one per second rather than calling gettimeofday()
+# --enable-cachemgr-hostname=some.hostname
+#  Set an explicit hostname in cachemgr.cgi
+# --enable-arp-acl
+#  Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+#  assigned IP addresses)
+# --enable-htcp
+#  Enable HTCP protocol
+# --enable-forw-via-db
+#  Enable Forw/Via database
+# --enable-cache-digests
+#  Use Cache Digests - see http://www.squid-cache.org/Doc/FAQ/FAQ-16.html
+# --disable-http-violations
+#  Strict HTTP compliance
+# --enable-ipf-transparent
+#  Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#  (Note: this is currently broken due to ipf headers not being installed to
+#  the base system, see PRs ports/60700 and misc/44148 for details)
+#  Note: see http://www.squid-cache.org/Doc/FAQ/FAQ-17.html for information
+#  about how to do transparent proxying with ipfw(8).
+# --disable-ident-lookups
+#  Compile out code that does optional Ident (RFC931) lookups
+# --disable-internal-dns
+#  Install the old external "dnsserver" binary
+# --enable-truncate
+#  Use truncate() rather than unlink()
+# --disable-hostname-checks
+#  Squid by default rejects any host names with odd characters in their name
+#  to conform with internet standards. If you disagree with this you may use
+#  this switch to turn off any such checks, provided that the resolver used by
+#  Squid does not reject such host names. This may be required to participate
+#  in testbeds for international domain names.
+# --disable-unlinkd
+#  Do not use "unlinkd"
+# --enable-stacktraces
+#  Enable automatic call backtrace on fatal errors
+
+CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@@ -145,37 +207,53 @@ post-patch:
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
+pre-configure:
+	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
+	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' ${WRKSRC}/src/cf.data.pre
+
+pre-install:
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	    -e 's|%%SQUID_UID%%|${SQUID_UID}|g' ${FILESDIR}/squid.sh \
+	    >${WRKDIR}/squid.sh
+
+pre-su-install:
+	@${SETENV} SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID} \
+	    PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+
 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 sbin_file in client squid
-	if [ -f ${PREFIX}/sbin/${sbin_file} ] ; then \
-		${STRIP_CMD} ${PREFIX}/sbin/${sbin_file} ; \
-	fi
-.endfor
-.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			\
-		${MKDIR} ${PREFIX}/squid/logs;		  	\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/logs;   \
-	fi
-	@if [ ! -d ${PREFIX}/squid/cache ]; then		\
-		${MKDIR} ${PREFIX}/squid/cache;			\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/cache;  \
-	fi
-	@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; \
-	fi
+.if defined(WITH_SQUID_PINGER)
+	${CHMOD} 4710 ${PREFIX}/libexec/squid/pinger; \
+	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
+.endif
+	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
+.if exists(${PREFIX}/etc/squid/errors/Lithuanian)
 # Work around the fact that the errorpages.patch creates files in
 # an "Attic" subdir:
 	@${FIND} ${WRKSRC}/errors/Lithuanian/Attic -type f \
-	-exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \;
+   	    -exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \;
+.endif
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+# Generate parts of pkg-plist on the fly:
+	@cd ${PREFIX} && ${FIND} libexec/squid -type f -o -type l \
+	    >${WRKDIR}/plist.dynamic
+	@${ECHO_CMD} "@dirrm libexec/squid" >>${WRKDIR}/plist.dynamic
+# Only register what we should have installed, there may be local additions
+# present:
+.for d in ${SQUID_LANGUAGES}
+	@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f \
+	    >>${WRKDIR}/plist.dynamic
+	@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
+.endfor
+	@${ECHO_CMD} "r ${TMPPLIST}" >${WRKDIR}/ex.script
+	@${ECHO_CMD} "/Start of dynamically generated plist" >>${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${WRKDIR}/plist.dynamic" >>${WRKDIR}/ex.script
+	@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
+	@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
+	@cd ${WRKDIR} && ex <ex.script >/dev/null
 
 .include <bsd.port.mk>
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 76f9e296de4d..893a0e19d67a 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -33,3 +33,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5
 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34
 MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284
 MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c
+MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac
diff --git a/www/squid27/files/patch-src-cf.data.pre b/www/squid27/files/patch-src-cf.data.pre
new file mode 100644
index 000000000000..2a8e1eff429f
--- /dev/null
+++ b/www/squid27/files/patch-src-cf.data.pre
@@ -0,0 +1,20 @@
+--- src/cf.data.pre.orig	Thu May  1 14:07:51 2003
++++ src/cf.data.pre	Thu May  1 14:13:12 2003
+@@ -2325,7 +2325,7 @@
+ 
+ NAME: cache_effective_user
+ TYPE: string
+-DEFAULT: nobody
++DEFAULT: %%SQUID_UID%%
+ LOC: Config.effectiveUser
+ DOC_NONE
+ 
+@@ -2337,7 +2337,7 @@
+ 
+ 	If you start Squid as root, it will change its effective/real
+ 	UID/GID to the UID/GID specified below.  The default is to
+-	change to UID to nobody.  If you define cache_effective_user,
++	change to UID to %%SQUID_UID%%.  If you define cache_effective_user,
+ 	but not cache_effective_group, Squid sets the GID the
+ 	effective user's default group ID (taken from the password
+ 	file).
diff --git a/www/squid27/files/squid.sh b/www/squid27/files/squid.sh
index 40f655b04f27..ec92a10bc3fc 100644
--- a/www/squid27/files/squid.sh
+++ b/www/squid27/files/squid.sh
@@ -1,26 +1,75 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: squid
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD
+# 
+# Note:
+# If you are running an rcNG-System (i.e. FreeBSD 5 and later or after
+# having installed the rc_subr-port on an earlier system) you must set
+# "squid_enable=YES" in either /etc/rc.conf, /etc/rc.conf.local or
+# /etc/rc.conf.d/squid to make this script actually do something. There
+# you can also set squid_chdir, squid_user, and squid_flags.
+#
+# Please see squid(8), rc.conf(5) and rc(8) for further details.
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+unset rcNG
+name="squid"
+command=%%PREFIX%%/sbin/squid
+extra_commands=reload
+reload_cmd="${command} -k reconfigure"
+stop_cmd="${command} -k shutdown"
+: ${squid_chdir:=%%PREFIX%%/squid/logs}
+: ${squid_user:=%%SQUID_UID%%}
+: ${squid_flags:="-D"}
+default_config=%%PREFIX%%/etc/squid/squid.conf
 
-case "$1" in
-start)
-	if [ -x ${PREFIX}/sbin/squid -a -f ${PREFIX}/etc/squid/squid.conf ]; then
-		(cd /${PREFIX}/squid/logs; ${PREFIX}/sbin/squid >/dev/null 2>&1 &) ; echo -n ' squid'
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr && rcNG=yes
+else
+	if [ -f %%PREFIX%%/etc/rc.subr ]; then
+		. %%PREFIX%%/etc/rc.subr && rcNG=yes
 	fi
-	;;
-stop)
-		${PREFIX}/sbin/squid -k shutdown 2>&1
-		# Uncomment this if you'd like the system to (attempt to
-		# wait for) squid to shut down cleanly
-		#echo "Sleeping for 45 seconds to allow squid to shutdown.."
-		#sleep 45 
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
+fi
 
-exit 0
+if [ "${rcNG}" ]; then
+	rcvar=`set_rcvar`
+	load_rc_config ${name}
+	# check that squid's default configuration is present when
+	# squid_flags is not set. We assume that you specify at
+	# least the path to your non-default configuration with
+	# '-f /path/to/config.file' in squid_flags if you delete this file.
+	if [ -z "${squid_flags}" ]; then
+		required_files=${default_config}
+	fi
+	required_dirs=${squid_chdir}
+	run_rc_command "$1"
+else
+	case $1 in
+	start)
+		if [ -x "${command}" -a \
+			\( -f "${default_config}" -o "${squid_flags}" \) ]; then
+			echo -n ' squid'
+			(cd ${squid_chdir} && exec su -fm ${squid_user} -c \
+				"${command} ${squid_flags}")
+		fi
+		;;
+	stop)
+		if [ -x "${command}" ]; then
+			echo -n ' squid'
+			${stop_cmd}
+			while ps -xcU ${squid_user} | grep -q squid; do
+				sleep 2
+			done
+		fi
+		;;
+		*)
+		echo "usage: `basename $0` {start|stop}" >&2
+		exit 64
+		;;
+	esac
+	exit 0
+fi
diff --git a/www/squid27/pkg-deinstall b/www/squid27/pkg-deinstall
new file mode 100644
index 000000000000..3a95b4f50e0d
--- /dev/null
+++ b/www/squid27/pkg-deinstall
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/bin:/usr/bin:/usr/sbin
+pkgname=$1
+
+case $2 in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	echo "===> post-deinstallation information for ${pkgname}"
+	echo ""
+	echo "     Please note that ${pkgname} was not completely removed"
+	echo "     from this system."
+	echo ""
+	echo "     The cache and log directories, squid's user account,"
+	echo "     and any modified configuration files have been preserved"
+	echo "     in case you want to install an updated version of squid"
+	echo "     on this system. You must remove them manually if you do"
+	echo "     not want to use squid any longer."
+	echo ""
+	;;
+*)
+	exit 64
+	;;
+esac
+exit 0
diff --git a/www/squid27/pkg-descr b/www/squid27/pkg-descr
index a030d6c271b8..f2674655d01e 100644
--- a/www/squid27/pkg-descr
+++ b/www/squid27/pkg-descr
@@ -9,9 +9,15 @@ 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.
 
-FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
-But you aren't lost in space: there is a mailing list,
-<squid-users@squid-cache.org>, where you will find some support and help.
-We also _strongly_ suggest you to examine Web pages noted above.
+Please see this port's Makefile for a list of compilation options.
+
+*** UPDATE NOTICE ***
+Starting from Version 2.5.4_6 the default user:group changed from
+nobody:nogroup to squid:squid. You can restore the old behavior
+of this port by specifying SQUID_UID=nobody SQUID_GID=nogroup in
+your make environment. Helper applications are now installed to
+$PREFIX/libexec/squid instead of $PREFIX/libexec, too.
+
+You can find further information on the project's website at
 
 WWW: http://www.squid-cache.org/
diff --git a/www/squid27/pkg-install b/www/squid27/pkg-install
index 7efd84949fd2..3b16eee43fda 100644
--- a/www/squid27/pkg-install
+++ b/www/squid27/pkg-install
@@ -1,44 +1,105 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
 
-PKGNAME=$1
+PATH=/bin:/usr/bin:/usr/sbin
+pkgname=$1
+squid_base=${PKG_PREFIX:-/usr/local}/squid
+squid_confdir=${PKG_PREFIX:-/usr/local}/etc/squid
+squid_user=${SQUID_UID:=squid}
+squid_group=${SQUID_GID:=squid}
+squid_gid=3128
+squid_uid=3128
 
 case $2 in
-    PRE-INSTALL)
+PRE-INSTALL)
+	echo "===> Pre-installation configuration for ${pkgname}"
+	if ! pw groupshow ${squid_group} -q >/dev/null ; then
+		while pw groupshow -g ${squid_gid} -q >/dev/null; do
+			squid_gid=`expr ${squid_gid} + 1`
+		done
+		echo "There is no group '${squid_group}' on this system, so I will try to create it:"
+		if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
+			echo "Failed to create group \"${squid_group}\"!" >&2
+			echo "Please create it manually." >&2
+			exit 1
+		else
+			echo "Group '${squid_group}' created successfully:"
+		fi
+	else
+		echo "I will use the existing group '${squid_group}':"
+	fi
+	pw groupshow ${squid_group}
+	if ! pw usershow ${squid_user} -q >/dev/null ; then
+		while pw usershow -u ${squid_uid} -q >/dev/null; do
+			squid_uid=`expr ${squid_uid} + 1`
+		done
+		echo "There is no account '${squid_user}' on this system, so I will try to create it:"
+		if ! pw useradd ${squid_user} -u ${squid_uid} -q \
+	  	    -c "squid caching-proxy pseudo user" -g ${squid_group} \
+		    -d "${squid_base}" -s "/sbin/nologin" -h - ; then
+			echo "Failed to create user '${squid_user}'!" >&2
+			echo "Please create it manually." >&2
+			exit 1
+		else
+			echo "User '${squid_user}' created successfully:"
+		fi
+	else
+		echo "I will use the existing user '${squid_user}':"
+	fi
+	pw usershow ${squid_user}
+	for dir in cache logs; do
+	if [ ! -d ${squid_base}/${dir} ]; then
+		echo "Creating ${squid_base}/${dir}..."
+		install -d -o ${squid_user} -g ${squid_group} \
+		    -m 0750 ${squid_base}/${dir}
+	fi
+	done
+	if [ ! -d ${squid_confdir} ]; then
+		echo "Creating ${squid_confdir}..."
+		install -d -o root -g ${squid_group} \
+		    -m 0750 ${squid_confdir}
+	fi
 	;;
-    POST-INSTALL)
-	echo "==> Post-installation configuration of ${PKGNAME}"
+POST-INSTALL)
+	for file in mime.conf squid.conf; do
+		if [ ! -f ${squid_confdir}/${file} \
+		    -a -f ${squid_confdir}/${file}.default ]; then
+		echo "Creating ${file} from default..."
+		install -c -o root -g ${squid_group} -m 0640 \
+		    ${squid_confdir}/${file}.default ${squid_confdir}/${file}
+	fi
+	done
+
+	echo "===> Post-installation informations for ${pkgname}"
+	echo ""
+	echo "     o You can find the configuration files for this package"
+	echo "       in the directory ${squid_confdir}."
 	echo ""
-	echo "    o you DO need running nameservice to start and run ${PKGNAME}"
+	echo "     o A cache directory has been created in ${squid_base}/cache."
+	echo "       Log files will be written to ${squid_base}/logs."
 	echo ""
-	echo "    o use the ${PKGNAME} proxy and caching WWW Server by"
-	echo "      configuring your WWW Navigator (Netscape, Mosaic,...)"
-	echo "      to use it as a proxy server."
+	echo "     o The default configuration will deny everyone access to the"
+	echo "       proxy service. Edit the \"http_access\" directives in"
+	echo "       ${squid_confdir}/squid.conf to suit your needs."
 	echo ""
-	echo "    o Note that before you can run ${PKGNAME} you will"
-	echo "      need to initialise the cache directory."
-	echo "      You can do this by typing \"squid -z\"."
+	echo "     o If you never ran squid on this system before, you need to"
+	echo "       initialize the cache directory by running \"squid -z\""
+	echo "       as 'root' or '${squid_user}' before starting squid."
 	echo ""
-	echo "==> Press Enter to edit the ${PKGNAME} config file."
-	echo "    (The defaults are reasonable; and the file is well commented)"
 	tput md
-	echo "    You'd certainly like to pay attention to the"
-	echo "    ACTUAL locations of cache \"spool\", logfiles, pidfile!"
+	echo "     *** UPDATE NOTICE ***"
+	echo ""
+	echo "     Starting with version 2.5.4_6, all helper applications are"
+	echo "     installed to ${PKG_PREFIX}/libexec/squid instead of"
+	echo "     ${PKG_PREFIX}/libexec."
+	echo "     Please check your squid.conf and update it if necessary."
 	tput me
-	if [ -z "${PACKAGE_BUILDING}" ]; then read skip; fi
-	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 ""
 	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
+*)
+	exit 64
 	;;
 esac
 exit 0
diff --git a/www/squid27/pkg-plist b/www/squid27/pkg-plist
index fa28b0b99d1d..f04c2fc92436 100644
--- a/www/squid27/pkg-plist
+++ b/www/squid27/pkg-plist
@@ -1,4 +1,12 @@
+@comment $FreeBSD$
 etc/rc.d/squid.sh
+etc/squid/mib.txt
+@unexec if cmp -s %D/etc/squid/mime.conf %D/etc/squid/mime.conf.default; then rm -f %D/etc/squid/mime.conf; fi
+etc/squid/mime.conf.default
+@unexec if cmp -s %D/etc/squid/msntauth.conf %D/etc/squid/msntauth.conf.default; then rm -f %D/etc/squid/msntauth.conf; fi
+etc/squid/msntauth.conf.default
+@unexec if cmp -s %D/etc/squid/squid.conf %D/etc/squid/squid.conf.default; then rm -f %D/etc/squid/squid.conf; fi
+etc/squid/squid.conf.default
 etc/squid/icons/anthony-binhex.gif
 etc/squid/icons/anthony-bomb.gif
 etc/squid/icons/anthony-box.gif
@@ -26,872 +34,22 @@ etc/squid/icons/anthony-text.gif
 etc/squid/icons/anthony-unknown.gif
 etc/squid/icons/anthony-xbm.gif
 etc/squid/icons/anthony-xpm.gif
-etc/squid/errors/Bulgarian/ERR_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CANNOT_FORWARD
-etc/squid/errors/Bulgarian/ERR_CONNECT_FAIL
-etc/squid/errors/Bulgarian/ERR_DNS_FAIL
-etc/squid/errors/Bulgarian/ERR_FORWARDING_DENIED
-etc/squid/errors/Bulgarian/ERR_FTP_DISABLED
-etc/squid/errors/Bulgarian/ERR_FTP_FAILURE
-etc/squid/errors/Bulgarian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Bulgarian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Bulgarian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Bulgarian/ERR_INVALID_REQ
-etc/squid/errors/Bulgarian/ERR_INVALID_URL
-etc/squid/errors/Bulgarian/ERR_LIFETIME_EXP
-etc/squid/errors/Bulgarian/ERR_NO_RELAY
-etc/squid/errors/Bulgarian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Bulgarian/ERR_READ_ERROR
-etc/squid/errors/Bulgarian/ERR_READ_TIMEOUT
-etc/squid/errors/Bulgarian/ERR_SHUTTING_DOWN
-etc/squid/errors/Bulgarian/ERR_SOCKET_FAILURE
-etc/squid/errors/Bulgarian/ERR_TOO_BIG
-etc/squid/errors/Bulgarian/ERR_UNSUP_REQ
-etc/squid/errors/Bulgarian/ERR_URN_RESOLVE
-etc/squid/errors/Bulgarian/ERR_WRITE_ERROR
-etc/squid/errors/Bulgarian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Catalan/ERR_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CANNOT_FORWARD
-etc/squid/errors/Catalan/ERR_CONNECT_FAIL
-etc/squid/errors/Catalan/ERR_DNS_FAIL
-etc/squid/errors/Catalan/ERR_FORWARDING_DENIED
-etc/squid/errors/Catalan/ERR_FTP_DISABLED
-etc/squid/errors/Catalan/ERR_FTP_FAILURE
-etc/squid/errors/Catalan/ERR_FTP_FORBIDDEN
-etc/squid/errors/Catalan/ERR_FTP_NOT_FOUND
-etc/squid/errors/Catalan/ERR_FTP_PUT_CREATED
-etc/squid/errors/Catalan/ERR_FTP_PUT_ERROR
-etc/squid/errors/Catalan/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Catalan/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Catalan/ERR_INVALID_REQ
-etc/squid/errors/Catalan/ERR_INVALID_URL
-etc/squid/errors/Catalan/ERR_LIFETIME_EXP
-etc/squid/errors/Catalan/ERR_NO_RELAY
-etc/squid/errors/Catalan/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Catalan/ERR_READ_ERROR
-etc/squid/errors/Catalan/ERR_READ_TIMEOUT
-etc/squid/errors/Catalan/ERR_SHUTTING_DOWN
-etc/squid/errors/Catalan/ERR_SOCKET_FAILURE
-etc/squid/errors/Catalan/ERR_TOO_BIG
-etc/squid/errors/Catalan/ERR_UNSUP_REQ
-etc/squid/errors/Catalan/ERR_URN_RESOLVE
-etc/squid/errors/Catalan/ERR_WRITE_ERROR
-etc/squid/errors/Catalan/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Czech/ERR_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CANNOT_FORWARD
-etc/squid/errors/Czech/ERR_CONNECT_FAIL
-etc/squid/errors/Czech/ERR_DNS_FAIL
-etc/squid/errors/Czech/ERR_FORWARDING_DENIED
-etc/squid/errors/Czech/ERR_FTP_DISABLED
-etc/squid/errors/Czech/ERR_FTP_FAILURE
-etc/squid/errors/Czech/ERR_FTP_FORBIDDEN
-etc/squid/errors/Czech/ERR_FTP_NOT_FOUND
-etc/squid/errors/Czech/ERR_FTP_PUT_CREATED
-etc/squid/errors/Czech/ERR_FTP_PUT_ERROR
-etc/squid/errors/Czech/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Czech/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Czech/ERR_INVALID_REQ
-etc/squid/errors/Czech/ERR_INVALID_URL
-etc/squid/errors/Czech/ERR_LIFETIME_EXP
-etc/squid/errors/Czech/ERR_NO_RELAY
-etc/squid/errors/Czech/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Czech/ERR_READ_ERROR
-etc/squid/errors/Czech/ERR_READ_TIMEOUT
-etc/squid/errors/Czech/ERR_SHUTTING_DOWN
-etc/squid/errors/Czech/ERR_SOCKET_FAILURE
-etc/squid/errors/Czech/ERR_TOO_BIG
-etc/squid/errors/Czech/ERR_UNSUP_REQ
-etc/squid/errors/Czech/ERR_URN_RESOLVE
-etc/squid/errors/Czech/ERR_WRITE_ERROR
-etc/squid/errors/Czech/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Danish/ERR_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CANNOT_FORWARD
-etc/squid/errors/Danish/ERR_CONNECT_FAIL
-etc/squid/errors/Danish/ERR_DNS_FAIL
-etc/squid/errors/Danish/ERR_FORWARDING_DENIED
-etc/squid/errors/Danish/ERR_FTP_DISABLED
-etc/squid/errors/Danish/ERR_FTP_FAILURE
-etc/squid/errors/Danish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Danish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Danish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Danish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Danish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Danish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Danish/ERR_INVALID_REQ
-etc/squid/errors/Danish/ERR_INVALID_URL
-etc/squid/errors/Danish/ERR_LIFETIME_EXP
-etc/squid/errors/Danish/ERR_NO_RELAY
-etc/squid/errors/Danish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Danish/ERR_READ_ERROR
-etc/squid/errors/Danish/ERR_READ_TIMEOUT
-etc/squid/errors/Danish/ERR_SHUTTING_DOWN
-etc/squid/errors/Danish/ERR_SOCKET_FAILURE
-etc/squid/errors/Danish/ERR_TOO_BIG
-etc/squid/errors/Danish/ERR_UNSUP_REQ
-etc/squid/errors/Danish/ERR_URN_RESOLVE
-etc/squid/errors/Danish/ERR_WRITE_ERROR
-etc/squid/errors/Danish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Dutch/ERR_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CANNOT_FORWARD
-etc/squid/errors/Dutch/ERR_CONNECT_FAIL
-etc/squid/errors/Dutch/ERR_DNS_FAIL
-etc/squid/errors/Dutch/ERR_FORWARDING_DENIED
-etc/squid/errors/Dutch/ERR_FTP_DISABLED
-etc/squid/errors/Dutch/ERR_FTP_FAILURE
-etc/squid/errors/Dutch/ERR_FTP_FORBIDDEN
-etc/squid/errors/Dutch/ERR_FTP_NOT_FOUND
-etc/squid/errors/Dutch/ERR_FTP_PUT_CREATED
-etc/squid/errors/Dutch/ERR_FTP_PUT_ERROR
-etc/squid/errors/Dutch/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Dutch/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Dutch/ERR_INVALID_REQ
-etc/squid/errors/Dutch/ERR_INVALID_URL
-etc/squid/errors/Dutch/ERR_LIFETIME_EXP
-etc/squid/errors/Dutch/ERR_NO_RELAY
-etc/squid/errors/Dutch/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Dutch/ERR_READ_ERROR
-etc/squid/errors/Dutch/ERR_READ_TIMEOUT
-etc/squid/errors/Dutch/ERR_SHUTTING_DOWN
-etc/squid/errors/Dutch/ERR_SOCKET_FAILURE
-etc/squid/errors/Dutch/ERR_TOO_BIG
-etc/squid/errors/Dutch/ERR_UNSUP_REQ
-etc/squid/errors/Dutch/ERR_URN_RESOLVE
-etc/squid/errors/Dutch/ERR_WRITE_ERROR
-etc/squid/errors/Dutch/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/English/ERR_ACCESS_DENIED
-etc/squid/errors/English/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/English/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/English/ERR_CANNOT_FORWARD
-etc/squid/errors/English/ERR_CONNECT_FAIL
-etc/squid/errors/English/ERR_DNS_FAIL
-etc/squid/errors/English/ERR_FORWARDING_DENIED
-etc/squid/errors/English/ERR_FTP_DISABLED
-etc/squid/errors/English/ERR_FTP_FAILURE
-etc/squid/errors/English/ERR_FTP_FORBIDDEN
-etc/squid/errors/English/ERR_FTP_NOT_FOUND
-etc/squid/errors/English/ERR_FTP_PUT_CREATED
-etc/squid/errors/English/ERR_FTP_PUT_ERROR
-etc/squid/errors/English/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/English/ERR_FTP_UNAVAILABLE
-etc/squid/errors/English/ERR_INVALID_REQ
-etc/squid/errors/English/ERR_INVALID_URL
-etc/squid/errors/English/ERR_LIFETIME_EXP
-etc/squid/errors/English/ERR_NO_RELAY
-etc/squid/errors/English/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/English/ERR_READ_ERROR
-etc/squid/errors/English/ERR_READ_TIMEOUT
-etc/squid/errors/English/ERR_SHUTTING_DOWN
-etc/squid/errors/English/ERR_SOCKET_FAILURE
-etc/squid/errors/English/ERR_TOO_BIG
-etc/squid/errors/English/ERR_UNSUP_REQ
-etc/squid/errors/English/ERR_URN_RESOLVE
-etc/squid/errors/English/ERR_WRITE_ERROR
-etc/squid/errors/English/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Estonian/ERR_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CANNOT_FORWARD
-etc/squid/errors/Estonian/ERR_CONNECT_FAIL
-etc/squid/errors/Estonian/ERR_DNS_FAIL
-etc/squid/errors/Estonian/ERR_FORWARDING_DENIED
-etc/squid/errors/Estonian/ERR_FTP_DISABLED
-etc/squid/errors/Estonian/ERR_FTP_FAILURE
-etc/squid/errors/Estonian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Estonian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Estonian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Estonian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Estonian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Estonian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Estonian/ERR_INVALID_REQ
-etc/squid/errors/Estonian/ERR_INVALID_URL
-etc/squid/errors/Estonian/ERR_LIFETIME_EXP
-etc/squid/errors/Estonian/ERR_NO_RELAY
-etc/squid/errors/Estonian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Estonian/ERR_READ_ERROR
-etc/squid/errors/Estonian/ERR_READ_TIMEOUT
-etc/squid/errors/Estonian/ERR_SHUTTING_DOWN
-etc/squid/errors/Estonian/ERR_SOCKET_FAILURE
-etc/squid/errors/Estonian/ERR_TOO_BIG
-etc/squid/errors/Estonian/ERR_UNSUP_REQ
-etc/squid/errors/Estonian/ERR_URN_RESOLVE
-etc/squid/errors/Estonian/ERR_WRITE_ERROR
-etc/squid/errors/Estonian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Finnish/ERR_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CANNOT_FORWARD
-etc/squid/errors/Finnish/ERR_CONNECT_FAIL
-etc/squid/errors/Finnish/ERR_DNS_FAIL
-etc/squid/errors/Finnish/ERR_FORWARDING_DENIED
-etc/squid/errors/Finnish/ERR_FTP_DISABLED
-etc/squid/errors/Finnish/ERR_FTP_FAILURE
-etc/squid/errors/Finnish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Finnish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Finnish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Finnish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Finnish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Finnish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Finnish/ERR_INVALID_REQ
-etc/squid/errors/Finnish/ERR_INVALID_URL
-etc/squid/errors/Finnish/ERR_LIFETIME_EXP
-etc/squid/errors/Finnish/ERR_NO_RELAY
-etc/squid/errors/Finnish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Finnish/ERR_READ_ERROR
-etc/squid/errors/Finnish/ERR_READ_TIMEOUT
-etc/squid/errors/Finnish/ERR_SHUTTING_DOWN
-etc/squid/errors/Finnish/ERR_SOCKET_FAILURE
-etc/squid/errors/Finnish/ERR_TOO_BIG
-etc/squid/errors/Finnish/ERR_UNSUP_REQ
-etc/squid/errors/Finnish/ERR_URN_RESOLVE
-etc/squid/errors/Finnish/ERR_WRITE_ERROR
-etc/squid/errors/Finnish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/French/ERR_ACCESS_DENIED
-etc/squid/errors/French/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/French/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/French/ERR_CANNOT_FORWARD
-etc/squid/errors/French/ERR_CONNECT_FAIL
-etc/squid/errors/French/ERR_DNS_FAIL
-etc/squid/errors/French/ERR_FORWARDING_DENIED
-etc/squid/errors/French/ERR_FTP_DISABLED
-etc/squid/errors/French/ERR_FTP_FAILURE
-etc/squid/errors/French/ERR_FTP_FORBIDDEN
-etc/squid/errors/French/ERR_FTP_NOT_FOUND
-etc/squid/errors/French/ERR_FTP_PUT_CREATED
-etc/squid/errors/French/ERR_FTP_PUT_ERROR
-etc/squid/errors/French/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/French/ERR_FTP_UNAVAILABLE
-etc/squid/errors/French/ERR_INVALID_REQ
-etc/squid/errors/French/ERR_INVALID_URL
-etc/squid/errors/French/ERR_LIFETIME_EXP
-etc/squid/errors/French/ERR_NO_RELAY
-etc/squid/errors/French/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/French/ERR_READ_ERROR
-etc/squid/errors/French/ERR_READ_TIMEOUT
-etc/squid/errors/French/ERR_SHUTTING_DOWN
-etc/squid/errors/French/ERR_SOCKET_FAILURE
-etc/squid/errors/French/ERR_TOO_BIG
-etc/squid/errors/French/ERR_UNSUP_REQ
-etc/squid/errors/French/ERR_URN_RESOLVE
-etc/squid/errors/French/ERR_WRITE_ERROR
-etc/squid/errors/French/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/German/ERR_ACCESS_DENIED
-etc/squid/errors/German/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/German/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/German/ERR_CANNOT_FORWARD
-etc/squid/errors/German/ERR_CONNECT_FAIL
-etc/squid/errors/German/ERR_DNS_FAIL
-etc/squid/errors/German/ERR_FORWARDING_DENIED
-etc/squid/errors/German/ERR_FTP_DISABLED
-etc/squid/errors/German/ERR_FTP_FAILURE
-etc/squid/errors/German/ERR_FTP_FORBIDDEN
-etc/squid/errors/German/ERR_FTP_NOT_FOUND
-etc/squid/errors/German/ERR_FTP_PUT_CREATED
-etc/squid/errors/German/ERR_FTP_PUT_ERROR
-etc/squid/errors/German/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/German/ERR_FTP_UNAVAILABLE
-etc/squid/errors/German/ERR_INVALID_REQ
-etc/squid/errors/German/ERR_INVALID_URL
-etc/squid/errors/German/ERR_LIFETIME_EXP
-etc/squid/errors/German/ERR_NO_RELAY
-etc/squid/errors/German/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/German/ERR_READ_ERROR
-etc/squid/errors/German/ERR_READ_TIMEOUT
-etc/squid/errors/German/ERR_SHUTTING_DOWN
-etc/squid/errors/German/ERR_SOCKET_FAILURE
-etc/squid/errors/German/ERR_TOO_BIG
-etc/squid/errors/German/ERR_UNSUP_REQ
-etc/squid/errors/German/ERR_URN_RESOLVE
-etc/squid/errors/German/ERR_WRITE_ERROR
-etc/squid/errors/German/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Hebrew/ERR_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CANNOT_FORWARD
-etc/squid/errors/Hebrew/ERR_CONNECT_FAIL
-etc/squid/errors/Hebrew/ERR_DNS_FAIL
-etc/squid/errors/Hebrew/ERR_FORWARDING_DENIED
-etc/squid/errors/Hebrew/ERR_FTP_DISABLED
-etc/squid/errors/Hebrew/ERR_FTP_FAILURE
-etc/squid/errors/Hebrew/ERR_FTP_FORBIDDEN
-etc/squid/errors/Hebrew/ERR_FTP_NOT_FOUND
-etc/squid/errors/Hebrew/ERR_FTP_PUT_CREATED
-etc/squid/errors/Hebrew/ERR_FTP_PUT_ERROR
-etc/squid/errors/Hebrew/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Hebrew/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Hebrew/ERR_INVALID_REQ
-etc/squid/errors/Hebrew/ERR_INVALID_URL
-etc/squid/errors/Hebrew/ERR_LIFETIME_EXP
-etc/squid/errors/Hebrew/ERR_NO_RELAY
-etc/squid/errors/Hebrew/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Hebrew/ERR_READ_ERROR
-etc/squid/errors/Hebrew/ERR_READ_TIMEOUT
-etc/squid/errors/Hebrew/ERR_SHUTTING_DOWN
-etc/squid/errors/Hebrew/ERR_SOCKET_FAILURE
-etc/squid/errors/Hebrew/ERR_TOO_BIG
-etc/squid/errors/Hebrew/ERR_UNSUP_REQ
-etc/squid/errors/Hebrew/ERR_URN_RESOLVE
-etc/squid/errors/Hebrew/ERR_WRITE_ERROR
-etc/squid/errors/Hebrew/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Hungarian/ERR_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CANNOT_FORWARD
-etc/squid/errors/Hungarian/ERR_CONNECT_FAIL
-etc/squid/errors/Hungarian/ERR_DNS_FAIL
-etc/squid/errors/Hungarian/ERR_FORWARDING_DENIED
-etc/squid/errors/Hungarian/ERR_FTP_DISABLED
-etc/squid/errors/Hungarian/ERR_FTP_FAILURE
-etc/squid/errors/Hungarian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Hungarian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Hungarian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Hungarian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Hungarian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Hungarian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Hungarian/ERR_INVALID_REQ
-etc/squid/errors/Hungarian/ERR_INVALID_URL
-etc/squid/errors/Hungarian/ERR_LIFETIME_EXP
-etc/squid/errors/Hungarian/ERR_NO_RELAY
-etc/squid/errors/Hungarian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Hungarian/ERR_READ_ERROR
-etc/squid/errors/Hungarian/ERR_READ_TIMEOUT
-etc/squid/errors/Hungarian/ERR_SHUTTING_DOWN
-etc/squid/errors/Hungarian/ERR_SOCKET_FAILURE
-etc/squid/errors/Hungarian/ERR_TOO_BIG
-etc/squid/errors/Hungarian/ERR_UNSUP_REQ
-etc/squid/errors/Hungarian/ERR_URN_RESOLVE
-etc/squid/errors/Hungarian/ERR_WRITE_ERROR
-etc/squid/errors/Hungarian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Italian/ERR_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CANNOT_FORWARD
-etc/squid/errors/Italian/ERR_CONNECT_FAIL
-etc/squid/errors/Italian/ERR_DNS_FAIL
-etc/squid/errors/Italian/ERR_FORWARDING_DENIED
-etc/squid/errors/Italian/ERR_FTP_DISABLED
-etc/squid/errors/Italian/ERR_FTP_FAILURE
-etc/squid/errors/Italian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Italian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Italian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Italian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Italian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Italian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Italian/ERR_INVALID_REQ
-etc/squid/errors/Italian/ERR_INVALID_URL
-etc/squid/errors/Italian/ERR_LIFETIME_EXP
-etc/squid/errors/Italian/ERR_NO_RELAY
-etc/squid/errors/Italian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Italian/ERR_READ_ERROR
-etc/squid/errors/Italian/ERR_READ_TIMEOUT
-etc/squid/errors/Italian/ERR_SHUTTING_DOWN
-etc/squid/errors/Italian/ERR_SOCKET_FAILURE
-etc/squid/errors/Italian/ERR_TOO_BIG
-etc/squid/errors/Italian/ERR_UNSUP_REQ
-etc/squid/errors/Italian/ERR_URN_RESOLVE
-etc/squid/errors/Italian/ERR_WRITE_ERROR
-etc/squid/errors/Italian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Japanese/ERR_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CANNOT_FORWARD
-etc/squid/errors/Japanese/ERR_CONNECT_FAIL
-etc/squid/errors/Japanese/ERR_DNS_FAIL
-etc/squid/errors/Japanese/ERR_FORWARDING_DENIED
-etc/squid/errors/Japanese/ERR_FTP_DISABLED
-etc/squid/errors/Japanese/ERR_FTP_FAILURE
-etc/squid/errors/Japanese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Japanese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Japanese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Japanese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Japanese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Japanese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Japanese/ERR_INVALID_REQ
-etc/squid/errors/Japanese/ERR_INVALID_URL
-etc/squid/errors/Japanese/ERR_LIFETIME_EXP
-etc/squid/errors/Japanese/ERR_NO_RELAY
-etc/squid/errors/Japanese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Japanese/ERR_READ_ERROR
-etc/squid/errors/Japanese/ERR_READ_TIMEOUT
-etc/squid/errors/Japanese/ERR_SHUTTING_DOWN
-etc/squid/errors/Japanese/ERR_SOCKET_FAILURE
-etc/squid/errors/Japanese/ERR_TOO_BIG
-etc/squid/errors/Japanese/ERR_UNSUP_REQ
-etc/squid/errors/Japanese/ERR_URN_RESOLVE
-etc/squid/errors/Japanese/ERR_WRITE_ERROR
-etc/squid/errors/Japanese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Korean/ERR_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CANNOT_FORWARD
-etc/squid/errors/Korean/ERR_CONNECT_FAIL
-etc/squid/errors/Korean/ERR_DNS_FAIL
-etc/squid/errors/Korean/ERR_FORWARDING_DENIED
-etc/squid/errors/Korean/ERR_FTP_DISABLED
-etc/squid/errors/Korean/ERR_FTP_FAILURE
-etc/squid/errors/Korean/ERR_FTP_FORBIDDEN
-etc/squid/errors/Korean/ERR_FTP_NOT_FOUND
-etc/squid/errors/Korean/ERR_FTP_PUT_CREATED
-etc/squid/errors/Korean/ERR_FTP_PUT_ERROR
-etc/squid/errors/Korean/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Korean/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Korean/ERR_INVALID_REQ
-etc/squid/errors/Korean/ERR_INVALID_URL
-etc/squid/errors/Korean/ERR_LIFETIME_EXP
-etc/squid/errors/Korean/ERR_NO_RELAY
-etc/squid/errors/Korean/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Korean/ERR_READ_ERROR
-etc/squid/errors/Korean/ERR_READ_TIMEOUT
-etc/squid/errors/Korean/ERR_SHUTTING_DOWN
-etc/squid/errors/Korean/ERR_SOCKET_FAILURE
-etc/squid/errors/Korean/ERR_TOO_BIG
-etc/squid/errors/Korean/ERR_UNSUP_REQ
-etc/squid/errors/Korean/ERR_URN_RESOLVE
-etc/squid/errors/Korean/ERR_WRITE_ERROR
-etc/squid/errors/Korean/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Lithuanian/ERR_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CANNOT_FORWARD
-etc/squid/errors/Lithuanian/ERR_CONNECT_FAIL
-etc/squid/errors/Lithuanian/ERR_DNS_FAIL
-etc/squid/errors/Lithuanian/ERR_FORWARDING_DENIED
-etc/squid/errors/Lithuanian/ERR_FTP_DISABLED
-etc/squid/errors/Lithuanian/ERR_FTP_FAILURE
-etc/squid/errors/Lithuanian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Lithuanian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Lithuanian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Lithuanian/ERR_INVALID_REQ
-etc/squid/errors/Lithuanian/ERR_INVALID_URL
-etc/squid/errors/Lithuanian/ERR_LIFETIME_EXP
-etc/squid/errors/Lithuanian/ERR_NO_RELAY
-etc/squid/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Lithuanian/ERR_READ_ERROR
-etc/squid/errors/Lithuanian/ERR_READ_TIMEOUT
-etc/squid/errors/Lithuanian/ERR_SHUTTING_DOWN
-etc/squid/errors/Lithuanian/ERR_SOCKET_FAILURE
-etc/squid/errors/Lithuanian/ERR_TOO_BIG
-etc/squid/errors/Lithuanian/ERR_UNSUP_REQ
-etc/squid/errors/Lithuanian/ERR_URN_RESOLVE
-etc/squid/errors/Lithuanian/ERR_WRITE_ERROR
-etc/squid/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Polish/ERR_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CANNOT_FORWARD
-etc/squid/errors/Polish/ERR_CONNECT_FAIL
-etc/squid/errors/Polish/ERR_DNS_FAIL
-etc/squid/errors/Polish/ERR_FORWARDING_DENIED
-etc/squid/errors/Polish/ERR_FTP_DISABLED
-etc/squid/errors/Polish/ERR_FTP_FAILURE
-etc/squid/errors/Polish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Polish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Polish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Polish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Polish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Polish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Polish/ERR_INVALID_REQ
-etc/squid/errors/Polish/ERR_INVALID_URL
-etc/squid/errors/Polish/ERR_LIFETIME_EXP
-etc/squid/errors/Polish/ERR_NO_RELAY
-etc/squid/errors/Polish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Polish/ERR_READ_ERROR
-etc/squid/errors/Polish/ERR_READ_TIMEOUT
-etc/squid/errors/Polish/ERR_SHUTTING_DOWN
-etc/squid/errors/Polish/ERR_SOCKET_FAILURE
-etc/squid/errors/Polish/ERR_TOO_BIG
-etc/squid/errors/Polish/ERR_UNSUP_REQ
-etc/squid/errors/Polish/ERR_URN_RESOLVE
-etc/squid/errors/Polish/ERR_WRITE_ERROR
-etc/squid/errors/Polish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Portuguese/ERR_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CANNOT_FORWARD
-etc/squid/errors/Portuguese/ERR_CONNECT_FAIL
-etc/squid/errors/Portuguese/ERR_DNS_FAIL
-etc/squid/errors/Portuguese/ERR_FORWARDING_DENIED
-etc/squid/errors/Portuguese/ERR_FTP_DISABLED
-etc/squid/errors/Portuguese/ERR_FTP_FAILURE
-etc/squid/errors/Portuguese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Portuguese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Portuguese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Portuguese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Portuguese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Portuguese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Portuguese/ERR_INVALID_REQ
-etc/squid/errors/Portuguese/ERR_INVALID_URL
-etc/squid/errors/Portuguese/ERR_LIFETIME_EXP
-etc/squid/errors/Portuguese/ERR_NO_RELAY
-etc/squid/errors/Portuguese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Portuguese/ERR_READ_ERROR
-etc/squid/errors/Portuguese/ERR_READ_TIMEOUT
-etc/squid/errors/Portuguese/ERR_SHUTTING_DOWN
-etc/squid/errors/Portuguese/ERR_SOCKET_FAILURE
-etc/squid/errors/Portuguese/ERR_TOO_BIG
-etc/squid/errors/Portuguese/ERR_UNSUP_REQ
-etc/squid/errors/Portuguese/ERR_URN_RESOLVE
-etc/squid/errors/Portuguese/ERR_WRITE_ERROR
-etc/squid/errors/Portuguese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Romanian/ERR_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CANNOT_FORWARD
-etc/squid/errors/Romanian/ERR_CONNECT_FAIL
-etc/squid/errors/Romanian/ERR_DNS_FAIL
-etc/squid/errors/Romanian/ERR_FORWARDING_DENIED
-etc/squid/errors/Romanian/ERR_FTP_DISABLED
-etc/squid/errors/Romanian/ERR_FTP_FAILURE
-etc/squid/errors/Romanian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Romanian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Romanian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Romanian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Romanian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Romanian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Romanian/ERR_INVALID_REQ
-etc/squid/errors/Romanian/ERR_INVALID_URL
-etc/squid/errors/Romanian/ERR_LIFETIME_EXP
-etc/squid/errors/Romanian/ERR_NO_RELAY
-etc/squid/errors/Romanian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Romanian/ERR_READ_ERROR
-etc/squid/errors/Romanian/ERR_READ_TIMEOUT
-etc/squid/errors/Romanian/ERR_SHUTTING_DOWN
-etc/squid/errors/Romanian/ERR_SOCKET_FAILURE
-etc/squid/errors/Romanian/ERR_TOO_BIG
-etc/squid/errors/Romanian/ERR_UNSUP_REQ
-etc/squid/errors/Romanian/ERR_URN_RESOLVE
-etc/squid/errors/Romanian/ERR_WRITE_ERROR
-etc/squid/errors/Romanian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Russian-1251/ERR_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CANNOT_FORWARD
-etc/squid/errors/Russian-1251/ERR_CONNECT_FAIL
-etc/squid/errors/Russian-1251/ERR_DNS_FAIL
-etc/squid/errors/Russian-1251/ERR_FORWARDING_DENIED
-etc/squid/errors/Russian-1251/ERR_FTP_DISABLED
-etc/squid/errors/Russian-1251/ERR_FTP_FAILURE
-etc/squid/errors/Russian-1251/ERR_FTP_FORBIDDEN
-etc/squid/errors/Russian-1251/ERR_FTP_NOT_FOUND
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_CREATED
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_ERROR
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Russian-1251/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Russian-1251/ERR_INVALID_REQ
-etc/squid/errors/Russian-1251/ERR_INVALID_URL
-etc/squid/errors/Russian-1251/ERR_LIFETIME_EXP
-etc/squid/errors/Russian-1251/ERR_NO_RELAY
-etc/squid/errors/Russian-1251/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Russian-1251/ERR_READ_ERROR
-etc/squid/errors/Russian-1251/ERR_READ_TIMEOUT
-etc/squid/errors/Russian-1251/ERR_SHUTTING_DOWN
-etc/squid/errors/Russian-1251/ERR_SOCKET_FAILURE
-etc/squid/errors/Russian-1251/ERR_TOO_BIG
-etc/squid/errors/Russian-1251/ERR_UNSUP_REQ
-etc/squid/errors/Russian-1251/ERR_URN_RESOLVE
-etc/squid/errors/Russian-1251/ERR_WRITE_ERROR
-etc/squid/errors/Russian-1251/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Russian-koi8-r/ERR_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CANNOT_FORWARD
-etc/squid/errors/Russian-koi8-r/ERR_CONNECT_FAIL
-etc/squid/errors/Russian-koi8-r/ERR_DNS_FAIL
-etc/squid/errors/Russian-koi8-r/ERR_FORWARDING_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_DISABLED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_FAILURE
-etc/squid/errors/Russian-koi8-r/ERR_FTP_FORBIDDEN
-etc/squid/errors/Russian-koi8-r/ERR_FTP_NOT_FOUND
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_CREATED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Russian-koi8-r/ERR_INVALID_REQ
-etc/squid/errors/Russian-koi8-r/ERR_INVALID_URL
-etc/squid/errors/Russian-koi8-r/ERR_LIFETIME_EXP
-etc/squid/errors/Russian-koi8-r/ERR_NO_RELAY
-etc/squid/errors/Russian-koi8-r/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Russian-koi8-r/ERR_READ_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_READ_TIMEOUT
-etc/squid/errors/Russian-koi8-r/ERR_SHUTTING_DOWN
-etc/squid/errors/Russian-koi8-r/ERR_SOCKET_FAILURE
-etc/squid/errors/Russian-koi8-r/ERR_TOO_BIG
-etc/squid/errors/Russian-koi8-r/ERR_UNSUP_REQ
-etc/squid/errors/Russian-koi8-r/ERR_URN_RESOLVE
-etc/squid/errors/Russian-koi8-r/ERR_WRITE_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Serbian/ERR_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CANNOT_FORWARD
-etc/squid/errors/Serbian/ERR_CONNECT_FAIL
-etc/squid/errors/Serbian/ERR_DNS_FAIL
-etc/squid/errors/Serbian/ERR_FORWARDING_DENIED
-etc/squid/errors/Serbian/ERR_FTP_DISABLED
-etc/squid/errors/Serbian/ERR_FTP_FAILURE
-etc/squid/errors/Serbian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Serbian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Serbian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Serbian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Serbian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Serbian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Serbian/ERR_INVALID_REQ
-etc/squid/errors/Serbian/ERR_INVALID_URL
-etc/squid/errors/Serbian/ERR_LIFETIME_EXP
-etc/squid/errors/Serbian/ERR_NO_RELAY
-etc/squid/errors/Serbian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Serbian/ERR_READ_ERROR
-etc/squid/errors/Serbian/ERR_READ_TIMEOUT
-etc/squid/errors/Serbian/ERR_SHUTTING_DOWN
-etc/squid/errors/Serbian/ERR_SOCKET_FAILURE
-etc/squid/errors/Serbian/ERR_TOO_BIG
-etc/squid/errors/Serbian/ERR_UNSUP_REQ
-etc/squid/errors/Serbian/ERR_URN_RESOLVE
-etc/squid/errors/Serbian/ERR_WRITE_ERROR
-etc/squid/errors/Serbian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Simplify_Chinese/ERR_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CANNOT_FORWARD
-etc/squid/errors/Simplify_Chinese/ERR_CONNECT_FAIL
-etc/squid/errors/Simplify_Chinese/ERR_DNS_FAIL
-etc/squid/errors/Simplify_Chinese/ERR_FORWARDING_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_DISABLED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_FAILURE
-etc/squid/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Simplify_Chinese/ERR_INVALID_REQ
-etc/squid/errors/Simplify_Chinese/ERR_INVALID_URL
-etc/squid/errors/Simplify_Chinese/ERR_LIFETIME_EXP
-etc/squid/errors/Simplify_Chinese/ERR_NO_RELAY
-etc/squid/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Simplify_Chinese/ERR_READ_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_READ_TIMEOUT
-etc/squid/errors/Simplify_Chinese/ERR_SHUTTING_DOWN
-etc/squid/errors/Simplify_Chinese/ERR_SOCKET_FAILURE
-etc/squid/errors/Simplify_Chinese/ERR_TOO_BIG
-etc/squid/errors/Simplify_Chinese/ERR_UNSUP_REQ
-etc/squid/errors/Simplify_Chinese/ERR_URN_RESOLVE
-etc/squid/errors/Simplify_Chinese/ERR_WRITE_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Slovak/ERR_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CANNOT_FORWARD
-etc/squid/errors/Slovak/ERR_CONNECT_FAIL
-etc/squid/errors/Slovak/ERR_DNS_FAIL
-etc/squid/errors/Slovak/ERR_FORWARDING_DENIED
-etc/squid/errors/Slovak/ERR_FTP_DISABLED
-etc/squid/errors/Slovak/ERR_FTP_FAILURE
-etc/squid/errors/Slovak/ERR_FTP_FORBIDDEN
-etc/squid/errors/Slovak/ERR_FTP_NOT_FOUND
-etc/squid/errors/Slovak/ERR_FTP_PUT_CREATED
-etc/squid/errors/Slovak/ERR_FTP_PUT_ERROR
-etc/squid/errors/Slovak/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Slovak/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Slovak/ERR_INVALID_REQ
-etc/squid/errors/Slovak/ERR_INVALID_URL
-etc/squid/errors/Slovak/ERR_LIFETIME_EXP
-etc/squid/errors/Slovak/ERR_NO_RELAY
-etc/squid/errors/Slovak/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Slovak/ERR_READ_ERROR
-etc/squid/errors/Slovak/ERR_READ_TIMEOUT
-etc/squid/errors/Slovak/ERR_SHUTTING_DOWN
-etc/squid/errors/Slovak/ERR_SOCKET_FAILURE
-etc/squid/errors/Slovak/ERR_TOO_BIG
-etc/squid/errors/Slovak/ERR_UNSUP_REQ
-etc/squid/errors/Slovak/ERR_URN_RESOLVE
-etc/squid/errors/Slovak/ERR_WRITE_ERROR
-etc/squid/errors/Slovak/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Spanish/ERR_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CANNOT_FORWARD
-etc/squid/errors/Spanish/ERR_CONNECT_FAIL
-etc/squid/errors/Spanish/ERR_DNS_FAIL
-etc/squid/errors/Spanish/ERR_FORWARDING_DENIED
-etc/squid/errors/Spanish/ERR_FTP_DISABLED
-etc/squid/errors/Spanish/ERR_FTP_FAILURE
-etc/squid/errors/Spanish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Spanish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Spanish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Spanish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Spanish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Spanish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Spanish/ERR_INVALID_REQ
-etc/squid/errors/Spanish/ERR_INVALID_URL
-etc/squid/errors/Spanish/ERR_LIFETIME_EXP
-etc/squid/errors/Spanish/ERR_NO_RELAY
-etc/squid/errors/Spanish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Spanish/ERR_READ_ERROR
-etc/squid/errors/Spanish/ERR_READ_TIMEOUT
-etc/squid/errors/Spanish/ERR_SHUTTING_DOWN
-etc/squid/errors/Spanish/ERR_SOCKET_FAILURE
-etc/squid/errors/Spanish/ERR_TOO_BIG
-etc/squid/errors/Spanish/ERR_UNSUP_REQ
-etc/squid/errors/Spanish/ERR_URN_RESOLVE
-etc/squid/errors/Spanish/ERR_WRITE_ERROR
-etc/squid/errors/Spanish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Swedish/ERR_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CANNOT_FORWARD
-etc/squid/errors/Swedish/ERR_CONNECT_FAIL
-etc/squid/errors/Swedish/ERR_DNS_FAIL
-etc/squid/errors/Swedish/ERR_FORWARDING_DENIED
-etc/squid/errors/Swedish/ERR_FTP_DISABLED
-etc/squid/errors/Swedish/ERR_FTP_FAILURE
-etc/squid/errors/Swedish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Swedish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Swedish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Swedish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Swedish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Swedish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Swedish/ERR_INVALID_REQ
-etc/squid/errors/Swedish/ERR_INVALID_URL
-etc/squid/errors/Swedish/ERR_LIFETIME_EXP
-etc/squid/errors/Swedish/ERR_NO_RELAY
-etc/squid/errors/Swedish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Swedish/ERR_READ_ERROR
-etc/squid/errors/Swedish/ERR_READ_TIMEOUT
-etc/squid/errors/Swedish/ERR_SHUTTING_DOWN
-etc/squid/errors/Swedish/ERR_SOCKET_FAILURE
-etc/squid/errors/Swedish/ERR_TOO_BIG
-etc/squid/errors/Swedish/ERR_UNSUP_REQ
-etc/squid/errors/Swedish/ERR_URN_RESOLVE
-etc/squid/errors/Swedish/ERR_WRITE_ERROR
-etc/squid/errors/Swedish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Traditional_Chinese/ERR_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CANNOT_FORWARD
-etc/squid/errors/Traditional_Chinese/ERR_CONNECT_FAIL
-etc/squid/errors/Traditional_Chinese/ERR_DNS_FAIL
-etc/squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_DISABLED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_FAILURE
-etc/squid/errors/Traditional_Chinese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Traditional_Chinese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Traditional_Chinese/ERR_INVALID_REQ
-etc/squid/errors/Traditional_Chinese/ERR_INVALID_URL
-etc/squid/errors/Traditional_Chinese/ERR_LIFETIME_EXP
-etc/squid/errors/Traditional_Chinese/ERR_NO_RELAY
-etc/squid/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Traditional_Chinese/ERR_READ_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_READ_TIMEOUT
-etc/squid/errors/Traditional_Chinese/ERR_SHUTTING_DOWN
-etc/squid/errors/Traditional_Chinese/ERR_SOCKET_FAILURE
-etc/squid/errors/Traditional_Chinese/ERR_TOO_BIG
-etc/squid/errors/Traditional_Chinese/ERR_UNSUP_REQ
-etc/squid/errors/Traditional_Chinese/ERR_URN_RESOLVE
-etc/squid/errors/Traditional_Chinese/ERR_WRITE_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Turkish/ERR_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CANNOT_FORWARD
-etc/squid/errors/Turkish/ERR_CONNECT_FAIL
-etc/squid/errors/Turkish/ERR_DNS_FAIL
-etc/squid/errors/Turkish/ERR_FORWARDING_DENIED
-etc/squid/errors/Turkish/ERR_FTP_DISABLED
-etc/squid/errors/Turkish/ERR_FTP_FAILURE
-etc/squid/errors/Turkish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Turkish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Turkish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Turkish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Turkish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Turkish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Turkish/ERR_INVALID_REQ
-etc/squid/errors/Turkish/ERR_INVALID_URL
-etc/squid/errors/Turkish/ERR_LIFETIME_EXP
-etc/squid/errors/Turkish/ERR_NO_RELAY
-etc/squid/errors/Turkish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Turkish/ERR_READ_ERROR
-etc/squid/errors/Turkish/ERR_READ_TIMEOUT
-etc/squid/errors/Turkish/ERR_SHUTTING_DOWN
-etc/squid/errors/Turkish/ERR_SOCKET_FAILURE
-etc/squid/errors/Turkish/ERR_TOO_BIG
-etc/squid/errors/Turkish/ERR_UNSUP_REQ
-etc/squid/errors/Turkish/ERR_URN_RESOLVE
-etc/squid/errors/Turkish/ERR_WRITE_ERROR
-etc/squid/errors/Turkish/ERR_ZERO_SIZE_OBJECT
-etc/squid/mib.txt
-@unexec if cmp -s %D/etc/squid/mime.conf %D/etc/squid/mime.conf.default; then rm -f %D/etc/squid/mime.conf; fi
-etc/squid/mime.conf.default
-@exec [ -f %B/mime.conf ] || cp %B/%f %B/mime.conf
-@unexec if cmp -s %D/etc/squid/squid.conf %D/etc/squid/squid.conf.default; then rm -f %D/etc/squid/squid.conf; fi
-etc/squid/squid.conf.default
-@exec [ -f %B/squid.conf ] || cp %B/%f %B/squid.conf
-libexec/cachemgr.cgi
-libexec/diskd
-libexec/unlinkd
-libexec/ip_user_check
-libexec/yp_auth
-libexec/pam_auth
-libexec/ncsa_auth
-libexec/squid_unix_group
 sbin/RunAccel
 sbin/RunCache
 sbin/squidclient
 sbin/squid
-@exec mkdir -p %D/squid/cache
-@exec chown nobody:nogroup %D/squid/cache
-@exec mkdir -p %D/squid/logs
-@exec chown nobody:nogroup %D/squid/logs
-@dirrm etc/squid/errors/Bulgarian
-@dirrm etc/squid/errors/Catalan
-@dirrm etc/squid/errors/Czech
-@dirrm etc/squid/errors/Danish
-@dirrm etc/squid/errors/Dutch
-@dirrm etc/squid/errors/English
-@dirrm etc/squid/errors/Estonian
-@dirrm etc/squid/errors/Finnish
-@dirrm etc/squid/errors/French
-@dirrm etc/squid/errors/German
-@dirrm etc/squid/errors/Hebrew
-@dirrm etc/squid/errors/Hungarian
-@dirrm etc/squid/errors/Italian
-@dirrm etc/squid/errors/Japanese
-@dirrm etc/squid/errors/Korean
-@dirrm etc/squid/errors/Lithuanian
-@dirrm etc/squid/errors/Polish
-@dirrm etc/squid/errors/Portuguese
-@dirrm etc/squid/errors/Romanian
-@dirrm etc/squid/errors/Russian-1251
-@dirrm etc/squid/errors/Russian-koi8-r
-@dirrm etc/squid/errors/Serbian
-@dirrm etc/squid/errors/Simplify_Chinese
-@dirrm etc/squid/errors/Slovak
-@dirrm etc/squid/errors/Spanish
-@dirrm etc/squid/errors/Swedish
-@dirrm etc/squid/errors/Traditional_Chinese
-@dirrm etc/squid/errors/Turkish
-@dirrm etc/squid/icons
-@dirrm etc/squid/errors
-@dirrm etc/squid
-@dirrm squid/logs
-@dirrm squid/cache
-@dirrm squid
+%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES.html
+%%PORTDOCS%%%%DOCSDIR%%/debug-sections.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@comment Start of dynamically generated plist
+@comment End of dynamically generated plist
+@comment These directories are maybe not empty at deinstallation time.
+@comment Since we try to preserve the data in there for updates anyway, be quiet.
+@unexec rmdir %D/etc/squid/icons 2>/dev/null || true
+@unexec rmdir %D/etc/squid/errors 2>/dev/null || true
+@unexec rmdir %D/etc/squid 2>/dev/null || true
+@unexec rmdir %D/squid/logs 2>/dev/null || true
+@unexec rmdir %D/squid/cache 2>/dev/null || true
+@unexec rmdir %D/squid 2>/dev/null || true
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index baf1c842a527..bed437c96f56 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -4,10 +4,31 @@
 #
 # $FreeBSD$
 #
+# Tunables:
+# WITH_SQUID_PINGER
+#   install the external icmp helper program (`pinger') for hierarchy stats and
+#   selection
+# WITH_SQUID_LDAP_AUTH
+#   install external modules for authentication against LDAP servers
+# SQUID_{U,G}ID
+#   Which user/group squid should run as (default: squid/squid).
+#   The user and group will be created if they do not already exist.
+#   NOTE: before version 2.5.4_6, these settings defaulted to
+#   nobody/nogroup.
+#   If you wish to keep these settings, please define SQUID_UID=nobody and
+#   SQUID_GID=nogroup in your make environment before you start the update.
+# SQUID_LANGUAGES
+#   A list of languages for which error page files should be installed
+#   (default: all)
+# SQUID_DEFAULT_LANG
+#   If you define SQUID_LANGUAGES, select which language should be the default
+#   (default: English)
+# SQUID_CONFIGURE_ARGS
+#   Additional configuration options, see below for a list
 
 PORTNAME=	squid
 PORTVERSION=	2.5.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -17,7 +38,6 @@ MASTER_SITES=	\
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.5.STABLE4
-EXTRACT_SUFX=	.tar.bz2
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
@@ -54,89 +74,131 @@ PATCHFILES=	squid-2.5.STABLE4-reconfigure_message.patch \
 		squid-2.5.STABLE4-pinger.patch \
 		squid-2.5.STABLE4-partial_reload.patch \
 		squid-2.5.STABLE4-ldap_tls.patch \
-		squid-2.5.STABLE4-ldap_group_bufsize.patch
+		squid-2.5.STABLE4-ldap_group_bufsize.patch \
+		squid-2.5.STABLE4-http_workarounds.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
 COMMENT=	The successful WWW proxy cache and accelerator
 
+CONFLICTS=	squid-*
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
-# Follow the apache port's lead...
+
+SQUID_UID?=	squid
+SQUID_GID?=	squid
+
+MAN8=		squid.8
+DOCS=		QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
+
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--datadir=${PREFIX}/etc/squid \
+		--libexecdir=${PREFIX}/libexec/squid \
 		--localstatedir=${PREFIX}/squid \
 		--enable-storeio="ufs diskd null" \
 		--enable-removal-policies="lru heap" \
-		--enable-auth=basic --enable-basic-auth-helpers="NCSA PAM YP" \
-		--enable-external-acl-helpers="ip_user unix_group" \
-		--enable-underscores ${SQUID_CONFIGURE_ARGS}
-
-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
-#CONFIGURE_ARGS+= --enable-dlmalloc
-#  - Compile and use the supplied GNUregex routines instead of BSD regex.
-#CONFIGURE_ARGS+= --enable-gnuregex
-#  - Enable simple malloc debugging
-#CONFIGURE_ARGS+= --enable-xmalloc-debug
-#  - Detailed trace of memory allocations
-#CONFIGURE_ARGS+= --enable-xmalloc-debug-count
-#  - Show malloc statistics in cachemgr status pages
-#CONFIGURE_ARGS+= --enable-xmalloc-statistics
-#  - Enable CARP support
-#CONFIGURE_ARGS+= --enable-carp
-#  - Enable ICMP pinging for heirarchy stats and selection
-#CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay pools to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-pools
-#  - Enable generic memory use tracing
-#CONFIGURE_ARGS+= --enable-mem-gen-trace
-#  - Enable logging of the User-Agent header
-#CONFIGURE_ARGS+= --enable-useragent-log
-#  - Disable Web Cache Coordination Protocol
-#CONFIGURE_ARGS+= --disable-wccp
-#  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent-hack
-#  - Turn on SNMP server support
-#CONFIGURE_ARGS+= --enable-snmp
-#  - Turn on SSL server support for reverse proxies
-#CONFIGURE_ARGS+= --enable-ssl
-#  - Optimize time updates to one per second rather than calling gettimeofday()
-#CONFIGURE_ARGS+= --enable-time-hack
-#  - Set an explicit hostname in cachemgr.cgi
-#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-#  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
-#    assigned IP addresses)
-#CONFIGURE_ARGS+= --enable-arp-acl
-#  - Enable HTCP protocol
-#CONFIGURE_ARGS+= --enable-htcp
-#  - Enable Forw/Via database
-#CONFIGURE_ARGS+= --enable-forw-via-db
-#  - 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
-#  (--enable-poll is not needed, it's detected correctly on 3.0)
-#  - Strict HTTP compliance
-#CONFIGURE_ARGS+= --disable-http-violations
-#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
-#CONFIGURE_ARGS+= --enable-ipf-transparent
-# (--enable-leakfinder is a developer support tool only)
-#  - Compile out code that does optional Ident (RFC931) lookups
-#CONFIGURE_ARGS+= --disable-ident-lookups
-#  - Disable squid's internal async DNS lookup code.
-#CONFIGURE_ARGS+= --disable-internal-dns
-#  - Use truncate() rather than unlink()
-#CONFIGURE_ARGS+= --enable-truncate
-#  - accept the illegal '_' character in hostnames.
-#CONFIGURE_ARGS+= --enable-underscores
-#  - Enable control of different heap replacement algorithms at runtime.
-#CONFIGURE_ARGS+= --enable-removal-policies
+		--enable-underscores
+
+.if defined(WITH_SQUID_PINGER)
+CONFIGURE_ARGS+=	--enable-icmp
+.endif
+
+# Authentication methods and modules:
+
+basic_auth=	NCSA PAM YP MSNT winbind
+external_acl=	ip_user unix_group wbinfo_group winbind_group
+MAN8+=		pam_auth.8 squid_unix_group.8
+.if defined(WITH_SQUID_LDAP_AUTH)
+USE_OPENLDAP=	yes
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+MAN8+=		squid_ldap_auth.8 squid_ldap_group.8
+basic_auth+=	LDAP
+external_acl+=	ldap_group
+.endif
+CONFIGURE_ARGS+=	--enable-auth="basic ntlm digest" \
+			--enable-basic-auth-helpers="${basic_auth}" \
+			--enable-digest-auth-helpers="password" \
+			--enable-external-acl-helpers="${external_acl}" \
+			--enable-ntlm-auth-helpers="winbind"
+
+# Languages:
+#
+# If you do not define SQUID_LANGUAGES yourself, all available language files
+# will be installed; the default language will be english.
+
+SQUID_LANGUAGES?=	\
+	Bulgarian Catalan Czech Danish Dutch English Estonian Finnish      \
+	French German Hebrew Hungarian Italian Japanese Korean Lithuanian  \
+	Polish Portuguese Romanian Russian-1251 Russian-koi8-r Serbian     \
+	Simplify_Chinese Slovak Spanish Swedish Traditional_Chinese Turkish
+SQUID_DEFAULT_LANG?=	English
+CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
+			--enable-default-err-language=${SQUID_DEFAULT_LANG}
+
+# Other configure options you might want to set using SQUID_CONFIGURE_ARGS:
+# Please see the configure script in the squid source distribution for a
+# complete list.
+#
+# --enable-dlmalloc
+#  Compile and use the malloc package from Doug Lea
+# --enable-gnuregex
+#  Compile and use the supplied GNUregex routines instead of BSD regex.
+# --enable-xmalloc-statistics
+#  Show malloc statistics in status page
+# --enable-carp
+#  Enable CARP support
+# --enable-delay-pools
+#  Enable delay pools to limit bandwidth usage
+# --enable-useragent-log
+#  Enable logging of the User-Agent header
+# --disable-wccp
+#  Disable Web Cache Coordination Protocol
+# --enable-snmp
+#  Turn on SNMP server support
+# --enable-ssl
+#  Turn on SSL server support for reverse proxies
+# --enable-time-hack
+#  Optimize time updates to one per second rather than calling gettimeofday()
+# --enable-cachemgr-hostname=some.hostname
+#  Set an explicit hostname in cachemgr.cgi
+# --enable-arp-acl
+#  Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+#  assigned IP addresses)
+# --enable-htcp
+#  Enable HTCP protocol
+# --enable-forw-via-db
+#  Enable Forw/Via database
+# --enable-cache-digests
+#  Use Cache Digests - see http://www.squid-cache.org/Doc/FAQ/FAQ-16.html
+# --disable-http-violations
+#  Strict HTTP compliance
+# --enable-ipf-transparent
+#  Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#  (Note: this is currently broken due to ipf headers not being installed to
+#  the base system, see PRs ports/60700 and misc/44148 for details)
+#  Note: see http://www.squid-cache.org/Doc/FAQ/FAQ-17.html for information
+#  about how to do transparent proxying with ipfw(8).
+# --disable-ident-lookups
+#  Compile out code that does optional Ident (RFC931) lookups
+# --disable-internal-dns
+#  Install the old external "dnsserver" binary
+# --enable-truncate
+#  Use truncate() rather than unlink()
+# --disable-hostname-checks
+#  Squid by default rejects any host names with odd characters in their name
+#  to conform with internet standards. If you disagree with this you may use
+#  this switch to turn off any such checks, provided that the resolver used by
+#  Squid does not reject such host names. This may be required to participate
+#  in testbeds for international domain names.
+# --disable-unlinkd
+#  Do not use "unlinkd"
+# --enable-stacktraces
+#  Enable automatic call backtrace on fatal errors
+
+CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@@ -145,37 +207,53 @@ post-patch:
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
+pre-configure:
+	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
+	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' ${WRKSRC}/src/cf.data.pre
+
+pre-install:
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	    -e 's|%%SQUID_UID%%|${SQUID_UID}|g' ${FILESDIR}/squid.sh \
+	    >${WRKDIR}/squid.sh
+
+pre-su-install:
+	@${SETENV} SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID} \
+	    PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+
 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 sbin_file in client squid
-	if [ -f ${PREFIX}/sbin/${sbin_file} ] ; then \
-		${STRIP_CMD} ${PREFIX}/sbin/${sbin_file} ; \
-	fi
-.endfor
-.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			\
-		${MKDIR} ${PREFIX}/squid/logs;		  	\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/logs;   \
-	fi
-	@if [ ! -d ${PREFIX}/squid/cache ]; then		\
-		${MKDIR} ${PREFIX}/squid/cache;			\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/cache;  \
-	fi
-	@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; \
-	fi
+.if defined(WITH_SQUID_PINGER)
+	${CHMOD} 4710 ${PREFIX}/libexec/squid/pinger; \
+	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
+.endif
+	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
+.if exists(${PREFIX}/etc/squid/errors/Lithuanian)
 # Work around the fact that the errorpages.patch creates files in
 # an "Attic" subdir:
 	@${FIND} ${WRKSRC}/errors/Lithuanian/Attic -type f \
-	-exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \;
+   	    -exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \;
+.endif
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+# Generate parts of pkg-plist on the fly:
+	@cd ${PREFIX} && ${FIND} libexec/squid -type f -o -type l \
+	    >${WRKDIR}/plist.dynamic
+	@${ECHO_CMD} "@dirrm libexec/squid" >>${WRKDIR}/plist.dynamic
+# Only register what we should have installed, there may be local additions
+# present:
+.for d in ${SQUID_LANGUAGES}
+	@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f \
+	    >>${WRKDIR}/plist.dynamic
+	@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
+.endfor
+	@${ECHO_CMD} "r ${TMPPLIST}" >${WRKDIR}/ex.script
+	@${ECHO_CMD} "/Start of dynamically generated plist" >>${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${WRKDIR}/plist.dynamic" >>${WRKDIR}/ex.script
+	@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
+	@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
+	@cd ${WRKDIR} && ex <ex.script >/dev/null
 
 .include <bsd.port.mk>
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 76f9e296de4d..893a0e19d67a 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -33,3 +33,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5
 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34
 MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284
 MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c
+MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac
diff --git a/www/squid30/files/patch-src-cf.data.pre b/www/squid30/files/patch-src-cf.data.pre
new file mode 100644
index 000000000000..2a8e1eff429f
--- /dev/null
+++ b/www/squid30/files/patch-src-cf.data.pre
@@ -0,0 +1,20 @@
+--- src/cf.data.pre.orig	Thu May  1 14:07:51 2003
++++ src/cf.data.pre	Thu May  1 14:13:12 2003
+@@ -2325,7 +2325,7 @@
+ 
+ NAME: cache_effective_user
+ TYPE: string
+-DEFAULT: nobody
++DEFAULT: %%SQUID_UID%%
+ LOC: Config.effectiveUser
+ DOC_NONE
+ 
+@@ -2337,7 +2337,7 @@
+ 
+ 	If you start Squid as root, it will change its effective/real
+ 	UID/GID to the UID/GID specified below.  The default is to
+-	change to UID to nobody.  If you define cache_effective_user,
++	change to UID to %%SQUID_UID%%.  If you define cache_effective_user,
+ 	but not cache_effective_group, Squid sets the GID the
+ 	effective user's default group ID (taken from the password
+ 	file).
diff --git a/www/squid30/files/squid.sh b/www/squid30/files/squid.sh
index 40f655b04f27..ec92a10bc3fc 100644
--- a/www/squid30/files/squid.sh
+++ b/www/squid30/files/squid.sh
@@ -1,26 +1,75 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: squid
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD
+# 
+# Note:
+# If you are running an rcNG-System (i.e. FreeBSD 5 and later or after
+# having installed the rc_subr-port on an earlier system) you must set
+# "squid_enable=YES" in either /etc/rc.conf, /etc/rc.conf.local or
+# /etc/rc.conf.d/squid to make this script actually do something. There
+# you can also set squid_chdir, squid_user, and squid_flags.
+#
+# Please see squid(8), rc.conf(5) and rc(8) for further details.
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+unset rcNG
+name="squid"
+command=%%PREFIX%%/sbin/squid
+extra_commands=reload
+reload_cmd="${command} -k reconfigure"
+stop_cmd="${command} -k shutdown"
+: ${squid_chdir:=%%PREFIX%%/squid/logs}
+: ${squid_user:=%%SQUID_UID%%}
+: ${squid_flags:="-D"}
+default_config=%%PREFIX%%/etc/squid/squid.conf
 
-case "$1" in
-start)
-	if [ -x ${PREFIX}/sbin/squid -a -f ${PREFIX}/etc/squid/squid.conf ]; then
-		(cd /${PREFIX}/squid/logs; ${PREFIX}/sbin/squid >/dev/null 2>&1 &) ; echo -n ' squid'
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr && rcNG=yes
+else
+	if [ -f %%PREFIX%%/etc/rc.subr ]; then
+		. %%PREFIX%%/etc/rc.subr && rcNG=yes
 	fi
-	;;
-stop)
-		${PREFIX}/sbin/squid -k shutdown 2>&1
-		# Uncomment this if you'd like the system to (attempt to
-		# wait for) squid to shut down cleanly
-		#echo "Sleeping for 45 seconds to allow squid to shutdown.."
-		#sleep 45 
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
+fi
 
-exit 0
+if [ "${rcNG}" ]; then
+	rcvar=`set_rcvar`
+	load_rc_config ${name}
+	# check that squid's default configuration is present when
+	# squid_flags is not set. We assume that you specify at
+	# least the path to your non-default configuration with
+	# '-f /path/to/config.file' in squid_flags if you delete this file.
+	if [ -z "${squid_flags}" ]; then
+		required_files=${default_config}
+	fi
+	required_dirs=${squid_chdir}
+	run_rc_command "$1"
+else
+	case $1 in
+	start)
+		if [ -x "${command}" -a \
+			\( -f "${default_config}" -o "${squid_flags}" \) ]; then
+			echo -n ' squid'
+			(cd ${squid_chdir} && exec su -fm ${squid_user} -c \
+				"${command} ${squid_flags}")
+		fi
+		;;
+	stop)
+		if [ -x "${command}" ]; then
+			echo -n ' squid'
+			${stop_cmd}
+			while ps -xcU ${squid_user} | grep -q squid; do
+				sleep 2
+			done
+		fi
+		;;
+		*)
+		echo "usage: `basename $0` {start|stop}" >&2
+		exit 64
+		;;
+	esac
+	exit 0
+fi
diff --git a/www/squid30/pkg-deinstall b/www/squid30/pkg-deinstall
new file mode 100644
index 000000000000..3a95b4f50e0d
--- /dev/null
+++ b/www/squid30/pkg-deinstall
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/bin:/usr/bin:/usr/sbin
+pkgname=$1
+
+case $2 in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	echo "===> post-deinstallation information for ${pkgname}"
+	echo ""
+	echo "     Please note that ${pkgname} was not completely removed"
+	echo "     from this system."
+	echo ""
+	echo "     The cache and log directories, squid's user account,"
+	echo "     and any modified configuration files have been preserved"
+	echo "     in case you want to install an updated version of squid"
+	echo "     on this system. You must remove them manually if you do"
+	echo "     not want to use squid any longer."
+	echo ""
+	;;
+*)
+	exit 64
+	;;
+esac
+exit 0
diff --git a/www/squid30/pkg-descr b/www/squid30/pkg-descr
index a030d6c271b8..f2674655d01e 100644
--- a/www/squid30/pkg-descr
+++ b/www/squid30/pkg-descr
@@ -9,9 +9,15 @@ 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.
 
-FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
-But you aren't lost in space: there is a mailing list,
-<squid-users@squid-cache.org>, where you will find some support and help.
-We also _strongly_ suggest you to examine Web pages noted above.
+Please see this port's Makefile for a list of compilation options.
+
+*** UPDATE NOTICE ***
+Starting from Version 2.5.4_6 the default user:group changed from
+nobody:nogroup to squid:squid. You can restore the old behavior
+of this port by specifying SQUID_UID=nobody SQUID_GID=nogroup in
+your make environment. Helper applications are now installed to
+$PREFIX/libexec/squid instead of $PREFIX/libexec, too.
+
+You can find further information on the project's website at
 
 WWW: http://www.squid-cache.org/
diff --git a/www/squid30/pkg-install b/www/squid30/pkg-install
index 7efd84949fd2..3b16eee43fda 100644
--- a/www/squid30/pkg-install
+++ b/www/squid30/pkg-install
@@ -1,44 +1,105 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
 
-PKGNAME=$1
+PATH=/bin:/usr/bin:/usr/sbin
+pkgname=$1
+squid_base=${PKG_PREFIX:-/usr/local}/squid
+squid_confdir=${PKG_PREFIX:-/usr/local}/etc/squid
+squid_user=${SQUID_UID:=squid}
+squid_group=${SQUID_GID:=squid}
+squid_gid=3128
+squid_uid=3128
 
 case $2 in
-    PRE-INSTALL)
+PRE-INSTALL)
+	echo "===> Pre-installation configuration for ${pkgname}"
+	if ! pw groupshow ${squid_group} -q >/dev/null ; then
+		while pw groupshow -g ${squid_gid} -q >/dev/null; do
+			squid_gid=`expr ${squid_gid} + 1`
+		done
+		echo "There is no group '${squid_group}' on this system, so I will try to create it:"
+		if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
+			echo "Failed to create group \"${squid_group}\"!" >&2
+			echo "Please create it manually." >&2
+			exit 1
+		else
+			echo "Group '${squid_group}' created successfully:"
+		fi
+	else
+		echo "I will use the existing group '${squid_group}':"
+	fi
+	pw groupshow ${squid_group}
+	if ! pw usershow ${squid_user} -q >/dev/null ; then
+		while pw usershow -u ${squid_uid} -q >/dev/null; do
+			squid_uid=`expr ${squid_uid} + 1`
+		done
+		echo "There is no account '${squid_user}' on this system, so I will try to create it:"
+		if ! pw useradd ${squid_user} -u ${squid_uid} -q \
+	  	    -c "squid caching-proxy pseudo user" -g ${squid_group} \
+		    -d "${squid_base}" -s "/sbin/nologin" -h - ; then
+			echo "Failed to create user '${squid_user}'!" >&2
+			echo "Please create it manually." >&2
+			exit 1
+		else
+			echo "User '${squid_user}' created successfully:"
+		fi
+	else
+		echo "I will use the existing user '${squid_user}':"
+	fi
+	pw usershow ${squid_user}
+	for dir in cache logs; do
+	if [ ! -d ${squid_base}/${dir} ]; then
+		echo "Creating ${squid_base}/${dir}..."
+		install -d -o ${squid_user} -g ${squid_group} \
+		    -m 0750 ${squid_base}/${dir}
+	fi
+	done
+	if [ ! -d ${squid_confdir} ]; then
+		echo "Creating ${squid_confdir}..."
+		install -d -o root -g ${squid_group} \
+		    -m 0750 ${squid_confdir}
+	fi
 	;;
-    POST-INSTALL)
-	echo "==> Post-installation configuration of ${PKGNAME}"
+POST-INSTALL)
+	for file in mime.conf squid.conf; do
+		if [ ! -f ${squid_confdir}/${file} \
+		    -a -f ${squid_confdir}/${file}.default ]; then
+		echo "Creating ${file} from default..."
+		install -c -o root -g ${squid_group} -m 0640 \
+		    ${squid_confdir}/${file}.default ${squid_confdir}/${file}
+	fi
+	done
+
+	echo "===> Post-installation informations for ${pkgname}"
+	echo ""
+	echo "     o You can find the configuration files for this package"
+	echo "       in the directory ${squid_confdir}."
 	echo ""
-	echo "    o you DO need running nameservice to start and run ${PKGNAME}"
+	echo "     o A cache directory has been created in ${squid_base}/cache."
+	echo "       Log files will be written to ${squid_base}/logs."
 	echo ""
-	echo "    o use the ${PKGNAME} proxy and caching WWW Server by"
-	echo "      configuring your WWW Navigator (Netscape, Mosaic,...)"
-	echo "      to use it as a proxy server."
+	echo "     o The default configuration will deny everyone access to the"
+	echo "       proxy service. Edit the \"http_access\" directives in"
+	echo "       ${squid_confdir}/squid.conf to suit your needs."
 	echo ""
-	echo "    o Note that before you can run ${PKGNAME} you will"
-	echo "      need to initialise the cache directory."
-	echo "      You can do this by typing \"squid -z\"."
+	echo "     o If you never ran squid on this system before, you need to"
+	echo "       initialize the cache directory by running \"squid -z\""
+	echo "       as 'root' or '${squid_user}' before starting squid."
 	echo ""
-	echo "==> Press Enter to edit the ${PKGNAME} config file."
-	echo "    (The defaults are reasonable; and the file is well commented)"
 	tput md
-	echo "    You'd certainly like to pay attention to the"
-	echo "    ACTUAL locations of cache \"spool\", logfiles, pidfile!"
+	echo "     *** UPDATE NOTICE ***"
+	echo ""
+	echo "     Starting with version 2.5.4_6, all helper applications are"
+	echo "     installed to ${PKG_PREFIX}/libexec/squid instead of"
+	echo "     ${PKG_PREFIX}/libexec."
+	echo "     Please check your squid.conf and update it if necessary."
 	tput me
-	if [ -z "${PACKAGE_BUILDING}" ]; then read skip; fi
-	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 ""
 	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
+*)
+	exit 64
 	;;
 esac
 exit 0
diff --git a/www/squid30/pkg-plist b/www/squid30/pkg-plist
index fa28b0b99d1d..f04c2fc92436 100644
--- a/www/squid30/pkg-plist
+++ b/www/squid30/pkg-plist
@@ -1,4 +1,12 @@
+@comment $FreeBSD$
 etc/rc.d/squid.sh
+etc/squid/mib.txt
+@unexec if cmp -s %D/etc/squid/mime.conf %D/etc/squid/mime.conf.default; then rm -f %D/etc/squid/mime.conf; fi
+etc/squid/mime.conf.default
+@unexec if cmp -s %D/etc/squid/msntauth.conf %D/etc/squid/msntauth.conf.default; then rm -f %D/etc/squid/msntauth.conf; fi
+etc/squid/msntauth.conf.default
+@unexec if cmp -s %D/etc/squid/squid.conf %D/etc/squid/squid.conf.default; then rm -f %D/etc/squid/squid.conf; fi
+etc/squid/squid.conf.default
 etc/squid/icons/anthony-binhex.gif
 etc/squid/icons/anthony-bomb.gif
 etc/squid/icons/anthony-box.gif
@@ -26,872 +34,22 @@ etc/squid/icons/anthony-text.gif
 etc/squid/icons/anthony-unknown.gif
 etc/squid/icons/anthony-xbm.gif
 etc/squid/icons/anthony-xpm.gif
-etc/squid/errors/Bulgarian/ERR_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CANNOT_FORWARD
-etc/squid/errors/Bulgarian/ERR_CONNECT_FAIL
-etc/squid/errors/Bulgarian/ERR_DNS_FAIL
-etc/squid/errors/Bulgarian/ERR_FORWARDING_DENIED
-etc/squid/errors/Bulgarian/ERR_FTP_DISABLED
-etc/squid/errors/Bulgarian/ERR_FTP_FAILURE
-etc/squid/errors/Bulgarian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Bulgarian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Bulgarian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Bulgarian/ERR_INVALID_REQ
-etc/squid/errors/Bulgarian/ERR_INVALID_URL
-etc/squid/errors/Bulgarian/ERR_LIFETIME_EXP
-etc/squid/errors/Bulgarian/ERR_NO_RELAY
-etc/squid/errors/Bulgarian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Bulgarian/ERR_READ_ERROR
-etc/squid/errors/Bulgarian/ERR_READ_TIMEOUT
-etc/squid/errors/Bulgarian/ERR_SHUTTING_DOWN
-etc/squid/errors/Bulgarian/ERR_SOCKET_FAILURE
-etc/squid/errors/Bulgarian/ERR_TOO_BIG
-etc/squid/errors/Bulgarian/ERR_UNSUP_REQ
-etc/squid/errors/Bulgarian/ERR_URN_RESOLVE
-etc/squid/errors/Bulgarian/ERR_WRITE_ERROR
-etc/squid/errors/Bulgarian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Catalan/ERR_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CANNOT_FORWARD
-etc/squid/errors/Catalan/ERR_CONNECT_FAIL
-etc/squid/errors/Catalan/ERR_DNS_FAIL
-etc/squid/errors/Catalan/ERR_FORWARDING_DENIED
-etc/squid/errors/Catalan/ERR_FTP_DISABLED
-etc/squid/errors/Catalan/ERR_FTP_FAILURE
-etc/squid/errors/Catalan/ERR_FTP_FORBIDDEN
-etc/squid/errors/Catalan/ERR_FTP_NOT_FOUND
-etc/squid/errors/Catalan/ERR_FTP_PUT_CREATED
-etc/squid/errors/Catalan/ERR_FTP_PUT_ERROR
-etc/squid/errors/Catalan/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Catalan/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Catalan/ERR_INVALID_REQ
-etc/squid/errors/Catalan/ERR_INVALID_URL
-etc/squid/errors/Catalan/ERR_LIFETIME_EXP
-etc/squid/errors/Catalan/ERR_NO_RELAY
-etc/squid/errors/Catalan/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Catalan/ERR_READ_ERROR
-etc/squid/errors/Catalan/ERR_READ_TIMEOUT
-etc/squid/errors/Catalan/ERR_SHUTTING_DOWN
-etc/squid/errors/Catalan/ERR_SOCKET_FAILURE
-etc/squid/errors/Catalan/ERR_TOO_BIG
-etc/squid/errors/Catalan/ERR_UNSUP_REQ
-etc/squid/errors/Catalan/ERR_URN_RESOLVE
-etc/squid/errors/Catalan/ERR_WRITE_ERROR
-etc/squid/errors/Catalan/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Czech/ERR_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CANNOT_FORWARD
-etc/squid/errors/Czech/ERR_CONNECT_FAIL
-etc/squid/errors/Czech/ERR_DNS_FAIL
-etc/squid/errors/Czech/ERR_FORWARDING_DENIED
-etc/squid/errors/Czech/ERR_FTP_DISABLED
-etc/squid/errors/Czech/ERR_FTP_FAILURE
-etc/squid/errors/Czech/ERR_FTP_FORBIDDEN
-etc/squid/errors/Czech/ERR_FTP_NOT_FOUND
-etc/squid/errors/Czech/ERR_FTP_PUT_CREATED
-etc/squid/errors/Czech/ERR_FTP_PUT_ERROR
-etc/squid/errors/Czech/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Czech/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Czech/ERR_INVALID_REQ
-etc/squid/errors/Czech/ERR_INVALID_URL
-etc/squid/errors/Czech/ERR_LIFETIME_EXP
-etc/squid/errors/Czech/ERR_NO_RELAY
-etc/squid/errors/Czech/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Czech/ERR_READ_ERROR
-etc/squid/errors/Czech/ERR_READ_TIMEOUT
-etc/squid/errors/Czech/ERR_SHUTTING_DOWN
-etc/squid/errors/Czech/ERR_SOCKET_FAILURE
-etc/squid/errors/Czech/ERR_TOO_BIG
-etc/squid/errors/Czech/ERR_UNSUP_REQ
-etc/squid/errors/Czech/ERR_URN_RESOLVE
-etc/squid/errors/Czech/ERR_WRITE_ERROR
-etc/squid/errors/Czech/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Danish/ERR_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CANNOT_FORWARD
-etc/squid/errors/Danish/ERR_CONNECT_FAIL
-etc/squid/errors/Danish/ERR_DNS_FAIL
-etc/squid/errors/Danish/ERR_FORWARDING_DENIED
-etc/squid/errors/Danish/ERR_FTP_DISABLED
-etc/squid/errors/Danish/ERR_FTP_FAILURE
-etc/squid/errors/Danish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Danish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Danish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Danish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Danish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Danish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Danish/ERR_INVALID_REQ
-etc/squid/errors/Danish/ERR_INVALID_URL
-etc/squid/errors/Danish/ERR_LIFETIME_EXP
-etc/squid/errors/Danish/ERR_NO_RELAY
-etc/squid/errors/Danish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Danish/ERR_READ_ERROR
-etc/squid/errors/Danish/ERR_READ_TIMEOUT
-etc/squid/errors/Danish/ERR_SHUTTING_DOWN
-etc/squid/errors/Danish/ERR_SOCKET_FAILURE
-etc/squid/errors/Danish/ERR_TOO_BIG
-etc/squid/errors/Danish/ERR_UNSUP_REQ
-etc/squid/errors/Danish/ERR_URN_RESOLVE
-etc/squid/errors/Danish/ERR_WRITE_ERROR
-etc/squid/errors/Danish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Dutch/ERR_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CANNOT_FORWARD
-etc/squid/errors/Dutch/ERR_CONNECT_FAIL
-etc/squid/errors/Dutch/ERR_DNS_FAIL
-etc/squid/errors/Dutch/ERR_FORWARDING_DENIED
-etc/squid/errors/Dutch/ERR_FTP_DISABLED
-etc/squid/errors/Dutch/ERR_FTP_FAILURE
-etc/squid/errors/Dutch/ERR_FTP_FORBIDDEN
-etc/squid/errors/Dutch/ERR_FTP_NOT_FOUND
-etc/squid/errors/Dutch/ERR_FTP_PUT_CREATED
-etc/squid/errors/Dutch/ERR_FTP_PUT_ERROR
-etc/squid/errors/Dutch/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Dutch/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Dutch/ERR_INVALID_REQ
-etc/squid/errors/Dutch/ERR_INVALID_URL
-etc/squid/errors/Dutch/ERR_LIFETIME_EXP
-etc/squid/errors/Dutch/ERR_NO_RELAY
-etc/squid/errors/Dutch/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Dutch/ERR_READ_ERROR
-etc/squid/errors/Dutch/ERR_READ_TIMEOUT
-etc/squid/errors/Dutch/ERR_SHUTTING_DOWN
-etc/squid/errors/Dutch/ERR_SOCKET_FAILURE
-etc/squid/errors/Dutch/ERR_TOO_BIG
-etc/squid/errors/Dutch/ERR_UNSUP_REQ
-etc/squid/errors/Dutch/ERR_URN_RESOLVE
-etc/squid/errors/Dutch/ERR_WRITE_ERROR
-etc/squid/errors/Dutch/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/English/ERR_ACCESS_DENIED
-etc/squid/errors/English/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/English/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/English/ERR_CANNOT_FORWARD
-etc/squid/errors/English/ERR_CONNECT_FAIL
-etc/squid/errors/English/ERR_DNS_FAIL
-etc/squid/errors/English/ERR_FORWARDING_DENIED
-etc/squid/errors/English/ERR_FTP_DISABLED
-etc/squid/errors/English/ERR_FTP_FAILURE
-etc/squid/errors/English/ERR_FTP_FORBIDDEN
-etc/squid/errors/English/ERR_FTP_NOT_FOUND
-etc/squid/errors/English/ERR_FTP_PUT_CREATED
-etc/squid/errors/English/ERR_FTP_PUT_ERROR
-etc/squid/errors/English/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/English/ERR_FTP_UNAVAILABLE
-etc/squid/errors/English/ERR_INVALID_REQ
-etc/squid/errors/English/ERR_INVALID_URL
-etc/squid/errors/English/ERR_LIFETIME_EXP
-etc/squid/errors/English/ERR_NO_RELAY
-etc/squid/errors/English/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/English/ERR_READ_ERROR
-etc/squid/errors/English/ERR_READ_TIMEOUT
-etc/squid/errors/English/ERR_SHUTTING_DOWN
-etc/squid/errors/English/ERR_SOCKET_FAILURE
-etc/squid/errors/English/ERR_TOO_BIG
-etc/squid/errors/English/ERR_UNSUP_REQ
-etc/squid/errors/English/ERR_URN_RESOLVE
-etc/squid/errors/English/ERR_WRITE_ERROR
-etc/squid/errors/English/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Estonian/ERR_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CANNOT_FORWARD
-etc/squid/errors/Estonian/ERR_CONNECT_FAIL
-etc/squid/errors/Estonian/ERR_DNS_FAIL
-etc/squid/errors/Estonian/ERR_FORWARDING_DENIED
-etc/squid/errors/Estonian/ERR_FTP_DISABLED
-etc/squid/errors/Estonian/ERR_FTP_FAILURE
-etc/squid/errors/Estonian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Estonian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Estonian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Estonian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Estonian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Estonian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Estonian/ERR_INVALID_REQ
-etc/squid/errors/Estonian/ERR_INVALID_URL
-etc/squid/errors/Estonian/ERR_LIFETIME_EXP
-etc/squid/errors/Estonian/ERR_NO_RELAY
-etc/squid/errors/Estonian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Estonian/ERR_READ_ERROR
-etc/squid/errors/Estonian/ERR_READ_TIMEOUT
-etc/squid/errors/Estonian/ERR_SHUTTING_DOWN
-etc/squid/errors/Estonian/ERR_SOCKET_FAILURE
-etc/squid/errors/Estonian/ERR_TOO_BIG
-etc/squid/errors/Estonian/ERR_UNSUP_REQ
-etc/squid/errors/Estonian/ERR_URN_RESOLVE
-etc/squid/errors/Estonian/ERR_WRITE_ERROR
-etc/squid/errors/Estonian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Finnish/ERR_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CANNOT_FORWARD
-etc/squid/errors/Finnish/ERR_CONNECT_FAIL
-etc/squid/errors/Finnish/ERR_DNS_FAIL
-etc/squid/errors/Finnish/ERR_FORWARDING_DENIED
-etc/squid/errors/Finnish/ERR_FTP_DISABLED
-etc/squid/errors/Finnish/ERR_FTP_FAILURE
-etc/squid/errors/Finnish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Finnish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Finnish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Finnish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Finnish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Finnish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Finnish/ERR_INVALID_REQ
-etc/squid/errors/Finnish/ERR_INVALID_URL
-etc/squid/errors/Finnish/ERR_LIFETIME_EXP
-etc/squid/errors/Finnish/ERR_NO_RELAY
-etc/squid/errors/Finnish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Finnish/ERR_READ_ERROR
-etc/squid/errors/Finnish/ERR_READ_TIMEOUT
-etc/squid/errors/Finnish/ERR_SHUTTING_DOWN
-etc/squid/errors/Finnish/ERR_SOCKET_FAILURE
-etc/squid/errors/Finnish/ERR_TOO_BIG
-etc/squid/errors/Finnish/ERR_UNSUP_REQ
-etc/squid/errors/Finnish/ERR_URN_RESOLVE
-etc/squid/errors/Finnish/ERR_WRITE_ERROR
-etc/squid/errors/Finnish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/French/ERR_ACCESS_DENIED
-etc/squid/errors/French/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/French/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/French/ERR_CANNOT_FORWARD
-etc/squid/errors/French/ERR_CONNECT_FAIL
-etc/squid/errors/French/ERR_DNS_FAIL
-etc/squid/errors/French/ERR_FORWARDING_DENIED
-etc/squid/errors/French/ERR_FTP_DISABLED
-etc/squid/errors/French/ERR_FTP_FAILURE
-etc/squid/errors/French/ERR_FTP_FORBIDDEN
-etc/squid/errors/French/ERR_FTP_NOT_FOUND
-etc/squid/errors/French/ERR_FTP_PUT_CREATED
-etc/squid/errors/French/ERR_FTP_PUT_ERROR
-etc/squid/errors/French/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/French/ERR_FTP_UNAVAILABLE
-etc/squid/errors/French/ERR_INVALID_REQ
-etc/squid/errors/French/ERR_INVALID_URL
-etc/squid/errors/French/ERR_LIFETIME_EXP
-etc/squid/errors/French/ERR_NO_RELAY
-etc/squid/errors/French/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/French/ERR_READ_ERROR
-etc/squid/errors/French/ERR_READ_TIMEOUT
-etc/squid/errors/French/ERR_SHUTTING_DOWN
-etc/squid/errors/French/ERR_SOCKET_FAILURE
-etc/squid/errors/French/ERR_TOO_BIG
-etc/squid/errors/French/ERR_UNSUP_REQ
-etc/squid/errors/French/ERR_URN_RESOLVE
-etc/squid/errors/French/ERR_WRITE_ERROR
-etc/squid/errors/French/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/German/ERR_ACCESS_DENIED
-etc/squid/errors/German/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/German/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/German/ERR_CANNOT_FORWARD
-etc/squid/errors/German/ERR_CONNECT_FAIL
-etc/squid/errors/German/ERR_DNS_FAIL
-etc/squid/errors/German/ERR_FORWARDING_DENIED
-etc/squid/errors/German/ERR_FTP_DISABLED
-etc/squid/errors/German/ERR_FTP_FAILURE
-etc/squid/errors/German/ERR_FTP_FORBIDDEN
-etc/squid/errors/German/ERR_FTP_NOT_FOUND
-etc/squid/errors/German/ERR_FTP_PUT_CREATED
-etc/squid/errors/German/ERR_FTP_PUT_ERROR
-etc/squid/errors/German/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/German/ERR_FTP_UNAVAILABLE
-etc/squid/errors/German/ERR_INVALID_REQ
-etc/squid/errors/German/ERR_INVALID_URL
-etc/squid/errors/German/ERR_LIFETIME_EXP
-etc/squid/errors/German/ERR_NO_RELAY
-etc/squid/errors/German/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/German/ERR_READ_ERROR
-etc/squid/errors/German/ERR_READ_TIMEOUT
-etc/squid/errors/German/ERR_SHUTTING_DOWN
-etc/squid/errors/German/ERR_SOCKET_FAILURE
-etc/squid/errors/German/ERR_TOO_BIG
-etc/squid/errors/German/ERR_UNSUP_REQ
-etc/squid/errors/German/ERR_URN_RESOLVE
-etc/squid/errors/German/ERR_WRITE_ERROR
-etc/squid/errors/German/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Hebrew/ERR_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CANNOT_FORWARD
-etc/squid/errors/Hebrew/ERR_CONNECT_FAIL
-etc/squid/errors/Hebrew/ERR_DNS_FAIL
-etc/squid/errors/Hebrew/ERR_FORWARDING_DENIED
-etc/squid/errors/Hebrew/ERR_FTP_DISABLED
-etc/squid/errors/Hebrew/ERR_FTP_FAILURE
-etc/squid/errors/Hebrew/ERR_FTP_FORBIDDEN
-etc/squid/errors/Hebrew/ERR_FTP_NOT_FOUND
-etc/squid/errors/Hebrew/ERR_FTP_PUT_CREATED
-etc/squid/errors/Hebrew/ERR_FTP_PUT_ERROR
-etc/squid/errors/Hebrew/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Hebrew/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Hebrew/ERR_INVALID_REQ
-etc/squid/errors/Hebrew/ERR_INVALID_URL
-etc/squid/errors/Hebrew/ERR_LIFETIME_EXP
-etc/squid/errors/Hebrew/ERR_NO_RELAY
-etc/squid/errors/Hebrew/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Hebrew/ERR_READ_ERROR
-etc/squid/errors/Hebrew/ERR_READ_TIMEOUT
-etc/squid/errors/Hebrew/ERR_SHUTTING_DOWN
-etc/squid/errors/Hebrew/ERR_SOCKET_FAILURE
-etc/squid/errors/Hebrew/ERR_TOO_BIG
-etc/squid/errors/Hebrew/ERR_UNSUP_REQ
-etc/squid/errors/Hebrew/ERR_URN_RESOLVE
-etc/squid/errors/Hebrew/ERR_WRITE_ERROR
-etc/squid/errors/Hebrew/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Hungarian/ERR_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CANNOT_FORWARD
-etc/squid/errors/Hungarian/ERR_CONNECT_FAIL
-etc/squid/errors/Hungarian/ERR_DNS_FAIL
-etc/squid/errors/Hungarian/ERR_FORWARDING_DENIED
-etc/squid/errors/Hungarian/ERR_FTP_DISABLED
-etc/squid/errors/Hungarian/ERR_FTP_FAILURE
-etc/squid/errors/Hungarian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Hungarian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Hungarian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Hungarian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Hungarian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Hungarian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Hungarian/ERR_INVALID_REQ
-etc/squid/errors/Hungarian/ERR_INVALID_URL
-etc/squid/errors/Hungarian/ERR_LIFETIME_EXP
-etc/squid/errors/Hungarian/ERR_NO_RELAY
-etc/squid/errors/Hungarian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Hungarian/ERR_READ_ERROR
-etc/squid/errors/Hungarian/ERR_READ_TIMEOUT
-etc/squid/errors/Hungarian/ERR_SHUTTING_DOWN
-etc/squid/errors/Hungarian/ERR_SOCKET_FAILURE
-etc/squid/errors/Hungarian/ERR_TOO_BIG
-etc/squid/errors/Hungarian/ERR_UNSUP_REQ
-etc/squid/errors/Hungarian/ERR_URN_RESOLVE
-etc/squid/errors/Hungarian/ERR_WRITE_ERROR
-etc/squid/errors/Hungarian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Italian/ERR_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CANNOT_FORWARD
-etc/squid/errors/Italian/ERR_CONNECT_FAIL
-etc/squid/errors/Italian/ERR_DNS_FAIL
-etc/squid/errors/Italian/ERR_FORWARDING_DENIED
-etc/squid/errors/Italian/ERR_FTP_DISABLED
-etc/squid/errors/Italian/ERR_FTP_FAILURE
-etc/squid/errors/Italian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Italian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Italian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Italian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Italian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Italian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Italian/ERR_INVALID_REQ
-etc/squid/errors/Italian/ERR_INVALID_URL
-etc/squid/errors/Italian/ERR_LIFETIME_EXP
-etc/squid/errors/Italian/ERR_NO_RELAY
-etc/squid/errors/Italian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Italian/ERR_READ_ERROR
-etc/squid/errors/Italian/ERR_READ_TIMEOUT
-etc/squid/errors/Italian/ERR_SHUTTING_DOWN
-etc/squid/errors/Italian/ERR_SOCKET_FAILURE
-etc/squid/errors/Italian/ERR_TOO_BIG
-etc/squid/errors/Italian/ERR_UNSUP_REQ
-etc/squid/errors/Italian/ERR_URN_RESOLVE
-etc/squid/errors/Italian/ERR_WRITE_ERROR
-etc/squid/errors/Italian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Japanese/ERR_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CANNOT_FORWARD
-etc/squid/errors/Japanese/ERR_CONNECT_FAIL
-etc/squid/errors/Japanese/ERR_DNS_FAIL
-etc/squid/errors/Japanese/ERR_FORWARDING_DENIED
-etc/squid/errors/Japanese/ERR_FTP_DISABLED
-etc/squid/errors/Japanese/ERR_FTP_FAILURE
-etc/squid/errors/Japanese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Japanese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Japanese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Japanese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Japanese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Japanese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Japanese/ERR_INVALID_REQ
-etc/squid/errors/Japanese/ERR_INVALID_URL
-etc/squid/errors/Japanese/ERR_LIFETIME_EXP
-etc/squid/errors/Japanese/ERR_NO_RELAY
-etc/squid/errors/Japanese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Japanese/ERR_READ_ERROR
-etc/squid/errors/Japanese/ERR_READ_TIMEOUT
-etc/squid/errors/Japanese/ERR_SHUTTING_DOWN
-etc/squid/errors/Japanese/ERR_SOCKET_FAILURE
-etc/squid/errors/Japanese/ERR_TOO_BIG
-etc/squid/errors/Japanese/ERR_UNSUP_REQ
-etc/squid/errors/Japanese/ERR_URN_RESOLVE
-etc/squid/errors/Japanese/ERR_WRITE_ERROR
-etc/squid/errors/Japanese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Korean/ERR_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CANNOT_FORWARD
-etc/squid/errors/Korean/ERR_CONNECT_FAIL
-etc/squid/errors/Korean/ERR_DNS_FAIL
-etc/squid/errors/Korean/ERR_FORWARDING_DENIED
-etc/squid/errors/Korean/ERR_FTP_DISABLED
-etc/squid/errors/Korean/ERR_FTP_FAILURE
-etc/squid/errors/Korean/ERR_FTP_FORBIDDEN
-etc/squid/errors/Korean/ERR_FTP_NOT_FOUND
-etc/squid/errors/Korean/ERR_FTP_PUT_CREATED
-etc/squid/errors/Korean/ERR_FTP_PUT_ERROR
-etc/squid/errors/Korean/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Korean/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Korean/ERR_INVALID_REQ
-etc/squid/errors/Korean/ERR_INVALID_URL
-etc/squid/errors/Korean/ERR_LIFETIME_EXP
-etc/squid/errors/Korean/ERR_NO_RELAY
-etc/squid/errors/Korean/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Korean/ERR_READ_ERROR
-etc/squid/errors/Korean/ERR_READ_TIMEOUT
-etc/squid/errors/Korean/ERR_SHUTTING_DOWN
-etc/squid/errors/Korean/ERR_SOCKET_FAILURE
-etc/squid/errors/Korean/ERR_TOO_BIG
-etc/squid/errors/Korean/ERR_UNSUP_REQ
-etc/squid/errors/Korean/ERR_URN_RESOLVE
-etc/squid/errors/Korean/ERR_WRITE_ERROR
-etc/squid/errors/Korean/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Lithuanian/ERR_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CANNOT_FORWARD
-etc/squid/errors/Lithuanian/ERR_CONNECT_FAIL
-etc/squid/errors/Lithuanian/ERR_DNS_FAIL
-etc/squid/errors/Lithuanian/ERR_FORWARDING_DENIED
-etc/squid/errors/Lithuanian/ERR_FTP_DISABLED
-etc/squid/errors/Lithuanian/ERR_FTP_FAILURE
-etc/squid/errors/Lithuanian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Lithuanian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Lithuanian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Lithuanian/ERR_INVALID_REQ
-etc/squid/errors/Lithuanian/ERR_INVALID_URL
-etc/squid/errors/Lithuanian/ERR_LIFETIME_EXP
-etc/squid/errors/Lithuanian/ERR_NO_RELAY
-etc/squid/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Lithuanian/ERR_READ_ERROR
-etc/squid/errors/Lithuanian/ERR_READ_TIMEOUT
-etc/squid/errors/Lithuanian/ERR_SHUTTING_DOWN
-etc/squid/errors/Lithuanian/ERR_SOCKET_FAILURE
-etc/squid/errors/Lithuanian/ERR_TOO_BIG
-etc/squid/errors/Lithuanian/ERR_UNSUP_REQ
-etc/squid/errors/Lithuanian/ERR_URN_RESOLVE
-etc/squid/errors/Lithuanian/ERR_WRITE_ERROR
-etc/squid/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Polish/ERR_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CANNOT_FORWARD
-etc/squid/errors/Polish/ERR_CONNECT_FAIL
-etc/squid/errors/Polish/ERR_DNS_FAIL
-etc/squid/errors/Polish/ERR_FORWARDING_DENIED
-etc/squid/errors/Polish/ERR_FTP_DISABLED
-etc/squid/errors/Polish/ERR_FTP_FAILURE
-etc/squid/errors/Polish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Polish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Polish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Polish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Polish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Polish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Polish/ERR_INVALID_REQ
-etc/squid/errors/Polish/ERR_INVALID_URL
-etc/squid/errors/Polish/ERR_LIFETIME_EXP
-etc/squid/errors/Polish/ERR_NO_RELAY
-etc/squid/errors/Polish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Polish/ERR_READ_ERROR
-etc/squid/errors/Polish/ERR_READ_TIMEOUT
-etc/squid/errors/Polish/ERR_SHUTTING_DOWN
-etc/squid/errors/Polish/ERR_SOCKET_FAILURE
-etc/squid/errors/Polish/ERR_TOO_BIG
-etc/squid/errors/Polish/ERR_UNSUP_REQ
-etc/squid/errors/Polish/ERR_URN_RESOLVE
-etc/squid/errors/Polish/ERR_WRITE_ERROR
-etc/squid/errors/Polish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Portuguese/ERR_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CANNOT_FORWARD
-etc/squid/errors/Portuguese/ERR_CONNECT_FAIL
-etc/squid/errors/Portuguese/ERR_DNS_FAIL
-etc/squid/errors/Portuguese/ERR_FORWARDING_DENIED
-etc/squid/errors/Portuguese/ERR_FTP_DISABLED
-etc/squid/errors/Portuguese/ERR_FTP_FAILURE
-etc/squid/errors/Portuguese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Portuguese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Portuguese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Portuguese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Portuguese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Portuguese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Portuguese/ERR_INVALID_REQ
-etc/squid/errors/Portuguese/ERR_INVALID_URL
-etc/squid/errors/Portuguese/ERR_LIFETIME_EXP
-etc/squid/errors/Portuguese/ERR_NO_RELAY
-etc/squid/errors/Portuguese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Portuguese/ERR_READ_ERROR
-etc/squid/errors/Portuguese/ERR_READ_TIMEOUT
-etc/squid/errors/Portuguese/ERR_SHUTTING_DOWN
-etc/squid/errors/Portuguese/ERR_SOCKET_FAILURE
-etc/squid/errors/Portuguese/ERR_TOO_BIG
-etc/squid/errors/Portuguese/ERR_UNSUP_REQ
-etc/squid/errors/Portuguese/ERR_URN_RESOLVE
-etc/squid/errors/Portuguese/ERR_WRITE_ERROR
-etc/squid/errors/Portuguese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Romanian/ERR_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CANNOT_FORWARD
-etc/squid/errors/Romanian/ERR_CONNECT_FAIL
-etc/squid/errors/Romanian/ERR_DNS_FAIL
-etc/squid/errors/Romanian/ERR_FORWARDING_DENIED
-etc/squid/errors/Romanian/ERR_FTP_DISABLED
-etc/squid/errors/Romanian/ERR_FTP_FAILURE
-etc/squid/errors/Romanian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Romanian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Romanian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Romanian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Romanian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Romanian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Romanian/ERR_INVALID_REQ
-etc/squid/errors/Romanian/ERR_INVALID_URL
-etc/squid/errors/Romanian/ERR_LIFETIME_EXP
-etc/squid/errors/Romanian/ERR_NO_RELAY
-etc/squid/errors/Romanian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Romanian/ERR_READ_ERROR
-etc/squid/errors/Romanian/ERR_READ_TIMEOUT
-etc/squid/errors/Romanian/ERR_SHUTTING_DOWN
-etc/squid/errors/Romanian/ERR_SOCKET_FAILURE
-etc/squid/errors/Romanian/ERR_TOO_BIG
-etc/squid/errors/Romanian/ERR_UNSUP_REQ
-etc/squid/errors/Romanian/ERR_URN_RESOLVE
-etc/squid/errors/Romanian/ERR_WRITE_ERROR
-etc/squid/errors/Romanian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Russian-1251/ERR_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CANNOT_FORWARD
-etc/squid/errors/Russian-1251/ERR_CONNECT_FAIL
-etc/squid/errors/Russian-1251/ERR_DNS_FAIL
-etc/squid/errors/Russian-1251/ERR_FORWARDING_DENIED
-etc/squid/errors/Russian-1251/ERR_FTP_DISABLED
-etc/squid/errors/Russian-1251/ERR_FTP_FAILURE
-etc/squid/errors/Russian-1251/ERR_FTP_FORBIDDEN
-etc/squid/errors/Russian-1251/ERR_FTP_NOT_FOUND
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_CREATED
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_ERROR
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Russian-1251/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Russian-1251/ERR_INVALID_REQ
-etc/squid/errors/Russian-1251/ERR_INVALID_URL
-etc/squid/errors/Russian-1251/ERR_LIFETIME_EXP
-etc/squid/errors/Russian-1251/ERR_NO_RELAY
-etc/squid/errors/Russian-1251/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Russian-1251/ERR_READ_ERROR
-etc/squid/errors/Russian-1251/ERR_READ_TIMEOUT
-etc/squid/errors/Russian-1251/ERR_SHUTTING_DOWN
-etc/squid/errors/Russian-1251/ERR_SOCKET_FAILURE
-etc/squid/errors/Russian-1251/ERR_TOO_BIG
-etc/squid/errors/Russian-1251/ERR_UNSUP_REQ
-etc/squid/errors/Russian-1251/ERR_URN_RESOLVE
-etc/squid/errors/Russian-1251/ERR_WRITE_ERROR
-etc/squid/errors/Russian-1251/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Russian-koi8-r/ERR_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CANNOT_FORWARD
-etc/squid/errors/Russian-koi8-r/ERR_CONNECT_FAIL
-etc/squid/errors/Russian-koi8-r/ERR_DNS_FAIL
-etc/squid/errors/Russian-koi8-r/ERR_FORWARDING_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_DISABLED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_FAILURE
-etc/squid/errors/Russian-koi8-r/ERR_FTP_FORBIDDEN
-etc/squid/errors/Russian-koi8-r/ERR_FTP_NOT_FOUND
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_CREATED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Russian-koi8-r/ERR_INVALID_REQ
-etc/squid/errors/Russian-koi8-r/ERR_INVALID_URL
-etc/squid/errors/Russian-koi8-r/ERR_LIFETIME_EXP
-etc/squid/errors/Russian-koi8-r/ERR_NO_RELAY
-etc/squid/errors/Russian-koi8-r/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Russian-koi8-r/ERR_READ_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_READ_TIMEOUT
-etc/squid/errors/Russian-koi8-r/ERR_SHUTTING_DOWN
-etc/squid/errors/Russian-koi8-r/ERR_SOCKET_FAILURE
-etc/squid/errors/Russian-koi8-r/ERR_TOO_BIG
-etc/squid/errors/Russian-koi8-r/ERR_UNSUP_REQ
-etc/squid/errors/Russian-koi8-r/ERR_URN_RESOLVE
-etc/squid/errors/Russian-koi8-r/ERR_WRITE_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Serbian/ERR_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CANNOT_FORWARD
-etc/squid/errors/Serbian/ERR_CONNECT_FAIL
-etc/squid/errors/Serbian/ERR_DNS_FAIL
-etc/squid/errors/Serbian/ERR_FORWARDING_DENIED
-etc/squid/errors/Serbian/ERR_FTP_DISABLED
-etc/squid/errors/Serbian/ERR_FTP_FAILURE
-etc/squid/errors/Serbian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Serbian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Serbian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Serbian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Serbian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Serbian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Serbian/ERR_INVALID_REQ
-etc/squid/errors/Serbian/ERR_INVALID_URL
-etc/squid/errors/Serbian/ERR_LIFETIME_EXP
-etc/squid/errors/Serbian/ERR_NO_RELAY
-etc/squid/errors/Serbian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Serbian/ERR_READ_ERROR
-etc/squid/errors/Serbian/ERR_READ_TIMEOUT
-etc/squid/errors/Serbian/ERR_SHUTTING_DOWN
-etc/squid/errors/Serbian/ERR_SOCKET_FAILURE
-etc/squid/errors/Serbian/ERR_TOO_BIG
-etc/squid/errors/Serbian/ERR_UNSUP_REQ
-etc/squid/errors/Serbian/ERR_URN_RESOLVE
-etc/squid/errors/Serbian/ERR_WRITE_ERROR
-etc/squid/errors/Serbian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Simplify_Chinese/ERR_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CANNOT_FORWARD
-etc/squid/errors/Simplify_Chinese/ERR_CONNECT_FAIL
-etc/squid/errors/Simplify_Chinese/ERR_DNS_FAIL
-etc/squid/errors/Simplify_Chinese/ERR_FORWARDING_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_DISABLED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_FAILURE
-etc/squid/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Simplify_Chinese/ERR_INVALID_REQ
-etc/squid/errors/Simplify_Chinese/ERR_INVALID_URL
-etc/squid/errors/Simplify_Chinese/ERR_LIFETIME_EXP
-etc/squid/errors/Simplify_Chinese/ERR_NO_RELAY
-etc/squid/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Simplify_Chinese/ERR_READ_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_READ_TIMEOUT
-etc/squid/errors/Simplify_Chinese/ERR_SHUTTING_DOWN
-etc/squid/errors/Simplify_Chinese/ERR_SOCKET_FAILURE
-etc/squid/errors/Simplify_Chinese/ERR_TOO_BIG
-etc/squid/errors/Simplify_Chinese/ERR_UNSUP_REQ
-etc/squid/errors/Simplify_Chinese/ERR_URN_RESOLVE
-etc/squid/errors/Simplify_Chinese/ERR_WRITE_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Slovak/ERR_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CANNOT_FORWARD
-etc/squid/errors/Slovak/ERR_CONNECT_FAIL
-etc/squid/errors/Slovak/ERR_DNS_FAIL
-etc/squid/errors/Slovak/ERR_FORWARDING_DENIED
-etc/squid/errors/Slovak/ERR_FTP_DISABLED
-etc/squid/errors/Slovak/ERR_FTP_FAILURE
-etc/squid/errors/Slovak/ERR_FTP_FORBIDDEN
-etc/squid/errors/Slovak/ERR_FTP_NOT_FOUND
-etc/squid/errors/Slovak/ERR_FTP_PUT_CREATED
-etc/squid/errors/Slovak/ERR_FTP_PUT_ERROR
-etc/squid/errors/Slovak/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Slovak/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Slovak/ERR_INVALID_REQ
-etc/squid/errors/Slovak/ERR_INVALID_URL
-etc/squid/errors/Slovak/ERR_LIFETIME_EXP
-etc/squid/errors/Slovak/ERR_NO_RELAY
-etc/squid/errors/Slovak/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Slovak/ERR_READ_ERROR
-etc/squid/errors/Slovak/ERR_READ_TIMEOUT
-etc/squid/errors/Slovak/ERR_SHUTTING_DOWN
-etc/squid/errors/Slovak/ERR_SOCKET_FAILURE
-etc/squid/errors/Slovak/ERR_TOO_BIG
-etc/squid/errors/Slovak/ERR_UNSUP_REQ
-etc/squid/errors/Slovak/ERR_URN_RESOLVE
-etc/squid/errors/Slovak/ERR_WRITE_ERROR
-etc/squid/errors/Slovak/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Spanish/ERR_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CANNOT_FORWARD
-etc/squid/errors/Spanish/ERR_CONNECT_FAIL
-etc/squid/errors/Spanish/ERR_DNS_FAIL
-etc/squid/errors/Spanish/ERR_FORWARDING_DENIED
-etc/squid/errors/Spanish/ERR_FTP_DISABLED
-etc/squid/errors/Spanish/ERR_FTP_FAILURE
-etc/squid/errors/Spanish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Spanish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Spanish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Spanish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Spanish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Spanish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Spanish/ERR_INVALID_REQ
-etc/squid/errors/Spanish/ERR_INVALID_URL
-etc/squid/errors/Spanish/ERR_LIFETIME_EXP
-etc/squid/errors/Spanish/ERR_NO_RELAY
-etc/squid/errors/Spanish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Spanish/ERR_READ_ERROR
-etc/squid/errors/Spanish/ERR_READ_TIMEOUT
-etc/squid/errors/Spanish/ERR_SHUTTING_DOWN
-etc/squid/errors/Spanish/ERR_SOCKET_FAILURE
-etc/squid/errors/Spanish/ERR_TOO_BIG
-etc/squid/errors/Spanish/ERR_UNSUP_REQ
-etc/squid/errors/Spanish/ERR_URN_RESOLVE
-etc/squid/errors/Spanish/ERR_WRITE_ERROR
-etc/squid/errors/Spanish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Swedish/ERR_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CANNOT_FORWARD
-etc/squid/errors/Swedish/ERR_CONNECT_FAIL
-etc/squid/errors/Swedish/ERR_DNS_FAIL
-etc/squid/errors/Swedish/ERR_FORWARDING_DENIED
-etc/squid/errors/Swedish/ERR_FTP_DISABLED
-etc/squid/errors/Swedish/ERR_FTP_FAILURE
-etc/squid/errors/Swedish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Swedish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Swedish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Swedish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Swedish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Swedish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Swedish/ERR_INVALID_REQ
-etc/squid/errors/Swedish/ERR_INVALID_URL
-etc/squid/errors/Swedish/ERR_LIFETIME_EXP
-etc/squid/errors/Swedish/ERR_NO_RELAY
-etc/squid/errors/Swedish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Swedish/ERR_READ_ERROR
-etc/squid/errors/Swedish/ERR_READ_TIMEOUT
-etc/squid/errors/Swedish/ERR_SHUTTING_DOWN
-etc/squid/errors/Swedish/ERR_SOCKET_FAILURE
-etc/squid/errors/Swedish/ERR_TOO_BIG
-etc/squid/errors/Swedish/ERR_UNSUP_REQ
-etc/squid/errors/Swedish/ERR_URN_RESOLVE
-etc/squid/errors/Swedish/ERR_WRITE_ERROR
-etc/squid/errors/Swedish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Traditional_Chinese/ERR_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CANNOT_FORWARD
-etc/squid/errors/Traditional_Chinese/ERR_CONNECT_FAIL
-etc/squid/errors/Traditional_Chinese/ERR_DNS_FAIL
-etc/squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_DISABLED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_FAILURE
-etc/squid/errors/Traditional_Chinese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Traditional_Chinese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Traditional_Chinese/ERR_INVALID_REQ
-etc/squid/errors/Traditional_Chinese/ERR_INVALID_URL
-etc/squid/errors/Traditional_Chinese/ERR_LIFETIME_EXP
-etc/squid/errors/Traditional_Chinese/ERR_NO_RELAY
-etc/squid/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Traditional_Chinese/ERR_READ_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_READ_TIMEOUT
-etc/squid/errors/Traditional_Chinese/ERR_SHUTTING_DOWN
-etc/squid/errors/Traditional_Chinese/ERR_SOCKET_FAILURE
-etc/squid/errors/Traditional_Chinese/ERR_TOO_BIG
-etc/squid/errors/Traditional_Chinese/ERR_UNSUP_REQ
-etc/squid/errors/Traditional_Chinese/ERR_URN_RESOLVE
-etc/squid/errors/Traditional_Chinese/ERR_WRITE_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Turkish/ERR_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CANNOT_FORWARD
-etc/squid/errors/Turkish/ERR_CONNECT_FAIL
-etc/squid/errors/Turkish/ERR_DNS_FAIL
-etc/squid/errors/Turkish/ERR_FORWARDING_DENIED
-etc/squid/errors/Turkish/ERR_FTP_DISABLED
-etc/squid/errors/Turkish/ERR_FTP_FAILURE
-etc/squid/errors/Turkish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Turkish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Turkish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Turkish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Turkish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Turkish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Turkish/ERR_INVALID_REQ
-etc/squid/errors/Turkish/ERR_INVALID_URL
-etc/squid/errors/Turkish/ERR_LIFETIME_EXP
-etc/squid/errors/Turkish/ERR_NO_RELAY
-etc/squid/errors/Turkish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Turkish/ERR_READ_ERROR
-etc/squid/errors/Turkish/ERR_READ_TIMEOUT
-etc/squid/errors/Turkish/ERR_SHUTTING_DOWN
-etc/squid/errors/Turkish/ERR_SOCKET_FAILURE
-etc/squid/errors/Turkish/ERR_TOO_BIG
-etc/squid/errors/Turkish/ERR_UNSUP_REQ
-etc/squid/errors/Turkish/ERR_URN_RESOLVE
-etc/squid/errors/Turkish/ERR_WRITE_ERROR
-etc/squid/errors/Turkish/ERR_ZERO_SIZE_OBJECT
-etc/squid/mib.txt
-@unexec if cmp -s %D/etc/squid/mime.conf %D/etc/squid/mime.conf.default; then rm -f %D/etc/squid/mime.conf; fi
-etc/squid/mime.conf.default
-@exec [ -f %B/mime.conf ] || cp %B/%f %B/mime.conf
-@unexec if cmp -s %D/etc/squid/squid.conf %D/etc/squid/squid.conf.default; then rm -f %D/etc/squid/squid.conf; fi
-etc/squid/squid.conf.default
-@exec [ -f %B/squid.conf ] || cp %B/%f %B/squid.conf
-libexec/cachemgr.cgi
-libexec/diskd
-libexec/unlinkd
-libexec/ip_user_check
-libexec/yp_auth
-libexec/pam_auth
-libexec/ncsa_auth
-libexec/squid_unix_group
 sbin/RunAccel
 sbin/RunCache
 sbin/squidclient
 sbin/squid
-@exec mkdir -p %D/squid/cache
-@exec chown nobody:nogroup %D/squid/cache
-@exec mkdir -p %D/squid/logs
-@exec chown nobody:nogroup %D/squid/logs
-@dirrm etc/squid/errors/Bulgarian
-@dirrm etc/squid/errors/Catalan
-@dirrm etc/squid/errors/Czech
-@dirrm etc/squid/errors/Danish
-@dirrm etc/squid/errors/Dutch
-@dirrm etc/squid/errors/English
-@dirrm etc/squid/errors/Estonian
-@dirrm etc/squid/errors/Finnish
-@dirrm etc/squid/errors/French
-@dirrm etc/squid/errors/German
-@dirrm etc/squid/errors/Hebrew
-@dirrm etc/squid/errors/Hungarian
-@dirrm etc/squid/errors/Italian
-@dirrm etc/squid/errors/Japanese
-@dirrm etc/squid/errors/Korean
-@dirrm etc/squid/errors/Lithuanian
-@dirrm etc/squid/errors/Polish
-@dirrm etc/squid/errors/Portuguese
-@dirrm etc/squid/errors/Romanian
-@dirrm etc/squid/errors/Russian-1251
-@dirrm etc/squid/errors/Russian-koi8-r
-@dirrm etc/squid/errors/Serbian
-@dirrm etc/squid/errors/Simplify_Chinese
-@dirrm etc/squid/errors/Slovak
-@dirrm etc/squid/errors/Spanish
-@dirrm etc/squid/errors/Swedish
-@dirrm etc/squid/errors/Traditional_Chinese
-@dirrm etc/squid/errors/Turkish
-@dirrm etc/squid/icons
-@dirrm etc/squid/errors
-@dirrm etc/squid
-@dirrm squid/logs
-@dirrm squid/cache
-@dirrm squid
+%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES.html
+%%PORTDOCS%%%%DOCSDIR%%/debug-sections.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@comment Start of dynamically generated plist
+@comment End of dynamically generated plist
+@comment These directories are maybe not empty at deinstallation time.
+@comment Since we try to preserve the data in there for updates anyway, be quiet.
+@unexec rmdir %D/etc/squid/icons 2>/dev/null || true
+@unexec rmdir %D/etc/squid/errors 2>/dev/null || true
+@unexec rmdir %D/etc/squid 2>/dev/null || true
+@unexec rmdir %D/squid/logs 2>/dev/null || true
+@unexec rmdir %D/squid/cache 2>/dev/null || true
+@unexec rmdir %D/squid 2>/dev/null || true
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index baf1c842a527..bed437c96f56 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -4,10 +4,31 @@
 #
 # $FreeBSD$
 #
+# Tunables:
+# WITH_SQUID_PINGER
+#   install the external icmp helper program (`pinger') for hierarchy stats and
+#   selection
+# WITH_SQUID_LDAP_AUTH
+#   install external modules for authentication against LDAP servers
+# SQUID_{U,G}ID
+#   Which user/group squid should run as (default: squid/squid).
+#   The user and group will be created if they do not already exist.
+#   NOTE: before version 2.5.4_6, these settings defaulted to
+#   nobody/nogroup.
+#   If you wish to keep these settings, please define SQUID_UID=nobody and
+#   SQUID_GID=nogroup in your make environment before you start the update.
+# SQUID_LANGUAGES
+#   A list of languages for which error page files should be installed
+#   (default: all)
+# SQUID_DEFAULT_LANG
+#   If you define SQUID_LANGUAGES, select which language should be the default
+#   (default: English)
+# SQUID_CONFIGURE_ARGS
+#   Additional configuration options, see below for a list
 
 PORTNAME=	squid
 PORTVERSION=	2.5.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	\
 		ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
@@ -17,7 +38,6 @@ MASTER_SITES=	\
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/squid/&,}
 MASTER_SITE_SUBDIR=	squid-2/STABLE
 DISTNAME=	squid-2.5.STABLE4
-EXTRACT_SUFX=	.tar.bz2
 DIST_SUBDIR=	squid2.5
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
@@ -54,89 +74,131 @@ PATCHFILES=	squid-2.5.STABLE4-reconfigure_message.patch \
 		squid-2.5.STABLE4-pinger.patch \
 		squid-2.5.STABLE4-partial_reload.patch \
 		squid-2.5.STABLE4-ldap_tls.patch \
-		squid-2.5.STABLE4-ldap_group_bufsize.patch
+		squid-2.5.STABLE4-ldap_group_bufsize.patch \
+		squid-2.5.STABLE4-http_workarounds.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tmseck@netcologne.de
 COMMENT=	The successful WWW proxy cache and accelerator
 
+CONFLICTS=	squid-*
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	yes
-# Follow the apache port's lead...
+
+SQUID_UID?=	squid
+SQUID_GID?=	squid
+
+MAN8=		squid.8
+DOCS=		QUICKSTART README RELEASENOTES.html doc/debug-sections.txt
+
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--datadir=${PREFIX}/etc/squid \
+		--libexecdir=${PREFIX}/libexec/squid \
 		--localstatedir=${PREFIX}/squid \
 		--enable-storeio="ufs diskd null" \
 		--enable-removal-policies="lru heap" \
-		--enable-auth=basic --enable-basic-auth-helpers="NCSA PAM YP" \
-		--enable-external-acl-helpers="ip_user unix_group" \
-		--enable-underscores ${SQUID_CONFIGURE_ARGS}
-
-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
-#CONFIGURE_ARGS+= --enable-dlmalloc
-#  - Compile and use the supplied GNUregex routines instead of BSD regex.
-#CONFIGURE_ARGS+= --enable-gnuregex
-#  - Enable simple malloc debugging
-#CONFIGURE_ARGS+= --enable-xmalloc-debug
-#  - Detailed trace of memory allocations
-#CONFIGURE_ARGS+= --enable-xmalloc-debug-count
-#  - Show malloc statistics in cachemgr status pages
-#CONFIGURE_ARGS+= --enable-xmalloc-statistics
-#  - Enable CARP support
-#CONFIGURE_ARGS+= --enable-carp
-#  - Enable ICMP pinging for heirarchy stats and selection
-#CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay pools to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-pools
-#  - Enable generic memory use tracing
-#CONFIGURE_ARGS+= --enable-mem-gen-trace
-#  - Enable logging of the User-Agent header
-#CONFIGURE_ARGS+= --enable-useragent-log
-#  - Disable Web Cache Coordination Protocol
-#CONFIGURE_ARGS+= --disable-wccp
-#  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent-hack
-#  - Turn on SNMP server support
-#CONFIGURE_ARGS+= --enable-snmp
-#  - Turn on SSL server support for reverse proxies
-#CONFIGURE_ARGS+= --enable-ssl
-#  - Optimize time updates to one per second rather than calling gettimeofday()
-#CONFIGURE_ARGS+= --enable-time-hack
-#  - Set an explicit hostname in cachemgr.cgi
-#CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
-#  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
-#    assigned IP addresses)
-#CONFIGURE_ARGS+= --enable-arp-acl
-#  - Enable HTCP protocol
-#CONFIGURE_ARGS+= --enable-htcp
-#  - Enable Forw/Via database
-#CONFIGURE_ARGS+= --enable-forw-via-db
-#  - 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
-#  (--enable-poll is not needed, it's detected correctly on 3.0)
-#  - Strict HTTP compliance
-#CONFIGURE_ARGS+= --disable-http-violations
-#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
-#CONFIGURE_ARGS+= --enable-ipf-transparent
-# (--enable-leakfinder is a developer support tool only)
-#  - Compile out code that does optional Ident (RFC931) lookups
-#CONFIGURE_ARGS+= --disable-ident-lookups
-#  - Disable squid's internal async DNS lookup code.
-#CONFIGURE_ARGS+= --disable-internal-dns
-#  - Use truncate() rather than unlink()
-#CONFIGURE_ARGS+= --enable-truncate
-#  - accept the illegal '_' character in hostnames.
-#CONFIGURE_ARGS+= --enable-underscores
-#  - Enable control of different heap replacement algorithms at runtime.
-#CONFIGURE_ARGS+= --enable-removal-policies
+		--enable-underscores
+
+.if defined(WITH_SQUID_PINGER)
+CONFIGURE_ARGS+=	--enable-icmp
+.endif
+
+# Authentication methods and modules:
+
+basic_auth=	NCSA PAM YP MSNT winbind
+external_acl=	ip_user unix_group wbinfo_group winbind_group
+MAN8+=		pam_auth.8 squid_unix_group.8
+.if defined(WITH_SQUID_LDAP_AUTH)
+USE_OPENLDAP=	yes
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+MAN8+=		squid_ldap_auth.8 squid_ldap_group.8
+basic_auth+=	LDAP
+external_acl+=	ldap_group
+.endif
+CONFIGURE_ARGS+=	--enable-auth="basic ntlm digest" \
+			--enable-basic-auth-helpers="${basic_auth}" \
+			--enable-digest-auth-helpers="password" \
+			--enable-external-acl-helpers="${external_acl}" \
+			--enable-ntlm-auth-helpers="winbind"
+
+# Languages:
+#
+# If you do not define SQUID_LANGUAGES yourself, all available language files
+# will be installed; the default language will be english.
+
+SQUID_LANGUAGES?=	\
+	Bulgarian Catalan Czech Danish Dutch English Estonian Finnish      \
+	French German Hebrew Hungarian Italian Japanese Korean Lithuanian  \
+	Polish Portuguese Romanian Russian-1251 Russian-koi8-r Serbian     \
+	Simplify_Chinese Slovak Spanish Swedish Traditional_Chinese Turkish
+SQUID_DEFAULT_LANG?=	English
+CONFIGURE_ARGS+=	--enable-err-languages="${SQUID_LANGUAGES}" \
+			--enable-default-err-language=${SQUID_DEFAULT_LANG}
+
+# Other configure options you might want to set using SQUID_CONFIGURE_ARGS:
+# Please see the configure script in the squid source distribution for a
+# complete list.
+#
+# --enable-dlmalloc
+#  Compile and use the malloc package from Doug Lea
+# --enable-gnuregex
+#  Compile and use the supplied GNUregex routines instead of BSD regex.
+# --enable-xmalloc-statistics
+#  Show malloc statistics in status page
+# --enable-carp
+#  Enable CARP support
+# --enable-delay-pools
+#  Enable delay pools to limit bandwidth usage
+# --enable-useragent-log
+#  Enable logging of the User-Agent header
+# --disable-wccp
+#  Disable Web Cache Coordination Protocol
+# --enable-snmp
+#  Turn on SNMP server support
+# --enable-ssl
+#  Turn on SSL server support for reverse proxies
+# --enable-time-hack
+#  Optimize time updates to one per second rather than calling gettimeofday()
+# --enable-cachemgr-hostname=some.hostname
+#  Set an explicit hostname in cachemgr.cgi
+# --enable-arp-acl
+#  Enable ACL based on ethernet address (eg: for machines with dynamic DHCP
+#  assigned IP addresses)
+# --enable-htcp
+#  Enable HTCP protocol
+# --enable-forw-via-db
+#  Enable Forw/Via database
+# --enable-cache-digests
+#  Use Cache Digests - see http://www.squid-cache.org/Doc/FAQ/FAQ-16.html
+# --disable-http-violations
+#  Strict HTTP compliance
+# --enable-ipf-transparent
+#  Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#  (Note: this is currently broken due to ipf headers not being installed to
+#  the base system, see PRs ports/60700 and misc/44148 for details)
+#  Note: see http://www.squid-cache.org/Doc/FAQ/FAQ-17.html for information
+#  about how to do transparent proxying with ipfw(8).
+# --disable-ident-lookups
+#  Compile out code that does optional Ident (RFC931) lookups
+# --disable-internal-dns
+#  Install the old external "dnsserver" binary
+# --enable-truncate
+#  Use truncate() rather than unlink()
+# --disable-hostname-checks
+#  Squid by default rejects any host names with odd characters in their name
+#  to conform with internet standards. If you disagree with this you may use
+#  this switch to turn off any such checks, provided that the resolver used by
+#  Squid does not reject such host names. This may be required to participate
+#  in testbeds for international domain names.
+# --disable-unlinkd
+#  Do not use "unlinkd"
+# --enable-stacktraces
+#  Enable automatic call backtrace on fatal errors
+
+CONFIGURE_ARGS+=	${SQUID_CONFIGURE_ARGS}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
@@ -145,37 +207,53 @@ post-patch:
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
+pre-configure:
+	@${REINPLACE_CMD} -e 's|%%SQUID_UID%%|${SQUID_UID}|g' \
+	    -e 's|%%SQUID_GID%%|${SQUID_GID}|g' ${WRKSRC}/src/cf.data.pre
+
+pre-install:
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	    -e 's|%%SQUID_UID%%|${SQUID_UID}|g' ${FILESDIR}/squid.sh \
+	    >${WRKDIR}/squid.sh
+
+pre-su-install:
+	@${SETENV} SQUID_UID=${SQUID_UID} SQUID_GID=${SQUID_GID} \
+	    PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+
 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 sbin_file in client squid
-	if [ -f ${PREFIX}/sbin/${sbin_file} ] ; then \
-		${STRIP_CMD} ${PREFIX}/sbin/${sbin_file} ; \
-	fi
-.endfor
-.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			\
-		${MKDIR} ${PREFIX}/squid/logs;		  	\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/logs;   \
-	fi
-	@if [ ! -d ${PREFIX}/squid/cache ]; then		\
-		${MKDIR} ${PREFIX}/squid/cache;			\
-		${CHOWN} nobody:nogroup ${PREFIX}/squid/cache;  \
-	fi
-	@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; \
-	fi
+.if defined(WITH_SQUID_PINGER)
+	${CHMOD} 4710 ${PREFIX}/libexec/squid/pinger; \
+	${CHGRP} ${SQUID_GID} ${PREFIX}/libexec/squid/pinger
+.endif
+	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
+.if exists(${PREFIX}/etc/squid/errors/Lithuanian)
 # Work around the fact that the errorpages.patch creates files in
 # an "Attic" subdir:
 	@${FIND} ${WRKSRC}/errors/Lithuanian/Attic -type f \
-	-exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \;
+   	    -exec ${INSTALL_DATA} {} ${PREFIX}/etc/squid/errors/Lithuanian/ \;
+.endif
+	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+# Generate parts of pkg-plist on the fly:
+	@cd ${PREFIX} && ${FIND} libexec/squid -type f -o -type l \
+	    >${WRKDIR}/plist.dynamic
+	@${ECHO_CMD} "@dirrm libexec/squid" >>${WRKDIR}/plist.dynamic
+# Only register what we should have installed, there may be local additions
+# present:
+.for d in ${SQUID_LANGUAGES}
+	@cd ${PREFIX} && ${FIND} etc/squid/errors/${d} -type f \
+	    >>${WRKDIR}/plist.dynamic
+	@${ECHO_CMD} "@dirrm etc/squid/errors/${d}" >>${WRKDIR}/plist.dynamic
+.endfor
+	@${ECHO_CMD} "r ${TMPPLIST}" >${WRKDIR}/ex.script
+	@${ECHO_CMD} "/Start of dynamically generated plist" >>${WRKDIR}/ex.script
+	@${ECHO_CMD} "r ${WRKDIR}/plist.dynamic" >>${WRKDIR}/ex.script
+	@${ECHO_CMD} "x!" >>${WRKDIR}/ex.script
+	@${CP} -p ${TMPPLIST} ${TMPPLIST}.orig
+	@cd ${WRKDIR} && ex <ex.script >/dev/null
 
 .include <bsd.port.mk>
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 76f9e296de4d..893a0e19d67a 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -33,3 +33,4 @@ MD5 (squid2.5/squid-2.5.STABLE4-pinger.patch) = 0902849d051873aaf5f54584d0536bb5
 MD5 (squid2.5/squid-2.5.STABLE4-partial_reload.patch) = 6d8fa663f46ffc2272b7d18a0b6eea34
 MD5 (squid2.5/squid-2.5.STABLE4-ldap_tls.patch) = dcd6b4ec46e252833a54c4bfd155c284
 MD5 (squid2.5/squid-2.5.STABLE4-ldap_group_bufsize.patch) = e42207a45232ca739a64f2ac3901263c
+MD5 (squid2.5/squid-2.5.STABLE4-http_workarounds.patch) = 69d958d5120116de3e5efd2b9e30c3ac
diff --git a/www/squid31/files/patch-src-cf.data.pre b/www/squid31/files/patch-src-cf.data.pre
new file mode 100644
index 000000000000..2a8e1eff429f
--- /dev/null
+++ b/www/squid31/files/patch-src-cf.data.pre
@@ -0,0 +1,20 @@
+--- src/cf.data.pre.orig	Thu May  1 14:07:51 2003
++++ src/cf.data.pre	Thu May  1 14:13:12 2003
+@@ -2325,7 +2325,7 @@
+ 
+ NAME: cache_effective_user
+ TYPE: string
+-DEFAULT: nobody
++DEFAULT: %%SQUID_UID%%
+ LOC: Config.effectiveUser
+ DOC_NONE
+ 
+@@ -2337,7 +2337,7 @@
+ 
+ 	If you start Squid as root, it will change its effective/real
+ 	UID/GID to the UID/GID specified below.  The default is to
+-	change to UID to nobody.  If you define cache_effective_user,
++	change to UID to %%SQUID_UID%%.  If you define cache_effective_user,
+ 	but not cache_effective_group, Squid sets the GID the
+ 	effective user's default group ID (taken from the password
+ 	file).
diff --git a/www/squid31/files/squid.sh b/www/squid31/files/squid.sh
index 40f655b04f27..ec92a10bc3fc 100644
--- a/www/squid31/files/squid.sh
+++ b/www/squid31/files/squid.sh
@@ -1,26 +1,75 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
+# PROVIDE: squid
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD
+# 
+# Note:
+# If you are running an rcNG-System (i.e. FreeBSD 5 and later or after
+# having installed the rc_subr-port on an earlier system) you must set
+# "squid_enable=YES" in either /etc/rc.conf, /etc/rc.conf.local or
+# /etc/rc.conf.d/squid to make this script actually do something. There
+# you can also set squid_chdir, squid_user, and squid_flags.
+#
+# Please see squid(8), rc.conf(5) and rc(8) for further details.
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
+unset rcNG
+name="squid"
+command=%%PREFIX%%/sbin/squid
+extra_commands=reload
+reload_cmd="${command} -k reconfigure"
+stop_cmd="${command} -k shutdown"
+: ${squid_chdir:=%%PREFIX%%/squid/logs}
+: ${squid_user:=%%SQUID_UID%%}
+: ${squid_flags:="-D"}
+default_config=%%PREFIX%%/etc/squid/squid.conf
 
-case "$1" in
-start)
-	if [ -x ${PREFIX}/sbin/squid -a -f ${PREFIX}/etc/squid/squid.conf ]; then
-		(cd /${PREFIX}/squid/logs; ${PREFIX}/sbin/squid >/dev/null 2>&1 &) ; echo -n ' squid'
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr && rcNG=yes
+else
+	if [ -f %%PREFIX%%/etc/rc.subr ]; then
+		. %%PREFIX%%/etc/rc.subr && rcNG=yes
 	fi
-	;;
-stop)
-		${PREFIX}/sbin/squid -k shutdown 2>&1
-		# Uncomment this if you'd like the system to (attempt to
-		# wait for) squid to shut down cleanly
-		#echo "Sleeping for 45 seconds to allow squid to shutdown.."
-		#sleep 45 
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
+fi
 
-exit 0
+if [ "${rcNG}" ]; then
+	rcvar=`set_rcvar`
+	load_rc_config ${name}
+	# check that squid's default configuration is present when
+	# squid_flags is not set. We assume that you specify at
+	# least the path to your non-default configuration with
+	# '-f /path/to/config.file' in squid_flags if you delete this file.
+	if [ -z "${squid_flags}" ]; then
+		required_files=${default_config}
+	fi
+	required_dirs=${squid_chdir}
+	run_rc_command "$1"
+else
+	case $1 in
+	start)
+		if [ -x "${command}" -a \
+			\( -f "${default_config}" -o "${squid_flags}" \) ]; then
+			echo -n ' squid'
+			(cd ${squid_chdir} && exec su -fm ${squid_user} -c \
+				"${command} ${squid_flags}")
+		fi
+		;;
+	stop)
+		if [ -x "${command}" ]; then
+			echo -n ' squid'
+			${stop_cmd}
+			while ps -xcU ${squid_user} | grep -q squid; do
+				sleep 2
+			done
+		fi
+		;;
+		*)
+		echo "usage: `basename $0` {start|stop}" >&2
+		exit 64
+		;;
+	esac
+	exit 0
+fi
diff --git a/www/squid31/pkg-deinstall b/www/squid31/pkg-deinstall
new file mode 100644
index 000000000000..3a95b4f50e0d
--- /dev/null
+++ b/www/squid31/pkg-deinstall
@@ -0,0 +1,29 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+PATH=/bin:/usr/bin:/usr/sbin
+pkgname=$1
+
+case $2 in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	echo "===> post-deinstallation information for ${pkgname}"
+	echo ""
+	echo "     Please note that ${pkgname} was not completely removed"
+	echo "     from this system."
+	echo ""
+	echo "     The cache and log directories, squid's user account,"
+	echo "     and any modified configuration files have been preserved"
+	echo "     in case you want to install an updated version of squid"
+	echo "     on this system. You must remove them manually if you do"
+	echo "     not want to use squid any longer."
+	echo ""
+	;;
+*)
+	exit 64
+	;;
+esac
+exit 0
diff --git a/www/squid31/pkg-descr b/www/squid31/pkg-descr
index a030d6c271b8..f2674655d01e 100644
--- a/www/squid31/pkg-descr
+++ b/www/squid31/pkg-descr
@@ -9,9 +9,15 @@ 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.
 
-FreeBSD PORTER'S NOTES. To this moment, Squid is not well documented.
-But you aren't lost in space: there is a mailing list,
-<squid-users@squid-cache.org>, where you will find some support and help.
-We also _strongly_ suggest you to examine Web pages noted above.
+Please see this port's Makefile for a list of compilation options.
+
+*** UPDATE NOTICE ***
+Starting from Version 2.5.4_6 the default user:group changed from
+nobody:nogroup to squid:squid. You can restore the old behavior
+of this port by specifying SQUID_UID=nobody SQUID_GID=nogroup in
+your make environment. Helper applications are now installed to
+$PREFIX/libexec/squid instead of $PREFIX/libexec, too.
+
+You can find further information on the project's website at
 
 WWW: http://www.squid-cache.org/
diff --git a/www/squid31/pkg-install b/www/squid31/pkg-install
index 7efd84949fd2..3b16eee43fda 100644
--- a/www/squid31/pkg-install
+++ b/www/squid31/pkg-install
@@ -1,44 +1,105 @@
 #!/bin/sh
+#
+# $FreeBSD$
+#
 
-PKGNAME=$1
+PATH=/bin:/usr/bin:/usr/sbin
+pkgname=$1
+squid_base=${PKG_PREFIX:-/usr/local}/squid
+squid_confdir=${PKG_PREFIX:-/usr/local}/etc/squid
+squid_user=${SQUID_UID:=squid}
+squid_group=${SQUID_GID:=squid}
+squid_gid=3128
+squid_uid=3128
 
 case $2 in
-    PRE-INSTALL)
+PRE-INSTALL)
+	echo "===> Pre-installation configuration for ${pkgname}"
+	if ! pw groupshow ${squid_group} -q >/dev/null ; then
+		while pw groupshow -g ${squid_gid} -q >/dev/null; do
+			squid_gid=`expr ${squid_gid} + 1`
+		done
+		echo "There is no group '${squid_group}' on this system, so I will try to create it:"
+		if ! pw groupadd ${squid_group} -g ${squid_gid} -q ; then
+			echo "Failed to create group \"${squid_group}\"!" >&2
+			echo "Please create it manually." >&2
+			exit 1
+		else
+			echo "Group '${squid_group}' created successfully:"
+		fi
+	else
+		echo "I will use the existing group '${squid_group}':"
+	fi
+	pw groupshow ${squid_group}
+	if ! pw usershow ${squid_user} -q >/dev/null ; then
+		while pw usershow -u ${squid_uid} -q >/dev/null; do
+			squid_uid=`expr ${squid_uid} + 1`
+		done
+		echo "There is no account '${squid_user}' on this system, so I will try to create it:"
+		if ! pw useradd ${squid_user} -u ${squid_uid} -q \
+	  	    -c "squid caching-proxy pseudo user" -g ${squid_group} \
+		    -d "${squid_base}" -s "/sbin/nologin" -h - ; then
+			echo "Failed to create user '${squid_user}'!" >&2
+			echo "Please create it manually." >&2
+			exit 1
+		else
+			echo "User '${squid_user}' created successfully:"
+		fi
+	else
+		echo "I will use the existing user '${squid_user}':"
+	fi
+	pw usershow ${squid_user}
+	for dir in cache logs; do
+	if [ ! -d ${squid_base}/${dir} ]; then
+		echo "Creating ${squid_base}/${dir}..."
+		install -d -o ${squid_user} -g ${squid_group} \
+		    -m 0750 ${squid_base}/${dir}
+	fi
+	done
+	if [ ! -d ${squid_confdir} ]; then
+		echo "Creating ${squid_confdir}..."
+		install -d -o root -g ${squid_group} \
+		    -m 0750 ${squid_confdir}
+	fi
 	;;
-    POST-INSTALL)
-	echo "==> Post-installation configuration of ${PKGNAME}"
+POST-INSTALL)
+	for file in mime.conf squid.conf; do
+		if [ ! -f ${squid_confdir}/${file} \
+		    -a -f ${squid_confdir}/${file}.default ]; then
+		echo "Creating ${file} from default..."
+		install -c -o root -g ${squid_group} -m 0640 \
+		    ${squid_confdir}/${file}.default ${squid_confdir}/${file}
+	fi
+	done
+
+	echo "===> Post-installation informations for ${pkgname}"
+	echo ""
+	echo "     o You can find the configuration files for this package"
+	echo "       in the directory ${squid_confdir}."
 	echo ""
-	echo "    o you DO need running nameservice to start and run ${PKGNAME}"
+	echo "     o A cache directory has been created in ${squid_base}/cache."
+	echo "       Log files will be written to ${squid_base}/logs."
 	echo ""
-	echo "    o use the ${PKGNAME} proxy and caching WWW Server by"
-	echo "      configuring your WWW Navigator (Netscape, Mosaic,...)"
-	echo "      to use it as a proxy server."
+	echo "     o The default configuration will deny everyone access to the"
+	echo "       proxy service. Edit the \"http_access\" directives in"
+	echo "       ${squid_confdir}/squid.conf to suit your needs."
 	echo ""
-	echo "    o Note that before you can run ${PKGNAME} you will"
-	echo "      need to initialise the cache directory."
-	echo "      You can do this by typing \"squid -z\"."
+	echo "     o If you never ran squid on this system before, you need to"
+	echo "       initialize the cache directory by running \"squid -z\""
+	echo "       as 'root' or '${squid_user}' before starting squid."
 	echo ""
-	echo "==> Press Enter to edit the ${PKGNAME} config file."
-	echo "    (The defaults are reasonable; and the file is well commented)"
 	tput md
-	echo "    You'd certainly like to pay attention to the"
-	echo "    ACTUAL locations of cache \"spool\", logfiles, pidfile!"
+	echo "     *** UPDATE NOTICE ***"
+	echo ""
+	echo "     Starting with version 2.5.4_6, all helper applications are"
+	echo "     installed to ${PKG_PREFIX}/libexec/squid instead of"
+	echo "     ${PKG_PREFIX}/libexec."
+	echo "     Please check your squid.conf and update it if necessary."
 	tput me
-	if [ -z "${PACKAGE_BUILDING}" ]; then read skip; fi
-	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 ""
 	;;
-    *)
-	echo "Unexpected Argument $2!!!"
-	exit 1
+*)
+	exit 64
 	;;
 esac
 exit 0
diff --git a/www/squid31/pkg-plist b/www/squid31/pkg-plist
index fa28b0b99d1d..f04c2fc92436 100644
--- a/www/squid31/pkg-plist
+++ b/www/squid31/pkg-plist
@@ -1,4 +1,12 @@
+@comment $FreeBSD$
 etc/rc.d/squid.sh
+etc/squid/mib.txt
+@unexec if cmp -s %D/etc/squid/mime.conf %D/etc/squid/mime.conf.default; then rm -f %D/etc/squid/mime.conf; fi
+etc/squid/mime.conf.default
+@unexec if cmp -s %D/etc/squid/msntauth.conf %D/etc/squid/msntauth.conf.default; then rm -f %D/etc/squid/msntauth.conf; fi
+etc/squid/msntauth.conf.default
+@unexec if cmp -s %D/etc/squid/squid.conf %D/etc/squid/squid.conf.default; then rm -f %D/etc/squid/squid.conf; fi
+etc/squid/squid.conf.default
 etc/squid/icons/anthony-binhex.gif
 etc/squid/icons/anthony-bomb.gif
 etc/squid/icons/anthony-box.gif
@@ -26,872 +34,22 @@ etc/squid/icons/anthony-text.gif
 etc/squid/icons/anthony-unknown.gif
 etc/squid/icons/anthony-xbm.gif
 etc/squid/icons/anthony-xpm.gif
-etc/squid/errors/Bulgarian/ERR_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Bulgarian/ERR_CANNOT_FORWARD
-etc/squid/errors/Bulgarian/ERR_CONNECT_FAIL
-etc/squid/errors/Bulgarian/ERR_DNS_FAIL
-etc/squid/errors/Bulgarian/ERR_FORWARDING_DENIED
-etc/squid/errors/Bulgarian/ERR_FTP_DISABLED
-etc/squid/errors/Bulgarian/ERR_FTP_FAILURE
-etc/squid/errors/Bulgarian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Bulgarian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Bulgarian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Bulgarian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Bulgarian/ERR_INVALID_REQ
-etc/squid/errors/Bulgarian/ERR_INVALID_URL
-etc/squid/errors/Bulgarian/ERR_LIFETIME_EXP
-etc/squid/errors/Bulgarian/ERR_NO_RELAY
-etc/squid/errors/Bulgarian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Bulgarian/ERR_READ_ERROR
-etc/squid/errors/Bulgarian/ERR_READ_TIMEOUT
-etc/squid/errors/Bulgarian/ERR_SHUTTING_DOWN
-etc/squid/errors/Bulgarian/ERR_SOCKET_FAILURE
-etc/squid/errors/Bulgarian/ERR_TOO_BIG
-etc/squid/errors/Bulgarian/ERR_UNSUP_REQ
-etc/squid/errors/Bulgarian/ERR_URN_RESOLVE
-etc/squid/errors/Bulgarian/ERR_WRITE_ERROR
-etc/squid/errors/Bulgarian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Catalan/ERR_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Catalan/ERR_CANNOT_FORWARD
-etc/squid/errors/Catalan/ERR_CONNECT_FAIL
-etc/squid/errors/Catalan/ERR_DNS_FAIL
-etc/squid/errors/Catalan/ERR_FORWARDING_DENIED
-etc/squid/errors/Catalan/ERR_FTP_DISABLED
-etc/squid/errors/Catalan/ERR_FTP_FAILURE
-etc/squid/errors/Catalan/ERR_FTP_FORBIDDEN
-etc/squid/errors/Catalan/ERR_FTP_NOT_FOUND
-etc/squid/errors/Catalan/ERR_FTP_PUT_CREATED
-etc/squid/errors/Catalan/ERR_FTP_PUT_ERROR
-etc/squid/errors/Catalan/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Catalan/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Catalan/ERR_INVALID_REQ
-etc/squid/errors/Catalan/ERR_INVALID_URL
-etc/squid/errors/Catalan/ERR_LIFETIME_EXP
-etc/squid/errors/Catalan/ERR_NO_RELAY
-etc/squid/errors/Catalan/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Catalan/ERR_READ_ERROR
-etc/squid/errors/Catalan/ERR_READ_TIMEOUT
-etc/squid/errors/Catalan/ERR_SHUTTING_DOWN
-etc/squid/errors/Catalan/ERR_SOCKET_FAILURE
-etc/squid/errors/Catalan/ERR_TOO_BIG
-etc/squid/errors/Catalan/ERR_UNSUP_REQ
-etc/squid/errors/Catalan/ERR_URN_RESOLVE
-etc/squid/errors/Catalan/ERR_WRITE_ERROR
-etc/squid/errors/Catalan/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Czech/ERR_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Czech/ERR_CANNOT_FORWARD
-etc/squid/errors/Czech/ERR_CONNECT_FAIL
-etc/squid/errors/Czech/ERR_DNS_FAIL
-etc/squid/errors/Czech/ERR_FORWARDING_DENIED
-etc/squid/errors/Czech/ERR_FTP_DISABLED
-etc/squid/errors/Czech/ERR_FTP_FAILURE
-etc/squid/errors/Czech/ERR_FTP_FORBIDDEN
-etc/squid/errors/Czech/ERR_FTP_NOT_FOUND
-etc/squid/errors/Czech/ERR_FTP_PUT_CREATED
-etc/squid/errors/Czech/ERR_FTP_PUT_ERROR
-etc/squid/errors/Czech/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Czech/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Czech/ERR_INVALID_REQ
-etc/squid/errors/Czech/ERR_INVALID_URL
-etc/squid/errors/Czech/ERR_LIFETIME_EXP
-etc/squid/errors/Czech/ERR_NO_RELAY
-etc/squid/errors/Czech/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Czech/ERR_READ_ERROR
-etc/squid/errors/Czech/ERR_READ_TIMEOUT
-etc/squid/errors/Czech/ERR_SHUTTING_DOWN
-etc/squid/errors/Czech/ERR_SOCKET_FAILURE
-etc/squid/errors/Czech/ERR_TOO_BIG
-etc/squid/errors/Czech/ERR_UNSUP_REQ
-etc/squid/errors/Czech/ERR_URN_RESOLVE
-etc/squid/errors/Czech/ERR_WRITE_ERROR
-etc/squid/errors/Czech/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Danish/ERR_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Danish/ERR_CANNOT_FORWARD
-etc/squid/errors/Danish/ERR_CONNECT_FAIL
-etc/squid/errors/Danish/ERR_DNS_FAIL
-etc/squid/errors/Danish/ERR_FORWARDING_DENIED
-etc/squid/errors/Danish/ERR_FTP_DISABLED
-etc/squid/errors/Danish/ERR_FTP_FAILURE
-etc/squid/errors/Danish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Danish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Danish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Danish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Danish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Danish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Danish/ERR_INVALID_REQ
-etc/squid/errors/Danish/ERR_INVALID_URL
-etc/squid/errors/Danish/ERR_LIFETIME_EXP
-etc/squid/errors/Danish/ERR_NO_RELAY
-etc/squid/errors/Danish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Danish/ERR_READ_ERROR
-etc/squid/errors/Danish/ERR_READ_TIMEOUT
-etc/squid/errors/Danish/ERR_SHUTTING_DOWN
-etc/squid/errors/Danish/ERR_SOCKET_FAILURE
-etc/squid/errors/Danish/ERR_TOO_BIG
-etc/squid/errors/Danish/ERR_UNSUP_REQ
-etc/squid/errors/Danish/ERR_URN_RESOLVE
-etc/squid/errors/Danish/ERR_WRITE_ERROR
-etc/squid/errors/Danish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Dutch/ERR_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Dutch/ERR_CANNOT_FORWARD
-etc/squid/errors/Dutch/ERR_CONNECT_FAIL
-etc/squid/errors/Dutch/ERR_DNS_FAIL
-etc/squid/errors/Dutch/ERR_FORWARDING_DENIED
-etc/squid/errors/Dutch/ERR_FTP_DISABLED
-etc/squid/errors/Dutch/ERR_FTP_FAILURE
-etc/squid/errors/Dutch/ERR_FTP_FORBIDDEN
-etc/squid/errors/Dutch/ERR_FTP_NOT_FOUND
-etc/squid/errors/Dutch/ERR_FTP_PUT_CREATED
-etc/squid/errors/Dutch/ERR_FTP_PUT_ERROR
-etc/squid/errors/Dutch/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Dutch/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Dutch/ERR_INVALID_REQ
-etc/squid/errors/Dutch/ERR_INVALID_URL
-etc/squid/errors/Dutch/ERR_LIFETIME_EXP
-etc/squid/errors/Dutch/ERR_NO_RELAY
-etc/squid/errors/Dutch/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Dutch/ERR_READ_ERROR
-etc/squid/errors/Dutch/ERR_READ_TIMEOUT
-etc/squid/errors/Dutch/ERR_SHUTTING_DOWN
-etc/squid/errors/Dutch/ERR_SOCKET_FAILURE
-etc/squid/errors/Dutch/ERR_TOO_BIG
-etc/squid/errors/Dutch/ERR_UNSUP_REQ
-etc/squid/errors/Dutch/ERR_URN_RESOLVE
-etc/squid/errors/Dutch/ERR_WRITE_ERROR
-etc/squid/errors/Dutch/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/English/ERR_ACCESS_DENIED
-etc/squid/errors/English/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/English/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/English/ERR_CANNOT_FORWARD
-etc/squid/errors/English/ERR_CONNECT_FAIL
-etc/squid/errors/English/ERR_DNS_FAIL
-etc/squid/errors/English/ERR_FORWARDING_DENIED
-etc/squid/errors/English/ERR_FTP_DISABLED
-etc/squid/errors/English/ERR_FTP_FAILURE
-etc/squid/errors/English/ERR_FTP_FORBIDDEN
-etc/squid/errors/English/ERR_FTP_NOT_FOUND
-etc/squid/errors/English/ERR_FTP_PUT_CREATED
-etc/squid/errors/English/ERR_FTP_PUT_ERROR
-etc/squid/errors/English/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/English/ERR_FTP_UNAVAILABLE
-etc/squid/errors/English/ERR_INVALID_REQ
-etc/squid/errors/English/ERR_INVALID_URL
-etc/squid/errors/English/ERR_LIFETIME_EXP
-etc/squid/errors/English/ERR_NO_RELAY
-etc/squid/errors/English/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/English/ERR_READ_ERROR
-etc/squid/errors/English/ERR_READ_TIMEOUT
-etc/squid/errors/English/ERR_SHUTTING_DOWN
-etc/squid/errors/English/ERR_SOCKET_FAILURE
-etc/squid/errors/English/ERR_TOO_BIG
-etc/squid/errors/English/ERR_UNSUP_REQ
-etc/squid/errors/English/ERR_URN_RESOLVE
-etc/squid/errors/English/ERR_WRITE_ERROR
-etc/squid/errors/English/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Estonian/ERR_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Estonian/ERR_CANNOT_FORWARD
-etc/squid/errors/Estonian/ERR_CONNECT_FAIL
-etc/squid/errors/Estonian/ERR_DNS_FAIL
-etc/squid/errors/Estonian/ERR_FORWARDING_DENIED
-etc/squid/errors/Estonian/ERR_FTP_DISABLED
-etc/squid/errors/Estonian/ERR_FTP_FAILURE
-etc/squid/errors/Estonian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Estonian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Estonian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Estonian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Estonian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Estonian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Estonian/ERR_INVALID_REQ
-etc/squid/errors/Estonian/ERR_INVALID_URL
-etc/squid/errors/Estonian/ERR_LIFETIME_EXP
-etc/squid/errors/Estonian/ERR_NO_RELAY
-etc/squid/errors/Estonian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Estonian/ERR_READ_ERROR
-etc/squid/errors/Estonian/ERR_READ_TIMEOUT
-etc/squid/errors/Estonian/ERR_SHUTTING_DOWN
-etc/squid/errors/Estonian/ERR_SOCKET_FAILURE
-etc/squid/errors/Estonian/ERR_TOO_BIG
-etc/squid/errors/Estonian/ERR_UNSUP_REQ
-etc/squid/errors/Estonian/ERR_URN_RESOLVE
-etc/squid/errors/Estonian/ERR_WRITE_ERROR
-etc/squid/errors/Estonian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Finnish/ERR_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Finnish/ERR_CANNOT_FORWARD
-etc/squid/errors/Finnish/ERR_CONNECT_FAIL
-etc/squid/errors/Finnish/ERR_DNS_FAIL
-etc/squid/errors/Finnish/ERR_FORWARDING_DENIED
-etc/squid/errors/Finnish/ERR_FTP_DISABLED
-etc/squid/errors/Finnish/ERR_FTP_FAILURE
-etc/squid/errors/Finnish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Finnish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Finnish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Finnish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Finnish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Finnish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Finnish/ERR_INVALID_REQ
-etc/squid/errors/Finnish/ERR_INVALID_URL
-etc/squid/errors/Finnish/ERR_LIFETIME_EXP
-etc/squid/errors/Finnish/ERR_NO_RELAY
-etc/squid/errors/Finnish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Finnish/ERR_READ_ERROR
-etc/squid/errors/Finnish/ERR_READ_TIMEOUT
-etc/squid/errors/Finnish/ERR_SHUTTING_DOWN
-etc/squid/errors/Finnish/ERR_SOCKET_FAILURE
-etc/squid/errors/Finnish/ERR_TOO_BIG
-etc/squid/errors/Finnish/ERR_UNSUP_REQ
-etc/squid/errors/Finnish/ERR_URN_RESOLVE
-etc/squid/errors/Finnish/ERR_WRITE_ERROR
-etc/squid/errors/Finnish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/French/ERR_ACCESS_DENIED
-etc/squid/errors/French/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/French/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/French/ERR_CANNOT_FORWARD
-etc/squid/errors/French/ERR_CONNECT_FAIL
-etc/squid/errors/French/ERR_DNS_FAIL
-etc/squid/errors/French/ERR_FORWARDING_DENIED
-etc/squid/errors/French/ERR_FTP_DISABLED
-etc/squid/errors/French/ERR_FTP_FAILURE
-etc/squid/errors/French/ERR_FTP_FORBIDDEN
-etc/squid/errors/French/ERR_FTP_NOT_FOUND
-etc/squid/errors/French/ERR_FTP_PUT_CREATED
-etc/squid/errors/French/ERR_FTP_PUT_ERROR
-etc/squid/errors/French/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/French/ERR_FTP_UNAVAILABLE
-etc/squid/errors/French/ERR_INVALID_REQ
-etc/squid/errors/French/ERR_INVALID_URL
-etc/squid/errors/French/ERR_LIFETIME_EXP
-etc/squid/errors/French/ERR_NO_RELAY
-etc/squid/errors/French/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/French/ERR_READ_ERROR
-etc/squid/errors/French/ERR_READ_TIMEOUT
-etc/squid/errors/French/ERR_SHUTTING_DOWN
-etc/squid/errors/French/ERR_SOCKET_FAILURE
-etc/squid/errors/French/ERR_TOO_BIG
-etc/squid/errors/French/ERR_UNSUP_REQ
-etc/squid/errors/French/ERR_URN_RESOLVE
-etc/squid/errors/French/ERR_WRITE_ERROR
-etc/squid/errors/French/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/German/ERR_ACCESS_DENIED
-etc/squid/errors/German/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/German/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/German/ERR_CANNOT_FORWARD
-etc/squid/errors/German/ERR_CONNECT_FAIL
-etc/squid/errors/German/ERR_DNS_FAIL
-etc/squid/errors/German/ERR_FORWARDING_DENIED
-etc/squid/errors/German/ERR_FTP_DISABLED
-etc/squid/errors/German/ERR_FTP_FAILURE
-etc/squid/errors/German/ERR_FTP_FORBIDDEN
-etc/squid/errors/German/ERR_FTP_NOT_FOUND
-etc/squid/errors/German/ERR_FTP_PUT_CREATED
-etc/squid/errors/German/ERR_FTP_PUT_ERROR
-etc/squid/errors/German/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/German/ERR_FTP_UNAVAILABLE
-etc/squid/errors/German/ERR_INVALID_REQ
-etc/squid/errors/German/ERR_INVALID_URL
-etc/squid/errors/German/ERR_LIFETIME_EXP
-etc/squid/errors/German/ERR_NO_RELAY
-etc/squid/errors/German/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/German/ERR_READ_ERROR
-etc/squid/errors/German/ERR_READ_TIMEOUT
-etc/squid/errors/German/ERR_SHUTTING_DOWN
-etc/squid/errors/German/ERR_SOCKET_FAILURE
-etc/squid/errors/German/ERR_TOO_BIG
-etc/squid/errors/German/ERR_UNSUP_REQ
-etc/squid/errors/German/ERR_URN_RESOLVE
-etc/squid/errors/German/ERR_WRITE_ERROR
-etc/squid/errors/German/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Hebrew/ERR_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Hebrew/ERR_CANNOT_FORWARD
-etc/squid/errors/Hebrew/ERR_CONNECT_FAIL
-etc/squid/errors/Hebrew/ERR_DNS_FAIL
-etc/squid/errors/Hebrew/ERR_FORWARDING_DENIED
-etc/squid/errors/Hebrew/ERR_FTP_DISABLED
-etc/squid/errors/Hebrew/ERR_FTP_FAILURE
-etc/squid/errors/Hebrew/ERR_FTP_FORBIDDEN
-etc/squid/errors/Hebrew/ERR_FTP_NOT_FOUND
-etc/squid/errors/Hebrew/ERR_FTP_PUT_CREATED
-etc/squid/errors/Hebrew/ERR_FTP_PUT_ERROR
-etc/squid/errors/Hebrew/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Hebrew/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Hebrew/ERR_INVALID_REQ
-etc/squid/errors/Hebrew/ERR_INVALID_URL
-etc/squid/errors/Hebrew/ERR_LIFETIME_EXP
-etc/squid/errors/Hebrew/ERR_NO_RELAY
-etc/squid/errors/Hebrew/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Hebrew/ERR_READ_ERROR
-etc/squid/errors/Hebrew/ERR_READ_TIMEOUT
-etc/squid/errors/Hebrew/ERR_SHUTTING_DOWN
-etc/squid/errors/Hebrew/ERR_SOCKET_FAILURE
-etc/squid/errors/Hebrew/ERR_TOO_BIG
-etc/squid/errors/Hebrew/ERR_UNSUP_REQ
-etc/squid/errors/Hebrew/ERR_URN_RESOLVE
-etc/squid/errors/Hebrew/ERR_WRITE_ERROR
-etc/squid/errors/Hebrew/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Hungarian/ERR_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Hungarian/ERR_CANNOT_FORWARD
-etc/squid/errors/Hungarian/ERR_CONNECT_FAIL
-etc/squid/errors/Hungarian/ERR_DNS_FAIL
-etc/squid/errors/Hungarian/ERR_FORWARDING_DENIED
-etc/squid/errors/Hungarian/ERR_FTP_DISABLED
-etc/squid/errors/Hungarian/ERR_FTP_FAILURE
-etc/squid/errors/Hungarian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Hungarian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Hungarian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Hungarian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Hungarian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Hungarian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Hungarian/ERR_INVALID_REQ
-etc/squid/errors/Hungarian/ERR_INVALID_URL
-etc/squid/errors/Hungarian/ERR_LIFETIME_EXP
-etc/squid/errors/Hungarian/ERR_NO_RELAY
-etc/squid/errors/Hungarian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Hungarian/ERR_READ_ERROR
-etc/squid/errors/Hungarian/ERR_READ_TIMEOUT
-etc/squid/errors/Hungarian/ERR_SHUTTING_DOWN
-etc/squid/errors/Hungarian/ERR_SOCKET_FAILURE
-etc/squid/errors/Hungarian/ERR_TOO_BIG
-etc/squid/errors/Hungarian/ERR_UNSUP_REQ
-etc/squid/errors/Hungarian/ERR_URN_RESOLVE
-etc/squid/errors/Hungarian/ERR_WRITE_ERROR
-etc/squid/errors/Hungarian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Italian/ERR_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Italian/ERR_CANNOT_FORWARD
-etc/squid/errors/Italian/ERR_CONNECT_FAIL
-etc/squid/errors/Italian/ERR_DNS_FAIL
-etc/squid/errors/Italian/ERR_FORWARDING_DENIED
-etc/squid/errors/Italian/ERR_FTP_DISABLED
-etc/squid/errors/Italian/ERR_FTP_FAILURE
-etc/squid/errors/Italian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Italian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Italian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Italian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Italian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Italian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Italian/ERR_INVALID_REQ
-etc/squid/errors/Italian/ERR_INVALID_URL
-etc/squid/errors/Italian/ERR_LIFETIME_EXP
-etc/squid/errors/Italian/ERR_NO_RELAY
-etc/squid/errors/Italian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Italian/ERR_READ_ERROR
-etc/squid/errors/Italian/ERR_READ_TIMEOUT
-etc/squid/errors/Italian/ERR_SHUTTING_DOWN
-etc/squid/errors/Italian/ERR_SOCKET_FAILURE
-etc/squid/errors/Italian/ERR_TOO_BIG
-etc/squid/errors/Italian/ERR_UNSUP_REQ
-etc/squid/errors/Italian/ERR_URN_RESOLVE
-etc/squid/errors/Italian/ERR_WRITE_ERROR
-etc/squid/errors/Italian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Japanese/ERR_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Japanese/ERR_CANNOT_FORWARD
-etc/squid/errors/Japanese/ERR_CONNECT_FAIL
-etc/squid/errors/Japanese/ERR_DNS_FAIL
-etc/squid/errors/Japanese/ERR_FORWARDING_DENIED
-etc/squid/errors/Japanese/ERR_FTP_DISABLED
-etc/squid/errors/Japanese/ERR_FTP_FAILURE
-etc/squid/errors/Japanese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Japanese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Japanese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Japanese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Japanese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Japanese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Japanese/ERR_INVALID_REQ
-etc/squid/errors/Japanese/ERR_INVALID_URL
-etc/squid/errors/Japanese/ERR_LIFETIME_EXP
-etc/squid/errors/Japanese/ERR_NO_RELAY
-etc/squid/errors/Japanese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Japanese/ERR_READ_ERROR
-etc/squid/errors/Japanese/ERR_READ_TIMEOUT
-etc/squid/errors/Japanese/ERR_SHUTTING_DOWN
-etc/squid/errors/Japanese/ERR_SOCKET_FAILURE
-etc/squid/errors/Japanese/ERR_TOO_BIG
-etc/squid/errors/Japanese/ERR_UNSUP_REQ
-etc/squid/errors/Japanese/ERR_URN_RESOLVE
-etc/squid/errors/Japanese/ERR_WRITE_ERROR
-etc/squid/errors/Japanese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Korean/ERR_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Korean/ERR_CANNOT_FORWARD
-etc/squid/errors/Korean/ERR_CONNECT_FAIL
-etc/squid/errors/Korean/ERR_DNS_FAIL
-etc/squid/errors/Korean/ERR_FORWARDING_DENIED
-etc/squid/errors/Korean/ERR_FTP_DISABLED
-etc/squid/errors/Korean/ERR_FTP_FAILURE
-etc/squid/errors/Korean/ERR_FTP_FORBIDDEN
-etc/squid/errors/Korean/ERR_FTP_NOT_FOUND
-etc/squid/errors/Korean/ERR_FTP_PUT_CREATED
-etc/squid/errors/Korean/ERR_FTP_PUT_ERROR
-etc/squid/errors/Korean/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Korean/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Korean/ERR_INVALID_REQ
-etc/squid/errors/Korean/ERR_INVALID_URL
-etc/squid/errors/Korean/ERR_LIFETIME_EXP
-etc/squid/errors/Korean/ERR_NO_RELAY
-etc/squid/errors/Korean/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Korean/ERR_READ_ERROR
-etc/squid/errors/Korean/ERR_READ_TIMEOUT
-etc/squid/errors/Korean/ERR_SHUTTING_DOWN
-etc/squid/errors/Korean/ERR_SOCKET_FAILURE
-etc/squid/errors/Korean/ERR_TOO_BIG
-etc/squid/errors/Korean/ERR_UNSUP_REQ
-etc/squid/errors/Korean/ERR_URN_RESOLVE
-etc/squid/errors/Korean/ERR_WRITE_ERROR
-etc/squid/errors/Korean/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Lithuanian/ERR_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Lithuanian/ERR_CANNOT_FORWARD
-etc/squid/errors/Lithuanian/ERR_CONNECT_FAIL
-etc/squid/errors/Lithuanian/ERR_DNS_FAIL
-etc/squid/errors/Lithuanian/ERR_FORWARDING_DENIED
-etc/squid/errors/Lithuanian/ERR_FTP_DISABLED
-etc/squid/errors/Lithuanian/ERR_FTP_FAILURE
-etc/squid/errors/Lithuanian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Lithuanian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Lithuanian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Lithuanian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Lithuanian/ERR_INVALID_REQ
-etc/squid/errors/Lithuanian/ERR_INVALID_URL
-etc/squid/errors/Lithuanian/ERR_LIFETIME_EXP
-etc/squid/errors/Lithuanian/ERR_NO_RELAY
-etc/squid/errors/Lithuanian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Lithuanian/ERR_READ_ERROR
-etc/squid/errors/Lithuanian/ERR_READ_TIMEOUT
-etc/squid/errors/Lithuanian/ERR_SHUTTING_DOWN
-etc/squid/errors/Lithuanian/ERR_SOCKET_FAILURE
-etc/squid/errors/Lithuanian/ERR_TOO_BIG
-etc/squid/errors/Lithuanian/ERR_UNSUP_REQ
-etc/squid/errors/Lithuanian/ERR_URN_RESOLVE
-etc/squid/errors/Lithuanian/ERR_WRITE_ERROR
-etc/squid/errors/Lithuanian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Polish/ERR_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Polish/ERR_CANNOT_FORWARD
-etc/squid/errors/Polish/ERR_CONNECT_FAIL
-etc/squid/errors/Polish/ERR_DNS_FAIL
-etc/squid/errors/Polish/ERR_FORWARDING_DENIED
-etc/squid/errors/Polish/ERR_FTP_DISABLED
-etc/squid/errors/Polish/ERR_FTP_FAILURE
-etc/squid/errors/Polish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Polish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Polish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Polish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Polish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Polish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Polish/ERR_INVALID_REQ
-etc/squid/errors/Polish/ERR_INVALID_URL
-etc/squid/errors/Polish/ERR_LIFETIME_EXP
-etc/squid/errors/Polish/ERR_NO_RELAY
-etc/squid/errors/Polish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Polish/ERR_READ_ERROR
-etc/squid/errors/Polish/ERR_READ_TIMEOUT
-etc/squid/errors/Polish/ERR_SHUTTING_DOWN
-etc/squid/errors/Polish/ERR_SOCKET_FAILURE
-etc/squid/errors/Polish/ERR_TOO_BIG
-etc/squid/errors/Polish/ERR_UNSUP_REQ
-etc/squid/errors/Polish/ERR_URN_RESOLVE
-etc/squid/errors/Polish/ERR_WRITE_ERROR
-etc/squid/errors/Polish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Portuguese/ERR_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Portuguese/ERR_CANNOT_FORWARD
-etc/squid/errors/Portuguese/ERR_CONNECT_FAIL
-etc/squid/errors/Portuguese/ERR_DNS_FAIL
-etc/squid/errors/Portuguese/ERR_FORWARDING_DENIED
-etc/squid/errors/Portuguese/ERR_FTP_DISABLED
-etc/squid/errors/Portuguese/ERR_FTP_FAILURE
-etc/squid/errors/Portuguese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Portuguese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Portuguese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Portuguese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Portuguese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Portuguese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Portuguese/ERR_INVALID_REQ
-etc/squid/errors/Portuguese/ERR_INVALID_URL
-etc/squid/errors/Portuguese/ERR_LIFETIME_EXP
-etc/squid/errors/Portuguese/ERR_NO_RELAY
-etc/squid/errors/Portuguese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Portuguese/ERR_READ_ERROR
-etc/squid/errors/Portuguese/ERR_READ_TIMEOUT
-etc/squid/errors/Portuguese/ERR_SHUTTING_DOWN
-etc/squid/errors/Portuguese/ERR_SOCKET_FAILURE
-etc/squid/errors/Portuguese/ERR_TOO_BIG
-etc/squid/errors/Portuguese/ERR_UNSUP_REQ
-etc/squid/errors/Portuguese/ERR_URN_RESOLVE
-etc/squid/errors/Portuguese/ERR_WRITE_ERROR
-etc/squid/errors/Portuguese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Romanian/ERR_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Romanian/ERR_CANNOT_FORWARD
-etc/squid/errors/Romanian/ERR_CONNECT_FAIL
-etc/squid/errors/Romanian/ERR_DNS_FAIL
-etc/squid/errors/Romanian/ERR_FORWARDING_DENIED
-etc/squid/errors/Romanian/ERR_FTP_DISABLED
-etc/squid/errors/Romanian/ERR_FTP_FAILURE
-etc/squid/errors/Romanian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Romanian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Romanian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Romanian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Romanian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Romanian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Romanian/ERR_INVALID_REQ
-etc/squid/errors/Romanian/ERR_INVALID_URL
-etc/squid/errors/Romanian/ERR_LIFETIME_EXP
-etc/squid/errors/Romanian/ERR_NO_RELAY
-etc/squid/errors/Romanian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Romanian/ERR_READ_ERROR
-etc/squid/errors/Romanian/ERR_READ_TIMEOUT
-etc/squid/errors/Romanian/ERR_SHUTTING_DOWN
-etc/squid/errors/Romanian/ERR_SOCKET_FAILURE
-etc/squid/errors/Romanian/ERR_TOO_BIG
-etc/squid/errors/Romanian/ERR_UNSUP_REQ
-etc/squid/errors/Romanian/ERR_URN_RESOLVE
-etc/squid/errors/Romanian/ERR_WRITE_ERROR
-etc/squid/errors/Romanian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Russian-1251/ERR_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Russian-1251/ERR_CANNOT_FORWARD
-etc/squid/errors/Russian-1251/ERR_CONNECT_FAIL
-etc/squid/errors/Russian-1251/ERR_DNS_FAIL
-etc/squid/errors/Russian-1251/ERR_FORWARDING_DENIED
-etc/squid/errors/Russian-1251/ERR_FTP_DISABLED
-etc/squid/errors/Russian-1251/ERR_FTP_FAILURE
-etc/squid/errors/Russian-1251/ERR_FTP_FORBIDDEN
-etc/squid/errors/Russian-1251/ERR_FTP_NOT_FOUND
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_CREATED
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_ERROR
-etc/squid/errors/Russian-1251/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Russian-1251/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Russian-1251/ERR_INVALID_REQ
-etc/squid/errors/Russian-1251/ERR_INVALID_URL
-etc/squid/errors/Russian-1251/ERR_LIFETIME_EXP
-etc/squid/errors/Russian-1251/ERR_NO_RELAY
-etc/squid/errors/Russian-1251/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Russian-1251/ERR_READ_ERROR
-etc/squid/errors/Russian-1251/ERR_READ_TIMEOUT
-etc/squid/errors/Russian-1251/ERR_SHUTTING_DOWN
-etc/squid/errors/Russian-1251/ERR_SOCKET_FAILURE
-etc/squid/errors/Russian-1251/ERR_TOO_BIG
-etc/squid/errors/Russian-1251/ERR_UNSUP_REQ
-etc/squid/errors/Russian-1251/ERR_URN_RESOLVE
-etc/squid/errors/Russian-1251/ERR_WRITE_ERROR
-etc/squid/errors/Russian-1251/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Russian-koi8-r/ERR_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_CANNOT_FORWARD
-etc/squid/errors/Russian-koi8-r/ERR_CONNECT_FAIL
-etc/squid/errors/Russian-koi8-r/ERR_DNS_FAIL
-etc/squid/errors/Russian-koi8-r/ERR_FORWARDING_DENIED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_DISABLED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_FAILURE
-etc/squid/errors/Russian-koi8-r/ERR_FTP_FORBIDDEN
-etc/squid/errors/Russian-koi8-r/ERR_FTP_NOT_FOUND
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_CREATED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Russian-koi8-r/ERR_INVALID_REQ
-etc/squid/errors/Russian-koi8-r/ERR_INVALID_URL
-etc/squid/errors/Russian-koi8-r/ERR_LIFETIME_EXP
-etc/squid/errors/Russian-koi8-r/ERR_NO_RELAY
-etc/squid/errors/Russian-koi8-r/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Russian-koi8-r/ERR_READ_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_READ_TIMEOUT
-etc/squid/errors/Russian-koi8-r/ERR_SHUTTING_DOWN
-etc/squid/errors/Russian-koi8-r/ERR_SOCKET_FAILURE
-etc/squid/errors/Russian-koi8-r/ERR_TOO_BIG
-etc/squid/errors/Russian-koi8-r/ERR_UNSUP_REQ
-etc/squid/errors/Russian-koi8-r/ERR_URN_RESOLVE
-etc/squid/errors/Russian-koi8-r/ERR_WRITE_ERROR
-etc/squid/errors/Russian-koi8-r/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Serbian/ERR_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Serbian/ERR_CANNOT_FORWARD
-etc/squid/errors/Serbian/ERR_CONNECT_FAIL
-etc/squid/errors/Serbian/ERR_DNS_FAIL
-etc/squid/errors/Serbian/ERR_FORWARDING_DENIED
-etc/squid/errors/Serbian/ERR_FTP_DISABLED
-etc/squid/errors/Serbian/ERR_FTP_FAILURE
-etc/squid/errors/Serbian/ERR_FTP_FORBIDDEN
-etc/squid/errors/Serbian/ERR_FTP_NOT_FOUND
-etc/squid/errors/Serbian/ERR_FTP_PUT_CREATED
-etc/squid/errors/Serbian/ERR_FTP_PUT_ERROR
-etc/squid/errors/Serbian/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Serbian/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Serbian/ERR_INVALID_REQ
-etc/squid/errors/Serbian/ERR_INVALID_URL
-etc/squid/errors/Serbian/ERR_LIFETIME_EXP
-etc/squid/errors/Serbian/ERR_NO_RELAY
-etc/squid/errors/Serbian/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Serbian/ERR_READ_ERROR
-etc/squid/errors/Serbian/ERR_READ_TIMEOUT
-etc/squid/errors/Serbian/ERR_SHUTTING_DOWN
-etc/squid/errors/Serbian/ERR_SOCKET_FAILURE
-etc/squid/errors/Serbian/ERR_TOO_BIG
-etc/squid/errors/Serbian/ERR_UNSUP_REQ
-etc/squid/errors/Serbian/ERR_URN_RESOLVE
-etc/squid/errors/Serbian/ERR_WRITE_ERROR
-etc/squid/errors/Serbian/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Simplify_Chinese/ERR_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_CANNOT_FORWARD
-etc/squid/errors/Simplify_Chinese/ERR_CONNECT_FAIL
-etc/squid/errors/Simplify_Chinese/ERR_DNS_FAIL
-etc/squid/errors/Simplify_Chinese/ERR_FORWARDING_DENIED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_DISABLED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_FAILURE
-etc/squid/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Simplify_Chinese/ERR_INVALID_REQ
-etc/squid/errors/Simplify_Chinese/ERR_INVALID_URL
-etc/squid/errors/Simplify_Chinese/ERR_LIFETIME_EXP
-etc/squid/errors/Simplify_Chinese/ERR_NO_RELAY
-etc/squid/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Simplify_Chinese/ERR_READ_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_READ_TIMEOUT
-etc/squid/errors/Simplify_Chinese/ERR_SHUTTING_DOWN
-etc/squid/errors/Simplify_Chinese/ERR_SOCKET_FAILURE
-etc/squid/errors/Simplify_Chinese/ERR_TOO_BIG
-etc/squid/errors/Simplify_Chinese/ERR_UNSUP_REQ
-etc/squid/errors/Simplify_Chinese/ERR_URN_RESOLVE
-etc/squid/errors/Simplify_Chinese/ERR_WRITE_ERROR
-etc/squid/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Slovak/ERR_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Slovak/ERR_CANNOT_FORWARD
-etc/squid/errors/Slovak/ERR_CONNECT_FAIL
-etc/squid/errors/Slovak/ERR_DNS_FAIL
-etc/squid/errors/Slovak/ERR_FORWARDING_DENIED
-etc/squid/errors/Slovak/ERR_FTP_DISABLED
-etc/squid/errors/Slovak/ERR_FTP_FAILURE
-etc/squid/errors/Slovak/ERR_FTP_FORBIDDEN
-etc/squid/errors/Slovak/ERR_FTP_NOT_FOUND
-etc/squid/errors/Slovak/ERR_FTP_PUT_CREATED
-etc/squid/errors/Slovak/ERR_FTP_PUT_ERROR
-etc/squid/errors/Slovak/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Slovak/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Slovak/ERR_INVALID_REQ
-etc/squid/errors/Slovak/ERR_INVALID_URL
-etc/squid/errors/Slovak/ERR_LIFETIME_EXP
-etc/squid/errors/Slovak/ERR_NO_RELAY
-etc/squid/errors/Slovak/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Slovak/ERR_READ_ERROR
-etc/squid/errors/Slovak/ERR_READ_TIMEOUT
-etc/squid/errors/Slovak/ERR_SHUTTING_DOWN
-etc/squid/errors/Slovak/ERR_SOCKET_FAILURE
-etc/squid/errors/Slovak/ERR_TOO_BIG
-etc/squid/errors/Slovak/ERR_UNSUP_REQ
-etc/squid/errors/Slovak/ERR_URN_RESOLVE
-etc/squid/errors/Slovak/ERR_WRITE_ERROR
-etc/squid/errors/Slovak/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Spanish/ERR_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Spanish/ERR_CANNOT_FORWARD
-etc/squid/errors/Spanish/ERR_CONNECT_FAIL
-etc/squid/errors/Spanish/ERR_DNS_FAIL
-etc/squid/errors/Spanish/ERR_FORWARDING_DENIED
-etc/squid/errors/Spanish/ERR_FTP_DISABLED
-etc/squid/errors/Spanish/ERR_FTP_FAILURE
-etc/squid/errors/Spanish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Spanish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Spanish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Spanish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Spanish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Spanish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Spanish/ERR_INVALID_REQ
-etc/squid/errors/Spanish/ERR_INVALID_URL
-etc/squid/errors/Spanish/ERR_LIFETIME_EXP
-etc/squid/errors/Spanish/ERR_NO_RELAY
-etc/squid/errors/Spanish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Spanish/ERR_READ_ERROR
-etc/squid/errors/Spanish/ERR_READ_TIMEOUT
-etc/squid/errors/Spanish/ERR_SHUTTING_DOWN
-etc/squid/errors/Spanish/ERR_SOCKET_FAILURE
-etc/squid/errors/Spanish/ERR_TOO_BIG
-etc/squid/errors/Spanish/ERR_UNSUP_REQ
-etc/squid/errors/Spanish/ERR_URN_RESOLVE
-etc/squid/errors/Spanish/ERR_WRITE_ERROR
-etc/squid/errors/Spanish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Swedish/ERR_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Swedish/ERR_CANNOT_FORWARD
-etc/squid/errors/Swedish/ERR_CONNECT_FAIL
-etc/squid/errors/Swedish/ERR_DNS_FAIL
-etc/squid/errors/Swedish/ERR_FORWARDING_DENIED
-etc/squid/errors/Swedish/ERR_FTP_DISABLED
-etc/squid/errors/Swedish/ERR_FTP_FAILURE
-etc/squid/errors/Swedish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Swedish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Swedish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Swedish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Swedish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Swedish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Swedish/ERR_INVALID_REQ
-etc/squid/errors/Swedish/ERR_INVALID_URL
-etc/squid/errors/Swedish/ERR_LIFETIME_EXP
-etc/squid/errors/Swedish/ERR_NO_RELAY
-etc/squid/errors/Swedish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Swedish/ERR_READ_ERROR
-etc/squid/errors/Swedish/ERR_READ_TIMEOUT
-etc/squid/errors/Swedish/ERR_SHUTTING_DOWN
-etc/squid/errors/Swedish/ERR_SOCKET_FAILURE
-etc/squid/errors/Swedish/ERR_TOO_BIG
-etc/squid/errors/Swedish/ERR_UNSUP_REQ
-etc/squid/errors/Swedish/ERR_URN_RESOLVE
-etc/squid/errors/Swedish/ERR_WRITE_ERROR
-etc/squid/errors/Swedish/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Traditional_Chinese/ERR_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_CANNOT_FORWARD
-etc/squid/errors/Traditional_Chinese/ERR_CONNECT_FAIL
-etc/squid/errors/Traditional_Chinese/ERR_DNS_FAIL
-etc/squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_DISABLED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_FAILURE
-etc/squid/errors/Traditional_Chinese/ERR_FTP_FORBIDDEN
-etc/squid/errors/Traditional_Chinese/ERR_FTP_NOT_FOUND
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Traditional_Chinese/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Traditional_Chinese/ERR_INVALID_REQ
-etc/squid/errors/Traditional_Chinese/ERR_INVALID_URL
-etc/squid/errors/Traditional_Chinese/ERR_LIFETIME_EXP
-etc/squid/errors/Traditional_Chinese/ERR_NO_RELAY
-etc/squid/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Traditional_Chinese/ERR_READ_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_READ_TIMEOUT
-etc/squid/errors/Traditional_Chinese/ERR_SHUTTING_DOWN
-etc/squid/errors/Traditional_Chinese/ERR_SOCKET_FAILURE
-etc/squid/errors/Traditional_Chinese/ERR_TOO_BIG
-etc/squid/errors/Traditional_Chinese/ERR_UNSUP_REQ
-etc/squid/errors/Traditional_Chinese/ERR_URN_RESOLVE
-etc/squid/errors/Traditional_Chinese/ERR_WRITE_ERROR
-etc/squid/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT
-etc/squid/errors/Turkish/ERR_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CACHE_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CACHE_MGR_ACCESS_DENIED
-etc/squid/errors/Turkish/ERR_CANNOT_FORWARD
-etc/squid/errors/Turkish/ERR_CONNECT_FAIL
-etc/squid/errors/Turkish/ERR_DNS_FAIL
-etc/squid/errors/Turkish/ERR_FORWARDING_DENIED
-etc/squid/errors/Turkish/ERR_FTP_DISABLED
-etc/squid/errors/Turkish/ERR_FTP_FAILURE
-etc/squid/errors/Turkish/ERR_FTP_FORBIDDEN
-etc/squid/errors/Turkish/ERR_FTP_NOT_FOUND
-etc/squid/errors/Turkish/ERR_FTP_PUT_CREATED
-etc/squid/errors/Turkish/ERR_FTP_PUT_ERROR
-etc/squid/errors/Turkish/ERR_FTP_PUT_MODIFIED
-etc/squid/errors/Turkish/ERR_FTP_UNAVAILABLE
-etc/squid/errors/Turkish/ERR_INVALID_REQ
-etc/squid/errors/Turkish/ERR_INVALID_URL
-etc/squid/errors/Turkish/ERR_LIFETIME_EXP
-etc/squid/errors/Turkish/ERR_NO_RELAY
-etc/squid/errors/Turkish/ERR_ONLY_IF_CACHED_MISS
-etc/squid/errors/Turkish/ERR_READ_ERROR
-etc/squid/errors/Turkish/ERR_READ_TIMEOUT
-etc/squid/errors/Turkish/ERR_SHUTTING_DOWN
-etc/squid/errors/Turkish/ERR_SOCKET_FAILURE
-etc/squid/errors/Turkish/ERR_TOO_BIG
-etc/squid/errors/Turkish/ERR_UNSUP_REQ
-etc/squid/errors/Turkish/ERR_URN_RESOLVE
-etc/squid/errors/Turkish/ERR_WRITE_ERROR
-etc/squid/errors/Turkish/ERR_ZERO_SIZE_OBJECT
-etc/squid/mib.txt
-@unexec if cmp -s %D/etc/squid/mime.conf %D/etc/squid/mime.conf.default; then rm -f %D/etc/squid/mime.conf; fi
-etc/squid/mime.conf.default
-@exec [ -f %B/mime.conf ] || cp %B/%f %B/mime.conf
-@unexec if cmp -s %D/etc/squid/squid.conf %D/etc/squid/squid.conf.default; then rm -f %D/etc/squid/squid.conf; fi
-etc/squid/squid.conf.default
-@exec [ -f %B/squid.conf ] || cp %B/%f %B/squid.conf
-libexec/cachemgr.cgi
-libexec/diskd
-libexec/unlinkd
-libexec/ip_user_check
-libexec/yp_auth
-libexec/pam_auth
-libexec/ncsa_auth
-libexec/squid_unix_group
 sbin/RunAccel
 sbin/RunCache
 sbin/squidclient
 sbin/squid
-@exec mkdir -p %D/squid/cache
-@exec chown nobody:nogroup %D/squid/cache
-@exec mkdir -p %D/squid/logs
-@exec chown nobody:nogroup %D/squid/logs
-@dirrm etc/squid/errors/Bulgarian
-@dirrm etc/squid/errors/Catalan
-@dirrm etc/squid/errors/Czech
-@dirrm etc/squid/errors/Danish
-@dirrm etc/squid/errors/Dutch
-@dirrm etc/squid/errors/English
-@dirrm etc/squid/errors/Estonian
-@dirrm etc/squid/errors/Finnish
-@dirrm etc/squid/errors/French
-@dirrm etc/squid/errors/German
-@dirrm etc/squid/errors/Hebrew
-@dirrm etc/squid/errors/Hungarian
-@dirrm etc/squid/errors/Italian
-@dirrm etc/squid/errors/Japanese
-@dirrm etc/squid/errors/Korean
-@dirrm etc/squid/errors/Lithuanian
-@dirrm etc/squid/errors/Polish
-@dirrm etc/squid/errors/Portuguese
-@dirrm etc/squid/errors/Romanian
-@dirrm etc/squid/errors/Russian-1251
-@dirrm etc/squid/errors/Russian-koi8-r
-@dirrm etc/squid/errors/Serbian
-@dirrm etc/squid/errors/Simplify_Chinese
-@dirrm etc/squid/errors/Slovak
-@dirrm etc/squid/errors/Spanish
-@dirrm etc/squid/errors/Swedish
-@dirrm etc/squid/errors/Traditional_Chinese
-@dirrm etc/squid/errors/Turkish
-@dirrm etc/squid/icons
-@dirrm etc/squid/errors
-@dirrm etc/squid
-@dirrm squid/logs
-@dirrm squid/cache
-@dirrm squid
+%%PORTDOCS%%%%DOCSDIR%%/QUICKSTART
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASENOTES.html
+%%PORTDOCS%%%%DOCSDIR%%/debug-sections.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@comment Start of dynamically generated plist
+@comment End of dynamically generated plist
+@comment These directories are maybe not empty at deinstallation time.
+@comment Since we try to preserve the data in there for updates anyway, be quiet.
+@unexec rmdir %D/etc/squid/icons 2>/dev/null || true
+@unexec rmdir %D/etc/squid/errors 2>/dev/null || true
+@unexec rmdir %D/etc/squid 2>/dev/null || true
+@unexec rmdir %D/squid/logs 2>/dev/null || true
+@unexec rmdir %D/squid/cache 2>/dev/null || true
+@unexec rmdir %D/squid 2>/dev/null || true