From 6e9e477620162abf4e84b91b41d5667e01e36b90 Mon Sep 17 00:00:00 2001
From: taca <taca>
Date: Mon, 25 Nov 2002 14:46:14 +0000
Subject: Update squid package to squid-2.5.1nb2.

- Apply disabled official patch since the patch's content has corrected.

    * Impossible to define acls with spaces in them

- Remove "@unexec ${RMDIR} %D/etc/squid ..." line from PLIST since
  there is already removing directory line which use more generic
  PKG_SYSCONFDIR variable.
---
 www/squid/Makefile | 8 ++++----
 www/squid/PLIST    | 3 +--
 www/squid/distinfo | 4 +++-
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'www/squid')

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 8132dd6b4f3..641a8597728 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.72 2002/11/25 07:17:25 tron Exp $
+# $NetBSD: Makefile,v 1.73 2002/11/25 14:46:14 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE1
 PKGNAME=	squid-2.5.1
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
 		ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \
@@ -31,8 +31,8 @@ PATCHFILES=	squid-2.5.STABLE1-disable-ident-lookups.patch \
 		squid-2.5.STABLE1-uninstall.patch \
 		squid-2.5.STABLE1-cachemgr.patch \
 		squid-2.5.STABLE1-auth-proxy.patch \
-		squid-2.5.STABLE1-dnsserver.patch
-#		squid-2.5.STABLE1-spaces.patch		# seems to broken?
+		squid-2.5.STABLE1-dnsserver.patch \
+		squid-2.5.STABLE1-spaces.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@netbsd.org
diff --git a/www/squid/PLIST b/www/squid/PLIST
index c594c8d1b08..9c0a5b17457 100644
--- a/www/squid/PLIST
+++ b/www/squid/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.9 2002/11/12 16:07:17 taca Exp $
+@comment $NetBSD: PLIST,v 1.10 2002/11/25 14:46:14 taca Exp $
 bin/squidclient
 etc/rc.d/squid
-@unexec ${RMDIR} %D/etc/squid 2>/dev/null || ${TRUE}
 libexec/cachemgr.cgi
 man/man8/squid.8
 share/examples/squid/mime.conf
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 8bacd82ec3a..c3e2bdc7c60 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2002/11/24 11:01:17 taca Exp $
+$NetBSD: distinfo,v 1.20 2002/11/25 14:46:14 taca Exp $
 
 SHA1 (squid-2.5.STABLE1.tar.bz2) = 6705006527f5fa0753e7c9f14347f36b1b787e62
 Size (squid-2.5.STABLE1.tar.bz2) = 1006600 bytes
@@ -46,6 +46,8 @@ SHA1 (squid-2.5.STABLE1-auth-proxy.patch) = cbb1d1300027ccaef73356a3ee7d849b1e38
 Size (squid-2.5.STABLE1-auth-proxy.patch) = 1225 bytes
 SHA1 (squid-2.5.STABLE1-dnsserver.patch) = 3f58bac1233b90e7504e65e1cb3e55fa8aba5273
 Size (squid-2.5.STABLE1-dnsserver.patch) = 795 bytes
+SHA1 (squid-2.5.STABLE1-spaces.patch) = 1c40dfa614096685ed1d39af16878869f4ad3d3c
+Size (squid-2.5.STABLE1-spaces.patch) = 1014 bytes
 SHA1 (patch-aa) = e29686a5c75635129b7e2eaf451140f10f29e081
 SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56
 SHA1 (patch-ac) = b962e05bcaccd0d9a0969b2f1419fd73456440cd
-- 
cgit v1.2.3