diff --git a/www/squid/Makefile b/www/squid/Makefile
index a4ceca6f4ef..49bda822585 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,23 +1,17 @@
-# $OpenBSD: Makefile,v 1.17 2000/06/10 06:27:25 brad Exp $
+# $OpenBSD: Makefile,v 1.18 2000/06/28 07:08:28 brad Exp $
 
-DISTNAME=	squid-2.2.STABLE5
-PKGNAME=	squid-2.2
+DISTNAME=	squid-2.3.STABLE3
+PKGNAME=	squid-2.3
 CATEGORIES=	www
-NEED_VERSION=	1.295
-MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.2/
-MASTER_SITES0=	http://www.squid-cache.org/Versions/v2/2.2/bugs/
+NEED_VERSION=	1.301
+MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.3/
+MASTER_SITES0=	http://www.squid-cache.org/Versions/v2/2.3/bugs/
 EXTRACT_SUFX=	-src.tar.gz
 DIST_SUBDIR=	squid
 
-PATCHFILES=	squid-2.2.stable5-no_cache.patch:0 \
-		squid-2.2.stable5-ipcache_negative.patch:0 \
-		squid-2.2.stable5-newlines_in_auth.patch:0 \
-		squid-2.2.stable5-domain-match.patch:0
-.if defined(PATCH_DEBUG) && ${PATCH_DEBUG:U} == YES
-PATCH_DIST_ARGS=-d ${WRKSRC}/src -E ${PATCH_DIST_STRIP}
-.else
-PATCH_DIST_ARGS=-d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
-.endif
+PATCHFILES=	squid-2.3.stable3-carp_compile.patch:0 \
+		squid-2.3.stable3-storeExpiredReferenceAge.patch:0 \
+		squid-2.3.stable3-zero-content-length.patch:0
 
 HOMEPAGE=	http://www.squid-cache.org/
 
@@ -29,13 +23,13 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 SYSCONFDIR=	/etc/squid
-STATEDIR=	/var/squid
+STATEDIR?=	/var/squid
 SUBST_VARS=SYSCONFDIR STATEDIR
 
-HAS_CONFIGURE=	Yes
-CONFIGURE_ARGS=--prefix='$${DESTDIR}${PREFIX}'
-CONFIGURE_ARGS+=--sysconfdir='$${DESTDIR}${SYSCONFDIR}'
-CONFIGURE_ARGS+=	--localstatedir="${STATEDIR}"
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS=	--localstatedir="${STATEDIR}"
+
+FAKE_FLAGS=	MFLAGS="DESTDIR=\"${WRKINST}\""
 
 MAKE_FILE=	makefile
 
diff --git a/www/squid/files/md5 b/www/squid/files/md5
index d3b3ef5c2bf..dbb5ddc707b 100644
--- a/www/squid/files/md5
+++ b/www/squid/files/md5
@@ -1,15 +1,12 @@
-MD5 (squid/squid-2.2.STABLE5-src.tar.gz) = e5b02867a4c58ac5db191041a9c298b6
-MD5 (squid/squid-2.2.stable5-domain-match.patch) = 4731e1f7f7886b7e733432fb3a9496c1
-MD5 (squid/squid-2.2.stable5-ipcache_negative.patch) = 20bfacdf3722a9957ea5ca6c64626aa2
-MD5 (squid/squid-2.2.stable5-newlines_in_auth.patch) = 5860cdc5613486f04571b81da40d4958
-MD5 (squid/squid-2.2.stable5-no_cache.patch) = adb98dcb868da61ffcf5035cbf7f1049
-RMD160 (squid/squid-2.2.STABLE5-src.tar.gz) = ea2dada08f2d63cb83be8a97717e403ee62330e7
-RMD160 (squid/squid-2.2.stable5-domain-match.patch) = a9fa78b0891bee8aec684b91fe3af58b408ae75a
-RMD160 (squid/squid-2.2.stable5-ipcache_negative.patch) = dcb9ac05647d92f476704c3f24d5984cac1d90e1
-RMD160 (squid/squid-2.2.stable5-newlines_in_auth.patch) = b81e3e685ebeb8503eb2ab79b8f90be4c2552802
-RMD160 (squid/squid-2.2.stable5-no_cache.patch) = 8677052f0f57549e3bc4859f05a0caf650d44e7d
-SHA1 (squid/squid-2.2.STABLE5-src.tar.gz) = ab03c701a3e21805bcf313b54f95dd3fe435a67f
-SHA1 (squid/squid-2.2.stable5-domain-match.patch) = b03c2bbd7da4f89e724badae4d977289de2deb7b
-SHA1 (squid/squid-2.2.stable5-ipcache_negative.patch) = 23bb13dbe470a31b190b6ce6e0982591f9fe4a66
-SHA1 (squid/squid-2.2.stable5-newlines_in_auth.patch) = 5fa99dce569b9e297890e4fe275d6b97f38d8456
-SHA1 (squid/squid-2.2.stable5-no_cache.patch) = 3dadd96c7b9081d1c4b79a7137ced42459fcd744
+MD5 (squid/squid-2.3.STABLE3-src.tar.gz) = 8c2384ea5e17c68941fea4cdeef3b6f7
+MD5 (squid/squid-2.3.stable3-carp_compile.patch) = 6bc79fd59484d7b4acc55d268a6e5081
+MD5 (squid/squid-2.3.stable3-storeExpiredReferenceAge.patch) = e98c735db35ed1f38363e54d9bf6d788
+MD5 (squid/squid-2.3.stable3-zero-content-length.patch) = 8e885f8ae0c3c2fefda682133f26cc06
+RMD160 (squid/squid-2.3.STABLE3-src.tar.gz) = f5a27b3d69a363afbf7bee8b725cec5053b21443
+RMD160 (squid/squid-2.3.stable3-carp_compile.patch) = 55efcce592bda061a14f57eab75d5c1d7a3e5a5e
+RMD160 (squid/squid-2.3.stable3-storeExpiredReferenceAge.patch) = 350a234ca5fa3fd55d8f109a7b33e842fc8f3347
+RMD160 (squid/squid-2.3.stable3-zero-content-length.patch) = b43f966c254444a99ff5f8e0f22e54ac40fe0ebf
+SHA1 (squid/squid-2.3.STABLE3-src.tar.gz) = 1a043657be3adbd41b93e341a53f02685834e046
+SHA1 (squid/squid-2.3.stable3-carp_compile.patch) = 2e463e0c904548f59b20cf15e4b059b7e7a1d858
+SHA1 (squid/squid-2.3.stable3-storeExpiredReferenceAge.patch) = 40098a26c3723a9df6357ad46b2ec6e65d40508c
+SHA1 (squid/squid-2.3.stable3-zero-content-length.patch) = b704bf7dda98e46d15e6d54ed20171ba69ad69e8
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index dac523824bb..c1236d427c5 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,6 +1,6 @@
---- src/cf.data.pre.orig	Fri Apr 23 12:47:40 1999
-+++ src/cf.data.pre	Fri Apr 23 12:48:33 1999
-@@ -1629,13 +1629,13 @@
+--- 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
@@ -16,7 +16,7 @@
  LOC: Config.effectiveGroup
  DOC_START
  
-@@ -1647,8 +1647,8 @@
+@@ -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.
  
diff --git a/www/squid/patches/patch-ab b/www/squid/patches/patch-ab
index 93b530e14f9..3bf40b40427 100644
--- a/www/squid/patches/patch-ab
+++ b/www/squid/patches/patch-ab
@@ -1,6 +1,6 @@
---- configure.orig	Tue Apr 20 23:36:03 1999
-+++ configure	Fri Apr 23 12:53:10 1999
-@@ -644,11 +644,11 @@
+--- configure.orig	Fri Apr 28 16:17:12 2000
++++ configure	Wed Jun 28 00:52:33 2000
+@@ -673,12 +673,6 @@
  REGEXLIB=''	# -lregex
  LIBREGEX=''	# libregex.a
  
@@ -9,11 +9,26 @@
 -	localstatedir='${prefix}'
 -
 -fi
-+#if test "$libexecdir" = '${exec_prefix}/libexec'; then
-+#	libexecdir='${bindir}'
-+#	localstatedir='${prefix}'
-+#
-+#fi
- 
+-
  case "$host_os" in
  cygwin32|os2)
+ 	exec_suffix=".exe"
+@@ -4063,18 +4057,6 @@
+ 
+ 		;;
+ esac
+-
+-# Remove optimization for GCC 2.95.[12]
+-# gcc -O[2] on *BSD and Linux (x86) causes pointers to magically become NULL
+-if test "$GCC" = "yes"; then
+-	GCCVER=`$CC -v 2>&1 | awk '$2 ==  "version" {print $3}'`
+-	case "$GCCVER" in
+-	2.95.[12])
+-		echo "Removing -O for gcc on $host with GCC $GCCVER"
+-		CFLAGS="`echo $CFLAGS | sed -e 's/-O[0-9]*//'`"
+-		;;
+-	esac
+-fi
+ 
+ # Recommended by Balint Nagy Endre <bne@CareNet.hu>
+ case "$host" in
diff --git a/www/squid/patches/patch-ae b/www/squid/patches/patch-ae
index 0bd0946d9b0..f47ca3aeddb 100644
--- a/www/squid/patches/patch-ae
+++ b/www/squid/patches/patch-ae
@@ -1,6 +1,15 @@
---- src/Makefile.in.orig	Fri Jan 22 14:07:01 1999
-+++ src/Makefile.in	Sun May  9 12:49:53 1999
-@@ -38,8 +38,8 @@
+--- src/Makefile.in.orig	Tue Oct 19 17:28:35 1999
++++ src/Makefile.in	Tue Jun 27 23:46:35 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)
@@ -11,8 +20,118 @@
  DEFAULT_MIB_PATH	= $(sysconfdir)/mib.txt
  
  CC		= @CC@
-@@ -325,22 +325,10 @@
- 			$(RM) -f $(libexecdir)/-$$f; \
+@@ -262,102 +264,86 @@
+ 	< $(srcdir)/cf.data.pre >$@
+ 
+ install-mkdirs:
+-	-@if test ! -d $(prefix); then \
+-		echo "mkdir $(prefix)"; \
+-		mkdir $(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)
@@ -31,10 +150,30 @@
 -		echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)"; \
 -		$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir); \
 -	fi
-+	${BSD_INSTALL_DATA_DIR} $(prefix)/lib/squid/conf
-+	$(INSTALL_FILE) $(srcdir)/mib.txt $(prefix)/lib/squid/conf/mib.txt.sample
-+	$(INSTALL_FILE) squid.conf $(prefix)/lib/squid/conf/squid.conf.sample
-+	$(INSTALL_FILE) $(srcdir)/mime.conf $(prefix)/lib/squid/conf/mime.conf.sample
++	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/lib/squid/conf
++	$(INSTALL_FILE) $(srcdir)/mib.txt $(DESTDIR)$(prefix)/lib/squid/conf/mib.txt.sample
++	$(INSTALL_FILE) squid.conf $(DESTDIR)$(prefix)/lib/squid/conf/squid.conf.sample
++	$(INSTALL_FILE) $(srcdir)/mime.conf $(DESTDIR)$(prefix)/lib/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
index 680be47dc6c..65983f9f7d2 100644
--- a/www/squid/patches/patch-af
+++ b/www/squid/patches/patch-af
@@ -1,26 +1,29 @@
---- errors/Makefile.in.orig	Fri Apr 24 01:26:39 1998
-+++ errors/Makefile.in	Sun May  9 14:05:51 1999
-@@ -15,7 +15,7 @@
+--- errors/Makefile.in.orig	Tue Jun 27 22:48:21 2000
++++ errors/Makefile.in	Tue Jun 27 23:06:11 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 +23,18 @@
+@@ -23,26 +26,18 @@
  
  install: install-mkdirs
  	@for f in $(srcdir)/$(LANGUAGE)/ERR_*; do \
 -		if test -f $(DEFAULT_ERROR_DIR)/$$f ; then \
-+		if test -f $(prefix)/lib/squid/errors/$$f ; then \
++		if test -f $(DESTDIR)$(prefix)/lib/squid/errors/$$f ; then \
  			:; \
  		else \
 -			echo "$(INSTALL_FILE) $$f $(DEFAULT_ERROR_DIR)"; \
 -			$(INSTALL_FILE) $$f $(DEFAULT_ERROR_DIR); \
-+			echo "$(INSTALL_FILE) $$f $(prefix)/lib/squid/errors"; \
-+			$(INSTALL_FILE) $$f $(prefix)/lib/squid/errors; \
++			echo "$(INSTALL_FILE) $$f $(DESTDIR)$(prefix)/lib/squid/errors"; \
++			$(INSTALL_FILE) $$f $(DESTDIR)$(prefix)/lib/squid/errors; \
  		fi; \
  	done
  
@@ -36,9 +39,9 @@
 -	-@if test ! -d $(DEFAULT_ERROR_DIR); then \
 -		echo "mkdir $(DEFAULT_ERROR_DIR)"; \
 -		mkdir $(DEFAULT_ERROR_DIR); \
-+	-@if test ! -d $(prefix)/lib/squid/errors; then \
-+		echo "mkdir $(prefix)/lib/squid/errors"; \
-+		${BSD_INSTALL_DATA_DIR} $(prefix)/lib/squid/errors; \
++	-@if test ! -d $(DESTDIR)$(prefix)/lib/squid/errors; then \
++		echo "${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/lib/squid/errors"; \
++		${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/lib/squid/errors; \
  	fi
  
- clean:
+ # 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
index 59ded98c403..f77b7ec624d 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,26 +1,29 @@
---- icons/Makefile.in.orig	Sun Apr 18 21:24:10 1999
-+++ icons/Makefile.in	Sun May  9 14:00:47 1999
-@@ -15,7 +15,7 @@
+--- icons/Makefile.in.orig	Tue Jun 27 23:09:05 2000
++++ icons/Makefile.in	Tue Jun 27 23:12:00 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 +52,18 @@
+@@ -52,26 +55,18 @@
  
  install: install-mkdirs anthony-xpm.gif
  	@for f in $(ICONS); do \
 -		if test -f $(DEFAULT_ICON_DIR)/$$f ; then \
-+		if test -f $(prefix)/lib/squid/icons/$$f ; then \
++		if test -f $(DESTDIR)$(prefix)/lib/squid/icons/$$f ; then \
  			:; \
  		else \
 -			echo "$(INSTALL_FILE) $$f $(DEFAULT_ICON_DIR)"; \
 -			$(INSTALL_FILE) $$f $(DEFAULT_ICON_DIR); \
-+			echo "$(INSTALL_FILE) $$f $(prefix)/lib/squid/icons"; \
-+			$(INSTALL_FILE) $$f $(prefix)/lib/squid/icons; \
++			echo "$(INSTALL_FILE) $$f $(DESTDIR)$(prefix)/lib/squid/icons"; \
++			$(INSTALL_FILE) $$f $(DESTDIR)$(prefix)/lib/squid/icons; \
  		fi; \
  	done
  
@@ -36,9 +39,9 @@
 -	-@if test ! -d $(DEFAULT_ICON_DIR); then \
 -		echo "mkdir $(DEFAULT_ICON_DIR)"; \
 -		mkdir $(DEFAULT_ICON_DIR); \
-+	-@if test ! -d $(prefix)/lib/squid/icons; then \
-+		echo "mkdir $(prefix)/lib/squid/icons"; \
-+		${BSD_INSTALL_DATA_DIR} $(prefix)/lib/squid/icons; \
++	-@if test ! -d $(DESTDIR)$(prefix)/lib/squid/icons; then \
++		echo "${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/lib/squid/icons"; \
++		${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(prefix)/lib/squid/icons; \
  	fi
  
  clean:
diff --git a/www/squid/patches/patch-ah b/www/squid/patches/patch-ah
index 7855c55a1e3..7919bfbec23 100644
--- a/www/squid/patches/patch-ah
+++ b/www/squid/patches/patch-ah
@@ -1,6 +1,6 @@
---- src/tools.c.orig	Fri Apr 16 13:07:58 1999
-+++ src/tools.c	Fri Apr 16 13:13:18 1999
-@@ -83,19 +83,15 @@
+--- src/tools.c.orig	Fri Mar 24 15:55:31 2000
++++ src/tools.c	Tue Jun 27 23:14:45 2000
+@@ -82,19 +82,15 @@
  mail_warranty(void)
  {
      FILE *fp = NULL;
diff --git a/www/squid/patches/patch-ai b/www/squid/patches/patch-ai
index 1fc2a5dae99..983b4639de5 100644
--- a/www/squid/patches/patch-ai
+++ b/www/squid/patches/patch-ai
@@ -1,22 +1,32 @@
---- lib/rfc1123.c.orig	Fri Feb 12 14:38:15 1999
-+++ lib/rfc1123.c	Mon Jan 17 09:16:29 2000
-@@ -237,15 +237,16 @@
-     gmt_yday = gmt->tm_yday;
+--- 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@
  
-     lt = localtime(t);
--    day_offset = lt->tm_yday - gmt_yday;
--    min_offset = day_offset * 1440 + (lt->tm_hour - gmt_hour) * 60
--	+ (lt->tm_min - gmt_min);
- 
-+    day_offset = lt->tm_yday - gmt_yday;
-     /* wrap round on end of year */
-     if (day_offset > 1)
- 	day_offset = -1;
-     else if (day_offset < -1)
- 	day_offset = 1;
++DESTDIR = 
 +
-+    min_offset = day_offset * 1440 + (lt->tm_hour - gmt_hour) * 60
-+	+ (lt->tm_min - gmt_min);
+ 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:
  
-     len = strftime(buf, 127 - 5, "%d/%b/%Y:%H:%M:%S ", lt);
-     snprintf(buf + len, 128 - len, "%+03d%02d",
diff --git a/www/squid/patches/patch-aj b/www/squid/patches/patch-aj
new file mode 100644
index 00000000000..0f406171aff
--- /dev/null
+++ b/www/squid/patches/patch-aj
@@ -0,0 +1,12 @@
+--- lib/Makefile.in.orig	Wed Jun 28 01:35:09 2000
++++ lib/Makefile.in	Wed Jun 28 01:35:26 2000
+@@ -48,6 +48,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/pkg/DEINSTALL b/www/squid/pkg/DEINSTALL
index fe2abf8fcb6..9881e7206eb 100644
--- a/www/squid/pkg/DEINSTALL
+++ b/www/squid/pkg/DEINSTALL
@@ -1,11 +1,10 @@
-# $OpenBSD: DEINSTALL,v 1.1 1999/05/09 20:01:56 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2000/06/28 07:08:31 brad Exp $
 #
 # squid de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=/etc/squid/squid.conf
+CONFIG_FILE=${SYSCONFDIR}/squid.conf
 
 if [ -f ${CONFIG_FILE} ]; then
     echo
@@ -13,9 +12,9 @@ if [ -f ${CONFIG_FILE} ]; then
     echo "| To completely deinstall the $1 package you need to perform"
     echo "| these steps as root:"
     echo "|"
-    echo "|           rm -rf /etc/squid"
-    echo "|           rm -rf /usr/local/share/squid"
-    echo "|           rm -rf /var/squid"
+    echo "|           rm -rf ${SYSCONFDIR}"
+    echo "|           rm -rf ${PREFIX}/share/squid"
+    echo "|           rm -rf ${STATEDIR}"
     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 3aaf2c3a073..9ee1c4e195f 100644
--- a/www/squid/pkg/DESCR
+++ b/www/squid/pkg/DESCR
@@ -1,5 +1,5 @@
-SQUID Internet Object Cache:  ${HOMEPAGE}
---------------------------------------------------------
+                SQUID Internet Object Cache
+  -------------------------------------------------------
 
   Squid is the result of efforts by numerous individuals from the
   Internet community.  Development is led by Duane Wessels of the
@@ -29,3 +29,5 @@ Please use our mailing lists for questions, feedback and bug fixes
         squid-users@ircache.net	# general questions, pubilc forum
         squid-bugs@ircache.net	# bugs and fixes
         squid@ircache.net	# other feedback
+
+WWW: ${HOMEPAGE}
diff --git a/www/squid/pkg/INSTALL b/www/squid/pkg/INSTALL
index f347907f277..abb90111e5a 100644
--- a/www/squid/pkg/INSTALL
+++ b/www/squid/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.1 1999/05/09 20:01:57 brad Exp $
+# $OpenBSD: INSTALL,v 1.2 2000/06/28 07:08:32 brad Exp $
 #
 # Pre/post-installation setup of squid
 
@@ -7,16 +7,15 @@
 #
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_FILE=/etc/squid/squid.conf
+CONFIG_FILE=${SYSCONFDIR}/squid.conf
 
-mkdir -p /etc/squid
-mkdir -p /usr/local/share/squid/icons
-mkdir -p /usr/local/share/squid/errors
-install -d -o www -g www /var/squid
-install -d -o www -g www /var/squid/logs
-install -d -o www -g www /var/squid/cache
-ln -sf /var/squid/logs/squid.pid /var/run/squid.pid
+install -d -o root -g wheel ${SYSCONFDIR}
+install -d -o root -g wheel ${PREFIX}/share/squid/icons
+install -d -o root -g wheel ${PREFIX}/share/squid/errors
+install -d -o www -g www ${STATEDIR}
+install -d -o www -g www ${STATEDIR}/logs
+install -d -o www -g www ${STATEDIR}/cache
+ln -sf ${STATEDIR}/logs/squid.pid /var/run/squid.pid
 
 # Function: tell the user what s/he needs to do to use the port just installed
 #
@@ -35,11 +34,11 @@ do_notice_conf()
 #
 do_install_conf()
 {
-    cp ${PREFIX}/lib/squid/conf/squid.conf.sample /etc/squid/squid.conf
-    cp ${PREFIX}/lib/squid/conf/mime.conf.sample /etc/squid/mime.conf
-    cp ${PREFIX}/lib/squid/conf/mib.txt.sample /etc/squid/mib.txt
-    cp -R ${PREFIX}/lib/squid/errors/* /usr/local/share/squid/errors
-    cp -R ${PREFIX}/lib/squid/icons/* /usr/local/share/squid/icons
+    install -o root -g wheel ${PREFIX}/lib/squid/conf/squid.conf.sample /etc/squid/squid.conf
+    install -o root -g wheel ${PREFIX}/lib/squid/conf/mime.conf.sample /etc/squid/mime.conf
+    install -o root -g wheel ${PREFIX}/lib/squid/conf/mib.txt.sample /etc/squid/mib.txt
+    cp -R ${PREFIX}/lib/squid/errors/* ${PREFIX}/share/squid/errors
+    cp -R ${PREFIX}/lib/squid/icons/* ${PREFIX}/share/squid/icons
     echo
     echo "+---------------"
     echo "| The $1 configuration files have been installed in /etc/squid."
diff --git a/www/squid/pkg/MESSAGE b/www/squid/pkg/MESSAGE
index 5614540d9e7..ecc0b607da9 100644
--- a/www/squid/pkg/MESSAGE
+++ b/www/squid/pkg/MESSAGE
@@ -1,9 +1,8 @@
-NOTES ON OpenBSD POST-INSTALLATION OF SQUID 2.2.RELEASE
--------------------------------------------------------
+NOTES ON OpenBSD POST-INSTALLATION OF SQUID 2.3
+-----------------------------------------------
 
- ** An old squid.conf will not work with squid 2.2! **
+ ** An old squid.conf will not work with squid 2.3! **
 
-Documentation on Squid is available at http://squid.nlanr.net/
 The local (OpenBSD) differences are:
 - configuration files are in		${SYSCONFDIR}
 - sample configuration files are in	${PREFIX}/lib/squid/conf
@@ -19,8 +18,6 @@ Please remember to initialize the cache by running "squid -z" before
 trying to run squid for the first time.
 
 You can also edit /etc/rc.local so that Squid is started automatically:
-    if [ -x /usr/local/bin/squid ]; then
-	echo -n ' squid';	/usr/local/bin/squid &
+    if [ -x ${PREFIX}/bin/squid ]; then
+	echo -n ' squid';	${PREFIX}/bin/squid &
     fi
-
-Happy caching!
diff --git a/www/squid/pkg/PLIST b/www/squid/pkg/PLIST
index 37065333772..1818cecabe3 100644
--- a/www/squid/pkg/PLIST
+++ b/www/squid/pkg/PLIST
@@ -1,11 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.4 2000/06/09 20:21:41 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2000/06/28 07:08:32 brad Exp $
 bin/RunCache
 bin/RunAccel
-bin/squid
 bin/client
+bin/squid
+libexec/cachemgr.cgi
 libexec/dnsserver
 libexec/unlinkd
-libexec/cachemgr.cgi
 lib/squid/conf/mib.txt.sample
 lib/squid/conf/squid.conf.sample
 lib/squid/conf/mime.conf.sample
@@ -32,6 +32,7 @@ lib/squid/errors/ERR_ONLY_IF_CACHED_MISS
 lib/squid/errors/ERR_READ_ERROR
 lib/squid/errors/ERR_READ_TIMEOUT
 lib/squid/errors/ERR_SHUTTING_DOWN
+lib/squid/errors/ERR_TOO_BIG
 lib/squid/errors/ERR_SOCKET_FAILURE
 lib/squid/errors/ERR_UNSUP_REQ
 lib/squid/errors/ERR_URN_RESOLVE