From 9708877378ca60ab80ea05c0a9df12c2a520f898 Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Thu, 3 Jun 2010 09:35:56 +0000 Subject: [PATCH] - add CONFLICTS PR: 147418 --- devel/baz/Makefile | 2 ++ devel/bazaar/Makefile | 2 ++ graphics/gd/Makefile | 2 ++ 3 files changed, 6 insertions(+) diff --git a/devel/baz/Makefile b/devel/baz/Makefile index 4947e8c6b8ea..8d6acf798e86 100644 --- a/devel/baz/Makefile +++ b/devel/baz/Makefile @@ -22,6 +22,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS} LIB_DEPENDS= neon.28:${PORTSDIR}/www/neon28 \ gpgme.18:${PORTSDIR}/security/gpgme +CONFLICTS= gd-2.* + USE_GMAKE= yes USE_GETTEXT= yes USE_PERL5_BUILD=yes diff --git a/devel/bazaar/Makefile b/devel/bazaar/Makefile index 4947e8c6b8ea..8d6acf798e86 100644 --- a/devel/bazaar/Makefile +++ b/devel/bazaar/Makefile @@ -22,6 +22,8 @@ RUN_DEPENDS= ${BUILD_DEPENDS} LIB_DEPENDS= neon.28:${PORTSDIR}/www/neon28 \ gpgme.18:${PORTSDIR}/security/gpgme +CONFLICTS= gd-2.* + USE_GMAKE= yes USE_GETTEXT= yes USE_PERL5_BUILD=yes 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}"