Sync with "squid-current" package.

13 files changed, 300 insertions, 162 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 0bda32fc78e..64a09a34906 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,48 +1,67 @@
-# $NetBSD: Makefile,v 1.3 1998/08/20 15:17:31 tsarna Exp $
-# $FreeBSD Id: Makefile,v 1.36 1998/03/20 13:58:54 peter Exp
+# $NetBSD: Makefile,v 1.4 1998/12/06 12:42:00 tron Exp $
 #
 
-DISTNAME=	squid-1.1.21
+DISTNAME=	squid-2.0.PATCH2
 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-2/ \
+	ftp://ftp.gw.com/pub/unix/squid/squid-2/ \
+	ftp://ftp.funet.fi/pub/mirrors/squid.nlanr.net/pub/squid-2/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-2/ \
+	ftp://sunsite.auc.dk/pub/infosystems/squid/squid-2/ \
+	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=	tron@netbsd.org
+CONFLICTS=	squid-1.1.21 \
+		squid-2.0.PRE1 \
+		squid-2.0.RELEASE \
+		squid-2.0.PATCH1
+
+MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://squid.nlanr.net/Squid/
 
 GNU_CONFIGURE=	yes
-# Follow the apache port's lead...
-CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
-		--libexecdir=${PREFIX}/sbin --localstatedir=/var/squid
-MAKEFILE=	makefile
+CONFIGURE_ARGS=	--sysconfdir=/etc \
+		--localstatedir=/var/squid
 
+# Options you might want to enable
+CONFIGURE_ARGS+=	--enable-cachemgr-hostname=localhost
+CONFIGURE_ARGS+=	--enable-icmp
+#CONFIGURE_ARGS+=	--enable-snmp
+
+MAKEFILE=	makefile
 MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-# 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"
 
 post-build:
 	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/squid.sh >${WRKDIR}/squid.sh
 
+PLIST_SRC=	${PKGDIR}/PLIST ${WRKDIR}/PLIST.share
+
+pre-install:
+	@-rm -f ${WRKDIR}/PLIST.share
+	@${MKDIR} ${PREFIX}/share/squid
+	@${MKDIR} ${PREFIX}/share/squid/errors
+	@${MKDIR} ${PREFIX}/share/squid/icons
+	@(							\
+	cd ${WRKSRC}/errors/English;				\
+	ls ERR_* | sed -e 's@^@share/squid/errors/@';		\
+	echo "@dirrm share/squid/errors";			\
+	cd ${WRKSRC}/icons;					\
+	ls anthony-*.gif | sed -e 's@^@share/squid/icons/@';	\
+	echo "@dirrm share/squid/icons";			\
+	echo "share/squid/mib.txt";				\
+	echo "share/squid/mime.conf";				\
+	echo "share/squid/mime.conf.default";			\
+	echo "share/squid/squid.conf.default";			\
+	echo "@dirrm share/squid";				\
+	) > ${WRKDIR}/PLIST.share
+
+# This is GNU ${datadir}/squid/squid.conf
+DEFCONF=	${PREFIX}/share/squid/squid.conf.default
+
 post-install:
 	cd ${WRKSRC}/src; make install-pinger
 	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/squid.sh
-	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} POST-INSTALL
+	@${SH} ${PKGDIR}/INSTALL ${PKGNAME} ${DEFCONF} POST-INSTALL
 
 .include <../../mk/bsd.pkg.mk>
diff --git a/www/squid/files/md5 b/www/squid/files/md5
index 3b93f7b1860..cbc70440ece 100644
--- a/www/squid/files/md5
+++ b/www/squid/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:27:42 agc Exp $
+$NetBSD: md5,v 1.3 1998/12/06 12:42:00 tron Exp $
 
-MD5 (squid-1.1.21-src.tar.gz) = 412c9a545f03f79c8b3fc26a39e16e6f
+MD5 (squid-2.0.PATCH2-src.tar.gz) = 2237cc7f55fab149f65f98a9fdfa08c5
diff --git a/www/squid/files/squid.sh b/www/squid/files/squid.sh
index eebc4ea5d18..a904ce29d67 100644
--- a/www/squid/files/squid.sh
+++ b/www/squid/files/squid.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 #
-# $NetBSD: squid.sh,v 1.2 1998/05/24 19:59:28 tron Exp $
+# $NetBSD: squid.sh,v 1.3 1998/12/06 12:42:00 tron Exp $
 #
-if [ -x @PREFIX@/sbin/RunCache -a -f @PREFIX@/etc/squid/squid.conf ];
+if [ -x @PREFIX@/sbin/RunCache -a -f /etc/squid.conf ];
 then
  @PREFIX@/sbin/RunCache >/dev/null 2>&1 &
  echo -n ' squid'
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index eab4e47a43b..c4766590812 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,49 +1,54 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:14:26 agc Exp $
+$NetBSD: patch-aa,v 1.4 1998/12/06 12:42:00 tron Exp $
 
---- src/Makefile.in.orig	Fri Oct 24 19:57:11 1997
-+++ src/Makefile.in	Sun May 24 12:01:18 1998
-@@ -5,19 +5,19 @@
- #
- #  Uncomment and customize the following to suit your needs:
- #
--HOST_OPT	= # -DCACHEMGR_HOSTNAME="getfullhostname()"
--AUTH_OPT	= # -DUSE_PROXY_AUTH=1
--LOG_HDRS_OPT	= # -DLOG_FULL_HEADERS=1
--ICMP_OPT	= # -DUSE_ICMP=1
--DELAY_HACK      = # -DDELAY_HACK=1
--USERAGENT_OPT	= # -DUSE_USERAGENT_LOG=1
--KILL_PARENT_OPT	= # -DKILL_PARENT_OPT
--USE_POLL_OPT    = # -DUSE_POLL
-+#HOST_OPT	= # -DCACHEMGR_HOSTNAME="getfullhostname()"
-+#AUTH_OPT	= # -DUSE_PROXY_AUTH=1
-+#LOG_HDRS_OPT	= # -DLOG_FULL_HEADERS=1
-+#ICMP_OPT	= # -DUSE_ICMP=1
-+#DELAY_HACK      = # -DDELAY_HACK=1
-+#USERAGENT_OPT	= # -DUSE_USERAGENT_LOG=1
-+#KILL_PARENT_OPT	= # -DKILL_PARENT_OPT
-+#USE_POLL_OPT    = # -DUSE_POLL
- # do NOT define both USE_SPLAY_TREE and USE_BIN_TREE at the same time!
--USE_SPLAY_TREE  = # -DUSE_SPLAY_TREE
--USE_BIN_TREE    = # -DUSE_BIN_TREE
--RELOAD_INTO_IMS	= # -DRELOAD_INTO_IMS
--UNDERSCORES_OPT = # -DALLOW_HOSTNAME_UNDERSCORES
-+#USE_SPLAY_TREE  = # -DUSE_SPLAY_TREE
-+#USE_BIN_TREE    = # -DUSE_BIN_TREE
-+#RELOAD_INTO_IMS	= # -DRELOAD_INTO_IMS
-+#UNDERSCORES_OPT = # -DALLOW_HOSTNAME_UNDERSCORES
+--- src/Makefile.in.orig	Mon Aug 17 19:27:15 1998
++++ src/Makefile.in	Thu Oct  1 17:00:53 1998
+@@ -12,6 +12,8 @@
+ cgi_suffix	= @cgi_suffix@
+ top_srcdir	= @top_srcdir@
+ bindir		= @bindir@
++sbindir		= @sbindir@
++datadir		= @datadir@
+ libexecdir      = @libexecdir@
+ sysconfdir	= @sysconfdir@
+ localstatedir   = @localstatedir@
+@@ -29,18 +31,18 @@
  
- DEFINES         = $(HOST_OPT) $(AUTH_OPT) $(LOG_HDRS_OPT) \
-                   $(ICMP_OPT) $(DELAY_HACK) $(USERAGENT_OPT) \
-@@ -41,7 +41,7 @@
+ DEFAULT_PREFIX		= $(prefix)
+ DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
+-DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
++DEFAULT_MIME_TABLE	= $(datadir)/squid/mime.conf
+ DEFAULT_DNSSERVER       = $(libexecdir)/$(DNSSERVER_EXE)
  DEFAULT_CACHE_LOG       = $(localstatedir)/logs/cache.log
  DEFAULT_ACCESS_LOG      = $(localstatedir)/logs/access.log
  DEFAULT_STORE_LOG       = $(localstatedir)/logs/store.log
 -DEFAULT_PID_FILE        = $(localstatedir)/logs/squid.pid
 +DEFAULT_PID_FILE        = /var/run/squid.pid
  DEFAULT_SWAP_DIR        = $(localstatedir)/cache
- DEFAULT_PINGER		= $(libexecdir)/pinger
- DEFAULT_UNLINKD		= $(libexecdir)/unlinkd
-@@ -199,14 +199,14 @@
+ DEFAULT_PINGER		= $(libexecdir)/$(PINGER_EXE)
+ DEFAULT_UNLINKD		= $(libexecdir)/$(UNLINKD_EXE)
+-DEFAULT_ICON_DIR	= $(sysconfdir)/icons
+-DEFAULT_ERROR_DIR	= $(sysconfdir)/errors
+-DEFAULT_MIB_PATH	= $(sysconfdir)/mib.txt
++DEFAULT_ICON_DIR	= $(datadir)/squid/icons
++DEFAULT_ERROR_DIR	= $(datadir)/squid/errors
++DEFAULT_MIB_PATH	= $(datadir)/squid/mib.txt
+ 
+ CC		= @CC@
+ MAKEDEPEND	= @MAKEDEPEND@
+@@ -264,9 +266,9 @@
+ 		echo "mkdir $(exec_prefix)"; \
+ 		mkdir $(exec_prefix); \
+ 	fi
+-	-@if test ! -d $(bindir); then \
+-		echo "mkdir $(bindir)"; \
+-		mkdir $(bindir); \
++	-@if test ! -d $(sbindir); then \
++		echo "mkdir $(sbindir)"; \
++		mkdir $(sbindir); \
+ 	fi
+ 	-@if test ! -d $(libexecdir); then \
+ 		echo "mkdir $(libexecdir)"; \
+@@ -276,28 +278,28 @@
  		echo "mkdir $(sysconfdir)"; \
  		mkdir $(sysconfdir); \
  	fi
@@ -66,3 +71,59 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:14:26 agc Exp $
  
  # Michael Lupp <mike@nemesis.saar.de> wants to know about additions
  # to the install target.
+ install: all install-mkdirs
+ 	@for f in $(PROGS); do \
+-		if test -f $(bindir)/$$f; then \
+-			echo $(MV) $(bindir)/$$f $(bindir)/-$$f; \
+-			$(MV) $(bindir)/$$f $(bindir)/-$$f; \
++		if test -f $(sbindir)/$$f; then \
++			echo $(MV) $(sbindir)/$$f $(sbindir)/-$$f; \
++			$(MV) $(sbindir)/$$f $(sbindir)/-$$f; \
+ 		fi; \
+-		echo $(INSTALL_BIN) $$f $(bindir); \
+-		$(INSTALL_BIN) $$f $(bindir); \
+-		if test -f $(bindir)/-$$f; then \
+-			echo $(RM) -f $(bindir)/-$$f; \
+-			$(RM) -f $(bindir)/-$$f; \
++		echo $(INSTALL_BIN) $$f $(sbindir); \
++		$(INSTALL_BIN) $$f $(sbindir); \
++		if test -f $(sbindir)/-$$f; then \
++			echo $(RM) -f $(sbindir)/-$$f; \
++			$(RM) -f $(sbindir)/-$$f; \
+ 		fi; \
+ 	done
+ 	@for f in $(UTILS); do \
+@@ -325,20 +327,20 @@
+ 		fi; \
+ 	done
+ 	$(INSTALL_FILE) $(srcdir)/mib.txt $(DEFAULT_MIB_PATH)
+-	$(INSTALL_FILE) squid.conf $(sysconfdir)/squid.conf.default
+-	@if test -f $(sysconfdir)/squid.conf ; then \
+-		echo "$@ will not overwrite existing $(sysconfdir)/squid.conf" ; \
+-	else \
+-		echo "$(INSTALL_FILE) squid.conf $(sysconfdir)"; \
+-		$(INSTALL_FILE) squid.conf $(sysconfdir); \
+-	fi
+-
+-	$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)/mime.conf.default
+-	@if test -f $(sysconfdir)/mime.conf ; then \
+-		echo "$@ will not overwrite existing $(sysconfdir)/mime.conf" ; \
++	$(INSTALL_FILE) squid.conf $(datadir)/squid/squid.conf.default
++#	@if test -f $(DEFAULT_CONFIG_FILE) ; then \
++#		echo "$@ will not overwrite existing $(DEFAULT_CONFIG_FILE)" ; \
++#	else \
++#		echo "$(INSTALL_FILE) squid.conf $(DEFAULT_CONFIG_FILE)"; \
++#		$(INSTALL_FILE) squid.conf $(DEFAULT_CONFIG_FILE); \
++#	fi
++
++	$(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE).default
++	@if test -f $(DEFAULT_MIME_TABLE) ; then \
++		echo "$@ will not overwrite existing $(DEFAULT_MIME_TABLE)" ; \
+ 	else \
+-		echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)"; \
+-		$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir); \
++		echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE)"; \
++		$(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE); \
+ 	fi
+ 
+ install-pinger:
diff --git a/www/squid/patches/patch-ab b/www/squid/patches/patch-ab
index 6ca1ec83dfc..b3d3e745469 100644
--- a/www/squid/patches/patch-ab
+++ b/www/squid/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 11:14:26 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/12/06 12:42:00 tron Exp $
 
---- src/unlinkd.c.dist	Tue Apr 29 02:14:17 1997
-+++ src/unlinkd.c	Sun Jul  6 00:58:56 1997
-@@ -148,7 +148,7 @@
-     close(rfd1);		/* close FD since we dup'd it */
-     close(wfd2);		/* close parent's FD */
-     commSetCloseOnExec(fileno(debug_log));
--    execlp(Config.Program.unlinkd, "(unlinkd)", NULL);
-+    execlp(Config.Program.unlinkd, Config.Program.unlinkd, NULL);
-     debug(50, 0, "unlinkdCreate: %s: %s\n",
- 	Config.Program.unlinkd, xstrerror());
-     _exit(1);
+--- scripts/Makefile.in.orig	Sat May  4 00:56:18 1996
++++ scripts/Makefile.in	Sat May 23 21:36:03 1998
+@@ -29,8 +29,8 @@
+ 		echo "mkdir $(bindir)"; \
+ 		mkdir $(bindir); \
+ 	fi
+-	$(INSTALL_BIN) RunCache $(bindir)
+-	$(INSTALL_BIN) RunAccel $(bindir)
++	$(INSTALL_SCRIPT) RunCache $(bindir)
++	$(INSTALL_SCRIPT) RunAccel $(bindir)
+ 
+ clean:
+ 
diff --git a/www/squid/patches/patch-ac b/www/squid/patches/patch-ac
index 56fbf3a5b37..9ea948fea2c 100644
--- a/www/squid/patches/patch-ac
+++ b/www/squid/patches/patch-ac
@@ -1,16 +1,26 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:14:27 agc Exp $
+$NetBSD: patch-ac,v 1.3 1998/12/06 12:42:00 tron Exp $
 
---- src/dns.c.dist	Wed Jun  4 00:25:44 1997
-+++ src/dns.c	Sun Jul  6 01:00:27 1997
-@@ -202,9 +202,9 @@
-     close(fd);
-     close(cfd);
-     if (Config.Options.res_defnames)
--	execlp(command, "(dnsserver)", "-D", NULL);
-+	execlp(command, command, "-D", NULL);
-     else
--	execlp(command, "(dnsserver)", NULL);
-+	execlp(command, command, NULL);
-     debug(50, 0, "dnsOpenServer: %s: %s\n", command, xstrerror());
-     _exit(1);
-     return 0;
+--- scripts/RunCache.in.orig	Tue Aug  4 22:59:32 1998
++++ scripts/RunCache.in	Fri Oct 16 17:57:43 1998
+@@ -5,7 +5,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ logdir=@localstatedir@
+-PATH=@bindir@:/bin:/usr/bin
++PATH=@sbindir@:/bin:/usr/bin
+ export PATH
+ 
+ conf=""
+@@ -16,10 +16,10 @@
+ 
+ failcount=0
+ while : ; do
+-	echo "Running: squid -sY $conf >> $logdir/squid.out 2>&1"
++	echo "Running: squid -Y $conf >> $logdir/squid.out 2>&1"
+ 	echo "Startup: `date`" >> $logdir/squid.out
+ 	start=`date '+%d%H%M%S'`
+-	squid -sY $conf >> $logdir/squid.out 2>&1
++	squid -Y $conf >> $logdir/squid.out 2>&1
+ 	stop=`date '+%d%H%M%S'`
+ 	t=`expr $stop - $start`
+ 	if test 0 -le $t -a $t -lt 5 ; then
diff --git a/www/squid/patches/patch-ad b/www/squid/patches/patch-ad
index 1b11030fedf..7e4d8c9bc48 100644
--- a/www/squid/patches/patch-ad
+++ b/www/squid/patches/patch-ad
@@ -1,13 +1,21 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:14:27 agc Exp $
+$NetBSD: patch-ad,v 1.3 1998/12/06 12:42:00 tron Exp $
 
---- src/redirect.c.dist	Wed Apr 16 07:26:02 1997
-+++ src/redirect.c	Sun Jul  6 01:01:21 1997
-@@ -154,7 +154,7 @@
-     fclose(debug_log);
-     close(fd);
-     close(cfd);
--    execlp(command, "(redirector)", NULL);
-+    execlp(command, command, NULL);
-     debug(50, 0, "redirect_create_redirector: %s: %s\n", command, xstrerror());
-     _exit(1);
-     return 0;
+--- errors/Makefile.in.orig	Fri Apr 24 01:26:39 1998
++++ errors/Makefile.in	Thu Oct  1 16:25:32 1998
+@@ -4,6 +4,7 @@
+ exec_prefix	= @exec_prefix@
+ top_srcdir	= @top_srcdir@
+ bindir		= @bindir@
++datadir		= @datadir@
+ libexecdir      = @libexecdir@
+ sysconfdir	= @sysconfdir@
+ localstatedir   = @localstatedir@
+@@ -15,7 +16,7 @@
+ 
+ INSTALL         	= @INSTALL@
+ INSTALL_FILE    	= @INSTALL_DATA@
+-DEFAULT_ERROR_DIR	= $(sysconfdir)/errors
++DEFAULT_ERROR_DIR	= $(datadir)/squid/errors
+ 
+ LANGUAGE		= @ERR_LANGUAGE@
+ 
diff --git a/www/squid/patches/patch-ae b/www/squid/patches/patch-ae
index 95e59fde898..07e71ddca82 100644
--- a/www/squid/patches/patch-ae
+++ b/www/squid/patches/patch-ae
@@ -1,13 +1,21 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:14:27 agc Exp $
+$NetBSD: patch-ae,v 1.3 1998/12/06 12:42:01 tron Exp $
 
---- src/icmp.c.dist	Wed Mar 26 15:29:44 1997
-+++ src/icmp.c	Sun Jul  6 01:02:25 1997
-@@ -297,7 +297,7 @@
- 	dup2(fileno(debug_log), 2);
- 	fclose(debug_log);
- 	enter_suid();
--	execlp(Config.Program.pinger, "(pinger)", NULL);
-+	execlp(Config.Program.pinger, Config.Program.pinger, NULL);
- 	debug(50, 0, "icmpOpen: %s: %s\n", Config.Program.pinger, xstrerror());
- 	_exit(1);
-     }
+--- icons/Makefile.in.orig	Mon Feb  2 14:39:25 1998
++++ icons/Makefile.in	Thu Oct  1 16:26:08 1998
+@@ -4,6 +4,7 @@
+ exec_prefix	= @exec_prefix@
+ top_srcdir	= @top_srcdir@
+ bindir		= @bindir@
++datadir		= @datadir@
+ libexecdir      = @libexecdir@
+ sysconfdir	= @sysconfdir@
+ localstatedir   = @localstatedir@
+@@ -15,7 +16,7 @@
+ 
+ INSTALL         	= @INSTALL@
+ INSTALL_FILE    	= @INSTALL_DATA@
+-DEFAULT_ICON_DIR        = $(sysconfdir)/icons
++DEFAULT_ICON_DIR        = $(datadir)/squid/icons
+ 
+ SHARFILE	= $(srcdir)/icons.shar
+ ICONS		= anthony-binhex.gif \
diff --git a/www/squid/patches/patch-af b/www/squid/patches/patch-af
index ca1a426283b..7be3ac95b11 100644
--- a/www/squid/patches/patch-af
+++ b/www/squid/patches/patch-af
@@ -1,15 +1,30 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:14:28 agc Exp $
+$NetBSD: patch-af,v 1.3 1998/12/06 12:42:01 tron Exp $
 
---- scripts/Makefile.in.orig	Sat May  4 00:56:18 1996
-+++ scripts/Makefile.in	Sat May 23 21:36:03 1998
-@@ -29,8 +29,8 @@
- 		echo "mkdir $(bindir)"; \
- 		mkdir $(bindir); \
+--- scripts/Makefile.in.orig	Thu Oct  1 16:06:14 1998
++++ scripts/Makefile.in	Thu Oct  1 16:29:14 1998
+@@ -7,6 +7,7 @@
+ exec_prefix     = @exec_prefix@
+ top_srcdir      = @top_srcdir@
+ bindir          = @bindir@
++sbindir         = @sbindir@
+ sysconfdir      = @sysconfdir@
+ srcdir          = @srcdir@
+ VPATH           = @srcdir@
+@@ -25,12 +26,12 @@
+ 		echo "mkdir $(exec_prefix)"; \
+ 		mkdir $(exec_prefix); \
  	fi
--	$(INSTALL_BIN) RunCache $(bindir)
--	$(INSTALL_BIN) RunAccel $(bindir)
-+	$(INSTALL_SCRIPT) RunCache $(bindir)
-+	$(INSTALL_SCRIPT) RunAccel $(bindir)
+-	@if test ! -d $(bindir); then \
+-		echo "mkdir $(bindir)"; \
+-		mkdir $(bindir); \
++	@if test ! -d $(sbindir); then \
++		echo "mkdir $(sbindir)"; \
++		mkdir $(sbindir); \
+ 	fi
+-	$(INSTALL_SCRIPT) RunCache $(bindir)
+-	$(INSTALL_SCRIPT) RunAccel $(bindir)
++	$(INSTALL_SCRIPT) RunCache $(sbindir)
++	$(INSTALL_SCRIPT) RunAccel $(sbindir)
  
  clean:
  
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index 3404034393e..a074483993a 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,16 +1,21 @@
-$NetBSD: patch-ag,v 1.3 1998/08/07 11:14:28 agc Exp $
+$NetBSD: patch-ag,v 1.4 1998/12/06 12:42:01 tron Exp $
 
---- scripts/RunCache.in.orig	Thu Oct 31 08:28:58 1996
-+++ scripts/RunCache.in	Sun May 24 21:53:01 1998
-@@ -16,9 +16,9 @@
+--- configure.orig	Tue Sep 22 19:46:09 1998
++++ configure	Thu Oct  1 17:39:47 1998
+@@ -636,11 +636,11 @@
+ REGEXLIB=''	# -lregex
+ LIBREGEX=''	# libregex.a
  
- failcount=0
- while : ; do
--	echo "Running: squid -sY $conf >> $logdir/squid.out 2>&1"
-+	echo "Running: squid -Y $conf >> $logdir/squid.out 2>&1"
- 	start=`date '+%d%H%M%S'`
--	squid -sY $conf >> $logdir/squid.out 2>&1
-+	squid -Y $conf >> $logdir/squid.out 2>&1
- 	stop=`date '+%d%H%M%S'`
- 	t=`expr $stop - $start`
- 	if test 0 -le $t -a $t -lt 5 ; then
+-if test "$libexecdir" = '${exec_prefix}/libexec'; then
+-	libexecdir='${bindir}'
+-	localstatedir='${prefix}'
+-
+-fi
++#if test "$libexecdir" = '${exec_prefix}/libexec'; then
++#	libexecdir='${bindir}'
++#	localstatedir='${prefix}'
++#
++#fi
+ 
+ case "$host_os" in
+ cygwin32)
diff --git a/www/squid/patches/patch-ah b/www/squid/patches/patch-ah
new file mode 100644
index 00000000000..2230a1a80d1
--- /dev/null
+++ b/www/squid/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 1998/12/06 12:43:23 tron Exp $
+
+--- scripts/RunAccel.in.orig	Tue Jul  9 05:41:15 1996
++++ scripts/RunAccel.in	Fri Oct 16 17:59:52 1998
+@@ -8,7 +8,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ logdir=@localstatedir@
+-PATH=@bindir@:/bin:/usr/bin
++PATH=@sbindir@:/bin:/usr/bin
+ export PATH
+ 
+ if test $# = 1 ; then
diff --git a/www/squid/pkg/INSTALL b/www/squid/pkg/INSTALL
index 663a48938ba..386f738c067 100644
--- a/www/squid/pkg/INSTALL
+++ b/www/squid/pkg/INSTALL
@@ -1,11 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.2 1998/08/07 11:14:28 agc Exp $
+# $NetBSD: INSTALL,v 1.3 1998/12/06 12:42:01 tron Exp $
 #
 
 PKGNAME=$1
+DEFCONF=$2
 
-case $2 in
+case $3 in
     PRE-INSTALL)
 	;;
     POST-INSTALL)
@@ -16,13 +17,14 @@ case $2 in
 	echo "      configuring your WWW Navigator (Netscape, Mosaic,...)"
 	echo "      to use it as a proxy server."
 	echo ""
-	echo "    o copy \"squid.conf.default\" to \"squid.conf\" and edit it"
-	echo "      as required. You should pay attention to the ACTUAL"
-	echo "      locations of the cache \"spool\" logfiles and pidfile."
+	echo "    o copy \"${DEFCONF}\" to \"/etc/squid.conf\""
+	echo "      and edit it as required. You should pay attention to"
+	echo "      the ACTUAL locations of the cache \"spool\" logfiles"
+	echo "      and pidfile."
 	echo ""
 	;;
     *)
-	echo "Unexpected Argument $2!!!"
+	echo "Unexpected Argument $3!!!"
 	exit 1
 	;;
 esac
diff --git a/www/squid/pkg/PLIST b/www/squid/pkg/PLIST
index fa985d8d281..e92619000c2 100644
--- a/www/squid/pkg/PLIST
+++ b/www/squid/pkg/PLIST
@@ -1,15 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 1998/05/24 20:02:05 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/12/06 12:42:01 tron Exp $
+etc/rc.d/squid.sh
+libexec/cachemgr.cgi
+libexec/dnsserver
+libexec/pinger
+libexec/unlinkd
 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 cp %F %D/etc/squid/squid.conf
-@unexec rm -f %D/etc/squid/squid.conf
-@dirrm etc/squid