Received: by mail.netbsd.org (Postfix, from userid 605) id 67AE684DC9; Thu, 23 Apr 2020 07:00:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E06D484D6C for ; Thu, 23 Apr 2020 07:00:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id AIV8lZVebpNv for ; Thu, 23 Apr 2020 07:00:09 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4E81484D33 for ; Thu, 23 Apr 2020 07:00:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 48711FB27; Thu, 23 Apr 2020 07:00:09 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1587625209290320" MIME-Version: 1.0 Date: Thu, 23 Apr 2020 07:00:09 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/devel/meson To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20200423070009.48711FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1587625209290320 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Thu Apr 23 07:00:09 UTC 2020 Modified Files: pkgsrc/devel/meson: Makefile distinfo Added Files: pkgsrc/devel/meson/patches: patch-mesonbuild_modules_pkgconfig.py Log Message: meson: disable FreeBSD specific condition pkgsrc changes: --------------- * Add a patch that reverts https://github.com/mesonbuild/meson/commit/aba8792. This commit introduced a condition to match FreeBSD path norm for pkg-config files. This condition is incompatible with the pkgsrc conventions. * Bump revision. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/meson/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/meson/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1587625209290320 Content-Disposition: inline Content-Length: 2935 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.9 pkgsrc/devel/meson/Makefile:1.10 --- pkgsrc/devel/meson/Makefile:1.9 Wed Apr 1 14:51:05 2020 +++ pkgsrc/devel/meson/Makefile Thu Apr 23 07:00:08 2020 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2020/04/01 14:51:05 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2020/04/23 07:00:08 triaxx Exp $ DISTNAME= meson-0.54.0 +PKGREVISION= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=m/meson/} Index: pkgsrc/devel/meson/distinfo diff -u pkgsrc/devel/meson/distinfo:1.6 pkgsrc/devel/meson/distinfo:1.7 --- pkgsrc/devel/meson/distinfo:1.6 Wed Apr 1 14:51:05 2020 +++ pkgsrc/devel/meson/distinfo Thu Apr 23 07:00:08 2020 @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.6 2020/04/01 14:51:05 wiz Exp $ +$NetBSD: distinfo,v 1.7 2020/04/23 07:00:08 triaxx Exp $ SHA1 (meson-0.54.0.tar.gz) = fde1464f3c5ec73ecaa7889743f35746f0a4855b RMD160 (meson-0.54.0.tar.gz) = 446e9e74451353f3e936941decf30cef32fcd66c SHA512 (meson-0.54.0.tar.gz) = e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7 Size (meson-0.54.0.tar.gz) = 1683491 bytes SHA1 (patch-mesonbuild_dependencies_dev.py) = ce9b93369d771f7e24208923b58af769e51bcd98 +SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 7b5dff2fbc29199a2b1b18a0073e73461c517744 SHA1 (patch-mesonbuild_scripts_depfixer.py) = 6ed6fdfd7454b517ad5d1ebd1c387ebd73437d4b Added files: Index: pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py diff -u /dev/null pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py:1.1 --- /dev/null Thu Apr 23 07:00:09 2020 +++ pkgsrc/devel/meson/patches/patch-mesonbuild_modules_pkgconfig.py Thu Apr 23 07:00:09 2020 @@ -0,0 +1,19 @@ +$NetBSD: patch-mesonbuild_modules_pkgconfig.py,v 1.1 2020/04/23 07:00:09 triaxx Exp $ + +* Revert https://github.com/mesonbuild/meson/commit/aba8792 that introduced + a condition to match FreeBSD path norm for pkg-config files. + +--- mesonbuild/modules/pkgconfig.py.orig 2020-03-23 17:22:09.000000000 +0000 ++++ mesonbuild/modules/pkgconfig.py +@@ -496,10 +496,7 @@ class PkgConfigModule(ExtensionModule): + pcfile = filebase + '.pc' + pkgroot = kwargs.get('install_dir', default_install_dir) + if pkgroot is None: +- if mesonlib.is_freebsd(): +- pkgroot = os.path.join(state.environment.coredata.get_builtin_option('prefix'), 'libdata', 'pkgconfig') +- else: +- pkgroot = os.path.join(state.environment.coredata.get_builtin_option('libdir'), 'pkgconfig') ++ pkgroot = os.path.join(state.environment.coredata.get_builtin_option('libdir'), 'pkgconfig') + if not isinstance(pkgroot, str): + raise mesonlib.MesonException('Install_dir must be a string.') + self.generate_pkgconfig_file(state, deps, subdirs, name, description, url, --_----------=_1587625209290320--