<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/430c387d10ab1635c0a4768ed1a8ade4d5d6167e">https://github.com/macports/macports-ports/commit/430c387d10ab1635c0a4768ed1a8ade4d5d6167e</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 430c387d10ab1635c0a4768ed1a8ade4d5d6167e
</span>Author: Mojca Miklavec <mojca@macports.org>
AuthorDate: Mon Dec 12 21:12:21 2016 +0100
<span style='display:block; white-space:pre;color:#404040;'> nsis: cosmetic changes only
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Whitespace changes
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove the `$Id$` line
</span><span style='display:block; white-space:pre;color:#404040;'> * Use `${version}` in checksums instead of hardcoding it
</span><span style='display:block; white-space:pre;color:#404040;'> * Set `distname`, minor changes in `distfiles` and `extract.only` syntax
</span><span style='display:block; white-space:pre;color:#404040;'> * Use `system -W ${dir} "..."` instead of `system "cd ${dir} && ..."`
</span><span style='display:block; white-space:pre;color:#404040;'> * Sort entries
</span><span style='display:block; white-space:pre;color:#404040;'> * Replace `${destpath}` with `${destroot}`
</span>---
devel/nsis/Portfile | 44 +++++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 23 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 fe78e97..6570856 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;'>@@ -1,7 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span>
name nsis
version 3.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,32 +11,31 @@ maintainers nomaintainer
</span>
description NSIS is a tool for creating win32 installers.
long_description NSIS (Nullsoft Scriptable Install System) is a tool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- that allows programmers to create software installers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for Windows. It is released under an open source \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- license and is completely free for any use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ that allows programmers to create software installers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for Windows. It is released under an open source \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license and is completely free for any use.
</span>
homepage http://nsis.sourceforge.net/
master_sites sourceforge
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles nsis-${version}-src.tar.bz2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nsis-${version}.zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles-append nsis-${version}.zip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+extract.only-delete nsis-${version}.zip
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums nsis-3.0-src.tar.bz2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums nsis-${version}-src.tar.bz2 \
</span> rmd160 10da864e78b23789bf0cbd45d7815240fc73d52b \
sha256 53a1e8ef109acd828ec909f3e6203f69d917f1a5b8bff27e93e66d0bddc5637e \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- nsis-3.0.zip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nsis-${version}.zip \
</span> rmd160 f76d61becc57ec8e62b6f53c986e647fd7ac67cb \
sha256 87b1d36765bb2f6e0fe531fdd8c9282b28e86b88d1f6b61842777bb791955372
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir nsis-${version}-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:scons port:i386-mingw32-gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.only nsis-${version}-src.tar.bz2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:scons \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:i386-mingw32-gcc
</span>
post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${workpath} && unzip ${distpath}/nsis-${version}.zip"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${workpath} "unzip ${distpath}/nsis-${version}.zip"
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,17 +45,17 @@ use_configure no
</span> # 32-bit libiconv installation. Should MacPorts switch to 32-bit/64-bit
# universal builds by default, this decision should be revisited.
set scons.args "PREFIX=\"${prefix}\" PREFIX_DEST=\"${destroot}\" SKIPSTUBS=all SKIPPLUGINS=all SKIPUTILS=all SKIPMISC=all"
<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;'>+# APPEND_CPPPATH=\"${prefix}/include\" APPEND_LIBPATH=\"${prefix}/lib\"
</span>
build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && scons ${scons.args}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "scons ${scons.args}"
</span> }
destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && scons ${scons.args} install"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir {Bin Docs Include Plugins Contrib Examples Menu Stubs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete -force ${destpath}${prefix}/share/nsis/${dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy -force ${workpath}/nsis-${version}/${dir} ${destpath}${prefix}/share/nsis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "scons ${scons.args} install"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach dir {Bin Contrib Docs Examples Include Menu Plugins Stubs} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete -force ${destroot}${prefix}/share/nsis/${dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file copy -force ${workpath}/nsis-${version}/${dir} ${destroot}${prefix}/share/nsis
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod -R go-w '${destpath}${prefix}/share/nsis'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "chmod -R go-w '${destroot}${prefix}/share/nsis'"
</span> }
</pre><pre style='margin:0'>
</pre>