Resurrect the devel branch. Update from 3.3.1 to 3.4.0alpha1.

Port provided by Peter Czanik of balabit.hu, the syslog-ng upline.

Submitted by:	Peter Czanik <czanik@balabit.hu> (syslog-ng upline)
Feature safe:	yes

4 files changed, 40 insertions, 27 deletions

diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 5c76b9afd14..03f4e48f3f1 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -6,20 +6,21 @@
 #
 
 PORTNAME=	syslog-ng
-PORTVERSION=	3.3.1
-PORTREVISION=	2
+PORTVERSION=	3.4.0a1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/3.3.1/source/
-PKGNAMESUFFIX=	-devel
-DISTFILES=	$(PORTNAME)_3.3.1.tar.gz
+# MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/$(DISTVERSOIN)/source/
+# temporary workaround: git snapshot
+# as alpha1 release crashes on start on FreeBSD
+MASTER_SITES=	http://people.balabit.hu/czanik/
+DISTVERSION=	$(PORTVERSION:S/a/alpha/)
+DISTFILES=	$(PORTNAME)-$(DISTVERSION).tar.gz
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A powerful syslogd replacement
 
-IGNORE=		Development branch not currently active
-
-CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]*
-WRKSRC=		$(WRKDIR)/$(PORTNAME)-3.3.1
+CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
+		syslog-ng-devel-[0-9]*
+WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(DISTVERSION)
 
 OPTIONS=	SYS_SSL "Build with OpenSSL support (from system)" off \
 		PORTS_SSL "Build with OpenSSL support (from ports)" off \
@@ -46,7 +47,8 @@ USE_GNOME=	glib20 gnomehack
 SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
-		--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
+		--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin \
+		--enable-debug
 CFLAGS+=	`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
 LDFLAGS+=	`${LIBNET_CONFIG} --libs`
 
@@ -58,7 +60,7 @@ BROKEN=		SYS_SSL and PORTS_SSL are mutually exclusive
 USE_OPENSSL=            yes
 CONFIGURE_ARGS+=        --enable-ssl
 CONFIGURE_ENV+=         OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
-                        OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
+			OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
 PLIST_FILES+=           lib/syslog-ng/libafsocket-tls.la lib/syslog-ng/libafsocket-tls.so
 .else
 CONFIGURE_ARGS+=        --disable-ssl
@@ -92,7 +94,8 @@ CONFIGURE_ARGS+=	--disable-ipv6
 
 .if defined(WITH_PCRE)
 CONFIGURE_ARGS+=	--enable-pcre
-LIB_DEPENDS+=		pcre.1:${PORTSDIR}/devel/pcre
+# LIB_DEPENDS+=		pcre.1:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=		pcre.0:${PORTSDIR}/devel/pcre
 .else
 CONFIGURE_ARGS+=	--disable-pcre
 .endif
@@ -112,12 +115,15 @@ BROKEN=		JSON_C and JSON_GLIB are mutually exclusive
 
 .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
+CONFIGURE_ARGS+=        --with-json=json-glib
+# XXX Tarball brokenness
+# XXX 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
+CONFIGURE_ARGS+=        --with-json=json-c
+# XXX Tarball brokenness
+# XXX PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so \
+PLIST_FILES+= 		lib/syslog-ng/libjsonparser.so lib/syslog-ng/libjsonparser.la
 .else
 CONFIGURE_ARGS+=        --disable-json
 .endif
@@ -137,7 +143,6 @@ post-patch:
 		${WRKSRC}/lib/utils.c ${WRKSRC}/lib/utils.h
 .endif
 
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng-devel/distinfo
index 580d48fc963..ce9deeb2e32 100644
--- a/sysutils/syslog-ng-devel/distinfo
+++ b/sysutils/syslog-ng-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.3.1.tar.gz) = 2cd5e0102504cb9d7bb25570bbb3fdd8657aa1b1afdc18f7b9aa892d8f9c9089
-SIZE (syslog-ng_3.3.1.tar.gz) = 2405280
+SHA256 (syslog-ng-3.4.0alpha1.tar.gz) = 10ef5936388bf9bab51fe0c3c6efc98af3c3660ed35a499501176017c667741a
+SIZE (syslog-ng-3.4.0alpha1.tar.gz) = 2688460
diff --git a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample
index ed9c40dc5fe..7cc443818b5 100644
--- a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample
+++ b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample
@@ -4,6 +4,8 @@
 # This sample configuration file is essentially equilivent to the stock
 # FreeBSD /etc/syslog.conf file.
 #
+# $FreeBSD$
+#
 
 #
 # options
diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng-devel/pkg-plist
index aab49324643..b04db3cc818 100644
--- a/sysutils/syslog-ng-devel/pkg-plist
+++ b/sysutils/syslog-ng-devel/pkg-plist
@@ -1,5 +1,4 @@
 @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
-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.dist; then rm -f %D/etc/syslog-ng.conf; fi
@@ -15,7 +14,6 @@ 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
@@ -24,7 +22,6 @@ 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
@@ -37,7 +34,6 @@ 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
@@ -58,8 +54,8 @@ 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/scratch-buffers.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
@@ -72,9 +68,13 @@ include/syslog-ng/tlscontext.h
 include/syslog-ng/tlstransport.h
 include/syslog-ng/utils.h
 include/syslog-ng/value-pairs.h
+include/syslog-ng/cfg-tree.h
+include/syslog-ng/file-perms.h
+include/syslog-ng/uuid.h
+include/syslog-ng/vptransform.h
 lib/libsyslog-ng.la
 lib/libsyslog-ng.so
-lib/libsyslog-ng-3.3.1.so
+lib/libsyslog-ng-3.4.0alpha1.so
 libdata/pkgconfig/syslog-ng.pc
 lib/syslog-ng/libaffile.la
 lib/syslog-ng/libaffile.so
@@ -91,8 +91,6 @@ lib/syslog-ng/libbasicfuncs.la
 lib/syslog-ng/libbasicfuncs.so
 lib/syslog-ng/libconfgen.la
 lib/syslog-ng/libconfgen.so
-lib/syslog-ng/libconvertfuncs.la
-lib/syslog-ng/libconvertfuncs.so
 lib/syslog-ng/libcsvparser.la
 lib/syslog-ng/libcsvparser.so
 lib/syslog-ng/libdbparser.la
@@ -103,6 +101,14 @@ lib/syslog-ng/libsyslog-ng-crypto.la
 lib/syslog-ng/libsyslog-ng-crypto.so
 lib/syslog-ng/libsyslogformat.la
 lib/syslog-ng/libsyslogformat.so
+lib/syslog-ng/libtfuuid.so
+lib/syslog-ng/libtfuuid.la
+@comment XXX upline says these are installed regardless of optoins selected
+lib/syslog-ng/libafsmtp.la
+lib/syslog-ng/libafsmtp.so
+lib/syslog-ng/libtfjson.la
+lib/syslog-ng/libtfjson.so
+@comment XXX
 share/include/scl/pacct/plugin.conf
 share/include/scl/syslogconf/README
 share/include/scl/syslogconf/convert-syslogconf.awk