summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/gimp-app/Makefile2
-rw-r--r--graphics/gimp/Makefile2
-rw-r--r--graphics/gimp1/Makefile2
3 files changed, 3 insertions, 3 deletions
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