diff options
| author | jtb <jtb> | 2001-03-31 18:40:25 +0000 |
|---|---|---|
| committer | jtb <jtb> | 2001-03-31 18:40:25 +0000 |
| commit | f1411e8a8e64a404f2f82d948fcde263a72ac877 (patch) | |
| tree | 9731b18824f4006f8ca96dbaa2334160d0982beb /graphics | |
| parent | bcf3634eb360d45ce4efe9fd2bb7e678e4f1afe9 (diff) | |
| download | pkgsrc-f1411e8a8e64a404f2f82d948fcde263a72ac877.tar.gz | |
Both packages conflict -- each has program named 'animate'. Discovered
by Lex Wennmacher's investigations.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/ImageMagick/Makefile | 4 | ||||
| -rw-r--r-- | graphics/geomview/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index adce4fbfd28..78aadb1cb09 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2001/03/04 09:06:10 tron Exp $ +# $NetBSD: Makefile,v 1.65 2001/03/31 18:40:25 jtb Exp $ DISTNAME= ImageMagick-5.2.8 CATEGORIES= graphics @@ -9,6 +9,8 @@ MAINTAINER= tron@netbsd.org HOMEPAGE= http://www.simplesystems.org/ImageMagick/ COMMENT= Package for display and interactive manipulation of images +CONFLICTS= geomview-* # both have a program named 'animate' + DEPENDS+= jpeg-6b:../../graphics/jpeg DEPENDS+= mpeg2codec-1.2:../../graphics/mpeg2codec DEPENDS+= png>1.0.9:../../graphics/png diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index e5efd934e2b..b6b60107aa2 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/03/29 00:02:18 jtb Exp $ +# $NetBSD: Makefile,v 1.5 2001/03/31 18:40:25 jtb Exp $ DISTNAME= geomview-1.8.1 CATEGORIES= graphics math @@ -8,6 +8,8 @@ MAINTAINER= jtb@netbsd.org HOMEPAGE= http://www.geomview.org COMMENT= Interactive geometry viewing program +CONFLICTS= ImageMagick-* # both have a program named 'animate' + GNU_CONFIGURE= YES USE_X11= YES USE_MOTIF= YES |