<pre style='margin:0'>
Andrea D'Amore (anddam) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a0846e2e9720741c98099df5a497c916001f4b31">https://github.com/macports/macports-ports/commit/a0846e2e9720741c98099df5a497c916001f4b31</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit a0846e2e9720741c98099df5a497c916001f4b31
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Dec 12 22:50:55 2016 -0600
<span style='display:block; white-space:pre;color:#404040;'> nsis: Add zlib and libiconv dependencies and use them
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also use the right -arch flags and remove obsolete comment.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also alphabetize build.args and remove unnecessary quoting.
</span>---
devel/nsis/Portfile | 33 +++++++++++++++++++--------------
1 file changed, 19 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/nsis/Portfile b/devel/nsis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 22f841f..f12a262 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/nsis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/nsis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name nsis
version 3.01
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
license zlib CPL-1 MIT
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +34,9 @@ checksums nsis-${version}-src.tar.bz2 \
</span>
depends_build port:scons
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:libiconv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Installer checks for cross-compiler during build, but doesn't seem to use it?
# port:i386-mingw32-gcc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,25 +46,26 @@ post-extract {
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# nsis can only ever be built 32-bit, but relies on libiconv. Since the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# dependency is limited to only iconv, we will rely on the base system
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# 32-bit libiconv installation. Should MacPorts switch to 32-bit/64-bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# universal builds by default, this decision should be revisited.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set scons.args "PREFIX=\"${prefix}\" CC=\"${configure.cc}\" CXX=\"${configure.cxx}\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- APPEND_CCFLAGS=\"-stdlib=${configure.cxx_stdlib}\" APPEND_LINKFLAGS=\"-stdlib=${configure.cxx_stdlib}\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STRIP=0 SKIPSTUBS=all SKIPPLUGINS=all SKIPUTILS=all SKIPMISC=all"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# APPEND_CPPPATH=\"${prefix}/include\" APPEND_LIBPATH=\"${prefix}/lib\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args APPEND_CCFLAGS="[get_canonical_archflags cc] -stdlib=${configure.cxx_stdlib}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ APPEND_CPPPATH="${prefix}/include" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ APPEND_LIBPATH="${prefix}/lib" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ APPEND_LINKFLAGS="[get_canonical_archflags ld] -stdlib=${configure.cxx_stdlib}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX="${prefix}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SKIPMISC=all \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SKIPPLUGINS=all \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SKIPSTUBS=all \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SKIPUTILS=all \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRIP=0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# just an ugly hack to remove "-j<n>"
</span> use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd scons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args ${scons.args}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd ${prefix}/bin/scons
</span> build.target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args ${scons.args}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target install
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir "PREFIX_DEST=\"${destroot}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args {*}${build.args}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir PREFIX_DEST="${destroot}"
</span>
post-destroot {
foreach dir {Bin Contrib Docs Examples Include Menu Plugins Stubs} {
</pre><pre style='margin:0'>
</pre>