Update 3.7.0a2 --> 3.7.1

- openssl became a mandatory dependency
- python and java support are moved from the incubator to syslog-ng core
  (well, on FreeBSD they are brand new, as it did not work previously at
  all...).

Not quite production ready: Java support does not work as it involves
downloading a truckload of JAR files.

Submitted by:	Peter Czanik (CzP) <peter.czanik@balabit.com>
		BalaBit IT Security / syslog-ng upstream

4 files changed, 178 insertions, 150 deletions

diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 56407da82959..a8d4c1248ff9 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	syslog-ng
-PORTVERSION=	3.7.0a2
-PORTREVISION=	1
+PORTVERSION=	3.7.1
 PKGNAMESUFFIX=	-devel
 CATEGORIES=	sysutils
 DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
@@ -24,8 +23,8 @@ CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
 
 MAKE_JOBS_UNSAFE=	yes
-OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS OPENSSL
-OPTIONS_DEFAULT=	OPENSSL JSON
+OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP DOCS REDIS JAVA PYTHON
+OPTIONS_DEFAULT=	JSON
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
 SPOOF_DESC=		Build with spoof source support
@@ -34,6 +33,8 @@ SMTP_DESC=		Build with SMTP support
 JSON_DESC=		Build with JSON-C support
 GEOIP_DESC=		Build with GeoIP support
 REDIS_DESC=		Build with Redis support
+JAVA_DESC=		Build with Java support (and modules, like Elastic)
+PYTHON_DESC=		Build with Python 2.7 support
 
 USES=		gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
@@ -41,27 +42,21 @@ USE_RC_SUBR=	syslog-ng
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
+USE_OPENSSL=	yes
+WITH_OPENSSL_PORT=	yes
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
-		--enable-dynamic-linking \
-		--enable-debug \
+		--enable-dynamic-linking --enable-manpages \
 		--datadir=${PREFIX}/share/syslog-ng/
+		
 
 BROKEN_sparc64=	Does not compile on sparc64: gcc core dump
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=		yes
-WITH_OPENSSL_PORT=	yes
-CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
-PLIST_FILES+=		lib/syslog-ng/libafsocket-tls.so
-.else
-CONFIGURE_ARGS+=	--disable-ssl
-.endif
 
 .if ${PORT_OPTIONS:MTCP_WRAPPERS}
 CONFIGURE_ARGS+=	--enable-tcp-wrapper
@@ -89,7 +84,7 @@ CONFIGURE_ARGS+=	--disable-ipv6
 CONFIGURE_ARGS+=	--enable-geoip
 LIB_DEPENDS+=		libGeoIP.so:${PORTSDIR}/net/GeoIP
 CONFIGURE_ENV+=		GEOIP_LIBS="-L${LOCALBASE}/lib -lGeoIP"
-PLIST_FILES+=		lib/syslog-ng/libtfgeoip.so
+PLIST_FILES+=		lib/syslog-ng/libgeoip-plugin.so
 .else
 CONFIGURE_ARGS+=	--disable-geoip
 .endif
@@ -128,6 +123,32 @@ PLIST_FILES+= 		lib/syslog-ng/libjson-plugin.so
 CONFIGURE_ARGS+=        --disable-json
 .endif
 
+.if ${PORT_OPTIONS:MJAVA}
+CONFIGURE_ARGS+=	--enable-java
+USE_JAVA=	yes
+BUILD_DEPENDS=		gradle:${PORTSDIR}/devel/gradle
+PLIST_FILES+= 		lib/syslog-ng/libmod-java.so \
+			lib/syslog-ng/java-modules/syslog-ng-core.jar \
+			lib/syslog-ng/java-modules/log4j-1.2.16.jar \
+			lib/syslog-ng/java-modules/elastic.jar \
+			lib/syslog-ng/java-modules/http.jar \
+			lib/syslog-ng/java-modules/kafka.jar \
+			lib/syslog-ng/java-modules/java-modules.jar \
+			lib/syslog-ng/java-modules/hdfs.jar \
+			lib/syslog-ng/java-modules/syslog-ng-common.jar \
+			lib/syslog-ng/java-modules/dummy.jar
+.else
+CONFIGURE_ARGS+=        --disable-java
+.endif
+
+.if ${PORT_OPTIONS:MPYTHON}
+CONFIGURE_ARGS+=	--enable-python --with-python=2.7
+USES+=			python:2.7
+PLIST_FILES+= 		lib/syslog-ng/libmod-python.so
+.else
+CONFIGURE_ARGS+=        --disable-python
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 900000
diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng-devel/distinfo
index 4b70253b9d4c..f42705074a1b 100644
--- a/sysutils/syslog-ng-devel/distinfo
+++ b/sysutils/syslog-ng-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.7.0alpha2.tar.gz) = a4ff3cf20a77d6e895f8213f75c82715f3330a46f2d4e4505ff201ea7dfb9e9a
-SIZE (syslog-ng-3.7.0alpha2.tar.gz) = 3211822
+SHA256 (syslog-ng-3.7.1.tar.gz) = 4c19841b9079b377cd814b1e6ebbf273af41d04d51c648f4c31f19bfadc20220
+SIZE (syslog-ng-3.7.1.tar.gz) = 3509575
diff --git a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample
index 7fa32733ffd1..337677ed652b 100644
--- a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample
+++ b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample
@@ -1,4 +1,4 @@
-@version:3.6
+@version:3.7
 @include "scl.conf"
 
 #
diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng-devel/pkg-plist
index 5d9a1bab781e..afe008e01536 100644
--- a/sysutils/syslog-ng-devel/pkg-plist
+++ b/sysutils/syslog-ng-devel/pkg-plist
@@ -2,103 +2,95 @@
 @sample etc/scl.conf.sample
 etc/syslog-ng.conf.dist
 @sample etc/syslog-ng.conf.sample
-bin/loggen
 bin/pdbtool
+bin/loggen
 bin/update-patterndb
-include/syslog-ng/ack_tracker.h
+include/syslog-ng/ivykis/iv_avl.h
+include/syslog-ng/ivykis/iv_event.h
+include/syslog-ng/ivykis/iv_event_raw.h
+include/syslog-ng/ivykis/iv_list.h
+include/syslog-ng/ivykis/iv_thread.h
+include/syslog-ng/ivykis/iv_tls.h
+include/syslog-ng/ivykis/iv_work.h
+include/syslog-ng/ivykis/iv_fd_pump.h
+include/syslog-ng/ivykis/iv_popen.h
+include/syslog-ng/ivykis/iv_signal.h
+include/syslog-ng/ivykis/iv_wait.h
+include/syslog-ng/ivykis/iv.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.h
+include/syslog-ng/control/control-server.h
+include/syslog-ng/debugger/debugger.h
+include/syslog-ng/debugger/tracer.h
+include/syslog-ng/debugger/debugger-main.h
+include/syslog-ng/filter/filter-expr.h
+include/syslog-ng/filter/filter-op.h
+include/syslog-ng/filter/filter-cmp.h
+include/syslog-ng/filter/filter-in-list.h
+include/syslog-ng/filter/filter-tags.h
+include/syslog-ng/filter/filter-netmask.h
+include/syslog-ng/filter/filter-netmask6.h
+include/syslog-ng/filter/filter-call.h
+include/syslog-ng/filter/filter-re.h
+include/syslog-ng/filter/filter-pri.h
+include/syslog-ng/filter/filter-pipe.h
+include/syslog-ng/filter/filter-expr-parser.h
+include/syslog-ng/libtest/testutils.h
+include/syslog-ng/libtest/msg_parse_lib.h
+include/syslog-ng/libtest/template_lib.h
+include/syslog-ng/libtest/proto_lib.h
+include/syslog-ng/libtest/persist_lib.h
+include/syslog-ng/libtest/mock-transport.h
+include/syslog-ng/logproto/logproto-client.h
+include/syslog-ng/logproto/logproto-server.h
+include/syslog-ng/logproto/logproto-buffered-server.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-text-client.h
+include/syslog-ng/logproto/logproto-text-server.h
+include/syslog-ng/logproto/logproto-indented-multiline-server.h
+include/syslog-ng/logproto/logproto-regexp-multiline-server.h
+include/syslog-ng/logproto/logproto-record-server.h
+include/syslog-ng/logproto/logproto-builtins.h
+include/syslog-ng/logproto/logproto.h
+include/syslog-ng/parser/parser-expr.h
+include/syslog-ng/parser/parser-expr-parser.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.h
 include/syslog-ng/cfg-grammar.h
-include/syslog-ng/cfg-lexer-subst.h
 include/syslog-ng/cfg-lexer.h
+include/syslog-ng/cfg-lexer-subst.h
+include/syslog-ng/cfg-args.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/time.h
-include/syslog-ng/compat/socket.h
-include/syslog-ng/compat/string.h
-include/syslog-ng/control/control-server.h
-include/syslog-ng/control/control.h
 include/syslog-ng/crypto.h
 include/syslog-ng/dnscache.h
+include/syslog-ng/misc.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-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-resolve.h
 include/syslog-ng/hostname.h
-include/syslog-ng/iv.h
-include/syslog-ng/iv_avl.h
-include/syslog-ng/iv_event.h
-include/syslog-ng/iv_event_raw.h
-include/syslog-ng/iv_fd_pump.h
-include/syslog-ng/iv_inotify.h
-include/syslog-ng/iv_list.h
-include/syslog-ng/iv_popen.h
-include/syslog-ng/iv_signal.h
-include/syslog-ng/iv_thread.h
-include/syslog-ng/iv_tls.h
-include/syslog-ng/iv_wait.h
-include/syslog-ng/iv_work.h
-include/syslog-ng/ivykis/iv.h
-include/syslog-ng/ivykis/iv_avl.h
-include/syslog-ng/ivykis/iv_event.h
-include/syslog-ng/ivykis/iv_event_raw.h
-include/syslog-ng/ivykis/iv_fd_pump.h
-include/syslog-ng/ivykis/iv_list.h
-include/syslog-ng/ivykis/iv_popen.h
-include/syslog-ng/ivykis/iv_signal.h
-include/syslog-ng/ivykis/iv_thread.h
-include/syslog-ng/ivykis/iv_tls.h
-include/syslog-ng/ivykis/iv_wait.h
-include/syslog-ng/ivykis/iv_work.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/host-resolve.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
@@ -106,101 +98,116 @@ include/syslog-ng/logsource.h
 include/syslog-ng/logstamp.h
 include/syslog-ng/logthrdestdrv.h
 include/syslog-ng/logwriter.h
+include/syslog-ng/mainloop.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/mainloop-io-worker.h
+include/syslog-ng/module-config.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/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/plugin-types.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/rcptid.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/stringutils.h
+include/syslog-ng/str-format.h
+include/syslog-ng/syslog-names.h
+include/syslog-ng/syslog-ng.h
+include/syslog-ng/tags.h
+include/syslog-ng/timeutils.h
+include/syslog-ng/tls-support.h
+include/syslog-ng/thread-utils.h
+include/syslog-ng/tlscontext.h
+include/syslog-ng/type-hinting.h
+include/syslog-ng/uuid.h
+include/syslog-ng/utf8utils.h
+include/syslog-ng/value-pairs.h
+include/syslog-ng/vptransform.h
+include/syslog-ng/versioning.h
+include/syslog-ng/bookmark.h
+include/syslog-ng/ringbuffer.h
+include/syslog-ng/ack_tracker.h
+include/syslog-ng/host-id.h
+include/syslog-ng/rewrite/rewrite-expr.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-expr-parser.h
+include/syslog-ng/rewrite/rewrite-groupset.h
+include/syslog-ng/stats/stats.h
 include/syslog-ng/stats/stats-counter.h
+include/syslog-ng/stats/stats-cluster.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/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/templates.h
 include/syslog-ng/template/macros.h
-include/syslog-ng/template/repr.h
+include/syslog-ng/template/function.h
 include/syslog-ng/template/simple-function.h
-include/syslog-ng/template/templates.h
+include/syslog-ng/template/repr.h
+include/syslog-ng/template/compiler.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/template/escaping.h
+include/syslog-ng/template/common-template-typedefs.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-tls.h
 include/syslog-ng/transport/transport-file.h
 include/syslog-ng/transport/transport-pipe.h
+include/syslog-ng/transport/transport-device.h
 include/syslog-ng/transport/transport-socket.h
-include/syslog-ng/transport/transport-tls.h
-include/syslog-ng/type-hinting.h
-include/syslog-ng/uuid.h
-include/syslog-ng/value-pairs.h
-include/syslog-ng/versioning.h
-include/syslog-ng/vptransform.h
+include/syslog-ng/iv.h
+include/syslog-ng/iv_avl.h
+include/syslog-ng/iv_event.h
+include/syslog-ng/iv_event_raw.h
+include/syslog-ng/iv_fd_pump.h
+include/syslog-ng/iv_inotify.h
+include/syslog-ng/iv_list.h
+include/syslog-ng/iv_popen.h
+include/syslog-ng/iv_signal.h
+include/syslog-ng/iv_thread.h
+include/syslog-ng/iv_tls.h
+include/syslog-ng/iv_wait.h
+include/syslog-ng/iv_work.h
 lib/libsyslog-ng-3.7.so.0.0.0
-lib/libsyslog-ng.so
 lib/libsyslog-ng-3.7.so.0
-lib/syslog-ng/libafamqp.so
+lib/libsyslog-ng.so
+lib/syslog-ng/libtest/libsyslog-ng-test.a
+lib/syslog-ng/libsyslogformat.so
+lib/syslog-ng/libafsocket.so
 lib/syslog-ng/libaffile.so
-lib/syslog-ng/libafmongodb.so
 lib/syslog-ng/libafprog.so
-lib/syslog-ng/libafsocket-notls.so
-lib/syslog-ng/libafsocket.so
-lib/syslog-ng/libafstomp.so
 lib/syslog-ng/libafuser.so
-lib/syslog-ng/libbasicfuncs.so
+lib/syslog-ng/libafamqp.so
+lib/syslog-ng/libafmongodb.so
+lib/syslog-ng/libcsvparser.so
 lib/syslog-ng/libconfgen.so
+lib/syslog-ng/libsystem-source.so
+lib/syslog-ng/liblinux-kmsg-format.so
+lib/syslog-ng/libbasicfuncs.so
 lib/syslog-ng/libcryptofuncs.so
-lib/syslog-ng/libcsvparser.so
 lib/syslog-ng/libdbparser.so
-lib/syslog-ng/libgraphite.so
-lib/syslog-ng/liblinux-kmsg-format.so
+lib/syslog-ng/libafstomp.so
 lib/syslog-ng/libpseudofile.so
-lib/syslog-ng/libsyslog-ng-crypto.so
-lib/syslog-ng/libsyslogformat.so
-lib/syslog-ng/libsystem-source.so
-lib/syslog-ng/libtest/libsyslog-ng-test.a
+lib/syslog-ng/libgraphite.so
+lib/syslog-ng/libkvformat.so
 libdata/pkgconfig/syslog-ng.pc
 libdata/pkgconfig/syslog-ng-test.pc
 man/man1/loggen.1.gz
@@ -210,19 +217,19 @@ man/man5/syslog-ng.conf.5.gz
 man/man8/syslog-ng.8.gz
 sbin/syslog-ng
 sbin/syslog-ng-ctl
-share/syslog-ng/include/scl/cim/template.conf
-share/syslog-ng/include/scl/graphite/plugin.conf
-share/syslog-ng/include/scl/graphite/README
-share/syslog-ng/include/scl/nodejs/plugin.conf
+share/syslog-ng/include/scl/system/plugin.conf
 share/syslog-ng/include/scl/pacct/plugin.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/include/scl/syslogconf/convert-syslogconf.awk
+share/syslog-ng/include/scl/syslogconf/README
 share/syslog-ng/include/scl/rewrite/cc-mask.conf
-share/syslog-ng/tools/cfg-grammar.y
+share/syslog-ng/include/scl/nodejs/plugin.conf
+share/syslog-ng/include/scl/graphite/plugin.conf
+share/syslog-ng/include/scl/graphite/README
+share/syslog-ng/include/scl/cim/template.conf
+share/syslog-ng/include/scl/solaris/plugin.conf
 share/syslog-ng/tools/lex-rules.am
+share/syslog-ng/tools/cfg-grammar.y
 share/syslog-ng/tools/merge-grammar.pl
 share/syslog-ng/tools/system-expand
 share/syslog-ng/xsd/patterndb-1.xsd