ports/151831: {graphics, japanese, russian, ukrainian}/gd conflict with one another

[TAOKA Fumiyoshi]

>Number:         151831
>Category:       ports
>Synopsis:       {graphics,japanese,russian,ukrainian}/gd conflict with one another
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 30 15:00:22 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     TAOKA Fumiyoshi
>Release:        
>Organization:
>Environment:
>Description:
	Though {graphics,japanese,russian,ukrainian}/gd conflict with
	one another, they are not marked.

	graphics/gd and devel/bazaar have already been marked CONFLICTS.

>How-To-Repeat:
>Fix:

Index: devel/bazaar/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/bazaar/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- devel/bazaar/Makefile	30 Jul 2010 22:14:46 -0000	1.19
+++ devel/bazaar/Makefile	30 Oct 2010 14:29:09 -0000
@@ -22,7 +22,7 @@
 LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29 \
 		gpgme.18:${PORTSDIR}/security/gpgme
 
-CONFLICTS=	gd-2.*
+CONFLICTS=	gd-2.* ja-gd-2.* ru-gd-2.* uk-gd-2.*
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes

Index: graphics/gd/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/gd/Makefile,v
retrieving revision 1.99
diff -u -r1.99 Makefile
--- graphics/gd/Makefile	3 Jun 2010 09:35:56 -0000	1.99
+++ graphics/gd/Makefile	30 Oct 2010 14:30:09 -0000
@@ -21,7 +21,8 @@
 		png.6:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-CONFLICTS=	bazaar-1.*
+CONFLICTS?=	ja-gd-2.* ru-gd-2.* uk-gd-2.*
+CONFLICTS+=	bazaar-1.*
 
 USE_BZIP2=	yes
 SCRIPTDIR=	${FILESDIR}

Index: japanese/gd/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/gd/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- japanese/gd/Makefile	18 Aug 2003 16:15:09 -0000	1.17
+++ japanese/gd/Makefile	30 Oct 2010 14:34:04 -0000
@@ -14,4 +14,6 @@
 
 CPPFLAGS+=	-DJISX0208
 
+CONFLICTS=	gd-2.* ru-gd-2.* uk-gd-2.*
+
 .include "${MASTERDIR}/Makefile"

Index: russian/gd/Makefile
===================================================================
RCS file: /home/ncvs/ports/russian/gd/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- russian/gd/Makefile	4 Jan 2009 10:06:39 -0000	1.16
+++ russian/gd/Makefile	30 Oct 2010 14:32:53 -0000
@@ -15,6 +15,8 @@
 GD_FONTS=	${DISTDIR}/x-koi8u.tgz koi6x10.bdf koi6x13.bdf \
 		koi10x16b.bdf koi9x15.bdf koi10x20.bdf
 
+CONFLICTS=	gd-2.* ja-gd-2.* uk-gd-2.*
+
 .if exists(${.CURDIR}/Makefile.local)
 .include "${.CURDIR}/Makefile.local"
 .endif

Index: ukrainian/gd/Makefile
===================================================================
RCS file: /home/ncvs/ports/ukrainian/gd/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ukrainian/gd/Makefile	18 Aug 2003 16:15:10 -0000	1.4
+++ ukrainian/gd/Makefile	30 Oct 2010 14:33:07 -0000
@@ -15,4 +15,6 @@
 GD_FONTS=	${DISTDIR}/x-koi8u.tgz koi6x10.bdf koi6x13.bdf \
 		koi10x16b.bdf koi9x15.bdf koi10x20.bdf
 
+CONFLICTS=	gd-2.* ja-gd-2.* ru-gd-2.*
+
 .include "${MASTERDIR}/Makefile"

>Release-Note:
>Audit-Trail:
>Unformatted: