[130917] trunk/dports/lang

[jeremyhu at macports.org]

Revision: 130917
          https://trac.macports.org/changeset/130917
Author:   jeremyhu at macports.org
Date:     2015-01-03 18:12:18 -0800 (Sat, 03 Jan 2015)
Log Message:
-----------
libcxx*: Install tarballs to prevent people fom trying to use content at the port-installed location

Modified Paths:
--------------
    trunk/dports/lang/libcxx/Portfile
    trunk/dports/lang/libcxxabi/Portfile

Modified: trunk/dports/lang/libcxx/Portfile
===================================================================
--- trunk/dports/lang/libcxx/Portfile	2015-01-04 01:44:56 UTC (rev 130916)
+++ trunk/dports/lang/libcxx/Portfile	2015-01-04 02:12:18 UTC (rev 130917)
@@ -5,6 +5,7 @@
 
 name                    libcxx
 version                 3.5.0
+revision                1
 epoch                   1
 categories              lang
 platforms               darwin
@@ -32,7 +33,8 @@
 variant universal {}
 use_configure no
 
-set root_path ${prefix}/var/host/${name}-${version}-${revision}
+set roots_path ${prefix}/var/system_roots/
+set root_name  ${name}-${version}-${revision}
 
 platform darwin {
     if {${os.major} < 10} {
@@ -44,7 +46,7 @@
 
     if {${os.major} < 11} {
         post-activate {
-            system "ditto ${root_path} /"
+            system "cd / && tar xzf ${roots_path}/${root_name}.tgz"
         }
     }
 }
@@ -78,9 +80,12 @@
     # runtime.
 
     destroot {
-        xinstall -m 755 -d ${destroot}${root_path}/usr/lib
-        xinstall -m 755 ${worksrcpath}/lib/libc++.1.dylib ${destroot}${root_path}/usr/lib
-        ln -s libc++.1.dylib ${destroot}${root_path}/usr/lib/libc++.dylib
+        xinstall -m 755 -d ${destroot}${roots_path}/${root_name}/usr/lib
+        xinstall -m 755 ${worksrcpath}/lib/libc++.1.dylib ${destroot}${roots_path}/${root_name}/usr/lib
+        ln -s libc++.1.dylib ${destroot}${roots_path}/${root_name}/usr/lib/libc++.dylib
+
+        system "cd ${destroot}${roots_path}/${root_name} && tar czf ../${root_name}.tgz ."
+        file delete -force ${destroot}${roots_path}/${root_name}
     }
 } else {
     distfiles

Modified: trunk/dports/lang/libcxxabi/Portfile
===================================================================
--- trunk/dports/lang/libcxxabi/Portfile	2015-01-04 01:44:56 UTC (rev 130916)
+++ trunk/dports/lang/libcxxabi/Portfile	2015-01-04 02:12:18 UTC (rev 130917)
@@ -5,6 +5,7 @@
 
 name                    libcxxabi
 version                 3.5.0
+revision                1
 epoch                   1
 categories              lang
 platforms               darwin
@@ -29,7 +30,8 @@
 checksums               rmd160  e4db7c7b07580304c5ae9cf03895d7b6470ecd0b \
                         sha256  53c6be6a2dd2371f6d92c968cb8a59fbe13c6153583025433df067f706bfacd9
 
-set root_path ${prefix}/var/host/${name}-${version}-${revision}
+set roots_path ${prefix}/var/system_roots/
+set root_name  ${name}-${version}-${revision}
 
 patch.pre_args          -p1
 patchfiles \
@@ -48,7 +50,7 @@
 
     if {${os.major} < 11} {
         post-activate {
-            system "ditto ${root_path} /"
+            system "cd / && tar xzf ${roots_path}/${root_name}.tgz"
         }
     }
 }
@@ -80,11 +82,14 @@
     # runtime.
 
     destroot {
-        xinstall -m 755 -d ${destroot}${root_path}/usr/lib
-        xinstall -m 755 ${worksrcpath}/lib/libc++abi.dylib ${destroot}${root_path}/usr/lib
+        xinstall -m 755 -d ${destroot}${roots_path}/${root_name}/usr/lib
+        xinstall -m 755 ${worksrcpath}/lib/libc++abi.dylib ${destroot}${roots_path}/${root_name}/usr/lib
 
-        xinstall -m 755 -d ${destroot}${root_path}/usr/include
-        xinstall -m 644 ${worksrcpath}/include/cxxabi.h ${destroot}${root_path}/usr/include
+        xinstall -m 755 -d ${destroot}${roots_path}/${root_name}/usr/include
+        xinstall -m 644 ${worksrcpath}/include/cxxabi.h ${destroot}${roots_path}/${root_name}/usr/include
+
+        system "cd ${destroot}${roots_path}/${root_name} && tar czf ../${root_name}.tgz ."
+        file delete -force ${destroot}${roots_path}/${root_name}
     }
 } else {
     distfiles
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150103/31447968/attachment.html>