pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/meson



Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr 17 10:28:23 UTC 2024

Modified Files:
        pkgsrc/devel/meson: Makefile

Log Message:
meson: simplify SUPERSEDES/CONFLICTS


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/devel/meson/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/meson/Makefile
diff -u pkgsrc/devel/meson/Makefile:1.64 pkgsrc/devel/meson/Makefile:1.65
--- pkgsrc/devel/meson/Makefile:1.64    Tue Apr 16 07:14:18 2024
+++ pkgsrc/devel/meson/Makefile Wed Apr 17 10:28:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2024/04/16 07:14:18 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2024/04/17 10:28:23 wiz Exp $
 
 DISTNAME=      meson-1.4.0
 CATEGORIES=    devel python
@@ -13,16 +13,8 @@ TOOL_DEPENDS+=       ${PYPKGPREFIX}-setuptools
 TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
 DEPENDS+=      ninja-build>=1.7:../../devel/ninja-build
 
-CONFLICTS+=    py38-meson-[0-9]*
-CONFLICTS+=    py39-meson-[0-9]*
-CONFLICTS+=    py310-meson-[0-9]*
-CONFLICTS+=    py311-meson-[0-9]*
-CONFLICTS+=    py312-meson-[0-9]*
-SUPERSEDES+=   py38-meson-[0-9]*
-SUPERSEDES+=   py39-meson-[0-9]*
-SUPERSEDES+=   py310-meson-[0-9]*
-SUPERSEDES+=   py311-meson-[0-9]*
-SUPERSEDES+=   py312-meson-[0-9]*
+CONFLICTS+=    py[0-9]*-meson-[0-9]*
+SUPERSEDES+=   py[0-9]*-meson-[0-9]*
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 



Home | Main Index | Thread Index | Old Index