4 files changed, 40 insertions, 2 deletions

diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 44d23d635af2..43caac225827 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -25,7 +25,9 @@ OPTIONS=	SYS_SSL "Build with OpenSSL support (from system)" off \
 		SQL "Build with database (libdbi) support" off \
 		SPOOF "Build with spoof source support" off \
 		IPV6 "Build with IPV6 support" on \
-		PCRE "Build with PCRE support" on
+		PCRE "Build with PCRE support" on \
+		JSON_C "Build with JSON-C support" off \
+		JSON_GLIB "Build with JSON-GLIB support" off \
 
 .include <bsd.port.options.mk>
 
@@ -101,6 +103,22 @@ PLIST_FILES+=		lib/syslog-ng/libafsql.la lib/syslog-ng/libafsql.so
 CONFIGURE_ARGS+=	--disable-sql
 .endif
 
+.if defined(WITH_JSON_C) && defined(WITH_JSON_GLIB)
+BROKEN=		JSON_C and JSON_GLIB are mutually exclusive
+.endif
+
+.if defined(WITH_JSON_GLIB)
+LIB_DEPENDS+=		json-glib-1.0.0:${PORTSDIR}/devel/json-glib
+CONFIGURE_ARGS+=        --enable-json --with-json=json-glib
+PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so
+.elif defined(WITH_JSON_C)
+LIB_DEPENDS+=		json.0:${PORTSDIR}/devel/json-c
+CONFIGURE_ARGS+=        --enable-json --with-json=json-c
+PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so
+.else
+CONFIGURE_ARGS+=        --disable-json
+.endif
+
 .if ${OSVERSION} >= 900034
 CONFIGURE_ARGS+=        --disable-linux-caps
 .endif
diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng-devel/pkg-plist
index 767d836800d0..438f8330b7d7 100644
--- a/sysutils/syslog-ng-devel/pkg-plist
+++ b/sysutils/syslog-ng-devel/pkg-plist
@@ -3,6 +3,7 @@ etc/modules.conf
 etc/scl.conf
 @exec test -f %D/etc/syslog-ng.conf || cp -p %D/etc/syslog-ng.conf.sample %D/etc/syslog-ng.conf
 @unexec if cmp -s %D/etc/syslog-ng.conf %D/etc/syslog-ng.conf.sample; then rm -f %D/etc/syslog-ng.conf; fi
+etc/syslog-ng.conf.dist
 etc/syslog-ng.conf.sample
 bin/loggen
 bin/pdbtool
diff --git a/sysutils/syslog-ng3-devel/Makefile b/sysutils/syslog-ng3-devel/Makefile
index 44d23d635af2..43caac225827 100644
--- a/sysutils/syslog-ng3-devel/Makefile
+++ b/sysutils/syslog-ng3-devel/Makefile
@@ -25,7 +25,9 @@ OPTIONS=	SYS_SSL "Build with OpenSSL support (from system)" off \
 		SQL "Build with database (libdbi) support" off \
 		SPOOF "Build with spoof source support" off \
 		IPV6 "Build with IPV6 support" on \
-		PCRE "Build with PCRE support" on
+		PCRE "Build with PCRE support" on \
+		JSON_C "Build with JSON-C support" off \
+		JSON_GLIB "Build with JSON-GLIB support" off \
 
 .include <bsd.port.options.mk>
 
@@ -101,6 +103,22 @@ PLIST_FILES+=		lib/syslog-ng/libafsql.la lib/syslog-ng/libafsql.so
 CONFIGURE_ARGS+=	--disable-sql
 .endif
 
+.if defined(WITH_JSON_C) && defined(WITH_JSON_GLIB)
+BROKEN=		JSON_C and JSON_GLIB are mutually exclusive
+.endif
+
+.if defined(WITH_JSON_GLIB)
+LIB_DEPENDS+=		json-glib-1.0.0:${PORTSDIR}/devel/json-glib
+CONFIGURE_ARGS+=        --enable-json --with-json=json-glib
+PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so
+.elif defined(WITH_JSON_C)
+LIB_DEPENDS+=		json.0:${PORTSDIR}/devel/json-c
+CONFIGURE_ARGS+=        --enable-json --with-json=json-c
+PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so
+.else
+CONFIGURE_ARGS+=        --disable-json
+.endif
+
 .if ${OSVERSION} >= 900034
 CONFIGURE_ARGS+=        --disable-linux-caps
 .endif
diff --git a/sysutils/syslog-ng3-devel/pkg-plist b/sysutils/syslog-ng3-devel/pkg-plist
index 767d836800d0..438f8330b7d7 100644
--- a/sysutils/syslog-ng3-devel/pkg-plist
+++ b/sysutils/syslog-ng3-devel/pkg-plist
@@ -3,6 +3,7 @@ etc/modules.conf
 etc/scl.conf
 @exec test -f %D/etc/syslog-ng.conf || cp -p %D/etc/syslog-ng.conf.sample %D/etc/syslog-ng.conf
 @unexec if cmp -s %D/etc/syslog-ng.conf %D/etc/syslog-ng.conf.sample; then rm -f %D/etc/syslog-ng.conf; fi
+etc/syslog-ng.conf.dist
 etc/syslog-ng.conf.sample
 bin/loggen
 bin/pdbtool