- Add "carp" and "unlinkd" option which are enabled on default.

  "unlinkd" option is propsed from Dave Sainty by private mail.
- Change "perl:run" to "perl" in USE_TOOLS since perl is used at build time.
- Quiet pkglint; changing make macro in double quotation into :Q modifier.

Bump PKGREVISION.

2 files changed, 16 insertions, 8 deletions

diff --git a/www/squid/Makefile b/www/squid/Makefile
index 1d0fbdf219c..b903725ecc6 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.164 2005/10/31 09:53:41 taca Exp $
+# $NetBSD: Makefile,v 1.165 2005/12/05 14:06:03 taca Exp $
 
 DISTNAME=	squid-2.5.STABLE12
 PKGNAME=	squid-2.5.12
-PKGREVISION=	2
+PKGREVISION=	3
 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/ \
@@ -30,13 +30,13 @@ DOCFILES=	ChangeLog RELEASENOTES.html doc/debug-sections.txt
 PKG_SYSCONFSUBDIR?=	squid
 
 USE_PKGINSTALL=		yes
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		perl
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
 			--localstatedir=${DATADIR}
 
-MAKE_ENV+=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-MAKE_ENV+=	PKG_PREFIX="${PREFIX}" VARBASE="${VARBASE}"
+MAKE_ENV+=	INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
+MAKE_ENV+=	PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q}
 PLIST_SRC=	${WRKDIR}/PLIST
 RCD_SCRIPTS=	squid
 
diff --git a/www/squid/options.mk b/www/squid/options.mk
index 8ecc788ff4b..b3f88e19ab5 100644
--- a/www/squid/options.mk
+++ b/www/squid/options.mk
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.4 2005/09/15 15:40:47 taca Exp $
+# $NetBSD: options.mk,v 1.5 2005/12/05 14:06:03 taca Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.squid
-PKG_SUPPORTED_OPTIONS=	icmp pam-helper snmp ssl aufs
+PKG_SUPPORTED_OPTIONS=	carp icmp pam-helper snmp ssl aufs unlinkd
 #
 # most of options are enabled by default except aufs.  aufs backend isn't
 # tested well.
-PKG_SUGGESTED_OPTIONS=	icmp pam-helper snmp ssl
+PKG_SUGGESTED_OPTIONS=	carp icmp pam-helper snmp ssl unlinkd
 
 .if !empty(OPSYS:MLinux)
 PKG_SUPPORTED_OPTIONS+=	linux-netfilter
@@ -66,6 +66,10 @@ CONFIGURE_ARGS+=	--enable-ipf-transparent
 CONFIGURE_ARGS+=	arp-acl
 .endif
 
+.if !empty(PKG_OPTIONS:Mcarp)
+CONFIGURE_ARGS+=	--enable-carp
+.endif
+
 .if !empty(PKG_OPTIONS:Micmp)
 CONFIGURE_ARGS+=	--enable-icmp
 .endif
@@ -88,6 +92,10 @@ CONFIGURE_ARGS+=	--enable-ssl --with-openssl=${SSLBASE}
 SQUID_BACKENDS+=	diskd
 .endif
 
+.if empty(PKG_OPTIONS:Munlinkd)
+CONFIGURE_ARGS+=	--disable-unlinkd
+.endif
+
 .if !empty(SQUID_BASIC_AUTH_HELPERS)
 CONFIGURE_ARGS+= --enable-basic-auth-helpers=${SQUID_BASIC_AUTH_HELPERS:Q}
 .endif