Wed Apr 17 11:57:37 2024 UTC (39d)
*: fix some CONFLICTS

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


(wiz)
diff -r1.23 -r1.24 pkgsrc/devel/py-gobject/Makefile.common
diff -r1.20 -r1.21 pkgsrc/devel/py-gobject3/Makefile.common
diff -r1.40 -r1.41 pkgsrc/devel/ruby-pkg-config/Makefile
diff -r1.17 -r1.18 pkgsrc/math/py-roman/Makefile
diff -r1.16 -r1.17 pkgsrc/net/rabbiter/Makefile
diff -r1.144 -r1.145 pkgsrc/x11/py-gtk2/Makefile
cvs diff -r1.23 -r1.24 pkgsrc/devel/py-gobject/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/py-gobject/Makefile.common 2024/04/17 10:38:34 1.23
+++ pkgsrc/devel/py-gobject/Makefile.common 2024/04/17 11:57:36 1.24
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile.common,v 1.23 2024/04/17 10:38:34 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.24 2024/04/17 11:57:36 wiz Exp $
2# 2#
3# used by devel/py-gobject/Makefile 3# used by devel/py-gobject/Makefile
4# used by devel/py-gobject-shared/Makefile 4# used by devel/py-gobject-shared/Makefile
5 5
6DISTNAME= pygobject-2.28.7 6DISTNAME= pygobject-2.28.7
7CATEGORIES= devel 7CATEGORIES= devel
8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygobject/${PKGVERSION_NOREV:R}/} 8MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygobject/${PKGVERSION_NOREV:R}/}
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER?= pkgsrc-users@NetBSD.org 11MAINTAINER?= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.pygtk.org/ 12HOMEPAGE= http://www.pygtk.org/
13COMMENT= Python bindings for glib2 gobject 13COMMENT= Python bindings for glib2 gobject
14LICENSE= gnu-lgpl-v2.1 14LICENSE= gnu-lgpl-v2.1
15 15
16USE_LANGUAGES= c99 16USE_LANGUAGES= c99
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
19USE_TOOLS+= gmake pkg-config 19USE_TOOLS+= gmake pkg-config
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} 21CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
22 22
23PATCHDIR= ${.CURDIR}/../../devel/py-gobject/patches 23PATCHDIR= ${.CURDIR}/../../devel/py-gobject/patches
24DISTINFO_FILE= ${.CURDIR}/../../devel/py-gobject/distinfo 24DISTINFO_FILE= ${.CURDIR}/../../devel/py-gobject/distinfo
25 25
26PKGCONFIG_OVERRIDE+= pygobject-2.0.pc.in 26PKGCONFIG_OVERRIDE+= pygobject-2.0.pc.in
27PY_PATCHPLIST= yes 27PY_PATCHPLIST= yes
28CONFLICTS+= py[0-9]*-gtk2<2.8.4 28CONFLICTS+= py27-gtk2<2.8.4
cvs diff -r1.20 -r1.21 pkgsrc/devel/py-gobject3/Makefile.common (expand / switch to unified diff)

--- pkgsrc/devel/py-gobject3/Makefile.common 2024/04/17 10:38:34 1.20
+++ pkgsrc/devel/py-gobject3/Makefile.common 2024/04/17 11:57:36 1.21
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile.common,v 1.20 2024/04/17 10:38:34 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.21 2024/04/17 11:57:36 wiz Exp $
2# used by devel/py-gobject3/Makefile 2# used by devel/py-gobject3/Makefile
3# used by devel/py-gobject3-common/Makefile 3# used by devel/py-gobject3-common/Makefile
4 4
5DISTNAME= pygobject-3.44.1 5DISTNAME= pygobject-3.44.1
6CATEGORIES= devel gnome 6CATEGORIES= devel gnome
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygobject/${PKGVERSION_NOREV:R}/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygobject/${PKGVERSION_NOREV:R}/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER?= prlw1@cam.ac.uk 10MAINTAINER?= prlw1@cam.ac.uk
11HOMEPAGE= https://pygobject.readthedocs.io/ 11HOMEPAGE= https://pygobject.readthedocs.io/
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14USE_LANGUAGES= c c99 14USE_LANGUAGES= c c99
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16 16
17DISTINFO_FILE= ../../devel/py-gobject3/distinfo 17DISTINFO_FILE= ../../devel/py-gobject3/distinfo
18#PATCHDIR= ../../devel/py-gobject3/patches 18#PATCHDIR= ../../devel/py-gobject3/patches
19 19
20CONFLICTS+= py[0-9]*-gtk2<2.8.4 20CONFLICTS+= py27-gtk2<2.8.4
21CONFLICTS+= py[0-9]*-gobject<2.28.6nb4 21CONFLICTS+= py27-gobject<2.28.6nb4
cvs diff -r1.40 -r1.41 pkgsrc/devel/ruby-pkg-config/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ruby-pkg-config/Makefile 2024/04/17 10:38:34 1.40
+++ pkgsrc/devel/ruby-pkg-config/Makefile 2024/04/17 11:57:36 1.41
@@ -1,23 +1,21 @@ @@ -1,23 +1,21 @@
1# $NetBSD: Makefile,v 1.40 2024/04/17 10:38:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.41 2024/04/17 11:57:36 wiz Exp $
2 2
3DISTNAME= pkg-config-1.5.6 3DISTNAME= pkg-config-1.5.6
4CATEGORIES= devel 4CATEGORIES= devel
5 5
6MAINTAINER= pkgsrc-users@NetBSD.org 6MAINTAINER= pkgsrc-users@NetBSD.org
7HOMEPAGE= https://github.com/ruby-gnome/pkg-config 7HOMEPAGE= https://github.com/ruby-gnome/pkg-config
8COMMENT= Pure Ruby implementation of pkg-config 8COMMENT= Pure Ruby implementation of pkg-config
9LICENSE= gnu-lgpl-v2.1 9LICENSE= gnu-lgpl-v2.1
10 10
11CONFLICTS+= ruby[0-9]*-gnome2-glib<0.90.0 
12 
13USE_LANGUAGES= # none 11USE_LANGUAGES= # none
14 12
15CONFIGURE_ARGS+= --siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE} \ 13CONFIGURE_ARGS+= --siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE} \
16 --siterubyver=${PREFIX}/${RUBY_VENDORLIB} \ 14 --siterubyver=${PREFIX}/${RUBY_VENDORLIB} \
17 --siterubyverarch=${PREFIX}/${RUBY_VENDORARCHLIB} 15 --siterubyverarch=${PREFIX}/${RUBY_VENDORARCHLIB}
18 16
19#do-test: 17#do-test:
20# cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${RUBY} test/run-test.rb 18# cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${RUBY} test/run-test.rb
21 19
22.include "../../lang/ruby/gem.mk" 20.include "../../lang/ruby/gem.mk"
23.include "../../mk/bsd.pkg.mk" 21.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/math/py-roman/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-roman/Makefile 2024/04/17 10:38:35 1.17
+++ pkgsrc/math/py-roman/Makefile 2024/04/17 11:57:36 1.18
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1# $NetBSD: Makefile,v 1.17 2024/04/17 10:38:35 wiz Exp $ 1# $NetBSD: Makefile,v 1.18 2024/04/17 11:57:36 wiz Exp $
2 2
3DISTNAME= roman-4.1 3DISTNAME= roman-4.1
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= math python 5CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=r/roman/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=r/roman/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://github.com/zopefoundation/roman 9HOMEPAGE= https://github.com/zopefoundation/roman
10COMMENT= Integer to Roman numerals converter for Python 10COMMENT= Integer to Roman numerals converter for Python
11LICENSE= zpl-2.1 11LICENSE= zpl-2.1
12 12
13CONFLICTS+= py[0-9]*-docutils<=0.7 
14 
15USE_LANGUAGES= # none 13USE_LANGUAGES= # none
16 14
17PYTHON_VERSIONS_INCOMPATIBLE= 27 15PYTHON_VERSIONS_INCOMPATIBLE= 27
18 16
19USE_PKG_RESOURCES= yes 17USE_PKG_RESOURCES= yes
20 18
21post-install: 19post-install:
22 cd ${DESTDIR}${PREFIX}/bin && \ 20 cd ${DESTDIR}${PREFIX}/bin && \
23 ${MV} roman roman-${PYVERSSUFFIX} || ${TRUE} 21 ${MV} roman roman-${PYVERSSUFFIX} || ${TRUE}
24 22
25.include "../../lang/python/egg.mk" 23.include "../../lang/python/egg.mk"
26.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/net/rabbiter/Makefile (expand / switch to unified diff)

--- pkgsrc/net/rabbiter/Makefile 2024/04/17 10:38:35 1.16
+++ pkgsrc/net/rabbiter/Makefile 2024/04/17 11:57:36 1.17
@@ -1,32 +1,30 @@ @@ -1,32 +1,30 @@
1# $NetBSD: Makefile,v 1.16 2024/04/17 10:38:35 wiz Exp $ 1# $NetBSD: Makefile,v 1.17 2024/04/17 11:57:36 wiz Exp $
2 2
3DISTNAME= rabbiter-2.0.1 3DISTNAME= rabbiter-2.0.1
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= net ruby 5CATEGORIES= net ruby
6MASTER_SITES= ${MASTER_SITE_RUBYGEMS} 6MASTER_SITES= ${MASTER_SITE_RUBYGEMS}
7EXTRACT_SUFX= .gem 7EXTRACT_SUFX= .gem
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://rabbit-shocker.org/en/rabbiter/ 10HOMEPAGE= https://rabbit-shocker.org/en/rabbiter/
11COMMENT= Twitter client for Rabbit 11COMMENT= Twitter client for Rabbit
12LICENSE= gnu-gpl-v2 # or later 12LICENSE= gnu-gpl-v2 # or later
13 13
14DEPENDS+= ${RUBY_PKGPREFIX}-rabbit>=2.0.0:../../graphics/rabbit 14DEPENDS+= ${RUBY_PKGPREFIX}-rabbit>=2.0.0:../../graphics/rabbit
15DEPENDS+= ${RUBY_PKGPREFIX}-twitter_oauth-[0-9]*:../../security/ruby-twitter_oauth 15DEPENDS+= ${RUBY_PKGPREFIX}-twitter_oauth-[0-9]*:../../security/ruby-twitter_oauth
16DEPENDS+= ${RUBY_PKGPREFIX}-twitter-stream>=0.1.16:../../net/ruby-twitter-stream 16DEPENDS+= ${RUBY_PKGPREFIX}-twitter-stream>=0.1.16:../../net/ruby-twitter-stream
17 17
18CONFLICTS+= ruby[0-9]*-rabbit<2.0.0 
19 
20USE_RUBY_SETUP= yes 18USE_RUBY_SETUP= yes
21USE_RUBY_SETUP_PKG= yes 19USE_RUBY_SETUP_PKG= yes
22 20
23CONFIGURE_ARGS+= --siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE} \ 21CONFIGURE_ARGS+= --siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE} \
24 --siterubyver=${PREFIX}/${RUBY_VENDORLIB} \ 22 --siterubyver=${PREFIX}/${RUBY_VENDORLIB} \
25 --siterubyverarch=${PREFIX}/${RUBY_VENDORARCHLIB} 23 --siterubyverarch=${PREFIX}/${RUBY_VENDORARCHLIB}
26 24
27# let locale data to be installed with setup.rb 25# let locale data to be installed with setup.rb
28post-extract: 26post-extract:
29 ${MKDIR} ${WRKSRC}/data 27 ${MKDIR} ${WRKSRC}/data
30 ${MV} ${WRKSRC}/locale ${WRKSRC}/data/locale 28 ${MV} ${WRKSRC}/locale ${WRKSRC}/data/locale
31 29
32.include "../../lang/ruby/modules.mk" 30.include "../../lang/ruby/modules.mk"
cvs diff -r1.144 -r1.145 pkgsrc/x11/py-gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/py-gtk2/Makefile 2024/04/17 10:38:36 1.144
+++ pkgsrc/x11/py-gtk2/Makefile 2024/04/17 11:57:36 1.145
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile,v 1.144 2024/04/17 10:38:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.145 2024/04/17 11:57:36 wiz Exp $
2 2
3DISTNAME= pygtk-2.24.0 3DISTNAME= pygtk-2.24.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
5PKGREVISION= 48 5PKGREVISION= 48
6CATEGORIES= x11 python 6CATEGORIES= x11 python
7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.24/} 7MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.24/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.pygtk.org/ 11HOMEPAGE= http://www.pygtk.org/
12COMMENT= Python bindings for GTK+2 12COMMENT= Python bindings for GTK+2
13LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
14 14
15CONFLICTS= py[0-9]*-gtk<0.6.10 15CONFLICTS= py27-gtk<0.6.10
16 16
17# IOError: [Errno 2] No such file or directory: 'gtk-types.defs' 17# IOError: [Errno 2] No such file or directory: 'gtk-types.defs'
18MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
19 19
20USE_LIBTOOL= YES 20USE_LIBTOOL= YES
21PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in 21PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in
22GNU_CONFIGURE= YES 22GNU_CONFIGURE= YES
23CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} 23CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
24USE_TOOLS+= gmake pkg-config 24USE_TOOLS+= gmake pkg-config
25 25
26PY_PATCHPLIST= YES 26PY_PATCHPLIST= YES
27PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.24.0 27PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.24.0
28 28