RSYSLOG OVERHAUL: Part 10

- Update to 6.1.0

PR:             ports/151021

11 files changed, 23 insertions, 19 deletions

diff --git a/sysutils/rsyslog6-devel-dbi/Makefile b/sysutils/rsyslog6-devel-dbi/Makefile
index b6793ea85025..a4fa985311e7 100644
--- a/sysutils/rsyslog6-devel-dbi/Makefile
+++ b/sysutils/rsyslog6-devel-dbi/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 COMMENT=	LibDBI output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog55
+MASTERDIR=	${.CURDIR}/../rsyslog6-devel
 
 MNAME=	libdbi
 LIB_DEPENDS=	dbi.0:${PORTSDIR}/databases/libdbi
diff --git a/sysutils/rsyslog6-devel-gnutls/Makefile b/sysutils/rsyslog6-devel-gnutls/Makefile
index 2147765a7f63..d7e37481e09a 100644
--- a/sysutils/rsyslog6-devel-gnutls/Makefile
+++ b/sysutils/rsyslog6-devel-gnutls/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	GNUTLS module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog55
+MASTERDIR=	${.CURDIR}/../rsyslog6-devel
 
 MNAME=	gnutls
 LIB_DEPENDS+=	gnutls.40:${PORTSDIR}/security/gnutls
diff --git a/sysutils/rsyslog6-devel-gssapi/Makefile b/sysutils/rsyslog6-devel-gssapi/Makefile
index 99a5b391fb44..7df33e87c6f9 100644
--- a/sysutils/rsyslog6-devel-gssapi/Makefile
+++ b/sysutils/rsyslog6-devel-gssapi/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	GSS API input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog55
+MASTERDIR=	${.CURDIR}/../rsyslog6-devel
 
 MNAME=	gssapi
 
diff --git a/sysutils/rsyslog6-devel-mysql/Makefile b/sysutils/rsyslog6-devel-mysql/Makefile
index a9ef36d84619..bd2703133282 100644
--- a/sysutils/rsyslog6-devel-mysql/Makefile
+++ b/sysutils/rsyslog6-devel-mysql/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	MySQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog55
+MASTERDIR=	${.CURDIR}/../rsyslog6-devel
 
 MNAME=	mysql
 USE_MYSQL=	yes
diff --git a/sysutils/rsyslog6-devel-pgsql/Makefile b/sysutils/rsyslog6-devel-pgsql/Makefile
index afb21f5d586d..f7051f20d205 100644
--- a/sysutils/rsyslog6-devel-pgsql/Makefile
+++ b/sysutils/rsyslog6-devel-pgsql/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	PostgreSQL output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog55
+MASTERDIR=	${.CURDIR}/../rsyslog6-devel
 
 MNAME=	pgsql
 USE_PGSQL=	yes
diff --git a/sysutils/rsyslog6-devel-relp/Makefile b/sysutils/rsyslog6-devel-relp/Makefile
index 7d4718ceb295..80743442e24f 100644
--- a/sysutils/rsyslog6-devel-relp/Makefile
+++ b/sysutils/rsyslog6-devel-relp/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RELP input/output module for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog55
+MASTERDIR=	${.CURDIR}/../rsyslog6-devel
 
 MNAME=	relp
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
diff --git a/sysutils/rsyslog6-devel-rfc3195/Makefile b/sysutils/rsyslog6-devel-rfc3195/Makefile
index f1e63689915f..9b5b72b74caf 100644
--- a/sysutils/rsyslog6-devel-rfc3195/Makefile
+++ b/sysutils/rsyslog6-devel-rfc3195/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	RFC3195 input support for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog55
+MASTERDIR=	${.CURDIR}/../rsyslog6-devel
 
 MNAME=	rfc3195
 BUILD_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkg-config
diff --git a/sysutils/rsyslog6-devel-snmp/Makefile b/sysutils/rsyslog6-devel-snmp/Makefile
index de4a22571650..b181e3b9aeb0 100644
--- a/sysutils/rsyslog6-devel-snmp/Makefile
+++ b/sysutils/rsyslog6-devel-snmp/Makefile
@@ -6,7 +6,7 @@
 #
 
 COMMENT=	SNMP trap sender for rsyslog
-MASTERDIR=	${.CURDIR}/../rsyslog55
+MASTERDIR=	${.CURDIR}/../rsyslog6-devel
 
 MNAME=	snmp
 LIB_DEPENDS=	netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp
diff --git a/sysutils/rsyslog6-devel/Makefile b/sysutils/rsyslog6-devel/Makefile
index 93b60e978359..0f5e3721be5e 100644
--- a/sysutils/rsyslog6-devel/Makefile
+++ b/sysutils/rsyslog6-devel/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: rsyslog4
+# New ports collection makefile for: rsyslog6-devel
 # Date created:     29 December 2008
 # Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 #
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	5.5.5
+PORTVERSION=	6.1.0
 CATEGORIES=	sysutils
-MASTER_SITES=	http://download.rsyslog.com/rsyslog/
+MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 .ifdef MNAME
 PKGNAMESUFFIX?=	-${MNAME}
 .endif
@@ -17,7 +17,7 @@ MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT?=	Syslogd supporting SQL, TCP and TLS
 
 .ifdef MNAME
-RUN_DEPENDS=	rsyslog>=5.5.0:${PORTSDIR}/sysutils/rsyslog55
+RUN_DEPENDS=	rsyslog>=${PORTREVISION}:${PORTSDIR}/sysutils/rsyslog6-devel
 
 PLIST=		${.CURDIR}/pkg-plist
 .endif
@@ -32,7 +32,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-mysql-microseconds
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sane-hostname
 .endif
 
-CONFLICTS=	rsyslog-[!5].[0-9]* rsyslog-5.4.*
+CONFLICTS=	rsyslog-[!6].[0-9]* 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
@@ -86,8 +86,8 @@ IGNORE=	with gssapi module is only supported on FreeBSD 7.x or later
 
 CONFIGURE_ARGS+=	--disable-rsyslogd --disable-klog
 
-DESCR?=		${.CURDIR}/../rsyslog55/pkg-descr
-MD5_FILE?=	${.CURDIR}/../rsyslog55/distinfo
+DESCR?=		${.CURDIR}/../rsyslog6-devel/pkg-descr
+MD5_FILE?=	${.CURDIR}/../rsyslog6-devel/distinfo
 .endif
 
 .if ${OSVERSION} < 700042
diff --git a/sysutils/rsyslog6-devel/distinfo b/sysutils/rsyslog6-devel/distinfo
index bc30986fcd6e..4821effe2f6d 100644
--- a/sysutils/rsyslog6-devel/distinfo
+++ b/sysutils/rsyslog6-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (rsyslog-5.5.5.tar.gz) = bd432dd7307312330962adaecc0d0e0a
-SHA256 (rsyslog-5.5.5.tar.gz) = c434a7272b592fbd2f95bb604f08f9529a51ee8e1ff8dd34c4a693bcfad8f55c
-SIZE (rsyslog-5.5.5.tar.gz) = 2200938
+MD5 (rsyslog-6.1.0.tar.gz) = 9fefe1e486084446ffeff728e53d5001
+SHA256 (rsyslog-6.1.0.tar.gz) = 8511b1a0e2429b44a5450a3b0346595703834ca3169e2dcd16948e2d145c0df3
+SIZE (rsyslog-6.1.0.tar.gz) = 2263513
diff --git a/sysutils/rsyslog6-devel/pkg-plist b/sysutils/rsyslog6-devel/pkg-plist
index 3d534e897482..53811dd3db8f 100644
--- a/sysutils/rsyslog6-devel/pkg-plist
+++ b/sysutils/rsyslog6-devel/pkg-plist
@@ -51,6 +51,7 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/imfile.html
 %%PORTDOCS%%%%DOCSDIR%%/imgssapi.html
 %%PORTDOCS%%%%DOCSDIR%%/imklog.html
+%%PORTDOCS%%%%DOCSDIR%%/imptcp.html
 %%PORTDOCS%%%%DOCSDIR%%/imrelp.html
 %%PORTDOCS%%%%DOCSDIR%%/imsolaris.html
 %%PORTDOCS%%%%DOCSDIR%%/imtcp.html
@@ -71,10 +72,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
@@ -135,6 +138,7 @@ sbin/rsyslogd
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_secure_tls.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_stunnel.html
 %%PORTDOCS%%%%DOCSDIR%%/rsyslog_tls.html
+%%PORTDOCS%%%%DOCSDIR%%/scoping.html
 %%PORTDOCS%%%%DOCSDIR%%/syslog_parsing.html
 %%PORTDOCS%%%%DOCSDIR%%/syslog_protocol.html
 %%PORTDOCS%%%%DOCSDIR%%/tls_cert.jpg