<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/c2c413321117ca470b1ebd4680acf148a960c320">https://github.com/macports/macports-ports/commit/c2c413321117ca470b1ebd4680acf148a960c320</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 c2c4133 calc: Fix help
</span>c2c4133 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c2c413321117ca470b1ebd4680acf148a960c320
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Sep 11 01:23:27 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> calc: Fix help
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Specify the path to the destroot dir only at destroot time, not at build
</span><span style='display:block; white-space:pre;color:#404040;'> time, so that the destroot path doesn't get baked into the files that
</span><span style='display:block; white-space:pre;color:#404040;'> get installed, since that prevents the help files from being found.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://lists.macports.org/pipermail/macports-users/2018-September/045679.html
</span>---
math/calc/Portfile | 4 ++--
math/calc/files/patch-Makefile.diff | 9 ---------
2 files changed, 2 insertions(+), 11 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 afa3a08..d333ba7 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;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name calc
version 2.12.6.5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories math
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +37,6 @@ patchfiles patch-Makefile.diff
</span>
post-patch {
reinplace "s|___PREFIX___|${prefix}|" ${worksrcpath}/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|___DESTROOT___|${destroot}|" ${worksrcpath}/Makefile
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,4 +51,4 @@ build.args-append CC=${configure.cc} \
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir T=${destroot}
</span><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 5742b28..3cbec30 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;'>@@ -36,15 +36,6 @@
</span>
else
#endif /* end of skip for non-Gnu makefiles */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -749,7 +749,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If in doubt, use T=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--T=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+T=___DESTROOT___
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # where man pages are installed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span> @@ -760,7 +760,7 @@
#MANDIR=
#MANDIR= /usr/local/man/man1
</pre><pre style='margin:0'>
</pre>