<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/143ff54254a816caff31b522caa165725bd96a32">https://github.com/macports/macports-ports/commit/143ff54254a816caff31b522caa165725bd96a32</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 143ff54254a calc: update to 2.12.7.5
</span>143ff54254a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 143ff54254a816caff31b522caa165725bd96a32
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Wed Feb 3 15:35:09 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> calc: update to 2.12.7.5
</span>---
math/calc/Portfile | 15 +++++----
math/calc/files/patch-Makefile.diff | 60 +++++++++--------------------------
math/calc/files/patch-csMakefile.diff | 11 +++++++
3 files changed, 34 insertions(+), 52 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/calc/Portfile b/math/calc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 41d6e949579..ac96be7b68f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/calc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/calc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name calc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.12.6.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.12.7.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories math
platforms darwin
maintainers {pmetzger @pmetzger} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,17 +27,18 @@ homepage http://www.isthe.com/chongo/tech/comp/calc/
</span> master_sites sourceforge:project/calc/calc/${version}
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f38589f666d57ca0339b89394b944165ce4924b0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0b92d5c72d26759c2a65bf85de0c111fa9653d9e2756578639100e952fa88a90 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 964386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6743f9238dafa44c4f80a72ff85fdc8cfeaa9efe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 eed12c0907b7aeb60135e474956b6e5c8c5b5eecb19b99f272a5a3d88a91898a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 969383
</span>
depends_lib port:ncurses port:readline
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Makefile.diff patch-csMakefile.diff
</span>
post-patch {
reinplace "s|___PREFIX___|${prefix}|" ${worksrcpath}/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|___SDK_PREFIX___|${configure.sdkroot}|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Not currently needed, but may be needed again.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #reinplace "s|___SDK_PREFIX___|${configure.sdkroot}|" ${worksrcpath}/Makefile
</span> }
use_configure no
<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 102929f1ec5..bd1dcb89a3f 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,14 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig 2018-09-27 08:46:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2018-09-27 10:09:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -575,7 +575,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(target),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # default INCDIR for macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCDIR= /usr/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+INCDIR=___SDK_PREFIX___/usr/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* end of skip for non-Gnu makefiles */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile
</span> @@ -638,7 +638,7 @@
ifeq ($(target),Darwin)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,42 +61,21 @@
</span> #
#READLINE_LIB= -lreadline
#READLINE_EXTRAS= -lhistory -lncurses
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -910,6 +910,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #READLINE_LIB= -L/usr/local/lib -lreadline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #READLINE_EXTRAS= -lhistory -lncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -924,6 +924,8 @@
</span> #
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #READLINE_LIB= -L/usr/local/opt/readline/lib -lreadline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #READLINE_EXTRAS= -lhistory -lncurses
</span> +READLINE_LIB= -L___PREFIX___/lib -lreadline
+READLINE_EXTRAS= -lhistory -lncurses
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For Apple OS X: install fink from http://fink.sourceforge.net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and then do a 'fink install readline' and then use:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1314,8 +1317,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCOPT= ${DEBUG}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CCMISC= ${DARWIN_ARCH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LCC= clang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CC= ${PURIFY} ${LCC} ${CCWERR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LCC= ${CC}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#CC= ${PURIFY} ${LCC} ${CCWERR}
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Darwin dynamic shared lib filenames
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIB_EXT:= .dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2176,7 +2179,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ READLINE_INCLUDE=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #READLINE_INCLUDE= -I/usr/gnu/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1270,7 +1272,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BLD_TYPE= calc-dynamic-only
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ###
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--all: check_include ${BLD_TYPE} CHANGES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+all: ${BLD_TYPE} CHANGES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_include:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(Q) if [ ! -d /usr/include ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4528,7 +4531,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${TRUE}; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -${Q} if [ ! -d ${T}${INCDIR} ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ -${Q} if /usr/bin/false; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${MKDIR} -p ${T}${INCDIR}; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${MKDIR} -p ${T}${INCDIR}; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ${CHMOD} 0755 ${T}${INCDIR}; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC_SHARE= -fPIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:___PREFIX___/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD_SHARE= ${DARWIN_ARCH}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #SET_INSTALL_NAME= no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET_INSTALL_NAME= yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/calc/files/patch-csMakefile.diff b/math/calc/files/patch-csMakefile.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..aaa2b911828
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/calc/files/patch-csMakefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cscript/Makefile.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cscript/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,7 +196,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # make detaillist
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SCRIPT= 4dsphere fproduct mersenne piforever plus powerterm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- simple square
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ simple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SCRIPT_SRC= 4dsphere.calc fproduct.calc mersenne.calc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ piforever.calc plus.calc powerterm.calc simple.calc
</span></pre><pre style='margin:0'>
</pre>