summaryrefslogtreecommitdiff
path: root/graphics/gimp
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2006-02-22 04:15:08 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2006-02-22 04:15:08 +0000
commit71b9c00401f2bafdaf7b25f0ad5c2c16de570a75 (patch)
treebc19bdf50ad48b033e66dadc60748a0f0580f8f6 /graphics/gimp
parentAdd gimpshop. (diff)
Add CONFLICTS for gimpshop.
Notes
Notes: svn path=/head/; revision=156645
Diffstat (limited to 'graphics/gimp')
-rw-r--r--graphics/gimp/Makefile2
1 files changed, 1 insertions, 1 deletions
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