Update squid1.2.beta14 -> beta16.

Note: the b14 -> b15 change will loose your cache unless you take
the steps on http://squid.nlanr.net/ to recover it.

Read the Changelog for details, this is a fairly large update.

27 files changed, 207 insertions, 234 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 042c1a692f6b..11fe868fcbe4 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta14
+# Version required:	1.2-beta16
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.43 1998/02/14 14:36:12 peter Exp $
+# $Id: Makefile,v 1.44 1998/02/16 13:16:37 asami Exp $
 #
 
-DISTNAME=	squid-1.2.beta14
-PKGNAME=	squid-1.2b14
+DISTNAME=	squid-1.2.beta16
+PKGNAME=	squid-1.2b16
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
@@ -16,12 +16,12 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
-PATCHFILES+=    1.2.beta14.patches
+#PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
+#PATCHFILES+=    1.2.beta16.patches
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b14
+DIST_SUBDIR=	squid1.2b16
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 56a119ddf791..2b107e1f1bc9 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,2 +1 @@
-MD5 (squid1.2b14/squid-1.2.beta14-src.tar.gz) = 46e70911ba8d706f25333e9e81cf6860
-MD5 (squid1.2b14/1.2.beta14.patches) = 7c4aa7c3747e2aec71d2fd280da5fae5
+MD5 (squid1.2b16/squid-1.2.beta16-src.tar.gz) = e6dba32061c6cd4e5592126e86b06281
diff --git a/www/squid/files/patch-al b/www/squid/files/patch-al
index c770bfd3b646..f2c7969ff964 100644
--- a/www/squid/files/patch-al
+++ b/www/squid/files/patch-al
@@ -1,17 +1,15 @@
-*** /tmp/configure	Sat Feb  7 21:20:29 1998
---- configure	Sat Feb  7 21:24:51 1998
-***************
-*** 608,619 ****
-  REGEXLIB=''	# -lregex
-  LIBREGEX=''	# libregex.a
-  
-- if test "$libexecdir" = '${exec_prefix}/libexec'; then
-- 	libexecdir='${bindir}'
-- 	localstatedir='${prefix}'
-- 
-- fi
-- 
-  if test -z "$CACHE_HTTP_PORT"; then
-  	CACHE_HTTP_PORT="3128"
-  fi
---- 608,613 ----
+--- configure.orig	Fri Feb 27 13:51:13 1998
++++ configure	Thu Mar  5 14:39:57 1998
+@@ -611,12 +611,6 @@
+ REGEXLIB=''	# -lregex
+ LIBREGEX=''	# libregex.a
+ 
+-if test "$libexecdir" = '${exec_prefix}/libexec'; then
+-	libexecdir='${bindir}'
+-	localstatedir='${prefix}'
+-
+-fi
+-
+ if test -z "$CACHE_HTTP_PORT"; then
+ 	CACHE_HTTP_PORT="3128"
+ fi
diff --git a/www/squid22/Makefile b/www/squid22/Makefile
index 042c1a692f6b..11fe868fcbe4 100644
--- a/www/squid22/Makefile
+++ b/www/squid22/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta14
+# Version required:	1.2-beta16
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.43 1998/02/14 14:36:12 peter Exp $
+# $Id: Makefile,v 1.44 1998/02/16 13:16:37 asami Exp $
 #
 
-DISTNAME=	squid-1.2.beta14
-PKGNAME=	squid-1.2b14
+DISTNAME=	squid-1.2.beta16
+PKGNAME=	squid-1.2b16
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
@@ -16,12 +16,12 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
-PATCHFILES+=    1.2.beta14.patches
+#PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
+#PATCHFILES+=    1.2.beta16.patches
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b14
+DIST_SUBDIR=	squid1.2b16
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
diff --git a/www/squid22/distinfo b/www/squid22/distinfo
index 56a119ddf791..2b107e1f1bc9 100644
--- a/www/squid22/distinfo
+++ b/www/squid22/distinfo
@@ -1,2 +1 @@
-MD5 (squid1.2b14/squid-1.2.beta14-src.tar.gz) = 46e70911ba8d706f25333e9e81cf6860
-MD5 (squid1.2b14/1.2.beta14.patches) = 7c4aa7c3747e2aec71d2fd280da5fae5
+MD5 (squid1.2b16/squid-1.2.beta16-src.tar.gz) = e6dba32061c6cd4e5592126e86b06281
diff --git a/www/squid22/files/patch-al b/www/squid22/files/patch-al
index c770bfd3b646..f2c7969ff964 100644
--- a/www/squid22/files/patch-al
+++ b/www/squid22/files/patch-al
@@ -1,17 +1,15 @@
-*** /tmp/configure	Sat Feb  7 21:20:29 1998
---- configure	Sat Feb  7 21:24:51 1998
-***************
-*** 608,619 ****
-  REGEXLIB=''	# -lregex
-  LIBREGEX=''	# libregex.a
-  
-- if test "$libexecdir" = '${exec_prefix}/libexec'; then
-- 	libexecdir='${bindir}'
-- 	localstatedir='${prefix}'
-- 
-- fi
-- 
-  if test -z "$CACHE_HTTP_PORT"; then
-  	CACHE_HTTP_PORT="3128"
-  fi
---- 608,613 ----
+--- configure.orig	Fri Feb 27 13:51:13 1998
++++ configure	Thu Mar  5 14:39:57 1998
+@@ -611,12 +611,6 @@
+ REGEXLIB=''	# -lregex
+ LIBREGEX=''	# libregex.a
+ 
+-if test "$libexecdir" = '${exec_prefix}/libexec'; then
+-	libexecdir='${bindir}'
+-	localstatedir='${prefix}'
+-
+-fi
+-
+ if test -z "$CACHE_HTTP_PORT"; then
+ 	CACHE_HTTP_PORT="3128"
+ fi
diff --git a/www/squid23/Makefile b/www/squid23/Makefile
index 042c1a692f6b..11fe868fcbe4 100644
--- a/www/squid23/Makefile
+++ b/www/squid23/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta14
+# Version required:	1.2-beta16
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.43 1998/02/14 14:36:12 peter Exp $
+# $Id: Makefile,v 1.44 1998/02/16 13:16:37 asami Exp $
 #
 
-DISTNAME=	squid-1.2.beta14
-PKGNAME=	squid-1.2b14
+DISTNAME=	squid-1.2.beta16
+PKGNAME=	squid-1.2b16
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
@@ -16,12 +16,12 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
-PATCHFILES+=    1.2.beta14.patches
+#PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
+#PATCHFILES+=    1.2.beta16.patches
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b14
+DIST_SUBDIR=	squid1.2b16
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
diff --git a/www/squid23/distinfo b/www/squid23/distinfo
index 56a119ddf791..2b107e1f1bc9 100644
--- a/www/squid23/distinfo
+++ b/www/squid23/distinfo
@@ -1,2 +1 @@
-MD5 (squid1.2b14/squid-1.2.beta14-src.tar.gz) = 46e70911ba8d706f25333e9e81cf6860
-MD5 (squid1.2b14/1.2.beta14.patches) = 7c4aa7c3747e2aec71d2fd280da5fae5
+MD5 (squid1.2b16/squid-1.2.beta16-src.tar.gz) = e6dba32061c6cd4e5592126e86b06281
diff --git a/www/squid23/files/patch-al b/www/squid23/files/patch-al
index c770bfd3b646..f2c7969ff964 100644
--- a/www/squid23/files/patch-al
+++ b/www/squid23/files/patch-al
@@ -1,17 +1,15 @@
-*** /tmp/configure	Sat Feb  7 21:20:29 1998
---- configure	Sat Feb  7 21:24:51 1998
-***************
-*** 608,619 ****
-  REGEXLIB=''	# -lregex
-  LIBREGEX=''	# libregex.a
-  
-- if test "$libexecdir" = '${exec_prefix}/libexec'; then
-- 	libexecdir='${bindir}'
-- 	localstatedir='${prefix}'
-- 
-- fi
-- 
-  if test -z "$CACHE_HTTP_PORT"; then
-  	CACHE_HTTP_PORT="3128"
-  fi
---- 608,613 ----
+--- configure.orig	Fri Feb 27 13:51:13 1998
++++ configure	Thu Mar  5 14:39:57 1998
+@@ -611,12 +611,6 @@
+ REGEXLIB=''	# -lregex
+ LIBREGEX=''	# libregex.a
+ 
+-if test "$libexecdir" = '${exec_prefix}/libexec'; then
+-	libexecdir='${bindir}'
+-	localstatedir='${prefix}'
+-
+-fi
+-
+ if test -z "$CACHE_HTTP_PORT"; then
+ 	CACHE_HTTP_PORT="3128"
+ fi
diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index 042c1a692f6b..11fe868fcbe4 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta14
+# Version required:	1.2-beta16
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.43 1998/02/14 14:36:12 peter Exp $
+# $Id: Makefile,v 1.44 1998/02/16 13:16:37 asami Exp $
 #
 
-DISTNAME=	squid-1.2.beta14
-PKGNAME=	squid-1.2b14
+DISTNAME=	squid-1.2.beta16
+PKGNAME=	squid-1.2b16
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
@@ -16,12 +16,12 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
-PATCHFILES+=    1.2.beta14.patches
+#PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
+#PATCHFILES+=    1.2.beta16.patches
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b14
+DIST_SUBDIR=	squid1.2b16
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
diff --git a/www/squid24/distinfo b/www/squid24/distinfo
index 56a119ddf791..2b107e1f1bc9 100644
--- a/www/squid24/distinfo
+++ b/www/squid24/distinfo
@@ -1,2 +1 @@
-MD5 (squid1.2b14/squid-1.2.beta14-src.tar.gz) = 46e70911ba8d706f25333e9e81cf6860
-MD5 (squid1.2b14/1.2.beta14.patches) = 7c4aa7c3747e2aec71d2fd280da5fae5
+MD5 (squid1.2b16/squid-1.2.beta16-src.tar.gz) = e6dba32061c6cd4e5592126e86b06281
diff --git a/www/squid24/files/patch-al b/www/squid24/files/patch-al
index c770bfd3b646..f2c7969ff964 100644
--- a/www/squid24/files/patch-al
+++ b/www/squid24/files/patch-al
@@ -1,17 +1,15 @@
-*** /tmp/configure	Sat Feb  7 21:20:29 1998
---- configure	Sat Feb  7 21:24:51 1998
-***************
-*** 608,619 ****
-  REGEXLIB=''	# -lregex
-  LIBREGEX=''	# libregex.a
-  
-- if test "$libexecdir" = '${exec_prefix}/libexec'; then
-- 	libexecdir='${bindir}'
-- 	localstatedir='${prefix}'
-- 
-- fi
-- 
-  if test -z "$CACHE_HTTP_PORT"; then
-  	CACHE_HTTP_PORT="3128"
-  fi
---- 608,613 ----
+--- configure.orig	Fri Feb 27 13:51:13 1998
++++ configure	Thu Mar  5 14:39:57 1998
+@@ -611,12 +611,6 @@
+ REGEXLIB=''	# -lregex
+ LIBREGEX=''	# libregex.a
+ 
+-if test "$libexecdir" = '${exec_prefix}/libexec'; then
+-	libexecdir='${bindir}'
+-	localstatedir='${prefix}'
+-
+-fi
+-
+ if test -z "$CACHE_HTTP_PORT"; then
+ 	CACHE_HTTP_PORT="3128"
+ fi
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 042c1a692f6b..11fe868fcbe4 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta14
+# Version required:	1.2-beta16
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.43 1998/02/14 14:36:12 peter Exp $
+# $Id: Makefile,v 1.44 1998/02/16 13:16:37 asami Exp $
 #
 
-DISTNAME=	squid-1.2.beta14
-PKGNAME=	squid-1.2b14
+DISTNAME=	squid-1.2.beta16
+PKGNAME=	squid-1.2b16
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
@@ -16,12 +16,12 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
-PATCHFILES+=    1.2.beta14.patches
+#PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
+#PATCHFILES+=    1.2.beta16.patches
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b14
+DIST_SUBDIR=	squid1.2b16
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index 56a119ddf791..2b107e1f1bc9 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -1,2 +1 @@
-MD5 (squid1.2b14/squid-1.2.beta14-src.tar.gz) = 46e70911ba8d706f25333e9e81cf6860
-MD5 (squid1.2b14/1.2.beta14.patches) = 7c4aa7c3747e2aec71d2fd280da5fae5
+MD5 (squid1.2b16/squid-1.2.beta16-src.tar.gz) = e6dba32061c6cd4e5592126e86b06281
diff --git a/www/squid25/files/patch-al b/www/squid25/files/patch-al
index c770bfd3b646..f2c7969ff964 100644
--- a/www/squid25/files/patch-al
+++ b/www/squid25/files/patch-al
@@ -1,17 +1,15 @@
-*** /tmp/configure	Sat Feb  7 21:20:29 1998
---- configure	Sat Feb  7 21:24:51 1998
-***************
-*** 608,619 ****
-  REGEXLIB=''	# -lregex
-  LIBREGEX=''	# libregex.a
-  
-- if test "$libexecdir" = '${exec_prefix}/libexec'; then
-- 	libexecdir='${bindir}'
-- 	localstatedir='${prefix}'
-- 
-- fi
-- 
-  if test -z "$CACHE_HTTP_PORT"; then
-  	CACHE_HTTP_PORT="3128"
-  fi
---- 608,613 ----
+--- configure.orig	Fri Feb 27 13:51:13 1998
++++ configure	Thu Mar  5 14:39:57 1998
+@@ -611,12 +611,6 @@
+ REGEXLIB=''	# -lregex
+ LIBREGEX=''	# libregex.a
+ 
+-if test "$libexecdir" = '${exec_prefix}/libexec'; then
+-	libexecdir='${bindir}'
+-	localstatedir='${prefix}'
+-
+-fi
+-
+ if test -z "$CACHE_HTTP_PORT"; then
+ 	CACHE_HTTP_PORT="3128"
+ fi
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 042c1a692f6b..11fe868fcbe4 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta14
+# Version required:	1.2-beta16
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.43 1998/02/14 14:36:12 peter Exp $
+# $Id: Makefile,v 1.44 1998/02/16 13:16:37 asami Exp $
 #
 
-DISTNAME=	squid-1.2.beta14
-PKGNAME=	squid-1.2b14
+DISTNAME=	squid-1.2.beta16
+PKGNAME=	squid-1.2b16
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
@@ -16,12 +16,12 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
-PATCHFILES+=    1.2.beta14.patches
+#PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
+#PATCHFILES+=    1.2.beta16.patches
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b14
+DIST_SUBDIR=	squid1.2b16
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index 56a119ddf791..2b107e1f1bc9 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -1,2 +1 @@
-MD5 (squid1.2b14/squid-1.2.beta14-src.tar.gz) = 46e70911ba8d706f25333e9e81cf6860
-MD5 (squid1.2b14/1.2.beta14.patches) = 7c4aa7c3747e2aec71d2fd280da5fae5
+MD5 (squid1.2b16/squid-1.2.beta16-src.tar.gz) = e6dba32061c6cd4e5592126e86b06281
diff --git a/www/squid26/files/patch-al b/www/squid26/files/patch-al
index c770bfd3b646..f2c7969ff964 100644
--- a/www/squid26/files/patch-al
+++ b/www/squid26/files/patch-al
@@ -1,17 +1,15 @@
-*** /tmp/configure	Sat Feb  7 21:20:29 1998
---- configure	Sat Feb  7 21:24:51 1998
-***************
-*** 608,619 ****
-  REGEXLIB=''	# -lregex
-  LIBREGEX=''	# libregex.a
-  
-- if test "$libexecdir" = '${exec_prefix}/libexec'; then
-- 	libexecdir='${bindir}'
-- 	localstatedir='${prefix}'
-- 
-- fi
-- 
-  if test -z "$CACHE_HTTP_PORT"; then
-  	CACHE_HTTP_PORT="3128"
-  fi
---- 608,613 ----
+--- configure.orig	Fri Feb 27 13:51:13 1998
++++ configure	Thu Mar  5 14:39:57 1998
+@@ -611,12 +611,6 @@
+ REGEXLIB=''	# -lregex
+ LIBREGEX=''	# libregex.a
+ 
+-if test "$libexecdir" = '${exec_prefix}/libexec'; then
+-	libexecdir='${bindir}'
+-	localstatedir='${prefix}'
+-
+-fi
+-
+ if test -z "$CACHE_HTTP_PORT"; then
+ 	CACHE_HTTP_PORT="3128"
+ fi
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 042c1a692f6b..11fe868fcbe4 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta14
+# Version required:	1.2-beta16
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.43 1998/02/14 14:36:12 peter Exp $
+# $Id: Makefile,v 1.44 1998/02/16 13:16:37 asami Exp $
 #
 
-DISTNAME=	squid-1.2.beta14
-PKGNAME=	squid-1.2b14
+DISTNAME=	squid-1.2.beta16
+PKGNAME=	squid-1.2b16
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
@@ -16,12 +16,12 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
-PATCHFILES+=    1.2.beta14.patches
+#PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
+#PATCHFILES+=    1.2.beta16.patches
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b14
+DIST_SUBDIR=	squid1.2b16
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 56a119ddf791..2b107e1f1bc9 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -1,2 +1 @@
-MD5 (squid1.2b14/squid-1.2.beta14-src.tar.gz) = 46e70911ba8d706f25333e9e81cf6860
-MD5 (squid1.2b14/1.2.beta14.patches) = 7c4aa7c3747e2aec71d2fd280da5fae5
+MD5 (squid1.2b16/squid-1.2.beta16-src.tar.gz) = e6dba32061c6cd4e5592126e86b06281
diff --git a/www/squid27/files/patch-al b/www/squid27/files/patch-al
index c770bfd3b646..f2c7969ff964 100644
--- a/www/squid27/files/patch-al
+++ b/www/squid27/files/patch-al
@@ -1,17 +1,15 @@
-*** /tmp/configure	Sat Feb  7 21:20:29 1998
---- configure	Sat Feb  7 21:24:51 1998
-***************
-*** 608,619 ****
-  REGEXLIB=''	# -lregex
-  LIBREGEX=''	# libregex.a
-  
-- if test "$libexecdir" = '${exec_prefix}/libexec'; then
-- 	libexecdir='${bindir}'
-- 	localstatedir='${prefix}'
-- 
-- fi
-- 
-  if test -z "$CACHE_HTTP_PORT"; then
-  	CACHE_HTTP_PORT="3128"
-  fi
---- 608,613 ----
+--- configure.orig	Fri Feb 27 13:51:13 1998
++++ configure	Thu Mar  5 14:39:57 1998
+@@ -611,12 +611,6 @@
+ REGEXLIB=''	# -lregex
+ LIBREGEX=''	# libregex.a
+ 
+-if test "$libexecdir" = '${exec_prefix}/libexec'; then
+-	libexecdir='${bindir}'
+-	localstatedir='${prefix}'
+-
+-fi
+-
+ if test -z "$CACHE_HTTP_PORT"; then
+ 	CACHE_HTTP_PORT="3128"
+ fi
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 042c1a692f6b..11fe868fcbe4 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta14
+# Version required:	1.2-beta16
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.43 1998/02/14 14:36:12 peter Exp $
+# $Id: Makefile,v 1.44 1998/02/16 13:16:37 asami Exp $
 #
 
-DISTNAME=	squid-1.2.beta14
-PKGNAME=	squid-1.2b14
+DISTNAME=	squid-1.2.beta16
+PKGNAME=	squid-1.2b16
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
@@ -16,12 +16,12 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
-PATCHFILES+=    1.2.beta14.patches
+#PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
+#PATCHFILES+=    1.2.beta16.patches
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b14
+DIST_SUBDIR=	squid1.2b16
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 56a119ddf791..2b107e1f1bc9 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1,2 +1 @@
-MD5 (squid1.2b14/squid-1.2.beta14-src.tar.gz) = 46e70911ba8d706f25333e9e81cf6860
-MD5 (squid1.2b14/1.2.beta14.patches) = 7c4aa7c3747e2aec71d2fd280da5fae5
+MD5 (squid1.2b16/squid-1.2.beta16-src.tar.gz) = e6dba32061c6cd4e5592126e86b06281
diff --git a/www/squid30/files/patch-al b/www/squid30/files/patch-al
index c770bfd3b646..f2c7969ff964 100644
--- a/www/squid30/files/patch-al
+++ b/www/squid30/files/patch-al
@@ -1,17 +1,15 @@
-*** /tmp/configure	Sat Feb  7 21:20:29 1998
---- configure	Sat Feb  7 21:24:51 1998
-***************
-*** 608,619 ****
-  REGEXLIB=''	# -lregex
-  LIBREGEX=''	# libregex.a
-  
-- if test "$libexecdir" = '${exec_prefix}/libexec'; then
-- 	libexecdir='${bindir}'
-- 	localstatedir='${prefix}'
-- 
-- fi
-- 
-  if test -z "$CACHE_HTTP_PORT"; then
-  	CACHE_HTTP_PORT="3128"
-  fi
---- 608,613 ----
+--- configure.orig	Fri Feb 27 13:51:13 1998
++++ configure	Thu Mar  5 14:39:57 1998
+@@ -611,12 +611,6 @@
+ REGEXLIB=''	# -lregex
+ LIBREGEX=''	# libregex.a
+ 
+-if test "$libexecdir" = '${exec_prefix}/libexec'; then
+-	libexecdir='${bindir}'
+-	localstatedir='${prefix}'
+-
+-fi
+-
+ if test -z "$CACHE_HTTP_PORT"; then
+ 	CACHE_HTTP_PORT="3128"
+ fi
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 042c1a692f6b..11fe868fcbe4 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta14
+# Version required:	1.2-beta16
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.43 1998/02/14 14:36:12 peter Exp $
+# $Id: Makefile,v 1.44 1998/02/16 13:16:37 asami Exp $
 #
 
-DISTNAME=	squid-1.2.beta14
-PKGNAME=	squid-1.2b14
+DISTNAME=	squid-1.2.beta16
+PKGNAME=	squid-1.2b16
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.2.beta/ \
@@ -16,12 +16,12 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.2.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
-PATCHFILES+=    1.2.beta14.patches
+#PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
+#PATCHFILES+=    1.2.beta16.patches
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b14
+DIST_SUBDIR=	squid1.2b16
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 56a119ddf791..2b107e1f1bc9 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1,2 +1 @@
-MD5 (squid1.2b14/squid-1.2.beta14-src.tar.gz) = 46e70911ba8d706f25333e9e81cf6860
-MD5 (squid1.2b14/1.2.beta14.patches) = 7c4aa7c3747e2aec71d2fd280da5fae5
+MD5 (squid1.2b16/squid-1.2.beta16-src.tar.gz) = e6dba32061c6cd4e5592126e86b06281
diff --git a/www/squid31/files/patch-al b/www/squid31/files/patch-al
index c770bfd3b646..f2c7969ff964 100644
--- a/www/squid31/files/patch-al
+++ b/www/squid31/files/patch-al
@@ -1,17 +1,15 @@
-*** /tmp/configure	Sat Feb  7 21:20:29 1998
---- configure	Sat Feb  7 21:24:51 1998
-***************
-*** 608,619 ****
-  REGEXLIB=''	# -lregex
-  LIBREGEX=''	# libregex.a
-  
-- if test "$libexecdir" = '${exec_prefix}/libexec'; then
-- 	libexecdir='${bindir}'
-- 	localstatedir='${prefix}'
-- 
-- fi
-- 
-  if test -z "$CACHE_HTTP_PORT"; then
-  	CACHE_HTTP_PORT="3128"
-  fi
---- 608,613 ----
+--- configure.orig	Fri Feb 27 13:51:13 1998
++++ configure	Thu Mar  5 14:39:57 1998
+@@ -611,12 +611,6 @@
+ REGEXLIB=''	# -lregex
+ LIBREGEX=''	# libregex.a
+ 
+-if test "$libexecdir" = '${exec_prefix}/libexec'; then
+-	libexecdir='${bindir}'
+-	localstatedir='${prefix}'
+-
+-fi
+-
+ if test -z "$CACHE_HTTP_PORT"; then
+ 	CACHE_HTTP_PORT="3128"
+ fi