<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/29b67f3d2659199c3dd3bc8691abc34c89324684">https://github.com/macports/macports-ports/commit/29b67f3d2659199c3dd3bc8691abc34c89324684</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 29b67f3 calc: update patchfile for Mojave and Xcode 10
</span>29b67f3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 29b67f3d2659199c3dd3bc8691abc34c89324684
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Thu Sep 27 09:45:21 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> calc: update patchfile for Mojave and Xcode 10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It was necessary to remove the test for /usr/include existing, and to
</span><span style='display:block; white-space:pre;color:#404040;'> set the system include files for autoconfiguration based on
</span><span style='display:block; white-space:pre;color:#404040;'> xcrun --show-sdk-path
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> I'll work with upstream to try to minimize some of this.
</span>---
math/calc/files/patch-Makefile.diff | 33 ++++++++++++++++++++++++++++++---
1 file changed, 30 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/calc/files/patch-Makefile.diff b/math/calc/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3cbec30..dda4c29 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/calc/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/calc/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2018-01-18 22:20:20.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2018-05-06 03:35:05.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2018-09-27 08:46:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2018-09-27 09:38:57.000000000 -0400
</span> @@ -575,7 +575,7 @@
ifeq ($(target),Darwin)
# default INCDIR for macOS
-INCDIR= /usr/local/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+INCDIR= ___PREFIX___/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCDIR=$(shell xcrun --show-sdk-path)/usr/include
</span>
else
#endif /* end of skip for non-Gnu makefiles */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +36,15 @@
</span>
else
#endif /* end of skip for non-Gnu makefiles */
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -690,7 +690,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #CALC_INCDIR= /usr/local/include/calc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #CALC_INCDIR= /dev/env/DJDIR/include/calc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CALC_INCDIR= ${INCDIR}/calc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CALC_INCDIR= ___PREFIX___/include/calc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ---------------------------------------------------------------
</span> @@ -760,7 +760,7 @@
#MANDIR=
#MANDIR= /usr/local/man/man1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,3 +91,21 @@
</span> #
# Darwin dynamic shared lib filenames
LIB_EXT:= .dylib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2176,7 +2179,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ###
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-all: check_include ${BLD_TYPE} CHANGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++all: ${BLD_TYPE} CHANGES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ check_include:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(Q) if [ ! -d /usr/include ]; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4528,7 +4531,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${TRUE}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -${Q} if [ ! -d ${T}${INCDIR} ]; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -${Q} if /usr/bin/false; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo ${MKDIR} -p ${T}${INCDIR}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${MKDIR} -p ${T}${INCDIR}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo ${CHMOD} 0755 ${T}${INCDIR}; \
</span></pre><pre style='margin:0'>
</pre>