5 files changed, 116 insertions, 36 deletions

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 372092525898..f8bcb528f10f 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -6,17 +6,17 @@
 #
 
 PORTNAME=	syslog-ng
-PORTVERSION=	3.2.4
+PORTVERSION=	3.3.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/
-PKGNAMESUFFIX=	3
 DISTFILES=	$(PORTNAME)_$(PORTVERSION).tar.gz
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A powerful syslogd replacement
 
-CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0124-9]-[0-9]* \
-		syslog-ng[0-9]-devel-[0-9]*
+CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
+		syslog-ng-devel-[0-9]*
+WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(PORTVERSION)
 
 OPTIONS=	SYS_SSL "Build with OpenSSL support (from system)" off \
 		PORTS_SSL "Build with OpenSSL support (from ports)" off \
@@ -24,7 +24,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>
 
@@ -37,13 +39,13 @@ MAN8=		syslog-ng.8
 USE_RC_SUBR=	syslog-ng.sh
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	glib20
+USE_GNOME=	glib20 gnomehack
 SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
 		--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
-CONFIGURE_ENV=	CFLAGS="`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include ${CFLAGS}" \
-		LDFLAGS="`${LIBNET_CONFIG} --libs` ${LDFLAGS}"
+CFLAGS+=	`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
+LDFLAGS+=	`${LIBNET_CONFIG} --libs`
 
 .if defined(WITH_SYS_SSL) && defined(WITH_PORTS_SSL)
 BROKEN=		SYS_SSL and PORTS_SSL are mutually exclusive
@@ -54,7 +56,7 @@ USE_OPENSSL=            yes
 CONFIGURE_ARGS+=        --enable-ssl
 CONFIGURE_ENV+=         OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
                         OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
-PLIST_FILES+=		lib/syslog-ng/libafsocket-tls.la lib/syslog-ng/libafsocket-tls.so
+PLIST_FILES+=           lib/syslog-ng/libafsocket-tls.la lib/syslog-ng/libafsocket-tls.so
 .else
 CONFIGURE_ARGS+=        --disable-ssl
 .endif
@@ -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
@@ -116,6 +134,7 @@ post-patch:
 		${WRKSRC}/lib/utils.c ${WRKSRC}/lib/utils.h
 .endif
 
+
 post-install:
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
@@ -125,13 +144,12 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/syslog-ng
 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/syslog-ng
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${PREFIX}/share/doc/syslog-ng
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/syslog-ng
 .endif
 	@if [ ! -f ${PREFIX}/etc/syslog-ng.conf.sample ]; then \
 		${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample ${PREFIX}/etc; \
 	fi
-	@if [ ! -f ${PREFIX}/etc/syslog-ng.conf ]; then \
-		${CP} ${PREFIX}/etc/syslog-ng.conf.sample ${PREFIX}/etc/syslog-ng.conf; \
+	@if [ ! -f ${PREFIX}/etc/syslog-ng.conf.dist ]; then \
+		${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist ${PREFIX}/etc; \
 	fi
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index 7da063ca32a6..580d48fc9633 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.2.4.tar.gz) = e7bbd53121b57ba49089a0f95bf10a393e62b27a575c83d08e668c9dc1fe2f15
-SIZE (syslog-ng_3.2.4.tar.gz) = 1435115
+SHA256 (syslog-ng_3.3.1.tar.gz) = 2cd5e0102504cb9d7bb25570bbb3fdd8657aa1b1afdc18f7b9aa892d8f9c9089
+SIZE (syslog-ng_3.3.1.tar.gz) = 2405280
diff --git a/sysutils/syslog-ng/files/patch-scl-Makefile.in b/sysutils/syslog-ng/files/patch-scl-Makefile.in
deleted file mode 100644
index 567af03179e4..000000000000
--- a/sysutils/syslog-ng/files/patch-scl-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- scl/Makefile.in.orig	2011-01-15 08:15:10.000000000 -0800
-+++ scl/Makefile.in	2011-01-20 21:16:20.000000000 -0800
-@@ -200,7 +200,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SCL_SUBDIRS = system pacct syslogconf
--SCL_CONFIGS = scl.conf modules.conf syslog-ng.conf
-+SCL_CONFIGS = scl.conf modules.conf syslog-ng.conf.dist
- EXTRA_DIST = $(SCL_CONFIGS) $(SCL_SUBDIRS)
- scldir = $(datadir)/include/scl
- all: all-am
diff --git a/sysutils/syslog-ng/files/syslog-ng.conf.sample b/sysutils/syslog-ng/files/syslog-ng.conf.sample
index a58743dad624..7cc443818b53 100644
--- a/sysutils/syslog-ng/files/syslog-ng.conf.sample
+++ b/sysutils/syslog-ng/files/syslog-ng.conf.sample
@@ -1,14 +1,16 @@
-@version:3.2
+@version:3.3
 
 #
 # This sample configuration file is essentially equilivent to the stock
 # FreeBSD /etc/syslog.conf file.
 #
+# $FreeBSD$
+#
 
 #
 # options
 #
-options { long_hostnames(off); flush_lines(0); };
+options { chain_hostnames(off); flush_lines(0); threaded(yes); };
 
 #
 # sources
diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist
index 09704c5898ae..488f5277021c 100644
--- a/sysutils/syslog-ng/pkg-plist
+++ b/sysutils/syslog-ng/pkg-plist
@@ -5,19 +5,86 @@ etc/scl.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/update-patterndb
 bin/loggen
 bin/pdbtool
+bin/update-patterndb
+sbin/syslog-ng
+sbin/syslog-ng-ctl
+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/center.h
+include/syslog-ng/cfg-grammar.h
+include/syslog-ng/cfg-lexer.h
+include/syslog-ng/cfg-parser.h
+include/syslog-ng/cfg.h
+include/syslog-ng/children.h
+include/syslog-ng/compat.h
+include/syslog-ng/control.h
+include/syslog-ng/crypto.h
+include/syslog-ng/dgroup.h
+include/syslog-ng/dnscache.h
+include/syslog-ng/driver.h
+include/syslog-ng/filter-expr-parser.h
+include/syslog-ng/filter.h
+include/syslog-ng/gprocess.h
+include/syslog-ng/gsockaddr.h
+include/syslog-ng/gsocket.h
+include/syslog-ng/logmatcher.h
+include/syslog-ng/logmpx.h
+include/syslog-ng/logmsg.h
+include/syslog-ng/logparser.h
+include/syslog-ng/logpipe.h
+include/syslog-ng/logprocess.h
+include/syslog-ng/logproto.h
+include/syslog-ng/logqueue-fifo.h
+include/syslog-ng/logqueue.h
+include/syslog-ng/logreader.h
+include/syslog-ng/logrewrite.h
+include/syslog-ng/logsource.h
+include/syslog-ng/logstamp.h
+include/syslog-ng/logtransport.h
+include/syslog-ng/logwriter.h
+include/syslog-ng/mainloop.h
+include/syslog-ng/memtrace.h
+include/syslog-ng/messages.h
+include/syslog-ng/misc.h
+include/syslog-ng/msg-format.h
+include/syslog-ng/nvtable.h
+include/syslog-ng/parser-expr-parser.h
+include/syslog-ng/persist-state.h
+include/syslog-ng/plugin.h
+include/syslog-ng/pragma-parser.h
+include/syslog-ng/rewrite-expr-parser.h
+include/syslog-ng/serialize.h
+include/syslog-ng/sgroup.h
+include/syslog-ng/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/templates.h
+include/syslog-ng/timeutils.h
+include/syslog-ng/tls-support.h
+include/syslog-ng/tlscontext.h
+include/syslog-ng/tlstransport.h
+include/syslog-ng/utils.h
+include/syslog-ng/value-pairs.h
 lib/libsyslog-ng.la
 lib/libsyslog-ng.so
-lib/libsyslog-ng.so.0
+lib/libsyslog-ng-3.3.1.so
+libdata/pkgconfig/syslog-ng.pc
 lib/syslog-ng/libaffile.la
 lib/syslog-ng/libaffile.so
+lib/syslog-ng/libafmongodb.la
+lib/syslog-ng/libafmongodb.so
 lib/syslog-ng/libafprog.la
 lib/syslog-ng/libafprog.so
-lib/syslog-ng/libafsocket.so
 lib/syslog-ng/libafsocket-notls.la
 lib/syslog-ng/libafsocket-notls.so
+lib/syslog-ng/libafsocket.so
 lib/syslog-ng/libafuser.la
 lib/syslog-ng/libafuser.so
 lib/syslog-ng/libbasicfuncs.la
@@ -32,16 +99,19 @@ lib/syslog-ng/libdbparser.la
 lib/syslog-ng/libdbparser.so
 lib/syslog-ng/libdummy.la
 lib/syslog-ng/libdummy.so
+lib/syslog-ng/libsyslog-ng-crypto.la
+lib/syslog-ng/libsyslog-ng-crypto.so
 lib/syslog-ng/libsyslogformat.la
 lib/syslog-ng/libsyslogformat.so
-sbin/syslog-ng
-sbin/syslog-ng-ctl
 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/tools/cfg-grammar.y
+share/tools/lex-rules.am
+share/tools/merge-grammar.pl
 share/xsd/patterndb-1.xsd
 share/xsd/patterndb-2.xsd
 share/xsd/patterndb-3.xsd
@@ -49,14 +119,15 @@ share/xsd/patterndb-3.xsd
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/xsd
+@dirrm etc/patterndb.d
+@dirrm include/syslog-ng
+@dirrm lib/syslog-ng
 @dirrm share/include/scl/system
 @dirrm share/include/scl/syslogconf
 @dirrm share/include/scl/pacct
 @dirrm share/include/scl
 @dirrm share/include
-@dirrm lib/syslog-ng
-@dirrm etc/patterndb.d
+@dirrmtry share/tools
+@dirrm share/xsd