Bug 184450 - [PATCH] databases/rrdtool12: Fix pkgname conflict.
Summary: [PATCH] databases/rrdtool12: Fix pkgname conflict.
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Beat Gaetzi
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-02 17:40 UTC by Mathieu Arnold
Modified: 2013-12-05 11:20 UTC (History)
0 users

See Also:


Attachments
rrdtool12-1.2.30_2.patch (549 bytes, patch)
2013-12-02 17:40 UTC, Mathieu Arnold
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Mathieu Arnold freebsd_committer freebsd_triage 2013-12-02 17:40:04 UTC
[DESCRIBE CHANGES]

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-12-02 17:40:31 UTC
Responsible Changed
From-To: freebsd-ports-bugs->beat

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Mathieu Arnold freebsd_committer freebsd_triage 2013-12-05 11:11:01 UTC
State Changed
From-To: open->closed

Committed, thanks!
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-12-05 11:11:07 UTC
Author: mat
Date: Thu Dec  5 11:10:49 2013
New Revision: 335658
URL: http://svnweb.freebsd.org/changeset/ports/335658

Log:
  Fixup pkgnames.
  
  PR:		ports/184440, ports/184441, ports/184442, ports/184443, ports/184444, ports/184445, ports/184446, ports/184447, ports/184448, ports/184449, ports/184450
  Submitted by:	mat
  Approved by:	portmgr (bapt)

Modified:
  head/databases/pgpool-II-22/Makefile
  head/databases/pgpool-II-23/Makefile
  head/databases/pgpool-II-30/Makefile
  head/databases/pgpool-II/Makefile
  head/databases/rrdtool/Makefile
  head/databases/rrdtool10/Makefile
  head/databases/rrdtool12/Makefile
  head/devel/flex-sdk/Makefile
  head/devel/flex-sdk2/Makefile
  head/devel/flex-sdk35/Makefile
  head/devel/msp430-gcc/Makefile
  head/devel/msp430-gcc3/Makefile
  head/mail/postfix-current/Makefile
  head/mail/postfix/Makefile
  head/mail/postfix27/Makefile
  head/mail/postfix28/Makefile
  head/mail/postfix29/Makefile
  head/net/trafshow/Makefile
  head/net/trafshow3/Makefile
  head/www/cakephp11/Makefile
  head/www/cakephp12/Makefile
  head/www/cakephp13/Makefile
  head/www/cakephp21/Makefile
  head/www/cakephp22/Makefile
  head/www/cakephp23/Makefile
  head/www/squid/Makefile
  head/www/squid32/Makefile
  head/www/squid33/Makefile

Modified: head/databases/pgpool-II-22/Makefile
==============================================================================
--- head/databases/pgpool-II-22/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/databases/pgpool-II-22/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -6,6 +6,7 @@ PORTVERSION=	2.2.6
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://pgfoundry.org/frs/download.php/2478/
+PKGNAMESUFFIX=	22
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	A connection pool server for PostgreSQL
@@ -14,9 +15,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PGSQL=	yes
 USE_LDCONFIG=	yes
-NO_LATEST_LINK=	yes
 
-CONFLICTS=	pgpool-3.* pgpool-II-*
+CONFLICTS=	pgpool-3.* pgpool-II-3.* pgpool-II-23-* pgpool-II-30-* 
 USE_RC_SUBR=	pgpool
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp

Modified: head/databases/pgpool-II-23/Makefile
==============================================================================
--- head/databases/pgpool-II-23/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/databases/pgpool-II-23/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -5,6 +5,7 @@ PORTNAME=	pgpool-II
 PORTVERSION=	2.3.3
 CATEGORIES=	databases
 MASTER_SITES=	http://pgfoundry.org/frs/download.php/2664/
+PKGNAMESUFFIX=	23
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	A connection pool server for PostgreSQL
@@ -13,9 +14,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PGSQL=	yes
 USE_LDCONFIG=	yes
-NO_LATEST_LINK=	yes
 
-CONFLICTS=	pgpool-3.* pgpool-II-*
+CONFLICTS=	pgpool-3.* pgpool-II-3.* pgpool-II-22-* pgpool-II-30-* 
 USE_RC_SUBR=	pgpool
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp

Modified: head/databases/pgpool-II-30/Makefile
==============================================================================
--- head/databases/pgpool-II-30/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/databases/pgpool-II-30/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -5,6 +5,7 @@ PORTNAME=	pgpool-II
 PORTVERSION=	3.0.4
 CATEGORIES=	databases
 MASTER_SITES=	http://pgfoundry.org/frs/download.php/3076/
+PKGNAMESUFFIX=	30
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	A connection pool server for PostgreSQL
@@ -15,9 +16,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PGSQL=	yes
 USE_LDCONFIG=	yes
-NO_LATEST_LINK=	yes
 
-CONFLICTS=	pgpool-3.* pgpool-II-2.* pgpool-II-3.1.*
+CONFLICTS=	pgpool-3.* pgpool-II-3.* pgpool-II-22-* pgpool-II-23-* 
 USE_RC_SUBR=	pgpool
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp

Modified: head/databases/pgpool-II/Makefile
==============================================================================
--- head/databases/pgpool-II/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/databases/pgpool-II/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -19,7 +19,7 @@ USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--with-openssl
 
-CONFLICTS=	pgpool-3.* pgpool-II-2.* pgpool-II-3.0.*
+CONFLICTS=	pgpool-3.* pgpool-II-22-* pgpool-II-23-* pgpool-II-23-* 
 USE_RC_SUBR=	pgpool
 
 PORTDOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README README.euc_jp

Modified: head/databases/rrdtool/Makefile
==============================================================================
--- head/databases/rrdtool/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/databases/rrdtool/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/
 		libxml2.so:${PORTSDIR}/textproc/libxml2 \
 		libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango
 
-CONFLICTS=	rrdtool-1.0* rrdtool-1.2*
+CONFLICTS=	rrdtool10-* rrdtool12-*
 
 USE_RC_SUBR=	rrdcached
 USE_AUTOTOOLS=	libtool

Modified: head/databases/rrdtool10/Makefile
==============================================================================
--- head/databases/rrdtool10/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/databases/rrdtool10/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -6,14 +6,14 @@ PORTVERSION=	1.0.50
 PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.0.x/
+PKGNAMESUFFIX=	10
 
 MAINTAINER=	lth@FreeBSD.org
 COMMENT=	Round Robin Database Tools
 
 MAKE_ENV=	PERL=${PERL}
 
-CONFLICTS=	rrdtool-1.2*
-LATEST_LINK=	rrdtool10
+CONFLICTS=	rrdtool12-* rrdtool-1.*
 
 USES=		pkgconfig perl5
 USE_AUTOTOOLS=	libtool

Modified: head/databases/rrdtool12/Makefile
==============================================================================
--- head/databases/rrdtool12/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/databases/rrdtool12/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -6,6 +6,7 @@ PORTVERSION=	1.2.30
 PORTREVISION=	2
 CATEGORIES=	databases graphics
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/
+PKGNAMESUFFIX=	12
 
 MAINTAINER=	beat@FreeBSD.org
 COMMENT=	Round Robin Database Tools v1.2
@@ -14,9 +15,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/prin
 		art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \
 		png15:${PORTSDIR}/graphics/png
 
-LATEST_LINK=	${PORTNAME}12
-
-CONFLICTS=	rrdtool-1.0* rrdtool-1.3*
+CONFLICTS=	rrdtool10-* rrdtool-1.*
 
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes

Modified: head/devel/flex-sdk/Makefile
==============================================================================
--- head/devel/flex-sdk/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/devel/flex-sdk/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -11,7 +11,7 @@ COMMENT=	Adobe Flex SDK
 
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
-CONFLICTS=	ja-flex-sdk-2.* flex-sdk-2.* flex-sdk-3.*
+CONFLICTS=	ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk3-3.*
 USE_ZIP=	YES
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+

Modified: head/devel/flex-sdk2/Makefile
==============================================================================
--- head/devel/flex-sdk2/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/devel/flex-sdk2/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -6,6 +6,7 @@ PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	#
 DISTFILES=	flex_sdk_2_194515.zip
+PKGNAMESUFFIX=	2
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Adobe Flex SDK
@@ -14,8 +15,7 @@ RUN_DEPENDS=	javavm:${PORTSDIR}/java/jav
 
 RESTRICTED=	Need agreement before download
 
-CONFLICTS=	ja-flex-sdk-2.* flex-sdk-3.* flex-sdk-4.*
-NO_LATEST_LINK=	YES
+CONFLICTS=	ja-flex-sdk-2.* flex-sdk3-3.* flex-sdk-4.*
 USE_ZIP=	YES
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+

Modified: head/devel/flex-sdk35/Makefile
==============================================================================
--- head/devel/flex-sdk35/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/devel/flex-sdk35/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -6,14 +6,14 @@ PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	http://fpdownload.adobe.com/pub/flex/sdk/builds/flex3/
 DISTFILES=	flex_sdk_${PORTVERSION}_mpl.zip
+PKGNAMESUFFIX=	3
 
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Adobe Flex SDK
 
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
-CONFLICTS=	ja-flex-sdk-2.* flex-sdk-2.* flex-sdk-4.*
-NO_LATEST_LINK=	YES
+CONFLICTS=	ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk-4.*
 USE_ZIP=	YES
 USE_JAVA=	YES
 JAVA_VERSION=	1.6+

Modified: head/devel/msp430-gcc/Makefile
==============================================================================
--- head/devel/msp430-gcc/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/devel/msp430-gcc/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -33,7 +33,7 @@ LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/
 		libmpfr.so:${PORTSDIR}/math/mpfr \
 		libmpc.so:${PORTSDIR}/math/mpc
 
-CONFLICTS=	msp430-gcc-3.*
+CONFLICTS=	msp430-gcc3-3.*
 
 GCCVERSION=	4.6.3
 LTSVERSION=	20120406

Modified: head/devel/msp430-gcc3/Makefile
==============================================================================
--- head/devel/msp430-gcc3/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/devel/msp430-gcc3/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -10,6 +10,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEWARE} 
 		http://lev.serebryakov.spb.ru/download/msp430/:patches
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTNAME}-${GCCVERSION}
 PKGNAMEPREFIX=	msp430-
+PKGNAMESUFFIX=	3
 DISTFILES=	${PORTNAME}-core-${GCCVERSION}${EXTRACT_SUFX} \
 		${PKGNAMEPREFIX}${PORTNAME}-${GCCVERSION}.${PATCHVERSION}${EXTRACT_SUFX}:patches
 
@@ -24,7 +25,6 @@ RUN_DEPENDS=	${PKGNAMEPREFIX}as:${PORTSD
 		${PKGNAMEPREFIX}ld:${PORTSDIR}/devel/${PKGNAMEPREFIX}binutils
 
 CONFLICTS=	msp430-gcc-4.*
-LATEST_LINK=	${PKGBASE}3
 
 GCCVERSION=	3.4.4
 PATCHVERSION=	20050317

Modified: head/mail/postfix-current/Makefile
==============================================================================
--- head/mail/postfix-current/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/mail/postfix-current/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -22,7 +22,7 @@ LICENSE_NAME=	IBM PUBLIC LICENSE VERSION
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.* postfix-base-2.* \
+CONFLICTS=	courier-0.* postfix-1.* postfix-2.* postfix-base-2.* postfix2[789]-* \
 		sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]*
 
 USERS=		postfix

Modified: head/mail/postfix/Makefile
==============================================================================
--- head/mail/postfix/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/mail/postfix/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -22,7 +22,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 VDAVERSION=	2.10.0
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-9].* postfix-base-2.[0-9].* \
+CONFLICTS=	courier-0.* postfix-1.* postfix2?-* \
 		postfix-current-2.* postfix-current-base-2.* sendmail-8.* \
 		sendmail+*-8.* smail-3.* zmailer-2.* opensmtpd-[0-9]*
 

Modified: head/mail/postfix27/Makefile
==============================================================================
--- head/mail/postfix27/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/mail/postfix27/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.porcupine.org/mi
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
 MASTER_SITE_SUBDIR=	. old related/postfix
 DIST_SUBDIR=	${PORTNAME}
+PKGNAMESUFFIX=	27
 
 MAINTAINER=	sahil@FreeBSD.org
 COMMENT=	Secure alternative to widely-used Sendmail
@@ -22,14 +23,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 VDAVERSION=	2.7.13
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-689].* postfix-base-2.[0-689].* \
+CONFLICTS=	courier-0.* postfix-1.* postfix2[89]-* \
 		postfix-2.10.* postfix-base-2.10.* postfix-current-2.* \
 		postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \
 		smail-3.* zmailer-2.* opensmtpd-[0-9]*
 
 USERS=		postfix
 GROUPS=		mail maildrop postfix
-NO_LATEST_LINK=	yes
 USES=		perl5
 USE_PERL5=	build
 USE_SUBMAKE=	yes
@@ -227,7 +227,7 @@ PLIST_SUB+=	TEST="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MINST_BASE}
-PKGNAMESUFFIX=	-base
+PKGNAMESUFFIX=	27-base
 PREFIX=		/usr
 ETCDIR=		/etc/postfix
 USE_RCORDER=	postfix

Modified: head/mail/postfix28/Makefile
==============================================================================
--- head/mail/postfix28/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/mail/postfix28/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.porcupine.org/mi
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
 MASTER_SITE_SUBDIR=	. old related/postfix
 DIST_SUBDIR=	${PORTNAME}
+PKGNAMESUFFIX=	28
 
 MAINTAINER=	sahil@FreeBSD.org
 COMMENT=	Secure alternative to widely-used Sendmail
@@ -22,13 +23,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 VDAVERSION=	2.8.14
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-79].* postfix-base-2.[0-79].* \
+CONFLICTS=	courier-0.* postfix-1.* postfix2[79]-* \
 		postfix-2.10.* postfix-base-2.10.* postfix-current-2.* \
 		postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \
 		smail-3.* zmailer-2.* opensmtpd-[0-9]*
 
-NO_LATEST_LINK=	yes
-
 USERS=		postfix
 GROUPS=		mail maildrop postfix
 USES=		perl5
@@ -250,7 +249,7 @@ PLIST_SUB+=	TEST="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MINST_BASE}
-PKGNAMESUFFIX=	-base
+PKGNAMESUFFIX=	28-base
 PREFIX=		/usr
 ETCDIR=		/etc/postfix
 USE_RCORDER=	postfix

Modified: head/mail/postfix29/Makefile
==============================================================================
--- head/mail/postfix29/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/mail/postfix29/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.porcupine.org/mi
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,}
 MASTER_SITE_SUBDIR=	. old related/postfix
 DIST_SUBDIR=	${PORTNAME}
+PKGNAMESUFFIX=	29
 
 MAINTAINER=	sahil@FreeBSD.org
 COMMENT=	Secure alternative to widely-used Sendmail
@@ -22,13 +23,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 VDAVERSION=	2.9.6
-CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-8].* postfix-base-2.[0-8].* \
+CONFLICTS=	courier-0.* postfix-1.* postfix2[78]-* \
 		postfix-2.10.* postfix-base-2.10.* postfix-current-2.* \
 		postfix-current-base-2.* sendmail-8.* sendmail+*-8.* \
 		smail-3.* zmailer-2.* opensmtpd-[0-9]*
 
-NO_LATEST_LINK=	yes
-
 USERS=		postfix
 GROUPS=		mail maildrop postfix
 USES=		perl5
@@ -250,7 +249,7 @@ PLIST_SUB+=	TEST="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MINST_BASE}
-PKGNAMESUFFIX=	-base
+PKGNAMESUFFIX=	29-base
 PREFIX=		/usr
 ETCDIR=		/etc/postfix
 USE_RCORDER=	postfix

Modified: head/net/trafshow/Makefile
==============================================================================
--- head/net/trafshow/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/net/trafshow/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -13,6 +13,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	alexey@renatasystems.org
 COMMENT=	Full screen visualization of network traffic
 
+CONFLICTS=	trafshow-4.* trafshow3-*
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"
 ALL_TARGET=	trafshow

Modified: head/net/trafshow3/Makefile
==============================================================================
--- head/net/trafshow3/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/net/trafshow3/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -8,6 +8,7 @@ PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	sem
+PKGNAMESUFFIX=	3
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sem@FreeBSD.org
@@ -15,8 +16,6 @@ COMMENT=	Full screen visualization of ne
 
 CONFLICTS=	trafshow-[45].*
 
-LATEST_LINK=	trafshow3
-
 .if defined(WITH_TRAFSHOW_SLANG) || \
     (exists(${LOCALBASE}/lib/libslang.a) && !defined(WITHOUT_TRAFSHOW_SLANG))
 LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2

Modified: head/www/cakephp11/Makefile
==============================================================================
--- head/www/cakephp11/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/www/cakephp11/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -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

Modified: head/www/cakephp12/Makefile
==============================================================================
--- head/www/cakephp12/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/www/cakephp12/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -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

Modified: head/www/cakephp13/Makefile
==============================================================================
--- head/www/cakephp13/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/www/cakephp13/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -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

Modified: head/www/cakephp21/Makefile
==============================================================================
--- head/www/cakephp21/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/www/cakephp21/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -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

Modified: head/www/cakephp22/Makefile
==============================================================================
--- head/www/cakephp22/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/www/cakephp22/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -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

Modified: head/www/cakephp23/Makefile
==============================================================================
--- head/www/cakephp23/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/www/cakephp23/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -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

Modified: head/www/squid/Makefile
==============================================================================
--- head/www/squid/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/www/squid/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -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

Modified: head/www/squid32/Makefile
==============================================================================
--- head/www/squid32/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/www/squid32/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -21,6 +21,7 @@ MASTER_SITES=	ftp://ftp.squid-cache.org/
 		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

Modified: head/www/squid33/Makefile
==============================================================================
--- head/www/squid33/Makefile	Thu Dec  5 10:04:09 2013	(r335657)
+++ head/www/squid33/Makefile	Thu Dec  5 11:10:49 2013	(r335658)
@@ -21,6 +21,7 @@ MASTER_SITES=	ftp://ftp.squid-cache.org/
 		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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"