[153814] trunk/dports/devel

[jeremyhu at macports.org]

Revision: 153814
          https://trac.macports.org/changeset/153814
Author:   jeremyhu at macports.org
Date:     2016-10-12 02:20:28 -0700 (Wed, 12 Oct 2016)
Log Message:
-----------
cctools, ld64: Default to +llvm34 on Lion (cf #46897)

Modified Paths:
--------------
    trunk/dports/devel/cctools/Portfile
    trunk/dports/devel/git/Portfile
    trunk/dports/devel/ld64/Portfile

Modified: trunk/dports/devel/cctools/Portfile
===================================================================
--- trunk/dports/devel/cctools/Portfile	2016-10-12 09:15:22 UTC (rev 153813)
+++ trunk/dports/devel/cctools/Portfile	2016-10-12 09:20:28 UTC (rev 153814)
@@ -50,7 +50,7 @@
 if {${os.major} < 10} {
     lappend all_llvm_variants llvm33
 }
-if {${os.major} < 11} {
+if {${os.major} < 12} {
     lappend all_llvm_variants llvm34
 }
 array set llvm_variant_version {llvm33 3.3 llvm34 3.4 llvm38 3.8 llvm39 3.9 llvmdev devel}
@@ -75,7 +75,7 @@
 }
 
 if {![some_llvm_variant_set]} {
-    if {${os.major} == 10} {
+    if {${os.major} == 10 || ${os.major} == 11} {
         default_variants +llvm34
     } elseif {${os.major} == 9} {
         # Using llvm-3.3 to break dependency cycle (https://trac.macports.org/ticket/52091)

Modified: trunk/dports/devel/git/Portfile
===================================================================
--- trunk/dports/devel/git/Portfile	2016-10-12 09:15:22 UTC (rev 153813)
+++ trunk/dports/devel/git/Portfile	2016-10-12 09:20:28 UTC (rev 153814)
@@ -5,7 +5,7 @@
 PortGroup           perl5 1.0
 
 name                git
-version             2.10.0
+version             2.10.1
 
 description         A fast version control system
 long_description    Git is a fast, scalable, distributed open source version \
@@ -20,12 +20,15 @@
 distfiles           git-${version}${extract.suffix} \
                     git-manpages-${version}${extract.suffix}
 
-checksums           git-${version}${extract.suffix} \
-                    rmd160  68bfc3dbb5522c80d9017be321081e1fa93189bc \
-                    sha256  207cfce8cc0a36497abb66236817ef449a45f6ff9141f586bbe2aafd7bc3d90b \
-                    git-manpages-${version}${extract.suffix} \
-                    rmd160  3de9262c9ba5b21813da205b46925c6305f843a9 \
-                    sha256  f12a72c3cd01952e43fbbbd84343a5afbb0566fee680a1052ea9c715cdb65c14 \
+checksums           git-2.10.1.tar.gz \
+                    rmd160  d935710c8e98405cb1da0dbaca02b087c7bdfc48 \
+                    sha256  78553f786f1a66cb68983c170be482558028a3376056c0f2ed366f331b1e35f2 \
+                    git-manpages-2.10.1.tar.gz \
+                    rmd160  b7e5523697962cad700d8312e0ddcb0948f163bf \
+                    sha256  4572477a8ffa69963f2be7d6e0fe63b8192de2c301edf3e37a888f904bbfd12e \
+                    git-htmldocs-2.10.1.tar.gz \
+                    rmd160  f7bd4fb1c5c90ea5dad678b0da15a7f18898f06c \
+                    sha256  cb36e94cfdfb00d8e763ea46baa59c6d9c7ef5143b9bfb37e35b25b144f10faa
 
 perl5.require_variant   yes
 perl5.conflict_variants yes
@@ -139,10 +142,6 @@
 
 variant doc description {Install HTML and plaintext documentation} {
     distfiles-append        git-htmldocs-${version}${extract.suffix}
-    checksums-append        git-htmldocs-${version}${extract.suffix} \
-                            rmd160  7527703d93cf9e920d86dc53fcf7fbdf32a6ba6b \
-                            sha256  c40afce5949a3788f4fc2928b0daaffad71813b59e14fcec7bd2e48381a17dce
-
     patchfiles-append       git-subtree.html.diff
 
     post-extract {

Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile	2016-10-12 09:15:22 UTC (rev 153813)
+++ trunk/dports/devel/ld64/Portfile	2016-10-12 09:20:28 UTC (rev 153814)
@@ -260,7 +260,7 @@
     if {${os.major} < 10} {
         lappend all_llvm_variants llvm33
     }
-    if {${os.major} < 11} {
+    if {${os.major} < 12} {
         lappend all_llvm_variants llvm34
     }
     array set llvm_variant_version {llvm33 3.3 llvm34 3.4 llvm38 3.8 llvm39 3.9 llvmdev devel}
@@ -290,7 +290,7 @@
     # has been installed.
 
     if {![some_llvm_variant_set]} {
-        if {${os.major} == 10} {
+        if {${os.major} == 10 || ${os.major} == 11} {
             default_variants +llvm34
         } elseif {${os.major} == 9} {
             # Using llvm-3.3 to break dependency cycle (https://trac.macports.org/ticket/52091)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161012/5da0cef3/attachment-0002.html>