Fix problems caused by recent changes: the example configuration files get

installed into "etc/squid" (and are not moved arround after installation).
The message of the install script matches the actual layout again and is
adapted to changes to "SQUID_SYSCONFDIR".

5 files changed, 38 insertions, 22 deletions

diff --git a/www/squid/INSTALL b/www/squid/INSTALL
index df1b1b12d4c..8c3532add6e 100644
--- a/www/squid/INSTALL
+++ b/www/squid/INSTALL
@@ -1,10 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.2 2001/11/08 06:58:10 tron Exp $
+# $NetBSD: INSTALL,v 1.3 2001/11/23 10:22:53 tron Exp $
 #
 
 PKGNAME=$1
-CONFDIR=${PKG_PREFIX}/etc/squid/
+EXCONFDIR=${PKG_PREFIX}/etc/squid/
+SYSCONFDIR=@SYSCONFDIR@/
 SQUIDCONF=squid.conf
 MIMECONF=mime.conf
 
@@ -19,8 +20,14 @@ case $2 in
 	echo "      configuring your WWW Navigator (Netscape, Mosaic,...)"
 	echo "      to use it as a proxy server."
 	echo ""
-	echo "    o Copy \"${CONFDIR}${SQUIDCONF}.default\" to \"${SQUIDCONF}\""
-	echo "      and \"${CONFDIR}${MIMECONF}.default\" to \"${MIMECONF}\""
+	if [ "${EXCONFDIR}" = "${SYSCONFDIR}" ]
+	then
+		echo "    o Copy \"${EXCONFDIR}${SQUIDCONF}.default\" to \"${SQUIDCONF}\""
+		echo "      and \"${EXCONFDIR}${MIMECONF}.default\" to \"${MIMECONF}\""
+	else
+		echo "    o Copy \"${EXCONFDIR}${SQUIDCONF}.default\" to \"${SYSCONFDIR}${SQUIDCONF}\""
+		echo "      and \"${EXCONFDIR}${MIMECONF}.default\" to \"${SYSCONFDIR}${MIMECONF}\""
+	fi
 	echo "      and edit them as required. You should pay attention to the"
 	echo "      ACTUAL locations of the cache \"spool\" logfiles and pidfile."
 	echo ""
diff --git a/www/squid/Makefile b/www/squid/Makefile
index e16f7f67c35..9dd24b4dba2 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2001/11/17 23:47:24 kim Exp $
+# $NetBSD: Makefile,v 1.56 2001/11/23 10:22:53 tron Exp $
 
 DISTNAME=	squid-2.4.STABLE2-src
 PKGNAME=	squid-2.4.2
@@ -13,8 +13,8 @@ COMMENT=	Post-Harvest_cached WWW proxy cache and accelerator
 
 BUILD_DEPENDS+=	perl>=${PERL5_REQD}:../../lang/perl5
 
-GNU_CONFIGURE=	# defined
-SQUID_SYSCONFDIR?= ${PREFIX}/etc/squid
+.include "../../mk/bsd.prefs.mk"
+GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+= --sysconfdir=${SQUID_SYSCONFDIR} \
 		--localstatedir=/var/squid \
 		${SQUID_CONFIGURE_ARGS}
@@ -23,10 +23,10 @@ CONFIGURE_ENV+=	PERL=${PERL5}
 BUILD_DEFS+=	SQUID_CONFIGURE_ARGS SQUID_SYSCONFDIR
 MAKEFILE=	makefile
 MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" PKG_PREFIX="${PREFIX}"
+INSTALL_FILE=	${WRKDIR}/INSTALL
 PLIST_SRC=	${WRKDIR}/PLIST
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 
-.include "../../mk/bsd.prefs.mk"
 # Configuration options which can be overwritten by the user.
 SQUID_CONFIGURE_ARGS?=	--enable-cachemgr-hostname=localhost \
 			--enable-delay-pools \
@@ -36,6 +36,9 @@ SQUID_CONFIGURE_ARGS?=	--enable-cachemgr-hostname=localhost \
 			--enable-underscores \
 			--enable-storeio=ufs,diskd
 
+# Configuration directory location which can be overwritten by the user.
+SQUID_SYSCONFDIR?=	${PREFIX}/etc/squid
+
 OPTIONAL_FILES=	libexec/diskd libexec/pinger libexec/unlinkd
 
 post-configure:
@@ -46,6 +49,8 @@ post-configure:
 
 post-build:
 	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/squid.sh >${WRKDIR}/squid.sh
+	${SED} s#@SYSCONFDIR@#${SQUID_SYSCONFDIR}#g <${PKGDIR}/INSTALL \
+	  >${WRKDIR}/INSTALL
 
 pre-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid
@@ -54,10 +59,6 @@ pre-install:
 
 post-install:
 	cd ${WRKSRC}/src; ${TEST} ! -x pinger || ${MAKE} install-pinger
-	@for i in mime squid; do				\
-	  ${MV} ${SQUID_SYSCONFDIR}/$$i.conf.default 		\
-	  ${PREFIX}/share/squid;				\
-	done
 	${INSTALL_SCRIPT} ${WRKDIR}/squid.sh ${PREFIX}/etc/rc.d/squid
 	@${SETENV} ${MAKE_ENV} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
diff --git a/www/squid/PLIST b/www/squid/PLIST
index e242307d564..b2f0c9170d9 100644
--- a/www/squid/PLIST
+++ b/www/squid/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2001/11/17 23:47:24 kim Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/11/23 10:22:53 tron Exp $
 etc/rc.d/squid
-share/squid/mime.conf.default
-share/squid/squid.conf.default
-@unexec rmdir %D/share/squid 2>/dev/null || true
+etc/squid/mime.conf.default
+etc/squid/squid.conf.default
+@unexec rmdir %D/etc/squid 2>/dev/null || true
 libexec/cachemgr.cgi
 sbin/RunAccel
 sbin/RunCache
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 76c26958697..ba479d7b4a1 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2001/10/09 19:01:50 tron Exp $
+$NetBSD: distinfo,v 1.6 2001/11/23 10:22:53 tron Exp $
 
 SHA1 (squid-2.4.STABLE2-src.tar.gz) = 798723943ef09e52539919f10b5d17a361fcfc11
 Size (squid-2.4.STABLE2-src.tar.gz) = 1075738 bytes
-SHA1 (patch-aa) = 89c0668d6380971734b373d38921525daeac61d5
+SHA1 (patch-aa) = d56966fabb9477ec1f4db2b91b1ed1e4be35a952
 SHA1 (patch-ab) = afb0c443c708d03fc7ab39120ae9a3c68d9e9b88
 SHA1 (patch-ac) = b962e05bcaccd0d9a0969b2f1419fd73456440cd
 SHA1 (patch-ad) = 03f76c2a781bff4b3a8680ee815f8c5dcbdd70d0
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index a47f36c3823..aab7d45341a 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2001/07/29 16:41:19 tron Exp $
+$NetBSD: patch-aa,v 1.7 2001/11/23 10:22:54 tron Exp $
 
---- src/Makefile.in.orig	Sun Jul 29 18:14:54 2001
-+++ src/Makefile.in	Sun Jul 29 18:20:14 2001
+--- src/Makefile.in.orig	Wed Apr  4 09:01:12 2001
++++ src/Makefile.in	Fri Nov 23 10:56:52 2001
 @@ -12,6 +12,8 @@
  cgi_suffix	= @cgi_suffix@
  top_srcdir	= @top_srcdir@
@@ -11,7 +11,15 @@ $NetBSD: patch-aa,v 1.6 2001/07/29 16:41:19 tron Exp $
  libexecdir      = @libexecdir@
  sysconfdir	= @sysconfdir@
  localstatedir   = @localstatedir@
-@@ -40,14 +42,14 @@
+@@ -34,20 +36,20 @@
+ DISKD_EXE	= diskd$(exec_suffix)
+ 
+ DEFAULT_PREFIX		= $(prefix)
+-DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
+-DEFAULT_MIME_TABLE	= $(sysconfdir)/mime.conf
++DEFAULT_CONFIG_FILE     = $(prefix)/etc/squid/squid.conf
++DEFAULT_MIME_TABLE	= $(prefix)/etc/squid/mime.conf
+ DEFAULT_DNSSERVER       = $(libexecdir)/$(DNSSERVER_EXE)
  DEFAULT_CACHE_LOG       = $(localstatedir)/logs/cache.log
  DEFAULT_ACCESS_LOG      = $(localstatedir)/logs/access.log
  DEFAULT_STORE_LOG       = $(localstatedir)/logs/store.log