Update 1.1.3 -> 1.1.4 + distributed patches

Among the changes are some patches submitted to the maintainers by
yours truly to improve the password support in cachemgr.cgi.  It also
reports the resource "maxrss" correctly for what it is.

The distributed patches to 1.1.4:
    * ftpget.c.patch: Changes the default MIME type to
      "application/octet-stream" and fixes directory listings from
      NetWare servers.
    * icp.c.patch: Fixes "Unknown status reply from server: 0!" error
      messages in Netscape.
    * ipcache.c.patch: Fixes ipcache_dnsHandleRead() coredumps.
    * neighbors.c.patch: Fixes BIT_SET/BIT_TEST typo in
      getDefaultParent().

Reviewed by:
Submitted by:
Obtained from:

18 files changed, 225 insertions, 36 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 637abb11b1bd..6084eea5b6ee 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	squid
-# Version required:	1.1.3
+# Version required:	1.1.4
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.16 1996/12/26 22:00:45 peter Exp $
+# $Id: Makefile,v 1.17 1997/01/07 18:49:06 peter Exp $
 #
 
-DISTNAME=	squid-1.1.3
+DISTNAME=	squid-1.1.4
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1/ \
@@ -15,6 +15,11 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.1/
 EXTRACT_SUFX=	-src.tar.gz
 
+PATCH_SITES+=   http://squid.nlanr.net/Squid/1.1/1.1.4/
+PATCHFILES+=    ftpget.c.patch icp.c.patch ipcache.c.patch neighbors.c.patch
+
+DIST_SUBDIR=	squid
+
 MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
@@ -24,6 +29,18 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
+# If you need to set any of these options, read the source and uncomment
+# these if appropriate.
+#MAKE_ENV+=	HOST_OPT="-DCACHEMGR_HOSTNAME=\"getfullhostname()\""
+#MAKE_ENV+=	AUTH_OPT="-DUSE_PROXY_AUTH=1"
+#MAKE_ENV+=	LOG_HDRS_OPT="-DLOG_FULL_HEADERS=1"
+#MAKE_ENV+=	ICMP_OPT="-DUSE_ICMP=1"
+#MAKE_ENV+=	DELAY_HACK="-DDELAY_HACK=1"
+#MAKE_ENV+=	USERAGENT_OPT="-DUSE_USERAGENT_LOG=1"
+#MAKE_ENV+=	KILL_PARENT_OPT="-DKILL_PARENT_OPT"
+#MAKE_ENV+=	USE_POLL_OPT="-DUSE_POLL"
+#MAKE_ENV+=	ANON_OPT="-DUSE_ANONYMIZER"
+
 post-install:
 .for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
diff --git a/www/squid/distinfo b/www/squid/distinfo
index e5cf107d44ae..c970f6b39dd1 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1 +1,5 @@
-MD5 (squid-1.1.3-src.tar.gz) = e5687bc711b53c74323f06a52c1cd971
+MD5 (squid/squid-1.1.4-src.tar.gz) = 547d7424af78e16bb74435093eef2aeb
+MD5 (squid/ftpget.c.patch) = 8b0b2a43c2ac6b2674a111efe9248e40
+MD5 (squid/icp.c.patch) = 75dfd4b30822c549b857acc5929a73e8
+MD5 (squid/ipcache.c.patch) = 0e6f55edeb835ae277e8bbc4c3b91803
+MD5 (squid/neighbors.c.patch) = 71f7ad22709093672200eb29b7057c05
diff --git a/www/squid22/Makefile b/www/squid22/Makefile
index 637abb11b1bd..6084eea5b6ee 100644
--- a/www/squid22/Makefile
+++ b/www/squid22/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	squid
-# Version required:	1.1.3
+# Version required:	1.1.4
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.16 1996/12/26 22:00:45 peter Exp $
+# $Id: Makefile,v 1.17 1997/01/07 18:49:06 peter Exp $
 #
 
-DISTNAME=	squid-1.1.3
+DISTNAME=	squid-1.1.4
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1/ \
@@ -15,6 +15,11 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.1/
 EXTRACT_SUFX=	-src.tar.gz
 
+PATCH_SITES+=   http://squid.nlanr.net/Squid/1.1/1.1.4/
+PATCHFILES+=    ftpget.c.patch icp.c.patch ipcache.c.patch neighbors.c.patch
+
+DIST_SUBDIR=	squid
+
 MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
@@ -24,6 +29,18 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
+# If you need to set any of these options, read the source and uncomment
+# these if appropriate.
+#MAKE_ENV+=	HOST_OPT="-DCACHEMGR_HOSTNAME=\"getfullhostname()\""
+#MAKE_ENV+=	AUTH_OPT="-DUSE_PROXY_AUTH=1"
+#MAKE_ENV+=	LOG_HDRS_OPT="-DLOG_FULL_HEADERS=1"
+#MAKE_ENV+=	ICMP_OPT="-DUSE_ICMP=1"
+#MAKE_ENV+=	DELAY_HACK="-DDELAY_HACK=1"
+#MAKE_ENV+=	USERAGENT_OPT="-DUSE_USERAGENT_LOG=1"
+#MAKE_ENV+=	KILL_PARENT_OPT="-DKILL_PARENT_OPT"
+#MAKE_ENV+=	USE_POLL_OPT="-DUSE_POLL"
+#MAKE_ENV+=	ANON_OPT="-DUSE_ANONYMIZER"
+
 post-install:
 .for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
diff --git a/www/squid22/distinfo b/www/squid22/distinfo
index e5cf107d44ae..c970f6b39dd1 100644
--- a/www/squid22/distinfo
+++ b/www/squid22/distinfo
@@ -1 +1,5 @@
-MD5 (squid-1.1.3-src.tar.gz) = e5687bc711b53c74323f06a52c1cd971
+MD5 (squid/squid-1.1.4-src.tar.gz) = 547d7424af78e16bb74435093eef2aeb
+MD5 (squid/ftpget.c.patch) = 8b0b2a43c2ac6b2674a111efe9248e40
+MD5 (squid/icp.c.patch) = 75dfd4b30822c549b857acc5929a73e8
+MD5 (squid/ipcache.c.patch) = 0e6f55edeb835ae277e8bbc4c3b91803
+MD5 (squid/neighbors.c.patch) = 71f7ad22709093672200eb29b7057c05
diff --git a/www/squid23/Makefile b/www/squid23/Makefile
index 637abb11b1bd..6084eea5b6ee 100644
--- a/www/squid23/Makefile
+++ b/www/squid23/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	squid
-# Version required:	1.1.3
+# Version required:	1.1.4
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.16 1996/12/26 22:00:45 peter Exp $
+# $Id: Makefile,v 1.17 1997/01/07 18:49:06 peter Exp $
 #
 
-DISTNAME=	squid-1.1.3
+DISTNAME=	squid-1.1.4
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1/ \
@@ -15,6 +15,11 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.1/
 EXTRACT_SUFX=	-src.tar.gz
 
+PATCH_SITES+=   http://squid.nlanr.net/Squid/1.1/1.1.4/
+PATCHFILES+=    ftpget.c.patch icp.c.patch ipcache.c.patch neighbors.c.patch
+
+DIST_SUBDIR=	squid
+
 MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
@@ -24,6 +29,18 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
+# If you need to set any of these options, read the source and uncomment
+# these if appropriate.
+#MAKE_ENV+=	HOST_OPT="-DCACHEMGR_HOSTNAME=\"getfullhostname()\""
+#MAKE_ENV+=	AUTH_OPT="-DUSE_PROXY_AUTH=1"
+#MAKE_ENV+=	LOG_HDRS_OPT="-DLOG_FULL_HEADERS=1"
+#MAKE_ENV+=	ICMP_OPT="-DUSE_ICMP=1"
+#MAKE_ENV+=	DELAY_HACK="-DDELAY_HACK=1"
+#MAKE_ENV+=	USERAGENT_OPT="-DUSE_USERAGENT_LOG=1"
+#MAKE_ENV+=	KILL_PARENT_OPT="-DKILL_PARENT_OPT"
+#MAKE_ENV+=	USE_POLL_OPT="-DUSE_POLL"
+#MAKE_ENV+=	ANON_OPT="-DUSE_ANONYMIZER"
+
 post-install:
 .for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
diff --git a/www/squid23/distinfo b/www/squid23/distinfo
index e5cf107d44ae..c970f6b39dd1 100644
--- a/www/squid23/distinfo
+++ b/www/squid23/distinfo
@@ -1 +1,5 @@
-MD5 (squid-1.1.3-src.tar.gz) = e5687bc711b53c74323f06a52c1cd971
+MD5 (squid/squid-1.1.4-src.tar.gz) = 547d7424af78e16bb74435093eef2aeb
+MD5 (squid/ftpget.c.patch) = 8b0b2a43c2ac6b2674a111efe9248e40
+MD5 (squid/icp.c.patch) = 75dfd4b30822c549b857acc5929a73e8
+MD5 (squid/ipcache.c.patch) = 0e6f55edeb835ae277e8bbc4c3b91803
+MD5 (squid/neighbors.c.patch) = 71f7ad22709093672200eb29b7057c05
diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index 637abb11b1bd..6084eea5b6ee 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	squid
-# Version required:	1.1.3
+# Version required:	1.1.4
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.16 1996/12/26 22:00:45 peter Exp $
+# $Id: Makefile,v 1.17 1997/01/07 18:49:06 peter Exp $
 #
 
-DISTNAME=	squid-1.1.3
+DISTNAME=	squid-1.1.4
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1/ \
@@ -15,6 +15,11 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.1/
 EXTRACT_SUFX=	-src.tar.gz
 
+PATCH_SITES+=   http://squid.nlanr.net/Squid/1.1/1.1.4/
+PATCHFILES+=    ftpget.c.patch icp.c.patch ipcache.c.patch neighbors.c.patch
+
+DIST_SUBDIR=	squid
+
 MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
@@ -24,6 +29,18 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
+# If you need to set any of these options, read the source and uncomment
+# these if appropriate.
+#MAKE_ENV+=	HOST_OPT="-DCACHEMGR_HOSTNAME=\"getfullhostname()\""
+#MAKE_ENV+=	AUTH_OPT="-DUSE_PROXY_AUTH=1"
+#MAKE_ENV+=	LOG_HDRS_OPT="-DLOG_FULL_HEADERS=1"
+#MAKE_ENV+=	ICMP_OPT="-DUSE_ICMP=1"
+#MAKE_ENV+=	DELAY_HACK="-DDELAY_HACK=1"
+#MAKE_ENV+=	USERAGENT_OPT="-DUSE_USERAGENT_LOG=1"
+#MAKE_ENV+=	KILL_PARENT_OPT="-DKILL_PARENT_OPT"
+#MAKE_ENV+=	USE_POLL_OPT="-DUSE_POLL"
+#MAKE_ENV+=	ANON_OPT="-DUSE_ANONYMIZER"
+
 post-install:
 .for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
diff --git a/www/squid24/distinfo b/www/squid24/distinfo
index e5cf107d44ae..c970f6b39dd1 100644
--- a/www/squid24/distinfo
+++ b/www/squid24/distinfo
@@ -1 +1,5 @@
-MD5 (squid-1.1.3-src.tar.gz) = e5687bc711b53c74323f06a52c1cd971
+MD5 (squid/squid-1.1.4-src.tar.gz) = 547d7424af78e16bb74435093eef2aeb
+MD5 (squid/ftpget.c.patch) = 8b0b2a43c2ac6b2674a111efe9248e40
+MD5 (squid/icp.c.patch) = 75dfd4b30822c549b857acc5929a73e8
+MD5 (squid/ipcache.c.patch) = 0e6f55edeb835ae277e8bbc4c3b91803
+MD5 (squid/neighbors.c.patch) = 71f7ad22709093672200eb29b7057c05
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 637abb11b1bd..6084eea5b6ee 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	squid
-# Version required:	1.1.3
+# Version required:	1.1.4
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.16 1996/12/26 22:00:45 peter Exp $
+# $Id: Makefile,v 1.17 1997/01/07 18:49:06 peter Exp $
 #
 
-DISTNAME=	squid-1.1.3
+DISTNAME=	squid-1.1.4
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1/ \
@@ -15,6 +15,11 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.1/
 EXTRACT_SUFX=	-src.tar.gz
 
+PATCH_SITES+=   http://squid.nlanr.net/Squid/1.1/1.1.4/
+PATCHFILES+=    ftpget.c.patch icp.c.patch ipcache.c.patch neighbors.c.patch
+
+DIST_SUBDIR=	squid
+
 MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
@@ -24,6 +29,18 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
+# If you need to set any of these options, read the source and uncomment
+# these if appropriate.
+#MAKE_ENV+=	HOST_OPT="-DCACHEMGR_HOSTNAME=\"getfullhostname()\""
+#MAKE_ENV+=	AUTH_OPT="-DUSE_PROXY_AUTH=1"
+#MAKE_ENV+=	LOG_HDRS_OPT="-DLOG_FULL_HEADERS=1"
+#MAKE_ENV+=	ICMP_OPT="-DUSE_ICMP=1"
+#MAKE_ENV+=	DELAY_HACK="-DDELAY_HACK=1"
+#MAKE_ENV+=	USERAGENT_OPT="-DUSE_USERAGENT_LOG=1"
+#MAKE_ENV+=	KILL_PARENT_OPT="-DKILL_PARENT_OPT"
+#MAKE_ENV+=	USE_POLL_OPT="-DUSE_POLL"
+#MAKE_ENV+=	ANON_OPT="-DUSE_ANONYMIZER"
+
 post-install:
 .for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
diff --git a/www/squid25/distinfo b/www/squid25/distinfo
index e5cf107d44ae..c970f6b39dd1 100644
--- a/www/squid25/distinfo
+++ b/www/squid25/distinfo
@@ -1 +1,5 @@
-MD5 (squid-1.1.3-src.tar.gz) = e5687bc711b53c74323f06a52c1cd971
+MD5 (squid/squid-1.1.4-src.tar.gz) = 547d7424af78e16bb74435093eef2aeb
+MD5 (squid/ftpget.c.patch) = 8b0b2a43c2ac6b2674a111efe9248e40
+MD5 (squid/icp.c.patch) = 75dfd4b30822c549b857acc5929a73e8
+MD5 (squid/ipcache.c.patch) = 0e6f55edeb835ae277e8bbc4c3b91803
+MD5 (squid/neighbors.c.patch) = 71f7ad22709093672200eb29b7057c05
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 637abb11b1bd..6084eea5b6ee 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	squid
-# Version required:	1.1.3
+# Version required:	1.1.4
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.16 1996/12/26 22:00:45 peter Exp $
+# $Id: Makefile,v 1.17 1997/01/07 18:49:06 peter Exp $
 #
 
-DISTNAME=	squid-1.1.3
+DISTNAME=	squid-1.1.4
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1/ \
@@ -15,6 +15,11 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.1/
 EXTRACT_SUFX=	-src.tar.gz
 
+PATCH_SITES+=   http://squid.nlanr.net/Squid/1.1/1.1.4/
+PATCHFILES+=    ftpget.c.patch icp.c.patch ipcache.c.patch neighbors.c.patch
+
+DIST_SUBDIR=	squid
+
 MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
@@ -24,6 +29,18 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
+# If you need to set any of these options, read the source and uncomment
+# these if appropriate.
+#MAKE_ENV+=	HOST_OPT="-DCACHEMGR_HOSTNAME=\"getfullhostname()\""
+#MAKE_ENV+=	AUTH_OPT="-DUSE_PROXY_AUTH=1"
+#MAKE_ENV+=	LOG_HDRS_OPT="-DLOG_FULL_HEADERS=1"
+#MAKE_ENV+=	ICMP_OPT="-DUSE_ICMP=1"
+#MAKE_ENV+=	DELAY_HACK="-DDELAY_HACK=1"
+#MAKE_ENV+=	USERAGENT_OPT="-DUSE_USERAGENT_LOG=1"
+#MAKE_ENV+=	KILL_PARENT_OPT="-DKILL_PARENT_OPT"
+#MAKE_ENV+=	USE_POLL_OPT="-DUSE_POLL"
+#MAKE_ENV+=	ANON_OPT="-DUSE_ANONYMIZER"
+
 post-install:
 .for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
diff --git a/www/squid26/distinfo b/www/squid26/distinfo
index e5cf107d44ae..c970f6b39dd1 100644
--- a/www/squid26/distinfo
+++ b/www/squid26/distinfo
@@ -1 +1,5 @@
-MD5 (squid-1.1.3-src.tar.gz) = e5687bc711b53c74323f06a52c1cd971
+MD5 (squid/squid-1.1.4-src.tar.gz) = 547d7424af78e16bb74435093eef2aeb
+MD5 (squid/ftpget.c.patch) = 8b0b2a43c2ac6b2674a111efe9248e40
+MD5 (squid/icp.c.patch) = 75dfd4b30822c549b857acc5929a73e8
+MD5 (squid/ipcache.c.patch) = 0e6f55edeb835ae277e8bbc4c3b91803
+MD5 (squid/neighbors.c.patch) = 71f7ad22709093672200eb29b7057c05
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 637abb11b1bd..6084eea5b6ee 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	squid
-# Version required:	1.1.3
+# Version required:	1.1.4
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.16 1996/12/26 22:00:45 peter Exp $
+# $Id: Makefile,v 1.17 1997/01/07 18:49:06 peter Exp $
 #
 
-DISTNAME=	squid-1.1.3
+DISTNAME=	squid-1.1.4
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1/ \
@@ -15,6 +15,11 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.1/
 EXTRACT_SUFX=	-src.tar.gz
 
+PATCH_SITES+=   http://squid.nlanr.net/Squid/1.1/1.1.4/
+PATCHFILES+=    ftpget.c.patch icp.c.patch ipcache.c.patch neighbors.c.patch
+
+DIST_SUBDIR=	squid
+
 MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
@@ -24,6 +29,18 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
+# If you need to set any of these options, read the source and uncomment
+# these if appropriate.
+#MAKE_ENV+=	HOST_OPT="-DCACHEMGR_HOSTNAME=\"getfullhostname()\""
+#MAKE_ENV+=	AUTH_OPT="-DUSE_PROXY_AUTH=1"
+#MAKE_ENV+=	LOG_HDRS_OPT="-DLOG_FULL_HEADERS=1"
+#MAKE_ENV+=	ICMP_OPT="-DUSE_ICMP=1"
+#MAKE_ENV+=	DELAY_HACK="-DDELAY_HACK=1"
+#MAKE_ENV+=	USERAGENT_OPT="-DUSE_USERAGENT_LOG=1"
+#MAKE_ENV+=	KILL_PARENT_OPT="-DKILL_PARENT_OPT"
+#MAKE_ENV+=	USE_POLL_OPT="-DUSE_POLL"
+#MAKE_ENV+=	ANON_OPT="-DUSE_ANONYMIZER"
+
 post-install:
 .for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
diff --git a/www/squid27/distinfo b/www/squid27/distinfo
index e5cf107d44ae..c970f6b39dd1 100644
--- a/www/squid27/distinfo
+++ b/www/squid27/distinfo
@@ -1 +1,5 @@
-MD5 (squid-1.1.3-src.tar.gz) = e5687bc711b53c74323f06a52c1cd971
+MD5 (squid/squid-1.1.4-src.tar.gz) = 547d7424af78e16bb74435093eef2aeb
+MD5 (squid/ftpget.c.patch) = 8b0b2a43c2ac6b2674a111efe9248e40
+MD5 (squid/icp.c.patch) = 75dfd4b30822c549b857acc5929a73e8
+MD5 (squid/ipcache.c.patch) = 0e6f55edeb835ae277e8bbc4c3b91803
+MD5 (squid/neighbors.c.patch) = 71f7ad22709093672200eb29b7057c05
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 637abb11b1bd..6084eea5b6ee 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	squid
-# Version required:	1.1.3
+# Version required:	1.1.4
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.16 1996/12/26 22:00:45 peter Exp $
+# $Id: Makefile,v 1.17 1997/01/07 18:49:06 peter Exp $
 #
 
-DISTNAME=	squid-1.1.3
+DISTNAME=	squid-1.1.4
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1/ \
@@ -15,6 +15,11 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.1/
 EXTRACT_SUFX=	-src.tar.gz
 
+PATCH_SITES+=   http://squid.nlanr.net/Squid/1.1/1.1.4/
+PATCHFILES+=    ftpget.c.patch icp.c.patch ipcache.c.patch neighbors.c.patch
+
+DIST_SUBDIR=	squid
+
 MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
@@ -24,6 +29,18 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
+# If you need to set any of these options, read the source and uncomment
+# these if appropriate.
+#MAKE_ENV+=	HOST_OPT="-DCACHEMGR_HOSTNAME=\"getfullhostname()\""
+#MAKE_ENV+=	AUTH_OPT="-DUSE_PROXY_AUTH=1"
+#MAKE_ENV+=	LOG_HDRS_OPT="-DLOG_FULL_HEADERS=1"
+#MAKE_ENV+=	ICMP_OPT="-DUSE_ICMP=1"
+#MAKE_ENV+=	DELAY_HACK="-DDELAY_HACK=1"
+#MAKE_ENV+=	USERAGENT_OPT="-DUSE_USERAGENT_LOG=1"
+#MAKE_ENV+=	KILL_PARENT_OPT="-DKILL_PARENT_OPT"
+#MAKE_ENV+=	USE_POLL_OPT="-DUSE_POLL"
+#MAKE_ENV+=	ANON_OPT="-DUSE_ANONYMIZER"
+
 post-install:
 .for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
diff --git a/www/squid30/distinfo b/www/squid30/distinfo
index e5cf107d44ae..c970f6b39dd1 100644
--- a/www/squid30/distinfo
+++ b/www/squid30/distinfo
@@ -1 +1,5 @@
-MD5 (squid-1.1.3-src.tar.gz) = e5687bc711b53c74323f06a52c1cd971
+MD5 (squid/squid-1.1.4-src.tar.gz) = 547d7424af78e16bb74435093eef2aeb
+MD5 (squid/ftpget.c.patch) = 8b0b2a43c2ac6b2674a111efe9248e40
+MD5 (squid/icp.c.patch) = 75dfd4b30822c549b857acc5929a73e8
+MD5 (squid/ipcache.c.patch) = 0e6f55edeb835ae277e8bbc4c3b91803
+MD5 (squid/neighbors.c.patch) = 71f7ad22709093672200eb29b7057c05
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 637abb11b1bd..6084eea5b6ee 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	squid
-# Version required:	1.1.3
+# Version required:	1.1.4
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.16 1996/12/26 22:00:45 peter Exp $
+# $Id: Makefile,v 1.17 1997/01/07 18:49:06 peter Exp $
 #
 
-DISTNAME=	squid-1.1.3
+DISTNAME=	squid-1.1.4
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1/ \
@@ -15,6 +15,11 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.1/
 EXTRACT_SUFX=	-src.tar.gz
 
+PATCH_SITES+=   http://squid.nlanr.net/Squid/1.1/1.1.4/
+PATCHFILES+=    ftpget.c.patch icp.c.patch ipcache.c.patch neighbors.c.patch
+
+DIST_SUBDIR=	squid
+
 MAINTAINER=	peter@freebsd.org
 
 GNU_CONFIGURE=	yes
@@ -24,6 +29,18 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 
+# If you need to set any of these options, read the source and uncomment
+# these if appropriate.
+#MAKE_ENV+=	HOST_OPT="-DCACHEMGR_HOSTNAME=\"getfullhostname()\""
+#MAKE_ENV+=	AUTH_OPT="-DUSE_PROXY_AUTH=1"
+#MAKE_ENV+=	LOG_HDRS_OPT="-DLOG_FULL_HEADERS=1"
+#MAKE_ENV+=	ICMP_OPT="-DUSE_ICMP=1"
+#MAKE_ENV+=	DELAY_HACK="-DDELAY_HACK=1"
+#MAKE_ENV+=	USERAGENT_OPT="-DUSE_USERAGENT_LOG=1"
+#MAKE_ENV+=	KILL_PARENT_OPT="-DKILL_PARENT_OPT"
+#MAKE_ENV+=	USE_POLL_OPT="-DUSE_POLL"
+#MAKE_ENV+=	ANON_OPT="-DUSE_ANONYMIZER"
+
 post-install:
 .for file in cachemgr.cgi client dnsserver ftpget pinger squid
 	strip ${PREFIX}/sbin/${file}
diff --git a/www/squid31/distinfo b/www/squid31/distinfo
index e5cf107d44ae..c970f6b39dd1 100644
--- a/www/squid31/distinfo
+++ b/www/squid31/distinfo
@@ -1 +1,5 @@
-MD5 (squid-1.1.3-src.tar.gz) = e5687bc711b53c74323f06a52c1cd971
+MD5 (squid/squid-1.1.4-src.tar.gz) = 547d7424af78e16bb74435093eef2aeb
+MD5 (squid/ftpget.c.patch) = 8b0b2a43c2ac6b2674a111efe9248e40
+MD5 (squid/icp.c.patch) = 75dfd4b30822c549b857acc5929a73e8
+MD5 (squid/ipcache.c.patch) = 0e6f55edeb835ae277e8bbc4c3b91803
+MD5 (squid/neighbors.c.patch) = 71f7ad22709093672200eb29b7057c05