Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Oct 2013 11:06:16 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r332222 - in head: graphics/GraphicsMagick graphics/GraphicsMagick12 graphics/GraphicsMagick13 math/qhull math/qhull5 textproc/xhtml-11 www/links www/links1
Message-ID:  <201310311106.r9VB6GIp049518@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu Oct 31 11:06:16 2013
New Revision: 332222
URL: http://svnweb.freebsd.org/changeset/ports/332222

Log:
  Fix pkgname collision
  
  With hat:	portmgr

Modified:
  head/graphics/GraphicsMagick/Makefile
  head/graphics/GraphicsMagick12/Makefile
  head/graphics/GraphicsMagick13/Makefile
  head/math/qhull/Makefile
  head/math/qhull5/Makefile
  head/textproc/xhtml-11/Makefile
  head/www/links/Makefile
  head/www/links1/Makefile

Modified: head/graphics/GraphicsMagick/Makefile
==============================================================================
--- head/graphics/GraphicsMagick/Makefile	Thu Oct 31 11:04:50 2013	(r332221)
+++ head/graphics/GraphicsMagick/Makefile	Thu Oct 31 11:06:16 2013	(r332222)
@@ -13,7 +13,7 @@ PORTSCOUT=	limit:^1\.1\.
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Fast image processing tools based on ImageMagick
 
-CONFLICTS=	GraphicsMagick-1.[23].*
+CONFLICTS=	GraphicsMagick-1.[23].* GraphicsMagick1[23]-*
 
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2	\
 		fpx.[2-9]:${PORTSDIR}/graphics/libfpx	\

Modified: head/graphics/GraphicsMagick12/Makefile
==============================================================================
--- head/graphics/GraphicsMagick12/Makefile	Thu Oct 31 11:04:50 2013	(r332221)
+++ head/graphics/GraphicsMagick12/Makefile	Thu Oct 31 11:06:16 2013	(r332222)
@@ -8,11 +8,12 @@ CATEGORIES=	graphics
 MASTER_SITES=	SF \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.2/
 PORTSCOUT=	limit:^1\.2\.
+PKGNAMESUFFIX=	12
 
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Fast image processing tools based on ImageMagick
 
-CONFLICTS=	GraphicsMagick-1.[13].*
+CONFLICTS=	GraphicsMagick-1.[13].* GraphicsMagick13-*
 
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2	\
 		png15:${PORTSDIR}/graphics/png		\
@@ -37,7 +38,6 @@ USE_AUTOTOOLS=	libtool libltdl
 USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
-LATEST_LINK=	GraphicsMagick12
 
 MAN1=	GraphicsMagick++-config.1 \
 	GraphicsMagick-config.1 \

Modified: head/graphics/GraphicsMagick13/Makefile
==============================================================================
--- head/graphics/GraphicsMagick13/Makefile	Thu Oct 31 11:04:50 2013	(r332221)
+++ head/graphics/GraphicsMagick13/Makefile	Thu Oct 31 11:06:16 2013	(r332222)
@@ -9,11 +9,12 @@ MASTER_SITES=	SF \
 		ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
 MASTER_SITE_SUBDIR=	${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION}
 PORTSCOUT=	limit:^1\.3\.
+PKGNAMESUFFIX=	12
 
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Fast image processing tools based on ImageMagick
 
-CONFLICTS=	GraphicsMagick-1.[12].*
+CONFLICTS=	GraphicsMagick-1.[12].* GraphicsMagick12-*
 
 LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2	\
 		png15:${PORTSDIR}/graphics/png		\
@@ -39,8 +40,6 @@ USE_BZIP2=	yes
 USE_GHOSTSCRIPT=yes
 GNU_CONFIGURE=	yes
 
-LATEST_LINK=	GraphicsMagick13
-
 MAN1=	GraphicsMagick++-config.1 \
 	GraphicsMagick-config.1 \
 	GraphicsMagickWand-config.1 \

Modified: head/math/qhull/Makefile
==============================================================================
--- head/math/qhull/Makefile	Thu Oct 31 11:04:50 2013	(r332221)
+++ head/math/qhull/Makefile	Thu Oct 31 11:06:16 2013	(r332222)
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 
 MAN1=	qhull.1 rbox.1
 
-CONFLICTS=	qhull-1.0* afni-[0-9]*
+CONFLICTS=	qhull-1.0* afni-[0-9]* qhull5-*
 
 NO_STAGE=	yes
 post-patch:

Modified: head/math/qhull5/Makefile
==============================================================================
--- head/math/qhull5/Makefile	Thu Oct 31 11:04:50 2013	(r332221)
+++ head/math/qhull5/Makefile	Thu Oct 31 11:06:16 2013	(r332222)
@@ -7,6 +7,7 @@ PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://www.qhull.org/download/
 DISTNAME=	${PORTNAME}-2003.1
+PKGNAMESUFFIX=	5
 
 PATCH_SITES=		http://www.qhull.org/download/
 PATCHFILES=		poly.c-qh_gethash.patch
@@ -15,7 +16,6 @@ PATCH_DIST_STRIP=	-p2
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Qhull computes convex hulls, Delaunay triangulations, and halfspaces
 
-LATEST_LINK=	qhull5
 CONFLICTS=	qhull-2011* afni-[0-9]*
 
 USE_AUTOTOOLS=	libtool

Modified: head/textproc/xhtml-11/Makefile
==============================================================================
--- head/textproc/xhtml-11/Makefile	Thu Oct 31 11:04:50 2013	(r332221)
+++ head/textproc/xhtml-11/Makefile	Thu Oct 31 11:06:16 2013	(r332222)
@@ -7,6 +7,7 @@ PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.w3.org/TR/2007/WD-xhtml11-${RECDATE}/
 DISTNAME=	xhtml11
+PKGNAMESUFFIX=	-11
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gabor@FreeBSD.org
@@ -16,7 +17,6 @@ RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/te
 
 RECDATE=	20070216
 
-LATEST_LINK=	xhtml-11
 WRKSRC=		${WRKDIR}/xhtml11-${RECDATE}
 NO_BUILD=	yes
 PLIST_SUB+=	XMLCAT_ADD="${XMLCAT_ADD}" \

Modified: head/www/links/Makefile
==============================================================================
--- head/www/links/Makefile	Thu Oct 31 11:04:50 2013	(r332221)
+++ head/www/links/Makefile	Thu Oct 31 11:06:16 2013	(r332222)
@@ -12,7 +12,7 @@ COMMENT=	Lynx-like text WWW browser
 
 LICENSE=	GPLv2
 
-CONFLICTS=	links-0* links-hacked-[0-9]*
+CONFLICTS=	links-0* links-hacked-[0-9]* links1-*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-ssl --without-pmshell --without-atheos \

Modified: head/www/links1/Makefile
==============================================================================
--- head/www/links1/Makefile	Thu Oct 31 11:04:50 2013	(r332221)
+++ head/www/links1/Makefile	Thu Oct 31 11:06:16 2013	(r332222)
@@ -6,6 +6,7 @@ PORTVERSION=	1.03
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.jikos.cz/~mikulas/links/download/
+PKGNAMESUFFIX=	1
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Lynx-like text WWW browser
@@ -13,7 +14,6 @@ COMMENT=	Lynx-like text WWW browser
 GNU_CONFIGURE=	yes
 
 USE_OPENSSL=	yes
-NO_LATEST_LINK=	yes
 CONFLICTS=	links-2*
 
 MAN1=		links.1



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310311106.r9VB6GIp049518>