- Add missing optional installed files.

- Slightly simplify installation of example configurations.
- Add official patches.

* 2005-07-11 00:46 (Cosmetic) The new --with-build-environment=...
				option doesn't work
* 2005-07-09 08:58 (Cosmetic) Allow wb_ntlm_auth to run more silent
* 2005-07-03 08:24 (Cosmetic) "make all" gives many warnings
* 2005-06-29 20:36 (Minor) wbinfo_group.pl only looks into the first
				group specified
* 2005-06-21 22:28 (Minor) FTP listings uses "BASE HREF" much more than
				it needs to,
* 2005-06-22 10:46 (Cosmetic) Title in FTP listings somewhat messed up
* 2005-06-19 21:03 (Minor) SNMP GETNEXT fails if the given OID is
				outside the Squid MIB
* 2005-06-19 09:39 (Minor) squid -k reconfigure internal corruption
				if the type of a cache_dir is changed
* 2005-06-13 22:55 (Minor) httpd_accel_signle_host incompatible
				with redireection
* 2005-06-30 08:49 (Minor) Core dump with --enable-ipf-transparent
				if access to NAT device not granted
* 2005-06-27 21:24 (Minor) squid -k fails in combination with chroot
				after patch for bug 1157
* 2005-06-09 08:01 (Minor) Squid internal icons served up with slightly
				incorrect HTTP headers
* 2005-06-06 21:38 (Cosmetic) Updated Spanish error messages

Bump PKGREVISION.

1 files changed, 25 insertions, 3 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index a62c61204f5..eab0d79df79 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.154 2005/07/15 20:14:03 jlam Exp $
+# $NetBSD: Makefile,v 1.155 2005/08/09 15:48:29 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE10
 PKGNAME=	squid-2.5.10
+PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
 		ftp://ftp.leo.org/pub/comp/general/infosys/www/daemons/squid/squid-2/STABLE/ \
@@ -9,7 +10,20 @@ MASTER_SITES=	http://www.squid-cache.org/Versions/v2/2.5/ \
 EXTRACT_SUFX=	.tar.bz2
 
 PATCH_SITES=	http://www.squid-cache.org/Versions/v2/2.5/bugs/
-PATCHFILES=	squid-2.5.STABLE10-content_length.patch
+PATCHFILES=	squid-2.5.STABLE10-content_length.patch \
+		squid-2.5.STABLE10-spanish.patch \
+		squid-2.5.STABLE10-internal_date.patch \
+		squid-2.5.STABLE10-chroot-2.patch \
+		squid-2.5.STABLE10-transparent-2.patch \
+		squid-2.5.STABLE10-redirect_flags.patch \
+		squid-2.5.STABLE10-cache_dir_change.patch \
+		squid-2.5.STABLE10-snmp_getnext.patch \
+		squid-2.5.STABLE10-ftp_title-2.patch \
+		squid-2.5.STABLE10-ftp_basehref.patch \
+		squid-2.5.STABLE10-wbinfo_groups.patch \
+		squid-2.5.STABLE10-64bit_cleanup.patch \
+		squid-2.5.STABLE10-wb_ntlm_auth_silent.patch \
+		squid-2.5.STABLE10-buildenv.patch
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	taca@NetBSD.org
@@ -47,9 +61,12 @@ PKG_GROUPS=	${SQUID_GROUP}
 PKG_USERS=	${SQUID_USER}:${SQUID_GROUP}::Squid\\ Web-Cache\\ pseudo-user
 CONF_FILES+=	${EXAMPLESDIR}/mime.conf ${PKG_SYSCONFDIR}/mime.conf
 CONF_FILES+=	${EXAMPLESDIR}/squid.conf ${PKG_SYSCONFDIR}/squid.conf
+CONF_FILES+=	${EXAMPLESDIR}/msntauth.conf ${PKG_SYSCONFDIR}/msntauth.conf
 OWN_DIRS=	${DATADIR}
 OWN_DIRS_PERMS+= ${DATADIR}/cache ${SQUID_USER} ${SQUID_GROUP} 0750 \
 		 ${DATADIR}/logs ${SQUID_USER} ${SQUID_GROUP} 0750
+EXAMPLES_FILES=	src/mime.conf.default src/squid.conf.default \
+		helpers/basic_auth/MSNT/msntauth.conf.default
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -82,6 +99,7 @@ OPTIONAL_FILES+= libexec/digest_pw_auth
 #
 # ntlm auth helpers (except no_check and winbind)
 #
+OPTIONAL_FILES+= libexec/fakeauth_auth libexec/ntlm_auth
 OPTIONAL_FILES+= libexec/wb_ntlmauth man/man8/squid_unix_group.8
 #
 # external acl helpers (except ldap_group, wbinfo_group and winbind_group)
@@ -89,12 +107,16 @@ OPTIONAL_FILES+= libexec/wb_ntlmauth man/man8/squid_unix_group.8
 OPTIONAL_FILES+= libexec/ip_user_check libexec/squid_unix_group
 
 pre-install:
-	@${INSTALL_DATA_DIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid/errors
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/squid/icons
 
 post-install:
+	@${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+.for f in ${EXAMPLES_FILES}
+	cd ${WRKSRC} && \
+	${INSTALL_DATA}	${f} ${EXAMPLESDIR}/`basename ${f} .default`
+.endfor
 	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	@cd ${WRKSRC};						\