18 files changed, 99 insertions, 144 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 4ac73c30cb66..bc974536e7e0 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	2.0.RELEASE
+# Version required:	2.1.PATCH2
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.52 1998/10/06 00:19:50 peter Exp $
+# $Id: Makefile,v 1.53 1998/10/19 12:12:45 peter Exp $
 #
 
-DISTNAME=	squid-2.0.RELEASE
-PKGNAME=	squid-2.0
+DISTNAME=	squid-2.1.PATCH2
+PKGNAME=	squid-2.1
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-2/ \
@@ -16,14 +16,13 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	diff-2.0.RELEASE-2.0.PATCH1.gz \
-		diff-2.0.PATCH1-2.0.PATCH2.gz
+PATCH_SITES=	http://squid.nlanr.net/Squid/v2/2.1/
+PATCHFILES=	squid-2.1.PATCH2-clientHandleIMSReply-leak.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid2.0
-PATCH_DIST_STRIP= -p1
+DIST_SUBDIR=	squid2.1
+PATCH_DIST_STRIP= -p0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -45,7 +44,7 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Enable CARP support
 #CONFIGURE_ARGS+= --enable-carp
-#  - Use ASYNC disk I/O (Requires real pthreads)
+#  - Use ASYNC disk I/O (Requires real threads, apparently runs on 3.0 libc_r)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
@@ -104,6 +103,3 @@ post-install:
 	fi
 
 .include <bsd.port.mk>
-
-# Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
-PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 1cb1be10928f..ec5e43f0d529 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,3 +1,2 @@
-MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
-MD5 (squid2.0/diff-2.0.RELEASE-2.0.PATCH1.gz) = 959a410616b3604b384ad3522e4d6c28
-MD5 (squid2.0/diff-2.0.PATCH1-2.0.PATCH2.gz) = 8bd597ab342ec5db7d14dae88a52798c
+MD5 (squid2.1/squid-2.1.PATCH2-src.tar.gz) = 71c6b2437e562224d43dcde5765001f8
+MD5 (squid2.1/squid-2.1.PATCH2-clientHandleIMSReply-leak.patch) = c5416dc4a2c0fa09a27790b575a19d9c
diff --git a/www/squid22/Makefile b/www/squid22/Makefile
index 4ac73c30cb66..bc974536e7e0 100644
--- a/www/squid22/Makefile
+++ b/www/squid22/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	2.0.RELEASE
+# Version required:	2.1.PATCH2
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.52 1998/10/06 00:19:50 peter Exp $
+# $Id: Makefile,v 1.53 1998/10/19 12:12:45 peter Exp $
 #
 
-DISTNAME=	squid-2.0.RELEASE
-PKGNAME=	squid-2.0
+DISTNAME=	squid-2.1.PATCH2
+PKGNAME=	squid-2.1
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-2/ \
@@ -16,14 +16,13 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	diff-2.0.RELEASE-2.0.PATCH1.gz \
-		diff-2.0.PATCH1-2.0.PATCH2.gz
+PATCH_SITES=	http://squid.nlanr.net/Squid/v2/2.1/
+PATCHFILES=	squid-2.1.PATCH2-clientHandleIMSReply-leak.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid2.0
-PATCH_DIST_STRIP= -p1
+DIST_SUBDIR=	squid2.1
+PATCH_DIST_STRIP= -p0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -45,7 +44,7 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Enable CARP support
 #CONFIGURE_ARGS+= --enable-carp
-#  - Use ASYNC disk I/O (Requires real pthreads)
+#  - Use ASYNC disk I/O (Requires real threads, apparently runs on 3.0 libc_r)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
@@ -104,6 +103,3 @@ post-install:
 	fi
 
 .include <bsd.port.mk>
-
-# Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
-PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}
diff --git a/www/squid22/distinfo b/www/squid22/distinfo
index 1cb1be10928f..ec5e43f0d529 100644
--- a/www/squid22/distinfo
+++ b/www/squid22/distinfo
@@ -1,3 +1,2 @@
-MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
-MD5 (squid2.0/diff-2.0.RELEASE-2.0.PATCH1.gz) = 959a410616b3604b384ad3522e4d6c28
-MD5 (squid2.0/diff-2.0.PATCH1-2.0.PATCH2.gz) = 8bd597ab342ec5db7d14dae88a52798c
+MD5 (squid2.1/squid-2.1.PATCH2-src.tar.gz) = 71c6b2437e562224d43dcde5765001f8
+MD5 (squid2.1/squid-2.1.PATCH2-clientHandleIMSReply-leak.patch) = c5416dc4a2c0fa09a27790b575a19d9c
diff --git a/www/squid23/Makefile b/www/squid23/Makefile
index 4ac73c30cb66..bc974536e7e0 100644
--- a/www/squid23/Makefile
+++ b/www/squid23/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	2.0.RELEASE
+# Version required:	2.1.PATCH2
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.52 1998/10/06 00:19:50 peter Exp $
+# $Id: Makefile,v 1.53 1998/10/19 12:12:45 peter Exp $
 #
 
-DISTNAME=	squid-2.0.RELEASE
-PKGNAME=	squid-2.0
+DISTNAME=	squid-2.1.PATCH2
+PKGNAME=	squid-2.1
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-2/ \
@@ -16,14 +16,13 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	diff-2.0.RELEASE-2.0.PATCH1.gz \
-		diff-2.0.PATCH1-2.0.PATCH2.gz
+PATCH_SITES=	http://squid.nlanr.net/Squid/v2/2.1/
+PATCHFILES=	squid-2.1.PATCH2-clientHandleIMSReply-leak.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid2.0
-PATCH_DIST_STRIP= -p1
+DIST_SUBDIR=	squid2.1
+PATCH_DIST_STRIP= -p0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -45,7 +44,7 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Enable CARP support
 #CONFIGURE_ARGS+= --enable-carp
-#  - Use ASYNC disk I/O (Requires real pthreads)
+#  - Use ASYNC disk I/O (Requires real threads, apparently runs on 3.0 libc_r)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
@@ -104,6 +103,3 @@ post-install:
 	fi
 
 .include <bsd.port.mk>
-
-# Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
-PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}
diff --git a/www/squid23/distinfo b/www/squid23/distinfo
index 1cb1be10928f..ec5e43f0d529 100644
--- a/www/squid23/distinfo
+++ b/www/squid23/distinfo
@@ -1,3 +1,2 @@
-MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
-MD5 (squid2.0/diff-2.0.RELEASE-2.0.PATCH1.gz) = 959a410616b3604b384ad3522e4d6c28
-MD5 (squid2.0/diff-2.0.PATCH1-2.0.PATCH2.gz) = 8bd597ab342ec5db7d14dae88a52798c
+MD5 (squid2.1/squid-2.1.PATCH2-src.tar.gz) = 71c6b2437e562224d43dcde5765001f8
+MD5 (squid2.1/squid-2.1.PATCH2-clientHandleIMSReply-leak.patch) = c5416dc4a2c0fa09a27790b575a19d9c
diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index 4ac73c30cb66..bc974536e7e0 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	2.0.RELEASE
+# Version required:	2.1.PATCH2
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.52 1998/10/06 00:19:50 peter Exp $
+# $Id: Makefile,v 1.53 1998/10/19 12:12:45 peter Exp $
 #
 
-DISTNAME=	squid-2.0.RELEASE
-PKGNAME=	squid-2.0
+DISTNAME=	squid-2.1.PATCH2
+PKGNAME=	squid-2.1
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-2/ \
@@ -16,14 +16,13 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	diff-2.0.RELEASE-2.0.PATCH1.gz \
-		diff-2.0.PATCH1-2.0.PATCH2.gz
+PATCH_SITES=	http://squid.nlanr.net/Squid/v2/2.1/
+PATCHFILES=	squid-2.1.PATCH2-clientHandleIMSReply-leak.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid2.0
-PATCH_DIST_STRIP= -p1
+DIST_SUBDIR=	squid2.1
+PATCH_DIST_STRIP= -p0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -45,7 +44,7 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Enable CARP support
 #CONFIGURE_ARGS+= --enable-carp
-#  - Use ASYNC disk I/O (Requires real pthreads)
+#  - Use ASYNC disk I/O (Requires real threads, apparently runs on 3.0 libc_r)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
@@ -104,6 +103,3 @@ post-install:
 	fi
 
 .include <bsd.port.mk>
-
-# Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
-PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}
diff --git a/www/squid24/distinfo b/www/squid24/distinfo
index 1cb1be10928f..ec5e43f0d529 100644
--- a/www/squid24/distinfo
+++ b/www/squid24/distinfo
@@ -1,3 +1,2 @@
-MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
-MD5 (squid2.0/diff-2.0.RELEASE-2.0.PATCH1.gz) = 959a410616b3604b384ad3522e4d6c28
-MD5 (squid2.0/diff-2.0.PATCH1-2.0.PATCH2.gz) = 8bd597ab342ec5db7d14dae88a52798c
+MD5 (squid2.1/squid-2.1.PATCH2-src.tar.gz) = 71c6b2437e562224d43dcde5765001f8
+MD5 (squid2.1/squid-2.1.PATCH2-clientHandleIMSReply-leak.patch) = c5416dc4a2c0fa09a27790b575a19d9c
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 4ac73c30cb66..bc974536e7e0 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	2.0.RELEASE
+# Version required:	2.1.PATCH2
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.52 1998/10/06 00:19:50 peter Exp $
+# $Id: Makefile,v 1.53 1998/10/19 12:12:45 peter Exp $
 #
 
-DISTNAME=	squid-2.0.RELEASE
-PKGNAME=	squid-2.0
+DISTNAME=	squid-2.1.PATCH2
+PKGNAME=	squid-2.1
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-2/ \
@@ -16,14 +16,13 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	diff-2.0.RELEASE-2.0.PATCH1.gz \
-		diff-2.0.PATCH1-2.0.PATCH2.gz
+PATCH_SITES=	http://squid.nlanr.net/Squid/v2/2.1/
+PATCHFILES=	squid-2.1.PATCH2-clientHandleIMSReply-leak.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid2.0
-PATCH_DIST_STRIP= -p1
+DIST_SUBDIR=	squid2.1
+PATCH_DIST_STRIP= -p0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -45,7 +44,7 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Enable CARP support
 #CONFIGURE_ARGS+= --enable-carp
-#  - Use ASYNC disk I/O (Requires real pthreads)
+#  - Use ASYNC disk I/O (Requires real threads, apparently runs on 3.0 libc_r)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
@@ -104,6 +103,3 @@ post-install:
 	fi
 
 .include <bsd.port.mk>
-
-# Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
-PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index 1cb1be10928f..ec5e43f0d529 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -1,3 +1,2 @@
-MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
-MD5 (squid2.0/diff-2.0.RELEASE-2.0.PATCH1.gz) = 959a410616b3604b384ad3522e4d6c28
-MD5 (squid2.0/diff-2.0.PATCH1-2.0.PATCH2.gz) = 8bd597ab342ec5db7d14dae88a52798c
+MD5 (squid2.1/squid-2.1.PATCH2-src.tar.gz) = 71c6b2437e562224d43dcde5765001f8
+MD5 (squid2.1/squid-2.1.PATCH2-clientHandleIMSReply-leak.patch) = c5416dc4a2c0fa09a27790b575a19d9c
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 4ac73c30cb66..bc974536e7e0 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	2.0.RELEASE
+# Version required:	2.1.PATCH2
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.52 1998/10/06 00:19:50 peter Exp $
+# $Id: Makefile,v 1.53 1998/10/19 12:12:45 peter Exp $
 #
 
-DISTNAME=	squid-2.0.RELEASE
-PKGNAME=	squid-2.0
+DISTNAME=	squid-2.1.PATCH2
+PKGNAME=	squid-2.1
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-2/ \
@@ -16,14 +16,13 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	diff-2.0.RELEASE-2.0.PATCH1.gz \
-		diff-2.0.PATCH1-2.0.PATCH2.gz
+PATCH_SITES=	http://squid.nlanr.net/Squid/v2/2.1/
+PATCHFILES=	squid-2.1.PATCH2-clientHandleIMSReply-leak.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid2.0
-PATCH_DIST_STRIP= -p1
+DIST_SUBDIR=	squid2.1
+PATCH_DIST_STRIP= -p0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -45,7 +44,7 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Enable CARP support
 #CONFIGURE_ARGS+= --enable-carp
-#  - Use ASYNC disk I/O (Requires real pthreads)
+#  - Use ASYNC disk I/O (Requires real threads, apparently runs on 3.0 libc_r)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
@@ -104,6 +103,3 @@ post-install:
 	fi
 
 .include <bsd.port.mk>
-
-# Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
-PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index 1cb1be10928f..ec5e43f0d529 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -1,3 +1,2 @@
-MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
-MD5 (squid2.0/diff-2.0.RELEASE-2.0.PATCH1.gz) = 959a410616b3604b384ad3522e4d6c28
-MD5 (squid2.0/diff-2.0.PATCH1-2.0.PATCH2.gz) = 8bd597ab342ec5db7d14dae88a52798c
+MD5 (squid2.1/squid-2.1.PATCH2-src.tar.gz) = 71c6b2437e562224d43dcde5765001f8
+MD5 (squid2.1/squid-2.1.PATCH2-clientHandleIMSReply-leak.patch) = c5416dc4a2c0fa09a27790b575a19d9c
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 4ac73c30cb66..bc974536e7e0 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	2.0.RELEASE
+# Version required:	2.1.PATCH2
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.52 1998/10/06 00:19:50 peter Exp $
+# $Id: Makefile,v 1.53 1998/10/19 12:12:45 peter Exp $
 #
 
-DISTNAME=	squid-2.0.RELEASE
-PKGNAME=	squid-2.0
+DISTNAME=	squid-2.1.PATCH2
+PKGNAME=	squid-2.1
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-2/ \
@@ -16,14 +16,13 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	diff-2.0.RELEASE-2.0.PATCH1.gz \
-		diff-2.0.PATCH1-2.0.PATCH2.gz
+PATCH_SITES=	http://squid.nlanr.net/Squid/v2/2.1/
+PATCHFILES=	squid-2.1.PATCH2-clientHandleIMSReply-leak.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid2.0
-PATCH_DIST_STRIP= -p1
+DIST_SUBDIR=	squid2.1
+PATCH_DIST_STRIP= -p0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -45,7 +44,7 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Enable CARP support
 #CONFIGURE_ARGS+= --enable-carp
-#  - Use ASYNC disk I/O (Requires real pthreads)
+#  - Use ASYNC disk I/O (Requires real threads, apparently runs on 3.0 libc_r)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
@@ -104,6 +103,3 @@ post-install:
 	fi
 
 .include <bsd.port.mk>
-
-# Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
-PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 1cb1be10928f..ec5e43f0d529 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -1,3 +1,2 @@
-MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
-MD5 (squid2.0/diff-2.0.RELEASE-2.0.PATCH1.gz) = 959a410616b3604b384ad3522e4d6c28
-MD5 (squid2.0/diff-2.0.PATCH1-2.0.PATCH2.gz) = 8bd597ab342ec5db7d14dae88a52798c
+MD5 (squid2.1/squid-2.1.PATCH2-src.tar.gz) = 71c6b2437e562224d43dcde5765001f8
+MD5 (squid2.1/squid-2.1.PATCH2-clientHandleIMSReply-leak.patch) = c5416dc4a2c0fa09a27790b575a19d9c
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 4ac73c30cb66..bc974536e7e0 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	2.0.RELEASE
+# Version required:	2.1.PATCH2
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.52 1998/10/06 00:19:50 peter Exp $
+# $Id: Makefile,v 1.53 1998/10/19 12:12:45 peter Exp $
 #
 
-DISTNAME=	squid-2.0.RELEASE
-PKGNAME=	squid-2.0
+DISTNAME=	squid-2.1.PATCH2
+PKGNAME=	squid-2.1
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-2/ \
@@ -16,14 +16,13 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	diff-2.0.RELEASE-2.0.PATCH1.gz \
-		diff-2.0.PATCH1-2.0.PATCH2.gz
+PATCH_SITES=	http://squid.nlanr.net/Squid/v2/2.1/
+PATCHFILES=	squid-2.1.PATCH2-clientHandleIMSReply-leak.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid2.0
-PATCH_DIST_STRIP= -p1
+DIST_SUBDIR=	squid2.1
+PATCH_DIST_STRIP= -p0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -45,7 +44,7 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Enable CARP support
 #CONFIGURE_ARGS+= --enable-carp
-#  - Use ASYNC disk I/O (Requires real pthreads)
+#  - Use ASYNC disk I/O (Requires real threads, apparently runs on 3.0 libc_r)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
@@ -104,6 +103,3 @@ post-install:
 	fi
 
 .include <bsd.port.mk>
-
-# Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
-PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 1cb1be10928f..ec5e43f0d529 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1,3 +1,2 @@
-MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
-MD5 (squid2.0/diff-2.0.RELEASE-2.0.PATCH1.gz) = 959a410616b3604b384ad3522e4d6c28
-MD5 (squid2.0/diff-2.0.PATCH1-2.0.PATCH2.gz) = 8bd597ab342ec5db7d14dae88a52798c
+MD5 (squid2.1/squid-2.1.PATCH2-src.tar.gz) = 71c6b2437e562224d43dcde5765001f8
+MD5 (squid2.1/squid-2.1.PATCH2-clientHandleIMSReply-leak.patch) = c5416dc4a2c0fa09a27790b575a19d9c
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 4ac73c30cb66..bc974536e7e0 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	2.0.RELEASE
+# Version required:	2.1.PATCH2
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.52 1998/10/06 00:19:50 peter Exp $
+# $Id: Makefile,v 1.53 1998/10/19 12:12:45 peter Exp $
 #
 
-DISTNAME=	squid-2.0.RELEASE
-PKGNAME=	squid-2.0
+DISTNAME=	squid-2.1.PATCH2
+PKGNAME=	squid-2.1
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-2/ \
@@ -16,14 +16,13 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	diff-2.0.RELEASE-2.0.PATCH1.gz \
-		diff-2.0.PATCH1-2.0.PATCH2.gz
+PATCH_SITES=	http://squid.nlanr.net/Squid/v2/2.1/
+PATCHFILES=	squid-2.1.PATCH2-clientHandleIMSReply-leak.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid2.0
-PATCH_DIST_STRIP= -p1
+DIST_SUBDIR=	squid2.1
+PATCH_DIST_STRIP= -p0
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
@@ -45,7 +44,7 @@ NO_LATEST_LINK=	yes
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Enable CARP support
 #CONFIGURE_ARGS+= --enable-carp
-#  - Use ASYNC disk I/O (Requires real pthreads)
+#  - Use ASYNC disk I/O (Requires real threads, apparently runs on 3.0 libc_r)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
@@ -104,6 +103,3 @@ post-install:
 	fi
 
 .include <bsd.port.mk>
-
-# Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
-PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 1cb1be10928f..ec5e43f0d529 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,3 +1,2 @@
-MD5 (squid2.0/squid-2.0.RELEASE-src.tar.gz) = dc2da8400c003b1d16848ae4674b6f8e
-MD5 (squid2.0/diff-2.0.RELEASE-2.0.PATCH1.gz) = 959a410616b3604b384ad3522e4d6c28
-MD5 (squid2.0/diff-2.0.PATCH1-2.0.PATCH2.gz) = 8bd597ab342ec5db7d14dae88a52798c
+MD5 (squid2.1/squid-2.1.PATCH2-src.tar.gz) = 71c6b2437e562224d43dcde5765001f8
+MD5 (squid2.1/squid-2.1.PATCH2-clientHandleIMSReply-leak.patch) = c5416dc4a2c0fa09a27790b575a19d9c