9 files changed, 10 insertions, 35 deletions

diff --git a/sysutils/rsyslog6-dbi/Makefile b/sysutils/rsyslog6-dbi/Makefile
index 58e39790dc6c..d5f031aece9a 100644
--- a/sysutils/rsyslog6-dbi/Makefile
+++ b/sysutils/rsyslog6-dbi/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for: rsyslog4-dbi
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
 
 COMMENT=	LibDBI output module for rsyslog
diff --git a/sysutils/rsyslog6-gssapi/Makefile b/sysutils/rsyslog6-gssapi/Makefile
index 9a89370a281d..1c2effde8624 100644
--- a/sysutils/rsyslog6-gssapi/Makefile
+++ b/sysutils/rsyslog6-gssapi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4-gssapi
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
-#
 
 COMMENT=	GSS API input/output module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog6
diff --git a/sysutils/rsyslog6-mysql/Makefile b/sysutils/rsyslog6-mysql/Makefile
index 3a49dccf7df2..9316781b3a0c 100644
--- a/sysutils/rsyslog6-mysql/Makefile
+++ b/sysutils/rsyslog6-mysql/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4-mysql
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
-#
 
 COMMENT=	MySQL output module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog6
diff --git a/sysutils/rsyslog6-pgsql/Makefile b/sysutils/rsyslog6-pgsql/Makefile
index b1976c84abc8..4fa619914640 100644
--- a/sysutils/rsyslog6-pgsql/Makefile
+++ b/sysutils/rsyslog6-pgsql/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4-pgsql
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
-#
 
 COMMENT=	PostgreSQL output module for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog6
diff --git a/sysutils/rsyslog6-rfc3195/Makefile b/sysutils/rsyslog6-rfc3195/Makefile
index b18847ac0770..fb7947f898f1 100644
--- a/sysutils/rsyslog6-rfc3195/Makefile
+++ b/sysutils/rsyslog6-rfc3195/Makefile
@@ -1,7 +1,5 @@
 # Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
 # $FreeBSD$
-#
 
 COMMENT=	RFC3195 input support for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog6
diff --git a/sysutils/rsyslog6-snmp/Makefile b/sysutils/rsyslog6-snmp/Makefile
index 5eaaaff2ff19..4124cc868515 100644
--- a/sysutils/rsyslog6-snmp/Makefile
+++ b/sysutils/rsyslog6-snmp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: rsyslog4-snmp
-# Date created:     29 December 2008
-# Whom:             Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
+# Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
 # $FreeBSD$
-#
 
 COMMENT=	SNMP trap sender for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog6
diff --git a/sysutils/rsyslog6/Makefile b/sysutils/rsyslog6/Makefile
index b928655eab65..99d0e4e61135 100644
--- a/sysutils/rsyslog6/Makefile
+++ b/sysutils/rsyslog6/Makefile
@@ -5,9 +5,7 @@ PORTVERSION=	6.6.0
 PORTREVISION?=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
-.ifdef MNAME
-PKGNAMESUFFIX?=	-${MNAME}
-.endif
+PKGNAMESUFFIX=	6${EXTRASUFFIX}
 
 MAINTAINER=	brd@FreeBSD.org
 COMMENT?=	Syslogd supporting SQL, TCP, and TLS
@@ -26,11 +24,9 @@ LIB_DEPENDS+=	ee:${PORTSDIR}/devel/libee \
 USES=		pkgconfig
 
 .ifdef MNAME
+EXTRASUFFIX=	-${MNAME}
 RUN_DEPENDS=	rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog6
 PLIST=		${.CURDIR}/pkg-plist
-LATEST_LINK=	rsyslog6-${MNAME}
-.else
-LATEST_LINK=	rsyslog6
 .endif
 
 PORTSCOUT=	limit:^6
@@ -43,7 +39,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-mysql-microseconds
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sane-hostname
 .endif
 
-CONFLICTS=	rsyslog-[57].[0-9]*
+CONFLICTS=	rsyslog-[0-9].* ryslog-devel-[0-9]*
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/sysutils/rsyslog7-devel/Makefile b/sysutils/rsyslog7-devel/Makefile
index a57b661643ea..f0467b39055e 100644
--- a/sysutils/rsyslog7-devel/Makefile
+++ b/sysutils/rsyslog7-devel/Makefile
@@ -124,7 +124,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-mysql-microseconds
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sane-hostname
 .endif
 
-CONFLICTS=	rsyslog-[56].[0-9]*
+CONFLICTS=	rsyslog6-* rsyslog-[0-9].*
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/sysutils/rsyslog7/Makefile b/sysutils/rsyslog7/Makefile
index e49838103c11..0a53dead125f 100644
--- a/sysutils/rsyslog7/Makefile
+++ b/sysutils/rsyslog7/Makefile
@@ -127,7 +127,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-mysql-microseconds
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sane-hostname
 .endif
 
-CONFLICTS=	rsyslog-[56].[0-9]*
+CONFLICTS=	rsyslog6-[1-9]* rsyslog-devel-[0-9]*
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib