27 files changed, 252 insertions, 189 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 81a94a08d5b4..a089411cfcc2 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta22
+# Version required:	2.0.RELEASE
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.50 1998/04/26 07:57:20 peter Exp $
+# $Id: Makefile,v 1.51 1998/06/09 15:08:06 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta22
-PKGNAME=	squid-1.2b22
+DISTNAME=	squid-2.0.RELEASE
+PKGNAME=	squid-2.0
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.2.beta/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.2.beta/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
+	ftp://squid.nlanr.net/pub/squid-2/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
 #PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
@@ -21,7 +21,7 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b22
+DIST_SUBDIR=	squid2.0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -35,26 +35,26 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
-#  - Use tree function to store ACL lists
-#CONFIGURE_ARGS+= --enable-splaytree
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
+#  - Enable CARP support
+#CONFIGURE_ARGS+= --enable-carp
 #  - Use ASYNC disk I/O (Requires real pthreads)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay hack to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable delay pools to limit bandwidth usage
+#CONFIGURE_ARGS+= --enable-delay-pools
 #  - Enable generic memory use tracing
 #CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent
+#CONFIGURE_ARGS+= --enable-kill-parent-hack
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
@@ -64,6 +64,19 @@ NO_LATEST_LINK=	yes
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
+#  - Enable HTCP protocol
+#CONFIGURE_ARGS+= --enable-htcp
+#  - Enable Forw/Via database
+#CONFIGURE_ARGS+= --enable-forw-via-db
+#  - Use Cache Digests - see http://squid.nlanr.net/Squid/FAQ/FAQ-16.html
+#CONFIGURE_ARGS+= --enable-cache-digests
+#  - Select language for Error pages (see errors dir)
+#CONFIGURE_ARGS+= --enable-err-language=lang
+#  (--enable-poll is not needed, it's detected correctly on 3.0)
+#  - Strict HTTP compliance
+#CONFIGURE_ARGS+= --disable-http-violations
+#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#CONFIGURE_ARGS+= --enable-ipf-transparent
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
diff --git a/www/squid/distinfo b/www/squid/distinfo
index b5e5279382c8..44d58de82429 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1 +1 @@
-MD5 (squid1.2b22/squid-1.2.beta22-src.tar.gz) = 544edd19c6f1f396c6e6b3f8f846eec1
+MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
diff --git a/www/squid/pkg-descr b/www/squid/pkg-descr
index 63aed7c3c1ff..bf7cae7f22f6 100644
--- a/www/squid/pkg-descr
+++ b/www/squid/pkg-descr
@@ -1,9 +1,3 @@
-		******** WARNING *********
-		THIS IS BETA SOFTWARE!!!!!
-		**************************
-DO NOT USE THIS UNLESS YOU ARE PREPARED TO DEAL WITH SERVER
-CRASHES AND THINGS LIKE LOG/INDEX FORMAT CHANGES!!
-
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
diff --git a/www/squid22/Makefile b/www/squid22/Makefile
index 81a94a08d5b4..a089411cfcc2 100644
--- a/www/squid22/Makefile
+++ b/www/squid22/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta22
+# Version required:	2.0.RELEASE
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.50 1998/04/26 07:57:20 peter Exp $
+# $Id: Makefile,v 1.51 1998/06/09 15:08:06 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta22
-PKGNAME=	squid-1.2b22
+DISTNAME=	squid-2.0.RELEASE
+PKGNAME=	squid-2.0
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.2.beta/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.2.beta/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
+	ftp://squid.nlanr.net/pub/squid-2/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
 #PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
@@ -21,7 +21,7 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b22
+DIST_SUBDIR=	squid2.0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -35,26 +35,26 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
-#  - Use tree function to store ACL lists
-#CONFIGURE_ARGS+= --enable-splaytree
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
+#  - Enable CARP support
+#CONFIGURE_ARGS+= --enable-carp
 #  - Use ASYNC disk I/O (Requires real pthreads)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay hack to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable delay pools to limit bandwidth usage
+#CONFIGURE_ARGS+= --enable-delay-pools
 #  - Enable generic memory use tracing
 #CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent
+#CONFIGURE_ARGS+= --enable-kill-parent-hack
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
@@ -64,6 +64,19 @@ NO_LATEST_LINK=	yes
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
+#  - Enable HTCP protocol
+#CONFIGURE_ARGS+= --enable-htcp
+#  - Enable Forw/Via database
+#CONFIGURE_ARGS+= --enable-forw-via-db
+#  - Use Cache Digests - see http://squid.nlanr.net/Squid/FAQ/FAQ-16.html
+#CONFIGURE_ARGS+= --enable-cache-digests
+#  - Select language for Error pages (see errors dir)
+#CONFIGURE_ARGS+= --enable-err-language=lang
+#  (--enable-poll is not needed, it's detected correctly on 3.0)
+#  - Strict HTTP compliance
+#CONFIGURE_ARGS+= --disable-http-violations
+#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#CONFIGURE_ARGS+= --enable-ipf-transparent
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
diff --git a/www/squid22/distinfo b/www/squid22/distinfo
index b5e5279382c8..44d58de82429 100644
--- a/www/squid22/distinfo
+++ b/www/squid22/distinfo
@@ -1 +1 @@
-MD5 (squid1.2b22/squid-1.2.beta22-src.tar.gz) = 544edd19c6f1f396c6e6b3f8f846eec1
+MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
diff --git a/www/squid22/pkg-descr b/www/squid22/pkg-descr
index 63aed7c3c1ff..bf7cae7f22f6 100644
--- a/www/squid22/pkg-descr
+++ b/www/squid22/pkg-descr
@@ -1,9 +1,3 @@
-		******** WARNING *********
-		THIS IS BETA SOFTWARE!!!!!
-		**************************
-DO NOT USE THIS UNLESS YOU ARE PREPARED TO DEAL WITH SERVER
-CRASHES AND THINGS LIKE LOG/INDEX FORMAT CHANGES!!
-
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
diff --git a/www/squid23/Makefile b/www/squid23/Makefile
index 81a94a08d5b4..a089411cfcc2 100644
--- a/www/squid23/Makefile
+++ b/www/squid23/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta22
+# Version required:	2.0.RELEASE
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.50 1998/04/26 07:57:20 peter Exp $
+# $Id: Makefile,v 1.51 1998/06/09 15:08:06 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta22
-PKGNAME=	squid-1.2b22
+DISTNAME=	squid-2.0.RELEASE
+PKGNAME=	squid-2.0
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.2.beta/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.2.beta/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
+	ftp://squid.nlanr.net/pub/squid-2/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
 #PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
@@ -21,7 +21,7 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b22
+DIST_SUBDIR=	squid2.0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -35,26 +35,26 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
-#  - Use tree function to store ACL lists
-#CONFIGURE_ARGS+= --enable-splaytree
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
+#  - Enable CARP support
+#CONFIGURE_ARGS+= --enable-carp
 #  - Use ASYNC disk I/O (Requires real pthreads)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay hack to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable delay pools to limit bandwidth usage
+#CONFIGURE_ARGS+= --enable-delay-pools
 #  - Enable generic memory use tracing
 #CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent
+#CONFIGURE_ARGS+= --enable-kill-parent-hack
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
@@ -64,6 +64,19 @@ NO_LATEST_LINK=	yes
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
+#  - Enable HTCP protocol
+#CONFIGURE_ARGS+= --enable-htcp
+#  - Enable Forw/Via database
+#CONFIGURE_ARGS+= --enable-forw-via-db
+#  - Use Cache Digests - see http://squid.nlanr.net/Squid/FAQ/FAQ-16.html
+#CONFIGURE_ARGS+= --enable-cache-digests
+#  - Select language for Error pages (see errors dir)
+#CONFIGURE_ARGS+= --enable-err-language=lang
+#  (--enable-poll is not needed, it's detected correctly on 3.0)
+#  - Strict HTTP compliance
+#CONFIGURE_ARGS+= --disable-http-violations
+#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#CONFIGURE_ARGS+= --enable-ipf-transparent
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
diff --git a/www/squid23/distinfo b/www/squid23/distinfo
index b5e5279382c8..44d58de82429 100644
--- a/www/squid23/distinfo
+++ b/www/squid23/distinfo
@@ -1 +1 @@
-MD5 (squid1.2b22/squid-1.2.beta22-src.tar.gz) = 544edd19c6f1f396c6e6b3f8f846eec1
+MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
diff --git a/www/squid23/pkg-descr b/www/squid23/pkg-descr
index 63aed7c3c1ff..bf7cae7f22f6 100644
--- a/www/squid23/pkg-descr
+++ b/www/squid23/pkg-descr
@@ -1,9 +1,3 @@
-		******** WARNING *********
-		THIS IS BETA SOFTWARE!!!!!
-		**************************
-DO NOT USE THIS UNLESS YOU ARE PREPARED TO DEAL WITH SERVER
-CRASHES AND THINGS LIKE LOG/INDEX FORMAT CHANGES!!
-
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index 81a94a08d5b4..a089411cfcc2 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta22
+# Version required:	2.0.RELEASE
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.50 1998/04/26 07:57:20 peter Exp $
+# $Id: Makefile,v 1.51 1998/06/09 15:08:06 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta22
-PKGNAME=	squid-1.2b22
+DISTNAME=	squid-2.0.RELEASE
+PKGNAME=	squid-2.0
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.2.beta/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.2.beta/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
+	ftp://squid.nlanr.net/pub/squid-2/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
 #PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
@@ -21,7 +21,7 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b22
+DIST_SUBDIR=	squid2.0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -35,26 +35,26 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
-#  - Use tree function to store ACL lists
-#CONFIGURE_ARGS+= --enable-splaytree
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
+#  - Enable CARP support
+#CONFIGURE_ARGS+= --enable-carp
 #  - Use ASYNC disk I/O (Requires real pthreads)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay hack to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable delay pools to limit bandwidth usage
+#CONFIGURE_ARGS+= --enable-delay-pools
 #  - Enable generic memory use tracing
 #CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent
+#CONFIGURE_ARGS+= --enable-kill-parent-hack
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
@@ -64,6 +64,19 @@ NO_LATEST_LINK=	yes
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
+#  - Enable HTCP protocol
+#CONFIGURE_ARGS+= --enable-htcp
+#  - Enable Forw/Via database
+#CONFIGURE_ARGS+= --enable-forw-via-db
+#  - Use Cache Digests - see http://squid.nlanr.net/Squid/FAQ/FAQ-16.html
+#CONFIGURE_ARGS+= --enable-cache-digests
+#  - Select language for Error pages (see errors dir)
+#CONFIGURE_ARGS+= --enable-err-language=lang
+#  (--enable-poll is not needed, it's detected correctly on 3.0)
+#  - Strict HTTP compliance
+#CONFIGURE_ARGS+= --disable-http-violations
+#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#CONFIGURE_ARGS+= --enable-ipf-transparent
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
diff --git a/www/squid24/distinfo b/www/squid24/distinfo
index b5e5279382c8..44d58de82429 100644
--- a/www/squid24/distinfo
+++ b/www/squid24/distinfo
@@ -1 +1 @@
-MD5 (squid1.2b22/squid-1.2.beta22-src.tar.gz) = 544edd19c6f1f396c6e6b3f8f846eec1
+MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
diff --git a/www/squid24/pkg-descr b/www/squid24/pkg-descr
index 63aed7c3c1ff..bf7cae7f22f6 100644
--- a/www/squid24/pkg-descr
+++ b/www/squid24/pkg-descr
@@ -1,9 +1,3 @@
-		******** WARNING *********
-		THIS IS BETA SOFTWARE!!!!!
-		**************************
-DO NOT USE THIS UNLESS YOU ARE PREPARED TO DEAL WITH SERVER
-CRASHES AND THINGS LIKE LOG/INDEX FORMAT CHANGES!!
-
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 81a94a08d5b4..a089411cfcc2 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta22
+# Version required:	2.0.RELEASE
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.50 1998/04/26 07:57:20 peter Exp $
+# $Id: Makefile,v 1.51 1998/06/09 15:08:06 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta22
-PKGNAME=	squid-1.2b22
+DISTNAME=	squid-2.0.RELEASE
+PKGNAME=	squid-2.0
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.2.beta/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.2.beta/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
+	ftp://squid.nlanr.net/pub/squid-2/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
 #PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
@@ -21,7 +21,7 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b22
+DIST_SUBDIR=	squid2.0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -35,26 +35,26 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
-#  - Use tree function to store ACL lists
-#CONFIGURE_ARGS+= --enable-splaytree
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
+#  - Enable CARP support
+#CONFIGURE_ARGS+= --enable-carp
 #  - Use ASYNC disk I/O (Requires real pthreads)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay hack to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable delay pools to limit bandwidth usage
+#CONFIGURE_ARGS+= --enable-delay-pools
 #  - Enable generic memory use tracing
 #CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent
+#CONFIGURE_ARGS+= --enable-kill-parent-hack
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
@@ -64,6 +64,19 @@ NO_LATEST_LINK=	yes
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
+#  - Enable HTCP protocol
+#CONFIGURE_ARGS+= --enable-htcp
+#  - Enable Forw/Via database
+#CONFIGURE_ARGS+= --enable-forw-via-db
+#  - Use Cache Digests - see http://squid.nlanr.net/Squid/FAQ/FAQ-16.html
+#CONFIGURE_ARGS+= --enable-cache-digests
+#  - Select language for Error pages (see errors dir)
+#CONFIGURE_ARGS+= --enable-err-language=lang
+#  (--enable-poll is not needed, it's detected correctly on 3.0)
+#  - Strict HTTP compliance
+#CONFIGURE_ARGS+= --disable-http-violations
+#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#CONFIGURE_ARGS+= --enable-ipf-transparent
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index b5e5279382c8..44d58de82429 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -1 +1 @@
-MD5 (squid1.2b22/squid-1.2.beta22-src.tar.gz) = 544edd19c6f1f396c6e6b3f8f846eec1
+MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
diff --git a/www/squid25/pkg-descr b/www/squid25/pkg-descr
index 63aed7c3c1ff..bf7cae7f22f6 100644
--- a/www/squid25/pkg-descr
+++ b/www/squid25/pkg-descr
@@ -1,9 +1,3 @@
-		******** WARNING *********
-		THIS IS BETA SOFTWARE!!!!!
-		**************************
-DO NOT USE THIS UNLESS YOU ARE PREPARED TO DEAL WITH SERVER
-CRASHES AND THINGS LIKE LOG/INDEX FORMAT CHANGES!!
-
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 81a94a08d5b4..a089411cfcc2 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta22
+# Version required:	2.0.RELEASE
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.50 1998/04/26 07:57:20 peter Exp $
+# $Id: Makefile,v 1.51 1998/06/09 15:08:06 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta22
-PKGNAME=	squid-1.2b22
+DISTNAME=	squid-2.0.RELEASE
+PKGNAME=	squid-2.0
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.2.beta/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.2.beta/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
+	ftp://squid.nlanr.net/pub/squid-2/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
 #PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
@@ -21,7 +21,7 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b22
+DIST_SUBDIR=	squid2.0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -35,26 +35,26 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
-#  - Use tree function to store ACL lists
-#CONFIGURE_ARGS+= --enable-splaytree
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
+#  - Enable CARP support
+#CONFIGURE_ARGS+= --enable-carp
 #  - Use ASYNC disk I/O (Requires real pthreads)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay hack to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable delay pools to limit bandwidth usage
+#CONFIGURE_ARGS+= --enable-delay-pools
 #  - Enable generic memory use tracing
 #CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent
+#CONFIGURE_ARGS+= --enable-kill-parent-hack
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
@@ -64,6 +64,19 @@ NO_LATEST_LINK=	yes
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
+#  - Enable HTCP protocol
+#CONFIGURE_ARGS+= --enable-htcp
+#  - Enable Forw/Via database
+#CONFIGURE_ARGS+= --enable-forw-via-db
+#  - Use Cache Digests - see http://squid.nlanr.net/Squid/FAQ/FAQ-16.html
+#CONFIGURE_ARGS+= --enable-cache-digests
+#  - Select language for Error pages (see errors dir)
+#CONFIGURE_ARGS+= --enable-err-language=lang
+#  (--enable-poll is not needed, it's detected correctly on 3.0)
+#  - Strict HTTP compliance
+#CONFIGURE_ARGS+= --disable-http-violations
+#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#CONFIGURE_ARGS+= --enable-ipf-transparent
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index b5e5279382c8..44d58de82429 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -1 +1 @@
-MD5 (squid1.2b22/squid-1.2.beta22-src.tar.gz) = 544edd19c6f1f396c6e6b3f8f846eec1
+MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
diff --git a/www/squid26/pkg-descr b/www/squid26/pkg-descr
index 63aed7c3c1ff..bf7cae7f22f6 100644
--- a/www/squid26/pkg-descr
+++ b/www/squid26/pkg-descr
@@ -1,9 +1,3 @@
-		******** WARNING *********
-		THIS IS BETA SOFTWARE!!!!!
-		**************************
-DO NOT USE THIS UNLESS YOU ARE PREPARED TO DEAL WITH SERVER
-CRASHES AND THINGS LIKE LOG/INDEX FORMAT CHANGES!!
-
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 81a94a08d5b4..a089411cfcc2 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta22
+# Version required:	2.0.RELEASE
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.50 1998/04/26 07:57:20 peter Exp $
+# $Id: Makefile,v 1.51 1998/06/09 15:08:06 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta22
-PKGNAME=	squid-1.2b22
+DISTNAME=	squid-2.0.RELEASE
+PKGNAME=	squid-2.0
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.2.beta/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.2.beta/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
+	ftp://squid.nlanr.net/pub/squid-2/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
 #PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
@@ -21,7 +21,7 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b22
+DIST_SUBDIR=	squid2.0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -35,26 +35,26 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
-#  - Use tree function to store ACL lists
-#CONFIGURE_ARGS+= --enable-splaytree
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
+#  - Enable CARP support
+#CONFIGURE_ARGS+= --enable-carp
 #  - Use ASYNC disk I/O (Requires real pthreads)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay hack to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable delay pools to limit bandwidth usage
+#CONFIGURE_ARGS+= --enable-delay-pools
 #  - Enable generic memory use tracing
 #CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent
+#CONFIGURE_ARGS+= --enable-kill-parent-hack
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
@@ -64,6 +64,19 @@ NO_LATEST_LINK=	yes
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
+#  - Enable HTCP protocol
+#CONFIGURE_ARGS+= --enable-htcp
+#  - Enable Forw/Via database
+#CONFIGURE_ARGS+= --enable-forw-via-db
+#  - Use Cache Digests - see http://squid.nlanr.net/Squid/FAQ/FAQ-16.html
+#CONFIGURE_ARGS+= --enable-cache-digests
+#  - Select language for Error pages (see errors dir)
+#CONFIGURE_ARGS+= --enable-err-language=lang
+#  (--enable-poll is not needed, it's detected correctly on 3.0)
+#  - Strict HTTP compliance
+#CONFIGURE_ARGS+= --disable-http-violations
+#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#CONFIGURE_ARGS+= --enable-ipf-transparent
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index b5e5279382c8..44d58de82429 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -1 +1 @@
-MD5 (squid1.2b22/squid-1.2.beta22-src.tar.gz) = 544edd19c6f1f396c6e6b3f8f846eec1
+MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
diff --git a/www/squid27/pkg-descr b/www/squid27/pkg-descr
index 63aed7c3c1ff..bf7cae7f22f6 100644
--- a/www/squid27/pkg-descr
+++ b/www/squid27/pkg-descr
@@ -1,9 +1,3 @@
-		******** WARNING *********
-		THIS IS BETA SOFTWARE!!!!!
-		**************************
-DO NOT USE THIS UNLESS YOU ARE PREPARED TO DEAL WITH SERVER
-CRASHES AND THINGS LIKE LOG/INDEX FORMAT CHANGES!!
-
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 81a94a08d5b4..a089411cfcc2 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta22
+# Version required:	2.0.RELEASE
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.50 1998/04/26 07:57:20 peter Exp $
+# $Id: Makefile,v 1.51 1998/06/09 15:08:06 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta22
-PKGNAME=	squid-1.2b22
+DISTNAME=	squid-2.0.RELEASE
+PKGNAME=	squid-2.0
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.2.beta/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.2.beta/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
+	ftp://squid.nlanr.net/pub/squid-2/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
 #PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
@@ -21,7 +21,7 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b22
+DIST_SUBDIR=	squid2.0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -35,26 +35,26 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
-#  - Use tree function to store ACL lists
-#CONFIGURE_ARGS+= --enable-splaytree
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
+#  - Enable CARP support
+#CONFIGURE_ARGS+= --enable-carp
 #  - Use ASYNC disk I/O (Requires real pthreads)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay hack to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable delay pools to limit bandwidth usage
+#CONFIGURE_ARGS+= --enable-delay-pools
 #  - Enable generic memory use tracing
 #CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent
+#CONFIGURE_ARGS+= --enable-kill-parent-hack
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
@@ -64,6 +64,19 @@ NO_LATEST_LINK=	yes
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
+#  - Enable HTCP protocol
+#CONFIGURE_ARGS+= --enable-htcp
+#  - Enable Forw/Via database
+#CONFIGURE_ARGS+= --enable-forw-via-db
+#  - Use Cache Digests - see http://squid.nlanr.net/Squid/FAQ/FAQ-16.html
+#CONFIGURE_ARGS+= --enable-cache-digests
+#  - Select language for Error pages (see errors dir)
+#CONFIGURE_ARGS+= --enable-err-language=lang
+#  (--enable-poll is not needed, it's detected correctly on 3.0)
+#  - Strict HTTP compliance
+#CONFIGURE_ARGS+= --disable-http-violations
+#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#CONFIGURE_ARGS+= --enable-ipf-transparent
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index b5e5279382c8..44d58de82429 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1 +1 @@
-MD5 (squid1.2b22/squid-1.2.beta22-src.tar.gz) = 544edd19c6f1f396c6e6b3f8f846eec1
+MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
diff --git a/www/squid30/pkg-descr b/www/squid30/pkg-descr
index 63aed7c3c1ff..bf7cae7f22f6 100644
--- a/www/squid30/pkg-descr
+++ b/www/squid30/pkg-descr
@@ -1,9 +1,3 @@
-		******** WARNING *********
-		THIS IS BETA SOFTWARE!!!!!
-		**************************
-DO NOT USE THIS UNLESS YOU ARE PREPARED TO DEAL WITH SERVER
-CRASHES AND THINGS LIKE LOG/INDEX FORMAT CHANGES!!
-
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 81a94a08d5b4..a089411cfcc2 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta22
+# Version required:	2.0.RELEASE
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.50 1998/04/26 07:57:20 peter Exp $
+# $Id: Makefile,v 1.51 1998/06/09 15:08:06 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta22
-PKGNAME=	squid-1.2b22
+DISTNAME=	squid-2.0.RELEASE
+PKGNAME=	squid-2.0
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.2.beta/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.2.beta/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
+	ftp://squid.nlanr.net/pub/squid-2/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
 #PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
@@ -21,7 +21,7 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b22
+DIST_SUBDIR=	squid2.0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -35,26 +35,26 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
-#  - Use tree function to store ACL lists
-#CONFIGURE_ARGS+= --enable-splaytree
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
+#  - Enable CARP support
+#CONFIGURE_ARGS+= --enable-carp
 #  - Use ASYNC disk I/O (Requires real pthreads)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
-#  - Enable delay hack to limit bandwidth usage
-#CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable delay pools to limit bandwidth usage
+#CONFIGURE_ARGS+= --enable-delay-pools
 #  - Enable generic memory use tracing
 #CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
-#CONFIGURE_ARGS+= --enable-kill-parent
+#CONFIGURE_ARGS+= --enable-kill-parent-hack
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
@@ -64,6 +64,19 @@ NO_LATEST_LINK=	yes
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
+#  - Enable HTCP protocol
+#CONFIGURE_ARGS+= --enable-htcp
+#  - Enable Forw/Via database
+#CONFIGURE_ARGS+= --enable-forw-via-db
+#  - Use Cache Digests - see http://squid.nlanr.net/Squid/FAQ/FAQ-16.html
+#CONFIGURE_ARGS+= --enable-cache-digests
+#  - Select language for Error pages (see errors dir)
+#CONFIGURE_ARGS+= --enable-err-language=lang
+#  (--enable-poll is not needed, it's detected correctly on 3.0)
+#  - Strict HTTP compliance
+#CONFIGURE_ARGS+= --disable-http-violations
+#  - Enable Transparent Proxy support for IP-Filter systems (incl 3.0)
+#CONFIGURE_ARGS+= --enable-ipf-transparent
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index b5e5279382c8..44d58de82429 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1 +1 @@
-MD5 (squid1.2b22/squid-1.2.beta22-src.tar.gz) = 544edd19c6f1f396c6e6b3f8f846eec1
+MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
diff --git a/www/squid31/pkg-descr b/www/squid31/pkg-descr
index 63aed7c3c1ff..bf7cae7f22f6 100644
--- a/www/squid31/pkg-descr
+++ b/www/squid31/pkg-descr
@@ -1,9 +1,3 @@
-		******** WARNING *********
-		THIS IS BETA SOFTWARE!!!!!
-		**************************
-DO NOT USE THIS UNLESS YOU ARE PREPARED TO DEAL WITH SERVER
-CRASHES AND THINGS LIKE LOG/INDEX FORMAT CHANGES!!
-
 This is the Squid Internet Object Cache developed by the National
 Laboratory for Applied Networking Research (NLANR) and Internet
 volunteers.  This software is freely available for anyone to use.