Change "squid" package to honor "PKG_SYSCONFDIR" completely. This fixes

PR pkg/15775 by Kimmo Suominen.

5 files changed, 22 insertions, 21 deletions

diff --git a/www/squid/INSTALL b/www/squid/INSTALL
index 8c3532add6e..51cb55be958 100644
--- a/www/squid/INSTALL
+++ b/www/squid/INSTALL
@@ -1,10 +1,10 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.3 2001/11/23 10:22:53 tron Exp $
+# $NetBSD: INSTALL,v 1.4 2002/03/22 14:59:01 tron Exp $
 #
 
 PKGNAME=$1
-EXCONFDIR=${PKG_PREFIX}/etc/squid/
+EXCONFDIR=${PKG_PREFIX}/share/examples/squid/
 SYSCONFDIR=@SYSCONFDIR@/
 SQUIDCONF=squid.conf
 MIMECONF=mime.conf
@@ -20,14 +20,10 @@ case $2 in
 	echo "      configuring your WWW Navigator (Netscape, Mosaic,...)"
 	echo "      to use it as a proxy server."
 	echo ""
-	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 "    o Copy \"${EXCONFDIR}${SQUIDCONF}\" to"
+	echo "      \"${SYSCONFDIR}${SQUIDCONF}\" and"
+	echo "      \"${EXCONFDIR}${MIMECONF}\" to"
+	echo "      \"${SYSCONFDIR}${MIMECONF}\""
 	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 6f47dd78386..32c270604bc 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2002/03/20 16:27:21 taca Exp $
+# $NetBSD: Makefile,v 1.63 2002/03/22 14:59:01 tron Exp $
 
 DISTNAME=	squid-2.4.STABLE6-src
 PKGNAME=	squid-2.4.6
@@ -25,6 +25,7 @@ MAKEFILE=	makefile
 MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" PKG_PREFIX="${PREFIX}"
 INSTALL_FILE=	${WRKDIR}/INSTALL
 PLIST_SRC=	${WRKDIR}/PLIST
+PLIST_SUBST+=	SQUID_SYSCONFDIR=${SQUID_SYSCONFDIR}
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 
 # Configuration options which can be overwritten by the user.
@@ -49,7 +50,8 @@ post-build:
 	  >${WRKDIR}/INSTALL
 
 pre-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/etc/squid
+	@${INSTALL_DATA_DIR} ${SQUID_SYSCONFDIR}
+	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/squid
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid/errors
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid/icons
diff --git a/www/squid/PLIST b/www/squid/PLIST
index 6f063055ef8..c400a3f967e 100644
--- a/www/squid/PLIST
+++ b/www/squid/PLIST
@@ -1,10 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2001/12/12 17:06:19 taca Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/03/22 14:59:01 tron Exp $
 etc/rc.d/squid
-etc/squid/mime.conf.default
-etc/squid/squid.conf.default
 @unexec ${RMDIR} %D/etc/squid 2>/dev/null || ${TRUE}
 libexec/cachemgr.cgi
+share/examples/squid/mime.conf
+share/examples/squid/squid.conf
 sbin/RunAccel
 sbin/RunCache
 sbin/client
 sbin/squid
+@dirrm share/examples/squid
+@exec mkdir -p ${SQUID_SYSCONFDIR}
+@unexec rmdir ${SQUID_SYSCONFDIR} 2>/dev/null || true
diff --git a/www/squid/distinfo b/www/squid/distinfo
index 32050d7e83b..354a14160f5 100644
--- a/www/squid/distinfo
+++ b/www/squid/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2002/03/20 16:27:21 taca Exp $
+$NetBSD: distinfo,v 1.14 2002/03/22 14:59:01 tron Exp $
 
 SHA1 (squid-2.4.STABLE6-src.tar.gz) = 0028030b420818922757b10260ae430955c0e617
 Size (squid-2.4.STABLE6-src.tar.gz) = 1081327 bytes
-SHA1 (patch-aa) = d56966fabb9477ec1f4db2b91b1ed1e4be35a952
+SHA1 (patch-aa) = 49aea18e313e86ca349c4a34d19b0ff1b0f1fb5a
 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 aab7d45341a..2f7aab021a0 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2001/11/23 10:22:54 tron Exp $
+$NetBSD: patch-aa,v 1.8 2002/03/22 14:59:02 tron Exp $
 
 --- src/Makefile.in.orig	Wed Apr  4 09:01:12 2001
-+++ src/Makefile.in	Fri Nov 23 10:56:52 2001
++++ src/Makefile.in	Fri Mar 22 15:47:06 2002
 @@ -12,6 +12,8 @@
  cgi_suffix	= @cgi_suffix@
  top_srcdir	= @top_srcdir@
@@ -117,7 +117,7 @@ $NetBSD: patch-aa,v 1.7 2001/11/23 10:22:54 tron Exp $
 -		echo "$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir)"; \
 -		$(INSTALL_FILE) $(srcdir)/mime.conf $(sysconfdir); \
 -	fi
-+	$(INSTALL_FILE) squid.conf $(DEFAULT_CONFIG_FILE).default
++	$(INSTALL_FILE) squid.conf $(prefix)/share/examples/squid
 +#	@if test -f $(DEFAULT_CONFIG_FILE) ; then \
 +#		echo "$@ will not overwrite existing $(DEFAULT_CONFIG_FILE)" ; \
 +#	else \
@@ -125,7 +125,7 @@ $NetBSD: patch-aa,v 1.7 2001/11/23 10:22:54 tron Exp $
 +#		$(INSTALL_FILE) squid.conf $(DEFAULT_CONFIG_FILE); \
 +#	fi
 +
-+	$(INSTALL_FILE) $(srcdir)/mime.conf $(DEFAULT_MIME_TABLE).default
++	$(INSTALL_FILE) $(srcdir)/mime.conf $(prefix)/share/examples/squid
 +#	@if test -f $(DEFAULT_MIME_TABLE) ; then \
 +#		echo "$@ will not overwrite existing $(DEFAULT_MIME_TABLE)" ; \
 +#	else \