Upgraded to version 2.9.9.0.

This is a HUGE bump, so look at the changelog on the Snort website !
For example, Snort does not natively handle MySQL anymore.

As for the pkgsrc changes :
- updated deps (net/daq) ;
- updated config files ;
- updated MASTER_SITE ;
- some substitution to handle pkgsrc paths ;
- updated compile options.

12 files changed, 142 insertions, 263 deletions

diff --git a/net/snort/MESSAGE b/net/snort/MESSAGE
index 1a64f9dc4a6..32e227e104f 100644
--- a/net/snort/MESSAGE
+++ b/net/snort/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2005/09/14 12:46:52 adrianp Exp $
+$NetBSD: MESSAGE,v 1.6 2017/06/15 18:27:50 nils Exp $
 
 To use snort, you will need to perform the following steps:
 
@@ -13,13 +13,11 @@ To use snort, you will need to perform the following steps:
 	/etc/rc.d/snort start
 
 As of snort v2.4.0 rules are no longer distributed with the main
-distribution.  You can either install the net/snort-rules package
-which contains the GPL "Community Rules" or download your appropriate
-rules from:
-
-	http://www.snort.org/pub-bin/downloads.cgi
-
-or:
-	http://www.bleedingsnort.com
+distribution.
+You can :
+- install the net/snort-rules package which contains
+  the GPL "Community Rules"
+- install the net/pulledpork package which downloads and updates rules
+- manually download rules from https://snort.org/downloads/#rule-downloads
 
 ===========================================================================
diff --git a/net/snort/Makefile b/net/snort/Makefile
index 810de2c7132..50e6ebc32a1 100644
--- a/net/snort/Makefile
+++ b/net/snort/Makefile
@@ -1,19 +1,17 @@
-# $NetBSD: Makefile,v 1.55 2017/01/19 18:52:21 agc Exp $
+# $NetBSD: Makefile,v 1.56 2017/06/15 18:27:50 nils Exp $
 #
 
-DISTNAME=		snort-2.8.5.1
-PKGREVISION=		9
+DISTNAME=		snort-2.9.9.0
 CATEGORIES=		net security
-MASTER_SITES=		http://www.snort.org/dl/
-MASTER_SITES+=		http://www.snort.org/dl/current/
-MASTER_SITES+=		http://www.snort.org/dl/old/
+MASTER_SITES=		https://www.snort.org/downloads/archive/snort/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.snort.org/
 COMMENT=		The Open Source Network Intrusion Detection System
-
 LICENSE=		gnu-gpl-v2
 
+DEPENDS+=		daq>=2.0.0:../../net/daq
+
 CONFLICTS+=		snort-mysql-[0-9]*
 CONFLICTS+=		snort-pgsql-[0-9]*
 CONFLICTS+=		snort-prelude-[0-9]*
@@ -30,58 +28,66 @@ EGDIR=			${PREFIX}/share/examples/snort
 PKG_GROUPS=		${SNORT_GROUP}
 PKG_USERS=		${SNORT_USER}:${SNORT_GROUP}
 PKG_GROUPS_VARS+=	SNORT_GROUP
-PKG_USERS_VARS+=	SNORT_USER
-FILES_SUBST+=		SNORT_USER=${SNORT_USER:Q} SNORT_GROUP=${SNORT_GROUP:Q}
+PKG_USERS_VARS=		SNORT_USER
+FILES_SUBST+=		SNORT_USER=${SNORT_USER} SNORT_GROUP=${SNORT_GROUP}
 BUILD_DEFS+=		VARBASE
 MAKE_JOBS_SAFE=		NO
 OWN_DIRS_PERMS=		${VARBASE}/log/snort ${SNORT_USER} ${SNORT_GROUP} 700
 DOC_FILES=		BUGS INSTALL NEWS PROBLEMS README TODO USAGE WISHLIST
-
-CONF_FILES=		${EGDIR}/snort.conf.default \
-			${PKG_SYSCONFDIR}/snort.conf
-CONF_FILES+=		${EGDIR}/threshold.conf \
-			${PKG_SYSCONFDIR}/threshold.conf
+OWN_DIRS=		${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/rules
+OWN_DIRS+=		${PKG_SYSCONFDIR}/so_rules ${PKG_SYSCONFDIR}/preproc_rules
+OWN_DIRS+=		${PREFIX}/lib ${PREFIX}/lib/snort_dynamicrules
+INSTALLATION_DIRS+=	${EGDIR}/rules 
+AUTO_MKDIRS=		yes
+
+CONF_FILES=		${EGDIR}/attribute_table.dtd \
+			${PKG_SYSCONFDIR}/attribute_table.dtd
 CONF_FILES+=		${EGDIR}/classification.config \
 			${PKG_SYSCONFDIR}/classification.config
-CONF_FILES+=		${EGDIR}/reference.config \
-			${PKG_SYSCONFDIR}/reference.config
+CONF_FILES+=		${EGDIR}/file_magic.conf \
+			${PKG_SYSCONFDIR}/file_magic.conf
 CONF_FILES+=		${EGDIR}/gen-msg.map \
 			${PKG_SYSCONFDIR}/gen-msg.map
+CONF_FILES+=		${EGDIR}/reference.config \
+			${PKG_SYSCONFDIR}/reference.config
+CONF_FILES+=		${EGDIR}/snort.conf.default \
+			${PKG_SYSCONFDIR}/snort.conf
+CONF_FILES+=		${EGDIR}/threshold.conf \
+			${PKG_SYSCONFDIR}/threshold.conf
 CONF_FILES+=		${EGDIR}/generators \
 			${PKG_SYSCONFDIR}/generators
-CONF_FILES+=		${EGDIR}/sid-msg.map \
-			${PKG_SYSCONFDIR}/sid-msg.map
 CONF_FILES+=		${EGDIR}/unicode.map \
 			${PKG_SYSCONFDIR}/unicode.map
+CONF_FILES+=		${EGDIR}/rules/black_list.rules \
+			${PKG_SYSCONFDIR}/rules/black_list.rules
+CONF_FILES+=		${EGDIR}/rules/white_list.rules \
+			${PKG_SYSCONFDIR}/rules/white_list.rules
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	post-patch
 SUBST_FILES.paths=	etc/snort.conf src/snort.c
-SUBST_SED.paths=	-e "s|@PREFIX@|${PREFIX}|g"
-SUBST_SED.paths+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
+SUBST_SED.paths=	-e "s|/usr/local|${PREFIX}|g"
+SUBST_SED.paths+=	-e "s|../rules|rules|g"
+SUBST_SED.paths+=	-e "s|../so_rules|so_rules|g"
+SUBST_SED.paths+=	-e "s|../preproc_rules|preproc_rules|g"
 SUBST_MESSAGE.paths=	Fixing paths.
 
 SUBST_CLASSES+=		installp
 SUBST_STAGE.installp=	post-extract
-SUBST_FILES.installp=	src/dynamic-preprocessors/ssl/Makefile.in
-SUBST_SED.installp=	-e "s|@INSTALL@|${INSTALL} -c|g"
-SUBST_MESSAGE.installp=	Fixing INSTALL options.
-
-SUBST_CLASSES+=		install
-SUBST_STAGE.install=	post-configure
-SUBST_FILES.install=	src/dynamic-preprocessors/ftptelnet/Makefile
-SUBST_FILES.install+=	src/dynamic-preprocessors/smtp/Makefile
-SUBST_FILES.install+=	src/dynamic-preprocessors/ssh/Makefile
-SUBST_FILES.install+=	src/dynamic-preprocessors/dcerpc/Makefile
-SUBST_FILES.install+=	src/dynamic-preprocessors/dns/Makefile
-SUBST_SED.install=	-e "s|-o root -g wheel||g"
-SUBST_MESSAGE.install=	Fixing install scripts.
+SUBST_FILES.installp=	src/dynamic-preprocessors/Makefile.in
+SUBST_SED.installp=	-e "s|exec_prefix)|exec_prefix)/share/snort|g"
+SUBST_MESSAGE.installp=	Fixing preprocessors install path.
 
 .include "options.mk"
 
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--disable-static-daq
+CONFIGURE_ARGS+=	--enable-sourcefire
+CONFIGURE_ARGS+=	--with-daq-includes=${BUILDLINK_PREFIX.daq}/include
+CONFIGURE_ARGS+=	--with-daq-libraries=${BUILDLINK_PREFIX.daq}/lib
 CONFIGURE_ARGS+=	--with-libpcap-includes=${BUILDLINK_PREFIX.libpcap}/include
 CONFIGURE_ARGS+=	--with-libpcap-libraries=${BUILDLINK_PREFIX.libpcap}/lib
+CONFIGURE_ARGS+=	--disable-so_with_static_lib
 
 pre-build:
 	${CP} ${WRKSRC}/etc/snort.conf ${WRKSRC}/etc/snort.conf.default
@@ -92,21 +98,24 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/*.config \
 			${WRKSRC}/etc/*.map \
 			${WRKSRC}/etc/threshold.conf \
+			${WRKSRC}/etc/attribute_table.dtd \
+			${WRKSRC}/etc/file_magic.conf \
 			${WRKSRC}/etc/snort.conf.default ${DESTDIR}${EGDIR}/
 	${INSTALL_DATA} ${WRKSRC}/doc/generators ${DESTDIR}${EGDIR}
 
-.	for i in ${DOC_FILES}
-		${INSTALL_DATA}	${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/snort/
-.	endfor
+.for i in ${DOC_FILES}
+	${INSTALL_DATA}	${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/snort/
+.endfor
 
-	${INSTALL_DATA} ${WRKSRC}/doc/README.* ${DESTDIR}${PREFIX}/share/doc/snort/
-	${INSTALL_DATA} ${WRKSRC}/doc/*.tex ${DESTDIR}${PREFIX}/share/doc/snort/
-	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${DESTDIR}${PREFIX}/share/doc/snort/
+	${INSTALL_DATA} ${WRKSRC}/doc/README.* \
+			${WRKSRC}/doc/*.tex \
+			${WRKSRC}/doc/*.pdf ${DESTDIR}${PREFIX}/share/doc/snort/
+	${INSTALL_DATA} ${FILESDIR}/black_list.rules \
+			${FILESDIR}/white_list.rules ${DESTDIR}${EGDIR}/rules/
 	${INSTALL_MAN} ${WRKSRC}/snort.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
-	${INSTALL_DATA} ${WRKSRC}/schemas/create_* \
-		${DESTDIR}${PREFIX}/share/doc/snort/schemas
-
+.include "../../net/daq/buildlink3.mk"
+.include "../../net/libdnet/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/snort/PLIST b/net/snort/PLIST
index 0cb1f940c53..ad6c1b69aa3 100644
--- a/net/snort/PLIST
+++ b/net/snort/PLIST
@@ -1,102 +1,158 @@
-@comment $NetBSD: PLIST,v 1.32 2014/03/11 14:05:11 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.33 2017/06/15 18:27:50 nils Exp $
 bin/snort
+bin/u2boat
+bin/u2spewfoo
 lib/pkgconfig/snort.pc
 lib/snort_dynamicengine/libsf_engine.la
-lib/snort_dynamicpreprocessor/lib_sfdynamic_preprocessor_example.la
 lib/snort_dynamicpreprocessor/libsf_dce2_preproc.la
-lib/snort_dynamicpreprocessor/libsf_dcerpc_preproc.la
+lib/snort_dynamicpreprocessor/libsf_dnp3_preproc.la
 lib/snort_dynamicpreprocessor/libsf_dns_preproc.la
 lib/snort_dynamicpreprocessor/libsf_ftptelnet_preproc.la
+lib/snort_dynamicpreprocessor/libsf_gtp_preproc.la
+lib/snort_dynamicpreprocessor/libsf_imap_preproc.la
+lib/snort_dynamicpreprocessor/libsf_modbus_preproc.la
+lib/snort_dynamicpreprocessor/libsf_pop_preproc.la
+lib/snort_dynamicpreprocessor/libsf_reputation_preproc.la
+lib/snort_dynamicpreprocessor/libsf_sdf_preproc.la
+lib/snort_dynamicpreprocessor/libsf_sip_preproc.la
 lib/snort_dynamicpreprocessor/libsf_smtp_preproc.la
 lib/snort_dynamicpreprocessor/libsf_ssh_preproc.la
 lib/snort_dynamicpreprocessor/libsf_ssl_preproc.la
-lib/snort_dynamicrules/lib_sfdynamic_example_rule.la
 man/man8/snort.8
 share/doc/snort/AUTHORS
 share/doc/snort/BUGS
 share/doc/snort/CREDITS
 share/doc/snort/INSTALL
 share/doc/snort/NEWS
+share/doc/snort/OpenDetectorDeveloperGuide.pdf
 share/doc/snort/PROBLEMS
 share/doc/snort/README
-share/doc/snort/README.ARUBA
-share/doc/snort/README.FLEXRESP
-share/doc/snort/README.FLEXRESP2
-share/doc/snort/README.INLINE
+share/doc/snort/README.GTP
 share/doc/snort/README.PLUGINS
 share/doc/snort/README.PerfProfiling
 share/doc/snort/README.SMTP
 share/doc/snort/README.UNSOCK
 share/doc/snort/README.WIN32
+share/doc/snort/README.active
 share/doc/snort/README.alert_order
+share/doc/snort/README.appid
 share/doc/snort/README.asn1
+share/doc/snort/README.counts
 share/doc/snort/README.csv
-share/doc/snort/README.database
-share/doc/snort/README.dcerpc
+share/doc/snort/README.daq
 share/doc/snort/README.dcerpc2
 share/doc/snort/README.decode
 share/doc/snort/README.decoder_preproc_rules
+share/doc/snort/README.dnp3
 share/doc/snort/README.dns
 share/doc/snort/README.event_queue
+share/doc/snort/README.file
+share/doc/snort/README.file_ips
 share/doc/snort/README.filters
 share/doc/snort/README.flowbits
 share/doc/snort/README.frag3
 share/doc/snort/README.ftptelnet
 share/doc/snort/README.gre
+share/doc/snort/README.ha
 share/doc/snort/README.http_inspect
+share/doc/snort/README.imap
 share/doc/snort/README.ipip
 share/doc/snort/README.ipv6
+share/doc/snort/README.modbus
 share/doc/snort/README.multipleconfigs
+share/doc/snort/README.normalize
 share/doc/snort/README.pcap_readmode
+share/doc/snort/README.pop
 share/doc/snort/README.ppm
 share/doc/snort/README.reload
+share/doc/snort/README.reputation
+share/doc/snort/README.sensitive_data
 share/doc/snort/README.sfportscan
+share/doc/snort/README.sip
 share/doc/snort/README.ssh
 share/doc/snort/README.ssl
 share/doc/snort/README.stream5
 share/doc/snort/README.tag
 share/doc/snort/README.thresholding
+share/doc/snort/README.u2boat
+share/doc/snort/README.unified2
 share/doc/snort/README.variables
-share/doc/snort/README.wireless
 share/doc/snort/TODO
 share/doc/snort/USAGE
 share/doc/snort/WISHLIST
-share/doc/snort/faq.pdf
-share/doc/snort/faq.tex
 share/doc/snort/generators
-share/doc/snort/schemas/create_db2
-share/doc/snort/schemas/create_mssql
-share/doc/snort/schemas/create_mysql
-share/doc/snort/schemas/create_oracle.sql
-share/doc/snort/schemas/create_postgresql
 share/doc/snort/snort_manual.pdf
 share/doc/snort/snort_manual.tex
-share/doc/snort/snort_schema_v106.pdf
+share/examples/snort/attribute_table.dtd
 share/examples/snort/classification.config
+share/examples/snort/file_magic.conf
 share/examples/snort/gen-msg.map
 share/examples/snort/generators
 share/examples/snort/reference.config
-share/examples/snort/sid-msg.map
+share/examples/snort/rules/black_list.rules
+share/examples/snort/rules/white_list.rules
 share/examples/snort/snort.conf.default
 share/examples/snort/threshold.conf
 share/examples/snort/unicode.map
+share/snort/src/snort_dynamicsrc/Unified2_common.h
 share/snort/src/snort_dynamicsrc/bitop.h
-share/snort/src/snort_dynamicsrc/debug.h
+share/snort/src/snort_dynamicsrc/event.h
+share/snort/src/snort_dynamicsrc/file_api.h
+share/snort/src/snort_dynamicsrc/file_mail_common.h
+share/snort/src/snort_dynamicsrc/idle_processing.h
+share/snort/src/snort_dynamicsrc/mpse_methods.h
+share/snort/src/snort_dynamicsrc/obfuscation.h
 share/snort/src/snort_dynamicsrc/pcap_pkthdr32.h
+share/snort/src/snort_dynamicsrc/perf_indicators.h
+share/snort/src/snort_dynamicsrc/plugin_enum.h
 share/snort/src/snort_dynamicsrc/preprocids.h
 share/snort/src/snort_dynamicsrc/profiler.h
+share/snort/src/snort_dynamicsrc/rule_option_types.h
+share/snort/src/snort_dynamicsrc/session_api.h
 share/snort/src/snort_dynamicsrc/sfPolicyUserData.c
 share/snort/src/snort_dynamicsrc/sfPolicyUserData.h
+share/snort/src/snort_dynamicsrc/sf_base64decode.c
+share/snort/src/snort_dynamicsrc/sf_base64decode.h
+share/snort/src/snort_dynamicsrc/sf_decompression.h
 share/snort/src/snort_dynamicsrc/sf_dynamic_common.h
+share/snort/src/snort_dynamicsrc/sf_dynamic_define.h
+share/snort/src/snort_dynamicsrc/sf_dynamic_engine.h
 share/snort/src/snort_dynamicsrc/sf_dynamic_meta.h
 share/snort/src/snort_dynamicsrc/sf_dynamic_preproc_lib.c
 share/snort/src/snort_dynamicsrc/sf_dynamic_preproc_lib.h
 share/snort/src/snort_dynamicsrc/sf_dynamic_preprocessor.h
+share/snort/src/snort_dynamicsrc/sf_email_attach_decode.c
+share/snort/src/snort_dynamicsrc/sf_email_attach_decode.h
+share/snort/src/snort_dynamicsrc/sf_ip.h
+share/snort/src/snort_dynamicsrc/sf_protocols.h
+share/snort/src/snort_dynamicsrc/sf_seqnums.h
 share/snort/src/snort_dynamicsrc/sf_snort_packet.h
 share/snort/src/snort_dynamicsrc/sf_snort_plugin_api.h
+share/snort/src/snort_dynamicsrc/sf_types.h
+share/snort/src/snort_dynamicsrc/sfcontrol.h
+share/snort/src/snort_dynamicsrc/sfdebug.h
 share/snort/src/snort_dynamicsrc/sfghash.h
 share/snort/src/snort_dynamicsrc/sfhashfcn.h
+share/snort/src/snort_dynamicsrc/sfparser.c
 share/snort/src/snort_dynamicsrc/sfsnort_dynamic_detection_lib.c
 share/snort/src/snort_dynamicsrc/sfsnort_dynamic_detection_lib.h
+share/snort/src/snort_dynamicsrc/sidechannel_define.h
+share/snort/src/snort_dynamicsrc/signature.h
+share/snort/src/snort_dynamicsrc/sip_common.h
+share/snort/src/snort_dynamicsrc/snort_debug.h
+share/snort/src/snort_dynamicsrc/ssl.c
+share/snort/src/snort_dynamicsrc/ssl.h
+share/snort/src/snort_dynamicsrc/ssl_config.c
+share/snort/src/snort_dynamicsrc/ssl_config.h
+share/snort/src/snort_dynamicsrc/ssl_ha.c
+share/snort/src/snort_dynamicsrc/ssl_ha.h
+share/snort/src/snort_dynamicsrc/ssl_include.h
+share/snort/src/snort_dynamicsrc/ssl_inspect.c
+share/snort/src/snort_dynamicsrc/ssl_inspect.h
+share/snort/src/snort_dynamicsrc/ssl_session.h
 share/snort/src/snort_dynamicsrc/str_search.h
 share/snort/src/snort_dynamicsrc/stream_api.h
+share/snort/src/snort_dynamicsrc/treenodes.h
+share/snort/src/snort_dynamicsrc/util_unfold.c
+share/snort/src/snort_dynamicsrc/util_unfold.h
+@pkgdir share/doc/snort/schemas
diff --git a/net/snort/distinfo b/net/snort/distinfo
index 9ad5a35364c..95359661028 100644
--- a/net/snort/distinfo
+++ b/net/snort/distinfo
@@ -1,15 +1,7 @@
-$NetBSD: distinfo,v 1.49 2015/11/04 00:35:37 agc Exp $
+$NetBSD: distinfo,v 1.50 2017/06/15 18:27:50 nils Exp $
 
-SHA1 (snort-2.8.5.1.tar.gz) = b971052cdd4b3527a0603854953103fe9ad8a45b
-RMD160 (snort-2.8.5.1.tar.gz) = fbfab45f1d7d815516043592eab8cf1cc6ec93d0
-SHA512 (snort-2.8.5.1.tar.gz) = c152d01c6548a3260018686e4f6f3817c6818582500da8be7bb07cd54947ede03b41af19db6a6a45be14f86729511bd96a8d1740e0d8dded4ed4703dad4b4906
-Size (snort-2.8.5.1.tar.gz) = 4715078 bytes
-SHA1 (patch-aa) = 3e59b984e5cb21f3fc12e07cdd0560f7cab4f2eb
-SHA1 (patch-ab) = 0ea7deb91de5d3d68558a30e80dcbd8bd81f8a5e
-SHA1 (patch-ac) = 95e08ebd8a57295540923a49c54177e81ec601c5
-SHA1 (patch-ad) = d4bf1dee02af1f1730263a78a868bbdae5d8846d
-SHA1 (patch-ae) = ca74cfab6d9010d037a1e72e7c39b7982888c476
-SHA1 (patch-af) = 03df09e853819816034109429762a3bb01b59fb0
-SHA1 (patch-ag) = 1dfcb56284528b307f44d911f84f64832d907139
-SHA1 (patch-ah) = 1dee26c42c30e60be83a5e574183f2394d23e340
+SHA1 (snort-2.9.9.0.tar.gz) = c522b6130655e0d12299af6fd1a613b20259b4e3
+RMD160 (snort-2.9.9.0.tar.gz) = cfe3f7bb4203411e40376607c6bd1ee1fe7c4f84
+SHA512 (snort-2.9.9.0.tar.gz) = 2c17539c80484c90198a2e5d5efd1e70f26afb79ce7c28e745ded356b6f1a1f97763ff21fde986652af1768fa3bcdafbbcc3c82ee8ad6d2ef0471f360cfcab83
+Size (snort-2.9.9.0.tar.gz) = 6364482 bytes
 SHA1 (patch-src_target-based_sftarget__reader.c) = c0f4bde7a1a0fa00e4efecf26eb579cc2b1cb2ee
diff --git a/net/snort/options.mk b/net/snort/options.mk
index b6fba09d44f..cfa363182fd 100644
--- a/net/snort/options.mk
+++ b/net/snort/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2012/09/12 13:16:38 obache Exp $
+# $NetBSD: options.mk,v 1.8 2017/06/15 18:27:50 nils Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.snort
 
@@ -14,9 +14,6 @@ PKG_SUGGESTED_OPTIONS=	inet6
 PKG_OPTIONS_OPTIONAL_GROUPS=	flex
 PKG_OPTIONS_GROUP.flex=		snort-flexresp snort-flexresp2
 
-PKG_OPTIONS_OPTIONAL_GROUPS+=	database
-PKG_OPTIONS_GROUP.database=	mysql pgsql
-
 .include "../../mk/bsd.options.mk"
 
 ###
@@ -82,23 +79,6 @@ CONFIGURE_ARGS+=	--with-snmp
 .endif
 
 ###
-### Support MySQL for snort logging
-###
-.if !empty(PKG_OPTIONS:Mmysql)
-.include "../../mk/mysql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-mysql=${BUILDLINK_PREFIX.mysql-client}
-LDFLAGS+=		${BUILDLINK_LDFLAGS.mysql-client}
-.endif
-
-###
-### Support PostgreSQL for snort logging
-###
-.if !empty(PKG_OPTIONS:Mpgsql)
-.include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-postgresql=${PGSQL_PREFIX:Q}
-.endif
-
-###
 ### Enable Prelude support (untested)
 ###
 .if !empty(PKG_OPTIONS:Msnort-prelude)
diff --git a/net/snort/patches/patch-aa b/net/snort/patches/patch-aa
deleted file mode 100644
index d4f1450950f..00000000000
--- a/net/snort/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.17 2011/04/01 16:48:36 gdt Exp $
-
---- src/snort.c.orig	2009-10-19 17:44:03.000000000 +0000
-+++ src/snort.c
-@@ -2737,6 +2737,19 @@ static int SetPktProcessor(void)
-             break;
- #endif  // NO_NON_ETHER_DECODER
- 
-+#if defined(__NetBSD__)
-+#  if defined(__NetBSD_Version__)
-+#    if (__NetBSD_Version__ >= 105000000)
-+       case DLT_PPP_ETHER:          /* PPP over Ethernet */
-+
-+#    else
-+       /* no DLT_PPP_* on <1.5 */
-+#    endif /* >= NetBSD 1.5 */
-+#  else
-+       /* no __NetBSD_Version__ on <1.4 */
-+#  endif /* __NetBSD_Version__ */
-+#endif /* NetBSD */
-+
-         case DLT_PPP:                /* point-to-point protocol */
-             if (!ScReadMode())
-             {
-@@ -3379,7 +3392,7 @@ static char *ConfigFileSearch(void)
- {
-     struct stat st;
-     int i;
--    char *conf_files[]={"/etc/snort.conf", "./snort.conf", NULL};
-+    char *conf_files[]={"@PKG_SYSCONFDIR@/snort.conf", "./snort.conf", NULL};
-     char *fname = NULL;
-     char *rval = NULL;
- 
diff --git a/net/snort/patches/patch-ab b/net/snort/patches/patch-ab
deleted file mode 100644
index 907f9f0f455..00000000000
--- a/net/snort/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2002/04/02 21:34:09 rh Exp $
-
---- config.sub.orig	Sun Mar 24 23:37:23 2002
-+++ config.sub	Sun Mar 24 23:46:03 2002
-@@ -235,7 +235,7 @@
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| i370 | i860 | i960 | ia64 \
- 	| m32r | m68000 | m68k | m88k | mcore \
--	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-+	| mips16 | mips64 | mips64el | mips64orion | mips64orionel | macppc \
- 	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
- 	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
- 	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-@@ -296,7 +296,7 @@
- 	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
- 	| m88110-* | m88k-* | mcore-* \
- 	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
--	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-+	| mips64orionel-* | macppc-* | mips64vr4100-* | mips64vr4100el-* \
- 	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
- 	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
diff --git a/net/snort/patches/patch-ac b/net/snort/patches/patch-ac
deleted file mode 100644
index c3bc79f28a4..00000000000
--- a/net/snort/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2011/04/01 16:48:36 gdt Exp $
-
---- src/plugbase.h.orig	2009-05-06 22:28:18.000000000 +0000
-+++ src/plugbase.h
-@@ -50,7 +50,7 @@
- # undef Free
- #endif
- 
--#if defined(SOLARIS) || defined(FREEBSD) || defined(OPENBSD)
-+#if defined(SOLARIS) || defined(FREEBSD) || defined(OPENBSD) || defined(NETBSD)
- # include <sys/param.h>
- #endif
- 
diff --git a/net/snort/patches/patch-ad b/net/snort/patches/patch-ad
deleted file mode 100644
index e4b3c42bd2f..00000000000
--- a/net/snort/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2007/02/17 19:08:06 adrianp Exp $
-
---- src/dynamic-preprocessors/Makefile.in.orig	2006-12-04 17:50:31.000000000 +0000
-+++ src/dynamic-preprocessors/Makefile.in
-@@ -224,7 +224,7 @@ EXTRA_DIST = \
- dynamic_preprocessors.dsp \
- sf_dynamic_initialize/sf_dynamic_initialize.dsp
- 
--@HAVE_DYNAMIC_PLUGINS_TRUE@srcinstdir = $(exec_prefix)/src/snort_dynamicsrc
-+@HAVE_DYNAMIC_PLUGINS_TRUE@srcinstdir = $(exec_prefix)/share/snort/src/snort_dynamicsrc
- @HAVE_DYNAMIC_PLUGINS_TRUE@exported_files = \
- @HAVE_DYNAMIC_PLUGINS_TRUE@include/sf_dynamic_common.h \
- @HAVE_DYNAMIC_PLUGINS_TRUE@include/sf_dynamic_meta.h \
diff --git a/net/snort/patches/patch-ae b/net/snort/patches/patch-ae
deleted file mode 100644
index 46d6cbbd9cb..00000000000
--- a/net/snort/patches/patch-ae
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2007/10/21 00:22:53 adrianp Exp $
-
---- etc/snort.conf.orig	2007-09-07 19:32:45.000000000 +0100
-+++ etc/snort.conf
-@@ -107,8 +107,8 @@ var AIM_SERVERS [64.12.24.0/23,64.12.28.
- # Path to your rules files (this can be a relative path)
- # Note for Windows users:  You are advised to make this an absolute path,
- # such as:  c:\snort\rules
--var RULE_PATH ../rules
--var PREPROC_RULE_PATH ../preproc_rules
-+var RULE_PATH @PREFIX@/share/snort/rules
-+var PREPROC_RULE_PATH @PREFIX@/share/snort/preproc_rules
- 
- # Configure the snort decoder
- # ============================
-@@ -191,27 +191,27 @@ var PREPROC_RULE_PATH ../preproc_rules
- # Load all dynamic preprocessors from the install path
- # (same as command line option --dynamic-preprocessor-lib-dir)
- #
--dynamicpreprocessor directory /usr/local/lib/snort_dynamicpreprocessor/
-+dynamicpreprocessor directory @PREFIX@/lib/snort_dynamicpreprocessor/
- #
- # Load a specific dynamic preprocessor library from the install path
- # (same as command line option --dynamic-preprocessor-lib)
- #
--# dynamicpreprocessor file /usr/local/lib/snort_dynamicpreprocessor/libdynamicexample.so
-+# dynamicpreprocessor file @PREFIX@/lib/snort_dynamicpreprocessor/libdynamicexample.so
- #
- # Load a dynamic engine from the install path
- # (same as command line option --dynamic-engine-lib)
- #
--dynamicengine /usr/local/lib/snort_dynamicengine/libsf_engine.so
-+dynamicengine @PREFIX@/lib/snort_dynamicengine/libsf_engine.so
- #
- # Load all dynamic rules libraries from the install path
- # (same as command line option --dynamic-detection-lib-dir)
- #
--# dynamicdetection directory /usr/local/lib/snort_dynamicrule/
-+# dynamicdetection directory @PREFIX@/lib/snort_dynamicrule/
- #
- # Load a specific dynamic rule library from the install path
- # (same as command line option --dynamic-detection-lib)
- #
--# dynamicdetection file /usr/local/lib/snort_dynamicrule/libdynamicexamplerule.so
-+# dynamicdetection file @PREFIX@/lib/snort_dynamicrule/libdynamicexamplerule.so
- #
- 
- ###################################################
diff --git a/net/snort/patches/patch-af b/net/snort/patches/patch-af
deleted file mode 100644
index e91f8e86621..00000000000
--- a/net/snort/patches/patch-af
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-af,v 1.5 2011/04/01 16:48:36 gdt Exp $
-
---- src/dynamic-plugins/sf_dynamic_plugins.c.orig	2009-08-10 21:26:41.000000000 +0000
-+++ src/dynamic-plugins/sf_dynamic_plugins.c
-@@ -244,8 +244,7 @@ void LoadAllLibs(char *path, LoadLibrary
-         dir_entry = readdir(directory);
-         while (dir_entry != NULL)
-         {
--            if ((dir_entry->d_reclen != 0) &&
--                (fnmatch(MODULE_EXT, dir_entry->d_name, FNM_PATHNAME | FNM_PERIOD) == 0))
-+            if (fnmatch(MODULE_EXT, dir_entry->d_name, FNM_PATHNAME | FNM_PERIOD) == 0)
-             {
-                 /* Get the string up until the first dot.  This will be
-                  * considered the file prefix. */
diff --git a/net/snort/patches/patch-ah b/net/snort/patches/patch-ah
deleted file mode 100644
index d83e2315f28..00000000000
--- a/net/snort/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2008/06/21 21:44:21 joerg Exp $
-
---- src/log_text.c.orig	2008-06-21 15:36:20.000000000 +0000
-+++ src/log_text.c
-@@ -1244,7 +1244,7 @@ static void LogReference(TextLog* log, R
-  *
-  * Returns: void function
-  */ 
--void LogXrefs(TextLog* log, int doNewLine)
-+void LogXrefs(TextLog* log, bool doNewLine)
- {
-     ReferenceNode *refNode = NULL;
-