5 files changed, 33 insertions, 17 deletions

diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 9f21055f71d0..17c6c0cb2ede 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -7,11 +7,14 @@
 
 PORTNAME=	syslog-ng
 PORTVERSION=	3.4.0a1
+PORTREVISION=   1
 CATEGORIES=	sysutils
-# MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/$(DISTVERSOIN)/source/
+# 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/
+MASTER_SITES=	http://people.balabit.hu/czanik/ \
+		http://komquats.com/distfiles/ \
+		http://people.freebsd.org/~cy/distfiles/
 PKGNAMESUFFIX=	-devel
 DISTVERSION=	$(PORTVERSION:S/a/alpha/)
 DISTFILES=	$(PORTNAME)-$(DISTVERSION).tar.gz
@@ -30,6 +33,7 @@ OPTIONS=	SYS_SSL "Build with OpenSSL support (from system)" off \
 		SPOOF "Build with spoof source support" off \
 		IPV6 "Build with IPV6 support" on \
 		PCRE "Build with PCRE support" on \
+		SMTP "Build with SMTP support" off \
 		JSON_C "Build with JSON-C support" off \
 		JSON_GLIB "Build with JSON-GLIB support" off \
 
@@ -100,6 +104,15 @@ LIB_DEPENDS+=		pcre:${PORTSDIR}/devel/pcre
 CONFIGURE_ARGS+=	--disable-pcre
 .endif
 
+.if defined(WITH_SMTP)
+CONFIGURE_ARGS+=	--with-libesmtp=/usr/local/lib
+LIB_DEPENDS+=		esmtp.6:${PORTSDIR}/mail/libesmtp
+PLIST_FILES+=		lib/syslog-ng/libafsmtp.la lib/syslog-ng/libafsmtp.so
+BROKEN=                 "smtp support does not work currently"
+.else
+CONFIGURE_ARGS+=	--without-libesmtp
+.endif
+
 .if defined(WITH_SQL)
 LIB_DEPENDS+=		dbi.1:${PORTSDIR}/databases/libdbi
 CONFIGURE_ENV+=		LIBDBI_LIBS="-ldbi"
@@ -116,13 +129,11 @@ 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+=        --with-json=json-glib
-# XXX Tarball brokenness
-# XXX PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so
+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+=        --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/libtfjson.la lib/syslog-ng/libtfjson.so
 PLIST_FILES+= 		lib/syslog-ng/libjsonparser.so lib/syslog-ng/libjsonparser.la
 .else
 CONFIGURE_ARGS+=        --disable-json
diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng-devel/distinfo
index ce9deeb2e325..459c2f62412f 100644
--- a/sysutils/syslog-ng-devel/distinfo
+++ b/sysutils/syslog-ng-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.4.0alpha1.tar.gz) = 10ef5936388bf9bab51fe0c3c6efc98af3c3660ed35a499501176017c667741a
-SIZE (syslog-ng-3.4.0alpha1.tar.gz) = 2688460
+SHA256 (syslog-ng-3.4.0alpha1.tar.gz) = 7e5be67c8ad751caa75d8d76628c08f9653266e7110e3734b3a71dce30b7b87e
+SIZE (syslog-ng-3.4.0alpha1.tar.gz) = 2656634
diff --git a/sysutils/syslog-ng-devel/files/patch-modules-Makefile.in b/sysutils/syslog-ng-devel/files/patch-modules-Makefile.in
new file mode 100644
index 000000000000..925a92047114
--- /dev/null
+++ b/sysutils/syslog-ng-devel/files/patch-modules-Makefile.in
@@ -0,0 +1,13 @@
+--- modules/Makefile.in.orig	2012-04-05 10:46:11.219706762 -0700
++++ modules/Makefile.in	2012-04-05 12:45:02.702508603 -0700
+@@ -265,7 +265,9 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = afsocket afsql afstreams affile afprog afuser afmongodb afsmtp csvparser confgen syslogformat pacctformat basicfuncs dbparser tfjson tfuuid jsonparser
++# XXX Temporarily afsmtp build temporarily broken
++# XXX SUBDIRS = afsocket afsql afstreams affile afprog afuser afmongodb afsmtp csvparser confgen syslogformat pacctformat basicfuncs dbparser tfjson tfuuid jsonparser
++SUBDIRS = afsocket afsql afstreams affile afprog afuser afmongodb csvparser confgen syslogformat pacctformat basicfuncs dbparser tfjson tfuuid jsonparser
+ all: all-recursive
+ 
+ .SUFFIXES:
diff --git a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample
index 7cc443818b53..c44b473d1767 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.3
+@version:3.4
 
 #
 # This sample configuration file is essentially equilivent to the stock
diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng-devel/pkg-plist
index b04db3cc818a..6bee7d6715a0 100644
--- a/sysutils/syslog-ng-devel/pkg-plist
+++ b/sysutils/syslog-ng-devel/pkg-plist
@@ -95,20 +95,12 @@ lib/syslog-ng/libcsvparser.la
 lib/syslog-ng/libcsvparser.so
 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
 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