From 71b9c00401f2bafdaf7b25f0ad5c2c16de570a75 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Wed, 22 Feb 2006 04:15:08 +0000 Subject: Add CONFLICTS for gimpshop. --- graphics/gimp-app/Makefile | 2 +- graphics/gimp/Makefile | 2 +- graphics/gimp1/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'graphics') diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 16defd724159..285d1fab2204 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -29,7 +29,7 @@ LIB_DEPENDS= wmf.2:${PORTSDIR}/graphics/libwmf \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff -CONFLICTS= gimp-1.* +CONFLICTS= gimp-1.* gimpshop-[0-9]* SHLIBVER?= 200 diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 16defd724159..285d1fab2204 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -29,7 +29,7 @@ LIB_DEPENDS= wmf.2:${PORTSDIR}/graphics/libwmf \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff -CONFLICTS= gimp-1.* +CONFLICTS= gimp-1.* gimpshop-[0-9]* SHLIBVER?= 200 diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile index 7308059424a8..fe8152c1c0e3 100644 --- a/graphics/gimp1/Makefile +++ b/graphics/gimp1/Makefile @@ -30,7 +30,7 @@ DEPRECATED= New stable release 2.0 can be installed via graphics/gimp port NO_LATEST_LINK= yes -CONFLICTS= gimp-2.* gimp-gnome-2.* +CONFLICTS= gimp-2.* gimp-gnome-2.* gimpshop-[0-9]* #SHLIBVER?= ${PORTVERSION:S/1.2.//g} SHLIBVER?= 2 -- cgit v1.2.3