diff --git a/www/squid/Makefile b/www/squid/Makefile
index 24a6b7e0ab5..31ed5f90bf8 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,15 +1,11 @@
-# $OpenBSD: Makefile,v 1.36 2001/09/28 06:02:15 pvalchev Exp $
-# Uses pthreads (can but does not at the moment)
+# $OpenBSD: Makefile,v 1.37 2002/02/20 01:17:03 brad Exp $
 
 COMMENT=	"WWW and FTP proxy cache and accelerator"
 
-DISTNAME=	squid-2.3.STABLE5
-PKGNAME=	squid-2.3
+DISTNAME=	squid-2.5.PRE4
 CATEGORIES=	www
-NEED_VERSION=	1.413
-MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.3/ \
-   		ftp://ftp.funet.fi/pub/mirrors/squid.nlanr.net/pub/squid-2/STABLE/
-EXTRACT_SUFX=	-src.tar.gz
+NEED_VERSION=	1.500
+MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/
 DIST_SUBDIR=	squid
 
 HOMEPAGE=	http://www.squid-cache.org/
@@ -22,14 +18,23 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 SYSCONFDIR=	/etc/squid
-STATEDIR?=	/var/squid
-SUBST_VARS=	STATEDIR
+SQUIDDIR?=	/var/squid
+SUBST_VARS=	SQUIDDIR
 
-CONFIGURE_STYLE= gnu
-MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/cfgaux
-CONFIGURE_ARGS=	--localstatedir="${STATEDIR}" \
-		--enable-heap-replacement
+FLAVORS=	transparent
+FLAVOR?=
 
-MAKE_FILE=	makefile
+CONFIGURE_STYLE= autoconf
+MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/cfgaux
+CONFIGURE_ARGS= --datadir="${PREFIX}/share/squid" \
+		--localstatedir="${SQUIDDIR}" \
+		--enable-removal-policies
+
+.if ${FLAVOR:L:Mtransparent}
+CONFIGURE_ARGS+= --enable-pf-transparent
+.endif
+
+post-install:
+	@chown -R root:wheel ${PREFIX}/share/examples/squid
 
 .include <bsd.port.mk>
diff --git a/www/squid/distinfo b/www/squid/distinfo
new file mode 100644
index 00000000000..c5911265ec3
--- /dev/null
+++ b/www/squid/distinfo
@@ -0,0 +1,3 @@
+MD5 (squid/squid-2.5.PRE4.tar.gz) = acac40ad3a2530b713d5a65cde844f68
+RMD160 (squid/squid-2.5.PRE4.tar.gz) = 6d00e4d9be4ac9a2109ba962096b1252589916fb
+SHA1 (squid/squid-2.5.PRE4.tar.gz) = 1f6abf2f521516248c4ab66cabdc6565a19d36fc
diff --git a/www/squid/files/md5 b/www/squid/files/md5
deleted file mode 100644
index 6fc94418554..00000000000
--- a/www/squid/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (squid/squid-2.3.STABLE5-src.tar.gz) = 1a1ae6f496600f3af697692a5ad031f0
-RMD160 (squid/squid-2.3.STABLE5-src.tar.gz) = f7fdde83ff8371379465a9e6f827889bb3836317
-SHA1 (squid/squid-2.3.STABLE5-src.tar.gz) = 1d72129f9cfc36147c911b8058040877839b554a
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
deleted file mode 100644
index c1236d427c5..00000000000
--- a/www/squid/patches/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/cf.data.pre.orig	Wed Mar 29 17:56:56 2000
-+++ src/cf.data.pre	Tue Jun 27 22:31:31 2000
-@@ -1856,13 +1856,13 @@
- 
- NAME: cache_effective_user
- TYPE: string
--DEFAULT: nobody
-+DEFAULT: www
- LOC: Config.effectiveUser
- DOC_NONE
- 
- NAME: cache_effective_group
- TYPE: string
--DEFAULT: nogroup
-+DEFAULT: www
- LOC: Config.effectiveGroup
- DOC_START
- 
-@@ -1874,8 +1874,8 @@
- 	current UID/GID.  Note that if Squid is not started as root then
- 	you cannot set http_port to a value lower than 1024.
- 
--cache_effective_user nobody
--cache_effective_group nogroup
-+cache_effective_user www
-+cache_effective_group www
- DOC_END
- 
- 
diff --git a/www/squid/patches/patch-ac b/www/squid/patches/patch-ac
deleted file mode 100644
index 5aded26c5f9..00000000000
--- a/www/squid/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/RunAccel.in.orig	Tue Jul  9 13:41:15 1996
-+++ scripts/RunAccel.in	Fri Apr 16 12:59:33 1999
-@@ -7,7 +7,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--logdir=@localstatedir@
-+logdir=@localstatedir@/logs
- PATH=@bindir@:/bin:/usr/bin
- export PATH
- 
diff --git a/www/squid/patches/patch-ad b/www/squid/patches/patch-ad
deleted file mode 100644
index 5288465745b..00000000000
--- a/www/squid/patches/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/RunCache.in.orig	Wed Aug  5 06:59:32 1998
-+++ scripts/RunCache.in	Fri Apr 16 12:59:34 1999
-@@ -4,7 +4,7 @@
- 
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--logdir=@localstatedir@
-+logdir=@localstatedir@/logs
- PATH=@bindir@:/bin:/usr/bin
- export PATH
- 
diff --git a/www/squid/patches/patch-ae b/www/squid/patches/patch-ae
deleted file mode 100644
index d867a377412..00000000000
--- a/www/squid/patches/patch-ae
+++ /dev/null
@@ -1,182 +0,0 @@
---- src/Makefile.in.orig	Tue Oct 19 17:28:35 1999
-+++ src/Makefile.in	Fri Aug  4 20:49:27 2000
-@@ -27,6 +27,8 @@
- PINGER_EXE	= pinger$(exec_suffix)
- CACHEMGR_EXE	= cachemgr$(cgi_suffix)
- 
-+DESTDIR = 
-+
- DEFAULT_PREFIX		= $(prefix)
- DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
- DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
-@@ -38,8 +40,8 @@
- DEFAULT_SWAP_DIR        = $(localstatedir)/cache
- DEFAULT_PINGER		= $(libexecdir)/$(PINGER_EXE)
- DEFAULT_UNLINKD		= $(libexecdir)/$(UNLINKD_EXE)
--DEFAULT_ICON_DIR	= $(sysconfdir)/icons
--DEFAULT_ERROR_DIR	= $(sysconfdir)/errors
-+DEFAULT_ICON_DIR	= $(prefix)/share/squid/icons
-+DEFAULT_ERROR_DIR	= $(prefix)/share/squid/errors
- DEFAULT_MIB_PATH	= $(sysconfdir)/mib.txt
- 
- CC		= @CC@
-@@ -262,102 +264,90 @@
- 	< $(srcdir)/cf.data.pre >$@
- 
- install-mkdirs:
--	-@if test ! -d $(prefix); then \
--		echo "mkdir $(prefix)"; \
--		mkdir $(prefix); \
-+	-@if test ! -d $(DESTDIR)$(prefix); then \
-+		echo "${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)"; \
-+		${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix); \
- 	fi
--	-@if test ! -d $(exec_prefix); then \
--		echo "mkdir $(exec_prefix)"; \
--		mkdir $(exec_prefix); \
-+	-@if test ! -d $(DESTDIR)$(exec_prefix); then \
-+		echo "${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(exec_prefix)"; \
-+		${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(exec_prefix); \
- 	fi
--	-@if test ! -d $(bindir); then \
--		echo "mkdir $(bindir)"; \
--		mkdir $(bindir); \
-+	-@if test ! -d $(DESTDIR)$(bindir); then \
-+		echo "${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir)"; \
-+		${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir); \
- 	fi
--	-@if test ! -d $(libexecdir); then \
--		echo "mkdir $(libexecdir)"; \
--		mkdir $(libexecdir); \
-+	-@if test ! -d $(DESTDIR)$(libexecdir); then \
-+		echo "${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(libexecdir)"; \
-+		${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(libexecdir); \
- 	fi
--	-@if test ! -d $(sysconfdir); then \
--		echo "mkdir $(sysconfdir)"; \
--		mkdir $(sysconfdir); \
-+	-@if test ! -d $(DESTDIR)$(sysconfdir); then \
-+		echo "${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(sysconfdir)"; \
-+		${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(sysconfdir); \
- 	fi
--	-@if test ! -d $(localstatedir); then \
--		echo "mkdir $(localstatedir)"; \
--		mkdir $(localstatedir); \
-+	-@if test ! -d $(DESTDIR)$(localstatedir); then \
-+		echo "${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(localstatedir)"; \
-+		${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(localstatedir); \
- 	fi
--	-@if test ! -d $(localstatedir)/logs; then \
--		echo "mkdir $(localstatedir)/logs"; \
--		mkdir $(localstatedir)/logs; \
-+	-@if test ! -d $(DESTDIR)$(localstatedir)/logs; then \
-+		echo "${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(localstatedir)/logs"; \
-+		${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(localstatedir)/logs; \
- 	fi
- 
- # Michael Lupp <mike@nemesis.saar.de> wants to know about additions
- # to the install target.
- install: all install-mkdirs
- 	@for f in $(PROGS); do \
--		if test -f $(bindir)/$$f; then \
--			echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \
--			$(MV) $(bindir)/$$f $(bindir)/-$$f; \
-+		if test -f $(DESTDIR)$(bindir)/$$f; then \
-+			echo $(MV) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/-$$f; \
-+			$(MV) $(DESTDIR)$(bindir)/$$f $(DESTDIR)$(bindir)/-$$f; \
- 		fi; \
--		echo $(INSTALL_BIN) $$f $(bindir); \
--		$(INSTALL_BIN) $$f $(bindir); \
--		if test -f $(bindir)/-$$f; then \
--			echo $(RM) -f $(bindir)/-$$f; \
--			$(RM) -f $(bindir)/-$$f; \
-+		echo $(INSTALL_BIN) $$f $(DESTDIR)$(bindir); \
-+		$(INSTALL_BIN) $$f $(DESTDIR)$(bindir); \
-+		if test -f $(DESTDIR)$(bindir)/-$$f; then \
-+			echo $(RM) -f $(DESTDIR)$(bindir)/-$$f; \
-+			$(RM) -f $(DESTDIR)$(bindir)/-$$f; \
- 		fi; \
- 	done
- 	@for f in $(UTILS); do \
--		if test -f $(libexecdir)/$$f; then \
--			echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
--			$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
-+		if test -f $(DESTDIR)$(libexecdir)/$$f; then \
-+			echo $(MV) $(DESTDIR)$(libexecdir)/$$f $(DESTDIR)$(libexecdir)/-$$f; \
-+			$(MV) $(DESTDIR)$(libexecdir)/$$f $(DESTDIR)$(libexecdir)/-$$f; \
- 		fi; \
--		echo $(INSTALL_BIN) $$f $(libexecdir); \
--		$(INSTALL_BIN) $$f $(libexecdir); \
--		if test -f $(libexecdir)/-$$f; then \
--			echo $(RM) -f $(libexecdir)/-$$f; \
--			$(RM) -f $(libexecdir)/-$$f; \
-+		echo $(INSTALL_BIN) $$f $(DESTDIR)$(libexecdir); \
-+		$(INSTALL_BIN) $$f $(DESTDIR)$(libexecdir); \
-+		if test -f $(DESTDIR)$(libexecdir)/-$$f; then \
-+			echo $(RM) -f $(DESTDIR)$(libexecdir)/-$$f; \
-+			$(RM) -f $(DESTDIR)$(libexecdir)/-$$f; \
- 		fi; \
- 	done
- 	@for f in $(CGIPROGS); do \
--		if test -f $(libexecdir)/$$f; then \
--			echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
--			$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
-+		if test -f $(DESTDIR)$(libexecdir)/$$f; then \
-+			echo $(MV) $(DESTDIR)$(libexecdir)/$$f $(DESTDIR)$(libexecdir)/-$$f; \
-+			$(MV) $(DESTDIR)$(libexecdir)/$$f $(DESTDIR)$(libexecdir)/-$$f; \
- 		fi; \
--		echo $(INSTALL_BIN) $$f $(libexecdir); \
--		$(INSTALL_BIN) $$f $(libexecdir); \
--		if test -f $(libexecdir)/-$$f; then \
--			echo $(RM) -f $(libexecdir)/-$$f; \
--			$(RM) -f $(libexecdir)/-$$f; \
-+		echo $(INSTALL_BIN) $$f $(DESTDIR)$(libexecdir); \
-+		$(INSTALL_BIN) $$f $(DESTDIR)$(libexecdir); \
-+		if test -f $(DESTDIR)$(libexecdir)/-$$f; then \
-+			echo $(RM) -f $(DESTDIR)$(libexecdir)/-$$f; \
-+			$(RM) -f $(DESTDIR)$(libexecdir)/-$$f; \
- 		fi; \
- 	done
--	$(INSTALL_FILE) $(srcdir)/mib.txt $(DEFAULT_MIB_PATH)
--	$(INSTALL_FILE) squid.conf $(sysconfdir)/squid.conf.default
--	@if test -f $(sysconfdir)/squid.conf ; then \
--		echo "$@ will not overwrite existing $(sysconfdir)/squid.conf" ; \
--	else \
--		echo "$(INSTALL_FILE) squid.conf $(sysconfdir)"; \
--		$(INSTALL_FILE) squid.conf $(sysconfdir); \
--	fi
--
--	$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)/mime.conf.default
--	@if test -f $(sysconfdir)/mime.conf ; then \
--		echo "$@ will not overwrite existing $(sysconfdir)/mime.conf" ; \
--	else \
--		echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)"; \
--		$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir); \
--	fi
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/share/examples/squid/conf
-+	$(INSTALL_FILE) $(srcdir)/mib.txt $(DESTDIR)$(prefix)/share/examples/squid/conf/mib.txt.sample
-+	$(INSTALL_FILE) squid.conf $(DESTDIR)$(prefix)/share/examples/squid/conf/squid.conf.sample
-+	$(INSTALL_FILE) $(srcdir)/mime.conf $(DESTDIR)$(prefix)/share/examples/squid/conf/mime.conf.sample
- 
- install-pinger:
- 	@f=pinger; \
--	if test -f $(libexecdir)/$$f; then \
--		echo $(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
--		$(MV) $(libexecdir)/$$f $(libexecdir)/-$$f; \
-+	if test -f $(DESTDIR)$(libexecdir)/$$f; then \
-+		echo $(MV) $(DESTDIR)$(libexecdir)/$$f $(DESTDIR)$(libexecdir)/-$$f; \
-+		$(MV) $(DESTDIR)$(libexecdir)/$$f $(DESTDIR)$(libexecdir)/-$$f; \
- 	fi; \
--	echo $(INSTALL_SUID) $$f $(libexecdir); \
--	$(INSTALL_SUID) $$f $(libexecdir) || exit 1; \
--	if test -f $(libexecdir)/-$$f; then \
--		echo $(RM) -f $(libexecdir)/-$$f; \
--		$(RM) -f $(libexecdir)/-$$f; \
-+	echo $(INSTALL_SUID) $$f $(DESTDIR)$(libexecdir); \
-+	$(INSTALL_SUID) $$f $(DESTDIR)$(libexecdir) || exit 1; \
-+	if test -f $(DESTDIR)$(libexecdir)/-$$f; then \
-+		echo $(RM) -f $(DESTDIR)$(libexecdir)/-$$f; \
-+		$(RM) -f $(DESTDIR)$(libexecdir)/-$$f; \
- 	fi
- 
- clean: 
diff --git a/www/squid/patches/patch-af b/www/squid/patches/patch-af
deleted file mode 100644
index b36d54705ac..00000000000
--- a/www/squid/patches/patch-af
+++ /dev/null
@@ -1,49 +0,0 @@
---- errors/Makefile.in.orig	Wed Sep 22 00:53:18 1999
-+++ errors/Makefile.in	Fri Aug  4 20:55:35 2000
-@@ -15,7 +15,10 @@
- 
- INSTALL         	= @INSTALL@
- INSTALL_FILE    	= @INSTALL_DATA@
--DEFAULT_ERROR_DIR	= $(sysconfdir)/errors
-+
-+DESTDIR = 
-+
-+DEFAULT_ERROR_DIR	= $(prefix)/share/squid/errors
- 
- LANGUAGE		= @ERR_LANGUAGE@
- 
-@@ -23,26 +26,18 @@
- 
- install: install-mkdirs
- 	@for f in $(srcdir)/$(LANGUAGE)/ERR_*; do \
--		if test -f $(DEFAULT_ERROR_DIR)/$$f ; then \
--			:; \
--		else \
--			echo "$(INSTALL_FILE) $$f $(DEFAULT_ERROR_DIR)"; \
--			$(INSTALL_FILE) $$f $(DEFAULT_ERROR_DIR); \
--		fi; \
-+		echo "$(INSTALL_FILE) $$f $(DESTDIR)$(prefix)/share/examples/squid/errors"; \
-+		$(INSTALL_FILE) $$f $(DESTDIR)$(prefix)/share/examples/squid/errors; \
- 	done
- 
- install-mkdirs:
--	-@if test ! -d $(prefix); then \
--		echo "mkdir $(prefix)"; \
--		mkdir $(prefix); \
--	fi
--	-@if test ! -d $(sysconfdir); then \
--		echo "mkdir $(sysconfdir)"; \
--		mkdir $(sysconfdir); \
-+	-@if test ! -d $(DESTDIR)$(prefix); then \
-+		echo "${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)"; \
-+		${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix); \
- 	fi
--	-@if test ! -d $(DEFAULT_ERROR_DIR); then \
--		echo "mkdir $(DEFAULT_ERROR_DIR)"; \
--		mkdir $(DEFAULT_ERROR_DIR); \
-+	-@if test ! -d $(DESTDIR)$(prefix)/share/examples/squid/errors; then \
-+		echo "${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/share/examples/squid/errors"; \
-+		${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/share/examples/squid/errors; \
- 	fi
- 
- # undocumented hack.  You can use this target to create multi-lingual
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
deleted file mode 100644
index 557356f4d64..00000000000
--- a/www/squid/patches/patch-ag
+++ /dev/null
@@ -1,49 +0,0 @@
---- icons/Makefile.in.orig	Mon Apr 19 03:18:09 1999
-+++ icons/Makefile.in	Fri Aug  4 21:44:03 2000
-@@ -15,7 +15,10 @@
- 
- INSTALL         	= @INSTALL@
- INSTALL_FILE    	= @INSTALL_DATA@
--DEFAULT_ICON_DIR        = $(sysconfdir)/icons
-+
-+DESTDIR = 
-+
-+DEFAULT_ICON_DIR        = $(prefix)/share/squid/icons
- 
- ICONS		= anthony-binhex.gif \
- 		  anthony-bomb.gif \
-@@ -52,26 +55,18 @@
- 
- install: install-mkdirs anthony-xpm.gif
- 	@for f in $(ICONS); do \
--		if test -f $(DEFAULT_ICON_DIR)/$$f ; then \
--			:; \
--		else \
--			echo "$(INSTALL_FILE) $$f $(DEFAULT_ICON_DIR)"; \
--			$(INSTALL_FILE) $$f $(DEFAULT_ICON_DIR); \
--		fi; \
-+		echo "$(INSTALL_FILE) $$f $(DESTDIR)$(prefix)/share/examples/squid/icons"; \
-+		$(INSTALL_FILE) $$f $(DESTDIR)$(prefix)/share/examples/squid/icons; \
- 	done
- 
- install-mkdirs:
--	-@if test ! -d $(prefix); then \
--		echo "mkdir $(prefix)"; \
--		mkdir $(prefix); \
--	fi
--	-@if test ! -d $(sysconfdir); then \
--		echo "mkdir $(sysconfdir)"; \
--		mkdir $(sysconfdir); \
-+	-@if test ! -d $(DESTDIR)$(prefix); then \
-+		echo "${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)"; \
-+		${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix); \
- 	fi
--	-@if test ! -d $(DEFAULT_ICON_DIR); then \
--		echo "mkdir $(DEFAULT_ICON_DIR)"; \
--		mkdir $(DEFAULT_ICON_DIR); \
-+	-@if test ! -d $(DESTDIR)$(prefix)/share/examples/squid/icons; then \
-+		echo "${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/share/examples/squid/icons"; \
-+		${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/share/examples/squid/icons; \
- 	fi
- 
- clean:
diff --git a/www/squid/patches/patch-ah b/www/squid/patches/patch-ah
deleted file mode 100644
index 68f655e8f7a..00000000000
--- a/www/squid/patches/patch-ah
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/tools.c.orig	Wed Jan  3 23:11:51 2001
-+++ src/tools.c	Fri Jul 20 10:58:33 2001
-@@ -85,8 +85,9 @@ mail_warranty(void)
-     static char command[256];
- #if HAVE_MKSTEMP
-     char filename[] = "/tmp/squid-XXXXXX";
--    int tfd = mkstemp(filename);
--    if (tfd < 0)
-+    int tfd = -1;
-+
-+    if ((tfd = mkstemp(filename)) == -1)
- 	return;
-     if ((fp = fdopen(tfd, "w")) == NULL)
- 	return;
diff --git a/www/squid/patches/patch-ai b/www/squid/patches/patch-ai
deleted file mode 100644
index 983b4639de5..00000000000
--- a/www/squid/patches/patch-ai
+++ /dev/null
@@ -1,32 +0,0 @@
---- scripts/Makefile.in.orig	Tue Jun 27 23:18:14 2000
-+++ scripts/Makefile.in	Tue Jun 27 23:20:19 2000
-@@ -18,19 +18,21 @@
- RANLIB		= @RANLIB@
- LN_S		= @LN_S@
- 
-+DESTDIR = 
-+
- all: 
- 
- install:	
--	@if test ! -d $(exec_prefix); then \
--		echo "mkdir $(exec_prefix)"; \
--		mkdir $(exec_prefix); \
-+	@if test ! -d $(DESTDIR)$(exec_prefix); then \
-+		echo "${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(exec_prefix)"; \
-+		${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(exec_prefix); \
- 	fi
--	@if test ! -d $(bindir); then \
--		echo "mkdir $(bindir)"; \
--		mkdir $(bindir); \
-+	@if test ! -d $(DESTDIR)$(bindir); then \
-+		echo "${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir)"; \
-+		${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)$(bindir); \
- 	fi
--	$(INSTALL_BIN) RunCache $(bindir)
--	$(INSTALL_BIN) RunAccel $(bindir)
-+	$(INSTALL_BIN) RunCache $(DESTDIR)$(bindir)
-+	$(INSTALL_BIN) RunAccel $(DESTDIR)$(bindir)
- 
- clean:
- 
diff --git a/www/squid/patches/patch-aj b/www/squid/patches/patch-aj
deleted file mode 100644
index 2e4b7169855..00000000000
--- a/www/squid/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/Makefile.in.orig	Tue Nov 21 16:09:40 2000
-+++ lib/Makefile.in	Tue Nov 21 16:09:46 2000
-@@ -49,6 +49,9 @@
- 
- all: $(LIBS)
- 
-+rfc1035.o: rfc1035.c
-+	$(CC) $(CFLAGS) -O0 -c $<
-+
- $(UTILOBJS): $(top_srcdir)/include/version.h
- 
- libmiscutil.a: $(UTILOBJS)
diff --git a/www/squid/patches/patch-configure_in b/www/squid/patches/patch-configure_in
new file mode 100644
index 00000000000..c612594159b
--- /dev/null
+++ b/www/squid/patches/patch-configure_in
@@ -0,0 +1,56 @@
+$OpenBSD: patch-configure_in,v 1.1 2002/02/20 01:17:03 brad Exp $
+--- configure.in.orig	Wed Feb  6 19:20:15 2002
++++ configure.in	Wed Feb  6 19:31:03 2002
+@@ -704,6 +704,18 @@ AC_ARG_ENABLE(ipf-transparent,
+   fi
+ ])
+ 
++dnl Enable PF Transparent Proxy
++AC_ARG_ENABLE(pf-transparent,
++[  --enable-pf-transparent
++                          Enable Transparent Proxy support for systems
++                          using PF network address redirection.],
++[ if test "$enableval" = "yes" ; then
++	echo "PF Transparent Proxy enabled"
++	AC_DEFINE(PF_TRANSPARENT)
++	PF_TRANSPARENT="yes"
++  fi
++])
++
+ dnl Enable Linux Netfilter (2.4) Transparent Proxy
+ AC_ARG_ENABLE(linux-netfilter,
+ [  --enable-linux-netfilter
+@@ -1067,6 +1079,7 @@ AC_CHECK_HEADERS( \
+ 	memory.h \
+ 	mount.h \
+ 	net/if.h \
++	net/pfvar.h \
+ 	netdb.h \
+ 	netinet/if_ether.h \
+ 	netinet/in.h \
+@@ -1620,6 +1633,25 @@ if test "$IPF_TRANSPARENT" ; then
+ fi 
+ if test "$IPF_TRANSPARENT" = "no" ; then
+     echo "WARNING: Cannot find necessary IP-Filter header files"
++    echo "         Transparent Proxy support WILL NOT be enabled"
++    sleep 10
++fi
++
++dnl PF support requires a header file.
++if test "$PF_TRANSPARENT" ; then
++    AC_MSG_CHECKING(if PF header file is installed)
++    # hold on to your hats...
++    if test "$ac_cv_header_net_pfvar_h" = "yes"; then
++        PF_TRANSPARENT="yes"
++        AC_DEFINE(PF_TRANSPARENT, 1)
++    else
++        PF_TRANSPARENT="no"
++        AC_DEFINE(PF_TRANSPARENT, 0)
++    fi
++    AC_MSG_RESULT($PF_TRANSPARENT)
++fi
++if test "$PF_TRANSPARENT" = "no" ; then
++    echo "WARNING: Cannot find necessary PF header file"
+     echo "         Transparent Proxy support WILL NOT be enabled"
+     sleep 10
+ fi
diff --git a/www/squid/patches/patch-errors_Makefile_in b/www/squid/patches/patch-errors_Makefile_in
new file mode 100644
index 00000000000..27579c4d175
--- /dev/null
+++ b/www/squid/patches/patch-errors_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-errors_Makefile_in,v 1.1 2002/02/20 01:17:03 brad Exp $
+--- errors/Makefile.in.orig	Thu Feb  7 12:04:12 2002
++++ errors/Makefile.in	Thu Feb  7 12:06:12 2002
+@@ -122,7 +122,7 @@ am__quote = @am__quote@
+ install_sh = @install_sh@
+ makesnmplib = @makesnmplib@
+ 
+-errordir = $(datadir)/errors
++errordir = $(prefix)/share/examples/squid/errors
+ 
+ DEFAULT_ERROR_DIR = $(errordir)
+ 
diff --git a/www/squid/patches/patch-icons_Makefile_in b/www/squid/patches/patch-icons_Makefile_in
new file mode 100644
index 00000000000..eb0d71dec7b
--- /dev/null
+++ b/www/squid/patches/patch-icons_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-icons_Makefile_in,v 1.1 2002/02/20 01:17:03 brad Exp $
+--- icons/Makefile.in.orig	Thu Feb  7 12:06:24 2002
++++ icons/Makefile.in	Thu Feb  7 12:06:42 2002
+@@ -150,7 +150,7 @@ ICON2 = anthony-bomb.gif \
+ 		anthony-xpm.gif
+ 
+ 
+-icondir = $(datadir)/icons
++icondir = $(prefix)/share/examples/squid/icons
+ icon_DATA = $(ICON1) $(ICON2)
+ EXTRA_DIST = $(ICON1) $(ICON2) icons.shar
+ DISTCLEANFILES = $(ICON1) $(ICON2)
diff --git a/www/squid/patches/patch-include_autoconf_h_in b/www/squid/patches/patch-include_autoconf_h_in
new file mode 100644
index 00000000000..c469f1cafb0
--- /dev/null
+++ b/www/squid/patches/patch-include_autoconf_h_in
@@ -0,0 +1,16 @@
+$OpenBSD: patch-include_autoconf_h_in,v 1.1 2002/02/20 01:17:03 brad Exp $
+--- include/autoconf.h.in.orig	Wed Feb  6 20:07:32 2002
++++ include/autoconf.h.in	Wed Feb  6 20:09:27 2002
+@@ -278,6 +278,12 @@
+ #undef IPF_TRANSPARENT
+ 
+ /*
++ * Enable support for Transparent Proxy on systems using PF address
++ * redirection. This provides "masquerading" support for OpenBSD.
++ */
++#undef PF_TRANSPARENT
++
++/*
+  * Enable code for assiting in finding memory leaks.  Hacker stuff only.
+  */
+ #undef USE_LEAKFINDER
diff --git a/www/squid/patches/patch-src_Makefile_in b/www/squid/patches/patch-src_Makefile_in
new file mode 100644
index 00000000000..cd54b30c245
--- /dev/null
+++ b/www/squid/patches/patch-src_Makefile_in
@@ -0,0 +1,103 @@
+$OpenBSD: patch-src_Makefile_in,v 1.1 2002/02/20 01:17:03 brad Exp $
+--- src/Makefile.in.orig	Thu Feb  7 12:47:49 2002
++++ src/Makefile.in	Thu Feb  7 13:03:31 2002
+@@ -791,37 +791,37 @@ CCDEPMODE = @CCDEPMODE@
+ uninstall-info-am:
+ install-dataDATA: $(data_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(datadir)
++	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/examples/squid
+ 	@list='$(data_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f"; \
+-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(datadir)/$$f; \
++	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
++	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(prefix)/share/examples/squid/$$f; \
+ 	done
+ 
+ uninstall-dataDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(data_DATA)'; for p in $$list; do \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(datadir)/$$f"; \
+-	  rm -f $(DESTDIR)$(datadir)/$$f; \
++	  echo " rm -f $(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
++	  rm -f $(DESTDIR)$(prefix)/share/examples/squid/$$f; \
+ 	done
+ install-sysconfDATA: $(sysconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
++	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/examples/squid
+ 	@list='$(sysconf_DATA)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
+-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
++	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
++	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(prefix)/share/examples/squid/$$f; \
+ 	done
+ 
+ uninstall-sysconfDATA:
+ 	@$(NORMAL_UNINSTALL)
+ 	@list='$(sysconf_DATA)'; for p in $$list; do \
+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  echo " rm -f $(DESTDIR)$(sysconfdir)/$$f"; \
+-	  rm -f $(DESTDIR)$(sysconfdir)/$$f; \
++	  echo " rm -f $(DESTDIR)$(prefix)/share/examples/squid/$$f"; \
++	  rm -f $(DESTDIR)$(prefix)/share/examples/squid/$$f; \
+ 	done
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -955,7 +955,7 @@ check: check-recursive
+ all-am: Makefile $(PROGRAMS) $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(datadir) $(DESTDIR)$(sysconfdir)
++	$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(prefix)/share/examples/squid
+ 
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -1104,28 +1104,28 @@ auth_modules.c: auth_modules.sh Makefile
+ 	@$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
+ 
+ install-data-local: install-sysconfDATA install-dataDATA
+-	@if test -f $(DESTDIR)$(sysconfdir)/mime.conf ; then \
+-	        echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/mime.conf" ; \
++	@if test -f $(DESTDIR)$(prefix)/share/examples/squid/mime.conf ; then \
++	        echo "$@ will not overwrite existing $(DESTDIR)$(prefix)/share/examples/squid/mime.conf" ; \
+ 	else \
+-	        echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(sysconfdir)/mime.conf" ;\
+-	        $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(sysconfdir)/mime.conf; \
++	        echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(prefix)/share/examples/squid/mime.conf" ;\
++	        $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(prefix)/share/examples/squid/mime.conf; \
+ 	fi
+-	@if test -f $(DESTDIR)$(sysconfdir)/squid.conf ; then \
+-	        echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/squid.conf" ; \
++	@if test -f $(DESTDIR)$(prefix)/share/examples/squid/squid.conf ; then \
++	        echo "$@ will not overwrite existing $(DESTDIR)$(prefix)/share/examples/squid/squid.conf" ; \
+ 	else \
+-	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(sysconfdir)/squid.conf"; \
+-	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(sysconfdir)/squid.conf; \
++	        echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(prefix)/share/examples/squid/squid.conf"; \
++	        $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(prefix)/share/examples/squid/squid.conf; \
+ 	fi
+ 	$(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
+ 
+ uninstall-local:
+-	@if test -f $(DESTDIR)$(sysconfdir)/mime.conf ; then \
+-		echo "rm -f $(DESTDIR)$(sysconfdir)/mime.conf"; \
+-		$(RM) -f $(DESTDIR)$(sysconfdir)/mime.conf; \
++	@if test -f $(DESTDIR)$(prefix)/share/examples/squid/mime.conf ; then \
++		echo "rm -f $(DESTDIR)$(prefix)/share/examples/squid/mime.conf"; \
++		$(RM) -f $(DESTDIR)$(prefix)/share/examples/squid/mime.conf; \
+ 	fi
+-	@if test -f $(DESTDIR)$(sysconfdir)/squid.conf ; then \
+-		echo "rm -f $(DESTDIR)$(sysconfdir)/squid.conf"; \
+-		$(RM) -f $(DESTDIR)$(sysconfdir)/squid.conf; \
++	@if test -f $(DESTDIR)$(prefix)/share/examples/squid/squid.conf ; then \
++		echo "rm -f $(DESTDIR)$(prefix)/share/examples/squid/squid.conf"; \
++		$(RM) -f $(DESTDIR)$(prefix)/share/examples/squid/squid.conf; \
+ 	fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/www/squid/patches/patch-src_client_side_c b/www/squid/patches/patch-src_client_side_c
new file mode 100644
index 00000000000..55af1fcbd62
--- /dev/null
+++ b/www/squid/patches/patch-src_client_side_c
@@ -0,0 +1,68 @@
+$OpenBSD: patch-src_client_side_c,v 1.1 2002/02/20 01:17:03 brad Exp $
+--- src/client_side.c.orig	Wed Feb  6 20:36:22 2002
++++ src/client_side.c	Wed Feb  6 21:07:26 2002
+@@ -62,6 +62,16 @@
+ #endif
+ #endif
+ 
++#if PF_TRANSPARENT
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <sys/ioctl.h>
++#include <sys/fcntl.h>
++#include <net/if.h>
++#include <netinet/in.h>
++#include <net/pfvar.h>
++#endif
++
+ #if LINUX_NETFILTER
+ #include <linux/netfilter_ipv4.h>
+ #endif
+@@ -2438,6 +2448,10 @@ parseHttpRequest(ConnStateData * conn, m
+     static int siocgnatl_cmd = SIOCGNATL & 0xff;
+     int x;
+ #endif
++#if PF_TRANSPARENT
++    struct pfioc_natlook nl;
++    static int pffd = -1;
++#endif
+ #if LINUX_NETFILTER
+     size_t sock_sz = sizeof(conn->me);
+ #endif
+@@ -2668,6 +2682,36 @@ parseHttpRequest(ConnStateData * conn, m
+ 		    inet_ntoa(natLookup.nl_realip),
+ 		    vport, url);
+ 	    }
++#elif PF_TRANSPARENT
++	   if (pffd < 0)
++		pffd = open("/dev/pf", O_RDWR);
++	   if (pffd < 0) {
++		debug(50, 1) ("parseHttpRequest: PF open failed: %s\n",
++		    xstrerror());
++		return parseHttpRequestAbort(conn, "error:pf-open-failed");
++	   }
++	   memset(&nl, 0, sizeof(struct pfioc_natlook));
++	   nl.saddr.v4.s_addr	= http->conn->peer.sin_addr.s_addr;
++	   nl.sport		= http->conn->peer.sin_port;
++	   nl.daddr.v4.s_addr	= http->conn->me.sin_addr.s_addr;
++	   nl.dport		= http->conn->me.sin_port;
++	   nl.af		= AF_INET;
++	   nl.proto		= IPPROTO_TCP;
++	   nl.direction		= PF_OUT;
++	   if (ioctl(pffd, DIOCNATLOOK, &nl)) {
++		if (errno != ENOENT) {
++		   debug(50, 1) ("parseHttpRequest: PF lookup failed: ioctl(DIOCNATLOOK)\n");
++		   close(pffd);
++		   pffd = -1;
++		   return parseHttpRequestAbort(conn, "error:pf-lookup-failed");
++		} else
++		   snprintf(http->uri, url_sz, "http://%s:%d%s",
++			inet_ntoa(http->conn->me.sin_addr),
++			vport, url);
++	    } else
++		snprintf(http->uri, url_sz, "http://%s:%d%s",
++		    inet_ntoa(nl.rdaddr.v4),
++		    ntohs(nl.rdport), url);
+ #else
+ #if LINUX_NETFILTER
+ 	    /* If the call fails the address structure will be unchanged */
diff --git a/www/squid/pkg/DEINSTALL b/www/squid/pkg/DEINSTALL
index 05dd9628599..a161e083018 100644
--- a/www/squid/pkg/DEINSTALL
+++ b/www/squid/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.4 2000/07/29 00:04:58 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.5 2002/02/20 01:17:03 brad Exp $
 #
 # squid de-installation
 
@@ -7,7 +7,7 @@ set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_DIR=${SYSCONFDIR}
-STATEDIR=${STATEDIR}
+SQUIDDIR=${SQUIDDIR}
 
 echo
 echo "+---------------"
@@ -16,7 +16,7 @@ echo "| these steps as root:"
 echo "|"
 echo "|           rm -rf $CONFIG_DIR"
 echo "|           rm -rf $PREFIX/share/squid"
-echo "|           rm -rf $STATEDIR"
+echo "|           rm -rf $SQUIDDIR"
 echo "|           rm -f /var/run/squid.pid"
 echo "|"
 echo "| Do not do this if you plan on re-installing $1"
diff --git a/www/squid/pkg/DESCR b/www/squid/pkg/DESCR
index e567b215c95..08a604c5807 100644
--- a/www/squid/pkg/DESCR
+++ b/www/squid/pkg/DESCR
@@ -11,4 +11,7 @@ Squid supports SSL, extensive access controls, and full request logging.
 By using the lightweight Internet Cache Protocol, Squid caches can be
 arranged in a hierarchy or mesh for additional bandwidth savings.
 
+Flavors:
+	transparent	- support for transparent proxying
+
 WWW: ${HOMEPAGE}
diff --git a/www/squid/pkg/INSTALL b/www/squid/pkg/INSTALL
index 531e3d1f9ba..cd899b77834 100644
--- a/www/squid/pkg/INSTALL
+++ b/www/squid/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.10 2001/01/12 21:21:02 brad Exp $
+# $OpenBSD: INSTALL,v 1.11 2002/02/20 01:17:03 brad Exp $
 #
 # Pre/post-installation setup of squid
 
@@ -10,12 +10,16 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_DIR=${SYSCONFDIR}
 SAMPLE_CONFIG_DIR=$PREFIX/share/examples/squid
-STATEDIR=${STATEDIR}
+SQUIDDIR=${SQUIDDIR}
+SQUIDUSER=nobody
+SQUIDGROUP=nogroup
 
-install -d -o www -g www -m 771 $STATEDIR
-install -d -o www -g www -m 775 $STATEDIR/logs
-install -d -o www -g www -m 771 $STATEDIR/cache
-ln -sf $STATEDIR/logs/squid.pid /var/run/squid.pid
+if [ ! -d $SQUIDDIR ]; then
+  install -d -o $SQUIDUSER -g $SQUIDGROUP -m 771 $SQUIDDIR
+  install -d -o $SQUIDUSER -g $SQUIDGROUP -m 775 $SQUIDDIR/logs
+  install -d -o $SQUIDUSER -g $SQUIDGROUP -m 771 $SQUIDDIR/cache
+  ln -sf $SQUIDDIR/logs/squid.pid /var/run/squid.pid
+fi
 
 do_notice_conf()
 {
@@ -23,7 +27,7 @@ do_notice_conf()
     echo "+---------------"
     echo "| The existing $1 configuration files in $CONFIG_DIR have NOT"
     echo "| been changed.  You may want to compare them to the current samples in"
-    echo "| $SAMPLE_CONFIG_DIR/conf, and update your configuration"
+    echo "| $SAMPLE_CONFIG_DIR, and update your configuration"
     echo "| files as needed."
 }
 
@@ -41,9 +45,9 @@ do_notice_errors_and_icons()
 do_install_conf()
 {
     install -d -o root -g wheel -m 755 $CONFIG_DIR
-    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/conf/squid.conf.sample $CONFIG_DIR/squid.conf
-    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/conf/mime.conf.sample $CONFIG_DIR/mime.conf
-    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/conf/mib.txt.sample $CONFIG_DIR/mib.txt
+    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/squid.conf $CONFIG_DIR
+    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/mime.conf $CONFIG_DIR
+    install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/mib.txt $CONFIG_DIR
     echo
     echo "+---------------"
     echo "| The $1 configuration files have been installed in $CONFIG_DIR."
@@ -86,7 +90,7 @@ case $2 in
 	fi
 	if [ ! -d $PREFIX/share/squid/errors ]; then
 	   do_install_errors_and_icons
-	elif [ ! -f $PREFIX/share/squid/errors/ERR_TOO_BIG ]; then
+	elif [ ! -f $PREFIX/share/squid/errors/English/ERR_TOO_BIG ]; then
 	   do_install_errors_and_icons
 	else
 	   do_notice_errors_and_icons
diff --git a/www/squid/pkg/MESSAGE b/www/squid/pkg/MESSAGE
index 10693b6a333..c1d8c90510f 100644
--- a/www/squid/pkg/MESSAGE
+++ b/www/squid/pkg/MESSAGE
@@ -1,7 +1,7 @@
-NOTES ON OpenBSD POST-INSTALLATION OF SQUID 2.3
+NOTES ON OpenBSD POST-INSTALLATION OF SQUID 2.5
 -----------------------------------------------
 
- ** An old squid.conf will not work with squid 2.3! **
+ ** An old squid.conf will not work with squid 2.5! **
 
 The local (OpenBSD) differences are:
 - configuration files are in		${SYSCONFDIR}
@@ -10,9 +10,9 @@ The local (OpenBSD) differences are:
 - sample error message files are in	${PREFIX}/share/examples/squid/errors
 - icons are in 				${PREFIX}/share/squid/icons
 - sample icons are in			${PREFIX}/share/examples/squid/icons
-- the cache is in 			${STATEDIR}/cache
-- logs are stored in 			${STATEDIR}/logs
-- the ugid squid runs as is		www:www
+- the cache is in 			${SQUIDDIR}/cache
+- logs are stored in 			${SQUIDDIR}/logs
+- the ugid squid runs as is		nobody:nogroup
 
 Please remember to initialize the cache by running "squid -z" before
 trying to run Squid for the first time.
diff --git a/www/squid/pkg/PLIST b/www/squid/pkg/PLIST
index c57afa1637c..4382993b6ed 100644
--- a/www/squid/pkg/PLIST
+++ b/www/squid/pkg/PLIST
@@ -1,43 +1,738 @@
-@comment $OpenBSD: PLIST,v 1.6 2000/08/05 02:23:15 brad Exp $
-bin/RunCache
+@comment $OpenBSD: PLIST,v 1.7 2002/02/20 01:17:03 brad Exp $
 bin/RunAccel
-bin/client
+bin/RunCache
 bin/squid
-libexec/cachemgr.cgi
-libexec/dnsserver
+bin/squidclient
+libexec/cachemgr
 libexec/unlinkd
-share/examples/squid/conf/mib.txt.sample
-share/examples/squid/conf/squid.conf.sample
-share/examples/squid/conf/mime.conf.sample
-share/examples/squid/errors/ERR_ACCESS_DENIED
-share/examples/squid/errors/ERR_CACHE_ACCESS_DENIED
-share/examples/squid/errors/ERR_CACHE_MGR_ACCESS_DENIED
-share/examples/squid/errors/ERR_CANNOT_FORWARD
-share/examples/squid/errors/ERR_CONNECT_FAIL
-share/examples/squid/errors/ERR_DNS_FAIL
-share/examples/squid/errors/ERR_FORWARDING_DENIED
-share/examples/squid/errors/ERR_FTP_DISABLED
-share/examples/squid/errors/ERR_FTP_FAILURE
-share/examples/squid/errors/ERR_FTP_FORBIDDEN
-share/examples/squid/errors/ERR_FTP_NOT_FOUND
-share/examples/squid/errors/ERR_FTP_PUT_CREATED
-share/examples/squid/errors/ERR_FTP_PUT_ERROR
-share/examples/squid/errors/ERR_FTP_PUT_MODIFIED
-share/examples/squid/errors/ERR_FTP_UNAVAILABLE
-share/examples/squid/errors/ERR_INVALID_REQ
-share/examples/squid/errors/ERR_INVALID_URL
-share/examples/squid/errors/ERR_LIFETIME_EXP
-share/examples/squid/errors/ERR_NO_RELAY
-share/examples/squid/errors/ERR_ONLY_IF_CACHED_MISS
-share/examples/squid/errors/ERR_READ_ERROR
-share/examples/squid/errors/ERR_READ_TIMEOUT
-share/examples/squid/errors/ERR_SHUTTING_DOWN
-share/examples/squid/errors/ERR_TOO_BIG
-share/examples/squid/errors/ERR_SOCKET_FAILURE
-share/examples/squid/errors/ERR_UNSUP_REQ
-share/examples/squid/errors/ERR_URN_RESOLVE
-share/examples/squid/errors/ERR_WRITE_ERROR
-share/examples/squid/errors/ERR_ZERO_SIZE_OBJECT
+man/man8/squid.8
+share/examples/squid/errors/Bulgarian/ERR_ACCESS_DENIED
+share/examples/squid/errors/Bulgarian/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Bulgarian/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Bulgarian/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Bulgarian/ERR_CONNECT_FAIL
+share/examples/squid/errors/Bulgarian/ERR_DNS_FAIL
+share/examples/squid/errors/Bulgarian/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Bulgarian/ERR_FTP_DISABLED
+share/examples/squid/errors/Bulgarian/ERR_FTP_FAILURE
+share/examples/squid/errors/Bulgarian/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Bulgarian/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Bulgarian/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Bulgarian/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Bulgarian/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Bulgarian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Bulgarian/ERR_INVALID_REQ
+share/examples/squid/errors/Bulgarian/ERR_INVALID_URL
+share/examples/squid/errors/Bulgarian/ERR_LIFETIME_EXP
+share/examples/squid/errors/Bulgarian/ERR_NO_RELAY
+share/examples/squid/errors/Bulgarian/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Bulgarian/ERR_READ_ERROR
+share/examples/squid/errors/Bulgarian/ERR_READ_TIMEOUT
+share/examples/squid/errors/Bulgarian/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Bulgarian/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Bulgarian/ERR_TOO_BIG
+share/examples/squid/errors/Bulgarian/ERR_UNSUP_REQ
+share/examples/squid/errors/Bulgarian/ERR_URN_RESOLVE
+share/examples/squid/errors/Bulgarian/ERR_WRITE_ERROR
+share/examples/squid/errors/Bulgarian/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Czech/ERR_ACCESS_DENIED
+share/examples/squid/errors/Czech/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Czech/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Czech/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Czech/ERR_CONNECT_FAIL
+share/examples/squid/errors/Czech/ERR_DNS_FAIL
+share/examples/squid/errors/Czech/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Czech/ERR_FTP_DISABLED
+share/examples/squid/errors/Czech/ERR_FTP_FAILURE
+share/examples/squid/errors/Czech/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Czech/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Czech/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Czech/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Czech/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Czech/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Czech/ERR_INVALID_REQ
+share/examples/squid/errors/Czech/ERR_INVALID_URL
+share/examples/squid/errors/Czech/ERR_LIFETIME_EXP
+share/examples/squid/errors/Czech/ERR_NO_RELAY
+share/examples/squid/errors/Czech/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Czech/ERR_READ_ERROR
+share/examples/squid/errors/Czech/ERR_READ_TIMEOUT
+share/examples/squid/errors/Czech/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Czech/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Czech/ERR_TOO_BIG
+share/examples/squid/errors/Czech/ERR_UNSUP_REQ
+share/examples/squid/errors/Czech/ERR_URN_RESOLVE
+share/examples/squid/errors/Czech/ERR_WRITE_ERROR
+share/examples/squid/errors/Czech/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Danish/ERR_ACCESS_DENIED
+share/examples/squid/errors/Danish/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Danish/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Danish/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Danish/ERR_CLIENT_ABORT
+share/examples/squid/errors/Danish/ERR_CONNECT_FAIL
+share/examples/squid/errors/Danish/ERR_DNS_FAIL
+share/examples/squid/errors/Danish/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Danish/ERR_FTP_DISABLED
+share/examples/squid/errors/Danish/ERR_FTP_FAILURE
+share/examples/squid/errors/Danish/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Danish/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Danish/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Danish/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Danish/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Danish/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Danish/ERR_INVALID_REQ
+share/examples/squid/errors/Danish/ERR_INVALID_URL
+share/examples/squid/errors/Danish/ERR_LIFETIME_EXP
+share/examples/squid/errors/Danish/ERR_NO_RELAY
+share/examples/squid/errors/Danish/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Danish/ERR_READ_ERROR
+share/examples/squid/errors/Danish/ERR_READ_TIMEOUT
+share/examples/squid/errors/Danish/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Danish/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Danish/ERR_TOO_BIG
+share/examples/squid/errors/Danish/ERR_UNSUP_REQ
+share/examples/squid/errors/Danish/ERR_URN_RESOLVE
+share/examples/squid/errors/Danish/ERR_WRITE_ERROR
+share/examples/squid/errors/Danish/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Dutch/ERR_ACCESS_DENIED
+share/examples/squid/errors/Dutch/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Dutch/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Dutch/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Dutch/ERR_CONNECT_FAIL
+share/examples/squid/errors/Dutch/ERR_DNS_FAIL
+share/examples/squid/errors/Dutch/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Dutch/ERR_FTP_DISABLED
+share/examples/squid/errors/Dutch/ERR_FTP_FAILURE
+share/examples/squid/errors/Dutch/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Dutch/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Dutch/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Dutch/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Dutch/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Dutch/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Dutch/ERR_INVALID_REQ
+share/examples/squid/errors/Dutch/ERR_INVALID_URL
+share/examples/squid/errors/Dutch/ERR_LIFETIME_EXP
+share/examples/squid/errors/Dutch/ERR_NO_RELAY
+share/examples/squid/errors/Dutch/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Dutch/ERR_READ_ERROR
+share/examples/squid/errors/Dutch/ERR_READ_TIMEOUT
+share/examples/squid/errors/Dutch/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Dutch/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Dutch/ERR_TOO_BIG
+share/examples/squid/errors/Dutch/ERR_UNSUP_REQ
+share/examples/squid/errors/Dutch/ERR_URN_RESOLVE
+share/examples/squid/errors/Dutch/ERR_WRITE_ERROR
+share/examples/squid/errors/Dutch/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/English/ERR_ACCESS_DENIED
+share/examples/squid/errors/English/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/English/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/English/ERR_CANNOT_FORWARD
+share/examples/squid/errors/English/ERR_CONNECT_FAIL
+share/examples/squid/errors/English/ERR_DNS_FAIL
+share/examples/squid/errors/English/ERR_FORWARDING_DENIED
+share/examples/squid/errors/English/ERR_FTP_DISABLED
+share/examples/squid/errors/English/ERR_FTP_FAILURE
+share/examples/squid/errors/English/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/English/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/English/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/English/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/English/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/English/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/English/ERR_INVALID_REQ
+share/examples/squid/errors/English/ERR_INVALID_URL
+share/examples/squid/errors/English/ERR_LIFETIME_EXP
+share/examples/squid/errors/English/ERR_NO_RELAY
+share/examples/squid/errors/English/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/English/ERR_READ_ERROR
+share/examples/squid/errors/English/ERR_READ_TIMEOUT
+share/examples/squid/errors/English/ERR_SHUTTING_DOWN
+share/examples/squid/errors/English/ERR_SOCKET_FAILURE
+share/examples/squid/errors/English/ERR_TOO_BIG
+share/examples/squid/errors/English/ERR_UNSUP_REQ
+share/examples/squid/errors/English/ERR_URN_RESOLVE
+share/examples/squid/errors/English/ERR_WRITE_ERROR
+share/examples/squid/errors/English/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Estonian/ERR_ACCESS_DENIED
+share/examples/squid/errors/Estonian/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Estonian/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Estonian/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Estonian/ERR_CONNECT_FAIL
+share/examples/squid/errors/Estonian/ERR_DNS_FAIL
+share/examples/squid/errors/Estonian/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Estonian/ERR_FTP_DISABLED
+share/examples/squid/errors/Estonian/ERR_FTP_FAILURE
+share/examples/squid/errors/Estonian/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Estonian/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Estonian/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Estonian/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Estonian/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Estonian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Estonian/ERR_INVALID_REQ
+share/examples/squid/errors/Estonian/ERR_INVALID_URL
+share/examples/squid/errors/Estonian/ERR_LIFETIME_EXP
+share/examples/squid/errors/Estonian/ERR_NO_RELAY
+share/examples/squid/errors/Estonian/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Estonian/ERR_READ_ERROR
+share/examples/squid/errors/Estonian/ERR_READ_TIMEOUT
+share/examples/squid/errors/Estonian/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Estonian/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Estonian/ERR_TOO_BIG
+share/examples/squid/errors/Estonian/ERR_UNSUP_REQ
+share/examples/squid/errors/Estonian/ERR_URN_RESOLVE
+share/examples/squid/errors/Estonian/ERR_WRITE_ERROR
+share/examples/squid/errors/Estonian/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Finnish/ERR_ACCESS_DENIED
+share/examples/squid/errors/Finnish/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Finnish/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Finnish/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Finnish/ERR_CLIENT_ABORT
+share/examples/squid/errors/Finnish/ERR_CONNECT_FAIL
+share/examples/squid/errors/Finnish/ERR_DNS_FAIL
+share/examples/squid/errors/Finnish/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Finnish/ERR_FTP_DISABLED
+share/examples/squid/errors/Finnish/ERR_FTP_FAILURE
+share/examples/squid/errors/Finnish/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Finnish/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Finnish/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Finnish/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Finnish/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Finnish/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Finnish/ERR_INVALID_REQ
+share/examples/squid/errors/Finnish/ERR_INVALID_URL
+share/examples/squid/errors/Finnish/ERR_LIFETIME_EXP
+share/examples/squid/errors/Finnish/ERR_NO_RELAY
+share/examples/squid/errors/Finnish/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Finnish/ERR_READ_ERROR
+share/examples/squid/errors/Finnish/ERR_READ_TIMEOUT
+share/examples/squid/errors/Finnish/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Finnish/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Finnish/ERR_TOO_BIG
+share/examples/squid/errors/Finnish/ERR_UNSUP_REQ
+share/examples/squid/errors/Finnish/ERR_URN_RESOLVE
+share/examples/squid/errors/Finnish/ERR_WRITE_ERROR
+share/examples/squid/errors/Finnish/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/French/ERR_ACCESS_DENIED
+share/examples/squid/errors/French/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/French/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/French/ERR_CANNOT_FORWARD
+share/examples/squid/errors/French/ERR_CONNECT_FAIL
+share/examples/squid/errors/French/ERR_DNS_FAIL
+share/examples/squid/errors/French/ERR_FORWARDING_DENIED
+share/examples/squid/errors/French/ERR_FTP_DISABLED
+share/examples/squid/errors/French/ERR_FTP_FAILURE
+share/examples/squid/errors/French/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/French/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/French/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/French/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/French/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/French/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/French/ERR_INVALID_REQ
+share/examples/squid/errors/French/ERR_INVALID_URL
+share/examples/squid/errors/French/ERR_LIFETIME_EXP
+share/examples/squid/errors/French/ERR_NO_RELAY
+share/examples/squid/errors/French/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/French/ERR_READ_ERROR
+share/examples/squid/errors/French/ERR_READ_TIMEOUT
+share/examples/squid/errors/French/ERR_SHUTTING_DOWN
+share/examples/squid/errors/French/ERR_SOCKET_FAILURE
+share/examples/squid/errors/French/ERR_TOO_BIG
+share/examples/squid/errors/French/ERR_UNSUP_REQ
+share/examples/squid/errors/French/ERR_URN_RESOLVE
+share/examples/squid/errors/French/ERR_WRITE_ERROR
+share/examples/squid/errors/French/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/German/ERR_ACCESS_DENIED
+share/examples/squid/errors/German/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/German/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/German/ERR_CANNOT_FORWARD
+share/examples/squid/errors/German/ERR_CONNECT_FAIL
+share/examples/squid/errors/German/ERR_DNS_FAIL
+share/examples/squid/errors/German/ERR_FORWARDING_DENIED
+share/examples/squid/errors/German/ERR_FTP_DISABLED
+share/examples/squid/errors/German/ERR_FTP_FAILURE
+share/examples/squid/errors/German/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/German/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/German/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/German/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/German/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/German/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/German/ERR_INVALID_REQ
+share/examples/squid/errors/German/ERR_INVALID_URL
+share/examples/squid/errors/German/ERR_LIFETIME_EXP
+share/examples/squid/errors/German/ERR_NO_RELAY
+share/examples/squid/errors/German/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/German/ERR_READ_ERROR
+share/examples/squid/errors/German/ERR_READ_TIMEOUT
+share/examples/squid/errors/German/ERR_SHUTTING_DOWN
+share/examples/squid/errors/German/ERR_SOCKET_FAILURE
+share/examples/squid/errors/German/ERR_TOO_BIG
+share/examples/squid/errors/German/ERR_UNSUP_REQ
+share/examples/squid/errors/German/ERR_URN_RESOLVE
+share/examples/squid/errors/German/ERR_WRITE_ERROR
+share/examples/squid/errors/German/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Hungarian/ERR_ACCESS_DENIED
+share/examples/squid/errors/Hungarian/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Hungarian/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Hungarian/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Hungarian/ERR_CONNECT_FAIL
+share/examples/squid/errors/Hungarian/ERR_DNS_FAIL
+share/examples/squid/errors/Hungarian/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Hungarian/ERR_FTP_DISABLED
+share/examples/squid/errors/Hungarian/ERR_FTP_FAILURE
+share/examples/squid/errors/Hungarian/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Hungarian/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Hungarian/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Hungarian/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Hungarian/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Hungarian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Hungarian/ERR_INVALID_REQ
+share/examples/squid/errors/Hungarian/ERR_INVALID_URL
+share/examples/squid/errors/Hungarian/ERR_LIFETIME_EXP
+share/examples/squid/errors/Hungarian/ERR_NO_RELAY
+share/examples/squid/errors/Hungarian/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Hungarian/ERR_READ_ERROR
+share/examples/squid/errors/Hungarian/ERR_READ_TIMEOUT
+share/examples/squid/errors/Hungarian/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Hungarian/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Hungarian/ERR_TOO_BIG
+share/examples/squid/errors/Hungarian/ERR_UNSUP_REQ
+share/examples/squid/errors/Hungarian/ERR_URN_RESOLVE
+share/examples/squid/errors/Hungarian/ERR_WRITE_ERROR
+share/examples/squid/errors/Hungarian/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Italian/ERR_ACCESS_DENIED
+share/examples/squid/errors/Italian/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Italian/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Italian/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Italian/ERR_CONNECT_FAIL
+share/examples/squid/errors/Italian/ERR_DNS_FAIL
+share/examples/squid/errors/Italian/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Italian/ERR_FTP_DISABLED
+share/examples/squid/errors/Italian/ERR_FTP_FAILURE
+share/examples/squid/errors/Italian/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Italian/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Italian/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Italian/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Italian/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Italian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Italian/ERR_INVALID_REQ
+share/examples/squid/errors/Italian/ERR_INVALID_URL
+share/examples/squid/errors/Italian/ERR_LIFETIME_EXP
+share/examples/squid/errors/Italian/ERR_NO_RELAY
+share/examples/squid/errors/Italian/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Italian/ERR_READ_ERROR
+share/examples/squid/errors/Italian/ERR_READ_TIMEOUT
+share/examples/squid/errors/Italian/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Italian/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Italian/ERR_TOO_BIG
+share/examples/squid/errors/Italian/ERR_UNSUP_REQ
+share/examples/squid/errors/Italian/ERR_URN_RESOLVE
+share/examples/squid/errors/Italian/ERR_WRITE_ERROR
+share/examples/squid/errors/Italian/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Japanese/ERR_ACCESS_DENIED
+share/examples/squid/errors/Japanese/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Japanese/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Japanese/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Japanese/ERR_CONNECT_FAIL
+share/examples/squid/errors/Japanese/ERR_DNS_FAIL
+share/examples/squid/errors/Japanese/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Japanese/ERR_FTP_DISABLED
+share/examples/squid/errors/Japanese/ERR_FTP_FAILURE
+share/examples/squid/errors/Japanese/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Japanese/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Japanese/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Japanese/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Japanese/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Japanese/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Japanese/ERR_INVALID_REQ
+share/examples/squid/errors/Japanese/ERR_INVALID_URL
+share/examples/squid/errors/Japanese/ERR_LIFETIME_EXP
+share/examples/squid/errors/Japanese/ERR_NO_RELAY
+share/examples/squid/errors/Japanese/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Japanese/ERR_READ_ERROR
+share/examples/squid/errors/Japanese/ERR_READ_TIMEOUT
+share/examples/squid/errors/Japanese/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Japanese/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Japanese/ERR_TOO_BIG
+share/examples/squid/errors/Japanese/ERR_UNSUP_REQ
+share/examples/squid/errors/Japanese/ERR_URN_RESOLVE
+share/examples/squid/errors/Japanese/ERR_WRITE_ERROR
+share/examples/squid/errors/Japanese/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Korean/ERR_ACCESS_DENIED
+share/examples/squid/errors/Korean/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Korean/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Korean/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Korean/ERR_CONNECT_FAIL
+share/examples/squid/errors/Korean/ERR_DNS_FAIL
+share/examples/squid/errors/Korean/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Korean/ERR_FTP_DISABLED
+share/examples/squid/errors/Korean/ERR_FTP_FAILURE
+share/examples/squid/errors/Korean/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Korean/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Korean/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Korean/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Korean/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Korean/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Korean/ERR_INVALID_REQ
+share/examples/squid/errors/Korean/ERR_INVALID_URL
+share/examples/squid/errors/Korean/ERR_LIFETIME_EXP
+share/examples/squid/errors/Korean/ERR_NO_RELAY
+share/examples/squid/errors/Korean/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Korean/ERR_READ_ERROR
+share/examples/squid/errors/Korean/ERR_READ_TIMEOUT
+share/examples/squid/errors/Korean/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Korean/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Korean/ERR_TOO_BIG
+share/examples/squid/errors/Korean/ERR_UNSUP_REQ
+share/examples/squid/errors/Korean/ERR_URN_RESOLVE
+share/examples/squid/errors/Korean/ERR_WRITE_ERROR
+share/examples/squid/errors/Korean/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Polish/ERR_ACCESS_DENIED
+share/examples/squid/errors/Polish/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Polish/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Polish/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Polish/ERR_CONNECT_FAIL
+share/examples/squid/errors/Polish/ERR_DNS_FAIL
+share/examples/squid/errors/Polish/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Polish/ERR_FTP_DISABLED
+share/examples/squid/errors/Polish/ERR_FTP_FAILURE
+share/examples/squid/errors/Polish/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Polish/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Polish/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Polish/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Polish/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Polish/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Polish/ERR_INVALID_REQ
+share/examples/squid/errors/Polish/ERR_INVALID_URL
+share/examples/squid/errors/Polish/ERR_LIFETIME_EXP
+share/examples/squid/errors/Polish/ERR_NO_RELAY
+share/examples/squid/errors/Polish/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Polish/ERR_READ_ERROR
+share/examples/squid/errors/Polish/ERR_READ_TIMEOUT
+share/examples/squid/errors/Polish/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Polish/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Polish/ERR_TOO_BIG
+share/examples/squid/errors/Polish/ERR_UNSUP_REQ
+share/examples/squid/errors/Polish/ERR_URN_RESOLVE
+share/examples/squid/errors/Polish/ERR_WRITE_ERROR
+share/examples/squid/errors/Polish/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Portuguese/ERR_ACCESS_DENIED
+share/examples/squid/errors/Portuguese/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Portuguese/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Portuguese/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Portuguese/ERR_CONNECT_FAIL
+share/examples/squid/errors/Portuguese/ERR_DNS_FAIL
+share/examples/squid/errors/Portuguese/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Portuguese/ERR_FTP_DISABLED
+share/examples/squid/errors/Portuguese/ERR_FTP_FAILURE
+share/examples/squid/errors/Portuguese/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Portuguese/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Portuguese/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Portuguese/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Portuguese/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Portuguese/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Portuguese/ERR_INVALID_REQ
+share/examples/squid/errors/Portuguese/ERR_INVALID_URL
+share/examples/squid/errors/Portuguese/ERR_LIFETIME_EXP
+share/examples/squid/errors/Portuguese/ERR_NO_RELAY
+share/examples/squid/errors/Portuguese/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Portuguese/ERR_READ_ERROR
+share/examples/squid/errors/Portuguese/ERR_READ_TIMEOUT
+share/examples/squid/errors/Portuguese/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Portuguese/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Portuguese/ERR_TOO_BIG
+share/examples/squid/errors/Portuguese/ERR_UNSUP_REQ
+share/examples/squid/errors/Portuguese/ERR_URN_RESOLVE
+share/examples/squid/errors/Portuguese/ERR_WRITE_ERROR
+share/examples/squid/errors/Portuguese/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Romanian/ERR_ACCESS_DENIED
+share/examples/squid/errors/Romanian/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Romanian/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Romanian/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Romanian/ERR_CONNECT_FAIL
+share/examples/squid/errors/Romanian/ERR_DNS_FAIL
+share/examples/squid/errors/Romanian/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Romanian/ERR_FTP_DISABLED
+share/examples/squid/errors/Romanian/ERR_FTP_FAILURE
+share/examples/squid/errors/Romanian/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Romanian/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Romanian/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Romanian/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Romanian/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Romanian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Romanian/ERR_INVALID_REQ
+share/examples/squid/errors/Romanian/ERR_INVALID_URL
+share/examples/squid/errors/Romanian/ERR_LIFETIME_EXP
+share/examples/squid/errors/Romanian/ERR_NO_RELAY
+share/examples/squid/errors/Romanian/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Romanian/ERR_READ_ERROR
+share/examples/squid/errors/Romanian/ERR_READ_TIMEOUT
+share/examples/squid/errors/Romanian/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Romanian/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Romanian/ERR_TOO_BIG
+share/examples/squid/errors/Romanian/ERR_UNSUP_REQ
+share/examples/squid/errors/Romanian/ERR_URN_RESOLVE
+share/examples/squid/errors/Romanian/ERR_WRITE_ERROR
+share/examples/squid/errors/Romanian/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Russian-1251/ERR_ACCESS_DENIED
+share/examples/squid/errors/Russian-1251/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Russian-1251/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Russian-1251/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Russian-1251/ERR_CONNECT_FAIL
+share/examples/squid/errors/Russian-1251/ERR_DNS_FAIL
+share/examples/squid/errors/Russian-1251/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Russian-1251/ERR_FTP_DISABLED
+share/examples/squid/errors/Russian-1251/ERR_FTP_FAILURE
+share/examples/squid/errors/Russian-1251/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Russian-1251/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Russian-1251/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Russian-1251/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Russian-1251/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Russian-1251/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Russian-1251/ERR_INVALID_REQ
+share/examples/squid/errors/Russian-1251/ERR_INVALID_URL
+share/examples/squid/errors/Russian-1251/ERR_LIFETIME_EXP
+share/examples/squid/errors/Russian-1251/ERR_NO_RELAY
+share/examples/squid/errors/Russian-1251/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Russian-1251/ERR_READ_ERROR
+share/examples/squid/errors/Russian-1251/ERR_READ_TIMEOUT
+share/examples/squid/errors/Russian-1251/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Russian-1251/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Russian-1251/ERR_TOO_BIG
+share/examples/squid/errors/Russian-1251/ERR_UNSUP_REQ
+share/examples/squid/errors/Russian-1251/ERR_URN_RESOLVE
+share/examples/squid/errors/Russian-1251/ERR_WRITE_ERROR
+share/examples/squid/errors/Russian-1251/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Russian-koi8-r/ERR_ACCESS_DENIED
+share/examples/squid/errors/Russian-koi8-r/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Russian-koi8-r/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Russian-koi8-r/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Russian-koi8-r/ERR_CONNECT_FAIL
+share/examples/squid/errors/Russian-koi8-r/ERR_DNS_FAIL
+share/examples/squid/errors/Russian-koi8-r/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Russian-koi8-r/ERR_FTP_DISABLED
+share/examples/squid/errors/Russian-koi8-r/ERR_FTP_FAILURE
+share/examples/squid/errors/Russian-koi8-r/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Russian-koi8-r/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Russian-koi8-r/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Russian-koi8-r/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Russian-koi8-r/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Russian-koi8-r/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Russian-koi8-r/ERR_INVALID_REQ
+share/examples/squid/errors/Russian-koi8-r/ERR_INVALID_URL
+share/examples/squid/errors/Russian-koi8-r/ERR_LIFETIME_EXP
+share/examples/squid/errors/Russian-koi8-r/ERR_NO_RELAY
+share/examples/squid/errors/Russian-koi8-r/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Russian-koi8-r/ERR_READ_ERROR
+share/examples/squid/errors/Russian-koi8-r/ERR_READ_TIMEOUT
+share/examples/squid/errors/Russian-koi8-r/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Russian-koi8-r/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Russian-koi8-r/ERR_TOO_BIG
+share/examples/squid/errors/Russian-koi8-r/ERR_UNSUP_REQ
+share/examples/squid/errors/Russian-koi8-r/ERR_URN_RESOLVE
+share/examples/squid/errors/Russian-koi8-r/ERR_WRITE_ERROR
+share/examples/squid/errors/Russian-koi8-r/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Serbian/ERR_ACCESS_DENIED
+share/examples/squid/errors/Serbian/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Serbian/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Serbian/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Serbian/ERR_CONNECT_FAIL
+share/examples/squid/errors/Serbian/ERR_DNS_FAIL
+share/examples/squid/errors/Serbian/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Serbian/ERR_FTP_DISABLED
+share/examples/squid/errors/Serbian/ERR_FTP_FAILURE
+share/examples/squid/errors/Serbian/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Serbian/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Serbian/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Serbian/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Serbian/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Serbian/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Serbian/ERR_INVALID_REQ
+share/examples/squid/errors/Serbian/ERR_INVALID_URL
+share/examples/squid/errors/Serbian/ERR_LIFETIME_EXP
+share/examples/squid/errors/Serbian/ERR_NO_RELAY
+share/examples/squid/errors/Serbian/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Serbian/ERR_READ_ERROR
+share/examples/squid/errors/Serbian/ERR_READ_TIMEOUT
+share/examples/squid/errors/Serbian/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Serbian/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Serbian/ERR_TOO_BIG
+share/examples/squid/errors/Serbian/ERR_UNSUP_REQ
+share/examples/squid/errors/Serbian/ERR_URN_RESOLVE
+share/examples/squid/errors/Serbian/ERR_WRITE_ERROR
+share/examples/squid/errors/Serbian/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Simplify_Chinese/ERR_ACCESS_DENIED
+share/examples/squid/errors/Simplify_Chinese/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Simplify_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Simplify_Chinese/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Simplify_Chinese/ERR_CONNECT_FAIL
+share/examples/squid/errors/Simplify_Chinese/ERR_DNS_FAIL
+share/examples/squid/errors/Simplify_Chinese/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Simplify_Chinese/ERR_FTP_DISABLED
+share/examples/squid/errors/Simplify_Chinese/ERR_FTP_FAILURE
+share/examples/squid/errors/Simplify_Chinese/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Simplify_Chinese/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Simplify_Chinese/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Simplify_Chinese/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Simplify_Chinese/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Simplify_Chinese/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Simplify_Chinese/ERR_INVALID_REQ
+share/examples/squid/errors/Simplify_Chinese/ERR_INVALID_URL
+share/examples/squid/errors/Simplify_Chinese/ERR_LIFETIME_EXP
+share/examples/squid/errors/Simplify_Chinese/ERR_NO_RELAY
+share/examples/squid/errors/Simplify_Chinese/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Simplify_Chinese/ERR_READ_ERROR
+share/examples/squid/errors/Simplify_Chinese/ERR_READ_TIMEOUT
+share/examples/squid/errors/Simplify_Chinese/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Simplify_Chinese/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Simplify_Chinese/ERR_TOO_BIG
+share/examples/squid/errors/Simplify_Chinese/ERR_UNSUP_REQ
+share/examples/squid/errors/Simplify_Chinese/ERR_URN_RESOLVE
+share/examples/squid/errors/Simplify_Chinese/ERR_WRITE_ERROR
+share/examples/squid/errors/Simplify_Chinese/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Slovak/ERR_ACCESS_DENIED
+share/examples/squid/errors/Slovak/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Slovak/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Slovak/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Slovak/ERR_CONNECT_FAIL
+share/examples/squid/errors/Slovak/ERR_DNS_FAIL
+share/examples/squid/errors/Slovak/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Slovak/ERR_FTP_DISABLED
+share/examples/squid/errors/Slovak/ERR_FTP_FAILURE
+share/examples/squid/errors/Slovak/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Slovak/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Slovak/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Slovak/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Slovak/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Slovak/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Slovak/ERR_INVALID_REQ
+share/examples/squid/errors/Slovak/ERR_INVALID_URL
+share/examples/squid/errors/Slovak/ERR_LIFETIME_EXP
+share/examples/squid/errors/Slovak/ERR_NO_RELAY
+share/examples/squid/errors/Slovak/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Slovak/ERR_READ_ERROR
+share/examples/squid/errors/Slovak/ERR_READ_TIMEOUT
+share/examples/squid/errors/Slovak/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Slovak/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Slovak/ERR_TOO_BIG
+share/examples/squid/errors/Slovak/ERR_UNSUP_REQ
+share/examples/squid/errors/Slovak/ERR_URN_RESOLVE
+share/examples/squid/errors/Slovak/ERR_WRITE_ERROR
+share/examples/squid/errors/Slovak/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Spanish/ERR_ACCESS_DENIED
+share/examples/squid/errors/Spanish/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Spanish/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Spanish/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Spanish/ERR_CONNECT_FAIL
+share/examples/squid/errors/Spanish/ERR_DNS_FAIL
+share/examples/squid/errors/Spanish/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Spanish/ERR_FTP_DISABLED
+share/examples/squid/errors/Spanish/ERR_FTP_FAILURE
+share/examples/squid/errors/Spanish/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Spanish/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Spanish/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Spanish/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Spanish/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Spanish/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Spanish/ERR_INVALID_REQ
+share/examples/squid/errors/Spanish/ERR_INVALID_URL
+share/examples/squid/errors/Spanish/ERR_LIFETIME_EXP
+share/examples/squid/errors/Spanish/ERR_NO_RELAY
+share/examples/squid/errors/Spanish/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Spanish/ERR_READ_ERROR
+share/examples/squid/errors/Spanish/ERR_READ_TIMEOUT
+share/examples/squid/errors/Spanish/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Spanish/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Spanish/ERR_TOO_BIG
+share/examples/squid/errors/Spanish/ERR_UNSUP_REQ
+share/examples/squid/errors/Spanish/ERR_URN_RESOLVE
+share/examples/squid/errors/Spanish/ERR_WRITE_ERROR
+share/examples/squid/errors/Spanish/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Swedish/ERR_ACCESS_DENIED
+share/examples/squid/errors/Swedish/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Swedish/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Swedish/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Swedish/ERR_CONNECT_FAIL
+share/examples/squid/errors/Swedish/ERR_DNS_FAIL
+share/examples/squid/errors/Swedish/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Swedish/ERR_FTP_DISABLED
+share/examples/squid/errors/Swedish/ERR_FTP_FAILURE
+share/examples/squid/errors/Swedish/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Swedish/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Swedish/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Swedish/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Swedish/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Swedish/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Swedish/ERR_INVALID_REQ
+share/examples/squid/errors/Swedish/ERR_INVALID_URL
+share/examples/squid/errors/Swedish/ERR_LIFETIME_EXP
+share/examples/squid/errors/Swedish/ERR_NO_RELAY
+share/examples/squid/errors/Swedish/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Swedish/ERR_READ_ERROR
+share/examples/squid/errors/Swedish/ERR_READ_TIMEOUT
+share/examples/squid/errors/Swedish/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Swedish/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Swedish/ERR_TOO_BIG
+share/examples/squid/errors/Swedish/ERR_UNSUP_REQ
+share/examples/squid/errors/Swedish/ERR_URN_RESOLVE
+share/examples/squid/errors/Swedish/ERR_WRITE_ERROR
+share/examples/squid/errors/Swedish/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Traditional_Chinese/ERR_ACCESS_DENIED
+share/examples/squid/errors/Traditional_Chinese/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Traditional_Chinese/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Traditional_Chinese/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Traditional_Chinese/ERR_CONNECT_FAIL
+share/examples/squid/errors/Traditional_Chinese/ERR_DNS_FAIL
+share/examples/squid/errors/Traditional_Chinese/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Traditional_Chinese/ERR_FTP_DISABLED
+share/examples/squid/errors/Traditional_Chinese/ERR_FTP_FAILURE
+share/examples/squid/errors/Traditional_Chinese/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Traditional_Chinese/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Traditional_Chinese/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Traditional_Chinese/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Traditional_Chinese/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Traditional_Chinese/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Traditional_Chinese/ERR_INVALID_REQ
+share/examples/squid/errors/Traditional_Chinese/ERR_INVALID_URL
+share/examples/squid/errors/Traditional_Chinese/ERR_LIFETIME_EXP
+share/examples/squid/errors/Traditional_Chinese/ERR_NO_RELAY
+share/examples/squid/errors/Traditional_Chinese/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Traditional_Chinese/ERR_READ_ERROR
+share/examples/squid/errors/Traditional_Chinese/ERR_READ_TIMEOUT
+share/examples/squid/errors/Traditional_Chinese/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Traditional_Chinese/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Traditional_Chinese/ERR_TOO_BIG
+share/examples/squid/errors/Traditional_Chinese/ERR_UNSUP_REQ
+share/examples/squid/errors/Traditional_Chinese/ERR_URN_RESOLVE
+share/examples/squid/errors/Traditional_Chinese/ERR_WRITE_ERROR
+share/examples/squid/errors/Traditional_Chinese/ERR_ZERO_SIZE_OBJECT
+share/examples/squid/errors/Turkish/ERR_ACCESS_DENIED
+share/examples/squid/errors/Turkish/ERR_CACHE_ACCESS_DENIED
+share/examples/squid/errors/Turkish/ERR_CACHE_MGR_ACCESS_DENIED
+share/examples/squid/errors/Turkish/ERR_CANNOT_FORWARD
+share/examples/squid/errors/Turkish/ERR_CONNECT_FAIL
+share/examples/squid/errors/Turkish/ERR_DNS_FAIL
+share/examples/squid/errors/Turkish/ERR_FORWARDING_DENIED
+share/examples/squid/errors/Turkish/ERR_FTP_DISABLED
+share/examples/squid/errors/Turkish/ERR_FTP_FAILURE
+share/examples/squid/errors/Turkish/ERR_FTP_FORBIDDEN
+share/examples/squid/errors/Turkish/ERR_FTP_NOT_FOUND
+share/examples/squid/errors/Turkish/ERR_FTP_PUT_CREATED
+share/examples/squid/errors/Turkish/ERR_FTP_PUT_ERROR
+share/examples/squid/errors/Turkish/ERR_FTP_PUT_MODIFIED
+share/examples/squid/errors/Turkish/ERR_FTP_UNAVAILABLE
+share/examples/squid/errors/Turkish/ERR_INVALID_REQ
+share/examples/squid/errors/Turkish/ERR_INVALID_URL
+share/examples/squid/errors/Turkish/ERR_LIFETIME_EXP
+share/examples/squid/errors/Turkish/ERR_NO_RELAY
+share/examples/squid/errors/Turkish/ERR_ONLY_IF_CACHED_MISS
+share/examples/squid/errors/Turkish/ERR_READ_ERROR
+share/examples/squid/errors/Turkish/ERR_READ_TIMEOUT
+share/examples/squid/errors/Turkish/ERR_SHUTTING_DOWN
+share/examples/squid/errors/Turkish/ERR_SOCKET_FAILURE
+share/examples/squid/errors/Turkish/ERR_TOO_BIG
+share/examples/squid/errors/Turkish/ERR_UNSUP_REQ
+share/examples/squid/errors/Turkish/ERR_URN_RESOLVE
+share/examples/squid/errors/Turkish/ERR_WRITE_ERROR
+share/examples/squid/errors/Turkish/ERR_ZERO_SIZE_OBJECT
 share/examples/squid/icons/anthony-binhex.gif
 share/examples/squid/icons/anthony-bomb.gif
 share/examples/squid/icons/anthony-box.gif
@@ -65,7 +760,34 @@ share/examples/squid/icons/anthony-text.gif
 share/examples/squid/icons/anthony-unknown.gif
 share/examples/squid/icons/anthony-xbm.gif
 share/examples/squid/icons/anthony-xpm.gif
-@dirrm share/examples/squid/conf
+share/examples/squid/mib.txt
+share/examples/squid/mime.conf
+share/examples/squid/squid.conf
 @dirrm share/examples/squid/icons
+@dirrm share/examples/squid/errors/Turkish
+@dirrm share/examples/squid/errors/Traditional_Chinese
+@dirrm share/examples/squid/errors/Swedish
+@dirrm share/examples/squid/errors/Spanish
+@dirrm share/examples/squid/errors/Slovak
+@dirrm share/examples/squid/errors/Simplify_Chinese
+@dirrm share/examples/squid/errors/Serbian
+@dirrm share/examples/squid/errors/Russian-koi8-r
+@dirrm share/examples/squid/errors/Russian-1251
+@dirrm share/examples/squid/errors/Romanian
+@dirrm share/examples/squid/errors/Portuguese
+@dirrm share/examples/squid/errors/Polish
+@dirrm share/examples/squid/errors/Korean
+@dirrm share/examples/squid/errors/Japanese
+@dirrm share/examples/squid/errors/Italian
+@dirrm share/examples/squid/errors/Hungarian
+@dirrm share/examples/squid/errors/German
+@dirrm share/examples/squid/errors/French
+@dirrm share/examples/squid/errors/Finnish
+@dirrm share/examples/squid/errors/Estonian
+@dirrm share/examples/squid/errors/English
+@dirrm share/examples/squid/errors/Dutch
+@dirrm share/examples/squid/errors/Danish
+@dirrm share/examples/squid/errors/Czech
+@dirrm share/examples/squid/errors/Bulgarian
 @dirrm share/examples/squid/errors
 @dirrm share/examples/squid