*: fix some CONFLICTS lines

Noted by riastradh@ in PR 58155.
NetBSD · Apr 17, 2024 · 6248477 · 6248477
1 parent 37c7afe
commit 6248477
Show file tree

Hide file tree

Showing 24 changed files with 53 additions and 62 deletions.
diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2022/01/10 08:49:05 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2024/04/17 10:38:33 wiz Exp $
 
 DISTNAME=		pyao-0.82
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -16,7 +16,7 @@ CONFIG_SHELL=		${PYTHONBIN}
 CONFIGURE_SCRIPT=	config_unix.py
 CONFIGURE_ARGS+=	--prefix ${PREFIX}
 
-CONFLICTS=		${PYPKGPREFIX}-pyao-[0-9]*
+CONFLICTS=		py[0-9]*-pyao-[0-9]*
 
 PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 0.82
 

diff --git a/audio/py-daap/Makefile b/audio/py-daap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/01/10 09:00:46 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2024/04/17 10:38:33 wiz Exp $
 
 DISTNAME=	PythonDaap-0.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/PythonD/d/}
@@ -12,7 +12,8 @@ COMMENT=	Python binding for DAAP
 LICENSE=	gnu-lgpl-v2.1
 
 PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 0.7
-CONFLICTS=	${PYPKGPREFIX}-PythonDaap-[0-9]*
+
+CONFLICTS=	py[0-9]*-PythonDaap-[0-9]*
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/py-serial/Makefile b/comms/py-serial/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2022/01/05 15:40:58 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2024/04/17 10:38:33 wiz Exp $
 
 DISTNAME=	pyserial-3.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://github.com/pyserial/pyserial
 COMMENT=	Python Serial Port Extension
 LICENSE=	modified-bsd
 
-CONFLICTS+=	${PYPKGPREFIX}-pyserial-[0-9]*
+CONFLICTS+=	py[0-9]*-pyserial-[0-9]*
 
 USE_LANGUAGES=	# none
 

diff --git a/databases/phpmyadmin5/Makefile b/databases/phpmyadmin5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/04/23 11:04:50 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2024/04/17 10:38:33 wiz Exp $
 
 DISTNAME=	phpMyAdmin-5.1.3-all-languages
 PKGNAME=	${PHP_PKG_PREFIX}-${DISTNAME:S/-all-languages//:tl}
@@ -27,8 +27,6 @@ PHP_VERSIONS_INCOMPATIBLE=	56
 
 .include "../../lang/php/phpversion.mk"
 
-CONFLICTS+=			${PHP_PKG_PREFIX}-phpmyadmin-4..*
-
 USE_LANGUAGES=	# none
 USE_TOOLS+=	pax
 

diff --git a/databases/py-pypika-tortoise/Makefile b/databases/py-pypika-tortoise/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2023/11/23 07:56:01 adam Exp $
+# $NetBSD: Makefile,v 1.2 2024/04/17 10:38:34 wiz Exp $
 
 DISTNAME=	pypika-tortoise-0.1.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,10 +10,10 @@ HOMEPAGE=	https://github.com/tortoise/pypika-tortoise
 COMMENT=	Forked from pypika and streamline just for tortoise-orm
 LICENSE=	apache-2.0
 
-CONFLICTS=	${PYPKGPREFIX}-pypika-[0-9]*
-
 TOOL_DEPENDS+=	${PYPKGPREFIX}-poetry-core>=1.0.0:../../devel/py-poetry-core
 
+CONFLICTS=	py[0-9]*-pypika-[0-9]*
+
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27

diff --git a/databases/py-pypika/Makefile b/databases/py-pypika/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2023/11/23 08:03:59 adam Exp $
+# $NetBSD: Makefile,v 1.26 2024/04/17 10:38:34 wiz Exp $
 
 DISTNAME=	PyPika-0.48.9
 PKGREVISION=	1
@@ -11,11 +11,11 @@ HOMEPAGE=	https://github.com/kayak/pypika
 COMMENT=	SQL query builder API for Python
 LICENSE=	apache-2.0
 
-CONFLICTS=	${PYPKGPREFIX}-pypika-tortoise-[0-9]*
-
 TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 
+CONFLICTS=	py[0-9]*-pypika-tortoise-[0-9]*
+
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27

diff --git a/devel/lua-bit32/Makefile b/devel/lua-bit32/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/07/11 15:14:29 nia Exp $
+# $NetBSD: Makefile,v 1.5 2024/04/17 10:38:34 wiz Exp $
 
 # Keep versioning in sync with the luarocks rockspec.
 DISTNAME=	lua-compat53-0.9
@@ -13,8 +13,8 @@ HOMEPAGE=	https://luarocks.org/modules/siffiejoe/bit32
 COMMENT=	Lua 5.2 bit manipulation library
 LICENSE=	mit
 
-CONFLICTS+=	${LUA_PKGPREFIX}-bitlib-[0-9]*
-SUPERSEDES+=	${LUA_PKGPREFIX}-bitlib-[0-9]*
+CONFLICTS+=	lua[0-9]*-bitlib-[0-9]*
+SUPERSEDES+=	lua[0-9]*-bitlib-[0-9]*
 
 INSTALLATION_DIRS+=	${LUA_CDIR}
 

diff --git a/devel/py-at-spi2/Makefile b/devel/py-at-spi2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2022/01/28 11:54:20 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2024/04/17 10:38:34 wiz Exp $
 
 DISTNAME=	pyatspi-2.38.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pyatspi/at-spi2/}
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 PY_PATCHPLIST=	yes
 
-CONFLICTS=	${PYPKGPREFIX}-at-spi-[0-9]*
+CONFLICTS=	py[0-9]*-at-spi-[0-9]*
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 

diff --git a/devel/py-gobject/Makefile.common b/devel/py-gobject/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2018/04/14 09:48:36 adam Exp $
+# $NetBSD: Makefile.common,v 1.23 2024/04/17 10:38:34 wiz Exp $
 #
 # used by devel/py-gobject/Makefile
 # used by devel/py-gobject-shared/Makefile
@@ -25,4 +25,4 @@ DISTINFO_FILE=		${.CURDIR}/../../devel/py-gobject/distinfo
 
 PKGCONFIG_OVERRIDE+=	pygobject-2.0.pc.in
 PY_PATCHPLIST=		yes
-CONFLICTS+=		${PYPKGPREFIX}-gtk2<2.8.4
+CONFLICTS+=		py[0-9]*-gtk2<2.8.4
diff --git a/devel/py-gobject3/Makefile.common b/devel/py-gobject3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2023/06/06 10:41:43 adam Exp $
+# $NetBSD: Makefile.common,v 1.20 2024/04/17 10:38:34 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+=	${PYPKGPREFIX}-gtk2<2.8.4
-CONFLICTS+=	${PYPKGPREFIX}-gobject<2.28.6nb4
+CONFLICTS+=	py[0-9]*-gtk2<2.8.4
+CONFLICTS+=	py[0-9]*-gobject<2.28.6nb4
diff --git a/devel/ruby-pkg-config/Makefile b/devel/ruby-pkg-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2023/12/17 14:19:44 taca Exp $
+# $NetBSD: Makefile,v 1.40 2024/04/17 10:38:34 wiz Exp $
 
 DISTNAME=	pkg-config-1.5.6
 CATEGORIES=	devel
@@ -8,7 +8,7 @@ HOMEPAGE=	https://github.com/ruby-gnome/pkg-config
 COMMENT=	Pure Ruby implementation of pkg-config
 LICENSE=	gnu-lgpl-v2.1
 
-CONFLICTS+=	${RUBY_PKGPREFIX}-gnome2-glib<0.90.0
+CONFLICTS+=	ruby[0-9]*-gnome2-glib<0.90.0
 
 USE_LANGUAGES=	# none
 

diff --git a/graphics/py-Pillow/Makefile b/graphics/py-Pillow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2024/04/02 05:55:48 adam Exp $
+# $NetBSD: Makefile,v 1.81 2024/04/17 10:38:34 wiz Exp $
 
 DISTNAME=	pillow-10.3.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^p/P/}
@@ -10,17 +10,17 @@ HOMEPAGE=	https://python-pillow.org/
 COMMENT=	Python Imaging Library (Fork)
 LICENSE=	hpnd
 
-USE_TOOLS+=	pkg-config
-
-CONFLICTS+=	${PYPKGPREFIX}-imaging-[0-9]*
-
 TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools>=67.8:../../devel/py-setuptools
 TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=	${PYPKGPREFIX}-olefile-[0-9]*:../../devel/py-olefile
 TEST_DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-timeout-[0-9]*:../../devel/py-test-timeout
 
+USE_TOOLS+=	pkg-config
+
+CONFLICTS+=	py[0-9]*-imaging-[0-9]*
+
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 DISTUTILS_BUILDDIR_IN_TEST_ENV=	yes

diff --git a/graphics/py-Pillow6/Makefile b/graphics/py-Pillow6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2023/11/12 13:22:12 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2024/04/17 10:38:35 wiz Exp $
 
 DISTNAME=	Pillow-6.2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -19,7 +19,7 @@ USE_TOOLS+=	pkg-config
 
 PYTHON_VERSIONS_ACCEPTED=	27
 
-CONFLICTS+=	${PYPKGPREFIX}-imaging-[0-9]*
+CONFLICTS+=	py[0-9]*-imaging-[0-9]*
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"

diff --git a/lang/ruby-cucumber-gherkin/Makefile b/lang/ruby-cucumber-gherkin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2023/12/17 17:26:07 taca Exp $
+# $NetBSD: Makefile,v 1.9 2024/04/17 10:38:35 wiz Exp $
 
 DISTNAME=	cucumber-gherkin-27.0.0
 CATEGORIES=	lang
@@ -10,7 +10,7 @@ LICENSE=	mit
 
 DEPENDS+=	${RUBY_PKGPREFIX}-cucumber-messages>=19.1.4<23:../../devel/ruby-cucumber-messages
 
-CONFLICTS+=	${RUBY_PKGPREFIX}-gherkin-[0-9]*
+CONFLICTS+=	ruby[0-9]*-gherkin-[0-9]*
 
 USE_LANGUAGES=	# none
 

diff --git a/math/py-roman/Makefile b/math/py-roman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2023/05/26 19:44:49 adam Exp $
+# $NetBSD: Makefile,v 1.17 2024/04/17 10:38:35 wiz Exp $
 
 DISTNAME=	roman-4.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/zopefoundation/roman
 COMMENT=	Integer to Roman numerals converter for Python
 LICENSE=	zpl-2.1
 
-CONFLICTS+=	${PYPKGPREFIX}-docutils<=0.7
+CONFLICTS+=	py[0-9]*-docutils<=0.7
 
 USE_LANGUAGES=	# none
 

diff --git a/net/py-Socks/Makefile b/net/py-Socks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/01/04 20:54:24 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2024/04/17 10:38:35 wiz Exp $
 
 DISTNAME=	PySocks-1.7.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Py//}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://github.com/Anorov/PySocks
 COMMENT=	Python SOCKS client module
 LICENSE=	modified-bsd
 
-CONFLICTS=	${PYPKGPREFIX}-SocksiPy-branch-[0-9]*
+CONFLICTS=	py[0-9]*-SocksiPy-branch-[0-9]*
 
 USE_LANGUAGES=	# none
 

diff --git a/net/py-adns/Makefile b/net/py-adns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2022/01/10 07:52:20 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2024/04/17 10:38:35 wiz Exp $
 
 DISTNAME=	adns-python-1.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://pypi.python.org/pypi/adns-python/
 COMMENT=	Python interface to the GNU asynchronous DNS resolver library
 LICENSE=	gnu-gpl-v2
 
-CONFLICTS=	${PYPKGPREFIX}-adns-python-[0-9]*
+CONFLICTS=	py[0-9]*-adns-python-[0-9]*
 
 PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 1.2.1
 

diff --git a/net/py-socksipy-branch/Makefile b/net/py-socksipy-branch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2022/01/22 14:31:59 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2024/04/17 10:38:35 wiz Exp $
 
 DISTNAME=	SocksiPy-branch-1.01
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://code.google.com/p/socksipy-branch/
 COMMENT=	Python SOCKS module
 LICENSE=	modified-bsd
 
-CONFLICTS=	${PYPKGPREFIX}-Socks-[0-9]*
+CONFLICTS=	py[0-9]*-Socks-[0-9]*
 
 .include "../../lang/python/pyversion.mk"
 

diff --git a/net/rabbiter/Makefile b/net/rabbiter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2022/10/10 03:36:49 taca Exp $
+# $NetBSD: Makefile,v 1.16 2024/04/17 10:38:35 wiz Exp $
 
 DISTNAME=	rabbiter-2.0.1
 PKGREVISION=	2
@@ -15,7 +15,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-rabbit>=2.0.0:../../graphics/rabbit
 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_PKGPREFIX}-rabbit<2.0.0
+CONFLICTS+=	ruby[0-9]*-rabbit<2.0.0
 
 USE_RUBY_SETUP=		yes
 USE_RUBY_SETUP_PKG=	yes

diff --git a/security/passphrase/Makefile b/security/passphrase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2023/08/14 05:25:10 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2024/04/17 10:38:35 wiz Exp $
 
 DISTNAME=	1.5
 PKGNAME=	passphrase-1.5
@@ -22,9 +22,7 @@ ZIGBUILDARGS=		-Dpie=true
 ZIGBUILDARGS+=		-Dstrip=true
 .endif
 
-.include "../../lang/python/pyversion.mk"
-CONFLICTS+=	${PYPKGPREFIX}-pyutil-[0-9]*
-
+CONFLICTS+=	py[0-9]*-pyutil-[0-9]*
 
 SUBST_CLASSES+=		mandir
 SUBST_STAGE.mandir=	pre-build

diff --git a/security/php-ssh2-0/Makefile b/security/php-ssh2-0/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2023/10/24 22:10:56 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.7 2024/04/17 10:38:36 wiz Exp $
 
 MODNAME=		ssh2
 PECL_VERSION=		0.13
@@ -11,8 +10,6 @@ COMMENT=		PHP bindings to the functions of libssh2
 PKGREVISION=		2
 LICENSE=		php
 
-CONFLICTS=	${PHP_PKG_PREFIX}-${MODNAME}>=1.0
-
 PHP_VERSIONS_ACCEPTED=	56
 
 CONFIGURE_ARGS+=	--with-ssh2=${PREFIX}

diff --git a/security/php-ssh2/Makefile b/security/php-ssh2/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2023/10/24 22:10:56 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.19 2024/04/17 10:38:36 wiz Exp $
 
 MODNAME=		ssh2
 PECL_VERSION=		1.3.1
@@ -11,8 +10,6 @@ COMMENT=		PHP bindings to the functions of libssh2
 PKGREVISION=		1
 LICENSE=		php
 
-CONFLICTS=	${PHP_PKG_PREFIX}-${MODNAME}<1.0
-
 CONFIGURE_ARGS+=	--with-ssh2=${PREFIX}
 
 PHP_VERSIONS_INCOMPATIBLE=	56

diff --git a/textproc/py-gnosis-utils/Makefile b/textproc/py-gnosis-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/10/23 06:37:54 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2024/04/17 10:38:36 wiz Exp $
 
 DISTNAME=	Gnosis_Utils-1.2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Gnosis_Utils/gnosis-utils/}
@@ -15,7 +15,7 @@ USE_LANGUAGES=	#none
 
 PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 1.2.2
 
-CONFLICTS+=	${PYPKGPREFIX}-Gnosis-Utils-[0-9]*
+CONFLICTS+=	py[0-9]*-Gnosis-Utils-[0-9]*
 
 .include "../../lang/python/batteries-included.mk"
 .include "../../lang/python/egg.mk"

diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.143 2024/04/07 07:35:26 wiz Exp $
+# $NetBSD: Makefile,v 1.144 2024/04/17 10:38: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=	${PYPKGPREFIX}-gtk<0.6.10
+CONFLICTS=	py[0-9]*-gtk<0.6.10
 
 # IOError: [Errno 2] No such file or directory: 'gtk-types.defs'
 MAKE_JOBS_SAFE=	no