Index: rsyslog6-dbi/Makefile
===================================================================
--- rsyslog6-dbi/Makefile	(revision 327454)
+++ rsyslog6-dbi/Makefile	(working copy)
@@ -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
Index: rsyslog6-gssapi/Makefile
===================================================================
--- rsyslog6-gssapi/Makefile	(revision 327454)
+++ rsyslog6-gssapi/Makefile	(working copy)
@@ -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
Index: rsyslog6-mysql/Makefile
===================================================================
--- rsyslog6-mysql/Makefile	(revision 327454)
+++ rsyslog6-mysql/Makefile	(working copy)
@@ -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
Index: rsyslog6-pgsql/Makefile
===================================================================
--- rsyslog6-pgsql/Makefile	(revision 327454)
+++ rsyslog6-pgsql/Makefile	(working copy)
@@ -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
Index: rsyslog6-rfc3195/Makefile
===================================================================
--- rsyslog6-rfc3195/Makefile	(revision 327454)
+++ rsyslog6-rfc3195/Makefile	(working copy)
@@ -1,7 +1,5 @@
 # Created by: Cristiano Rolim Pereira <cristianorolim@hotmail.com>
-#
 # $FreeBSD$
-#
 
 COMMENT=	RFC3195 input support for rsyslog
 MASTERDIR=	${.CURDIR}/../rsyslog6
Index: rsyslog6-snmp/Makefile
===================================================================
--- rsyslog6-snmp/Makefile	(revision 327454)
+++ rsyslog6-snmp/Makefile	(working copy)
@@ -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
Index: rsyslog6/Makefile
===================================================================
--- rsyslog6/Makefile	(revision 327454)
+++ rsyslog6/Makefile	(working copy)
@@ -5,9 +5,7 @@
 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 @@
 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-sane-hostname
 .endif
 
-CONFLICTS=	rsyslog-[57].[0-9]*
+CONFLICTS=	rsyslog-[0-9].*
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: rsyslog7/Makefile
===================================================================
--- rsyslog7/Makefile	(revision 327454)
+++ rsyslog7/Makefile	(working copy)
@@ -127,7 +127,7 @@
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sane-hostname
 .endif
 
-CONFLICTS=	rsyslog-[56].[0-9]*
+CONFLICTS=	rsyslog6-[1-9]*
 CFLAGS+=	-I${LOCALBASE}/include
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib