Sun Nov 12 11:50:21 2017 UTC ()
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


(bsiegert)
diff -r1.21 -r1.21.4.1 pkgsrc/emulators/stella/distinfo
diff -r1.3 -r1.3.4.1 pkgsrc/emulators/stella/patches/patch-configure
cvs diff -r1.21 -r1.21.4.1 pkgsrc/emulators/stella/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/stella/distinfo 2017/09/14 06:04:07 1.21
+++ pkgsrc/emulators/stella/distinfo 2017/11/12 11:50:21 1.21.4.1
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.21 2017/09/14 06:04:07 dholland Exp $ 1$NetBSD: distinfo,v 1.21.4.1 2017/11/12 11:50:21 bsiegert Exp $
2 2
3SHA1 (stella-4.7.3.tar.gz) = 7f4a4f8c88b335aee35bd2a87f3f4e109d7cb190 3SHA1 (stella-4.7.3.tar.gz) = 7f4a4f8c88b335aee35bd2a87f3f4e109d7cb190
4RMD160 (stella-4.7.3.tar.gz) = 188ccb822f8e3eb6b231ff0d4460fd6d9bf44ccc 4RMD160 (stella-4.7.3.tar.gz) = 188ccb822f8e3eb6b231ff0d4460fd6d9bf44ccc
5SHA512 (stella-4.7.3.tar.gz) = 76028f3e4a8a7d49e2444d1d3c348060df4dfa54a7675521c3197235084f3eb44550e0df5a6b57c71c404a87d648f9a7798bb850faec7a17499b97ca4fd52bb5 5SHA512 (stella-4.7.3.tar.gz) = 76028f3e4a8a7d49e2444d1d3c348060df4dfa54a7675521c3197235084f3eb44550e0df5a6b57c71c404a87d648f9a7798bb850faec7a17499b97ca4fd52bb5
6Size (stella-4.7.3.tar.gz) = 2270157 bytes 6Size (stella-4.7.3.tar.gz) = 2270157 bytes
7SHA1 (patch-configure) = 7a18472b08290c043ad9e300b907ae305184641a 7SHA1 (patch-configure) = 4a86af5c1baea0989e77eb621d7e632400c4f9e5
8SHA1 (patch-src_unix_FSNodePOSIX.cxx) = 8679698480dd443bbcf9d92411ad307bfbe700b3 8SHA1 (patch-src_unix_FSNodePOSIX.cxx) = 8679698480dd443bbcf9d92411ad307bfbe700b3
cvs diff -r1.3 -r1.3.4.1 pkgsrc/emulators/stella/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/emulators/stella/patches/patch-configure 2017/09/14 06:04:07 1.3
+++ pkgsrc/emulators/stella/patches/patch-configure 2017/11/12 11:50:21 1.3.4.1
@@ -1,25 +1,32 @@ @@ -1,25 +1,32 @@
1$NetBSD: patch-configure,v 1.3 2017/09/14 06:04:07 dholland Exp $ 1$NetBSD: patch-configure,v 1.3.4.1 2017/11/12 11:50:21 bsiegert Exp $
2 2
3Recognize more clang versions. 3Recognize more clang versions.
4Recognize solaris, dragonfly, bitrig, and darwin. 4Recognize solaris, dragonfly, bitrig, and darwin.
5 5
6--- configure.orig 2016-11-21 19:22:17.000000000 +0000 6--- configure.orig 2016-11-21 19:22:17.000000000 +0000
7+++ configure 7+++ configure
8@@ -392,7 +392,7 @@ if test "$have_clang" = yes; then 8@@ -386,13 +386,13 @@ cc_check_define __GNUC__ && have_gcc=yes
 9
 10 if test "$have_clang" = yes; then
 11 cxx_name=`( $cc -v ) 2>&1 | tail -n 1 | cut -d ' ' -f 1`
 12- 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)
 13+ cxx_version=$( $CXX -dM -E -x c /dev/null | grep __clang_version__ | sed 's/^[^0-9]*\([0-9.]*\).*$/\1/g' 2>&1 )
 14 if test "$?" -gt 0; then
 15 cxx_version="not found"
9 fi 16 fi
10  17
11 case $cxx_version in 18 case $cxx_version in
12- [3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*|[4].[0-9].[0-9]) 19- [3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*|[4].[0-9].[0-9])
13+ [3].[4-9]|[3].[4-9].[0-9]|[3-6].[4-9].[0-9][-.]*|[456].[0-9].[0-9]) 20+ [3].[4-9]|[3].[4-9].[0-9]|[3].[4-9].[0-9][-.]*|[4-9].[0-9]*)
14 _cxx_major=`echo $cxx_version | cut -d '.' -f 1` 21 _cxx_major=`echo $cxx_version | cut -d '.' -f 1`
15 _cxx_minor=`echo $cxx_version | cut -d '.' -f 2` 22 _cxx_minor=`echo $cxx_version | cut -d '.' -f 2`
16 cxx_version="$cxx_version, ok" 23 cxx_version="$cxx_version, ok"
17@@ -515,7 +515,7 @@ else 24@@ -515,7 +515,7 @@ else
18 echo_n "Checking hosttype... " 25 echo_n "Checking hosttype... "
19 echo $_host_os 26 echo $_host_os
20 case $_host_os in 27 case $_host_os in
21- linux* | openbsd* | freebsd* | kfreebsd* | netbsd* | bsd* | gnu0.* | sunos* | hpux* | beos*) 28- linux* | openbsd* | freebsd* | kfreebsd* | netbsd* | bsd* | gnu0.* | sunos* | hpux* | beos*)
22+ linux* | openbsd* | freebsd* | kfreebsd* | netbsd* | bsd* | gnu0.* | sunos* | hpux* | beos* | solaris* | dragonfly* | bitrig* | darwin*) 29+ linux* | openbsd* | freebsd* | kfreebsd* | netbsd* | bsd* | gnu0.* | sunos* | hpux* | beos* | solaris* | dragonfly* | bitrig* | darwin*)
23 DEFINES="$DEFINES -DUNIX" 30 DEFINES="$DEFINES -DUNIX"
24 _host_os=unix 31 _host_os=unix
25 ;; 32 ;;