<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/697746c35a175390a159abe2a95248057ff201d7">https://github.com/macports/macports-ports/commit/697746c35a175390a159abe2a95248057ff201d7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 697746c vapor: Use frameworks_dir for Python
</span>697746c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 697746c35a175390a159abe2a95248057ff201d7
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed May 2 18:18:33 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> vapor: Use frameworks_dir for Python
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't use it yet for Qt stuff because qt4-mac doesn't yet either.
</span>---
science/vapor/Portfile | 5 +++--
science/vapor/files/patch-options.mk.diff | 10 +++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/vapor/Portfile b/science/vapor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4262a46..268ee2f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/vapor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/vapor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,8 +43,9 @@ use_configure no
</span> post-configure {
reinplace "s|@@MP_INSTALL_PREFIX@@|${destroot}${prefix}|g" ${worksrcpath}/options.mk
reinplace "s|@@MP_PREFIX@@|${prefix}|g" ${worksrcpath}/options.mk ${worksrcpath}/make/config/Darwin.mk
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MP_CC@@|${configure.cc}|" ${worksrcpath}/options.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@MP_CXX@@|${configure.cxx}|" ${worksrcpath}/options.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MP_FRAMEWORKS_DIR@@|${frameworks_dir}|g" ${worksrcpath}/options.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MP_CC@@|${configure.cc}|g" ${worksrcpath}/options.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@MP_CXX@@|${configure.cxx}|g" ${worksrcpath}/options.mk
</span> reinplace "s|-F.*/lib|-F${prefix}/Library/Frameworks|" ${worksrcpath}/apps/vaporgui/Makefile ${worksrcpath}/apps/asciitf2vtf/Makefile
if {${build_arch} eq "x86_64"} {
set f [open ${worksrcpath}/site.mk "w"]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/vapor/files/patch-options.mk.diff b/science/vapor/files/patch-options.mk.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 820ae60..7885dc9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/vapor/files/patch-options.mk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/vapor/files/patch-options.mk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- options.mk.orig 2013-12-08 16:40:11.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ options.mk 2013-12-08 16:46:43.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- options.mk.orig 2013-08-23 14:06:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ options.mk 2018-05-02 17:50:17.000000000 -0500
</span> @@ -13,10 +13,10 @@
# in $(INSTALL_PREFIX_DIR)/bin, libraries in $(INSTALL_PREFIX_DIR)/lib
# etc,.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@
</span> # in the order specified.
#
-LIB_SEARCH_DIRS =
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIB_SEARCH_DIRS = @@MP_PREFIX@@/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_SEARCH_DIRS = @@MP_PREFIX@@/lib
</span>
# Set INC_SEARCH_DIRS to a list of directories containing include files
# not on the default search path for the compiler. Typically 3rd party
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@
</span> # compiler normally checks. The compiler will search the directories
# in the order specified.
-INC_SEARCH_DIRS =
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+INC_SEARCH_DIRS = @@MP_PREFIX@@/include @@MP_PREFIX@@/include/udunits2 @@MP_PREFIX@@/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7 @@MP_PREFIX@@/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/numarray/include @@MP_PREFIX@@/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/core/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INC_SEARCH_DIRS = @@MP_PREFIX@@/include @@MP_PREFIX@@/include/udunits2 @@MP_FRAMEWORKS_DIR@@/Python.framework/Versions/2.7/include/python2.7 @@MP_FRAMEWORKS_DIR@@/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/numarray/include @@MP_FRAMEWORKS_DIR@@/Python.framework/Versions/2.7/lib/python2.7/site-packages/numpy/core/include
</span>
# Set NETCDF_LIBS to the name of your netCDF library and any library
# dependencies that netcdf has. The default is simply 'netcdf'. Starting
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,7 @@
</span> # may be found. Python version 2.6.5 or higher is required.
#
-PYTHONDIR =
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYTHONDIR = @@MP_PREFIX@@/Library/Frameworks/Python.framework/Versions/2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PYTHONDIR = @@MP_FRAMEWORKS_DIR@@/Python.framework/Versions/2.7
</span>
# If BUILD_PYTHON is set to 1, set PYTHONVERSION to the version
# number (both major and minor, e.g. "2.6") of Python.
</pre><pre style='margin:0'>
</pre>