From 47cba93276aad3117773422f29659a3fd915b102 Mon Sep 17 00:00:00 2001
From: bad <bad>
Date: Fri, 8 Jan 1999 15:29:46 +0000
Subject: Update to squid-2.1.PATCH2+memory-leak-patch (and reenable). Make me
 the maintainer.

2.1.PATCH2 has many important bug fixes over 2.0.PATCH2 (too many to mention).
---
 www/squid-current/Makefile  | 39 ++++++++++++++++++++++-----------------
 www/squid-current/files/md5 |  5 +++--
 2 files changed, 25 insertions(+), 19 deletions(-)

(limited to 'www')

diff --git a/www/squid-current/Makefile b/www/squid-current/Makefile
index bb3da172a7b..88da5afc51f 100644
--- a/www/squid-current/Makefile
+++ b/www/squid-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 1998/12/06 12:48:50 tron Exp $
+# $NetBSD: Makefile,v 1.6 1999/01/08 15:29:46 bad Exp $
 #
 
-DISTNAME=	squid-2.0.PATCH2
+DISTNAME=	squid-2.1.PATCH2
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-2/ \
@@ -12,15 +12,19 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-2/
 EXTRACT_SUFX=	-src.tar.gz
 
-CONFLICTS=	squid-1.1.21 \
-		squid-2.0.PRE1 \
-		squid-2.0.RELEASE \
-		squid-2.0.PATCH1
+PATCH_SITES= \
+	http://squid.nlanr.net/Squid/v2/2.1/ \
+	http://mirror.aarnet.edu.au/squid/v2/2.1/
+PATCHFILES=squid-2.1.PATCH2-clientHandleIMSReply-leak.patch
 
-MAINTAINER=	kim@tac.nyc.ny.us
+MAINTAINER=	bad@netbsd.org
 HOMEPAGE=	http://squid.nlanr.net/Squid/
 
-IGNORE=		"can be found in \"pkgsrc/www/squid\""
+CONFLICTS=	squid-1.1.21 \
+		squid-2.0.PRE1 \
+		squid-2.0.RELEASE \
+		squid-2.0.PATCH1 \
+		squid-2.0.PATCH2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=/etc \
@@ -30,6 +34,7 @@ CONFIGURE_ARGS=	--sysconfdir=/etc \
 CONFIGURE_ARGS+=	--enable-cachemgr-hostname=localhost
 CONFIGURE_ARGS+=	--enable-icmp
 #CONFIGURE_ARGS+=	--enable-snmp
+CONFIGURE_ARGS+=	--enable-cache-digests
 
 MAKEFILE=	makefile
 MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
@@ -46,16 +51,16 @@ pre-install:
 	@${MKDIR} ${PREFIX}/share/squid/icons
 	@(							\
 	cd ${WRKSRC}/errors/English;				\
-	ls ERR_* | sed -e 's@^@share/squid/errors/@';		\
-	echo "@dirrm share/squid/errors";			\
+	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";				\
+	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
diff --git a/www/squid-current/files/md5 b/www/squid-current/files/md5
index dd206f25847..14ef6c9c150 100644
--- a/www/squid-current/files/md5
+++ b/www/squid-current/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.3 1998/10/12 06:11:39 kim Exp $
+$NetBSD: md5,v 1.4 1999/01/08 15:29:47 bad Exp $
 
-MD5 (squid-2.0.PATCH2-src.tar.gz) = 2237cc7f55fab149f65f98a9fdfa08c5
+MD5 (squid-2.1.PATCH2-src.tar.gz) = 71c6b2437e562224d43dcde5765001f8
+MD5 (squid-2.1.PATCH2-clientHandleIMSReply-leak.patch) = c5416dc4a2c0fa09a27790b575a19d9c
-- 
cgit v1.2.3