<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/d16c24b838bd4913a572437c5c88d41a2b0ee143">https://github.com/macports/macports-ports/commit/d16c24b838bd4913a572437c5c88d41a2b0ee143</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 d16c24b838b calc: update to 2.13.0.1
</span>d16c24b838b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d16c24b838bd4913a572437c5c88d41a2b0ee143
</span>Author: Perry E. Metzger <perry@piermont.com>
AuthorDate: Sun May 2 17:47:55 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> calc: update to 2.13.0.1
</span>---
math/calc/Portfile | 15 +++---
math/calc/files/patch-Makefile.diff | 81 -------------------------------
math/calc/files/patch-Makefile.local.diff | 9 ++++
3 files changed, 15 insertions(+), 90 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 fe37be41110..7df3b5c156e 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,7 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup lcn2 calc 2.13.0.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup lcn2 calc 2.13.0.1 v
</span> revision 0
categories math
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,22 +28,19 @@ homepage http://www.isthe.com/chongo/tech/comp/calc/
</span> github.tarball_from releases
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 687f4d47e1df28e937caa53578f578673e5d9dcb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 566e71646e1cba427f52ee34b91e402a3e28ab73befb1306505f3cae09700595 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 975166
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 186740b6ac2c5d673fd7ed14d590783adcfe7c74 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6ae538f57785c5701a70112ccf007ab5553abd332ae2deaadaf564f401c734ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 987542
</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.local.diff
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|___PREFIX___|${prefix}|" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Not currently needed, but may be needed again.
</span><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;'>+ reinplace "s|___PREFIX___|${prefix}|" ${worksrcpath}/Makefile.local
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> use_parallel_build no
variant universal {}
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9fec57d1a11..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,81 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -719,7 +719,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 BINDIR for macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--BINDIR= /usr/local/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BINDIR= ___PREFIX___/bin
</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:#ffe0e0;'>-@@ -735,7 +735,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 LIBDIR for macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBDIR= /usr/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBDIR= ___PREFIX___/lib
</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:#ffe0e0;'>-@@ -751,7 +751,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 CALC_SHAREDIR for macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CALC_SHAREDIR= /usr/local/share/calc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CALC_SHAREDIR= ___PREFIX___/share/calc
</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:#ffe0e0;'>-@@ -771,7 +771,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #CALC_INCDIR= /usr/local/include/calc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #CALC_INCDIR= /dev/env/DJDIR/include/calc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CALC_INCDIR= ${INCDIR}/calc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CALC_INCDIR= ___PREFIX___/include/calc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # By default, these values are based CALC_SHAREDIR, INCDIR, BINDIR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ---------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -849,7 +849,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if 0 /* start of skip for non-Gnu makefiles */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(target),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MANDIR= /usr/local/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MANDIR= ___PREFIX___/share/man/man1
</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:#ffe0e0;'>- MANDIR= /usr/share/man/man1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -993,11 +993,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--USE_READLINE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#USE_READLINE= -DUSE_READLINE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#USE_READLINE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+USE_READLINE= -DUSE_READLINE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--READLINE_LIB=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--READLINE_EXTRAS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#READLINE_LIB=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#READLINE_EXTRAS=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #READLINE_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:#ffe0e0;'>-@@ -1022,6 +1022,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #READLINE_LIB= -L/usr/local/opt/readline/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:#ffe0e0;'>-+READLINE_LIB= -L___PREFIX___/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:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- READLINE_INCLUDE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #READLINE_INCLUDE= -I/usr/gnu/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1391,7 +1393,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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;'>- CC_SHARE= -fPIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:___PREFIX___/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LD_SHARE= ${DARWIN_ARCH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #SET_INSTALL_NAME= no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET_INSTALL_NAME= yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/calc/files/patch-Makefile.local.diff b/math/calc/files/patch-Makefile.local.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d1572ccfc14
</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-Makefile.local.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.local.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,1 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add below to override Makefile values (using :=) as in: HAVE_STRING_H:= YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PREFIX=___PREFIX___
</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;'>++USE_READLINE:= -DUSE_READLINE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++READLINE_LIB:= -L${PREFIX}/lib -lreadline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++READLINE_EXTRAS:= -lhistory -lncurses
</span></pre><pre style='margin:0'>
</pre>