summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjschauma <jschauma@pkgsrc.org>2003-07-03 17:41:51 +0000
committerjschauma <jschauma@pkgsrc.org>2003-07-03 17:41:51 +0000
commit72dd0fdb1c01e88cc107b8f856426bc7a4d86d09 (patch)
treea2a84bbfd728fb94ead8892ed34b49d6382f7568 /graphics
parent64c9904eed03fedafc748039ef2c39ea9632292e (diff)
downloadpkgsrc-72dd0fdb1c01e88cc107b8f856426bc7a4d86d09.tar.gz
Conflict only with geomview<1.8.1nb2
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ImageMagick/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 4bc87d8d2ab..51337dee73e 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2003/06/30 06:45:01 tron Exp $
+# $NetBSD: Makefile,v 1.99 2003/07/03 17:41:51 jschauma Exp $
.include "Makefile.common"
@@ -12,7 +12,7 @@ COMMENT= Package for display and interactive manipulation of images
DEPENDS+= mpeg2codec-1.2:../../graphics/mpeg2codec
-CONFLICTS= geomview-[0-9]* # both have a program named 'animate'
+CONFLICTS= geomview<1.8.1nb2 # used to have a program named 'animate'
USE_BUILDLINK2= YES
USE_X11= YES