From ee1813f52e6f5d42238c2feb271e6ccba11219b8 Mon Sep 17 00:00:00 2001 From: ahze Date: Tue, 15 Apr 2008 18:36:36 +0000 Subject: Mark CONFLICTS git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10876 df743ca5-7f9a-e211-a948-0013205c9059 --- graphics/gimp-app-devel/Makefile | 4 +++- graphics/gimp-app/Makefile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile index b851b5587..34f7018b5 100644 --- a/graphics/gimp-app-devel/Makefile +++ b/graphics/gimp-app-devel/Makefile @@ -3,7 +3,7 @@ # Whom: erich@FreeBSD.org # # $FreeBSD$ -# $MCom: ports/graphics/gimp-app/Makefile,v 1.20 2008/03/24 14:24:58 ahze Exp $ +# $MCom: ports/graphics/gimp-app-devel/Makefile,v 1.20 2008/04/15 14:38:14 ahze Exp $ # PORTNAME= gimp-app @@ -36,6 +36,8 @@ LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \ curl.4:${PORTSDIR}/ftp/curl \ gegl-0.0.0:${PORTSDIR}/x11/gegl +CONFLICTS= gimp-app-[0-9]* + USE_BZIP2= yes USE_GETTEXT= yes USE_XPM= yes diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 74ffad1b9..c16327430 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -3,7 +3,7 @@ # Whom: erich@FreeBSD.org # # $FreeBSD$ -# $MCom: ports-stable/graphics/gimp-app/Makefile,v 1.1 2007/12/02 18:43:48 ahze Exp $ +# $MCom: ports/graphics/gimp-app/Makefile,v 1.20 2008/03/24 14:24:58 ahze Exp $ # PORTNAME= gimp-app @@ -34,6 +34,8 @@ LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \ tiff.4:${PORTSDIR}/graphics/tiff \ lcms.1:${PORTSDIR}/graphics/lcms +CONFLICTS= gimp-app-devel-[0-9]* + USE_BZIP2= yes USE_GETTEXT= yes USE_XPM= yes -- cgit v1.2.3