summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmmv <jmmv@pkgsrc.org>2004-01-22 17:47:53 +0000
committerjmmv <jmmv@pkgsrc.org>2004-01-22 17:47:53 +0000
commitf40ee30fc937982288f6f735c0d5a720145d1116 (patch)
treea97af4904b6544f4025e3b5b486663092702d544
parent8104b158ba540ae43f9df9ec874dfd551b004e9d (diff)
downloadpkgsrc-f40ee30fc937982288f6f735c0d5a720145d1116.tar.gz
The CONFLICTS line is useless here; we depend on a version newer than the
specified on it.
-rw-r--r--graphics/librsvg2-gtk2/Makefile4
-rw-r--r--graphics/swfdec-gtk2/Makefile4
2 files changed, 2 insertions, 6 deletions
diff --git a/graphics/librsvg2-gtk2/Makefile b/graphics/librsvg2-gtk2/Makefile
index e0aae7e1b3f..2e1ce722340 100644
--- a/graphics/librsvg2-gtk2/Makefile
+++ b/graphics/librsvg2-gtk2/Makefile
@@ -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 --git a/graphics/swfdec-gtk2/Makefile b/graphics/swfdec-gtk2/Makefile
index 46adb066ef8..a9ddd5be7a9 100644
--- a/graphics/swfdec-gtk2/Makefile
+++ b/graphics/swfdec-gtk2/Makefile
@@ -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