From 9708877378ca60ab80ea05c0a9df12c2a520f898 Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Thu, 3 Jun 2010 09:35:56 +0000
Subject: - add CONFLICTS PR:		147418

---
 graphics/gd/Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'graphics/gd/Makefile')

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 1dbdc85a1396..13f884d423e5 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -21,6 +21,8 @@ LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png.6:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2
 
+CONFLICTS=	bazaar-1.*
+
 USE_BZIP2=	yes
 SCRIPTDIR=	${FILESDIR}
 MAKE_ENV=	WRKSRC="${WRKSRC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-- 
cgit v1.2.3