ruby-gnome: Remove package CONFLICTS that conflict with themselves.

This commit is contained in:
jperkin 2018-02-21 16:59:59 +00:00
parent 35f0340a6a
commit 96f52699df
15 changed files with 15 additions and 39 deletions

View file

@ -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 @@ CATEGORIES= devel
MAINTAINER= tsutsui@NetBSD.org
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

View file

@ -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 @@ CATEGORIES= devel
MAINTAINER= tsutsui@NetBSD.org
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

View file

@ -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 @@ CATEGORIES= devel
MAINTAINER= tsutsui@NetBSD.org
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

View file

@ -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 @@ CATEGORIES= devel
MAINTAINER= tsutsui@NetBSD.org
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

View file

@ -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 @@ CATEGORIES= devel fonts
MAINTAINER= tsutsui@NetBSD.org
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

View file

@ -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 @@ CATEGORIES= graphics
MAINTAINER= tsutsui@NetBSD.org
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

View file

@ -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 @@ CATEGORIES= graphics devel
MAINTAINER= tsutsui@NetBSD.org
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

View file

@ -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 @@ CATEGORIES= graphics
MAINTAINER= pkgsrc-users@NetBSD.org
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

View file

@ -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 @@ CATEGORIES= multimedia
MAINTAINER= pkgsrc-users@NetBSD.org
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

View file

@ -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 @@ CATEGORIES= print
MAINTAINER= pkgsrc-users@NetBSD.org
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

View file

@ -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 @@ CATEGORIES= x11
MAINTAINER= tsutsui@NetBSD.org
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

View file

@ -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 @@ CATEGORIES= x11
MAINTAINER= tsutsui@NetBSD.org
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

View file

@ -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 @@ CATEGORIES= x11
MAINTAINER= pkgsrc-users@NetBSD.org
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"

View file

@ -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 @@ CATEGORIES= x11
MAINTAINER= pkgsrc-users@NetBSD.org
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

View file

@ -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 @@ CATEGORIES= x11
MAINTAINER= pkgsrc-users@NetBSD.org
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"