9 files changed, 14 insertions, 19 deletions

diff --git a/www/cakephp11/Makefile b/www/cakephp11/Makefile
index 970528e8891e..a70609b058c8 100644
--- a/www/cakephp11/Makefile
+++ b/www/cakephp11/Makefile
@@ -7,19 +7,18 @@ PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/ \
 		LOCAL/glarkin
+PKGNAMESUFFIX=	11
 DISTNAME=	cake_${PORTVERSION}
 
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	A framework for developing PHP web applications
 
-LATEST_LINK=	cakephp11
-
 USE_BZIP2=	yes
 
 USE_APACHE_RUN=	22+
 SLAVE_PORT_MODULES=	REWRITE
 
-CONFLICTS=	cakephp-1.[23].* cakephp-2.*
+CONFLICTS=	cakephp-1[23]-* cakephp-2?-.* cakephp-2.3.*
 NO_BUILD=	yes
 
 USE_PHP=	pcre session
diff --git a/www/cakephp12/Makefile b/www/cakephp12/Makefile
index 7164e6272926..52c42120d4a1 100644
--- a/www/cakephp12/Makefile
+++ b/www/cakephp12/Makefile
@@ -6,13 +6,12 @@ PORTVERSION=	1.2.10
 CATEGORIES=	www
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/tarball/${PORTVERSION}/ \
 		LOCAL/glarkin
+PKGNAMESUFFIX=	12
 DISTNAME=	${PORTNAME}-${PORTNAME}-${PORTVERSION}-${GITVERSION}
 
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	A framework for developing PHP web applications
 
-LATEST_LINK=	cakephp12
-
 GITVERSION=	0-ge6e50e8
 FETCH_ARGS=	-pRr
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-da67eb8
@@ -21,7 +20,7 @@ PORTDOCS=	README
 
 SLAVE_PORT_MODULES=	REWRITE
 
-CONFLICTS=	cakephp-1.[13].* cakephp-2.*
+CONFLICTS=	cakephp-1[13]-* cakephp-2?-.* cakephp-2.3.*
 
 NO_BUILD=	yes
 USES=		gettext
diff --git a/www/cakephp13/Makefile b/www/cakephp13/Makefile
index 6b28cf9d03dc..8df08075738d 100644
--- a/www/cakephp13/Makefile
+++ b/www/cakephp13/Makefile
@@ -20,7 +20,7 @@ PORTDOCS=	README
 
 SLAVE_PORT_MODULES=	REWRITE
 
-CONFLICTS=	cakephp-1.[12].* cakephp-2.*
+CONFLICTS=	cakephp-1[12]-* cakephp-2?-.* cakephp-2.3.*
 
 NO_BUILD=	yes
 USES=		gettext
diff --git a/www/cakephp21/Makefile b/www/cakephp21/Makefile
index 498e5102cdb4..14d8caabc97c 100644
--- a/www/cakephp21/Makefile
+++ b/www/cakephp21/Makefile
@@ -21,7 +21,7 @@ PORTDOCS=	README
 
 SLAVE_PORT_MODULES=	REWRITE
 
-CONFLICTS=	cakephp-1.* cakephp-2.[23].*
+CONFLICTS=	cakephp-1?-* cakephp-2[2]-.* cakephp-2.3.*
 
 NO_BUILD=	yes
 USES=		gettext
diff --git a/www/cakephp22/Makefile b/www/cakephp22/Makefile
index 833e2f0b2af1..01f5efcd2603 100644
--- a/www/cakephp22/Makefile
+++ b/www/cakephp22/Makefile
@@ -4,12 +4,11 @@
 PORTNAME=	cakephp
 PORTVERSION=	2.2.7
 CATEGORIES=	www
+PKGNAMESUFFIX=	22
 
 MAINTAINER=	pphillips@experts-exchange.com
 COMMENT=	A framework for developing PHP web applications
 
-LATEST_LINK=	cakephp22
-
 LICENSE=	MIT
 
 USE_GITHUB=	yes
@@ -20,7 +19,7 @@ PORTDOCS=	README.md
 
 SLAVE_PORT_MODULES=	REWRITE
 
-CONFLICTS=	cakephp-1.* cakephp-2.[13].*
+CONFLICTS=	cakephp-1?-* cakephp-2[1]-.* cakephp-2.3.*
 
 NO_BUILD=	yes
 USES=		gettext
diff --git a/www/cakephp23/Makefile b/www/cakephp23/Makefile
index 195c1cdccc79..da9ac44e7ffc 100644
--- a/www/cakephp23/Makefile
+++ b/www/cakephp23/Makefile
@@ -18,7 +18,7 @@ PORTDOCS=	README.md
 
 SLAVE_PORT_MODULES=	REWRITE
 
-CONFLICTS=	cakephp-1.* cakephp-2.[12].*
+CONFLICTS=	cakephp-1?-* cakephp-2[12]-.*
 
 NO_BUILD=	yes
 USES=		gettext
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 771bb15820b8..e77f47518d41 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -114,7 +114,7 @@ COMMENT=	HTTP Caching Proxy
 
 SQUID_STABLE_VER=	9
 
-CONFLICTS_INSTALL=	squid-2.[^7]* squid-3.* cacheboy-[0-9]* lusca-head-[0-9]*
+CONFLICTS_INSTALL=	squid-2.[^7]* squid3?-* cacheboy-[0-9]* lusca-head-[0-9]*
 USES=		perl5
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
diff --git a/www/squid32/Makefile b/www/squid32/Makefile
index 1a85717561ab..0990bd36adfc 100644
--- a/www/squid32/Makefile
+++ b/www/squid32/Makefile
@@ -21,6 +21,7 @@ MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		http://www1.za.squid-cache.org/Versions/v3/3.2/
 MASTER_SITE_SUBDIR=	squid
 DIST_SUBDIR=	squid3.2
+PKGNAMESUFFIX=	32
 
 PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
 		http://www2.us.squid-cache.org/%SUBDIR%/ \
@@ -39,11 +40,9 @@ COMMENT=	HTTP Caching Proxy
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LATEST_LINK=	squid32
-
 SQUID_STABLE_VER=	13
 
-CONFLICTS_INSTALL=	squid-2.[0-9].* squid-3.[!2].* cacheboy-[0-9]* lusca-head-[0-9]*
+CONFLICTS_INSTALL=	squid-2.[0-9].* squid33-* cacheboy-[0-9]* lusca-head-[0-9]*
 USES=		perl5
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
diff --git a/www/squid33/Makefile b/www/squid33/Makefile
index 2663b6bb97e9..6f25fe060462 100644
--- a/www/squid33/Makefile
+++ b/www/squid33/Makefile
@@ -21,6 +21,7 @@ MASTER_SITES=	ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
 		http://www1.za.squid-cache.org/Versions/v3/${PORTVERSION:R}/
 MASTER_SITE_SUBDIR=	squid
 DIST_SUBDIR=	squid3.3
+PKGNAMESUFFIX=	33
 
 PATCH_SITES=	http://www.squid-cache.org/%SUBDIR%/ \
 		http://www2.us.squid-cache.org/%SUBDIR%/ \
@@ -39,11 +40,9 @@ COMMENT=	HTTP Caching Proxy
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LATEST_LINK=	squid33
-
 SQUID_STABLE_VER=	11
 
-CONFLICTS_INSTALL=	squid-2.[0-9].* squid-3.[!3].* cacheboy-[0-9]* lusca-head-[0-9]*
+CONFLICTS_INSTALL=	squid-2.[0-9].* squid32-* cacheboy-[0-9]* lusca-head-[0-9]*
 USES=		perl5
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes