From cbb1233bc0cc644bc7d5709faabec303e4a465f7 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Sun, 2 Mar 1997 02:50:43 +0000
Subject: Update 1.1.6 -> 1.1.7 + vendor patches.

Note: the patch file on the web site has several problems.. First, it
doesn't apply, and second, it bogusly changes the version.  It also
introduces some problems for FreeBSD where the author missed the point of
a fix I sent back. :-(
---
 www/squid22/Makefile | 16 ++++++++++------
 www/squid22/distinfo |  4 ++--
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'www/squid22')

diff --git a/www/squid22/Makefile b/www/squid22/Makefile
index 4299f4911a81..0963b9520211 100644
--- a/www/squid22/Makefile
+++ b/www/squid22/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	squid
-# Version required:	1.1.6
+# Version required:	1.1.7
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.21 1997/02/08 16:19:15 peter Exp $
+# $Id: Makefile,v 1.22 1997/02/20 17:17:32 peter Exp $
 #
 
-DISTNAME=	squid-1.1.6
+DISTNAME=	squid-1.1.7
 CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1/ \
@@ -15,8 +15,10 @@ 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.6/
-PATCHFILES+=    fixes.patch
+#Sigh. cannot use this since the author botched it so badly. :-(
+#see patches/patch-ab
+#PATCH_SITES+=   http://squid.nlanr.net/Squid/1.1/1.1.7/
+#PATCHFILES+=    fixes.patch
 
 MAINTAINER=	peter@freebsd.org
 
@@ -38,7 +40,9 @@ MAKEFILE=	makefile
 #MAKE_ENV+=	USERAGENT_OPT="-DUSE_USERAGENT_LOG=1"
 #MAKE_ENV+=	KILL_PARENT_OPT="-DKILL_PARENT_OPT"
 #MAKE_ENV+=	USE_POLL_OPT="-DUSE_POLL"
-#MAKE_ENV+=	ANON_OPT="-DUSE_ANONYMIZER"
+# 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"
 
 post-install:
 .for file in cachemgr.cgi client dnsserver ftpget pinger squid
diff --git a/www/squid22/distinfo b/www/squid22/distinfo
index dded30b010e4..f87e0a269b56 100644
--- a/www/squid22/distinfo
+++ b/www/squid22/distinfo
@@ -1,2 +1,2 @@
-MD5 (squid/squid-1.1.6-src.tar.gz) = 99a5d163781c116a97b5e01ce2a6c72e
-MD5 (squid/fixes.patch) = 66ec617cc9a295687f14b1c3818c9396
+MD5 (squid/squid-1.1.7-src.tar.gz) = ac0d1f9b928458e6d2d24dd6615998d3
+MD5 (squid/fixes.patch) = c9700ba1bb40c13eb7daa2770b75893a
-- 
cgit