summaryrefslogtreecommitdiff
path: root/www/squid
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>1999-05-02 12:49:43 +0000
committertron <tron@pkgsrc.org>1999-05-02 12:49:43 +0000
commitac36b26288a5b40bef1e3cc6b1520b36bdaabcec (patch)
tree278b128e4929710ff78554f2c87612f86314c726 /www/squid
parente547cb75e9e5f197dc3d05d9477f1c17a77c6a39 (diff)
downloadpkgsrc-ac36b26288a5b40bef1e3cc6b1520b36bdaabcec.tar.gz
Update "squid" package to version 2.2s2 (squid-2.2.STABLE2).
Diffstat (limited to 'www/squid')
-rw-r--r--www/squid/Makefile32
-rw-r--r--www/squid/files/md54
-rw-r--r--www/squid/patches/patch-ac10
3 files changed, 23 insertions, 23 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile
index eca7ddf0186..4c35dfe6d0b 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 1999/05/02 00:48:31 tron Exp $
+# $NetBSD: Makefile,v 1.10 1999/05/02 12:49:43 tron Exp $
#
-DISTNAME= squid-2.0.PATCH2
+DISTNAME= squid-2.2.STABLE2-src
+PKGNAME= squid-2.2s2
CATEGORIES= www
MASTER_SITES= \
ftp://squid.nlanr.net/pub/squid-2/ \
@@ -10,12 +11,11 @@ MASTER_SITES= \
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= kim@tac.nyc.ny.us
+MAINTAINER= tron@netbsd.org
HOMEPAGE= http://squid.nlanr.net/Squid/
-BUILD_DEPENDS= ${LOCALBASE}/bin/perl:${PKGSRCDIR}/lang/perl5
+BUILD_DEPENDS= ${LOCALBASE}/bin/perl:../../lang/perl5
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir=/etc \
@@ -34,12 +34,12 @@ CONFIGURE_ENV+= CPPFLAGS=${CPPFLAGS} \
MAKEFILE= makefile
MAKE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}" PKG_PREFIX="${PREFIX}"
+PLIST_SRC= ${PKGDIR}/PLIST ${WRKDIR}/PLIST.share
+WRKSRC= ${WRKDIR}/squid-2.2.STABLE2
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
@@ -47,16 +47,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
post-install:
diff --git a/www/squid/files/md5 b/www/squid/files/md5
index cbc70440ece..6a5d5a03af0 100644
--- a/www/squid/files/md5
+++ b/www/squid/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/12/06 12:42:00 tron Exp $
+$NetBSD: md5,v 1.4 1999/05/02 12:49:43 tron Exp $
-MD5 (squid-2.0.PATCH2-src.tar.gz) = 2237cc7f55fab149f65f98a9fdfa08c5
+MD5 (squid-2.2.STABLE2-src.tar.gz) = 310e4d604b071214cf4cd9688502b0e8
diff --git a/www/squid/patches/patch-ac b/www/squid/patches/patch-ac
index 9ea948fea2c..c69339a5d72 100644
--- a/www/squid/patches/patch-ac
+++ b/www/squid/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.3 1998/12/06 12:42:00 tron Exp $
+$NetBSD: patch-ac,v 1.4 1999/05/02 12:49:43 tron Exp $
---- scripts/RunCache.in.orig Tue Aug 4 22:59:32 1998
-+++ scripts/RunCache.in Fri Oct 16 17:57:43 1998
+--- scripts/RunCache.in.orig Fri Jan 29 19:19:46 1999
++++ scripts/RunCache.in Sun May 2 14:36:10 1999
@@ -5,7 +5,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
@@ -19,8 +19,8 @@ $NetBSD: patch-ac,v 1.3 1998/12/06 12:42:00 tron Exp $
+ 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
+- squid -NsY $conf >> $logdir/squid.out 2>&1
++ squid -NY $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