pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc ruby-gnome: Remove package CONFLICTS that conflict wit...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9e857180fa31
branches: trunk
changeset: 375808:9e857180fa31
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Wed Feb 21 16:59:59 2018 +0000
description:
ruby-gnome: Remove package CONFLICTS that conflict with themselves.
diffstat:
devel/ruby-gnome2-atk/Makefile | 3 +--
devel/ruby-gnome2-gio/Makefile | 4 +---
devel/ruby-gnome2-glib/Makefile | 3 +--
devel/ruby-gnome2-gobject-introspection/Makefile | 3 +--
devel/ruby-gnome2-pango/Makefile | 3 +--
graphics/ruby-gnome2-gdk3/Makefile | 4 +---
graphics/ruby-gnome2-gdkpixbuf/Makefile | 3 +--
graphics/ruby-gnome2-rsvg/Makefile | 4 +---
multimedia/ruby-gnome2-gstreamer/Makefile | 4 +---
print/ruby-gnome2-poppler/Makefile | 4 +---
x11/ruby-gnome2-gtk/Makefile | 3 +--
x11/ruby-gnome2-gtk3/Makefile | 4 +---
x11/ruby-gnome2-gtksourceview2/Makefile | 4 +---
x11/ruby-gnome2-gtksourceview3/Makefile | 4 +---
x11/ruby-gnome2-vte/Makefile | 4 +---
15 files changed, 15 insertions(+), 39 deletions(-)
diffs (264 lines):
diff -r 0e80ef8ea5b1 -r 9e857180fa31 devel/ruby-gnome2-atk/Makefile
--- a/devel/ruby-gnome2-atk/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/devel/ruby-gnome2-atk/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/06/11 05:51:40 tsutsui Exp $
+# $NetBSD: Makefile,v 1.23 2018/02/21 16:59:59 jperkin Exp $
#
DISTNAME= atk-${VERSION}
@@ -9,7 +9,6 @@
MAINTAINER= tsutsui%NetBSD.org@localhost
CONFLICTS+= ruby-gnome2-atk-[0-9]*
-CONFLICTS+= ruby[0-9][0-9]-gnome2-atk-[0-9]*
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
diff -r 0e80ef8ea5b1 -r 9e857180fa31 devel/ruby-gnome2-gio/Makefile
--- a/devel/ruby-gnome2-gio/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/devel/ruby-gnome2-gio/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2017/06/11 05:51:40 tsutsui Exp $
+# $NetBSD: Makefile,v 1.22 2018/02/21 16:59:59 jperkin Exp $
#
DISTNAME= gio2-${VERSION}
@@ -8,8 +8,6 @@
MAINTAINER= tsutsui%NetBSD.org@localhost
-CONFLICTS+= ruby[0-9][0-9]-gnome2-gio-[0-9]*
-
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=${VERSION}:../../devel/ruby-gnome2-gobject-introspection
diff -r 0e80ef8ea5b1 -r 9e857180fa31 devel/ruby-gnome2-glib/Makefile
--- a/devel/ruby-gnome2-glib/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/devel/ruby-gnome2-glib/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2017/06/11 05:51:40 tsutsui Exp $
+# $NetBSD: Makefile,v 1.30 2018/02/21 16:59:59 jperkin Exp $
#
DISTNAME= glib2-${VERSION}
@@ -9,7 +9,6 @@
MAINTAINER= tsutsui%NetBSD.org@localhost
CONFLICTS+= ruby-gnome2-glib-[0-9]*
-CONFLICTS+= ruby[0-9][0-9]-gnome2-glib-[0-9]*
DEPENDS+= ${RUBY_PKGPREFIX}-native-package-installer>=1.0.3:../../devel/ruby-native-package-installer
DEPENDS+= ${RUBY_PKGPREFIX}-pkg-config>=1.2.2:../../devel/ruby-pkg-config
diff -r 0e80ef8ea5b1 -r 9e857180fa31 devel/ruby-gnome2-gobject-introspection/Makefile
--- a/devel/ruby-gnome2-gobject-introspection/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/devel/ruby-gnome2-gobject-introspection/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/06/11 05:51:40 tsutsui Exp $
+# $NetBSD: Makefile,v 1.7 2018/02/21 16:59:59 jperkin Exp $
#
DISTNAME= gobject-introspection-${VERSION}
@@ -9,7 +9,6 @@
MAINTAINER= tsutsui%NetBSD.org@localhost
CONFLICTS+= ruby-gnome2-gobject-introspection-[0-9]*
-CONFLICTS+= ruby[0-9][0-9]-gnome2-gobject-introspection-[0-9]*
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
diff -r 0e80ef8ea5b1 -r 9e857180fa31 devel/ruby-gnome2-pango/Makefile
--- a/devel/ruby-gnome2-pango/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/devel/ruby-gnome2-pango/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2017/06/11 05:51:40 tsutsui Exp $
+# $NetBSD: Makefile,v 1.56 2018/02/21 16:59:59 jperkin Exp $
#
DISTNAME= pango-${VERSION}
@@ -9,7 +9,6 @@
MAINTAINER= tsutsui%NetBSD.org@localhost
CONFLICTS+= ruby-gnome2-pango-[0-9]*
-CONFLICTS+= ruby[0-9][0-9]-gnome2-pango-[0-9]*
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
DEPENDS+= ${RUBY_PKGPREFIX}-cairo>=1.14.3:../../graphics/ruby-cairo
diff -r 0e80ef8ea5b1 -r 9e857180fa31 graphics/ruby-gnome2-gdk3/Makefile
--- a/graphics/ruby-gnome2-gdk3/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/graphics/ruby-gnome2-gdk3/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/11/23 17:19:42 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2018/02/21 16:59:59 jperkin Exp $
#
DISTNAME= gdk3-${VERSION}
@@ -9,8 +9,6 @@
MAINTAINER= tsutsui%NetBSD.org@localhost
-CONFLICTS+= ruby[0-9][0-9]-gnome2-gdk3-[0-9]*
-
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=${VERSION}:../../devel/ruby-gnome2-gobject-introspection
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-cairo-gobject>=${VERSION}:../../graphics/ruby-gnome2-cairo-gobject
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pango
diff -r 0e80ef8ea5b1 -r 9e857180fa31 graphics/ruby-gnome2-gdkpixbuf/Makefile
--- a/graphics/ruby-gnome2-gdkpixbuf/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/graphics/ruby-gnome2-gdkpixbuf/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2017/06/11 05:51:40 tsutsui Exp $
+# $NetBSD: Makefile,v 1.44 2018/02/21 16:59:59 jperkin Exp $
#
DISTNAME= gdk_pixbuf2-${VERSION}
@@ -9,7 +9,6 @@
MAINTAINER= tsutsui%NetBSD.org@localhost
CONFLICTS+= ruby-gnome2-gdkpixbuf-[0-9]*
-CONFLICTS+= ruby[0-9][0-9]-gnome2-gdkpixbuf-[0-9]*
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gio>=${VERSION}:../../devel/ruby-gnome2-gio
DEPENDS+= gdk-pixbuf2>=2.36.4:../../graphics/gdk-pixbuf2
diff -r 0e80ef8ea5b1 -r 9e857180fa31 graphics/ruby-gnome2-rsvg/Makefile
--- a/graphics/ruby-gnome2-rsvg/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/graphics/ruby-gnome2-rsvg/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2017/08/18 14:58:50 tsutsui Exp $
+# $NetBSD: Makefile,v 1.66 2018/02/21 17:00:00 jperkin Exp $
#
DISTNAME= rsvg2-${VERSION}
@@ -8,8 +8,6 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-CONFLICTS+= ruby[0-9][0-9]-gnome2-rsvg-[0-9]*
-
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gdkpixbuf>=${VERSION}:../../graphics/ruby-gnome2-gdkpixbuf
DEPENDS+= ${RUBY_PKGPREFIX}-cairo>=1.14.3:../../graphics/ruby-cairo
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-cairo-gobject>=${VERSION}:../../graphics/ruby-gnome2-cairo-gobject
diff -r 0e80ef8ea5b1 -r 9e857180fa31 multimedia/ruby-gnome2-gstreamer/Makefile
--- a/multimedia/ruby-gnome2-gstreamer/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/multimedia/ruby-gnome2-gstreamer/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2017/06/11 05:51:41 tsutsui Exp $
+# $NetBSD: Makefile,v 1.26 2018/02/21 17:00:00 jperkin Exp $
#
DISTNAME= gstreamer-${VERSION}
@@ -8,8 +8,6 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-CONFLICTS+= ruby[0-9][0-9]-gnome2-gstreamer-[0-9]*
-
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=${VERSION}:../../devel/ruby-gnome2-gobject-introspection
DEPENDS+= gst-plugins1-base-[0-9]*:../../multimedia/gst-plugins1-base
diff -r 0e80ef8ea5b1 -r 9e857180fa31 print/ruby-gnome2-poppler/Makefile
--- a/print/ruby-gnome2-poppler/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/print/ruby-gnome2-poppler/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2018/01/10 22:16:26 wiz Exp $
+# $NetBSD: Makefile,v 1.90 2018/02/21 17:00:00 jperkin Exp $
DISTNAME= poppler-${VERSION}
PKGNAME= ${RUBY_PKGPREFIX}-gnome2-${DISTNAME}
@@ -8,8 +8,6 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-CONFLICTS+= ruby[0-9][0-9]-gnome2-poppler-[0-9]*
-
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gio>=${VERSION}:../../devel/ruby-gnome2-gio
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-cairo-gobject>=${VERSION}:../../graphics/ruby-gnome2-cairo-gobject
diff -r 0e80ef8ea5b1 -r 9e857180fa31 x11/ruby-gnome2-gtk/Makefile
--- a/x11/ruby-gnome2-gtk/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/x11/ruby-gnome2-gtk/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2017/06/11 05:51:41 tsutsui Exp $
+# $NetBSD: Makefile,v 1.64 2018/02/21 17:00:00 jperkin Exp $
#
DISTNAME= gtk2-${VERSION}
@@ -9,7 +9,6 @@
MAINTAINER= tsutsui%NetBSD.org@localhost
CONFLICTS+= ruby-gnome2-gtk-[0-9]*
-CONFLICTS+= ruby[0-9][0-9]-gnome2-gtk-[0-9]*
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pango
diff -r 0e80ef8ea5b1 -r 9e857180fa31 x11/ruby-gnome2-gtk3/Makefile
--- a/x11/ruby-gnome2-gtk3/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/x11/ruby-gnome2-gtk3/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/11/23 17:19:46 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2018/02/21 17:00:00 jperkin Exp $
#
DISTNAME= gtk3-${VERSION}
@@ -9,8 +9,6 @@
MAINTAINER= tsutsui%NetBSD.org@localhost
-CONFLICTS+= ruby[0-9][0-9]-gnome2-gtk3-[0-9]*
-
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gio>=${VERSION}:../../devel/ruby-gnome2-gio
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
diff -r 0e80ef8ea5b1 -r 9e857180fa31 x11/ruby-gnome2-gtksourceview2/Makefile
--- a/x11/ruby-gnome2-gtksourceview2/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/x11/ruby-gnome2-gtksourceview2/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2017/06/11 05:51:41 tsutsui Exp $
+# $NetBSD: Makefile,v 1.53 2018/02/21 17:00:00 jperkin Exp $
#
DISTNAME= gtksourceview2-${VERSION}
@@ -8,8 +8,6 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-CONFLICTS+= ruby[0-9][0-9]-gnome2-gtksourceview2-[0-9]*
-
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
.include "../../x11/gtksourceview2/buildlink3.mk"
diff -r 0e80ef8ea5b1 -r 9e857180fa31 x11/ruby-gnome2-gtksourceview3/Makefile
--- a/x11/ruby-gnome2-gtksourceview3/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/x11/ruby-gnome2-gtksourceview3/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2017/11/23 17:20:20 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2018/02/21 17:00:00 jperkin Exp $
#
DISTNAME= gtksourceview3-${VERSION}
@@ -9,8 +9,6 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-CONFLICTS+= ruby[0-9][0-9]-gnome2-gtksourceview3-[0-9]*
-
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gobject-introspection>=${VERSION}:../../devel/ruby-gnome2-gobject-introspection
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=${VERSION}:../../x11/ruby-gnome2-gtk3
diff -r 0e80ef8ea5b1 -r 9e857180fa31 x11/ruby-gnome2-vte/Makefile
--- a/x11/ruby-gnome2-vte/Makefile Wed Feb 21 16:55:37 2018 +0000
+++ b/x11/ruby-gnome2-vte/Makefile Wed Feb 21 16:59:59 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2017/06/11 05:51:41 tsutsui Exp $
+# $NetBSD: Makefile,v 1.55 2018/02/21 17:00:00 jperkin Exp $
#
DISTNAME= vte-${VERSION}
@@ -8,8 +8,6 @@
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-CONFLICTS+= ruby[0-9][0-9]-gnome2-vte-[0-9]*
-
DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-gtk>=${VERSION}:../../x11/ruby-gnome2-gtk
.include "../../devel/ruby-gnome2-glib/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index