Thu Sep 27 20:01:07 2018 UTC ()
nsis: SUBST in pre-configure doesn't work when NO_CONFIGURE=yes


(tnn)
diff -r1.18 -r1.19 pkgsrc/devel/nsis/Makefile
cvs diff -r1.18 -r1.19 pkgsrc/devel/nsis/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/nsis/Makefile 2018/07/04 13:40:15 1.18
+++ pkgsrc/devel/nsis/Makefile 2018/09/27 20:01:07 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.18 2018/07/04 13:40:15 jperkin Exp $ 1# $NetBSD: Makefile,v 1.19 2018/09/27 20:01:07 tnn Exp $
2# 2#
3 3
4DISTNAME= nsis-${NSIS_VER} 4DISTNAME= nsis-${NSIS_VER}
5PKGREVISION= 5 5PKGREVISION= 5
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nsis/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nsis/}
8EXTRACT_SUFX= .zip .tar.bz2 8EXTRACT_SUFX= .zip .tar.bz2
9DISTFILES= ${DISTNAME}.zip \ 9DISTFILES= ${DISTNAME}.zip \
10 ${NSIS_SRC}.tar.bz2 10 ${NSIS_SRC}.tar.bz2
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://nsis.sourceforge.net/Main_Page 13HOMEPAGE= http://nsis.sourceforge.net/Main_Page
14COMMENT= Scriptable system to build Windows installers 14COMMENT= Scriptable system to build Windows installers
@@ -20,27 +20,27 @@ USE_TOOLS+= pax @@ -20,27 +20,27 @@ USE_TOOLS+= pax
20 20
21NSIS_SRC= ${DISTNAME:=-src} 21NSIS_SRC= ${DISTNAME:=-src}
22NSIS_VER= 2.12 22NSIS_VER= 2.12
23WRKSRC= ${WRKDIR}/${NSIS_SRC} 23WRKSRC= ${WRKDIR}/${NSIS_SRC}
24NO_CONFIGURE= yes 24NO_CONFIGURE= yes
25EXTRACT_OPTS_ZIP= -qo 25EXTRACT_OPTS_ZIP= -qo
26 26
27SCONS_BIN= ${LOCALBASE}/bin/scons 27SCONS_BIN= ${LOCALBASE}/bin/scons
28MAKENSIS_BIN= ${PREFIX}/share/nsis/makensis 28MAKENSIS_BIN= ${PREFIX}/share/nsis/makensis
29 29
30INSTALLATION_DIRS= bin share/nsis 30INSTALLATION_DIRS= bin share/nsis
31 31
32SUBST_CLASSES+= makensis 32SUBST_CLASSES+= makensis
33SUBST_STAGE.makensis= pre-configure 33SUBST_STAGE.makensis= pre-build
34SUBST_FILES.makensis= makensis.sh 34SUBST_FILES.makensis= makensis.sh
35SUBST_SED.makensis= -e s,@@SH@@,${SH:Q}, 35SUBST_SED.makensis= -e s,@@SH@@,${SH:Q},
36SUBST_SED.makensis+= -e s,@@MAKENSIS@@,${MAKENSIS_BIN:Q}, 36SUBST_SED.makensis+= -e s,@@MAKENSIS@@,${MAKENSIS_BIN:Q},
37 37
38post-extract: 38post-extract:
39 ${CP} ${FILESDIR:Q}/makensis.sh ${WRKSRC:Q} 39 ${CP} ${FILESDIR:Q}/makensis.sh ${WRKSRC:Q}
40 chmod -R go-w ${WRKDIR}/* 40 chmod -R go-w ${WRKDIR}/*
41 41
42do-build: 42do-build:
43 cd ${WRKSRC:Q} && ${PKGSRC_SETENV} ${MAKE_ENV} \ 43 cd ${WRKSRC:Q} && ${PKGSRC_SETENV} ${MAKE_ENV} \
44 ${SCONS_BIN:Q} SKIPSTUBS=all SKIPPLUGINS=all \ 44 ${SCONS_BIN:Q} SKIPSTUBS=all SKIPPLUGINS=all \
45 SKIPUTILS=all SKIPMISC=all VERSION=${NSIS_VER:Q} 45 SKIPUTILS=all SKIPMISC=all VERSION=${NSIS_VER:Q}
46 46