Update 3.5.3 --> 3.5.4.1

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

3 files changed, 29 insertions, 27 deletions

diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 1298c6a2c6b6..4c483922cff2 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	syslog-ng
-PORTVERSION=	3.5.3
-PORTREVISION=	2
+PORTVERSION=	3.5.4.1
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
 DISTVERSION=	$(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
@@ -46,7 +45,8 @@ SUB_FILES=	pkg-message
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
 		--enable-dynamic-linking \
-		--enable-debug
+		--enable-debug \
+		--datadir=${PREFIX}/share/syslog-ng/
 
 .include <bsd.port.options.mk>
 
@@ -165,5 +165,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/scl/scl.conf.dist ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h ${STAGEDIR}${PREFIX}/include/syslog-ng/
+	${RMDIR} ${STAGEDIR}${PREFIX}/tests
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng-devel/distinfo
index c32c6880bbf8..d5dd6e9eccd3 100644
--- a/sysutils/syslog-ng-devel/distinfo
+++ b/sysutils/syslog-ng-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.5.3.tar.gz) = a349a1baa272e7b07fa4b0d6a85512e71dd946476ae12bc8f9c9ad64311164d0
-SIZE (syslog-ng_3.5.3.tar.gz) = 3049273
+SHA256 (syslog-ng_3.5.4.1.tar.gz) = 92c6969e4172b4fd32390f80043b4de7b116f29989d8c2e5a8a687ee6dcd6f66
+SIZE (syslog-ng_3.5.4.1.tar.gz) = 3034040
diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng-devel/pkg-plist
index 63859d701f6e..9c8e5d4eca63 100644
--- a/sysutils/syslog-ng-devel/pkg-plist
+++ b/sysutils/syslog-ng-devel/pkg-plist
@@ -119,7 +119,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.3.so
+lib/libsyslog-ng-3.5.4.1.so
 lib/libsyslog-ng.la
 lib/libsyslog-ng.so
 lib/syslog-ng/libafamqp.la
@@ -163,31 +163,32 @@ man/man5/syslog-ng.conf.5.gz
 man/man8/syslog-ng.8.gz
 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/plugin.conf
-share/include/scl/rewrite/cc-mask.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
-share/xsd/patterndb-4.xsd
+share/syslog-ng/include/scl/pacct/plugin.conf
+share/syslog-ng/include/scl/syslogconf/README
+share/syslog-ng/include/scl/syslogconf/convert-syslogconf.awk
+share/syslog-ng/include/scl/syslogconf/plugin.conf
+share/syslog-ng/include/scl/system/plugin.conf
+share/syslog-ng/include/scl/rewrite/cc-mask.conf
+share/syslog-ng/tools/cfg-grammar.y
+share/syslog-ng/tools/lex-rules.am
+share/syslog-ng/tools/merge-grammar.pl
+share/syslog-ng/xsd/patterndb-1.xsd
+share/syslog-ng/xsd/patterndb-2.xsd
+share/syslog-ng/xsd/patterndb-3.xsd
+share/syslog-ng/xsd/patterndb-4.xsd
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/xsd
-@dirrmtry share/tools
-@dirrm share/include/scl/system
-@dirrm share/include/scl/syslogconf
-@dirrm share/include/scl/pacct
-@dirrm share/include/scl/rewrite
-@dirrm share/include/scl
-@dirrm share/include
+@dirrm share/syslog-ng/xsd
+@dirrmtry share/syslog-ng/tools
+@dirrm share/syslog-ng/include/scl/system
+@dirrm share/syslog-ng/include/scl/syslogconf
+@dirrm share/syslog-ng/include/scl/pacct
+@dirrm share/syslog-ng/include/scl/rewrite
+@dirrm share/syslog-ng/include/scl
+@dirrm share/syslog-ng/include
+@dirrm share/syslog-ng
 @dirrm lib/syslog-ng
 @dirrm include/syslog-ng/filter
 @dirrm include/syslog-ng/logproto