[pkgsrc/trunk]: pkgsrc/graphics The CONFLICTS line is useless here; we depend...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5dfb54ed599
branches:  trunk
changeset: 466757:c5dfb54ed599
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Thu Jan 22 17:47:53 2004 +0000

description:
The CONFLICTS line is useless here; we depend on a version newer than the
specified on it.

diffstat:

 graphics/librsvg2-gtk2/Makefile |  4 +---
 graphics/swfdec-gtk2/Makefile   |  4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 2fba6215b185 -r c5dfb54ed599 graphics/librsvg2-gtk2/Makefile
--- a/graphics/librsvg2-gtk2/Makefile   Thu Jan 22 17:37:04 2004 +0000
+++ b/graphics/librsvg2-gtk2/Makefile   Thu Jan 22 17:47:53 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/22 12:44:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/22 17:47:53 jmmv Exp $
 #
 
 .include "../../graphics/librsvg2/Makefile.common"
@@ -6,8 +6,6 @@
 PKGNAME=               ${DISTNAME:S/-/2-gtk2-/}
 COMMENT+=              (GTK2 modules)
 
-CONFLICTS+=            librsvg2<=2.5.0nb3
-
 CONFIGURE_ARGS+=       --enable-pixbuf-loader
 
 BUILD_DIRS=            ${WRKSRC}/gtk-engine ${WRKSRC}/gdk-pixbuf-loader
diff -r 2fba6215b185 -r c5dfb54ed599 graphics/swfdec-gtk2/Makefile
--- a/graphics/swfdec-gtk2/Makefile     Thu Jan 22 17:37:04 2004 +0000
+++ b/graphics/swfdec-gtk2/Makefile     Thu Jan 22 17:47:53 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/22 12:50:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/22 17:47:53 jmmv Exp $
 #
 
 .include "../../graphics/swfdec/Makefile.common"
@@ -6,8 +6,6 @@
 PKGNAME=               ${DISTNAME:S/-/-gtk2-/}
 COMMENT+=              (GTK2 modules)
 
-CONFLICTS+=            swfdec<=0.2.1nb6
-
 CONFIGURE_ARGS+=       --enable-pixbuf-loader
 
 BUILD_DIRS=            ${WRKSRC}/pixbuf-loader