Squid-1.1.beta13. This was a little unusual in that the www/squid ncvs

files were repository copied to www/squid11, then this commit brings it
to 1.1.b13.  (This was Satoshi's idea :-) It preserves the history)

Squid-1.0 and 1.1 are under parallel development, kinda like when we had
2.1-stable and 2.2-current in parallel development.  The 1.0 code is well
polished, and 1.1 is "on the bleeding edge" as such.  The features and
performance are much improved, but it can be a bit hair-raising.  I
personally have no major hassles with 1.1beta13.

Among the nicer things that this version has over 1.0:
- URL redirector..  ie: you can rewrite url's of sites with "mirrors"
  so that you don't have 15 copies of the same files.
- optional ident logging
- improved acl's
- dramatically improved cache directory structure (scales much better with
  gigantic disk caches)
- much improved DNS ttl handling (esp. with resolver hack)
- more control over neighbor status; parent, sibling etc.
- much improved refresh rules to help combat stupid sites that needlessly
  set the Expires: field to zero when it doesn't need to be.  (This is fine
  when it's genuinely needed, but some sites really abuse it to to attempt
  to negate caching to get inflated hit counts etc)
Reviewed by:
Submitted by:
Obtained from:

27 files changed, 117 insertions, 108 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 866cdd8a9410..0879a1c35662 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	squid
-# Version required:	1.0.20
-# Date created:		Fri May 17 04:02:53 EET DST 1996
-# Whom:			Andrew Stesin <stesin@elvisti.kiev.ua>
+# Version required:	1.1.beta13
+# Date created:		Thu Nov  7 00:53:18 WST 1996
+# Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/06 16:37:10 peter Exp $
 #
 
-DISTNAME=	squid-1.0.20
+DISTNAME=	squid-1.1.beta13
 CATEGORIES+=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.0/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.0/
+	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.1.beta/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-1.1.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	stesin@elvisti.kiev.ua
+MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
@@ -25,7 +25,7 @@ STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
 post-install:
-.for file in cachemgr.cgi client dnsserver ftpget squid
+.for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 987e4dcfa1cc..5c84dfbf264a 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1 +1 @@
-MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267
+MD5 (squid-1.1.beta13-src.tar.gz) = 2092da09e0403e2634112e72792c6e28
diff --git a/www/squid/pkg-plist b/www/squid/pkg-plist
index d2506d04b87a..fa5f082bbcff 100644
--- a/www/squid/pkg-plist
+++ b/www/squid/pkg-plist
@@ -4,6 +4,7 @@ sbin/squid
 sbin/client
 sbin/dnsserver
 sbin/ftpget
+sbin/pinger
 sbin/cachemgr.cgi
 etc/squid/squid.conf.default
 etc/rc.d/squid.sh
diff --git a/www/squid22/Makefile b/www/squid22/Makefile
index 866cdd8a9410..0879a1c35662 100644
--- a/www/squid22/Makefile
+++ b/www/squid22/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	squid
-# Version required:	1.0.20
-# Date created:		Fri May 17 04:02:53 EET DST 1996
-# Whom:			Andrew Stesin <stesin@elvisti.kiev.ua>
+# Version required:	1.1.beta13
+# Date created:		Thu Nov  7 00:53:18 WST 1996
+# Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/06 16:37:10 peter Exp $
 #
 
-DISTNAME=	squid-1.0.20
+DISTNAME=	squid-1.1.beta13
 CATEGORIES+=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.0/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.0/
+	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.1.beta/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-1.1.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	stesin@elvisti.kiev.ua
+MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
@@ -25,7 +25,7 @@ STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
 post-install:
-.for file in cachemgr.cgi client dnsserver ftpget squid
+.for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
diff --git a/www/squid22/distinfo b/www/squid22/distinfo
index 987e4dcfa1cc..5c84dfbf264a 100644
--- a/www/squid22/distinfo
+++ b/www/squid22/distinfo
@@ -1 +1 @@
-MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267
+MD5 (squid-1.1.beta13-src.tar.gz) = 2092da09e0403e2634112e72792c6e28
diff --git a/www/squid22/pkg-plist b/www/squid22/pkg-plist
index d2506d04b87a..fa5f082bbcff 100644
--- a/www/squid22/pkg-plist
+++ b/www/squid22/pkg-plist
@@ -4,6 +4,7 @@ sbin/squid
 sbin/client
 sbin/dnsserver
 sbin/ftpget
+sbin/pinger
 sbin/cachemgr.cgi
 etc/squid/squid.conf.default
 etc/rc.d/squid.sh
diff --git a/www/squid23/Makefile b/www/squid23/Makefile
index 866cdd8a9410..0879a1c35662 100644
--- a/www/squid23/Makefile
+++ b/www/squid23/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	squid
-# Version required:	1.0.20
-# Date created:		Fri May 17 04:02:53 EET DST 1996
-# Whom:			Andrew Stesin <stesin@elvisti.kiev.ua>
+# Version required:	1.1.beta13
+# Date created:		Thu Nov  7 00:53:18 WST 1996
+# Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/06 16:37:10 peter Exp $
 #
 
-DISTNAME=	squid-1.0.20
+DISTNAME=	squid-1.1.beta13
 CATEGORIES+=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.0/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.0/
+	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.1.beta/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-1.1.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	stesin@elvisti.kiev.ua
+MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
@@ -25,7 +25,7 @@ STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
 post-install:
-.for file in cachemgr.cgi client dnsserver ftpget squid
+.for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
diff --git a/www/squid23/distinfo b/www/squid23/distinfo
index 987e4dcfa1cc..5c84dfbf264a 100644
--- a/www/squid23/distinfo
+++ b/www/squid23/distinfo
@@ -1 +1 @@
-MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267
+MD5 (squid-1.1.beta13-src.tar.gz) = 2092da09e0403e2634112e72792c6e28
diff --git a/www/squid23/pkg-plist b/www/squid23/pkg-plist
index d2506d04b87a..fa5f082bbcff 100644
--- a/www/squid23/pkg-plist
+++ b/www/squid23/pkg-plist
@@ -4,6 +4,7 @@ sbin/squid
 sbin/client
 sbin/dnsserver
 sbin/ftpget
+sbin/pinger
 sbin/cachemgr.cgi
 etc/squid/squid.conf.default
 etc/rc.d/squid.sh
diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index 866cdd8a9410..0879a1c35662 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	squid
-# Version required:	1.0.20
-# Date created:		Fri May 17 04:02:53 EET DST 1996
-# Whom:			Andrew Stesin <stesin@elvisti.kiev.ua>
+# Version required:	1.1.beta13
+# Date created:		Thu Nov  7 00:53:18 WST 1996
+# Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/06 16:37:10 peter Exp $
 #
 
-DISTNAME=	squid-1.0.20
+DISTNAME=	squid-1.1.beta13
 CATEGORIES+=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.0/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.0/
+	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.1.beta/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-1.1.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	stesin@elvisti.kiev.ua
+MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
@@ -25,7 +25,7 @@ STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
 post-install:
-.for file in cachemgr.cgi client dnsserver ftpget squid
+.for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
diff --git a/www/squid24/distinfo b/www/squid24/distinfo
index 987e4dcfa1cc..5c84dfbf264a 100644
--- a/www/squid24/distinfo
+++ b/www/squid24/distinfo
@@ -1 +1 @@
-MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267
+MD5 (squid-1.1.beta13-src.tar.gz) = 2092da09e0403e2634112e72792c6e28
diff --git a/www/squid24/pkg-plist b/www/squid24/pkg-plist
index d2506d04b87a..fa5f082bbcff 100644
--- a/www/squid24/pkg-plist
+++ b/www/squid24/pkg-plist
@@ -4,6 +4,7 @@ sbin/squid
 sbin/client
 sbin/dnsserver
 sbin/ftpget
+sbin/pinger
 sbin/cachemgr.cgi
 etc/squid/squid.conf.default
 etc/rc.d/squid.sh
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 866cdd8a9410..0879a1c35662 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	squid
-# Version required:	1.0.20
-# Date created:		Fri May 17 04:02:53 EET DST 1996
-# Whom:			Andrew Stesin <stesin@elvisti.kiev.ua>
+# Version required:	1.1.beta13
+# Date created:		Thu Nov  7 00:53:18 WST 1996
+# Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/06 16:37:10 peter Exp $
 #
 
-DISTNAME=	squid-1.0.20
+DISTNAME=	squid-1.1.beta13
 CATEGORIES+=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.0/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.0/
+	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.1.beta/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-1.1.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	stesin@elvisti.kiev.ua
+MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
@@ -25,7 +25,7 @@ STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
 post-install:
-.for file in cachemgr.cgi client dnsserver ftpget squid
+.for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index 987e4dcfa1cc..5c84dfbf264a 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -1 +1 @@
-MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267
+MD5 (squid-1.1.beta13-src.tar.gz) = 2092da09e0403e2634112e72792c6e28
diff --git a/www/squid25/pkg-plist b/www/squid25/pkg-plist
index d2506d04b87a..fa5f082bbcff 100644
--- a/www/squid25/pkg-plist
+++ b/www/squid25/pkg-plist
@@ -4,6 +4,7 @@ sbin/squid
 sbin/client
 sbin/dnsserver
 sbin/ftpget
+sbin/pinger
 sbin/cachemgr.cgi
 etc/squid/squid.conf.default
 etc/rc.d/squid.sh
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 866cdd8a9410..0879a1c35662 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	squid
-# Version required:	1.0.20
-# Date created:		Fri May 17 04:02:53 EET DST 1996
-# Whom:			Andrew Stesin <stesin@elvisti.kiev.ua>
+# Version required:	1.1.beta13
+# Date created:		Thu Nov  7 00:53:18 WST 1996
+# Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/06 16:37:10 peter Exp $
 #
 
-DISTNAME=	squid-1.0.20
+DISTNAME=	squid-1.1.beta13
 CATEGORIES+=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.0/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.0/
+	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.1.beta/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-1.1.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	stesin@elvisti.kiev.ua
+MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
@@ -25,7 +25,7 @@ STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
 post-install:
-.for file in cachemgr.cgi client dnsserver ftpget squid
+.for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index 987e4dcfa1cc..5c84dfbf264a 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -1 +1 @@
-MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267
+MD5 (squid-1.1.beta13-src.tar.gz) = 2092da09e0403e2634112e72792c6e28
diff --git a/www/squid26/pkg-plist b/www/squid26/pkg-plist
index d2506d04b87a..fa5f082bbcff 100644
--- a/www/squid26/pkg-plist
+++ b/www/squid26/pkg-plist
@@ -4,6 +4,7 @@ sbin/squid
 sbin/client
 sbin/dnsserver
 sbin/ftpget
+sbin/pinger
 sbin/cachemgr.cgi
 etc/squid/squid.conf.default
 etc/rc.d/squid.sh
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 866cdd8a9410..0879a1c35662 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	squid
-# Version required:	1.0.20
-# Date created:		Fri May 17 04:02:53 EET DST 1996
-# Whom:			Andrew Stesin <stesin@elvisti.kiev.ua>
+# Version required:	1.1.beta13
+# Date created:		Thu Nov  7 00:53:18 WST 1996
+# Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/06 16:37:10 peter Exp $
 #
 
-DISTNAME=	squid-1.0.20
+DISTNAME=	squid-1.1.beta13
 CATEGORIES+=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.0/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.0/
+	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.1.beta/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-1.1.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	stesin@elvisti.kiev.ua
+MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
@@ -25,7 +25,7 @@ STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
 post-install:
-.for file in cachemgr.cgi client dnsserver ftpget squid
+.for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index 987e4dcfa1cc..5c84dfbf264a 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -1 +1 @@
-MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267
+MD5 (squid-1.1.beta13-src.tar.gz) = 2092da09e0403e2634112e72792c6e28
diff --git a/www/squid27/pkg-plist b/www/squid27/pkg-plist
index d2506d04b87a..fa5f082bbcff 100644
--- a/www/squid27/pkg-plist
+++ b/www/squid27/pkg-plist
@@ -4,6 +4,7 @@ sbin/squid
 sbin/client
 sbin/dnsserver
 sbin/ftpget
+sbin/pinger
 sbin/cachemgr.cgi
 etc/squid/squid.conf.default
 etc/rc.d/squid.sh
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 866cdd8a9410..0879a1c35662 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	squid
-# Version required:	1.0.20
-# Date created:		Fri May 17 04:02:53 EET DST 1996
-# Whom:			Andrew Stesin <stesin@elvisti.kiev.ua>
+# Version required:	1.1.beta13
+# Date created:		Thu Nov  7 00:53:18 WST 1996
+# Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/06 16:37:10 peter Exp $
 #
 
-DISTNAME=	squid-1.0.20
+DISTNAME=	squid-1.1.beta13
 CATEGORIES+=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.0/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.0/
+	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.1.beta/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-1.1.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	stesin@elvisti.kiev.ua
+MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
@@ -25,7 +25,7 @@ STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
 post-install:
-.for file in cachemgr.cgi client dnsserver ftpget squid
+.for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index 987e4dcfa1cc..5c84dfbf264a 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1 +1 @@
-MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267
+MD5 (squid-1.1.beta13-src.tar.gz) = 2092da09e0403e2634112e72792c6e28
diff --git a/www/squid30/pkg-plist b/www/squid30/pkg-plist
index d2506d04b87a..fa5f082bbcff 100644
--- a/www/squid30/pkg-plist
+++ b/www/squid30/pkg-plist
@@ -4,6 +4,7 @@ sbin/squid
 sbin/client
 sbin/dnsserver
 sbin/ftpget
+sbin/pinger
 sbin/cachemgr.cgi
 etc/squid/squid.conf.default
 etc/rc.d/squid.sh
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 866cdd8a9410..0879a1c35662 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	squid
-# Version required:	1.0.20
-# Date created:		Fri May 17 04:02:53 EET DST 1996
-# Whom:			Andrew Stesin <stesin@elvisti.kiev.ua>
+# Version required:	1.1.beta13
+# Date created:		Thu Nov  7 00:53:18 WST 1996
+# Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1996/07/10 21:48:58 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/06 16:37:10 peter Exp $
 #
 
-DISTNAME=	squid-1.0.20
+DISTNAME=	squid-1.1.beta13
 CATEGORIES+=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.0/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.0/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.0/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.0/
+	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.1.beta/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-1.1.beta/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	stesin@elvisti.kiev.ua
+MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
@@ -25,7 +25,7 @@ STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
 post-install:
-.for file in cachemgr.cgi client dnsserver ftpget squid
+.for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index 987e4dcfa1cc..5c84dfbf264a 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1 +1 @@
-MD5 (squid-1.0.20-src.tar.gz) = 832c7402e5b2d7b81822b67a0f7b6267
+MD5 (squid-1.1.beta13-src.tar.gz) = 2092da09e0403e2634112e72792c6e28
diff --git a/www/squid31/pkg-plist b/www/squid31/pkg-plist
index d2506d04b87a..fa5f082bbcff 100644
--- a/www/squid31/pkg-plist
+++ b/www/squid31/pkg-plist
@@ -4,6 +4,7 @@ sbin/squid
 sbin/client
 sbin/dnsserver
 sbin/ftpget
+sbin/pinger
 sbin/cachemgr.cgi
 etc/squid/squid.conf.default
 etc/rc.d/squid.sh