Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_170395377536050"
MIME-Version: 1.0
Date: Sat, 30 Dec 2023 16:29:35 +0000
From: "Thomas Klausner" <wiz@netbsd.org>
Subject: CVS commit: pkgsrc/devel/meson
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: wiz@netbsd.org
Message-Id: <20231230162935.1D764FA42@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_170395377536050
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	wiz
Date:		Sat Dec 30 16:29:35 UTC 2023

Modified Files:
	pkgsrc/devel/meson: Makefile PLIST distinfo

Log Message:
meson: update to 1.3.1.

Changes not found.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/devel/meson/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/meson/PLIST
cvs rdiff -u -r1.53 -r1.54 pkgsrc/devel/meson/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_170395377536050
Content-Disposition: inline
Content-Length: 4673
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/meson/Makefile
diff -u pkgsrc/devel/meson/Makefile:1.60 pkgsrc/devel/meson/Makefile:1.61
--- pkgsrc/devel/meson/Makefile:1.60	Sat Oct 21 14:35:49 2023
+++ pkgsrc/devel/meson/Makefile	Sat Dec 30 16:29:34 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2023/10/21 14:35:49 adam Exp $
+# $NetBSD: Makefile,v 1.61 2023/12/30 16:29:34 wiz Exp $
 
-DISTNAME=	meson-1.2.3
+DISTNAME=	meson-1.3.1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=m/meson/}
 
@@ -9,16 +9,18 @@ HOMEPAGE=	https://mesonbuild.com/
 COMMENT=	Open source build system meant to be fast and user friendly
 LICENSE=	apache-2.0
 
+TOOL_DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
+TOOL_DEPENDS+=	${PYPKGPREFIX}-wheel-[0-9]*:../../devel/py-wheel
+DEPENDS+=	ninja-build>=1.7:../../devel/ninja-build
+
 CONFLICTS=	${PYPKGPREFIX}-meson-[0-9]*
 SUPERSEDES=	${PYPKGPREFIX}-meson-[0-9]*
 
-DEPENDS+=	ninja-build>=1.7:../../devel/ninja-build
-
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
-USE_PKG_RESOURCES=	yes
-
 USE_LANGUAGES=	c c++ # c++ for tests
+# XXX only needed for tests, but itstool:test didn't work
+USE_TOOLS+=	itstool
 
 SUBST_CLASSES+=		man
 SUBST_SED.man+=		-e "s,share/man,${PKGMANDIR},"
@@ -26,23 +28,25 @@ SUBST_FILES.man+=	setup.py
 SUBST_STAGE.man=	pre-configure
 SUBST_MESSAGE.man=	Fixing man page installation path.
 
-REPLACE_PYTHON+=	ghwt.py
 REPLACE_PYTHON+=	meson.py
 REPLACE_PYTHON+=	mesonbuild/rewriter.py
-REPLACE_PYTHON+=	mesonbuild/cmake/data/run_ctgt.py
 REPLACE_PYTHON+=	run_*.py
 REPLACE_PYTHON+=	test\ cases/*/*/*.py
 REPLACE_PYTHON+=	test\ cases/*/*/*/*.py
 REPLACE_PYTHON+=	test\ cases/*/*/*/*/*.py
 REPLACE_PYTHON+=	test\ cases/common/14\ configure\ file/test.py.in
-REPLACE_PYTHON+=	test\ cases/common/187\ find\ override/subdir/gencodegen.py.in
-REPLACE_PYTHON+=	test\ cases/common/54\ run\ target/configure.in
 REPLACE_PYTHON+=	test\ cases/windows/8\ find\ program/test-script
 REPLACE_PYTHON+=	tools/*.py
 
+# Total passed tests:  435                                       
+# Total failed tests:  39
+# Total skipped tests: 273
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} run_tests.py
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/egg.mk"
+.include "../../lang/python/wheel.mk"
+# the following are only for tests
+.include "../../devel/gettext-tools/msgfmt-desktop.mk"
+.include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/meson/PLIST
diff -u pkgsrc/devel/meson/PLIST:1.17 pkgsrc/devel/meson/PLIST:1.18
--- pkgsrc/devel/meson/PLIST:1.17	Wed Jul 19 05:36:20 2023
+++ pkgsrc/devel/meson/PLIST	Sat Dec 30 16:29:34 2023
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.17 2023/07/19 05:36:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2023/12/30 16:29:34 wiz Exp $
 bin/meson
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/COPYING
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/mesonbuild/__init__.py
 ${PYSITELIB}/mesonbuild/__init__.pyc
 ${PYSITELIB}/mesonbuild/__init__.pyo

Index: pkgsrc/devel/meson/distinfo
diff -u pkgsrc/devel/meson/distinfo:1.53 pkgsrc/devel/meson/distinfo:1.54
--- pkgsrc/devel/meson/distinfo:1.53	Sat Oct 21 14:35:49 2023
+++ pkgsrc/devel/meson/distinfo	Sat Dec 30 16:29:34 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.53 2023/10/21 14:35:49 adam Exp $
+$NetBSD: distinfo,v 1.54 2023/12/30 16:29:34 wiz Exp $
 
-BLAKE2s (meson-1.2.3.tar.gz) = dd981b78cc856ace94a93c1254152009b05796e4b10873f81584435d264cbc2e
-SHA512 (meson-1.2.3.tar.gz) = cdcadc731effc1ffb2de98b795ba37955f934ed9b54b9f7f3ac5fe96ab33268d4de4fce734a4c2ef7d2ecc5051616df127e1f8665e197ff954310bf1483b81fc
-Size (meson-1.2.3.tar.gz) = 2184484 bytes
+BLAKE2s (meson-1.3.1.tar.gz) = ba144647d4e09e7a80930d4fcc0301c7762683fe3a194c49c14847109b41c585
+SHA512 (meson-1.3.1.tar.gz) = 6e694beb70329535faca9405358c04e2fd5a490b0c0d2678d5831b7de3477e0fcf4f6a242f1bc6218da04ac4f6e096ee53cdf273c6b6a38a35d370e8c16694ba
+Size (meson-1.3.1.tar.gz) = 2222386 bytes
 SHA1 (patch-mesonbuild_compilers_detect.py) = 433c20bcf613817f0df9a73859909f8c257af243
 SHA1 (patch-mesonbuild_compilers_mixins_gnu.py) = 34c2f6f215d5aed1d6c422187f733d0d488ebb4f
 SHA1 (patch-mesonbuild_dependencies_dev.py) = 2165f1ee4ad5d9689eb2fb7e94841503336070b9


--_----------=_170395377536050--