Update syslog-ng 3.5.4.1 --> 3.5.5

Update syslog-ng-incubator 0.3.2 --> 0.3.3

6 files changed, 43 insertions, 10 deletions

diff --git a/sysutils/syslog-ng-incubator/Makefile b/sysutils/syslog-ng-incubator/Makefile
index 08a9ef870549..d34d1fcdeaa7 100644
--- a/sysutils/syslog-ng-incubator/Makefile
+++ b/sysutils/syslog-ng-incubator/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	syslog-ng-incubator
-PORTVERSION=	0.3.2
+PORTVERSION=	0.3.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://packages.madhouse-project.org/syslog-ng/incubator/
 DISTFILES=	syslog-ng-incubator-${PORTVERSION}.tar.xz
diff --git a/sysutils/syslog-ng-incubator/distinfo b/sysutils/syslog-ng-incubator/distinfo
index 5a40bb66e311..e0f9954dd8bf 100644
--- a/sysutils/syslog-ng-incubator/distinfo
+++ b/sysutils/syslog-ng-incubator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-incubator-0.3.2.tar.xz) = 5f0ebfda18620f67848abbf90d32d7c238334ee4ec8dcb9b1d77a9dcd5508965
-SIZE (syslog-ng-incubator-0.3.2.tar.xz) = 263820
+SHA256 (syslog-ng-incubator-0.3.3.tar.xz) = 7cc64867fd80e20111d6b5dc054a9ceb17569efe29fd7d71b7a01dec82a7abf7
+SIZE (syslog-ng-incubator-0.3.3.tar.xz) = 263956
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 66c5ad1f8832..d146b6521300 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	syslog-ng
-PORTVERSION=	3.5.4.1
-PORTREVISION=	3
+PORTVERSION=	3.5.5
 CATEGORIES=	sysutils
 DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
 DISTFILES=	syslog-ng_${DISTVERSION}.tar.gz
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index d5dd6e9eccd3..a2598879556e 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.5.4.1.tar.gz) = 92c6969e4172b4fd32390f80043b4de7b116f29989d8c2e5a8a687ee6dcd6f66
-SIZE (syslog-ng_3.5.4.1.tar.gz) = 3034040
+SHA256 (syslog-ng_3.5.5.tar.gz) = 3c5e90e49783eb716ec08d9d60722993cb0b8b0ce8a385615ed244f7c9a1ef42
+SIZE (syslog-ng_3.5.5.tar.gz) = 3001703
diff --git a/sysutils/syslog-ng/files/patch-Makefile.in b/sysutils/syslog-ng/files/patch-Makefile.in
new file mode 100644
index 000000000000..1609bfd8ce41
--- /dev/null
+++ b/sysutils/syslog-ng/files/patch-Makefile.in
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	2014-08-01 19:27:14.584284459 -0700
++++ Makefile.in	2014-08-01 19:33:44.036046297 -0700
+@@ -3280,8 +3280,8 @@
+ 	for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    $(am__strip_dir) \
+-	    echo " ( cd '$(DESTDIR)$(libtestdir)' && $(RANLIB) $$f )"; \
+-	    ( cd "$(DESTDIR)$(libtestdir)" && $(RANLIB) $$f ) || exit $$?; \
++	    echo " ( cd '$(DESTDIR)$(libtestdir)' && $(RANLIB) $$p )"; \
++	    ( cd "$(DESTDIR)$(libtestdir)" && $(RANLIB) $$p ) || exit $$?; \
+ 	  else :; fi; \
+ 	done
+ 
diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist
index 1ca853075cc9..e149457d5586 100644
--- a/sysutils/syslog-ng/pkg-plist
+++ b/sysutils/syslog-ng/pkg-plist
@@ -38,6 +38,18 @@ include/syslog-ng/iv_thread.h
 include/syslog-ng/iv_tls.h
 include/syslog-ng/iv_wait.h
 include/syslog-ng/iv_work.h
+include/syslog-ng/ivykis/iv.h
+include/syslog-ng/ivykis/iv_avl.h
+include/syslog-ng/ivykis/iv_event.h
+include/syslog-ng/ivykis/iv_event_raw.h
+include/syslog-ng/ivykis/iv_fd_pump.h
+include/syslog-ng/ivykis/iv_list.h
+include/syslog-ng/ivykis/iv_popen.h
+include/syslog-ng/ivykis/iv_signal.h
+include/syslog-ng/ivykis/iv_thread.h
+include/syslog-ng/ivykis/iv_tls.h
+include/syslog-ng/ivykis/iv_wait.h
+include/syslog-ng/ivykis/iv_work.h
 include/syslog-ng/logmatcher.h
 include/syslog-ng/logmpx.h
 include/syslog-ng/logmsg.h
@@ -88,6 +100,11 @@ include/syslog-ng/filter/filter-re.h
 include/syslog-ng/filter/filter-pri.h
 include/syslog-ng/filter/filter-pipe.h
 include/syslog-ng/filter/filter-expr-parser.h
+include/syslog-ng/libtest/mock-transport.h
+include/syslog-ng/libtest/msg_parse_lib.h
+include/syslog-ng/libtest/proto_lib.h
+include/syslog-ng/libtest/template_lib.h
+include/syslog-ng/libtest/testutils.h
 include/syslog-ng/logproto/logproto-client.h
 include/syslog-ng/logproto/logproto-server.h
 include/syslog-ng/logproto/logproto-buffered-server.h
@@ -115,7 +132,7 @@ include/syslog-ng/rewrite/rewrite-set.h
 include/syslog-ng/rewrite/rewrite-subst.h
 include/syslog-ng/rewrite/rewrite-expr-parser.h
 include/syslog-ng/template/templates.h
-lib/libsyslog-ng-3.5.4.1.so
+lib/libsyslog-ng-3.5.5.so
 lib/libsyslog-ng.so
 lib/syslog-ng/libafamqp.so
 lib/syslog-ng/libaffile.so
@@ -134,7 +151,9 @@ lib/syslog-ng/liblinux-kmsg-format.so
 lib/syslog-ng/libsyslog-ng-crypto.so
 lib/syslog-ng/libsyslogformat.so
 lib/syslog-ng/libsystem-source.so
+lib/syslog-ng/libtest/libsyslog-ng-test.a
 libdata/pkgconfig/syslog-ng.pc
+libdata/pkgconfig/syslog-ng-test.pc
 man/man1/loggen.1.gz
 man/man1/pdbtool.1.gz
 man/man1/syslog-ng-ctl.1.gz
@@ -168,12 +187,14 @@ share/syslog-ng/xsd/patterndb-4.xsd
 @dirrm share/syslog-ng/include/scl
 @dirrm share/syslog-ng/include
 @dirrm share/syslog-ng
+@dirrm lib/syslog-ng/libtest
 @dirrm lib/syslog-ng
 @dirrm include/syslog-ng/filter
+@dirrm include/syslog-ng/ivykis
+@dirrm include/syslog-ng/libtest
 @dirrm include/syslog-ng/logproto
 @dirrm include/syslog-ng/parser
 @dirrm include/syslog-ng/rewrite
 @dirrm include/syslog-ng/template
 @dirrm include/syslog-ng
-@exec mkdir -p %D/etc/patterndb.d
-@dirrmtry etc/patterndb.d
+@dirrm etc/patterndb.d