summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2004-04-08 07:37:01 +0000
committerjmmv <jmmv@pkgsrc.org>2004-04-08 07:37:01 +0000
commitabcab1a79be36582ea844dd7f85df0b9e556d7d9 (patch)
tree89bab42be2329c5dfd8fba04aa4d0692a93c3339 /graphics
parent3e271a7cd72d959f2d845a69c87305b91ba510e8 (diff)
downloadpkgsrc-abcab1a79be36582ea844dd7f85df0b9e556d7d9.tar.gz
Conflict with gimp>=2.0.0.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/gimp1-base/Makefile4
-rw-r--r--graphics/gimp1-data/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/gimp1-base/Makefile b/graphics/gimp1-base/Makefile
index b712ba327a8..4f1016df639 100644
--- a/graphics/gimp1-base/Makefile
+++ b/graphics/gimp1-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/03/29 22:06:49 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/04/08 07:37:01 jmmv Exp $
#
DISTNAME= gimp-1.2.5
@@ -16,7 +16,7 @@ COMMENT= GNU Image Manipulation Program (base)
BUILD_USES_MSGFMT= YES
-CONFLICTS+= gimp<=1.2.3
+CONFLICTS+= gimp<=1.2.3 gimp>=2.0.0
USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
diff --git a/graphics/gimp1-data/Makefile b/graphics/gimp1-data/Makefile
index bf3bbb7dadc..7cf77b6ca99 100644
--- a/graphics/gimp1-data/Makefile
+++ b/graphics/gimp1-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/03/29 22:22:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/04/08 07:37:01 jmmv Exp $
#
DISTNAME= gimp-data-extras-1.2.0
@@ -14,7 +14,7 @@ MAINTAINER= hubertf@NetBSD.org
HOMEPAGE= http://www.gimp.org/
COMMENT= GNU Image Manipulation Program (extra brushes and patterns)
-CONFLICTS+= gimp<=1.2.3
+CONFLICTS+= gimp<=1.2.3 gimp>=2.0.0
USE_BUILDLINK2= YES
USE_X11= YES