From 6753dba747f61654b2a33b7b0ca32eea75c2fef8 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Mon, 31 Mar 1997 11:14:54 +0000
Subject: Update 1.1.8+patches -> 1.1.9.

See ChangeLog for the (large) list of changes.
---
 www/squid24/Makefile  | 17 ++++++++++-------
 www/squid24/distinfo  |  3 +--
 www/squid24/pkg-plist |  9 +++++----
 3 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'www/squid24')

diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index 2da1d701f8dd..801629c8f88e 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	squid
-# Version required:	1.1.8
+# Version required:	1.1.9
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.24 1997/03/04 12:03:23 peter Exp $
+# $Id: Makefile,v 1.25 1997/03/23 15:43:41 peter Exp $
 #
 
-DISTNAME=	squid-1.1.8
+DISTNAME=	squid-1.1.9
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1/ \
@@ -15,12 +15,12 @@ MASTER_SITES=  \
 	ftp://ftp.net.lut.ac.uk/squid/squid-1.1/
 EXTRACT_SUFX=	-src.tar.gz
 
-PATCH_SITES+=   http://squid.nlanr.net/Squid/1.1/1.1.8/
-PATCHFILES+=    fixes.patch
+#PATCH_SITES+=   http://squid.nlanr.net/Squid/1.1/1.1.9/
+#PATCHFILES+=    fixes.patch
 
 MAINTAINER=	peter@freebsd.org
 
-DIST_SUBDIR=	squid118
+DIST_SUBDIR=	squid119
 GNU_CONFIGURE=	yes
 # Follow the apache port's lead...
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/squid --bindir=${PREFIX}/sbin \
@@ -43,8 +43,11 @@ MAKEFILE=	makefile
 #MAKE_ENV+=	USE_BIN_TREE="-DUSE_BIN_TREE"
 
 post-install:
+	cd ${WRKSRC}/src; make install-pinger
 .for file in cachemgr.cgi client dnsserver ftpget pinger squid
-	strip ${PREFIX}/sbin/${file}
+	if [ -f ${PREFIX}/sbin/${file} ] ; then \
+		strip ${PREFIX}/sbin/${file} ; \
+	fi
 .endfor
 	${MKDIR} ${PREFIX}/squid/logs
 	${MKDIR} ${PREFIX}/squid/cache
diff --git a/www/squid24/distinfo b/www/squid24/distinfo
index 51f924749273..e155465ecc40 100644
--- a/www/squid24/distinfo
+++ b/www/squid24/distinfo
@@ -1,2 +1 @@
-MD5 (squid118/squid-1.1.8-src.tar.gz) = 5f86761218ca68d8d797207fa2f8ff38
-MD5 (squid118/fixes.patch) = adda86492b18ea8af43ffd81e3ef0923
+MD5 (squid119/squid-1.1.9-src.tar.gz) = 90ae55a81bddb0aed4bb85b2815ddc9f
diff --git a/www/squid24/pkg-plist b/www/squid24/pkg-plist
index fa5f082bbcff..05cb21cc7ebf 100644
--- a/www/squid24/pkg-plist
+++ b/www/squid24/pkg-plist
@@ -1,12 +1,13 @@
-sbin/RunCache
 sbin/RunAccel
-sbin/squid
+sbin/RunCache
+sbin/cachemgr.cgi
 sbin/client
 sbin/dnsserver
 sbin/ftpget
 sbin/pinger
-sbin/cachemgr.cgi
-etc/squid/squid.conf.default
+sbin/squid
+sbin/unlinkd
 etc/rc.d/squid.sh
+etc/squid/squid.conf.default
 @exec mkdir -p %D/squid/cache
 @exec mkdir -p %D/squid/logs
-- 
cgit