[150490] trunk/dports/science

[mojca at macports.org]

Revision: 150490
          https://trac.macports.org/changeset/150490
Author:   mojca at macports.org
Date:     2016-07-20 04:01:57 -0700 (Wed, 20 Jul 2016)
Log Message:
-----------
root5, root6: don't hardcode ${frameworks_dir} (closes #51880)

Modified Paths:
--------------
    trunk/dports/science/root5/Portfile
    trunk/dports/science/root6/Portfile

Modified: trunk/dports/science/root5/Portfile
===================================================================
--- trunk/dports/science/root5/Portfile	2016-07-20 06:58:34 UTC (rev 150489)
+++ trunk/dports/science/root5/Portfile	2016-07-20 11:01:57 UTC (rev 150490)
@@ -338,14 +338,14 @@
             return -code error "root6 port is already installed with +python${ver_no_dot} and both cannot be active at once. Pick a different python variant."
         }
     }
-    set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_variant}
+    set mypydir ${frameworks_dir}/Python.framework/Versions/${active_python_variant}
     configure.args-delete   --disable-python
     configure.args-append   --enable-python \
                             --with-python-incdir="${mypydir}/Headers" \
                             --with-python-libdir="${mypydir}"
     depends_lib-append      port:python${ver_no_dot}
     post-destroot {
-        set mypylibdir  ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_variant}/lib/python${active_python_variant}
+        set mypylibdir  ${frameworks_dir}/Python.framework/Versions/${active_python_variant}/lib/python${active_python_variant}
         set mypysitedir ${mypylibdir}/site-packages/
         file mkdir ${destroot}${mypysitedir}
         foreach pyfile [glob ${destroot}${install_prefix}/lib/root/*.py*] { move $pyfile ${destroot}${mypysitedir}/ }

Modified: trunk/dports/science/root6/Portfile
===================================================================
--- trunk/dports/science/root6/Portfile	2016-07-20 06:58:34 UTC (rev 150489)
+++ trunk/dports/science/root6/Portfile	2016-07-20 11:01:57 UTC (rev 150490)
@@ -400,7 +400,7 @@
         }
 
         # Setup python
-        set mypydir ${prefix}/Library/Frameworks/Python.framework/Versions/${py_ver}
+        set mypydir ${frameworks_dir}/Python.framework/Versions/${py_ver}
         configure.args-replace  -Dpython=OFF -Dpython=ON
         configure.args-append   -DPYTHON_INCLUDE_DIR="${mypydir}/Headers" \
                                 -DPYTHON_EXECUTABLE="${mypydir}/bin/python${py_ver}"
@@ -414,7 +414,7 @@
         
         post-destroot {
             # Install PyROOT lib in the correct place
-            set mypylibdir  ${prefix}/Library/Frameworks/Python.framework/Versions/${active_python_version}/lib/python${active_python_version}
+            set mypylibdir  ${frameworks_dir}/Python.framework/Versions/${active_python_version}/lib/python${active_python_version}
             set mypysitedir ${mypylibdir}/site-packages/
             file mkdir ${destroot}${mypysitedir}
             foreach pyfile [glob ${destroot}${install_prefix}/lib/root/*.py*] { move $pyfile ${destroot}${mypysitedir}/ }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160720/ca4bbe8d/attachment.html>