Update from 3.3.0-beta1 to 3.3.0-beta2.

Submitted by:	Peter Czanik <czanik@balabit.hu> (our syslog-ng3 upline)

5 files changed, 10 insertions, 19 deletions

diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 43caac225827..ab4ff9cb11cc 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	syslog-ng
-PORTVERSION=	3.3.0b1
+PORTVERSION=	3.3.0b2
 PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/3.3.0beta1/source/
+MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/3.3.0beta2/source/
 PKGNAMESUFFIX=	3-devel
-DISTFILES=	$(PORTNAME)_3.3.0beta1.tar.gz
+DISTFILES=	$(PORTNAME)_3.3.0beta2.tar.gz
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A powerful syslogd replacement
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]*
-WRKSRC=		$(WRKDIR)/$(PORTNAME)-3.3.0beta1
+WRKSRC=		$(WRKDIR)/$(PORTNAME)-3.3.0beta2
 
 OPTIONS=	SYS_SSL "Build with OpenSSL support (from system)" off \
 		PORTS_SSL "Build with OpenSSL support (from ports)" off \
diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng-devel/distinfo
index 83439ce869eb..f591fab34b37 100644
--- a/sysutils/syslog-ng-devel/distinfo
+++ b/sysutils/syslog-ng-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.3.0beta1.tar.gz) = 7836baf85bafebaa31bf16c689e69a8f89e60fa1bac853eaddc9dd595a081e60
-SIZE (syslog-ng_3.3.0beta1.tar.gz) = 2203917
+SHA256 (syslog-ng_3.3.0beta2.tar.gz) = ba27261e5557c1de4b9ad5ac59ecc38a23c22ed111a00d3ba397a5e215c4c235
+SIZE (syslog-ng_3.3.0beta2.tar.gz) = 2372967
diff --git a/sysutils/syslog-ng-devel/files/patch-lib-Makefile.am b/sysutils/syslog-ng-devel/files/patch-lib-Makefile.am
deleted file mode 100644
index 399eed4b24dc..000000000000
--- a/sysutils/syslog-ng-devel/files/patch-lib-Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Makefile.am.orig	2011-05-07 06:18:15.000000000 -0700
-+++ lib/Makefile.am	2011-06-01 13:02:37.000000000 -0700
-@@ -13,7 +13,7 @@
- 
- module_LTLIBRARIES = libsyslog-ng-crypto.la
- libsyslog_ng_crypto_la_LIBADD = @CORE_DEPS_LIBS@ libsyslog-ng.la
--libsyslog_ng_crypto_la_LDFLAGS = -no-undefined
-+libsyslog_ng_crypto_la_LDFLAGS = -no-undefined -avoid-versions
- 
- # this is intentionally formatted so conflicts are less likely to arise. one name in every line.
- pkginclude_HEADERS = 		\
diff --git a/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample b/sysutils/syslog-ng-devel/files/syslog-ng.conf.sample
index 0ba913185c6c..ed9c40dc5fe2 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.0
+@version:3.3
 
 #
 # This sample configuration file is essentially equilivent to the stock
@@ -8,7 +8,7 @@
 #
 # options
 #
-options { long_hostnames(off); flush_lines(0); };
+options { chain_hostnames(off); flush_lines(0); threaded(yes); };
 
 #
 # sources
diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng-devel/pkg-plist
index 438f8330b7d7..83b570ecadec 100644
--- a/sysutils/syslog-ng-devel/pkg-plist
+++ b/sysutils/syslog-ng-devel/pkg-plist
@@ -83,6 +83,8 @@ lib/syslog-ng/libafprog.la
 lib/syslog-ng/libafprog.so
 lib/syslog-ng/libafsocket-notls.la
 lib/syslog-ng/libafsocket-notls.so
+lib/syslog-ng/libafsocket-tls.la
+lib/syslog-ng/libafsocket-tls.so
 lib/syslog-ng/libafsocket.so
 lib/syslog-ng/libafuser.la
 lib/syslog-ng/libafuser.so