Upgrade from 1.0 beta11 to 1.0 release.

Submitted by:	Andrew Stesin <stesin@elvisti.kiev.ua>

6 files changed, 24 insertions, 11 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 0207ae8f4d1..1befb9b3029 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,21 +1,22 @@
 # New ports collection makefile for:	squid
-# Version required:	1.0.beta11
+# Version required:	1.0.0
 # Date created:		Fri May 17 04:02:53 EET DST 1996
 # Whom:			Andrew Stesin <stesin@elvisti.kiev.ua>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/06/03 02:21:13 asami Exp $
 #
 
-DISTNAME=	squid-1.0.beta11
-PKGNAME=	squid-1.0b11
+DISTNAME=	squid-1.0.0
+PKGNAME=	squid-1.0
 CATEGORIES+=	www
-MASTER_SITES=  ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/ \
+MASTER_SITES=  \
 	ftp://www.nlanr.net/Software/Squid/ \
+	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/ \
 	ftp://sunsite.auc.dk/pub/infosystems/squid/ \
 	ftp://ftp.net.lut.ac.uk/squid/
 EXTRACT_SUFX=	-src.tar.gz
 
-MAINTAINER=		stesin@elvisti.kiev.ua
+MAINTAINER=	stesin@elvisti.kiev.ua
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 5b8bf8d65dc..ebf12fa6b2c 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1 +1 @@
-MD5 (squid-1.0.beta11-src.tar.gz) = f94d88cf76ef3b3076f271ace113780e
+MD5 (squid-1.0.0-src.tar.gz) = a16ecec2fc688234607f6f60c9ef4e3e
diff --git a/www/squid/pkg-comment b/www/squid/pkg-comment
index f03c0577674..4df36232a32 100644
--- a/www/squid/pkg-comment
+++ b/www/squid/pkg-comment
@@ -1 +1 @@
-Post-Harvest_cached WWW accelerator
+Post-Harvest_cached WWW proxy cache and accelerator
diff --git a/www/squid/pkg-descr b/www/squid/pkg-descr
index 325c5a5df97..4a03e4124d5 100644
--- a/www/squid/pkg-descr
+++ b/www/squid/pkg-descr
@@ -6,3 +6,11 @@ The Squid home page is http://www.nlanr.net/Squid/.
 This software is based on the Harvest Object Cache developed by
 the University of Colorado and the University of Southern California.
 The Harvest home page is http://harvest.cs.colorado.edu/.
+
+FreeBSD PORTER'S NOTES. To this moment, Squid is poorly documented.
+But you aren't lost in space: there is a mailing list,
+<squid-users@nlanr.net>, where you will find some support and help.
+I also _strongly_ suggest you to examine Web pages noticed above.
+If you have comments/questions/suggestions about FreeBSD port -- ask
+me.  Andrew Stesin.
+
diff --git a/www/squid/pkg-install b/www/squid/pkg-install
index e476199106d..8f5ca748d66 100644
--- a/www/squid/pkg-install
+++ b/www/squid/pkg-install
@@ -20,11 +20,16 @@ case $2 in
 	echo ""
 	echo "==> Press Enter to edit the ${PKGNAME} config file."
 	echo "    (The defaults are reasonable; and the file is well commented)"
-	echo "    You'd probably like to pay attention to the"
-	echo "    ACTUAL locations of BOTH cache \"spool\" AND logfiles."
+	tput md
+	echo "    You'd certainly like to pay attention to the"
+	echo "    ACTUAL locations of cache \"spool\", logfiles, pidfile!"
+	tput me
 	read skip
 	chown root:wheel ${PREFIX:-/usr/local}/etc/squid.conf*
 	chmod 644 ${PREFIX:-/usr/local}/etc/squid.conf*
+	[ -f ${PREFIX:-/usr/local}/etc/squid.conf ] || \
+		cp -fp	${PREFIX:-/usr/local}/etc/squid.conf.default \
+			${PREFIX:-/usr/local}/etc/squid.conf
 	${EDITOR:-vi} ${PREFIX:-/usr/local}/etc/squid.conf
 	;;
     *)
diff --git a/www/squid/pkg-plist b/www/squid/pkg-plist
index dc5f780eea8..b5d11ef67b1 100644
--- a/www/squid/pkg-plist
+++ b/www/squid/pkg-plist
@@ -6,4 +6,3 @@ bin/dnsserver
 bin/ftpget
 bin/cachemgr.cgi
 etc/squid.conf.default
-etc/squid.conf