Initial squid 1.2beta8 port. As the squid www page says:

"We are currently in a beta-test period for Squid-1.2. If you like
seeing Squid coredump frequently, please join us!"

"This is BETA software. Do not run this on your production systems.
Logfile formats are subject (and likely) to change at any time without
warning.

Here is a brief list of the major features of this version:
   HTTP/1.1 persisitent connections.
   Lower VM usage; in-transit objects are not held fully in memory.
   Totally independent swap directories.
   Customizable error texts.
   FTP supported internally; no more ftpget.
   Asynchronous disk operations (optional, requires pthreads library).
   Internal icons for FTP and gopher directories.
   snprintf() used everywhere instead of sprintf().
   ...and many more!
"
As well, there is support for using MD5 or SHA hashes of URL's in the
cache index for space (and speed?) savings, SNMP support, poll(2) is
used by default, etc.

Please see  http://squid.nlanr.net/Squid/1.2.beta/  before using.

6 files changed, 87 insertions, 21 deletions

diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index a1ac89a14a7c..716395f91aa5 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -1,26 +1,27 @@
 # New ports collection makefile for:	squid
-# Version required:	1.1.18
+# Version required:	1.2-beta8
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.33 1997/10/25 02:51:12 peter Exp $
+# $Id: Makefile,v 1.34 1997/11/01 11:10:35 peter Exp $
 #
 
-DISTNAME=	squid-1.1.18
+DISTNAME=	squid-1.2.beta8
+PKGNAME=	squid-1.2b8
 CATEGORIES=	www
 MASTER_SITES=  \
-	ftp://squid.nlanr.net/pub/squid-1.1/ \
-	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1/ \
-	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-1.1/ \
-	ftp://ftp.net.lut.ac.uk/squid/squid-1.1/
+	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/
 EXTRACT_SUFX=	-src.tar.gz
 
-#PATCH_SITES+=   http://squid.nlanr.net/Squid/1.1/1.1.11/
-#PATCHFILES+=    config.h.in.patch long-dns-coredump.patch
+PATCH_SITES+=   http://squid.nlanr.net/Squid/1.2.beta/
+PATCHFILES+=    1.2.beta8.patches
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.1.18
+DIST_SUBDIR=	squid1.2b8
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
@@ -31,22 +32,29 @@ 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"
 # do NOT define both USE_SPLAY_TREE and USE_BIN_TREE at the same time!
 #MAKE_ENV+=	USE_SPLAY_TREE="-DUSE_SPLAY_TREE"
 #MAKE_ENV+=	USE_BIN_TREE="-DUSE_BIN_TREE"
-#MAKE_ENV+=	RELOAD_INTO_IMS="-DRELOAD_INTO_IMS"
-#MAKE_ENV+=	UNDERSCORES_OPT="-DALLOW_HOSTNAME_UNDERSCORES"
+#MAKE_ENV+=	ALARM_UPDATES_TIME="-DALARM_UPDATES_TIME=1"
+#MAKE_ENV+=	STORE_KEY_SHA="-DSTORE_KEY_SHA=1"
+#MAKE_ENV+=	STORE_KEY_MD5="-DSTORE_KEY_MD5=1"
+#MAKE_ENV+=	USE_ASYNC_IO="-DUSE_ASYNC_IO=1"
+
+# To turn on SNMP, uncomment these three.  I'm not sure how this works,
+# I think you need some sort of snmp multiplexor if you run another snmp
+# server as well.
+#MAKE_ENV+=	SQUID_SNMP="-DSQUID_SNMP=1"
+#MAKE_ENV+=	SQUID_MIB="mib.txt"
+#MAKE_ENV+=	SQUID_SNMP_LIBS="-L../snmplib -lsnmp"
+
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
-.for file in cachemgr.cgi client dnsserver ftpget pinger squid
+.for file in cachemgr.cgi client dnsserver pinger squid
 	if [ -f ${PREFIX}/sbin/${file} ] ; then \
 		strip ${PREFIX}/sbin/${file} ; \
 	fi
diff --git a/www/squid24/distinfo b/www/squid24/distinfo
index b76747301a50..66178dc21ff1 100644
--- a/www/squid24/distinfo
+++ b/www/squid24/distinfo
@@ -1 +1,2 @@
-MD5 (squid1.1.18/squid-1.1.18-src.tar.gz) = b1e0cf554c71ef824bd405276e668c1d
+MD5 (squid1.2b8/squid-1.2.beta8-src.tar.gz) = b10a9891bb6d629fddd410021eb6591a
+MD5 (squid1.2b8/1.2.beta8.patches) = 4a56f89d4b29aa8cd8acf97d0c6a4233
diff --git a/www/squid24/pkg-comment b/www/squid24/pkg-comment
index 4df36232a32c..eec4966b0f07 100644
--- a/www/squid24/pkg-comment
+++ b/www/squid24/pkg-comment
@@ -1 +1 @@
-Post-Harvest_cached WWW proxy cache and accelerator
+The successful WWW proxy cache and accelerator
diff --git a/www/squid24/pkg-descr b/www/squid24/pkg-descr
index bf7cae7f22f6..63aed7c3c1ff 100644
--- a/www/squid24/pkg-descr
+++ b/www/squid24/pkg-descr
@@ -1,3 +1,9 @@
+		******** 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/pkg-install b/www/squid24/pkg-install
index d85e7bbe68b7..66143d6a4650 100644
--- a/www/squid24/pkg-install
+++ b/www/squid24/pkg-install
@@ -26,6 +26,12 @@ case $2 in
 	[ -f ${PREFIX:-/usr/local}/etc/squid/squid.conf ] || \
 		cp -fp	${PREFIX:-/usr/local}/etc/squid/squid.conf.default \
 			${PREFIX:-/usr/local}/etc/squid/squid.conf
+	[ -f ${PREFIX:-/usr/local}/etc/squid/mime.conf ] || \
+		cp -fp	${PREFIX:-/usr/local}/etc/squid/mime.conf.default \
+			${PREFIX:-/usr/local}/etc/squid/mime.conf
+	[ -f ${PREFIX:-/usr/local}/etc/squid/mib.txt ] || \
+		cp -fp	${PREFIX:-/usr/local}/etc/squid/mib.txt.default \
+			${PREFIX:-/usr/local}/etc/squid/mib.txt
 	${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid/squid.conf
 	;;
     *)
diff --git a/www/squid24/pkg-plist b/www/squid24/pkg-plist
index 05cb21cc7ebf..c0bc2c610f68 100644
--- a/www/squid24/pkg-plist
+++ b/www/squid24/pkg-plist
@@ -1,13 +1,58 @@
+etc/rc.d/squid.sh
+etc/squid/errors/ERR_ACCESS_DENIED
+etc/squid/errors/ERR_CANNOT_FORWARD
+etc/squid/errors/ERR_CLIENT_ABORT
+etc/squid/errors/ERR_CONNECT_FAIL
+etc/squid/errors/ERR_DNS_FAIL
+etc/squid/errors/ERR_FTP_DISABLED
+etc/squid/errors/ERR_FTP_FAILURE
+etc/squid/errors/ERR_INVALID_REQ
+etc/squid/errors/ERR_INVALID_URL
+etc/squid/errors/ERR_LIFETIME_EXP
+etc/squid/errors/ERR_NO_RELAY
+etc/squid/errors/ERR_READ_ERROR
+etc/squid/errors/ERR_READ_TIMEOUT
+etc/squid/errors/ERR_SOCKET_FAILURE
+etc/squid/errors/ERR_UNSUP_REQ
+etc/squid/errors/ERR_WRITE_ERROR
+etc/squid/errors/ERR_ZERO_SIZE_OBJECT
+etc/squid/icons/anthony-binhex.gif
+etc/squid/icons/anthony-bomb.gif
+etc/squid/icons/anthony-box.gif
+etc/squid/icons/anthony-box2.gif
+etc/squid/icons/anthony-c.gif
+etc/squid/icons/anthony-compressed.gif
+etc/squid/icons/anthony-dir.gif
+etc/squid/icons/anthony-dirup.gif
+etc/squid/icons/anthony-dvi.gif
+etc/squid/icons/anthony-f.gif
+etc/squid/icons/anthony-image.gif
+etc/squid/icons/anthony-image2.gif
+etc/squid/icons/anthony-layout.gif
+etc/squid/icons/anthony-link.gif
+etc/squid/icons/anthony-movie.gif
+etc/squid/icons/anthony-pdf.gif
+etc/squid/icons/anthony-portal.gif
+etc/squid/icons/anthony-ps.gif
+etc/squid/icons/anthony-quill.gif
+etc/squid/icons/anthony-script.gif
+etc/squid/icons/anthony-sound.gif
+etc/squid/icons/anthony-tar.gif
+etc/squid/icons/anthony-tex.gif
+etc/squid/icons/anthony-text.gif
+etc/squid/icons/anthony-unknown.gif
+etc/squid/icons/anthony-xbm.gif
+etc/squid/icons/anthony-xpm.gif
+etc/squid/mib.txt.default
+etc/squid/mime.conf.default
+etc/squid/squid.conf.default
 sbin/RunAccel
 sbin/RunCache
 sbin/cachemgr.cgi
 sbin/client
 sbin/dnsserver
-sbin/ftpget
 sbin/pinger
 sbin/squid
 sbin/unlinkd
-etc/rc.d/squid.sh
-etc/squid/squid.conf.default
 @exec mkdir -p %D/squid/cache
 @exec mkdir -p %D/squid/logs