Update syslog-ng to the latest stable 3.7.2 version.

Rework and clean up the package, split off various bindings
into separate packages. Add SMF support.

Major features and improvements introduced in major releases since 3.2.

3.7
- OpenSSL is now a required dependency for syslog-ng.
- Java-destination driver ported from syslog-ng-incubator.
- Python language support is ported from syslog-ng incubator.
- New Java destination drivers
- New Parsers

3.6
- PCRE is now a required dependency of syslog-ng.
- Threaded mode is now enabled by default.

3.5
- Multi-line support
- STOMP destination
- Redis destination
- Template type hinting
- Template options honored everywhere
- Support for unit suffixes in the configuration
- The Incubator project

3.4
- New plugins: AMQP & SMTP destinations, JSON parser.
- New parsers for patterndb: HOSTNAME, EMAIL, PCRE and LLADDR.
- It is now possible to control what db-parser() sees as its input
  via it's new template() option.
- value-pairs() gained support for programmatically
  rewriting key names in bulk, via the rekey() method.
- The network() driver is introduced, unifying and extending
  tcp(), udp(), syslog(), unix-dgram() and
  unix-stream(). The old drivers are still available, but
- Support for junctions & channels were added, which improve
  the flexibility of the syslog-ng configuration language.

3.3
- multi-core/CPU scaling: the new multi-threaded architecture allows
  syslog-ng to scale into the 800k msg/sec region.
- MongoDB support: using MongoDB instead of SQL is faster and
  allows better representation of log data.
- JSON support: using the $(format-json) template function it is
  now possible to construct JSON (JavaScript Object Notation)
  output for log messages.
- A number of enhancements all over the place: SQL, patterndb.
- The default ports have changed. syslog-ng is using the standard

31 files changed, 567 insertions, 104 deletions

diff --git a/sysutils/syslog-ng-geoip/DESCR b/sysutils/syslog-ng-geoip/DESCR
new file mode 100644
index 00000000000..03d56de759f
--- /dev/null
+++ b/sysutils/syslog-ng-geoip/DESCR
@@ -0,0 +1,6 @@
+Syslog-ng tries to fill the gaps original syslogd's were lacking:
+	* powerful configurability
+	* filtering based on message content
+	* message integrity, message encryption
+	* portability
+	* better network forwarding
diff --git a/sysutils/syslog-ng-geoip/Makefile b/sysutils/syslog-ng-geoip/Makefile
new file mode 100644
index 00000000000..d9d19e4023d
--- /dev/null
+++ b/sysutils/syslog-ng-geoip/Makefile
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+
+SYSLOG_MOD=		geoip
+SYSLOG_MOD_TARGET=	geoip-plugin
+COMMENT=		Syslog-ng GeoIP module
+
+.include "../../sysutils/syslog-ng/Makefile.module"
+
+CONFIGURE_ENV+=		GEOIP_LIBS="-L${BUILDLINK_PREFIX.GeoIP}/lib -lGeoIP"
+
+.include "../../net/GeoIP/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/syslog-ng-geoip/PLIST b/sysutils/syslog-ng-geoip/PLIST
new file mode 100644
index 00000000000..42e6a2f313c
--- /dev/null
+++ b/sysutils/syslog-ng-geoip/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+lib/syslog-ng/libgeoip-plugin.la
diff --git a/sysutils/syslog-ng-json/DESCR b/sysutils/syslog-ng-json/DESCR
new file mode 100644
index 00000000000..03d56de759f
--- /dev/null
+++ b/sysutils/syslog-ng-json/DESCR
@@ -0,0 +1,6 @@
+Syslog-ng tries to fill the gaps original syslogd's were lacking:
+	* powerful configurability
+	* filtering based on message content
+	* message integrity, message encryption
+	* portability
+	* better network forwarding
diff --git a/sysutils/syslog-ng-json/Makefile b/sysutils/syslog-ng-json/Makefile
new file mode 100644
index 00000000000..d986d36d284
--- /dev/null
+++ b/sysutils/syslog-ng-json/Makefile
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+
+SYSLOG_MOD=		json
+SYSLOG_MOD_TARGET=	json-plugin
+COMMENT=		Syslog-ng JSON module
+
+.include "../../sysutils/syslog-ng/Makefile.module"
+
+CONFIGURE_ARGS+=	--with-jsonc=${BUILDLINK_PREFIX.jsonc}
+
+.include "../../textproc/json-c/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/syslog-ng-json/PLIST b/sysutils/syslog-ng-json/PLIST
new file mode 100644
index 00000000000..a513d08da3e
--- /dev/null
+++ b/sysutils/syslog-ng-json/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+lib/syslog-ng/libjson-plugin.la
diff --git a/sysutils/syslog-ng-mongodb/DESCR b/sysutils/syslog-ng-mongodb/DESCR
new file mode 100644
index 00000000000..03d56de759f
--- /dev/null
+++ b/sysutils/syslog-ng-mongodb/DESCR
@@ -0,0 +1,6 @@
+Syslog-ng tries to fill the gaps original syslogd's were lacking:
+	* powerful configurability
+	* filtering based on message content
+	* message integrity, message encryption
+	* portability
+	* better network forwarding
diff --git a/sysutils/syslog-ng-mongodb/Makefile b/sysutils/syslog-ng-mongodb/Makefile
new file mode 100644
index 00000000000..d6ee4b2beb3
--- /dev/null
+++ b/sysutils/syslog-ng-mongodb/Makefile
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+
+SYSLOG_MOD=		mongodb
+SYSLOG_MOD_DIR=		afmongodb
+COMMENT=		Syslog-ng MongoDB module
+
+.include "../../sysutils/syslog-ng/Makefile.module"
+
+CONFIGURE_ARGS+=	--with-libmongo-client=system
+
+.include "../../databases/libmongo-client/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/syslog-ng-mongodb/PLIST b/sysutils/syslog-ng-mongodb/PLIST
new file mode 100644
index 00000000000..c2cf58add78
--- /dev/null
+++ b/sysutils/syslog-ng-mongodb/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+lib/syslog-ng/libafmongodb.la
diff --git a/sysutils/syslog-ng-redis/DESCR b/sysutils/syslog-ng-redis/DESCR
new file mode 100644
index 00000000000..03d56de759f
--- /dev/null
+++ b/sysutils/syslog-ng-redis/DESCR
@@ -0,0 +1,6 @@
+Syslog-ng tries to fill the gaps original syslogd's were lacking:
+	* powerful configurability
+	* filtering based on message content
+	* message integrity, message encryption
+	* portability
+	* better network forwarding
diff --git a/sysutils/syslog-ng-redis/Makefile b/sysutils/syslog-ng-redis/Makefile
new file mode 100644
index 00000000000..66345e8256b
--- /dev/null
+++ b/sysutils/syslog-ng-redis/Makefile
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+
+SYSLOG_MOD=		redis
+COMMENT=		Syslog-ng Redis module
+
+.include "../../sysutils/syslog-ng/Makefile.module"
+
+CONFIGURE_ARGS+=	--with-libhires=${BUILDLINK_PREFIX.hiredis}
+
+.include "../../databases/hiredis/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/syslog-ng-redis/PLIST b/sysutils/syslog-ng-redis/PLIST
new file mode 100644
index 00000000000..148a1fb35c4
--- /dev/null
+++ b/sysutils/syslog-ng-redis/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+lib/syslog-ng/libredis.la
diff --git a/sysutils/syslog-ng-smtp/DESCR b/sysutils/syslog-ng-smtp/DESCR
new file mode 100644
index 00000000000..03d56de759f
--- /dev/null
+++ b/sysutils/syslog-ng-smtp/DESCR
@@ -0,0 +1,6 @@
+Syslog-ng tries to fill the gaps original syslogd's were lacking:
+	* powerful configurability
+	* filtering based on message content
+	* message integrity, message encryption
+	* portability
+	* better network forwarding
diff --git a/sysutils/syslog-ng-smtp/Makefile b/sysutils/syslog-ng-smtp/Makefile
new file mode 100644
index 00000000000..9b3bd5a1ef6
--- /dev/null
+++ b/sysutils/syslog-ng-smtp/Makefile
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+
+SYSLOG_MOD=		smtp
+SYSLOG_MOD_DIR=		afsmtp
+COMMENT=		Syslog-ng SMTP module
+
+.include "../../sysutils/syslog-ng/Makefile.module"
+
+CONFIGURE_ARGS+=	--with-libesmtp=${BUILDLINK_PREFIX.libesmtp}
+
+.include "../../mail/libesmtp/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/syslog-ng-smtp/PLIST b/sysutils/syslog-ng-smtp/PLIST
new file mode 100644
index 00000000000..6aab3e99ded
--- /dev/null
+++ b/sysutils/syslog-ng-smtp/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+lib/syslog-ng/libafsmtp.la
diff --git a/sysutils/syslog-ng-sql/DESCR b/sysutils/syslog-ng-sql/DESCR
new file mode 100644
index 00000000000..03d56de759f
--- /dev/null
+++ b/sysutils/syslog-ng-sql/DESCR
@@ -0,0 +1,6 @@
+Syslog-ng tries to fill the gaps original syslogd's were lacking:
+	* powerful configurability
+	* filtering based on message content
+	* message integrity, message encryption
+	* portability
+	* better network forwarding
diff --git a/sysutils/syslog-ng-sql/Makefile b/sysutils/syslog-ng-sql/Makefile
new file mode 100644
index 00000000000..784c5289225
--- /dev/null
+++ b/sysutils/syslog-ng-sql/Makefile
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+
+SYSLOG_MOD=		sql
+SYSLOG_MOD_DIR=		afsql
+COMMENT=		Syslog-ng SQL module
+
+.include "../../sysutils/syslog-ng/Makefile.module"
+.include "../../databases/libdbi/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/syslog-ng-sql/PLIST b/sysutils/syslog-ng-sql/PLIST
new file mode 100644
index 00000000000..f28b1918385
--- /dev/null
+++ b/sysutils/syslog-ng-sql/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2015/10/29 16:34:14 fhajny Exp $
+lib/syslog-ng/libafsql.la
diff --git a/sysutils/syslog-ng/DESCR b/sysutils/syslog-ng/DESCR
index 03d56de759f..f1ef8fa9a98 100644
--- a/sysutils/syslog-ng/DESCR
+++ b/sysutils/syslog-ng/DESCR
@@ -1,6 +1,2 @@
-Syslog-ng tries to fill the gaps original syslogd's were lacking:
-	* powerful configurability
-	* filtering based on message content
-	* message integrity, message encryption
-	* portability
-	* better network forwarding
+Highly portable log management solution to create collect, filter,
+classify, store and forward log messages.
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 66edccb8ce9..0c09a290755 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,89 +1,42 @@
-# $NetBSD: Makefile,v 1.22 2014/02/12 23:18:40 tron Exp $
+# $NetBSD: Makefile,v 1.23 2015/10/29 16:34:13 fhajny Exp $
 
-VERS=		3.2.4
-DISTNAME=	syslog-ng_${VERS}
-PKGNAME=	syslog-ng-${VERS}
-PKGREVISION=	7
-CATEGORIES=	sysutils
-MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/${VERS}/source/
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.balabit.com/network-security/syslog-ng/
-COMMENT=	Syslog-ng tries to fill the gaps original syslogd's were lacking
-LICENSE=	gnu-gpl-v2
-
-USE_TOOLS+=	flex pkg-config gmake awk:run
-USE_LIBTOOL=	YES
-
-GNU_CONFIGURE=		YES
-RCD_SCRIPTS=		syslogng
-PKG_SYSCONFSUBDIR=	syslog-ng
+.include "../../sysutils/syslog-ng/Makefile.common"
 
+CONFIGURE_ARGS+=	--enable-ssl
+CONFIGURE_ARGS+=	--enable-stomp
 CONFIGURE_ARGS+=	--enable-tcp-wrapper
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/db/syslog-ng
-CONFIGURE_ARGS+=	--with-pidfile-dir=${VARBASE}/run
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-
-REPLACE_AWK+=		contrib/syslog2ng
-
-EGDIR=			${PREFIX}/share/examples/syslog-ng
-DOCDIR=			${PREFIX}/share/doc/syslog-ng
-
-INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
-
-OWN_DIRS+=	${VARBASE}/db/syslog-ng
-
-BUILD_DEFS+=	VARBASE
-
-CONF_FILES+=	${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/modules.conf
-CONF_FILES+=	${EGDIR}/scl.conf ${PKG_SYSCONFDIR}/scl.conf
-CONF_FILES+=	${EGDIR}/syslog-ng.conf ${PKG_SYSCONFDIR}/syslog-ng.conf
-
-SUBST_CLASSES+=		unamepath
-SUBST_STAGE.unamepath=	post-configure
-SUBST_FILES.unamepath=	contrib/syslog2ng
-SUBST_VARS.unamepath=	UNAME
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../sysutils/eventlog/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.8
-.include "../../security/openssl/buildlink3.mk"
 
 .if ${OPSYS} == "SunOS"
-CONFIGURE_ARGS+=	--enable-full-dynamic
+CONFIGURE_ARGS+=	--enable-dynamic-linking
 CONFIGURE_ARGS+=	--enable-sun-streams
+CPPFLAGS+=		-D_XOPEN_SOURCE=600 -D__EXTENSIONS__
 .endif
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.syslog-ng
-PKG_SUPPORTED_OPTIONS=	syslogng-spoof
+.include "options.mk"
 
-PKG_OPTIONS_LEGACY_OPTS+=	spoof:syslogng-spoof
+BUILD_DEFS+=		VARBASE
 
-.include "../../mk/bsd.options.mk"
+PKG_SYSCONFSUBDIR=	syslog-ng
+EGDIR=			${PREFIX}/share/examples/syslog-ng
+DOCDIR=			${PREFIX}/share/doc/syslog-ng
 
-#
-# spoof the original source address of forwarded syslog packets
-#
-.if !empty(PKG_OPTIONS:Msyslogng-spoof)
-CONFIGURE_ARGS+=	--enable-spoof-source
-.include "../../devel/libnet11/buildlink3.mk"
-.endif
+OWN_DIRS+=		${VARBASE}/db/syslog-ng
+CONF_FILES+=		${EGDIR}/scl.conf ${PKG_SYSCONFDIR}/scl.conf
+CONF_FILES+=		${EGDIR}/syslog-ng.conf ${PKG_SYSCONFDIR}/syslog-ng.conf
+
+RCD_SCRIPTS=		syslogng
 
-INSTALLATION_DIRS+=	bin
-INSTALLATION_DIRS+=	${DOCDIR}
-INSTALLATION_DIRS+=	${EGDIR}
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
+INSTALL_TARGET=		install
+INSTALLATION_DIRS=	bin ${DOCDIR} ${EGDIR}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/syslog-ng.conf.doc ${DESTDIR}${DOCDIR}
-	for f in syslog-ng.conf.sample syslog-ng.conf.solaris syslog-ng.service\	; do \
-		${INSTALL_DATA} ${WRKSRC}/doc/examples/$${f} ${DESTDIR}${EGDIR};\
-	done
+.for f in syslog-ng.conf.RedHat syslog-ng.conf.SunOS
+		${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${DESTDIR}${EGDIR}
+.endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/syslog2ng ${DESTDIR}${PREFIX}/bin
 
+.include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/syslog-ng/Makefile.common b/sysutils/syslog-ng/Makefile.common
new file mode 100644
index 00000000000..04eaced834a
--- /dev/null
+++ b/sysutils/syslog-ng/Makefile.common
@@ -0,0 +1,70 @@
+# $NetBSD: Makefile.common,v 1.1 2015/10/29 16:34:13 fhajny Exp $
+# used by sysutils/syslog-ng/Makefile
+# used by sysutils/syslog-ng/Makefile.module
+
+DISTNAME=	syslog-ng-3.7.2
+CATEGORIES=	sysutils
+MASTER_SITES=	${MASTER_SITE_GITHUB:=balabit/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.syslog-ng.org/
+COMMENT=	Highly portable log management solution
+LICENSE=	gnu-gpl-v2
+
+GITHUB_RELEASE=	${DISTNAME}
+
+PATCHDIR=	${.CURDIR}/../../sysutils/syslog-ng/patches
+DISTINFO_FILE=	${.CURDIR}/../../sysutils/syslog-ng/distinfo
+
+USE_LANGUAGES=	c c99
+USE_TOOLS+=	flex pkg-config gmake awk:run
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
+
+CHECK_PORTABILITY_SKIP+=	debian/syslog-ng.init
+
+CONFIGURE_ARGS+=	--disable-amqp
+CONFIGURE_ARGS+=	--disable-geoip
+CONFIGURE_ARGS+=	--disable-ipv6
+CONFIGURE_ARGS+=	--disable-java
+CONFIGURE_ARGS+=	--disable-json
+CONFIGURE_ARGS+=	--disable-mongodb
+CONFIGURE_ARGS+=	--disable-python
+CONFIGURE_ARGS+=	--disable-redis
+CONFIGURE_ARGS+=	--disable-smtp
+CONFIGURE_ARGS+=	--disable-sql
+CONFIGURE_ARGS+=	--disable-ssl
+CONFIGURE_ARGS+=	--disable-stomp
+CONFIGURE_ARGS+=	--disable-sun-streams
+CONFIGURE_ARGS+=	--disable-tcp-wrapper
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/db/syslog-ng
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-ivykis=${BUILDLINK_PREFIX.ivykis}
+CONFIGURE_ARGS+=	--with-jsonc=no
+CONFIGURE_ARGS+=	--with-libmongo-client=no
+CONFIGURE_ARGS+=	--with-librabbitmq-client=no
+CONFIGURE_ARGS+=	--with-pidfile-dir=${VARBASE}/run
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=	--enable-dynamic-linking
+CPPFLAGS+=		-D_XOPEN_SOURCE=600 -D__EXTENSIONS__
+.endif
+
+SUBST_CLASSES+=		unamepath
+SUBST_STAGE.unamepath=	post-configure
+SUBST_FILES.unamepath=	contrib/syslog2ng
+SUBST_VARS.unamepath=	UNAME
+
+REPLACE_AWK+=		contrib/syslog2ng
+REPLACE_PERL+=		lib/merge-grammar.pl
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/ivykis/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../sysutils/eventlog/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
diff --git a/sysutils/syslog-ng/Makefile.module b/sysutils/syslog-ng/Makefile.module
new file mode 100644
index 00000000000..cd2cb0dc830
--- /dev/null
+++ b/sysutils/syslog-ng/Makefile.module
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile.module,v 1.1 2015/10/29 16:34:13 fhajny Exp $
+# used by sysutils/py-syslog-ng/Makefile
+# used by sysutils/syslog-ng-geoip/Makefile
+# used by sysutils/syslog-ng-json/Makefile
+# used by sysutils/syslog-ng-mongodb/Makefile
+# used by sysutils/syslog-ng-redis/Makefile
+# used by sysutils/syslog-ng-smtp/Makefile
+# used by sysutils/syslog-ng-sql/Makefile
+
+.include "../../sysutils/syslog-ng/Makefile.common"
+
+PKGNAME?=	${DISTNAME:S/ng/ng-${SYSLOG_MOD}/}
+
+DEPENDS+=	syslog-ng-${PKGVERSION_NOREV}{nb*,}:../../sysutils/syslog-ng
+
+CONFIGURE_ARGS+=	--enable-${SYSLOG_MOD}
+
+SYSLOG_MOD_DIR?=	${SYSLOG_MOD}
+SYSLOG_MOD_TARGET?=	${SYSLOG_MOD_DIR}
+BUILD_TARGET?=		modules/${SYSLOG_MOD_DIR}/lib${SYSLOG_MOD_TARGET}.la
+
+INSTALL_TARGET=		install-moduleLTLIBRARIES
+INSTALL_MAKE_FLAGS+=	module_LTLIBRARIES=${BUILD_TARGET}
+
+INSTALLATION_DIRS=	lib/syslog-ng
diff --git a/sysutils/syslog-ng/PLIST b/sysutils/syslog-ng/PLIST
index 26abb9ac070..8a12c7a6227 100644
--- a/sysutils/syslog-ng/PLIST
+++ b/sysutils/syslog-ng/PLIST
@@ -1,44 +1,213 @@
-@comment $NetBSD: PLIST,v 1.5 2014/03/11 14:05:16 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/10/29 16:34:13 fhajny Exp $
 bin/loggen
 bin/pdbtool
 bin/syslog2ng
 bin/update-patterndb
+include/syslog-ng/ack_tracker.h
+include/syslog-ng/afinter.h
+include/syslog-ng/alarms.h
+include/syslog-ng/apphook.h
+include/syslog-ng/atomic.h
+include/syslog-ng/block-ref-parser.h
+include/syslog-ng/bookmark.h
+include/syslog-ng/cache.h
+include/syslog-ng/cfg-args.h
+include/syslog-ng/cfg-grammar.h
+include/syslog-ng/cfg-lexer-subst.h
+include/syslog-ng/cfg-lexer.h
+include/syslog-ng/cfg-parser.h
+include/syslog-ng/cfg-tree.h
+include/syslog-ng/cfg.h
+include/syslog-ng/children.h
+include/syslog-ng/compat/compat.h
+include/syslog-ng/compat/getutent.h
+include/syslog-ng/compat/glib.h
+include/syslog-ng/compat/lfs.h
+include/syslog-ng/compat/pio.h
+include/syslog-ng/compat/socket.h
+include/syslog-ng/compat/string.h
+include/syslog-ng/compat/time.h
+include/syslog-ng/control/control-server.h
+include/syslog-ng/control/control.h
+include/syslog-ng/crypto.h
+include/syslog-ng/debugger/debugger-main.h
+include/syslog-ng/debugger/debugger.h
+include/syslog-ng/debugger/tracer.h
+include/syslog-ng/dnscache.h
+include/syslog-ng/driver.h
+include/syslog-ng/file-perms.h
+include/syslog-ng/filter/filter-call.h
+include/syslog-ng/filter/filter-cmp.h
+include/syslog-ng/filter/filter-expr-parser.h
+include/syslog-ng/filter/filter-expr.h
+include/syslog-ng/filter/filter-in-list.h
+include/syslog-ng/filter/filter-netmask.h
+include/syslog-ng/filter/filter-netmask6.h
+include/syslog-ng/filter/filter-op.h
+include/syslog-ng/filter/filter-pipe.h
+include/syslog-ng/filter/filter-pri.h
+include/syslog-ng/filter/filter-re.h
+include/syslog-ng/filter/filter-tags.h
+include/syslog-ng/gprocess.h
+include/syslog-ng/gsockaddr.h
+include/syslog-ng/gsocket.h
+include/syslog-ng/host-id.h
+include/syslog-ng/host-resolve.h
+include/syslog-ng/hostname.h
+include/syslog-ng/libtest/mock-transport.h
+include/syslog-ng/libtest/msg_parse_lib.h
+include/syslog-ng/libtest/persist_lib.h
+include/syslog-ng/libtest/proto_lib.h
+include/syslog-ng/libtest/template_lib.h
+include/syslog-ng/libtest/testutils.h
+include/syslog-ng/logmatcher.h
+include/syslog-ng/logmpx.h
+include/syslog-ng/logmsg.h
+include/syslog-ng/logpipe.h
+include/syslog-ng/logproto/logproto-buffered-server.h
+include/syslog-ng/logproto/logproto-builtins.h
+include/syslog-ng/logproto/logproto-client.h
+include/syslog-ng/logproto/logproto-dgram-server.h
+include/syslog-ng/logproto/logproto-framed-client.h
+include/syslog-ng/logproto/logproto-framed-server.h
+include/syslog-ng/logproto/logproto-indented-multiline-server.h
+include/syslog-ng/logproto/logproto-record-server.h
+include/syslog-ng/logproto/logproto-regexp-multiline-server.h
+include/syslog-ng/logproto/logproto-server.h
+include/syslog-ng/logproto/logproto-text-client.h
+include/syslog-ng/logproto/logproto-text-server.h
+include/syslog-ng/logproto/logproto.h
+include/syslog-ng/logqueue-fifo.h
+include/syslog-ng/logqueue.h
+include/syslog-ng/logreader.h
+include/syslog-ng/logsource.h
+include/syslog-ng/logstamp.h
+include/syslog-ng/logthrdestdrv.h
+include/syslog-ng/logwriter.h
+include/syslog-ng/mainloop-call.h
+include/syslog-ng/mainloop-io-worker.h
+include/syslog-ng/mainloop-worker.h
+include/syslog-ng/mainloop.h
+include/syslog-ng/memtrace.h
+include/syslog-ng/messages.h
+include/syslog-ng/misc.h
+include/syslog-ng/ml-batched-timer.h
+include/syslog-ng/module-config.h
+include/syslog-ng/msg-format.h
+include/syslog-ng/nvtable.h
+include/syslog-ng/parse-number.h
+include/syslog-ng/parser/parser-expr-parser.h
+include/syslog-ng/parser/parser-expr.h
+include/syslog-ng/pathutils.h
+include/syslog-ng/persist-state.h
+include/syslog-ng/persistable-state-header.h
+include/syslog-ng/persistable-state-presenter.h
+include/syslog-ng/plugin-types.h
+include/syslog-ng/plugin.h
+include/syslog-ng/poll-events.h
+include/syslog-ng/poll-fd-events.h
+include/syslog-ng/pragma-parser.h
+include/syslog-ng/presented-persistable-state.h
+include/syslog-ng/rcptid.h
+include/syslog-ng/reloc.h
+include/syslog-ng/rewrite/rewrite-expr-parser.h
+include/syslog-ng/rewrite/rewrite-expr.h
+include/syslog-ng/rewrite/rewrite-groupset.h
+include/syslog-ng/rewrite/rewrite-set-tag.h
+include/syslog-ng/rewrite/rewrite-set.h
+include/syslog-ng/rewrite/rewrite-subst.h
+include/syslog-ng/ringbuffer.h
+include/syslog-ng/run-id.h
+include/syslog-ng/scratch-buffers.h
+include/syslog-ng/serialize.h
+include/syslog-ng/service-management.h
+include/syslog-ng/stats/stats-cluster.h
+include/syslog-ng/stats/stats-counter.h
+include/syslog-ng/stats/stats-csv.h
+include/syslog-ng/stats/stats-log.h
+include/syslog-ng/stats/stats-registry.h
+include/syslog-ng/stats/stats-syslog.h
+include/syslog-ng/stats/stats.h
+include/syslog-ng/str-format.h
+include/syslog-ng/stringutils.h
+include/syslog-ng/syslog-names.h
+include/syslog-ng/syslog-ng.h
+include/syslog-ng/tags.h
+include/syslog-ng/template/common-template-typedefs.h
+include/syslog-ng/template/compiler.h
+include/syslog-ng/template/escaping.h
+include/syslog-ng/template/function.h
+include/syslog-ng/template/macros.h
+include/syslog-ng/template/repr.h
+include/syslog-ng/template/simple-function.h
+include/syslog-ng/template/templates.h
+include/syslog-ng/template/user-function.h
+include/syslog-ng/thread-utils.h
+include/syslog-ng/timeutils.h
+include/syslog-ng/tls-support.h
+include/syslog-ng/tlscontext.h
+include/syslog-ng/transport/logtransport.h
+include/syslog-ng/transport/transport-aux-data.h
+include/syslog-ng/transport/transport-device.h
+include/syslog-ng/transport/transport-file.h
+include/syslog-ng/transport/transport-pipe.h
+include/syslog-ng/transport/transport-socket.h
+include/syslog-ng/transport/transport-tls.h
+include/syslog-ng/type-hinting.h
+include/syslog-ng/utf8utils.h
+include/syslog-ng/uuid.h
+include/syslog-ng/value-pairs.h
+include/syslog-ng/versioning.h
+include/syslog-ng/vptransform.h
 lib/libsyslog-ng.la
+lib/pkgconfig/syslog-ng-test.pc
+lib/pkgconfig/syslog-ng.pc
 lib/syslog-ng/libaffile.la
 lib/syslog-ng/libafprog.la
-lib/syslog-ng/libafsocket-notls.la
-lib/syslog-ng/libafsocket-tls.la
-lib/syslog-ng/libafsocket.so
+lib/syslog-ng/libafsocket.la
+lib/syslog-ng/libafstomp.la
+lib/syslog-ng/libafstreams.la
 lib/syslog-ng/libafuser.la
 lib/syslog-ng/libbasicfuncs.la
 lib/syslog-ng/libconfgen.la
-lib/syslog-ng/libconvertfuncs.la
+lib/syslog-ng/libcryptofuncs.la
 lib/syslog-ng/libcsvparser.la
 lib/syslog-ng/libdbparser.la
-lib/syslog-ng/libdummy.la
+lib/syslog-ng/libgraphite.la
+lib/syslog-ng/libkvformat.la
+lib/syslog-ng/liblinux-kmsg-format.la
+lib/syslog-ng/libpseudofile.la
 lib/syslog-ng/libsyslogformat.la
-man/man1/loggen.1
-man/man1/pdbtool.1
-man/man1/syslog-ng-ctl.1
-man/man5/syslog-ng.conf.5
-man/man8/syslog-ng.8
+lib/syslog-ng/libsystem-source.la
+lib/syslog-ng/libtest/libsyslog-ng-test.a
 sbin/syslog-ng
 sbin/syslog-ng-ctl
-share/doc/${PKGBASE}/INSTALL
-share/doc/${PKGBASE}/README
-share/doc/${PKGBASE}/syslog-ng.conf.doc
-share/examples/syslog-ng/modules.conf
+share/doc/syslog-ng/INSTALL
+share/doc/syslog-ng/syslog-ng.conf.doc
 share/examples/syslog-ng/scl.conf
 share/examples/syslog-ng/syslog-ng.conf
-share/examples/syslog-ng/syslog-ng.conf.sample
-share/examples/syslog-ng/syslog-ng.conf.solaris
-share/examples/syslog-ng/syslog-ng.service
+share/examples/syslog-ng/syslog-ng.conf.RedHat
+share/examples/syslog-ng/syslog-ng.conf.SunOS
+share/include/scl/cim/template.conf
+share/include/scl/elasticsearch/plugin.conf
+share/include/scl/graphite/README
+share/include/scl/graphite/plugin.conf
+share/include/scl/hdfs/plugin.conf
+share/include/scl/kafka/plugin.conf
+share/include/scl/mbox/mbox.conf
+share/include/scl/nodejs/plugin.conf
 share/include/scl/pacct/plugin.conf
+share/include/scl/rewrite/cc-mask.conf
+share/include/scl/solaris/plugin.conf
 share/include/scl/syslogconf/README
 share/include/scl/syslogconf/convert-syslogconf.awk
 share/include/scl/syslogconf/plugin.conf
-share/include/scl/system/generate-system-source.sh
 share/include/scl/system/plugin.conf
+share/tools/cfg-grammar.y
+share/tools/lex-rules.am
+share/tools/merge-grammar.pl
+share/tools/system-expand
 share/xsd/patterndb-1.xsd
 share/xsd/patterndb-2.xsd
 share/xsd/patterndb-3.xsd
+share/xsd/patterndb-4.xsd
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index a954da9d14f..00ba802005b 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.5 2011/10/09 10:59:31 obache Exp $
+$NetBSD: distinfo,v 1.6 2015/10/29 16:34:13 fhajny Exp $
 
-SHA1 (syslog-ng_3.2.4.tar.gz) = ff732f7223bd2bd0424d4b9028b523cf62133af1
-RMD160 (syslog-ng_3.2.4.tar.gz) = 2927ba4d9b8a913f7117a659806c1721fe3d244e
-Size (syslog-ng_3.2.4.tar.gz) = 1435115 bytes
-SHA1 (patch-ac) = e76b4cea2bfc04386574701e42908c5eae401b03
+SHA1 (syslog-ng-3.7.2.tar.gz) = d80f787b46533613ba0da854b543a108c4cc3c38
+RMD160 (syslog-ng-3.7.2.tar.gz) = 6302b00ff77b72220d84fa768fc63e511a511aef
+SHA512 (syslog-ng-3.7.2.tar.gz) = dbf58b51b68bc6616a136df5eb67a120718d8c83f785218d40f62e5f7b3691a3ad4d21db617551e4192e053dc9340440424e3d3b072b47ca590d4eac0dbf0e6f
+Size (syslog-ng-3.7.2.tar.gz) = 3558377 bytes
+SHA1 (patch-ac) = 7d48f689b6ff69c68697baf729fba8be9aec5ce8
+SHA1 (patch-configure) = 344d9c0fabc7e9656b5576b0fe63e20801587975
+SHA1 (patch-lib_ivykis_src_iv__fd__port.c) = a6b1feafd7c8031a1ed7d2cb0abc57ca3633fb5a
+SHA1 (patch-modules_afsocket_socket-options-inet.c) = a23103caea1c46dd2e405bd1a668fde0d3ceeeae
+SHA1 (patch-modules_system-source_system-source.c) = f51ed8d2e6d603744b3e6636eeb9c68382e5cda6
diff --git a/sysutils/syslog-ng/files/smf/manifest.xml b/sysutils/syslog-ng/files/smf/manifest.xml
new file mode 100644
index 00000000000..e2111a91898
--- /dev/null
+++ b/sysutils/syslog-ng/files/smf/manifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="syslog-ng">
+  <service name="@SMF_PREFIX@/syslog-ng" type="service" version="1">
+    <create_default_instance enabled="false" />
+    <single_instance />
+    <dependency name="network" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/milestone/network:default" />
+    </dependency>
+    <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/system/filesystem/local" />
+    </dependency>
+    <method_context></method_context>
+    <exec_method type="method" name="start" exec="@PREFIX@/sbin/syslog-ng" timeout_seconds="60" />
+    <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
+    <property_group name="startd" type="framework">
+      <propval name="duration" type="astring" value="contract" />
+      <propval name="ignore_error" type="astring" value="core,signal" />
+    </property_group>
+    <property_group name="application" type="application">
+      <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/syslog-ng.conf" />
+    </property_group>
+    <stability value="Evolving" />
+    <template>
+      <common_name>
+        <loctext xml:lang="C">syslog-ng</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>
diff --git a/sysutils/syslog-ng/options.mk b/sysutils/syslog-ng/options.mk
new file mode 100644
index 00000000000..8aadd9bf75f
--- /dev/null
+++ b/sysutils/syslog-ng/options.mk
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2015/10/29 16:34:13 fhajny Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.syslog-ng
+PKG_SUPPORTED_OPTIONS=	inet6 syslogng-spoof
+PKG_SUGGESTED_OPTIONS=	inet6
+
+PKG_OPTIONS_LEGACY_OPTS+=	spoof:syslogng-spoof
+
+.include "../../mk/bsd.options.mk"
+
+#
+# Enable IPv6 support
+#
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6=yes
+.else
+CONFIGURE_ARGS+=	--enable-ipv6=no
+.endif
+
+#
+# spoof the original source address of forwarded syslog packets
+#
+.if !empty(PKG_OPTIONS:Msyslogng-spoof)
+CONFIGURE_ARGS+=	--enable-spoof-source
+.include "../../devel/libnet11/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-spoof-source
+.endif
diff --git a/sysutils/syslog-ng/patches/patch-ac b/sysutils/syslog-ng/patches/patch-ac
index ca83bb2b3ab..a12268fa7e3 100644
--- a/sysutils/syslog-ng/patches/patch-ac
+++ b/sysutils/syslog-ng/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.2 2011/10/09 10:59:32 obache Exp $
+$NetBSD: patch-ac,v 1.3 2015/10/29 16:34:13 fhajny Exp $
 
 # add NetBSD support and fix some paths
 
---- contrib/syslog2ng.orig	Thu Jun 19 14:24:03 2003
-+++ contrib/syslog2ng	Thu Jun 19 14:24:13 2003
+--- contrib/syslog2ng.orig	2014-12-15 14:48:45.000000000 +0000
++++ contrib/syslog2ng
 @@ -5,18 +5,24 @@
  # Translator from syslog.conf to syslog-ng.conf
  # by Jonathan W. Marks <j-marks@uiuc.edu>
@@ -32,7 +32,7 @@ $NetBSD: patch-ac,v 1.2 2011/10/09 10:59:32 obache Exp $
  	} else {
  		print "!!! Unsupported system: " sysname ".";
  		exit 1;
-@@ -29,7 +35,7 @@
+@@ -29,7 +35,7 @@ BEGIN {
  
  	print \
  "source local {\n" \
diff --git a/sysutils/syslog-ng/patches/patch-configure b/sysutils/syslog-ng/patches/patch-configure
new file mode 100644
index 00000000000..44efede9023
--- /dev/null
+++ b/sysutils/syslog-ng/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.1 2015/10/29 16:34:13 fhajny Exp $
+
+Portability.
+
+--- configure.orig	2015-08-17 08:56:19.000000000 +0000
++++ configure
+@@ -16011,7 +16011,7 @@ $as_echo "$as_me: Too old java version r
+       fi
+     fi
+ 
+-    if test "$VERSION_OK" == "1";
++    if test "$VERSION_OK" = "1";
+     then
+       JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1/"`
+       JNI_LIBDIR=`find $JNI_HOME -name "libjvm.so" | sed "s/\(.*\)libjvm.so/\1/" | head -n 1`
+@@ -16112,7 +16112,7 @@ $as_echo "$as_me: Too old java version r
+       fi
+     fi
+ 
+-    if test "$VERSION_OK" == "1";
++    if test "$VERSION_OK" = "1";
+     then
+       JNI_HOME=`echo $JAVAC_BIN | sed "s/\(.*\)[/]bin[/]java.*/\1/"`
+       JNI_LIBDIR=`find $JNI_HOME -name "libjvm.so" | sed "s/\(.*\)libjvm.so/\1/" | head -n 1`
diff --git a/sysutils/syslog-ng/patches/patch-lib_ivykis_src_iv__fd__port.c b/sysutils/syslog-ng/patches/patch-lib_ivykis_src_iv__fd__port.c
new file mode 100644
index 00000000000..1cfb9e73344
--- /dev/null
+++ b/sysutils/syslog-ng/patches/patch-lib_ivykis_src_iv__fd__port.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_ivykis_src_iv__fd__port.c,v 1.1 2015/10/29 16:34:13 fhajny Exp $
+
+Need sys/poll.h on SunOS.
+
+--- lib/ivykis/src/iv_fd_port.c.orig	2014-12-15 14:49:36.000000000 +0000
++++ lib/ivykis/src/iv_fd_port.c
+@@ -23,6 +23,9 @@
+ #include <fcntl.h>
+ #include <port.h>
+ #include <string.h>
++#ifdef __sun
++#include <sys/poll.h>
++#endif
+ #include "iv_private.h"
+ #include "iv_fd_private.h"
+ 
diff --git a/sysutils/syslog-ng/patches/patch-modules_afsocket_socket-options-inet.c b/sysutils/syslog-ng/patches/patch-modules_afsocket_socket-options-inet.c
new file mode 100644
index 00000000000..77706cedfff
--- /dev/null
+++ b/sysutils/syslog-ng/patches/patch-modules_afsocket_socket-options-inet.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-modules_afsocket_socket-options-inet.c,v 1.1 2015/10/29 16:34:13 fhajny Exp $
+
+Need netinet/in.h.
+
+--- modules/afsocket/socket-options-inet.c.orig	2014-12-15 14:48:45.000000000 +0000
++++ modules/afsocket/socket-options-inet.c
+@@ -25,6 +25,7 @@
+ #include "messages.h"
+ 
+ #include <string.h>
++#include <netinet/in.h>
+ 
+ #ifndef SOL_IP
+ #define SOL_IP IPPROTO_IP
diff --git a/sysutils/syslog-ng/patches/patch-modules_system-source_system-source.c b/sysutils/syslog-ng/patches/patch-modules_system-source_system-source.c
new file mode 100644
index 00000000000..d260dcccf6d
--- /dev/null
+++ b/sysutils/syslog-ng/patches/patch-modules_system-source_system-source.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-modules_system-source_system-source.c,v 1.1 2015/10/29 16:34:13 fhajny Exp $
+
+Add basic NetBSD system() definition.
+
+--- modules/system-source/system-source.c.orig	2015-10-27 08:08:53.000000000 +0000
++++ modules/system-source/system-source.c
+@@ -294,6 +294,10 @@ system_generate_system_transports(GStrin
+       system_sysblock_add_unix_dgram(sysblock, "/var/run/log", NULL, NULL);
+       system_sysblock_add_freebsd_klog(sysblock, u.release);
+     }
++  else if (strcmp(u.sysname, "NetBSD") == 0)
++    {
++      system_sysblock_add_unix_dgram(sysblock, "/var/run/log", NULL, NULL);
++    }
+   else if (strcmp(u.sysname, "HP-UX") == 0)
+     {
+       system_sysblock_add_pipe(sysblock, "/dev/log", 2048);