pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: jperkin
Date: Wed Feb 21 17:00:00 UTC 2018
Modified Files:
pkgsrc/devel/ruby-gnome2-atk: Makefile
pkgsrc/devel/ruby-gnome2-gio: Makefile
pkgsrc/devel/ruby-gnome2-glib: Makefile
pkgsrc/devel/ruby-gnome2-gobject-introspection: Makefile
pkgsrc/devel/ruby-gnome2-pango: Makefile
pkgsrc/graphics/ruby-gnome2-gdk3: Makefile
pkgsrc/graphics/ruby-gnome2-gdkpixbuf: Makefile
pkgsrc/graphics/ruby-gnome2-rsvg: Makefile
pkgsrc/multimedia/ruby-gnome2-gstreamer: Makefile
pkgsrc/print/ruby-gnome2-poppler: Makefile
pkgsrc/x11/ruby-gnome2-gtk: Makefile
pkgsrc/x11/ruby-gnome2-gtk3: Makefile
pkgsrc/x11/ruby-gnome2-gtksourceview2: Makefile
pkgsrc/x11/ruby-gnome2-gtksourceview3: Makefile
pkgsrc/x11/ruby-gnome2-vte: Makefile
Log Message:
ruby-gnome: Remove package CONFLICTS that conflict with themselves.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/devel/ruby-gnome2-atk/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/ruby-gnome2-gio/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/devel/ruby-gnome2-glib/Makefile
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/devel/ruby-gnome2-gobject-introspection/Makefile
cvs rdiff -u -r1.55 -r1.56 pkgsrc/devel/ruby-gnome2-pango/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/ruby-gnome2-gdk3/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/ruby-gnome2-gdkpixbuf/Makefile
cvs rdiff -u -r1.65 -r1.66 pkgsrc/graphics/ruby-gnome2-rsvg/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/multimedia/ruby-gnome2-gstreamer/Makefile
cvs rdiff -u -r1.89 -r1.90 pkgsrc/print/ruby-gnome2-poppler/Makefile
cvs rdiff -u -r1.63 -r1.64 pkgsrc/x11/ruby-gnome2-gtk/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/ruby-gnome2-gtk3/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/x11/ruby-gnome2-gtksourceview2/Makefile
cvs rdiff -u -r1.29 -r1.30 pkgsrc/x11/ruby-gnome2-gtksourceview3/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/x11/ruby-gnome2-vte/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/devel/ruby-gnome2-atk/Makefile
diff -u pkgsrc/devel/ruby-gnome2-atk/Makefile:1.22 pkgsrc/devel/ruby-gnome2-atk/Makefile:1.23
--- pkgsrc/devel/ruby-gnome2-atk/Makefile:1.22 Sun Jun 11 05:51:40 2017
+++ pkgsrc/devel/ruby-gnome2-atk/Makefile Wed Feb 21 16:59:59 2018
@@ -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@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
Index: pkgsrc/devel/ruby-gnome2-gio/Makefile
diff -u pkgsrc/devel/ruby-gnome2-gio/Makefile:1.21 pkgsrc/devel/ruby-gnome2-gio/Makefile:1.22
--- pkgsrc/devel/ruby-gnome2-gio/Makefile:1.21 Sun Jun 11 05:51:40 2017
+++ pkgsrc/devel/ruby-gnome2-gio/Makefile Wed Feb 21 16:59:59 2018
@@ -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@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
Index: pkgsrc/devel/ruby-gnome2-glib/Makefile
diff -u pkgsrc/devel/ruby-gnome2-glib/Makefile:1.29 pkgsrc/devel/ruby-gnome2-glib/Makefile:1.30
--- pkgsrc/devel/ruby-gnome2-glib/Makefile:1.29 Sun Jun 11 05:51:40 2017
+++ pkgsrc/devel/ruby-gnome2-glib/Makefile Wed Feb 21 16:59:59 2018
@@ -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@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
Index: pkgsrc/devel/ruby-gnome2-gobject-introspection/Makefile
diff -u pkgsrc/devel/ruby-gnome2-gobject-introspection/Makefile:1.6 pkgsrc/devel/ruby-gnome2-gobject-introspection/Makefile:1.7
--- pkgsrc/devel/ruby-gnome2-gobject-introspection/Makefile:1.6 Sun Jun 11 05:51:40 2017
+++ pkgsrc/devel/ruby-gnome2-gobject-introspection/Makefile Wed Feb 21 16:59:59 2018
@@ -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@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
Index: pkgsrc/devel/ruby-gnome2-pango/Makefile
diff -u pkgsrc/devel/ruby-gnome2-pango/Makefile:1.55 pkgsrc/devel/ruby-gnome2-pango/Makefile:1.56
--- pkgsrc/devel/ruby-gnome2-pango/Makefile:1.55 Sun Jun 11 05:51:40 2017
+++ pkgsrc/devel/ruby-gnome2-pango/Makefile Wed Feb 21 16:59:59 2018
@@ -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@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
Index: pkgsrc/graphics/ruby-gnome2-gdk3/Makefile
diff -u pkgsrc/graphics/ruby-gnome2-gdk3/Makefile:1.26 pkgsrc/graphics/ruby-gnome2-gdk3/Makefile:1.27
--- pkgsrc/graphics/ruby-gnome2-gdk3/Makefile:1.26 Thu Nov 23 17:19:42 2017
+++ pkgsrc/graphics/ruby-gnome2-gdk3/Makefile Wed Feb 21 16:59:59 2018
@@ -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@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
Index: pkgsrc/graphics/ruby-gnome2-gdkpixbuf/Makefile
diff -u pkgsrc/graphics/ruby-gnome2-gdkpixbuf/Makefile:1.43 pkgsrc/graphics/ruby-gnome2-gdkpixbuf/Makefile:1.44
--- pkgsrc/graphics/ruby-gnome2-gdkpixbuf/Makefile:1.43 Sun Jun 11 05:51:40 2017
+++ pkgsrc/graphics/ruby-gnome2-gdkpixbuf/Makefile Wed Feb 21 16:59:59 2018
@@ -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@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
Index: pkgsrc/graphics/ruby-gnome2-rsvg/Makefile
diff -u pkgsrc/graphics/ruby-gnome2-rsvg/Makefile:1.65 pkgsrc/graphics/ruby-gnome2-rsvg/Makefile:1.66
--- pkgsrc/graphics/ruby-gnome2-rsvg/Makefile:1.65 Fri Aug 18 14:58:50 2017
+++ pkgsrc/graphics/ruby-gnome2-rsvg/Makefile Wed Feb 21 17:00:00 2018
@@ -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@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
Index: pkgsrc/multimedia/ruby-gnome2-gstreamer/Makefile
diff -u pkgsrc/multimedia/ruby-gnome2-gstreamer/Makefile:1.25 pkgsrc/multimedia/ruby-gnome2-gstreamer/Makefile:1.26
--- pkgsrc/multimedia/ruby-gnome2-gstreamer/Makefile:1.25 Sun Jun 11 05:51:41 2017
+++ pkgsrc/multimedia/ruby-gnome2-gstreamer/Makefile Wed Feb 21 17:00:00 2018
@@ -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@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
Index: pkgsrc/print/ruby-gnome2-poppler/Makefile
diff -u pkgsrc/print/ruby-gnome2-poppler/Makefile:1.89 pkgsrc/print/ruby-gnome2-poppler/Makefile:1.90
--- pkgsrc/print/ruby-gnome2-poppler/Makefile:1.89 Wed Jan 10 22:16:26 2018
+++ pkgsrc/print/ruby-gnome2-poppler/Makefile Wed Feb 21 17:00:00 2018
@@ -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@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
Index: pkgsrc/x11/ruby-gnome2-gtk/Makefile
diff -u pkgsrc/x11/ruby-gnome2-gtk/Makefile:1.63 pkgsrc/x11/ruby-gnome2-gtk/Makefile:1.64
--- pkgsrc/x11/ruby-gnome2-gtk/Makefile:1.63 Sun Jun 11 05:51:41 2017
+++ pkgsrc/x11/ruby-gnome2-gtk/Makefile Wed Feb 21 17:00:00 2018
@@ -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@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
Index: pkgsrc/x11/ruby-gnome2-gtk3/Makefile
diff -u pkgsrc/x11/ruby-gnome2-gtk3/Makefile:1.28 pkgsrc/x11/ruby-gnome2-gtk3/Makefile:1.29
--- pkgsrc/x11/ruby-gnome2-gtk3/Makefile:1.28 Thu Nov 23 17:19:46 2017
+++ pkgsrc/x11/ruby-gnome2-gtk3/Makefile Wed Feb 21 17:00:00 2018
@@ -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@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
Index: pkgsrc/x11/ruby-gnome2-gtksourceview2/Makefile
diff -u pkgsrc/x11/ruby-gnome2-gtksourceview2/Makefile:1.52 pkgsrc/x11/ruby-gnome2-gtksourceview2/Makefile:1.53
--- pkgsrc/x11/ruby-gnome2-gtksourceview2/Makefile:1.52 Sun Jun 11 05:51:41 2017
+++ pkgsrc/x11/ruby-gnome2-gtksourceview2/Makefile Wed Feb 21 17:00:00 2018
@@ -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@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"
Index: pkgsrc/x11/ruby-gnome2-gtksourceview3/Makefile
diff -u pkgsrc/x11/ruby-gnome2-gtksourceview3/Makefile:1.29 pkgsrc/x11/ruby-gnome2-gtksourceview3/Makefile:1.30
--- pkgsrc/x11/ruby-gnome2-gtksourceview3/Makefile:1.29 Thu Nov 23 17:20:20 2017
+++ pkgsrc/x11/ruby-gnome2-gtksourceview3/Makefile Wed Feb 21 17:00:00 2018
@@ -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@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
Index: pkgsrc/x11/ruby-gnome2-vte/Makefile
diff -u pkgsrc/x11/ruby-gnome2-vte/Makefile:1.54 pkgsrc/x11/ruby-gnome2-vte/Makefile:1.55
--- pkgsrc/x11/ruby-gnome2-vte/Makefile:1.54 Sun Jun 11 05:51:41 2017
+++ pkgsrc/x11/ruby-gnome2-vte/Makefile Wed Feb 21 17:00:00 2018
@@ -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@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