[pkgsrc/trunk]: pkgsrc/devel/meson only match '++' at the end of the string i...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6e4990a4a3d3
branches:  trunk
changeset: 436189:6e4990a4a3d3
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Jul 28 23:28:23 2020 +0000

description:
only match '++' at the end of the string in previous

diffstat:

 devel/meson/distinfo                                |  4 ++--
 devel/meson/patches/patch-mesonbuild_environment.py |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r ffb6a3028d27 -r 6e4990a4a3d3 devel/meson/distinfo
--- a/devel/meson/distinfo      Tue Jul 28 22:43:01 2020 +0000
+++ b/devel/meson/distinfo      Tue Jul 28 23:28:23 2020 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2020/07/28 22:43:01 tnn Exp $
+$NetBSD: distinfo,v 1.13 2020/07/28 23:28:23 tnn Exp $
 
 SHA1 (meson-0.55.0.tar.gz) = 266c35ad4ea0b526e3437500b99a0745adf82d92
 RMD160 (meson-0.55.0.tar.gz) = 59db72dded4bf8dfb53dd5eb00d229e377a2ae80
 SHA512 (meson-0.55.0.tar.gz) = bf2a5bab19deb433e363bf569527dbd1a9e8c0f77482aa077abbaa480dadc396e43148957473a31ecd9d3965578d2f7b7dc8808839c619ae2c0d419aed72d4e2
 Size (meson-0.55.0.tar.gz) = 1742882 bytes
 SHA1 (patch-mesonbuild_dependencies_dev.py) = ce9b93369d771f7e24208923b58af769e51bcd98
-SHA1 (patch-mesonbuild_environment.py) = 6bb8a8743a0706c8845a20bf297841af6c1de4b5
+SHA1 (patch-mesonbuild_environment.py) = d0340ea4149c7ed89fd64d0f1631721f7b9f04aa
 SHA1 (patch-mesonbuild_modules_pkgconfig.py) = 7b5dff2fbc29199a2b1b18a0073e73461c517744
 SHA1 (patch-mesonbuild_scripts_depfixer.py) = 4c212e4f25f5cf3fb993b41993580805d57695b3
diff -r ffb6a3028d27 -r 6e4990a4a3d3 devel/meson/patches/patch-mesonbuild_environment.py
--- a/devel/meson/patches/patch-mesonbuild_environment.py       Tue Jul 28 22:43:01 2020 +0000
+++ b/devel/meson/patches/patch-mesonbuild_environment.py       Tue Jul 28 23:28:23 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-mesonbuild_environment.py,v 1.3 2020/07/28 22:43:01 tnn Exp $
+$NetBSD: patch-mesonbuild_environment.py,v 1.4 2020/07/28 23:28:23 tnn Exp $
 
 Specify c++ language when making CXX parse standard input.
 Fixes problem where graphics/MesaLib fails to build due to:
@@ -14,7 +14,7 @@
          # gcc, g++, and gfortran all support these arguments
 -        args = compiler + ['-E', '-dM', '-']
 +        args = compiler + ['-E', '-dM' ]
-+        if "++" in compiler[0]:
++        if compiler[0].endswith('++'):
 +          args += [ '-x', 'c++' ]
 +        args += [ '-' ]
          p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
@@ -26,7 +26,7 @@
          """
 -        args = compiler + ['-E', '-dM', '-']
 +        args = compiler + ['-E', '-dM' ]
-+        if "++" in compiler[0]:
++        if compiler[0].endswith('++'):
 +          args += [ '-x', 'c++' ]
 +        args += [ '-' ]
          p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)