Date: Tue, 15 Nov 2016 06:51:38 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426146 - in head/devel/meson: . files Message-ID: <201611150651.uAF6pcdl015044@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Tue Nov 15 06:51:38 2016 New Revision: 426146 URL: https://svnweb.freebsd.org/changeset/ports/426146 Log: Update meson to 0.36.0. Deleted: head/devel/meson/files/patch-mesonbuild_compilers-1.py head/devel/meson/files/patch-mesonbuild_compilers-2.py head/devel/meson/files/patch-mesonbuild_compilers-3.py head/devel/meson/files/patch-mesonbuild_compilers-4.py head/devel/meson/files/patch-mesonbuild_scripts_scanbuild.py Modified: head/devel/meson/Makefile head/devel/meson/distinfo head/devel/meson/files/patch-setup.py Modified: head/devel/meson/Makefile ============================================================================== --- head/devel/meson/Makefile Tue Nov 15 06:37:12 2016 (r426145) +++ head/devel/meson/Makefile Tue Nov 15 06:51:38 2016 (r426146) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= meson -PORTVERSION= 0.35.1 +PORTVERSION= 0.36.0 CATEGORIES= devel python MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/ Modified: head/devel/meson/distinfo ============================================================================== --- head/devel/meson/distinfo Tue Nov 15 06:37:12 2016 (r426145) +++ head/devel/meson/distinfo Tue Nov 15 06:51:38 2016 (r426146) @@ -1,3 +1,3 @@ -TIMESTAMP = 1478286789 -SHA256 (meson-0.35.1.tar.gz) = b47edb53bd7554cb7890a32399fdf6402e8079379393893ab3dec8fffcbfba2c -SIZE (meson-0.35.1.tar.gz) = 510957 +TIMESTAMP = 1479164234 +SHA256 (meson-0.36.0.tar.gz) = dc087ec40dacb5e256e6ee6467f2d004faf4ef284d3c1ce5e89faa1e16540950 +SIZE (meson-0.36.0.tar.gz) = 458992 Modified: head/devel/meson/files/patch-setup.py ============================================================================== --- head/devel/meson/files/patch-setup.py Tue Nov 15 06:37:12 2016 (r426145) +++ head/devel/meson/files/patch-setup.py Tue Nov 15 06:51:38 2016 (r426146) @@ -1,59 +1,10 @@ -From 999669e8501501d4618588008e4bf4353a1ace2a Mon Sep 17 00:00:00 2001 -From: Patrick Griffis <tingping@tingping.se> -Date: Fri, 30 Sep 2016 23:28:40 -0400 -Subject: [PATCH] setup.py: On Unix install scripts without .py suffix - ---- setup.py.orig 2016-10-17 17:38:14 UTC +--- setup.py.orig 2016-11-13 20:01:34 UTC +++ setup.py -@@ -14,7 +14,9 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - -+import os - import sys -+from os import path - - if sys.version_info[0] < 3: - print('Tried to install with Python 2, Meson only supports Python 3.') -@@ -25,8 +27,32 @@ if sys.version_info[0] < 3: - # plain distutils when setuptools is not available. - try: - from setuptools import setup -+ from setuptools.command.install_scripts import install_scripts as orig - except ImportError: - from distutils.core import setup -+ from distutils.command.install_scripts import install_scripts as orig -+ -+from distutils.file_util import copy_file -+from distutils.dir_util import mkpath -+from stat import ST_MODE -+ -+class install_scripts(orig): -+ def run(self): -+ if sys.platform == 'win32': -+ super().run() -+ return -+ -+ self.outfiles = [] -+ if not self.dry_run: -+ mkpath(self.install_dir) -+ -+ # We want the files to be installed without a suffix on Unix -+ for infile in self.get_inputs(): -+ in_stripped = infile[:-3] if infile.endswith('.py') else infile -+ outfile = path.join(self.install_dir, in_stripped) -+ # NOTE: Mode is preserved by default -+ copy_file(infile, outfile, dry_run=self.dry_run) -+ self.outfiles.append(outfile) - - from mesonbuild.coredata import version - -@@ -46,7 +72,8 @@ setup(name='meson', - 'mesonconf.py', +@@ -73,7 +73,7 @@ setup(name='meson', 'mesonintrospect.py', 'wraptool.py'], + cmdclass={'install_scripts': install_scripts}, - data_files=[('share/man/man1', ['man/meson.1', -+ cmdclass={'install_scripts': install_scripts}, + data_files=[('man/man1' , ['man/meson.1', 'man/mesonconf.1', 'man/mesonintrospect.1',
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611150651.uAF6pcdl015044>