summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2012-09-12 13:16:38 +0000
committerobache <obache@pkgsrc.org>2012-09-12 13:16:38 +0000
commit8aa0660c48c7ebfd34df958c25688be5ac3319e3 (patch)
tree076a88a381817dd04d9498e12b207d888222870b /net
parent6a22aa2336318447b0484a3d3ad215ead47a3017 (diff)
downloadpkgsrc-8aa0660c48c7ebfd34df958c25688be5ac3319e3.tar.gz
Instead of overwrite PKG_OPTIONS.snort with -inet6, drop inet6 from
PKG_SUGGESTED_OPTIONS for SunOS. PR 46947.
Diffstat (limited to 'net')
-rw-r--r--net/snort/Makefile7
-rw-r--r--net/snort/options.mk6
2 files changed, 6 insertions, 7 deletions
diff --git a/net/snort/Makefile b/net/snort/Makefile
index c61c30b3aaf..36018b89f27 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2012/03/03 00:13:47 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2012/09/12 13:16:38 obache Exp $
#
DISTNAME= snort-2.8.5.1
@@ -79,11 +79,6 @@ SUBST_FILES.install+= src/dynamic-preprocessors/dns/Makefile
SUBST_SED.install= -e "s|-o root -g wheel||g"
SUBST_MESSAGE.install= Fixing install scripts.
-# does not work on SunOS
-.if ${OPSYS} == "SunOS"
-PKG_OPTIONS.snort=-inet6
-.endif
-
.include "options.mk"
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/net/snort/options.mk b/net/snort/options.mk
index 8c8b79764b8..b6fba09d44f 100644
--- a/net/snort/options.mk
+++ b/net/snort/options.mk
@@ -1,11 +1,15 @@
-# $NetBSD: options.mk,v 1.6 2012/06/12 15:46:01 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2012/09/12 13:16:38 obache Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.snort
PKG_SUPPORTED_OPTIONS= debug snort-prelude ssl snmp snort-gre
PKG_SUPPORTED_OPTIONS+= snort-dynamicplugin snort-timestats
PKG_SUPPORTED_OPTIONS+= snort-rulestate inet6
+# does not work on SunOS
+.if ${OPSYS} != "SunOS"
PKG_SUGGESTED_OPTIONS= inet6
+.endif
+
PKG_OPTIONS_OPTIONAL_GROUPS= flex
PKG_OPTIONS_GROUP.flex= snort-flexresp snort-flexresp2