summaryrefslogtreecommitdiffstats
path: root/graphics/gimp-app
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2007-03-31 02:22:45 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2007-03-31 02:22:45 +0800
commit75217400b7d0cb4f15302b1c69acab41a7296d0f (patch)
treeb0e75ee1283ce9dfcea1def1f7fb3672c2960a27 /graphics/gimp-app
parent8245c7faf7c4d0c37ab9d53ccb84afed224ffc55 (diff)
downloadmarcuscom-ports-75217400b7d0cb4f15302b1c69acab41a7296d0f.tar
marcuscom-ports-75217400b7d0cb4f15302b1c69acab41a7296d0f.tar.gz
marcuscom-ports-75217400b7d0cb4f15302b1c69acab41a7296d0f.tar.bz2
marcuscom-ports-75217400b7d0cb4f15302b1c69acab41a7296d0f.tar.lz
marcuscom-ports-75217400b7d0cb4f15302b1c69acab41a7296d0f.tar.xz
marcuscom-ports-75217400b7d0cb4f15302b1c69acab41a7296d0f.tar.zst
marcuscom-ports-75217400b7d0cb4f15302b1c69acab41a7296d0f.zip
Update CONFLICTS
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8586 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'graphics/gimp-app')
-rw-r--r--graphics/gimp-app/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index ed4090e91..7ec640b1c 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,7 +3,7 @@
# Whom: erich@FreeBSD.org
#
# $FreeBSD$
-# $MCom: ports/graphics/gimp-app/Makefile,v 1.10 2007/03/30 18:18:12 ahze Exp $
+# $MCom: ports/graphics/gimp-app/Makefile,v 1.11 2007/03/30 18:20:44 ahze Exp $
PORTNAME= gimp
PORTVERSION= 2.2.13
@@ -30,7 +30,7 @@ LIB_DEPENDS= wmf.2:${PORTSDIR}/graphics/libwmf \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
-CONFLICTS= gimp-1.* gimpshop-[0-9]*
+CONFLICTS= gimp-1.* gimpshop-[0-9]* gimp-app-devel-[0-9]*
SHLIBVER?= 200