Index: head/www/squid/Makefile
===================================================================
--- head/www/squid/Makefile	(revision 10317)
+++ head/www/squid/Makefile	(revision 10318)
@@ -1,93 +1,95 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta17
+# Version required:	1.2-beta18
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.46 1998/03/09 03:35:09 peter Exp $
+# $Id: Makefile,v 1.47 1998/03/20 14:00:51 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta17
-PKGNAME=	squid-1.2b17
+DISTNAME=	squid-1.2.beta18
+PKGNAME=	squid-1.2b18
 CATEGORIES=	www
 MASTER_SITES=  \
 	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.2.beta/
-#PATCHFILES+=    1.2.beta17.patch
+#PATCHFILES+=    1.2.beta18.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b17
+DIST_SUBDIR=	squid1.2b18
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--localstatedir=${PREFIX}/squid
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 NO_LATEST_LINK=	yes
 
 # Some other configure options..
 #  - Compile and use the malloc package from Doug Lea
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
 #  - Use tree function to store ACL lists
 #CONFIGURE_ARGS+= --enable-acltree=bin
 #CONFIGURE_ARGS+= --enable-acltree=splay
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Use ASYNC disk I/O (Requires real pthreads, libc_r probably doesn't work)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
 #  - Enable delay hack to limit bandwidth usage
 #CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable generic memory use tracing
+#CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
 #CONFIGURE_ARGS+= --enable-kill-parent
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
 #CONFIGURE_ARGS+= --enable-time-hack
 #  - Set an explicit hostname in cachemgr.cgi
 #CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
 .for file in client squid
 	if [ -f ${PREFIX}/sbin/${file} ] ; then \
 		strip ${PREFIX}/sbin/${file} ; \
 	fi
 .endfor
 .for file in cachemgr.cgi dnsserver pinger unlinkd
 	if [ -f ${PREFIX}/libexec/${file} ] ; then \
 		strip ${PREFIX}/libexec/${file} ; \
 	fi
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
 		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "	(cd /tmp; /usr/local/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
 .include <bsd.port.mk>
 
 # Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
 PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}

Property changes on: head/www/squid/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property
Index: head/www/squid/distinfo
===================================================================
--- head/www/squid/distinfo	(revision 10317)
+++ head/www/squid/distinfo	(revision 10318)
@@ -1 +1 @@
-MD5 (squid1.2b17/squid-1.2.beta17-src.tar.gz) = 9a4fd60baa6d7b98cb7e4c2ffc2dd334
+MD5 (squid1.2b18/squid-1.2.beta18-src.tar.gz) = 97e6269b2ee749e3dcd10f8e6d9501e6

Property changes on: head/www/squid/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.39
\ No newline at end of property
+1.40
\ No newline at end of property
Index: head/www/squid/pkg-plist
===================================================================
--- head/www/squid/pkg-plist	(revision 10317)
+++ head/www/squid/pkg-plist	(revision 10318)
@@ -1,65 +1,66 @@
 etc/rc.d/squid.sh
 etc/squid/errors/ERR_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_MGR_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_FORWARDING_DENIED
 etc/squid/errors/ERR_FTP_DISABLED
 etc/squid/errors/ERR_FTP_FAILURE
 etc/squid/errors/ERR_FTP_PUT_CREATED
 etc/squid/errors/ERR_FTP_PUT_ERROR
 etc/squid/errors/ERR_FTP_PUT_MODIFIED
 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_ONLY_IF_CACHED_MISS
 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_URN_RESOLVE
 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
 etc/squid/mime.conf.default
 etc/squid/squid.conf.default
 libexec/cachemgr.cgi
 libexec/dnsserver
 libexec/pinger
 libexec/unlinkd
 sbin/RunAccel
 sbin/RunCache
 sbin/client
 sbin/squid
 @exec mkdir -p %D/squid/cache
 @exec mkdir -p %D/squid/logs

Property changes on: head/www/squid/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/www/squid22/Makefile
===================================================================
--- head/www/squid22/Makefile	(revision 10317)
+++ head/www/squid22/Makefile	(revision 10318)
@@ -1,93 +1,95 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta17
+# Version required:	1.2-beta18
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.46 1998/03/09 03:35:09 peter Exp $
+# $Id: Makefile,v 1.47 1998/03/20 14:00:51 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta17
-PKGNAME=	squid-1.2b17
+DISTNAME=	squid-1.2.beta18
+PKGNAME=	squid-1.2b18
 CATEGORIES=	www
 MASTER_SITES=  \
 	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.2.beta/
-#PATCHFILES+=    1.2.beta17.patch
+#PATCHFILES+=    1.2.beta18.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b17
+DIST_SUBDIR=	squid1.2b18
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--localstatedir=${PREFIX}/squid
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 NO_LATEST_LINK=	yes
 
 # Some other configure options..
 #  - Compile and use the malloc package from Doug Lea
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
 #  - Use tree function to store ACL lists
 #CONFIGURE_ARGS+= --enable-acltree=bin
 #CONFIGURE_ARGS+= --enable-acltree=splay
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Use ASYNC disk I/O (Requires real pthreads, libc_r probably doesn't work)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
 #  - Enable delay hack to limit bandwidth usage
 #CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable generic memory use tracing
+#CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
 #CONFIGURE_ARGS+= --enable-kill-parent
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
 #CONFIGURE_ARGS+= --enable-time-hack
 #  - Set an explicit hostname in cachemgr.cgi
 #CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
 .for file in client squid
 	if [ -f ${PREFIX}/sbin/${file} ] ; then \
 		strip ${PREFIX}/sbin/${file} ; \
 	fi
 .endfor
 .for file in cachemgr.cgi dnsserver pinger unlinkd
 	if [ -f ${PREFIX}/libexec/${file} ] ; then \
 		strip ${PREFIX}/libexec/${file} ; \
 	fi
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
 		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "	(cd /tmp; /usr/local/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
 .include <bsd.port.mk>
 
 # Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
 PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}

Property changes on: head/www/squid22/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property
Index: head/www/squid22/distinfo
===================================================================
--- head/www/squid22/distinfo	(revision 10317)
+++ head/www/squid22/distinfo	(revision 10318)
@@ -1 +1 @@
-MD5 (squid1.2b17/squid-1.2.beta17-src.tar.gz) = 9a4fd60baa6d7b98cb7e4c2ffc2dd334
+MD5 (squid1.2b18/squid-1.2.beta18-src.tar.gz) = 97e6269b2ee749e3dcd10f8e6d9501e6

Property changes on: head/www/squid22/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.39
\ No newline at end of property
+1.40
\ No newline at end of property
Index: head/www/squid22/pkg-plist
===================================================================
--- head/www/squid22/pkg-plist	(revision 10317)
+++ head/www/squid22/pkg-plist	(revision 10318)
@@ -1,65 +1,66 @@
 etc/rc.d/squid.sh
 etc/squid/errors/ERR_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_MGR_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_FORWARDING_DENIED
 etc/squid/errors/ERR_FTP_DISABLED
 etc/squid/errors/ERR_FTP_FAILURE
 etc/squid/errors/ERR_FTP_PUT_CREATED
 etc/squid/errors/ERR_FTP_PUT_ERROR
 etc/squid/errors/ERR_FTP_PUT_MODIFIED
 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_ONLY_IF_CACHED_MISS
 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_URN_RESOLVE
 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
 etc/squid/mime.conf.default
 etc/squid/squid.conf.default
 libexec/cachemgr.cgi
 libexec/dnsserver
 libexec/pinger
 libexec/unlinkd
 sbin/RunAccel
 sbin/RunCache
 sbin/client
 sbin/squid
 @exec mkdir -p %D/squid/cache
 @exec mkdir -p %D/squid/logs

Property changes on: head/www/squid22/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/www/squid23/Makefile
===================================================================
--- head/www/squid23/Makefile	(revision 10317)
+++ head/www/squid23/Makefile	(revision 10318)
@@ -1,93 +1,95 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta17
+# Version required:	1.2-beta18
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.46 1998/03/09 03:35:09 peter Exp $
+# $Id: Makefile,v 1.47 1998/03/20 14:00:51 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta17
-PKGNAME=	squid-1.2b17
+DISTNAME=	squid-1.2.beta18
+PKGNAME=	squid-1.2b18
 CATEGORIES=	www
 MASTER_SITES=  \
 	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.2.beta/
-#PATCHFILES+=    1.2.beta17.patch
+#PATCHFILES+=    1.2.beta18.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b17
+DIST_SUBDIR=	squid1.2b18
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--localstatedir=${PREFIX}/squid
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 NO_LATEST_LINK=	yes
 
 # Some other configure options..
 #  - Compile and use the malloc package from Doug Lea
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
 #  - Use tree function to store ACL lists
 #CONFIGURE_ARGS+= --enable-acltree=bin
 #CONFIGURE_ARGS+= --enable-acltree=splay
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Use ASYNC disk I/O (Requires real pthreads, libc_r probably doesn't work)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
 #  - Enable delay hack to limit bandwidth usage
 #CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable generic memory use tracing
+#CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
 #CONFIGURE_ARGS+= --enable-kill-parent
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
 #CONFIGURE_ARGS+= --enable-time-hack
 #  - Set an explicit hostname in cachemgr.cgi
 #CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
 .for file in client squid
 	if [ -f ${PREFIX}/sbin/${file} ] ; then \
 		strip ${PREFIX}/sbin/${file} ; \
 	fi
 .endfor
 .for file in cachemgr.cgi dnsserver pinger unlinkd
 	if [ -f ${PREFIX}/libexec/${file} ] ; then \
 		strip ${PREFIX}/libexec/${file} ; \
 	fi
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
 		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "	(cd /tmp; /usr/local/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
 .include <bsd.port.mk>
 
 # Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
 PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}

Property changes on: head/www/squid23/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property
Index: head/www/squid23/distinfo
===================================================================
--- head/www/squid23/distinfo	(revision 10317)
+++ head/www/squid23/distinfo	(revision 10318)
@@ -1 +1 @@
-MD5 (squid1.2b17/squid-1.2.beta17-src.tar.gz) = 9a4fd60baa6d7b98cb7e4c2ffc2dd334
+MD5 (squid1.2b18/squid-1.2.beta18-src.tar.gz) = 97e6269b2ee749e3dcd10f8e6d9501e6

Property changes on: head/www/squid23/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.39
\ No newline at end of property
+1.40
\ No newline at end of property
Index: head/www/squid23/pkg-plist
===================================================================
--- head/www/squid23/pkg-plist	(revision 10317)
+++ head/www/squid23/pkg-plist	(revision 10318)
@@ -1,65 +1,66 @@
 etc/rc.d/squid.sh
 etc/squid/errors/ERR_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_MGR_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_FORWARDING_DENIED
 etc/squid/errors/ERR_FTP_DISABLED
 etc/squid/errors/ERR_FTP_FAILURE
 etc/squid/errors/ERR_FTP_PUT_CREATED
 etc/squid/errors/ERR_FTP_PUT_ERROR
 etc/squid/errors/ERR_FTP_PUT_MODIFIED
 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_ONLY_IF_CACHED_MISS
 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_URN_RESOLVE
 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
 etc/squid/mime.conf.default
 etc/squid/squid.conf.default
 libexec/cachemgr.cgi
 libexec/dnsserver
 libexec/pinger
 libexec/unlinkd
 sbin/RunAccel
 sbin/RunCache
 sbin/client
 sbin/squid
 @exec mkdir -p %D/squid/cache
 @exec mkdir -p %D/squid/logs

Property changes on: head/www/squid23/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/www/squid24/Makefile
===================================================================
--- head/www/squid24/Makefile	(revision 10317)
+++ head/www/squid24/Makefile	(revision 10318)
@@ -1,93 +1,95 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta17
+# Version required:	1.2-beta18
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.46 1998/03/09 03:35:09 peter Exp $
+# $Id: Makefile,v 1.47 1998/03/20 14:00:51 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta17
-PKGNAME=	squid-1.2b17
+DISTNAME=	squid-1.2.beta18
+PKGNAME=	squid-1.2b18
 CATEGORIES=	www
 MASTER_SITES=  \
 	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.2.beta/
-#PATCHFILES+=    1.2.beta17.patch
+#PATCHFILES+=    1.2.beta18.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b17
+DIST_SUBDIR=	squid1.2b18
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--localstatedir=${PREFIX}/squid
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 NO_LATEST_LINK=	yes
 
 # Some other configure options..
 #  - Compile and use the malloc package from Doug Lea
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
 #  - Use tree function to store ACL lists
 #CONFIGURE_ARGS+= --enable-acltree=bin
 #CONFIGURE_ARGS+= --enable-acltree=splay
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Use ASYNC disk I/O (Requires real pthreads, libc_r probably doesn't work)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
 #  - Enable delay hack to limit bandwidth usage
 #CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable generic memory use tracing
+#CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
 #CONFIGURE_ARGS+= --enable-kill-parent
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
 #CONFIGURE_ARGS+= --enable-time-hack
 #  - Set an explicit hostname in cachemgr.cgi
 #CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
 .for file in client squid
 	if [ -f ${PREFIX}/sbin/${file} ] ; then \
 		strip ${PREFIX}/sbin/${file} ; \
 	fi
 .endfor
 .for file in cachemgr.cgi dnsserver pinger unlinkd
 	if [ -f ${PREFIX}/libexec/${file} ] ; then \
 		strip ${PREFIX}/libexec/${file} ; \
 	fi
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
 		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "	(cd /tmp; /usr/local/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
 .include <bsd.port.mk>
 
 # Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
 PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}

Property changes on: head/www/squid24/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property
Index: head/www/squid24/distinfo
===================================================================
--- head/www/squid24/distinfo	(revision 10317)
+++ head/www/squid24/distinfo	(revision 10318)
@@ -1 +1 @@
-MD5 (squid1.2b17/squid-1.2.beta17-src.tar.gz) = 9a4fd60baa6d7b98cb7e4c2ffc2dd334
+MD5 (squid1.2b18/squid-1.2.beta18-src.tar.gz) = 97e6269b2ee749e3dcd10f8e6d9501e6

Property changes on: head/www/squid24/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.39
\ No newline at end of property
+1.40
\ No newline at end of property
Index: head/www/squid24/pkg-plist
===================================================================
--- head/www/squid24/pkg-plist	(revision 10317)
+++ head/www/squid24/pkg-plist	(revision 10318)
@@ -1,65 +1,66 @@
 etc/rc.d/squid.sh
 etc/squid/errors/ERR_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_MGR_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_FORWARDING_DENIED
 etc/squid/errors/ERR_FTP_DISABLED
 etc/squid/errors/ERR_FTP_FAILURE
 etc/squid/errors/ERR_FTP_PUT_CREATED
 etc/squid/errors/ERR_FTP_PUT_ERROR
 etc/squid/errors/ERR_FTP_PUT_MODIFIED
 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_ONLY_IF_CACHED_MISS
 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_URN_RESOLVE
 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
 etc/squid/mime.conf.default
 etc/squid/squid.conf.default
 libexec/cachemgr.cgi
 libexec/dnsserver
 libexec/pinger
 libexec/unlinkd
 sbin/RunAccel
 sbin/RunCache
 sbin/client
 sbin/squid
 @exec mkdir -p %D/squid/cache
 @exec mkdir -p %D/squid/logs

Property changes on: head/www/squid24/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/www/squid25/Makefile
===================================================================
--- head/www/squid25/Makefile	(revision 10317)
+++ head/www/squid25/Makefile	(revision 10318)
@@ -1,93 +1,95 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta17
+# Version required:	1.2-beta18
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.46 1998/03/09 03:35:09 peter Exp $
+# $Id: Makefile,v 1.47 1998/03/20 14:00:51 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta17
-PKGNAME=	squid-1.2b17
+DISTNAME=	squid-1.2.beta18
+PKGNAME=	squid-1.2b18
 CATEGORIES=	www
 MASTER_SITES=  \
 	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.2.beta/
-#PATCHFILES+=    1.2.beta17.patch
+#PATCHFILES+=    1.2.beta18.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b17
+DIST_SUBDIR=	squid1.2b18
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--localstatedir=${PREFIX}/squid
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 NO_LATEST_LINK=	yes
 
 # Some other configure options..
 #  - Compile and use the malloc package from Doug Lea
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
 #  - Use tree function to store ACL lists
 #CONFIGURE_ARGS+= --enable-acltree=bin
 #CONFIGURE_ARGS+= --enable-acltree=splay
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Use ASYNC disk I/O (Requires real pthreads, libc_r probably doesn't work)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
 #  - Enable delay hack to limit bandwidth usage
 #CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable generic memory use tracing
+#CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
 #CONFIGURE_ARGS+= --enable-kill-parent
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
 #CONFIGURE_ARGS+= --enable-time-hack
 #  - Set an explicit hostname in cachemgr.cgi
 #CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
 .for file in client squid
 	if [ -f ${PREFIX}/sbin/${file} ] ; then \
 		strip ${PREFIX}/sbin/${file} ; \
 	fi
 .endfor
 .for file in cachemgr.cgi dnsserver pinger unlinkd
 	if [ -f ${PREFIX}/libexec/${file} ] ; then \
 		strip ${PREFIX}/libexec/${file} ; \
 	fi
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
 		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "	(cd /tmp; /usr/local/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
 .include <bsd.port.mk>
 
 # Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
 PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}

Property changes on: head/www/squid25/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property
Index: head/www/squid25/distinfo
===================================================================
--- head/www/squid25/distinfo	(revision 10317)
+++ head/www/squid25/distinfo	(revision 10318)
@@ -1 +1 @@
-MD5 (squid1.2b17/squid-1.2.beta17-src.tar.gz) = 9a4fd60baa6d7b98cb7e4c2ffc2dd334
+MD5 (squid1.2b18/squid-1.2.beta18-src.tar.gz) = 97e6269b2ee749e3dcd10f8e6d9501e6

Property changes on: head/www/squid25/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.39
\ No newline at end of property
+1.40
\ No newline at end of property
Index: head/www/squid25/pkg-plist
===================================================================
--- head/www/squid25/pkg-plist	(revision 10317)
+++ head/www/squid25/pkg-plist	(revision 10318)
@@ -1,65 +1,66 @@
 etc/rc.d/squid.sh
 etc/squid/errors/ERR_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_MGR_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_FORWARDING_DENIED
 etc/squid/errors/ERR_FTP_DISABLED
 etc/squid/errors/ERR_FTP_FAILURE
 etc/squid/errors/ERR_FTP_PUT_CREATED
 etc/squid/errors/ERR_FTP_PUT_ERROR
 etc/squid/errors/ERR_FTP_PUT_MODIFIED
 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_ONLY_IF_CACHED_MISS
 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_URN_RESOLVE
 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
 etc/squid/mime.conf.default
 etc/squid/squid.conf.default
 libexec/cachemgr.cgi
 libexec/dnsserver
 libexec/pinger
 libexec/unlinkd
 sbin/RunAccel
 sbin/RunCache
 sbin/client
 sbin/squid
 @exec mkdir -p %D/squid/cache
 @exec mkdir -p %D/squid/logs

Property changes on: head/www/squid25/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/www/squid26/Makefile
===================================================================
--- head/www/squid26/Makefile	(revision 10317)
+++ head/www/squid26/Makefile	(revision 10318)
@@ -1,93 +1,95 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta17
+# Version required:	1.2-beta18
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.46 1998/03/09 03:35:09 peter Exp $
+# $Id: Makefile,v 1.47 1998/03/20 14:00:51 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta17
-PKGNAME=	squid-1.2b17
+DISTNAME=	squid-1.2.beta18
+PKGNAME=	squid-1.2b18
 CATEGORIES=	www
 MASTER_SITES=  \
 	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.2.beta/
-#PATCHFILES+=    1.2.beta17.patch
+#PATCHFILES+=    1.2.beta18.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b17
+DIST_SUBDIR=	squid1.2b18
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--localstatedir=${PREFIX}/squid
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 NO_LATEST_LINK=	yes
 
 # Some other configure options..
 #  - Compile and use the malloc package from Doug Lea
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
 #  - Use tree function to store ACL lists
 #CONFIGURE_ARGS+= --enable-acltree=bin
 #CONFIGURE_ARGS+= --enable-acltree=splay
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Use ASYNC disk I/O (Requires real pthreads, libc_r probably doesn't work)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
 #  - Enable delay hack to limit bandwidth usage
 #CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable generic memory use tracing
+#CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
 #CONFIGURE_ARGS+= --enable-kill-parent
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
 #CONFIGURE_ARGS+= --enable-time-hack
 #  - Set an explicit hostname in cachemgr.cgi
 #CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
 .for file in client squid
 	if [ -f ${PREFIX}/sbin/${file} ] ; then \
 		strip ${PREFIX}/sbin/${file} ; \
 	fi
 .endfor
 .for file in cachemgr.cgi dnsserver pinger unlinkd
 	if [ -f ${PREFIX}/libexec/${file} ] ; then \
 		strip ${PREFIX}/libexec/${file} ; \
 	fi
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
 		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "	(cd /tmp; /usr/local/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
 .include <bsd.port.mk>
 
 # Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
 PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}

Property changes on: head/www/squid26/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property
Index: head/www/squid26/distinfo
===================================================================
--- head/www/squid26/distinfo	(revision 10317)
+++ head/www/squid26/distinfo	(revision 10318)
@@ -1 +1 @@
-MD5 (squid1.2b17/squid-1.2.beta17-src.tar.gz) = 9a4fd60baa6d7b98cb7e4c2ffc2dd334
+MD5 (squid1.2b18/squid-1.2.beta18-src.tar.gz) = 97e6269b2ee749e3dcd10f8e6d9501e6

Property changes on: head/www/squid26/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.39
\ No newline at end of property
+1.40
\ No newline at end of property
Index: head/www/squid26/pkg-plist
===================================================================
--- head/www/squid26/pkg-plist	(revision 10317)
+++ head/www/squid26/pkg-plist	(revision 10318)
@@ -1,65 +1,66 @@
 etc/rc.d/squid.sh
 etc/squid/errors/ERR_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_MGR_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_FORWARDING_DENIED
 etc/squid/errors/ERR_FTP_DISABLED
 etc/squid/errors/ERR_FTP_FAILURE
 etc/squid/errors/ERR_FTP_PUT_CREATED
 etc/squid/errors/ERR_FTP_PUT_ERROR
 etc/squid/errors/ERR_FTP_PUT_MODIFIED
 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_ONLY_IF_CACHED_MISS
 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_URN_RESOLVE
 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
 etc/squid/mime.conf.default
 etc/squid/squid.conf.default
 libexec/cachemgr.cgi
 libexec/dnsserver
 libexec/pinger
 libexec/unlinkd
 sbin/RunAccel
 sbin/RunCache
 sbin/client
 sbin/squid
 @exec mkdir -p %D/squid/cache
 @exec mkdir -p %D/squid/logs

Property changes on: head/www/squid26/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/www/squid27/Makefile
===================================================================
--- head/www/squid27/Makefile	(revision 10317)
+++ head/www/squid27/Makefile	(revision 10318)
@@ -1,93 +1,95 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta17
+# Version required:	1.2-beta18
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.46 1998/03/09 03:35:09 peter Exp $
+# $Id: Makefile,v 1.47 1998/03/20 14:00:51 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta17
-PKGNAME=	squid-1.2b17
+DISTNAME=	squid-1.2.beta18
+PKGNAME=	squid-1.2b18
 CATEGORIES=	www
 MASTER_SITES=  \
 	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.2.beta/
-#PATCHFILES+=    1.2.beta17.patch
+#PATCHFILES+=    1.2.beta18.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b17
+DIST_SUBDIR=	squid1.2b18
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--localstatedir=${PREFIX}/squid
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 NO_LATEST_LINK=	yes
 
 # Some other configure options..
 #  - Compile and use the malloc package from Doug Lea
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
 #  - Use tree function to store ACL lists
 #CONFIGURE_ARGS+= --enable-acltree=bin
 #CONFIGURE_ARGS+= --enable-acltree=splay
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Use ASYNC disk I/O (Requires real pthreads, libc_r probably doesn't work)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
 #  - Enable delay hack to limit bandwidth usage
 #CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable generic memory use tracing
+#CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
 #CONFIGURE_ARGS+= --enable-kill-parent
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
 #CONFIGURE_ARGS+= --enable-time-hack
 #  - Set an explicit hostname in cachemgr.cgi
 #CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
 .for file in client squid
 	if [ -f ${PREFIX}/sbin/${file} ] ; then \
 		strip ${PREFIX}/sbin/${file} ; \
 	fi
 .endfor
 .for file in cachemgr.cgi dnsserver pinger unlinkd
 	if [ -f ${PREFIX}/libexec/${file} ] ; then \
 		strip ${PREFIX}/libexec/${file} ; \
 	fi
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
 		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "	(cd /tmp; /usr/local/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
 .include <bsd.port.mk>
 
 # Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
 PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}

Property changes on: head/www/squid27/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property
Index: head/www/squid27/distinfo
===================================================================
--- head/www/squid27/distinfo	(revision 10317)
+++ head/www/squid27/distinfo	(revision 10318)
@@ -1 +1 @@
-MD5 (squid1.2b17/squid-1.2.beta17-src.tar.gz) = 9a4fd60baa6d7b98cb7e4c2ffc2dd334
+MD5 (squid1.2b18/squid-1.2.beta18-src.tar.gz) = 97e6269b2ee749e3dcd10f8e6d9501e6

Property changes on: head/www/squid27/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.39
\ No newline at end of property
+1.40
\ No newline at end of property
Index: head/www/squid27/pkg-plist
===================================================================
--- head/www/squid27/pkg-plist	(revision 10317)
+++ head/www/squid27/pkg-plist	(revision 10318)
@@ -1,65 +1,66 @@
 etc/rc.d/squid.sh
 etc/squid/errors/ERR_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_MGR_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_FORWARDING_DENIED
 etc/squid/errors/ERR_FTP_DISABLED
 etc/squid/errors/ERR_FTP_FAILURE
 etc/squid/errors/ERR_FTP_PUT_CREATED
 etc/squid/errors/ERR_FTP_PUT_ERROR
 etc/squid/errors/ERR_FTP_PUT_MODIFIED
 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_ONLY_IF_CACHED_MISS
 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_URN_RESOLVE
 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
 etc/squid/mime.conf.default
 etc/squid/squid.conf.default
 libexec/cachemgr.cgi
 libexec/dnsserver
 libexec/pinger
 libexec/unlinkd
 sbin/RunAccel
 sbin/RunCache
 sbin/client
 sbin/squid
 @exec mkdir -p %D/squid/cache
 @exec mkdir -p %D/squid/logs

Property changes on: head/www/squid27/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/www/squid30/Makefile
===================================================================
--- head/www/squid30/Makefile	(revision 10317)
+++ head/www/squid30/Makefile	(revision 10318)
@@ -1,93 +1,95 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta17
+# Version required:	1.2-beta18
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.46 1998/03/09 03:35:09 peter Exp $
+# $Id: Makefile,v 1.47 1998/03/20 14:00:51 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta17
-PKGNAME=	squid-1.2b17
+DISTNAME=	squid-1.2.beta18
+PKGNAME=	squid-1.2b18
 CATEGORIES=	www
 MASTER_SITES=  \
 	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.2.beta/
-#PATCHFILES+=    1.2.beta17.patch
+#PATCHFILES+=    1.2.beta18.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b17
+DIST_SUBDIR=	squid1.2b18
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--localstatedir=${PREFIX}/squid
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 NO_LATEST_LINK=	yes
 
 # Some other configure options..
 #  - Compile and use the malloc package from Doug Lea
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
 #  - Use tree function to store ACL lists
 #CONFIGURE_ARGS+= --enable-acltree=bin
 #CONFIGURE_ARGS+= --enable-acltree=splay
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Use ASYNC disk I/O (Requires real pthreads, libc_r probably doesn't work)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
 #  - Enable delay hack to limit bandwidth usage
 #CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable generic memory use tracing
+#CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
 #CONFIGURE_ARGS+= --enable-kill-parent
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
 #CONFIGURE_ARGS+= --enable-time-hack
 #  - Set an explicit hostname in cachemgr.cgi
 #CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
 .for file in client squid
 	if [ -f ${PREFIX}/sbin/${file} ] ; then \
 		strip ${PREFIX}/sbin/${file} ; \
 	fi
 .endfor
 .for file in cachemgr.cgi dnsserver pinger unlinkd
 	if [ -f ${PREFIX}/libexec/${file} ] ; then \
 		strip ${PREFIX}/libexec/${file} ; \
 	fi
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
 		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "	(cd /tmp; /usr/local/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
 .include <bsd.port.mk>
 
 # Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
 PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}

Property changes on: head/www/squid30/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property
Index: head/www/squid30/distinfo
===================================================================
--- head/www/squid30/distinfo	(revision 10317)
+++ head/www/squid30/distinfo	(revision 10318)
@@ -1 +1 @@
-MD5 (squid1.2b17/squid-1.2.beta17-src.tar.gz) = 9a4fd60baa6d7b98cb7e4c2ffc2dd334
+MD5 (squid1.2b18/squid-1.2.beta18-src.tar.gz) = 97e6269b2ee749e3dcd10f8e6d9501e6

Property changes on: head/www/squid30/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.39
\ No newline at end of property
+1.40
\ No newline at end of property
Index: head/www/squid30/pkg-plist
===================================================================
--- head/www/squid30/pkg-plist	(revision 10317)
+++ head/www/squid30/pkg-plist	(revision 10318)
@@ -1,65 +1,66 @@
 etc/rc.d/squid.sh
 etc/squid/errors/ERR_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_MGR_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_FORWARDING_DENIED
 etc/squid/errors/ERR_FTP_DISABLED
 etc/squid/errors/ERR_FTP_FAILURE
 etc/squid/errors/ERR_FTP_PUT_CREATED
 etc/squid/errors/ERR_FTP_PUT_ERROR
 etc/squid/errors/ERR_FTP_PUT_MODIFIED
 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_ONLY_IF_CACHED_MISS
 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_URN_RESOLVE
 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
 etc/squid/mime.conf.default
 etc/squid/squid.conf.default
 libexec/cachemgr.cgi
 libexec/dnsserver
 libexec/pinger
 libexec/unlinkd
 sbin/RunAccel
 sbin/RunCache
 sbin/client
 sbin/squid
 @exec mkdir -p %D/squid/cache
 @exec mkdir -p %D/squid/logs

Property changes on: head/www/squid30/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property
Index: head/www/squid31/Makefile
===================================================================
--- head/www/squid31/Makefile	(revision 10317)
+++ head/www/squid31/Makefile	(revision 10318)
@@ -1,93 +1,95 @@
 # New ports collection makefile for:	squid
-# Version required:	1.2-beta17
+# Version required:	1.2-beta18
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.46 1998/03/09 03:35:09 peter Exp $
+# $Id: Makefile,v 1.47 1998/03/20 14:00:51 peter Exp $
 #
 
-DISTNAME=	squid-1.2.beta17
-PKGNAME=	squid-1.2b17
+DISTNAME=	squid-1.2.beta18
+PKGNAME=	squid-1.2b18
 CATEGORIES=	www
 MASTER_SITES=  \
 	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.2.beta/
-#PATCHFILES+=    1.2.beta17.patch
+#PATCHFILES+=    1.2.beta18.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid1.2b17
+DIST_SUBDIR=	squid1.2b18
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--bindir=${PREFIX}/sbin  --sysconfdir=${PREFIX}/etc/squid \
 		--localstatedir=${PREFIX}/squid
 STRIP=		# won't install scripts correctly othervise.
 MAKEFILE=	makefile
 NO_LATEST_LINK=	yes
 
 # Some other configure options..
 #  - Compile and use the malloc package from Doug Lea
 #CONFIGURE_ARGS+= --enable-dlmalloc
 #  - Compile and use the supplied GNUregex routines instead of BSD regex.
 #CONFIGURE_ARGS+= --enable-gnuregex
 #  - Use tree function to store ACL lists
 #CONFIGURE_ARGS+= --enable-acltree=bin
 #CONFIGURE_ARGS+= --enable-acltree=splay
 #  - Enable simple malloc debugging
 #CONFIGURE_ARGS+= --enable-xmalloc-debug
 #  - Detailed trace of memory allocations
 #CONFIGURE_ARGS+= --enable-xmalloc-debug-count
 #  - Show malloc statistics in cachemgr status pages
 #CONFIGURE_ARGS+= --enable-xmalloc-statistics
 #  - Use ASYNC disk I/O (Requires real pthreads, libc_r probably doesn't work)
 #CONFIGURE_ARGS+= --enable-async-io
 #  - Enable ICMP pinging for heirarchy stats and selection
 #CONFIGURE_ARGS+= --enable-icmp
 #  - Enable delay hack to limit bandwidth usage
 #CONFIGURE_ARGS+= --enable-delay-hack
+#  - Enable generic memory use tracing
+#CONFIGURE+ARGS+= --enable-mem-gen-trace
 #  - Enable logging of the User-Agent header
 #CONFIGURE_ARGS+= --enable-useragent-log
 #  - Kill parent (eg: RunCache) on shutdown (use with great care!!)
 #CONFIGURE_ARGS+= --enable-kill-parent
 #  - Turn on SNMP server support
 #CONFIGURE_ARGS+= --enable-snmp
 #  - Optimize time updates to one per second rather than calling gettimeofday()
 #CONFIGURE_ARGS+= --enable-time-hack
 #  - Set an explicit hostname in cachemgr.cgi
 #CONFIGURE_ARGS+= --enable-cachemgr-hostname=some.hostname
 #  - Enable ACL based on ethernet address (eg: for machines with dynamic DHCP 
 #    assigned IP addresses)
 #CONFIGURE_ARGS+= --enable-arp-acl
 
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
 .for file in client squid
 	if [ -f ${PREFIX}/sbin/${file} ] ; then \
 		strip ${PREFIX}/sbin/${file} ; \
 	fi
 .endfor
 .for file in cachemgr.cgi dnsserver pinger unlinkd
 	if [ -f ${PREFIX}/libexec/${file} ] ; then \
 		strip ${PREFIX}/libexec/${file} ; \
 	fi
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
 	@if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \
 		echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \
 		echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "if [ -x /usr/local/sbin/RunCache -a -f /usr/local/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "	(cd /tmp; /usr/local/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \
 		chmod 751 ${PREFIX}/etc/rc.d/squid.sh; \
 	fi
 
 .include <bsd.port.mk>
 
 # Put on peril sensitive sunglasses in case of stupid GNU make v2.5!
 PATCH:=         env POSIXLY_CORRECT=yes ${PATCH}

Property changes on: head/www/squid31/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.47
\ No newline at end of property
+1.48
\ No newline at end of property
Index: head/www/squid31/distinfo
===================================================================
--- head/www/squid31/distinfo	(revision 10317)
+++ head/www/squid31/distinfo	(revision 10318)
@@ -1 +1 @@
-MD5 (squid1.2b17/squid-1.2.beta17-src.tar.gz) = 9a4fd60baa6d7b98cb7e4c2ffc2dd334
+MD5 (squid1.2b18/squid-1.2.beta18-src.tar.gz) = 97e6269b2ee749e3dcd10f8e6d9501e6

Property changes on: head/www/squid31/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.39
\ No newline at end of property
+1.40
\ No newline at end of property
Index: head/www/squid31/pkg-plist
===================================================================
--- head/www/squid31/pkg-plist	(revision 10317)
+++ head/www/squid31/pkg-plist	(revision 10318)
@@ -1,65 +1,66 @@
 etc/rc.d/squid.sh
 etc/squid/errors/ERR_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_ACCESS_DENIED
 etc/squid/errors/ERR_CACHE_MGR_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_FORWARDING_DENIED
 etc/squid/errors/ERR_FTP_DISABLED
 etc/squid/errors/ERR_FTP_FAILURE
 etc/squid/errors/ERR_FTP_PUT_CREATED
 etc/squid/errors/ERR_FTP_PUT_ERROR
 etc/squid/errors/ERR_FTP_PUT_MODIFIED
 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_ONLY_IF_CACHED_MISS
 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_URN_RESOLVE
 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
 etc/squid/mime.conf.default
 etc/squid/squid.conf.default
 libexec/cachemgr.cgi
 libexec/dnsserver
 libexec/pinger
 libexec/unlinkd
 sbin/RunAccel
 sbin/RunCache
 sbin/client
 sbin/squid
 @exec mkdir -p %D/squid/cache
 @exec mkdir -p %D/squid/logs

Property changes on: head/www/squid31/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.10
\ No newline at end of property
+1.11
\ No newline at end of property