[pkgsrc/trunk]: pkgsrc/devel/py-meson py-meson: use more specific REPLACE_PYT...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/22b40eb50655
branches:  trunk
changeset: 334804:22b40eb50655
user:      adam <adam%pkgsrc.org@localhost>
date:      Wed Jun 05 20:45:52 2019 +0000

description:
py-meson: use more specific REPLACE_PYTHON or sed might fail; test hacks are not needed anymore

diffstat:

 devel/py-meson/Makefile          |  30 ++++++++++++++----------------
 devel/py-meson/files/meson.build |   2 --
 2 files changed, 14 insertions(+), 18 deletions(-)

diffs (59 lines):

diff -r 0e9db35cc661 -r 22b40eb50655 devel/py-meson/Makefile
--- a/devel/py-meson/Makefile   Wed Jun 05 19:19:59 2019 +0000
+++ b/devel/py-meson/Makefile   Wed Jun 05 20:45:52 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/05/22 09:52:52 prlw1 Exp $
+# $NetBSD: Makefile,v 1.22 2019/06/05 20:45:52 adam Exp $
 
 DISTNAME=      meson-0.50.1
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,8 +14,7 @@
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-# c++ for tests
-USE_LANGUAGES= c c++
+USE_LANGUAGES= c c++ # c++ for tests
 
 SUBST_CLASSES+=                man
 SUBST_SED.man+=                -e "s,share/man,${PKGMANDIR},"
@@ -23,21 +22,20 @@
 SUBST_STAGE.man=       pre-configure
 SUBST_MESSAGE.man=     Fixing man page installation path.
 
-REPLACE_PYTHON+=       *.py
-REPLACE_PYTHON+=       */*.py
-REPLACE_PYTHON+=       */*/*.py
-REPLACE_PYTHON+=       */*/*/*.py
-REPLACE_PYTHON+=       */*/*/*.in
-REPLACE_PYTHON+=       */*/*/*/*.py
-REPLACE_PYTHON+=       */*/*/*/*/*.py
-
-post-extract:
-       # see https://github.com/mesonbuild/meson/issues/695
-       # patching does not work, perhaps due to spaces in path?
-       ${CP} ${FILESDIR}/meson.build ${WRKSRC}/test\ cases/frameworks/6\ gettext/src/meson.build
+REPLACE_PYTHON+=       ghwt.py
+REPLACE_PYTHON+=       meson.py
+REPLACE_PYTHON+=       mesonbuild/rewriter.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/188\ find\ override/subdir/gencodegen.py.in
+REPLACE_PYTHON+=       test\ cases/common/55\ run\ target/configure.in
+REPLACE_PYTHON+=       test\ cases/windows/8\ find\ program/test-script
+REPLACE_PYTHON+=       tools/*.py
 
 do-test:
-       ${LN} -s ${PYTHONBIN} ${BUILDLINK_DIR}/bin/python3
        cd ${WRKSRC} && ${PYTHONBIN} run_tests.py
 
 .include "../../lang/python/application.mk"
diff -r 0e9db35cc661 -r 22b40eb50655 devel/py-meson/files/meson.build
--- a/devel/py-meson/files/meson.build  Wed Jun 05 19:19:59 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-executable('intlprog', 'intlmain.c', install : true,
-  dependencies : meson.get_compiler('c').find_library('intl', required : false))