Import of pkgsrc-2016Q3

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.

sysutils/syslog-ng/Makefile

@@ -1,89 +1,46 @@
-# $NetBSD: Makefile,v 1.22 2014/02/12 23:18:40 tron Exp $
+# $NetBSD: Makefile,v 1.28 2016/08/21 20:22:30 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
+CONFIGURE_ARGS.SunOS+=	--enable-dynamic-linking
+CONFIGURE_ARGS.SunOS+=	--enable-sun-streams
+CPPFLAGS.SunOS+=	-D_XOPEN_SOURCE=600 -D__EXTENSIONS__
 
+.include "options.mk"
+
+BUILD_DEFS+=		VARBASE
+
+PKG_SYSCONFSUBDIR=	syslog-ng
 EGDIR=			${PREFIX}/share/examples/syslog-ng
 DOCDIR=			${PREFIX}/share/doc/syslog-ng
 
+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
+
 INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
+INSTALL_TARGET=		install
+INSTALLATION_DIRS=	bin ${DOCDIR} ${EGDIR}
 
-OWN_DIRS+=	${VARBASE}/db/syslog-ng
+PLIST_VARS+=		systemd
 
-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-sun-streams
+.if exists(/bin/systemd)
+PLIST.systemd=		yes
 .endif
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.syslog-ng
-PKG_SUPPORTED_OPTIONS=	syslogng-spoof
-
-PKG_OPTIONS_LEGACY_OPTS+=	spoof:syslogng-spoof
-
-.include "../../mk/bsd.options.mk"
-
-#
-# 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
-
-INSTALLATION_DIRS+=	bin
-INSTALLATION_DIRS+=	${DOCDIR}
-INSTALLATION_DIRS+=	${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"

sysutils/syslog-ng/Makefile.common

@@ -0,0 +1,66 @@
+# $NetBSD: Makefile.common,v 1.4 2016/08/21 21:31:24 fhajny Exp $
+# used by sysutils/syslog-ng/Makefile
+# used by sysutils/syslog-ng/Makefile.module
+
+DISTNAME=	syslog-ng-3.8.1
+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-http
+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-mongoc=no
+CONFIGURE_ARGS+=	--with-librabbitmq-client=no
+CONFIGURE_ARGS+=	--with-pidfile-dir=${VARBASE}/run
+
+CONFIGURE_ARGS.SunOS+=	--enable-dynamic-linking
+
+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"

sysutils/syslog-ng/Makefile.module

@@ -0,0 +1,27 @@
+# $NetBSD: Makefile.module,v 1.2 2016/08/21 20:18:30 fhajny Exp $
+# used by sysutils/py-syslog-ng/Makefile
+# used by sysutils/syslog-ng-amqp/Makefile
+# used by sysutils/syslog-ng-curl/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

sysutils/syslog-ng/PLIST

@@ -1,44 +1,243 @@
-@comment $NetBSD: PLIST,v 1.5 2014/03/11 14:05:16 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/08/21 20:18:30 fhajny Exp $
+bin/dqtool
 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/fdhelpers.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/find-crlf.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/gsockaddr-serialize.h
+include/syslog-ng/logmsg/logmsg-serialize-fixup.h
+include/syslog-ng/logmsg/logmsg-serialize.h
+include/syslog-ng/logmsg/logmsg.h
+include/syslog-ng/logmsg/nvtable-serialize-endianutils.h
+include/syslog-ng/logmsg/nvtable-serialize.h
+include/syslog-ng/logmsg/nvtable.h
+include/syslog-ng/logmsg/serialization.h
+include/syslog-ng/logmsg/tags-serialize.h
+include/syslog-ng/logmsg/tags.h
+include/syslog-ng/logmsg/timestamp-serialize.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/ml-batched-timer.h
+include/syslog-ng/module-config.h
+include/syslog-ng/msg-format.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/resolved-configurable-paths.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/rewrite/rewrite-unset.h
+include/syslog-ng/ringbuffer.h
+include/syslog-ng/run-id.h
+include/syslog-ng/scanner/csv-scanner/csv-scanner.h
+include/syslog-ng/scratch-buffers.h
+include/syslog-ng/seqnum.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/str-utils.h
+include/syslog-ng/string-list.h
+include/syslog-ng/syslog-names.h
+include/syslog-ng/syslog-ng-config.h
+include/syslog-ng/syslog-ng.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/userdb.h
+include/syslog-ng/utf8utils.h
+include/syslog-ng/uuid.h
+include/syslog-ng/value-pairs/cmdline.h
+include/syslog-ng/value-pairs/evttag.h
+include/syslog-ng/value-pairs/transforms.h
+include/syslog-ng/value-pairs/value-pairs.h
+include/syslog-ng/versioning.h
+lib/libsyslog-ng-native-connector.a
 lib/libsyslog-ng.la
+lib/pkgconfig/syslog-ng-native-connector.pc
+lib/pkgconfig/syslog-ng-test.pc
+lib/pkgconfig/syslog-ng.pc
+lib/syslog-ng/libadd-contextual-data.la
 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/libafuser.la
 lib/syslog-ng/libbasicfuncs.la
+lib/syslog-ng/libcef.la
 lib/syslog-ng/libconfgen.la
-lib/syslog-ng/libconvertfuncs.la
+lib/syslog-ng/libcryptofuncs.la
 lib/syslog-ng/libcsvparser.la
+lib/syslog-ng/libdate.la
 lib/syslog-ng/libdbparser.la
-lib/syslog-ng/libdummy.la
+lib/syslog-ng/libdisk-buffer.la
+lib/syslog-ng/libgraphite.la
+lib/syslog-ng/libkvformat.la
+lib/syslog-ng/liblinux-kmsg-format.la
+lib/syslog-ng/libpseudofile.la
+${PLIST.systemd}lib/syslog-ng/libsdjournal.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/include/scl/pacct/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/xsd/patterndb-1.xsd
-share/xsd/patterndb-2.xsd
-share/xsd/patterndb-3.xsd
+share/examples/syslog-ng/syslog-ng.conf.RedHat
+share/examples/syslog-ng/syslog-ng.conf.SunOS
+share/syslog-ng/include/scl/apache/apache.conf
+share/syslog-ng/include/scl/cim/template.conf
+share/syslog-ng/include/scl/elasticsearch/plugin.conf
+share/syslog-ng/include/scl/graphite/README
+share/syslog-ng/include/scl/graphite/plugin.conf
+share/syslog-ng/include/scl/hdfs/plugin.conf
+share/syslog-ng/include/scl/kafka/plugin.conf
+share/syslog-ng/include/scl/loggly/loggly.conf
+share/syslog-ng/include/scl/logmatic/logmatic.conf
+share/syslog-ng/include/scl/mbox/mbox.conf
+share/syslog-ng/include/scl/nodejs/plugin.conf
+share/syslog-ng/include/scl/pacct/plugin.conf
+share/syslog-ng/include/scl/rewrite/cc-mask.conf
+share/syslog-ng/include/scl/solaris/plugin.conf
+share/syslog-ng/include/scl/syslogconf/README
+share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk
+share/syslog-ng/include/scl/syslogconf/plugin.conf
+share/syslog-ng/include/scl/system/plugin.conf
+share/syslog-ng/tools/cfg-grammar.y
+share/syslog-ng/tools/lex-rules.am
+share/syslog-ng/tools/merge-grammar.pl
+share/syslog-ng/tools/system-expand.sh
+share/syslog-ng/xsd/patterndb-1.xsd
+share/syslog-ng/xsd/patterndb-2.xsd
+share/syslog-ng/xsd/patterndb-3.xsd
+share/syslog-ng/xsd/patterndb-4.xsd
+share/syslog-ng/xsd/patterndb-5.xsd
+@pkgdir share/examples/syslog-ng/patterndb.d

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.7 2016/08/21 20:18:30 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.8.1.tar.gz) = e66cc7538eec245b80dda4624671a61932c856c3
+RMD160 (syslog-ng-3.8.1.tar.gz) = 67357d1eeef54be78ceac16ae4eff0ce66ef65a6
+SHA512 (syslog-ng-3.8.1.tar.gz) = cdd07427e7ddf4aebc1e4ed9512a1d7718d49d5c0deadccdeb0b1d7762eae178c3018b2b48b475ff8c7aec999b75d1f1cc424fca823b543f607f4fc8872070a5
+Size (syslog-ng-3.8.1.tar.gz) = 8328391 bytes
+SHA1 (patch-ac) = 7d48f689b6ff69c68697baf729fba8be9aec5ce8
+SHA1 (patch-configure) = b68b36f8f443149f97c538571d95e894da7deb80
+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

sysutils/syslog-ng/files/smf/manifest.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
+<service_bundle type="manifest" name="export">
+  <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>
+    <template>
+      <common_name>
+        <loctext xml:lang="C">syslog-ng</loctext>
+      </common_name>
+    </template>
+  </service>
+</service_bundle>

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

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" \

sysutils/syslog-ng/patches/patch-configure

@@ -0,0 +1,112 @@
+$NetBSD: patch-configure,v 1.2 2016/08/21 20:18:30 fhajny Exp $
+
+Portability.
+
+--- configure.orig	2016-08-19 11:18:46.000000000 +0000
++++ configure
+@@ -15496,12 +15496,12 @@ if test -n "$LIBMONGO_CFLAGS"; then
+     pkg_cv_LIBMONGO_CFLAGS="$LIBMONGO_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc >= \$LMC_MIN_VERSION\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libmongoc >= $LMC_MIN_VERSION") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc-1.0 >= \$LMC_MIN_VERSION\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libmongoc-1.0 >= $LMC_MIN_VERSION") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBMONGO_CFLAGS=`$PKG_CONFIG --cflags "libmongoc >= $LMC_MIN_VERSION" 2>/dev/null`
++  pkg_cv_LIBMONGO_CFLAGS=`$PKG_CONFIG --cflags "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15513,12 +15513,12 @@ if test -n "$LIBMONGO_LIBS"; then
+     pkg_cv_LIBMONGO_LIBS="$LIBMONGO_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc >= \$LMC_MIN_VERSION\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libmongoc >= $LMC_MIN_VERSION") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc-1.0 >= \$LMC_MIN_VERSION\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libmongoc-1.0 >= $LMC_MIN_VERSION") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBMONGO_LIBS=`$PKG_CONFIG --libs "libmongoc >= $LMC_MIN_VERSION" 2>/dev/null`
++  pkg_cv_LIBMONGO_LIBS=`$PKG_CONFIG --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15539,9 +15539,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmongoc >= $LMC_MIN_VERSION" 2>&1`
++	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>&1`
+         else
+-	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmongoc >= $LMC_MIN_VERSION" 2>&1`
++	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBMONGO_PKG_ERRORS" >&5
+@@ -15568,12 +15568,12 @@ if test -n "$LIBMONGO_CFLAGS"; then
+     pkg_cv_LIBMONGO_CFLAGS="$LIBMONGO_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc >= \$LMC_MIN_VERSION\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libmongoc >= $LMC_MIN_VERSION") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc-1.0 >= \$LMC_MIN_VERSION\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libmongoc-1.0 >= $LMC_MIN_VERSION") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBMONGO_CFLAGS=`$PKG_CONFIG --cflags "libmongoc >= $LMC_MIN_VERSION" 2>/dev/null`
++  pkg_cv_LIBMONGO_CFLAGS=`$PKG_CONFIG --cflags "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15585,12 +15585,12 @@ if test -n "$LIBMONGO_LIBS"; then
+     pkg_cv_LIBMONGO_LIBS="$LIBMONGO_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc >= \$LMC_MIN_VERSION\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "libmongoc >= $LMC_MIN_VERSION") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmongoc-1.0 >= \$LMC_MIN_VERSION\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libmongoc-1.0 >= $LMC_MIN_VERSION") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBMONGO_LIBS=`$PKG_CONFIG --libs "libmongoc >= $LMC_MIN_VERSION" 2>/dev/null`
++  pkg_cv_LIBMONGO_LIBS=`$PKG_CONFIG --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -15611,9 +15611,9 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmongoc >= $LMC_MIN_VERSION" 2>&1`
++	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>&1`
+         else
+-	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmongoc >= $LMC_MIN_VERSION" 2>&1`
++	        LIBMONGO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmongoc-1.0 >= $LMC_MIN_VERSION" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBMONGO_PKG_ERRORS" >&5
+@@ -16367,7 +16367,7 @@ $as_echo_n "checking for JAVA_VERSION...
+   JAVA_HOME_CHECKER="/usr/libexec/java_home"
+ 
+   if test "x$JAVAC_BIN" != "x"; then
+-    if test "x$DONT_RESOLVE_JAVA_BIN_LINKS" == "x"; then
++    if test "x$DONT_RESOLVE_JAVA_BIN_LINKS" = "x"; then
+       JAVAC_BIN=`
+   READLINK_TARGET=$JAVAC_BIN
+   cd $(dirname "$READLINK_TARGET")
+@@ -16474,7 +16474,7 @@ $as_echo_n "checking for JAVA_VERSION...
+   JAVA_HOME_CHECKER="/usr/libexec/java_home"
+ 
+   if test "x$JAVAC_BIN" != "x"; then
+-    if test "x$DONT_RESOLVE_JAVA_BIN_LINKS" == "x"; then
++    if test "x$DONT_RESOLVE_JAVA_BIN_LINKS" = "x"; then
+       JAVAC_BIN=`
+   READLINK_TARGET=$JAVAC_BIN
+   cd $(dirname "$READLINK_TARGET")

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"
+ 

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

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);