CVS commit: pkgsrc/devel/py-meson

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Aug 23 11:07:00 UTC 2019

Modified Files:
        pkgsrc/devel/py-meson: Makefile distinfo
        pkgsrc/devel/py-meson/patches: patch-mesonbuild_dependencies_dev.py

Log Message:
py-meson: Check for the LLVM_CONFIG_PATH key properly


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/py-meson/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/py-meson/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/devel/py-meson/patches/patch-mesonbuild_dependencies_dev.py

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

Modified files:

Index: pkgsrc/devel/py-meson/Makefile
diff -u pkgsrc/devel/py-meson/Makefile:1.27 pkgsrc/devel/py-meson/Makefile:1.28
--- pkgsrc/devel/py-meson/Makefile:1.27 Thu Aug 22 17:45:51 2019
+++ pkgsrc/devel/py-meson/Makefile      Fri Aug 23 11:07:00 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2019/08/22 17:45:51 nia Exp $
+# $NetBSD: Makefile,v 1.28 2019/08/23 11:07:00 nia Exp $
 
 DISTNAME=      meson-0.51.1
-PKGREVISION=   2
+PKGREVISION=   3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=m/meson/}

Index: pkgsrc/devel/py-meson/distinfo
diff -u pkgsrc/devel/py-meson/distinfo:1.24 pkgsrc/devel/py-meson/distinfo:1.25
--- pkgsrc/devel/py-meson/distinfo:1.24 Thu Aug 22 17:45:51 2019
+++ pkgsrc/devel/py-meson/distinfo      Fri Aug 23 11:07:00 2019
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.24 2019/08/22 17:45:51 nia Exp $
+$NetBSD: distinfo,v 1.25 2019/08/23 11:07:00 nia Exp $
 
 SHA1 (meson-0.51.1.tar.gz) = 157c6924fdade6827a6cb7cdf9ab978e0ae249fa
 RMD160 (meson-0.51.1.tar.gz) = 3a07dff3ee59890cdbb05773e5ebcd776ee775db
 SHA512 (meson-0.51.1.tar.gz) = 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
 Size (meson-0.51.1.tar.gz) = 1451234 bytes
 SHA1 (patch-mesonbuild_compilers_compilers.py) = 08404a441ec8ba37c780af4fba44492021f858dd
-SHA1 (patch-mesonbuild_dependencies_dev.py) = d91d7f78cb49900baf93915bfb1ef40819945b5e
+SHA1 (patch-mesonbuild_dependencies_dev.py) = 068b7e6a105eec694c469f0bf50324385900f91f
 SHA1 (patch-mesonbuild_envconfig.py) = 82199f5ed59d368b76c932112da7d42e2f32001a
 SHA1 (patch-mesonbuild_environment.py) = 7df96002a8b625cfa08b88cfa4f0cf4d5b76cf64
 SHA1 (patch-mesonbuild_scripts_depfixer.py) = 6ed6fdfd7454b517ad5d1ebd1c387ebd73437d4b

Index: pkgsrc/devel/py-meson/patches/patch-mesonbuild_dependencies_dev.py
diff -u pkgsrc/devel/py-meson/patches/patch-mesonbuild_dependencies_dev.py:1.1 pkgsrc/devel/py-meson/patches/patch-mesonbuild_dependencies_dev.py:1.2
--- pkgsrc/devel/py-meson/patches/patch-mesonbuild_dependencies_dev.py:1.1      Thu Aug 22 17:45:51 2019
+++ pkgsrc/devel/py-meson/patches/patch-mesonbuild_dependencies_dev.py  Fri Aug 23 11:07:00 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-mesonbuild_dependencies_dev.py,v 1.1 2019/08/22 17:45:51 nia Exp $
+$NetBSD: patch-mesonbuild_dependencies_dev.py,v 1.2 2019/08/23 11:07:00 nia Exp $
 
 Allow handling different versions of LLVM in pkgsrc using LLVM_CONFIG_PATH.
 
@@ -23,7 +23,7 @@ Allow handling different versions of LLV
 -            'llvm-config-9',     # Debian development snapshot
 -            'llvm-config-devel', # FreeBSD development snapshot
 -        ]
-+        if os.environ['LLVM_CONFIG_PATH']:
++        if 'LLVM_CONFIG_PATH' in os.environ:
 +            self.tools = [ os.environ['LLVM_CONFIG_PATH'] ]
 +        else:
 +            self.tools = [