diff --git a/devel/meson/Makefile b/devel/meson/Makefile index 37da3deddba3..081591cdd4cd 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -1,42 +1,43 @@ PORTNAME= meson PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/ MAINTAINER= desktop@FreeBSD.org COMMENT= High performance build system WWW= https://mesonbuild.com/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} USES= ninja:run python shebangfix USE_PYTHON= autoplist pep517 SHEBANG_FILES= mesonbuild/rewriter.py \ mesonbuild/scripts/cmake_run_ctgt.py NO_ARCH= yes # https://github.com/mesonbuild/meson/issues/6016 TEST_ENV= ${MAKE_ENV:NCC=*:NCXX=*} # Hide from regular build to avoid accidental dependency on symlinks .if make(test) # helper_create_binary_wrapper, test_python_module, test cases/*.py BINARY_ALIAS+= python3=${PYTHON_CMD:T} python=${PYTHON_CMD:T} do-test: create-binary-alias # force if run late .endif .include .if ${PYTHON_VER} != ${PYTHON_DEFAULT} PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} .endif do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${WRKSRC}/run_unittests.py) .include diff --git a/devel/meson/files/patch-setup.py b/devel/meson/files/patch-setup.py deleted file mode 100644 index 54608af977e8..000000000000 --- a/devel/meson/files/patch-setup.py +++ /dev/null @@ -1,11 +0,0 @@ ---- setup.py.orig 2021-04-27 06:49:45 UTC -+++ setup.py -@@ -25,7 +25,7 @@ from setuptools import setup - data_files = [] - if sys.platform != 'win32': - # Only useful on UNIX-like systems -- data_files = [('share/man/man1', ['man/meson.1']), -+ data_files = [('man/man1', ['man/meson.1']), - ('share/polkit-1/actions', ['data/com.mesonbuild.install.policy'])] - - setup(data_files=data_files,)