[91155] trunk/dports/lang

[jeremyhu at macports.org]

Revision: 91155
          https://trac.macports.org/changeset/91155
Author:   jeremyhu at macports.org
Date:     2012-03-24 02:16:30 -0700 (Sat, 24 Mar 2012)
Log Message:
-----------
{clang,llvm,dragonegg}-{2,9,3.0}: Fix default LLVMINTERP to be prefixed, #33207

Also set a common dist_subdir, #29062

Modified Paths:
--------------
    trunk/dports/lang/clang-2.9/Portfile
    trunk/dports/lang/clang-3.0/Portfile
    trunk/dports/lang/dragonegg-3.0/Portfile
    trunk/dports/lang/llvm-2.9/Portfile
    trunk/dports/lang/llvm-3.0/Portfile

Modified: trunk/dports/lang/clang-2.9/Portfile
===================================================================
--- trunk/dports/lang/clang-2.9/Portfile	2012-03-24 09:15:28 UTC (rev 91154)
+++ trunk/dports/lang/clang-2.9/Portfile	2012-03-24 09:16:30 UTC (rev 91155)
@@ -8,6 +8,7 @@
 name                    clang-${llvm_version}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
+dist_subdir             llvm
 categories              lang
 platforms               darwin
 maintainers             jeremyhu openmaintainer
@@ -138,6 +139,11 @@
     }
 }
 
+post-patch {
+    # http://trac.macports.org/ticket/33207
+    reinplace "/LLVMINTERP/s/-lli/-lli-${suffix}/" ${worksrcpath}/tools/llvm-ld/llvm-ld.cpp
+}
+
 post-destroot {
     foreach bin [glob ${destroot}${sub_prefix}/bin/*] {
         set bin_filename [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}

Modified: trunk/dports/lang/clang-3.0/Portfile
===================================================================
--- trunk/dports/lang/clang-3.0/Portfile	2012-03-24 09:15:28 UTC (rev 91154)
+++ trunk/dports/lang/clang-3.0/Portfile	2012-03-24 09:16:30 UTC (rev 91155)
@@ -8,6 +8,7 @@
 name                    clang-${llvm_version}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/llvm-${llvm_version}
+dist_subdir             llvm
 categories              lang
 platforms               darwin
 maintainers             jeremyhu openmaintainer
@@ -136,6 +137,11 @@
     }
 }
 
+post-patch {
+    # http://trac.macports.org/ticket/33207
+    reinplace "/LLVMINTERP/s/-lli/-lli-${suffix}/" ${worksrcpath}/tools/llvm-ld/llvm-ld.cpp
+}
+
 post-destroot {
     foreach bin [glob ${destroot}${sub_prefix}/bin/*] {
         set bin_filename [string map "${sub_prefix} ${prefix}" ${bin}]-${suffix}

Modified: trunk/dports/lang/dragonegg-3.0/Portfile
===================================================================
--- trunk/dports/lang/dragonegg-3.0/Portfile	2012-03-24 09:15:28 UTC (rev 91154)
+++ trunk/dports/lang/dragonegg-3.0/Portfile	2012-03-24 09:16:30 UTC (rev 91155)
@@ -9,6 +9,7 @@
 set gcc_version         46
 set gcc_version_dot     4.6
 revision                2
+dist_subdir             llvm
 categories              lang
 platforms               darwin
 maintainers             jeremyhu openmaintainer

Modified: trunk/dports/lang/llvm-2.9/Portfile
===================================================================
--- trunk/dports/lang/llvm-2.9/Portfile	2012-03-24 09:15:28 UTC (rev 91154)
+++ trunk/dports/lang/llvm-2.9/Portfile	2012-03-24 09:16:30 UTC (rev 91155)
@@ -4,10 +4,11 @@
 PortGroup select        1.0
 
 set llvm_version        2.9
-revision                2
+revision                3
 name                    llvm-${llvm_version}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/${name}
+dist_subdir             llvm
 categories              lang
 platforms               darwin
 license                 NCSA
@@ -92,6 +93,11 @@
     destroot.args-append  OVERRIDE_libdir=${sub_prefix}/lib
 }
 
+post-patch {
+    # http://trac.macports.org/ticket/33207
+    reinplace "/LLVMINTERP/s/-lli/-lli-${suffix}/" ${worksrcpath}/tools/llvm-ld/llvm-ld.cpp
+}
+
 post-destroot {
     file mkdir ${destroot}${prefix}/share/doc
     file rename ${destroot}${sub_prefix}/docs/llvm ${destroot}${prefix}/share/doc/${name}

Modified: trunk/dports/lang/llvm-3.0/Portfile
===================================================================
--- trunk/dports/lang/llvm-3.0/Portfile	2012-03-24 09:15:28 UTC (rev 91154)
+++ trunk/dports/lang/llvm-3.0/Portfile	2012-03-24 09:16:30 UTC (rev 91155)
@@ -4,10 +4,11 @@
 PortGroup select        1.0
 
 set llvm_version        3.0
-revision                2
+revision                3
 name                    llvm-${llvm_version}
 set suffix              mp-${llvm_version}
 set sub_prefix          ${prefix}/libexec/${name}
+dist_subdir             llvm
 categories              lang
 platforms               darwin
 license                 NCSA
@@ -92,6 +93,11 @@
     destroot.args-append  OVERRIDE_libdir=${sub_prefix}/lib
 }
 
+post-patch {
+    # http://trac.macports.org/ticket/33207
+    reinplace "/LLVMINTERP/s/-lli/-lli-${suffix}/" ${worksrcpath}/tools/llvm-ld/llvm-ld.cpp
+}
+
 post-destroot {
     file mkdir ${destroot}${prefix}/share/doc
     file rename ${destroot}${sub_prefix}/docs/llvm ${destroot}${prefix}/share/doc/${name}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120324/395b6ced/attachment.html>