summaryrefslogtreecommitdiff
path: root/www/squid3
diff options
context:
space:
mode:
authorhauke <hauke@pkgsrc.org>2013-12-28 19:50:34 +0000
committerhauke <hauke@pkgsrc.org>2013-12-28 19:50:34 +0000
commit06a66e91a41c03a1ec1be649efebf99f7c4b3f79 (patch)
treeba2f7bab41d5c61672579cfee808aac55fa0dcf8 /www/squid3
parentfb0f7499214761082099ca70ac645053e0cee819 (diff)
downloadpkgsrc-06a66e91a41c03a1ec1be649efebf99f7c4b3f79.tar.gz
For PKG_OPTIONS.squid = -ssl, do not PLIST files that will not be
installed.
Diffstat (limited to 'www/squid3')
-rw-r--r--www/squid3/Makefile4
-rw-r--r--www/squid3/PLIST4
-rw-r--r--www/squid3/options.mk4
3 files changed, 7 insertions, 5 deletions
diff --git a/www/squid3/Makefile b/www/squid3/Makefile
index 2460eacb822..d736bace459 100644
--- a/www/squid3/Makefile
+++ b/www/squid3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2013/12/11 14:55:02 tron Exp $
+# $NetBSD: Makefile,v 1.23 2013/12/28 19:50:34 hauke Exp $
DISTNAME= squid-3.4.1
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
ftp://ftp.squid-cache.org/pub/squid/ \
diff --git a/www/squid3/PLIST b/www/squid3/PLIST
index 720d243cdf2..1e9a64c1f42 100644
--- a/www/squid3/PLIST
+++ b/www/squid3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2013/12/10 14:48:26 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/12/28 19:50:34 hauke Exp $
bin/purge
bin/squidclient
${PLIST.ba_getpwnam}libexec/basic_getpwnam_auth
@@ -14,7 +14,7 @@ ${PLIST.diskd}libexec/diskd
${PLIST.eacl_file_userip}libexec/ext_file_userip_acl
${PLIST.eacl_LDAP_group}libexec/ext_ldap_group_acl
${PLIST.eacl_unix_group}libexec/ext_unix_group_acl
-libexec/cert_valid.pl
+${PLIST.ssl}libexec/cert_valid.pl
libexec/helper-mux.pl
libexec/log_db_daemon
libexec/log_file_daemon
diff --git a/www/squid3/options.mk b/www/squid3/options.mk
index b7f9160b99f..8ffeb06f1a3 100644
--- a/www/squid3/options.mk
+++ b/www/squid3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2013/12/10 14:48:26 adam Exp $
+# $NetBSD: options.mk,v 1.11 2013/12/28 19:50:34 hauke Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.squid
PKG_SUPPORTED_OPTIONS= inet6 snmp ssl squid-backend-aufs squid-backend-diskd \
@@ -16,6 +16,7 @@ PLIST_VARS+= da_file da_LDAP
PLIST_VARS+= na_SMB
PLIST_VARS+= ta_kerberos
PLIST_VARS+= eacl_file_userip eacl_LDAP_group eacl_unix_group
+PLIST_VARS+= ssl
PKG_SUGGESTED_OPTIONS= inet6 snmp ssl squid-backend-diskd squid-carp \
squid-pam-helper squid-unlinkd
@@ -115,6 +116,7 @@ CONFIGURE_ARGS+= --disable-snmp
.if !empty(PKG_OPTIONS:Mssl)
CONFIGURE_ARGS+= --enable-ssl --with-openssl=${SSLBASE:Q}
. include "../../security/openssl/buildlink3.mk"
+PLIST.ssl= yes
.endif
.if !empty(PKG_OPTIONS:Msquid-backend-aufs)