RSYSLOG OVERHAUL: Part 8

- Update to 5.7.0

PR:             ports/151021

11 files changed, 22 insertions, 17 deletions

diff --git a/sysutils/rsyslog5-devel-dbi/Makefile b/sysutils/rsyslog5-devel-dbi/Makefile
index 7105b210b8a3..7f90e8e045c3 100644
--- a/sysutils/rsyslog5-devel-dbi/Makefile
+++ b/sysutils/rsyslog5-devel-dbi/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 COMMENT=	LibDBI output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog5
+MASTERDIR=	${.CURDIR}/../rsyslog5-devel
 
 MNAME=	libdbi
 LIB_DEPENDS=	dbi.0:${PORTSDIR}/databases/libdbi
diff --git a/sysutils/rsyslog5-devel-gnutls/Makefile b/sysutils/rsyslog5-devel-gnutls/Makefile
index 80c35be7d839..0595a990b626 100644
--- a/sysutils/rsyslog5-devel-gnutls/Makefile
+++ b/sysutils/rsyslog5-devel-gnutls/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	GNUTLS module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog5
+MASTERDIR=	${.CURDIR}/../rsyslog5-devel
 
 MNAME=	gnutls
 LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
diff --git a/sysutils/rsyslog5-devel-gssapi/Makefile b/sysutils/rsyslog5-devel-gssapi/Makefile
index 2e90c606d787..37c12d2a253e 100644
--- a/sysutils/rsyslog5-devel-gssapi/Makefile
+++ b/sysutils/rsyslog5-devel-gssapi/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	GSS API input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog5
+MASTERDIR=	${.CURDIR}/../rsyslog5-devel
 
 MNAME=	gssapi
 
diff --git a/sysutils/rsyslog5-devel-mysql/Makefile b/sysutils/rsyslog5-devel-mysql/Makefile
index b40cac1b4073..9c076c0a40c7 100644
--- a/sysutils/rsyslog5-devel-mysql/Makefile
+++ b/sysutils/rsyslog5-devel-mysql/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	MySQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog5
+MASTERDIR=	${.CURDIR}/../rsyslog5-devel
 
 MNAME=	mysql
 USE_MYSQL=	yes
diff --git a/sysutils/rsyslog5-devel-pgsql/Makefile b/sysutils/rsyslog5-devel-pgsql/Makefile
index 1d867ee4c3b7..2554c93cb431 100644
--- a/sysutils/rsyslog5-devel-pgsql/Makefile
+++ b/sysutils/rsyslog5-devel-pgsql/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	PostgreSQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog5
+MASTERDIR=	${.CURDIR}/../rsyslog5-devel
 
 MNAME=	pgsql
 USE_PGSQL=	yes
diff --git a/sysutils/rsyslog5-devel-relp/Makefile b/sysutils/rsyslog5-devel-relp/Makefile
index 097271146148..95980c80cd5e 100644
--- a/sysutils/rsyslog5-devel-relp/Makefile
+++ b/sysutils/rsyslog5-devel-relp/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RELP input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog5
+MASTERDIR=	${.CURDIR}/../rsyslog5-devel
 
 MNAME=	relp
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
diff --git a/sysutils/rsyslog5-devel-rfc3195/Makefile b/sysutils/rsyslog5-devel-rfc3195/Makefile
index bff68245ad1c..b33beebd58c5 100644
--- a/sysutils/rsyslog5-devel-rfc3195/Makefile
+++ b/sysutils/rsyslog5-devel-rfc3195/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RFC3195 input support for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog5
+MASTERDIR=	${.CURDIR}/../rsyslog5-devel
 
 MNAME=	rfc3195
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
diff --git a/sysutils/rsyslog5-devel-snmp/Makefile b/sysutils/rsyslog5-devel-snmp/Makefile
index f6a0e253d532..d66ab2d84de1 100644
--- a/sysutils/rsyslog5-devel-snmp/Makefile
+++ b/sysutils/rsyslog5-devel-snmp/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	SNMP trap sender for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog5
+MASTERDIR=	${.CURDIR}/../rsyslog5-devel
 
 MNAME=	snmp
 LIB_DEPENDS=	netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp
diff --git a/sysutils/rsyslog5-devel/Makefile b/sysutils/rsyslog5-devel/Makefile
index 579f300449dd..655005a2fd5c 100644
--- a/sysutils/rsyslog5-devel/Makefile
+++ b/sysutils/rsyslog5-devel/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	5.4.0
-PORTREVISION=	1
+PORTVERSION=	5.7.0
 CATEGORIES=	sysutils
-MASTER_SITES=	http://download.rsyslog.com/rsyslog/
+MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 .ifdef MNAME
 PKGNAMESUFFIX?=	-${MNAME}
 .endif
@@ -76,8 +75,8 @@ IGNORE=	with gssapi module is only supported on FreeBSD 7.x or later
 
 CONFIGURE_ARGS+=	--disable-rsyslogd --disable-klog
 
-DESCR?=		${.CURDIR}/../rsyslog5/pkg-descr
-MD5_FILE?=	${.CURDIR}/../rsyslog5/distinfo
+DESCR?=		${.CURDIR}/../rsyslog5-devel/pkg-descr
+MD5_FILE?=	${.CURDIR}/../rsyslog5-devel/distinfo
 .endif
 
 .if ${OSVERSION} < 700042
diff --git a/sysutils/rsyslog5-devel/distinfo b/sysutils/rsyslog5-devel/distinfo
index a4527494eeae..c703c6ee17b9 100644
--- a/sysutils/rsyslog5-devel/distinfo
+++ b/sysutils/rsyslog5-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (rsyslog-5.4.0.tar.gz) = 291882229d50496f42bd63174076dd37
-SHA256 (rsyslog-5.4.0.tar.gz) = d9cd21d2fcd45fcae65eb0a51927c40315cca02afdc62478abd950febfcf7228
-SIZE (rsyslog-5.4.0.tar.gz) = 2124201
+MD5 (rsyslog-5.7.0.tar.gz) = 6f73e1dc8be7c3702283137ef7b88671
+SHA256 (rsyslog-5.7.0.tar.gz) = aec838f402dc74d8d087468556e36d1c7e67e179b6247431aeeee8ee815898f7
+SIZE (rsyslog-5.7.0.tar.gz) = 2271241
diff --git a/sysutils/rsyslog5-devel/pkg-plist b/sysutils/rsyslog5-devel/pkg-plist
index 4120023c3fba..ccf5c5bb39c8 100644
--- a/sysutils/rsyslog5-devel/pkg-plist
+++ b/sysutils/rsyslog5-devel/pkg-plist
@@ -51,8 +51,11 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/imfile.html
 %%PORTDOCS%%%%DOCSDIR%%/imgssapi.html
 %%PORTDOCS%%%%DOCSDIR%%/imklog.html
+%%PORTDOCS%%%%DOCSDIR%%/impstats.html
+%%PORTDOCS%%%%DOCSDIR%%/imptcp.html
 %%PORTDOCS%%%%DOCSDIR%%/imrelp.html
 %%PORTDOCS%%%%DOCSDIR%%/imtcp.html
+%%PORTDOCS%%%%DOCSDIR%%/imsolaris.html
 %%PORTDOCS%%%%DOCSDIR%%/imuxsock.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install.html
@@ -70,10 +73,12 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/ommysql.html
 %%PORTDOCS%%%%DOCSDIR%%/omoracle.html
 %%PORTDOCS%%%%DOCSDIR%%/omrelp.html
+%%PORTDOCS%%%%DOCSDIR%%/omruleset.html
 %%PORTDOCS%%%%DOCSDIR%%/omsnmp.html
 %%PORTDOCS%%%%DOCSDIR%%/omstdout.html
 %%PORTDOCS%%%%DOCSDIR%%/omudpspoof.html
-%%PORTDOCS%%%%DOCSDIR%%/professional_support.html
+%%PORTDOCS%%%%DOCSDIR%%/omuxsock.html
+%%PORTDOCS%%%%DOCSDIR%%/pmlastmsg.html
 %%PORTDOCS%%%%DOCSDIR%%/property_replacer.html
 %%PORTDOCS%%%%DOCSDIR%%/queueWorkerLogic.jpg
 %%PORTDOCS%%%%DOCSDIR%%/queueWorkerLogic_small.jpg
@@ -93,6 +98,7 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_dropmsgswithmaliciousdnsptrrecords.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_droptrailinglfonreception.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_dynafilecachesize.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_escape8bitcharsonreceive.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_escapecontrolcharactersonreceive.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_failonchownfailure.html
 %%PORTDOCS%%%%DOCSDIR%%/rsconf1_filecreatemode.html