pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics Conflict with gimp>=2.0.0.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/65261740cda0
branches:  trunk
changeset: 472305:65261740cda0
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Thu Apr 08 07:37:01 2004 +0000

description:
Conflict with gimp>=2.0.0.

diffstat:

 graphics/gimp1-base/Makefile |  4 ++--
 graphics/gimp1-data/Makefile |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 1c3c60668f61 -r 65261740cda0 graphics/gimp1-base/Makefile
--- a/graphics/gimp1-base/Makefile      Thu Apr 08 06:46:45 2004 +0000
+++ b/graphics/gimp1-base/Makefile      Thu Apr 08 07:37:01 2004 +0000
@@ -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 @@
 
 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 -r 1c3c60668f61 -r 65261740cda0 graphics/gimp1-data/Makefile
--- a/graphics/gimp1-data/Makefile      Thu Apr 08 06:46:45 2004 +0000
+++ b/graphics/gimp1-data/Makefile      Thu Apr 08 07:37:01 2004 +0000
@@ -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 @@
 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



Home | Main Index | Thread Index | Old Index