Thu May 5 08:36:30 2022 UTC ()
squid4: Remove redundant NetBSD version check


(nia)
diff -r1.4 -r1.5 pkgsrc/www/squid4/options.mk

cvs diff -r1.4 -r1.5 pkgsrc/www/squid4/options.mk (expand / switch to unified diff)

--- pkgsrc/www/squid4/options.mk 2020/06/21 16:05:55 1.4
+++ pkgsrc/www/squid4/options.mk 2022/05/05 08:36:30 1.5
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.4 2020/06/21 16:05:55 taca Exp $ 1# $NetBSD: options.mk,v 1.5 2022/05/05 08:36:30 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.squid4 3PKG_OPTIONS_VAR= PKG_OPTIONS.squid4
4PKG_SUPPORTED_OPTIONS= inet6 snmp squid-backend-aufs \ 4PKG_SUPPORTED_OPTIONS= inet6 snmp squid-backend-aufs \
5 squid-backend-diskd squid-backend-rock \ 5 squid-backend-diskd squid-backend-rock \
6 squid-backend-ufs squid-ecap squid-esi \ 6 squid-backend-ufs squid-ecap squid-esi \
7 squid-unlinkd squid-kerberos-helper \ 7 squid-unlinkd squid-kerberos-helper \
8 squid-ldap-helper squid-pam-helper 8 squid-ldap-helper squid-pam-helper
9PKG_OPTIONS_REQUIRED_GROUPS= ssl 9PKG_OPTIONS_REQUIRED_GROUPS= ssl
10PKG_OPTIONS_GROUP.ssl= openssl gnutls 10PKG_OPTIONS_GROUP.ssl= openssl gnutls
11PKG_OPTIONS_LEGACY_OPTS+= diskd:squid-backend-diskd \ 11PKG_OPTIONS_LEGACY_OPTS+= diskd:squid-backend-diskd \
12 ecap:squid-ecap esi:squid-esi \ 12 ecap:squid-ecap esi:squid-esi \
13 null:squid-backend-null ufs:squid-backend-ufs \ 13 null:squid-backend-null ufs:squid-backend-ufs \
14 linux-netfilter:squid-netfilter \ 14 linux-netfilter:squid-netfilter \
@@ -23,27 +23,27 @@ PLIST_VARS+= eacl_LDAP_group eacl_file_u @@ -23,27 +23,27 @@ PLIST_VARS+= eacl_LDAP_group eacl_file_u
23PLIST_VARS+= openssl ta_kerberos unlinkd 23PLIST_VARS+= openssl ta_kerberos unlinkd
24 24
25PKG_SUGGESTED_OPTIONS= inet6 openssl snmp squid-backend-aufs \ 25PKG_SUGGESTED_OPTIONS= inet6 openssl snmp squid-backend-aufs \
26 squid-backend-diskd squid-backend-ufs \ 26 squid-backend-diskd squid-backend-ufs \
27 squid-esi squid-pam-helper squid-unlinkd 27 squid-esi squid-pam-helper squid-unlinkd
28 28
29.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
30 30
31.if ${OPSYS} == "Linux" 31.if ${OPSYS} == "Linux"
32PKG_SUPPORTED_OPTIONS+= squid-netfilter 32PKG_SUPPORTED_OPTIONS+= squid-netfilter
33.endif 33.endif
34 34
35# some release of NetBSD lacks <ipl.h> header of IP Filter 4.x 35# some release of NetBSD lacks <ipl.h> header of IP Filter 4.x
36.if ${OPSYS} != "NetBSD" || ${OS_VERSION:M[01].*} || exists(/usr/include/netinet/ipl.h) 36.if ${OPSYS} != "NetBSD" || exists(/usr/include/netinet/ipl.h)
37PKG_SUPPORTED_OPTIONS+= squid-ipf 37PKG_SUPPORTED_OPTIONS+= squid-ipf
38.endif 38.endif
39 39
40.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || \ 40.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || \
41 ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" 41 ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly"
42PKG_SUPPORTED_OPTIONS+= squid-pf 42PKG_SUPPORTED_OPTIONS+= squid-pf
43.endif 43.endif
44 44
45.if (${OPSYS} == "NetBSD") && \ 45.if (${OPSYS} == "NetBSD") && \
46 !empty(PKG_SUPPORTED_OPTIONS:Msquid-ipf) 46 !empty(PKG_SUPPORTED_OPTIONS:Msquid-ipf)
47PKG_SUGGESTED_OPTIONS+= squid-ipf 47PKG_SUGGESTED_OPTIONS+= squid-ipf
48.endif 48.endif
49 49