Fix package name collision

15 files changed, 15 insertions, 16 deletions

diff --git a/chinese/phpbb3-tw/Makefile b/chinese/phpbb3-tw/Makefile
index d791a28eddca..cf36200fa491 100644
--- a/chinese/phpbb3-tw/Makefile
+++ b/chinese/phpbb3-tw/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	3.0.11
 CATEGORIES=	chinese www
 MASTER_SITES=	http://www.phpbb-tw.net/phpbb/download/ \
 		http://freebsd.ee.ccu.edu.tw/phpBB/
-PKGNAMESUFFIX=	-tw
+PKGNAMESUFFIX=	3-tw
 DISTNAME=	phpBB-${PORTVERSION}
 
 MAINTAINER=	appleboy.tw@gmail.com
diff --git a/databases/adodb5/Makefile b/databases/adodb5/Makefile
index 7a470688533b..26d7430df676 100644
--- a/databases/adodb5/Makefile
+++ b/databases/adodb5/Makefile
@@ -6,6 +6,7 @@ DISTVERSION=	5.18
 CATEGORIES=	databases www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-php5-only/${PORTNAME}-${DISTVERSION:S/.//g}-for-php5
 DISTNAME=	${PORTNAME:S/5//}${DISTVERSION:S/.//g}a
+PKGNAMESUFFIX=	5
 
 MAINTAINER=	joehorn@gmail.com
 COMMENT=	Database library for PHP
@@ -13,7 +14,6 @@ COMMENT=	Database library for PHP
 LICENSE=	BSD
 
 CONFLICTS=	adodb-4.*
-LATEST_LINK=	adodb5
 
 USE_ZIP=	yes
 USE_PHP=	pcre
diff --git a/databases/mysql++1/Makefile b/databases/mysql++1/Makefile
index 7d427fbd8f3b..b902a9760bfc 100644
--- a/databases/mysql++1/Makefile
+++ b/databases/mysql++1/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.7.40
 PORTREVISION=	2
 CATEGORIES=	databases devel
 MASTER_SITES=	http://tangentsoft.net/mysql++/releases/
-PKGNAMESUFFIX=	-mysql${MYSQL_VER}
+PKGNAMESUFFIX=	1-mysql${MYSQL_VER}
 
 MAINTAINER=	sergey@network-asp.biz
 COMMENT=	Complex C++ API for MySQL${MYSQL_VER}
@@ -19,7 +19,6 @@ CONFIGURE_ARGS=	--with-mysql=${LOCALBASE} \
 USE_LDCONFIG=	yes
 
 CONFLICTS=	${PORTNAME}*-2.*
-NO_LATEST_LINK=	yes
 
 NO_STAGE=	yes
 post-install:
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index e81515547682..6c096ce8adba 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -8,6 +8,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	ade/gnu
 DISTNAME=	autoconf-000227
+PKGNAMESUFFIX=	213
 
 # note: before committing to this port, contact portmgr to arrange for an
 # experimental ports run.  Untested commits may be backed out at portmgr's
@@ -21,7 +22,6 @@ RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 
 BUILD_VERSION=	2.13
 PLIST_SUB=	BUILD_VERSION=${BUILD_VERSION}
-LATEST_LINK=	autoconf213
 USE_BZIP2=	yes
 USES=		perl5
 GNU_CONFIGURE=	yes
diff --git a/devel/gitolite2/Makefile b/devel/gitolite2/Makefile
index 9fac28fb7b6e..72f34a528dfe 100644
--- a/devel/gitolite2/Makefile
+++ b/devel/gitolite2/Makefile
@@ -5,6 +5,7 @@ PORTVERSION=	2.3.1
 CATEGORIES=	devel
 MASTER_SITES=	http://milki.github.io/${PORTNAME}/ \
 		LOCAL/tdb
+PKGNAMESUFFIX=	2
 
 MAINTAINER=	milki@rescomp.berkeley.edu
 COMMENT=	An access control layer on top of git
diff --git a/devel/llvm33/Makefile b/devel/llvm33/Makefile
index 886f8f77b3ae..c931797ed1b8 100644
--- a/devel/llvm33/Makefile
+++ b/devel/llvm33/Makefile
@@ -6,6 +6,7 @@ PORTREVISION=	4
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
+PKGNAMESUFFIX=	33
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Low Level Virtual Machine
diff --git a/dns/idnkit2/Makefile b/dns/idnkit2/Makefile
index bc3d926b679e..3e654a448468 100644
--- a/dns/idnkit2/Makefile
+++ b/dns/idnkit2/Makefile
@@ -5,6 +5,7 @@ PORTNAME=	idnkit
 PORTVERSION=	2.2
 CATEGORIES=	dns
 MASTER_SITES=	http://jprs.co.jp/idn/
+PKGNAMESUFFIX=	2
 
 MAINTAINER=	fbsd@grid.einherjar.de
 COMMENT=	Internationalized Domain Name toolkit 2
@@ -13,7 +14,6 @@ LICENSE_PERMS=	# permissive
 LICENSE_NAME=	OSCL
 LICENSE_FILE=	LICENSE.txt
 
-LATEST_LINK=	${PORTNAME}${PORTVERSION:R}
 CONFLICTS_INSTALL=	idnkit-1.*
 
 USE_AUTOTOOLS=	libtool
diff --git a/dns/opendnssec13/Makefile b/dns/opendnssec13/Makefile
index 909b77d3f215..408ee4040d9c 100644
--- a/dns/opendnssec13/Makefile
+++ b/dns/opendnssec13/Makefile
@@ -5,6 +5,7 @@ PORTNAME=	opendnssec
 PORTVERSION=	1.3.15
 CATEGORIES=	dns
 MASTER_SITES=	http://dist.opendnssec.org/source/
+PKGNAMESUFFIX=	13
 
 MAINTAINER=	jaap@NLnetLabs.nl
 COMMENT=	Tool suite for maintaining DNSSEC
@@ -12,8 +13,6 @@ COMMENT=	Tool suite for maintaining DNSSEC
 BUILD_DEPENDS=	ldns>=1.6.16:${PORTSDIR}/dns/ldns
 LIB_DEPENDS=	libldns.so:${PORTSDIR}/dns/ldns
 
-LATEST_LINK=	${PORTNAME}13
-
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	opendnssec
 USE_GNOME=	libxml2
diff --git a/java/eclipse-aptana2/Makefile b/java/eclipse-aptana2/Makefile
index 5ded4b4c48b1..ff91b4f63f20 100644
--- a/java/eclipse-aptana2/Makefile
+++ b/java/eclipse-aptana2/Makefile
@@ -7,6 +7,7 @@ PORTVERSION=	2.0.5.1278522500
 CATEGORIES=	java devel
 MASTER_SITES=	http://nivi.interfree.it/distfiles/eclipse-aptana2/
 PKGNAMEPREFIX=	eclipse-
+PKGNAMESUFFIX=	2
 DISTNAME=	com.aptana.ide.feature.studio-${PORTVERSION}-5-7857HJ97CFF61HN1HZHtem5tN7
 
 MAINTAINER=	nivit@FreeBSD.org
@@ -18,8 +19,6 @@ CONFLICTS_INSTALL=	eclipse-aptana-1*
 
 JAVA_VERSION=	1.6+
 
-LATEST_LINK?=	${PKGNAMEPREFIX}aptana2
-
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
diff --git a/lang/clang33/Makefile b/lang/clang33/Makefile
index 758c6f17afc4..f68e2dbc543a 100644
--- a/lang/clang33/Makefile
+++ b/lang/clang33/Makefile
@@ -5,6 +5,7 @@ DISTVERSION=	3.3
 PORTREVISION=	1
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
+PKGNAMESUFFIX=	33
 DISTNAME=	${CLANG_NAME}
 DISTFILES=	${CLANG_SOURCE} \
 		${LLVM_SOURCE}
diff --git a/mail/wanderlust-devel/Makefile b/mail/wanderlust-devel/Makefile
index 3e19f34afdc5..bc7007447d54 100644
--- a/mail/wanderlust-devel/Makefile
+++ b/mail/wanderlust-devel/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.jpl.org/ftp/pub/github-snapshots/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nobutaka
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+PKGNAMESUFFIX=	-devel-${EMACS_PORT_NAME}
 DISTNAME=	wanderlust-${SNAPDATE}${SNAPTIME}
 
 MAINTAINER=	nobutaka@FreeBSD.org
diff --git a/net-p2p/libtorrent-rasterbar-15/Makefile b/net-p2p/libtorrent-rasterbar-15/Makefile
index 88276f2098c9..19085cb9b9bb 100644
--- a/net-p2p/libtorrent-rasterbar-15/Makefile
+++ b/net-p2p/libtorrent-rasterbar-15/Makefile
@@ -6,6 +6,7 @@ PORTREVISION?=	4
 CATEGORIES?=	net-p2p ipv6
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	libtorrent
+PKGNAMESUFFIX=	-15
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	C++ library implementing a BitTorrent client
@@ -15,8 +16,6 @@ BROKEN=		Does not build with recent boost
 
 CONFLICTS+=	libtorrent-rasterbar-0.1[46789].*
 
-NO_LATEST_LINK=	yes
-
 BUILD_DEPENDS=	pkgconf>0:${PORTSDIR}/devel/pkgconf
 LIB_DEPENDS+=	boost_date_time:${PORTSDIR}/devel/boost-libs \
 		GeoIP.5:${PORTSDIR}/net/GeoIP
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index f0d00b529f66..618dbddef430 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -8,6 +8,7 @@ CATEGORIES=	print editors
 MASTER_SITES=	http://download.tuxfamily.org/bartcoding/FreeBSD/ \
 				${MASTER_SITE_LOCAL}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${SVN_REV}
+PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	coder@tuxfamily.org
 COMMENT=	Comprehensive desktop publishing program
@@ -32,7 +33,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinte
 
 CONFLICTS=	scribus-1.[0-4]*
 
-NO_LATEST_LINK=	yes
 USE_BZIP2=	yes
 USE_QT4=	gui linguist_build moc_build qmake_build rcc_build uic_build xml network
 USE_GNOME=	desktopfileutils libartlgpl2 libxml2
diff --git a/science/minc2/Makefile b/science/minc2/Makefile
index 05456dbef8c9..16076265d28c 100644
--- a/science/minc2/Makefile
+++ b/science/minc2/Makefile
@@ -15,6 +15,7 @@ PORTVERSION=	2.2.00
 PORTREVISION=	1
 CATEGORIES=	science biology
 MASTER_SITES=	http://packages.bic.mni.mcgill.ca/tgz/
+PKGNAMESUFFIX=	2
 
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Medical Imaging NetCDF
@@ -31,7 +32,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CMAKE_ARGS=	-DMINC2_BUILD_SHARED_LIBS:BOOL=YES
 
 CONFLICTS=	minc-1* zh-tk-[0-9]*
-LATEST_LINK=	minc2
 
 NO_STAGE=	yes
 post-install:
diff --git a/textproc/apache-solr3/Makefile b/textproc/apache-solr3/Makefile
index 1a0265de6699..46c3736fb6d3 100644
--- a/textproc/apache-solr3/Makefile
+++ b/textproc/apache-solr3/Makefile
@@ -7,6 +7,7 @@ CATEGORIES=	textproc java
 MASTER_SITES=	APACHE
 MASTER_SITE_SUBDIR=	lucene/solr/${PORTVERSION}/
 EXTRACT_SUFX=	.tgz
+PKGNAMESUFFIX=	3
 
 MAINTAINER=	gaod@hychen.org
 COMMENT=	High performance search server built using Lucene Java
@@ -15,7 +16,6 @@ LICENSE=	AL2
 
 CONFLICT=	apache-solr-4.1.*
 
-NO_LATEST_LINK=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"