<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/32ea7ed8e38722d82dda310bbc2b786058efbd19">https://github.com/macports/macports-ports/commit/32ea7ed8e38722d82dda310bbc2b786058efbd19</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 32ea7ed8e38722d82dda310bbc2b786058efbd19
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Mon Dec 12 21:20:35 2016 +0100
<span style='display:block; white-space:pre;color:#404040;'> nsis: upgrade to 3.01, other build fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Upgrade to version 3.01
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove a hard dependency on i386-mingw32-gcc
</span><span style='display:block; white-space:pre;color:#404040;'> * Use the right compiler by setting `CC=...` and `CXX=...`
</span><span style='display:block; white-space:pre;color:#404040;'> * Use the expected stdlib (it could only be added when needed)
</span><span style='display:block; white-space:pre;color:#404040;'> * Add `STRIP=0`
</span><span style='display:block; white-space:pre;color:#404040;'> * Set the proper build and destroot variables instead of using
</span><span style='display:block; white-space:pre;color:#404040;'> `system -W ${worksrpath} "scons ..."`
</span><span style='display:block; white-space:pre;color:#404040;'> * Dirty hack to remove "-j<n>" in the build command
</span><span style='display:block; white-space:pre;color:#404040;'> * No need for a `-force` flag when copying folders
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: #95
</span>---
devel/nsis/Portfile | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 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 6570856..22f841f 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;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name nsis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.01
</span> categories devel
license zlib CPL-1 MIT
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,14 +25,16 @@ distfiles-append nsis-${version}.zip
</span> extract.only-delete nsis-${version}.zip
checksums nsis-${version}-src.tar.bz2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 10da864e78b23789bf0cbd45d7815240fc73d52b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 53a1e8ef109acd828ec909f3e6203f69d917f1a5b8bff27e93e66d0bddc5637e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 9674b933a3d0df881a441d3caf2119dae5cbff20 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 604c011593be484e65b2141c50a018f1b28ab28c994268e4ecd377773f3ffba1 \
</span> nsis-${version}.zip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f76d61becc57ec8e62b6f53c986e647fd7ac67cb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 87b1d36765bb2f6e0fe531fdd8c9282b28e86b88d1f6b61842777bb791955372
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 6a6193c61d6c59adc6384dd268ea160571b6933b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 daa17556c8690a34fb13af25c87ced89c79a36a935bf6126253a9d9a5226367c
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:scons \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:i386-mingw32-gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:scons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Installer checks for cross-compiler during build, but doesn't seem to use it?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port:i386-mingw32-gcc
</span>
post-extract {
system -W ${workpath} "unzip ${distpath}/nsis-${version}.zip"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,18 +46,26 @@ use_configure no
</span> # dependency is limited to only iconv, we will rely on the base system
# 32-bit libiconv installation. Should MacPorts switch to 32-bit/64-bit
# universal builds by default, this decision should be revisited.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set scons.args "PREFIX=\"${prefix}\" PREFIX_DEST=\"${destroot}\" SKIPSTUBS=all SKIPPLUGINS=all SKIPUTILS=all SKIPMISC=all"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set scons.args "PREFIX=\"${prefix}\" CC=\"${configure.cc}\" CXX=\"${configure.cxx}\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ APPEND_CCFLAGS=\"-stdlib=${configure.cxx_stdlib}\" APPEND_LINKFLAGS=\"-stdlib=${configure.cxx_stdlib}\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ STRIP=0 SKIPSTUBS=all SKIPPLUGINS=all SKIPUTILS=all SKIPMISC=all"
</span> # APPEND_CPPPATH=\"${prefix}/include\" APPEND_LIBPATH=\"${prefix}/lib\"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "scons ${scons.args}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# just an ugly hack to remove "-j<n>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd scons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args ${scons.args}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args ${scons.args}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir "PREFIX_DEST=\"${destroot}\""
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "scons ${scons.args} install"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span> foreach dir {Bin Contrib Docs Examples Include Menu Plugins Stubs} {
file delete -force ${destroot}${prefix}/share/nsis/${dir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy -force ${workpath}/nsis-${version}/${dir} ${destroot}${prefix}/share/nsis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy ${workpath}/nsis-${version}/${dir} ${destroot}${prefix}/share/nsis
</span> }
system "chmod -R go-w '${destroot}${prefix}/share/nsis'"
}
</pre><pre style='margin:0'>
</pre>