[pkgsrc/pkgsrc-2017Q3]: pkgsrc/emulators/stella Pullup ticket #5634 - request...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6fc2a9acb255
branches:  pkgsrc-2017Q3
changeset: 408595:6fc2a9acb255
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sun Nov 12 11:50:21 2017 +0000

description:
Pullup ticket #5634 - requested by sevan
emulators/stella: build fix

Revisions pulled up:
- emulators/stella/distinfo                                     1.22
- emulators/stella/patches/patch-configure                      1.4

---
   Module Name:    pkgsrc
   Committed By:   dbj
   Date:           Fri Nov  3 07:49:58 UTC 2017

   Modified Files:
           pkgsrc/emulators/stella: distinfo
           pkgsrc/emulators/stella/patches: patch-configure

   Log Message:
   tweak clang compiler version matching

diffstat:

 emulators/stella/distinfo                |   4 ++--
 emulators/stella/patches/patch-configure |  13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 70bac2943025 -r 6fc2a9acb255 emulators/stella/distinfo
--- a/emulators/stella/distinfo Sun Nov 12 11:46:10 2017 +0000
+++ b/emulators/stella/distinfo Sun Nov 12 11:50:21 2017 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.21 2017/09/14 06:04:07 dholland Exp $
+$NetBSD: distinfo,v 1.21.4.1 2017/11/12 11:50:21 bsiegert Exp $
 
 SHA1 (stella-4.7.3.tar.gz) = 7f4a4f8c88b335aee35bd2a87f3f4e109d7cb190
 RMD160 (stella-4.7.3.tar.gz) = 188ccb822f8e3eb6b231ff0d4460fd6d9bf44ccc
 SHA512 (stella-4.7.3.tar.gz) = 76028f3e4a8a7d49e2444d1d3c348060df4dfa54a7675521c3197235084f3eb44550e0df5a6b57c71c404a87d648f9a7798bb850faec7a17499b97ca4fd52bb5
 Size (stella-4.7.3.tar.gz) = 2270157 bytes
-SHA1 (patch-configure) = 7a18472b08290c043ad9e300b907ae305184641a
+SHA1 (patch-configure) = 4a86af5c1baea0989e77eb621d7e632400c4f9e5
 SHA1 (patch-src_unix_FSNodePOSIX.cxx) = 8679698480dd443bbcf9d92411ad307bfbe700b3
diff -r 70bac2943025 -r 6fc2a9acb255 emulators/stella/patches/patch-configure
--- a/emulators/stella/patches/patch-configure  Sun Nov 12 11:46:10 2017 +0000
+++ b/emulators/stella/patches/patch-configure  Sun Nov 12 11:50:21 2017 +0000
@@ -1,16 +1,23 @@
-$NetBSD: patch-configure,v 1.3 2017/09/14 06:04:07 dholland Exp $
+$NetBSD: patch-configure,v 1.3.4.1 2017/11/12 11:50:21 bsiegert Exp $
 
 Recognize more clang versions.
 Recognize solaris, dragonfly, bitrig, and darwin.
 
 --- configure.orig     2016-11-21 19:22:17.000000000 +0000
 +++ configure
-@@ -392,7 +392,7 @@ if test "$have_clang" = yes; then
+@@ -386,13 +386,13 @@ cc_check_define __GNUC__ && have_gcc=yes
+ 
+ if test "$have_clang" = yes; then
+       cxx_name=`( $cc -v ) 2>&1 | tail -n 1 | cut -d ' ' -f 1`
+-      cxx_version=$( $CXX -dM -E -x c /dev/null | grep __clang_version__ | sed 's/^.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/g' 2>&1)
++      cxx_version=$( $CXX -dM -E -x c /dev/null | grep __clang_version__ | sed 's/^[^0-9]*\([0-9.]*\).*$/\1/g' 2>&1 )
+       if test "$?" -gt 0; then
+               cxx_version="not found"
        fi
  
        case $cxx_version in
 -              [3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*|[4].[0-9].[0-9])
-+              [3].[4-9]|[3].[4-9].[0-9]|[3-6].[4-9].[0-9][-.]*|[456].[0-9].[0-9])
++              [3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*|[4-9].[0-9]*)
                        _cxx_major=`echo $cxx_version | cut -d '.' -f 1`
                        _cxx_minor=`echo $cxx_version | cut -d '.' -f 2`
                        cxx_version="$cxx_version, ok"