CVS commit: pkgsrc/devel/nsis

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Wed Oct  7 14:06:58 UTC 2026

Modified Files:
        pkgsrc/devel/nsis: Makefile

Log Message:
nsis: depend on GNU iconv to fix initialisation errors

NetBSD base iconv gives:
# makensis
NSISRT_Initialize failed!

With GNU iconv:
# makensis
Error: reading stub "/usr/pkg/share/Stubs/zlib-x86-unicode"
Error initializing CEXEBuild: error setting default stub

In turn, to fix this error:
SCONS_BUILD_ARGS+=      NSIS_CONFIG_CONST_DATA_PATH=no

needs changing to:
SCONS_BUILD_ARGS+=      NSIS_CONFIG_CONST_DATA_PATH=yes


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/devel/nsis/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/nsis/Makefile
diff -u pkgsrc/devel/nsis/Makefile:1.27 pkgsrc/devel/nsis/Makefile:1.28
--- pkgsrc/devel/nsis/Makefile:1.27     Fri Jul 17 10:16:04 2026
+++ pkgsrc/devel/nsis/Makefile  Wed Oct  7 14:06:58 2026
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2026/07/17 10:16:04 adam Exp $
+# $NetBSD: Makefile,v 1.28 2026/10/07 14:06:58 sborrill Exp $
 
 DISTNAME=      nsis-${NSIS_VER}
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=nsis/}
 EXTRACT_SUFX=  .zip .tar.bz2
@@ -20,7 +21,7 @@ NSIS_SRC=     ${DISTNAME:=-src}
 NSIS_VER=      3.12
 WRKSRC=                ${WRKDIR}/${NSIS_SRC}
 NO_CONFIGURE=  yes
-
+USE_GNU_ICONV= yes
 EXTRACT_OPTS_ZIP=      -qo
 
 MAKENSIS_BIN=  ${PREFIX}/share/nsis/makensis
@@ -34,7 +35,9 @@ SUBST_SED.makensis=   -e s,@@SH@@,${SH:Q},
 SUBST_SED.makensis+=   -e s,@@MAKENSIS@@,${MAKENSIS_BIN:Q},
 
 # https://nsis.sourceforge.io/Docs/AppendixG.html#build_posix
-SCONS_BUILD_ARGS+=     NSIS_CONFIG_CONST_DATA_PATH=no
+SCONS_BUILD_ARGS+=     APPEND_CCFLAGS=${CFLAGS:Q}
+SCONS_BUILD_ARGS+=     APPEND_LINKFLAGS=${LDFLAGS:Q}
+SCONS_BUILD_ARGS+=     NSIS_CONFIG_CONST_DATA_PATH=yes
 SCONS_BUILD_ARGS+=     SKIPMISC=all
 SCONS_BUILD_ARGS+=     SKIPPLUGINS=all
 SCONS_BUILD_ARGS+=     SKIPSTUBS=all
@@ -54,6 +57,7 @@ do-install:
        cd ${WRKDIR}/${DISTNAME} && ${PAX} -rw .        \
                ${DESTDIR}${PREFIX}/share/nsis
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/scons4/build.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"