CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr 17 11:57:37 UTC 2024

Modified Files:
        pkgsrc/devel/py-gobject: Makefile.common
        pkgsrc/devel/py-gobject3: Makefile.common
        pkgsrc/devel/ruby-pkg-config: Makefile
        pkgsrc/math/py-roman: Makefile
        pkgsrc/net/rabbiter: Makefile
        pkgsrc/x11/py-gtk2: Makefile

Log Message:
*: fix some CONFLICTS

Remove some that are for packages more than ten year old,
fix rest.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/py-gobject/Makefile.common
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/py-gobject3/Makefile.common
cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/ruby-pkg-config/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/math/py-roman/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/rabbiter/Makefile
cvs rdiff -u -r1.144 -r1.145 pkgsrc/x11/py-gtk2/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/py-gobject/Makefile.common
diff -u pkgsrc/devel/py-gobject/Makefile.common:1.23 pkgsrc/devel/py-gobject/Makefile.common:1.24
--- pkgsrc/devel/py-gobject/Makefile.common:1.23        Wed Apr 17 10:38:34 2024
+++ pkgsrc/devel/py-gobject/Makefile.common     Wed Apr 17 11:57:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2024/04/17 10:38:34 wiz Exp $
+# $NetBSD: Makefile.common,v 1.24 2024/04/17 11:57:36 wiz Exp $
 #
 # used by devel/py-gobject/Makefile
 # used by devel/py-gobject-shared/Makefile
@@ -25,4 +25,4 @@ DISTINFO_FILE=                ${.CURDIR}/../../devel/p
 
 PKGCONFIG_OVERRIDE+=   pygobject-2.0.pc.in
 PY_PATCHPLIST=         yes
-CONFLICTS+=            py[0-9]*-gtk2<2.8.4
+CONFLICTS+=            py27-gtk2<2.8.4

Index: pkgsrc/devel/py-gobject3/Makefile.common
diff -u pkgsrc/devel/py-gobject3/Makefile.common:1.20 pkgsrc/devel/py-gobject3/Makefile.common:1.21
--- pkgsrc/devel/py-gobject3/Makefile.common:1.20       Wed Apr 17 10:38:34 2024
+++ pkgsrc/devel/py-gobject3/Makefile.common    Wed Apr 17 11:57:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2024/04/17 10:38:34 wiz Exp $
+# $NetBSD: Makefile.common,v 1.21 2024/04/17 11:57:36 wiz Exp $
 # used by devel/py-gobject3/Makefile
 # used by devel/py-gobject3-common/Makefile
 
@@ -17,5 +17,5 @@ USE_TOOLS+=   pkg-config
 DISTINFO_FILE= ../../devel/py-gobject3/distinfo
 #PATCHDIR=     ../../devel/py-gobject3/patches
 
-CONFLICTS+=    py[0-9]*-gtk2<2.8.4
-CONFLICTS+=    py[0-9]*-gobject<2.28.6nb4
+CONFLICTS+=    py27-gtk2<2.8.4
+CONFLICTS+=    py27-gobject<2.28.6nb4

Index: pkgsrc/devel/ruby-pkg-config/Makefile
diff -u pkgsrc/devel/ruby-pkg-config/Makefile:1.40 pkgsrc/devel/ruby-pkg-config/Makefile:1.41
--- pkgsrc/devel/ruby-pkg-config/Makefile:1.40  Wed Apr 17 10:38:34 2024
+++ pkgsrc/devel/ruby-pkg-config/Makefile       Wed Apr 17 11:57:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2024/04/17 10:38:34 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2024/04/17 11:57:36 wiz Exp $
 
 DISTNAME=      pkg-config-1.5.6
 CATEGORIES=    devel
@@ -8,8 +8,6 @@ HOMEPAGE=       https://github.com/ruby-gnome/
 COMMENT=       Pure Ruby implementation of pkg-config
 LICENSE=       gnu-lgpl-v2.1
 
-CONFLICTS+=    ruby[0-9]*-gnome2-glib<0.90.0
-
 USE_LANGUAGES= # none
 
 CONFIGURE_ARGS+=       --siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE} \

Index: pkgsrc/math/py-roman/Makefile
diff -u pkgsrc/math/py-roman/Makefile:1.17 pkgsrc/math/py-roman/Makefile:1.18
--- pkgsrc/math/py-roman/Makefile:1.17  Wed Apr 17 10:38:35 2024
+++ pkgsrc/math/py-roman/Makefile       Wed Apr 17 11:57:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2024/04/17 10:38:35 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2024/04/17 11:57:36 wiz Exp $
 
 DISTNAME=      roman-4.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,8 +10,6 @@ HOMEPAGE=     https://github.com/zopefoundat
 COMMENT=       Integer to Roman numerals converter for Python
 LICENSE=       zpl-2.1
 
-CONFLICTS+=    py[0-9]*-docutils<=0.7
-
 USE_LANGUAGES= # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27

Index: pkgsrc/net/rabbiter/Makefile
diff -u pkgsrc/net/rabbiter/Makefile:1.16 pkgsrc/net/rabbiter/Makefile:1.17
--- pkgsrc/net/rabbiter/Makefile:1.16   Wed Apr 17 10:38:35 2024
+++ pkgsrc/net/rabbiter/Makefile        Wed Apr 17 11:57:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2024/04/17 10:38:35 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2024/04/17 11:57:36 wiz Exp $
 
 DISTNAME=      rabbiter-2.0.1
 PKGREVISION=   2
@@ -15,8 +15,6 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-rabbit>=2.0.
 DEPENDS+=      ${RUBY_PKGPREFIX}-twitter_oauth-[0-9]*:../../security/ruby-twitter_oauth
 DEPENDS+=      ${RUBY_PKGPREFIX}-twitter-stream>=0.1.16:../../net/ruby-twitter-stream
 
-CONFLICTS+=    ruby[0-9]*-rabbit<2.0.0
-
 USE_RUBY_SETUP=                yes
 USE_RUBY_SETUP_PKG=    yes
 

Index: pkgsrc/x11/py-gtk2/Makefile
diff -u pkgsrc/x11/py-gtk2/Makefile:1.144 pkgsrc/x11/py-gtk2/Makefile:1.145
--- pkgsrc/x11/py-gtk2/Makefile:1.144   Wed Apr 17 10:38:36 2024
+++ pkgsrc/x11/py-gtk2/Makefile Wed Apr 17 11:57:36 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.144 2024/04/17 10:38:36 wiz Exp $
+# $NetBSD: Makefile,v 1.145 2024/04/17 11:57:36 wiz Exp $
 
 DISTNAME=      pygtk-2.24.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
@@ -12,7 +12,7 @@ HOMEPAGE=     http://www.pygtk.org/
 COMMENT=       Python bindings for GTK+2
 LICENSE=       gnu-lgpl-v2.1
 
-CONFLICTS=     py[0-9]*-gtk<0.6.10
+CONFLICTS=     py27-gtk<0.6.10
 
 # IOError: [Errno 2] No such file or directory: 'gtk-types.defs'
 MAKE_JOBS_SAFE=        no