[pkgsrc/trunk]: pkgsrc/devel/nsis nsis: update to 3.0.4 in order to fix build...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d04a02a0ce18
branches:  trunk
changeset: 317252:d04a02a0ce18
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Jan 02 21:35:57 2019 +0000

description:
nsis: update to 3.0.4 in order to fix build breakage

Only tested with "make package".
Version 3 adds Unicode, 64-bit and Windows 10 support.

diffstat:

 devel/nsis/Makefile                      |   15 +-
 devel/nsis/PLIST                         |  304 +++++++++++++++++++++---------
 devel/nsis/distinfo                      |   21 +-
 devel/nsis/patches/patch-SConstruct      |   14 -
 devel/nsis/patches/patch-Source_util.cpp |   21 --
 devel/nsis/patches/patch-Source_util.h   |   12 -
 6 files changed, 226 insertions(+), 161 deletions(-)

diffs (truncated from 594 to 300 lines):

diff -r 829b27bb1bce -r d04a02a0ce18 devel/nsis/Makefile
--- a/devel/nsis/Makefile       Wed Jan 02 21:31:33 2019 +0000
+++ b/devel/nsis/Makefile       Wed Jan 02 21:35:57 2019 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2018/09/27 20:01:07 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2019/01/02 21:35:57 tnn Exp $
 #
 
 DISTNAME=      nsis-${NSIS_VER}
-PKGREVISION=   5
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=nsis/}
 EXTRACT_SUFX=  .zip .tar.bz2
@@ -13,18 +12,17 @@
 HOMEPAGE=      http://nsis.sourceforge.net/Main_Page
 COMMENT=       Scriptable system to build Windows installers
 
-DEPENDS+=      scons>=0.96.91:../../devel/scons
-
 USE_LANGUAGES= c c++
 USE_TOOLS+=    pax
 
+PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37     # as of 3.04
+
 NSIS_SRC=      ${DISTNAME:=-src}
-NSIS_VER=      2.12
+NSIS_VER=      3.04
 WRKSRC=                ${WRKDIR}/${NSIS_SRC}
 NO_CONFIGURE=  yes
 EXTRACT_OPTS_ZIP=      -qo
 
-SCONS_BIN=     ${LOCALBASE}/bin/scons
 MAKENSIS_BIN=  ${PREFIX}/share/nsis/makensis
 
 INSTALLATION_DIRS=     bin share/nsis
@@ -41,15 +39,16 @@
 
 do-build:
        cd ${WRKSRC:Q} && ${PKGSRC_SETENV} ${MAKE_ENV}                  \
-           ${SCONS_BIN:Q} SKIPSTUBS=all SKIPPLUGINS=all                \
+           ${SCONSBIN:Q} SKIPSTUBS=all SKIPPLUGINS=all         \
                SKIPUTILS=all SKIPMISC=all VERSION=${NSIS_VER:Q}
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC:Q}/build/release/makensis/makensis  \
+       ${INSTALL_PROGRAM} ${WRKSRC:Q}/build/urelease/makensis/makensis \
                ${DESTDIR}${MAKENSIS_BIN:Q}
        ${INSTALL_SCRIPT} ${WRKSRC:Q}/makensis.sh                       \
                ${DESTDIR}${PREFIX:Q}/bin/makensis
        cd ${WRKDIR:Q}/${DISTNAME:Q} && pax -rw .                       \
                ${DESTDIR}${PREFIX:Q}/share/nsis
 
+.include "../../devel/scons/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 829b27bb1bce -r d04a02a0ce18 devel/nsis/PLIST
--- a/devel/nsis/PLIST  Wed Jan 02 21:31:33 2019 +0000
+++ b/devel/nsis/PLIST  Wed Jan 02 21:35:57 2019 +0000
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:49:00 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/01/02 21:35:57 tnn Exp $
 bin/makensis
 share/nsis/Bin/GenPat.exe
-share/nsis/Bin/LibraryLocal.exe
 share/nsis/Bin/MakeLangId.exe
-share/nsis/Bin/RegTool.bin
+share/nsis/Bin/RegTool-x86.bin
+share/nsis/Bin/makensis.exe
 share/nsis/Bin/zip2exe.exe
+share/nsis/Bin/zlib1.dll
+share/nsis/COPYING
 share/nsis/Contrib/Graphics/Checks/big.bmp
 share/nsis/Contrib/Graphics/Checks/classic-cross.bmp
 share/nsis/Contrib/Graphics/Checks/classic.bmp
@@ -19,6 +21,14 @@
 share/nsis/Contrib/Graphics/Checks/simple.bmp
 share/nsis/Contrib/Graphics/Header/nsis-r.bmp
 share/nsis/Contrib/Graphics/Header/nsis.bmp
+share/nsis/Contrib/Graphics/Header/nsis3-branding-r.bmp
+share/nsis/Contrib/Graphics/Header/nsis3-branding.bmp
+share/nsis/Contrib/Graphics/Header/nsis3-grey-right.bmp
+share/nsis/Contrib/Graphics/Header/nsis3-grey.bmp
+share/nsis/Contrib/Graphics/Header/nsis3-metro-right.bmp
+share/nsis/Contrib/Graphics/Header/nsis3-metro.bmp
+share/nsis/Contrib/Graphics/Header/nsis3-vintage-right.bmp
+share/nsis/Contrib/Graphics/Header/nsis3-vintage.bmp
 share/nsis/Contrib/Graphics/Header/orange-nsis.bmp
 share/nsis/Contrib/Graphics/Header/orange-r-nsis.bmp
 share/nsis/Contrib/Graphics/Header/orange-r.bmp
@@ -48,8 +58,12 @@
 share/nsis/Contrib/Graphics/Icons/modern-uninstall-colorful.ico
 share/nsis/Contrib/Graphics/Icons/modern-uninstall-full.ico
 share/nsis/Contrib/Graphics/Icons/modern-uninstall.ico
+share/nsis/Contrib/Graphics/Icons/nsis-menu.ico
 share/nsis/Contrib/Graphics/Icons/nsis1-install.ico
 share/nsis/Contrib/Graphics/Icons/nsis1-uninstall.ico
+share/nsis/Contrib/Graphics/Icons/nsis3-install-alt.ico
+share/nsis/Contrib/Graphics/Icons/nsis3-install.ico
+share/nsis/Contrib/Graphics/Icons/nsis3-uninstall.ico
 share/nsis/Contrib/Graphics/Icons/orange-install-nsis.ico
 share/nsis/Contrib/Graphics/Icons/orange-install.ico
 share/nsis/Contrib/Graphics/Icons/orange-uninstall-nsis.ico
@@ -61,111 +75,163 @@
 share/nsis/Contrib/Graphics/Wizard/arrow.bmp
 share/nsis/Contrib/Graphics/Wizard/llama.bmp
 share/nsis/Contrib/Graphics/Wizard/nsis.bmp
+share/nsis/Contrib/Graphics/Wizard/nsis3-branding.bmp
+share/nsis/Contrib/Graphics/Wizard/nsis3-grey.bmp
+share/nsis/Contrib/Graphics/Wizard/nsis3-metro.bmp
+share/nsis/Contrib/Graphics/Wizard/nsis3-vintage.bmp
 share/nsis/Contrib/Graphics/Wizard/nullsoft.bmp
 share/nsis/Contrib/Graphics/Wizard/orange-nsis.bmp
 share/nsis/Contrib/Graphics/Wizard/orange-uninstall-nsis.bmp
 share/nsis/Contrib/Graphics/Wizard/orange-uninstall.bmp
 share/nsis/Contrib/Graphics/Wizard/orange.bmp
 share/nsis/Contrib/Graphics/Wizard/win.bmp
+share/nsis/Contrib/Language files/Afrikaans.nlf
+share/nsis/Contrib/Language files/Afrikaans.nsh
 share/nsis/Contrib/Language files/Albanian.nlf
+share/nsis/Contrib/Language files/Albanian.nsh
 share/nsis/Contrib/Language files/Arabic.nlf
+share/nsis/Contrib/Language files/Arabic.nsh
+share/nsis/Contrib/Language files/Armenian.nlf
+share/nsis/Contrib/Language files/Armenian.nsh
+share/nsis/Contrib/Language files/Asturian.nlf
+share/nsis/Contrib/Language files/Asturian.nsh
+share/nsis/Contrib/Language files/Basque.nlf
+share/nsis/Contrib/Language files/Basque.nsh
 share/nsis/Contrib/Language files/Belarusian.nlf
+share/nsis/Contrib/Language files/Belarusian.nsh
 share/nsis/Contrib/Language files/Bosnian.nlf
+share/nsis/Contrib/Language files/Bosnian.nsh
 share/nsis/Contrib/Language files/Breton.nlf
+share/nsis/Contrib/Language files/Breton.nsh
 share/nsis/Contrib/Language files/Bulgarian.nlf
+share/nsis/Contrib/Language files/Bulgarian.nsh
 share/nsis/Contrib/Language files/Catalan.nlf
+share/nsis/Contrib/Language files/Catalan.nsh
+share/nsis/Contrib/Language files/Corsican.nlf
+share/nsis/Contrib/Language files/Corsican.nsh
 share/nsis/Contrib/Language files/Croatian.nlf
+share/nsis/Contrib/Language files/Croatian.nsh
 share/nsis/Contrib/Language files/Czech.nlf
+share/nsis/Contrib/Language files/Czech.nsh
 share/nsis/Contrib/Language files/Danish.nlf
+share/nsis/Contrib/Language files/Danish.nsh
 share/nsis/Contrib/Language files/Dutch.nlf
+share/nsis/Contrib/Language files/Dutch.nsh
 share/nsis/Contrib/Language files/English.nlf
+share/nsis/Contrib/Language files/English.nsh
+share/nsis/Contrib/Language files/Esperanto.nlf
+share/nsis/Contrib/Language files/Esperanto.nsh
 share/nsis/Contrib/Language files/Estonian.nlf
+share/nsis/Contrib/Language files/Estonian.nsh
 share/nsis/Contrib/Language files/Farsi.nlf
+share/nsis/Contrib/Language files/Farsi.nsh
 share/nsis/Contrib/Language files/Finnish.nlf
+share/nsis/Contrib/Language files/Finnish.nsh
 share/nsis/Contrib/Language files/French.nlf
+share/nsis/Contrib/Language files/French.nsh
+share/nsis/Contrib/Language files/Galician.nlf
+share/nsis/Contrib/Language files/Galician.nsh
+share/nsis/Contrib/Language files/Georgian.nlf
+share/nsis/Contrib/Language files/Georgian.nsh
 share/nsis/Contrib/Language files/German.nlf
+share/nsis/Contrib/Language files/German.nsh
 share/nsis/Contrib/Language files/Greek.nlf
+share/nsis/Contrib/Language files/Greek.nsh
 share/nsis/Contrib/Language files/Hebrew.nlf
+share/nsis/Contrib/Language files/Hebrew.nsh
+share/nsis/Contrib/Language files/Hindi.nlf
+share/nsis/Contrib/Language files/Hindi.nsh
 share/nsis/Contrib/Language files/Hungarian.nlf
+share/nsis/Contrib/Language files/Hungarian.nsh
 share/nsis/Contrib/Language files/Icelandic.nlf
+share/nsis/Contrib/Language files/Icelandic.nsh
 share/nsis/Contrib/Language files/Indonesian.nlf
+share/nsis/Contrib/Language files/Indonesian.nsh
+share/nsis/Contrib/Language files/Irish.nlf
+share/nsis/Contrib/Language files/Irish.nsh
 share/nsis/Contrib/Language files/Italian.nlf
+share/nsis/Contrib/Language files/Italian.nsh
 share/nsis/Contrib/Language files/Japanese.nlf
+share/nsis/Contrib/Language files/Japanese.nsh
 share/nsis/Contrib/Language files/Korean.nlf
+share/nsis/Contrib/Language files/Korean.nsh
 share/nsis/Contrib/Language files/Kurdish.nlf
+share/nsis/Contrib/Language files/Kurdish.nsh
 share/nsis/Contrib/Language files/Latvian.nlf
+share/nsis/Contrib/Language files/Latvian.nsh
 share/nsis/Contrib/Language files/Lithuanian.nlf
+share/nsis/Contrib/Language files/Lithuanian.nsh
 share/nsis/Contrib/Language files/Luxembourgish.nlf
+share/nsis/Contrib/Language files/Luxembourgish.nsh
 share/nsis/Contrib/Language files/Macedonian.nlf
+share/nsis/Contrib/Language files/Macedonian.nsh
 share/nsis/Contrib/Language files/Malay.nlf
+share/nsis/Contrib/Language files/Malay.nsh
 share/nsis/Contrib/Language files/Mongolian.nlf
+share/nsis/Contrib/Language files/Mongolian.nsh
 share/nsis/Contrib/Language files/Norwegian.nlf
+share/nsis/Contrib/Language files/Norwegian.nsh
+share/nsis/Contrib/Language files/NorwegianNynorsk.nlf
+share/nsis/Contrib/Language files/NorwegianNynorsk.nsh
+share/nsis/Contrib/Language files/Pashto.nlf
+share/nsis/Contrib/Language files/Pashto.nsh
 share/nsis/Contrib/Language files/Polish.nlf
+share/nsis/Contrib/Language files/Polish.nsh
 share/nsis/Contrib/Language files/Portuguese.nlf
+share/nsis/Contrib/Language files/Portuguese.nsh
 share/nsis/Contrib/Language files/PortugueseBR.nlf
+share/nsis/Contrib/Language files/PortugueseBR.nsh
 share/nsis/Contrib/Language files/Romanian.nlf
+share/nsis/Contrib/Language files/Romanian.nsh
 share/nsis/Contrib/Language files/Russian.nlf
+share/nsis/Contrib/Language files/Russian.nsh
+share/nsis/Contrib/Language files/ScotsGaelic.nlf
+share/nsis/Contrib/Language files/ScotsGaelic.nsh
 share/nsis/Contrib/Language files/Serbian.nlf
+share/nsis/Contrib/Language files/Serbian.nsh
 share/nsis/Contrib/Language files/SerbianLatin.nlf
+share/nsis/Contrib/Language files/SerbianLatin.nsh
 share/nsis/Contrib/Language files/SimpChinese.nlf
+share/nsis/Contrib/Language files/SimpChinese.nsh
 share/nsis/Contrib/Language files/Slovak.nlf
+share/nsis/Contrib/Language files/Slovak.nsh
 share/nsis/Contrib/Language files/Slovenian.nlf
+share/nsis/Contrib/Language files/Slovenian.nsh
 share/nsis/Contrib/Language files/Spanish.nlf
+share/nsis/Contrib/Language files/Spanish.nsh
+share/nsis/Contrib/Language files/SpanishInternational.nlf
+share/nsis/Contrib/Language files/SpanishInternational.nsh
 share/nsis/Contrib/Language files/Swedish.nlf
+share/nsis/Contrib/Language files/Swedish.nsh
+share/nsis/Contrib/Language files/Tatar.nlf
+share/nsis/Contrib/Language files/Tatar.nsh
 share/nsis/Contrib/Language files/Thai.nlf
+share/nsis/Contrib/Language files/Thai.nsh
 share/nsis/Contrib/Language files/TradChinese.nlf
+share/nsis/Contrib/Language files/TradChinese.nsh
 share/nsis/Contrib/Language files/Turkish.nlf
+share/nsis/Contrib/Language files/Turkish.nsh
 share/nsis/Contrib/Language files/Ukrainian.nlf
-share/nsis/Contrib/Modern UI/Language files/Albanian.nsh
-share/nsis/Contrib/Modern UI/Language files/Arabic.nsh
-share/nsis/Contrib/Modern UI/Language files/Belarusian.nsh
-share/nsis/Contrib/Modern UI/Language files/Bosnian.nsh
-share/nsis/Contrib/Modern UI/Language files/Breton.nsh
-share/nsis/Contrib/Modern UI/Language files/Bulgarian.nsh
-share/nsis/Contrib/Modern UI/Language files/Catalan.nsh
-share/nsis/Contrib/Modern UI/Language files/Croatian.nsh
-share/nsis/Contrib/Modern UI/Language files/Czech.nsh
-share/nsis/Contrib/Modern UI/Language files/Danish.nsh
-share/nsis/Contrib/Modern UI/Language files/Default.nsh
-share/nsis/Contrib/Modern UI/Language files/Dutch.nsh
-share/nsis/Contrib/Modern UI/Language files/English.nsh
-share/nsis/Contrib/Modern UI/Language files/Estonian.nsh
-share/nsis/Contrib/Modern UI/Language files/Farsi.nsh
-share/nsis/Contrib/Modern UI/Language files/Finnish.nsh
-share/nsis/Contrib/Modern UI/Language files/French.nsh
-share/nsis/Contrib/Modern UI/Language files/German.nsh
-share/nsis/Contrib/Modern UI/Language files/Greek.nsh
-share/nsis/Contrib/Modern UI/Language files/Hebrew.nsh
-share/nsis/Contrib/Modern UI/Language files/Hungarian.nsh
-share/nsis/Contrib/Modern UI/Language files/Icelandic.nsh
-share/nsis/Contrib/Modern UI/Language files/Indonesian.nsh
-share/nsis/Contrib/Modern UI/Language files/Italian.nsh
-share/nsis/Contrib/Modern UI/Language files/Japanese.nsh
-share/nsis/Contrib/Modern UI/Language files/Korean.nsh
-share/nsis/Contrib/Modern UI/Language files/Kurdish.nsh
-share/nsis/Contrib/Modern UI/Language files/Latvian.nsh
-share/nsis/Contrib/Modern UI/Language files/Lithuanian.nsh
-share/nsis/Contrib/Modern UI/Language files/Luxembourgish.nsh
-share/nsis/Contrib/Modern UI/Language files/Macedonian.nsh
-share/nsis/Contrib/Modern UI/Language files/Malay.nsh
-share/nsis/Contrib/Modern UI/Language files/Mongolian.nsh
-share/nsis/Contrib/Modern UI/Language files/Norwegian.nsh
-share/nsis/Contrib/Modern UI/Language files/Polish.nsh
-share/nsis/Contrib/Modern UI/Language files/Portuguese.nsh
-share/nsis/Contrib/Modern UI/Language files/PortugueseBR.nsh
-share/nsis/Contrib/Modern UI/Language files/Romanian.nsh
-share/nsis/Contrib/Modern UI/Language files/Russian.nsh
-share/nsis/Contrib/Modern UI/Language files/Serbian.nsh
-share/nsis/Contrib/Modern UI/Language files/SerbianLatin.nsh
-share/nsis/Contrib/Modern UI/Language files/SimpChinese.nsh
-share/nsis/Contrib/Modern UI/Language files/Slovak.nsh
-share/nsis/Contrib/Modern UI/Language files/Slovenian.nsh
-share/nsis/Contrib/Modern UI/Language files/Spanish.nsh
-share/nsis/Contrib/Modern UI/Language files/Swedish.nsh
-share/nsis/Contrib/Modern UI/Language files/Thai.nsh
-share/nsis/Contrib/Modern UI/Language files/TradChinese.nsh
-share/nsis/Contrib/Modern UI/Language files/Turkish.nsh
-share/nsis/Contrib/Modern UI/Language files/Ukrainian.nsh
+share/nsis/Contrib/Language files/Ukrainian.nsh
+share/nsis/Contrib/Language files/Uzbek.nlf
+share/nsis/Contrib/Language files/Uzbek.nsh
+share/nsis/Contrib/Language files/Vietnamese.nlf
+share/nsis/Contrib/Language files/Vietnamese.nsh
+share/nsis/Contrib/Language files/Welsh.nlf
+share/nsis/Contrib/Language files/Welsh.nsh
+share/nsis/Contrib/Modern UI 2/Deprecated.nsh