Tue Feb 3 15:24:46 2009 UTC ()
devel/scons-devel contains the scons-devel, not scons, so fix dependency.


(sborrill)
diff -r1.11 -r1.12 pkgsrc/devel/nsis/Makefile
cvs diff -r1.11 -r1.12 pkgsrc/devel/nsis/Makefile (switch to unified diff)

--- pkgsrc/devel/nsis/Makefile 2008/05/26 02:13:17 1.11
+++ pkgsrc/devel/nsis/Makefile 2009/02/03 15:24:46 1.12
@@ -1,57 +1,57 @@ @@ -1,57 +1,57 @@
1# $NetBSD: Makefile,v 1.11 2008/05/26 02:13:17 joerg Exp $ 1# $NetBSD: Makefile,v 1.12 2009/02/03 15:24:46 sborrill Exp $
2# 2#
3 3
4DISTNAME= nsis-${NSIS_VER} 4DISTNAME= nsis-${NSIS_VER}
5PKGREVISION= 4 5PKGREVISION= 4
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= cube@NetBSD.org 12MAINTAINER= cube@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
15 15
16DEPENDS+= scons>=0.96.91:../../devel/scons-devel 16DEPENDS+= scons-devel>=0.96.91:../../devel/scons-devel
17 17
18USE_TOOLS+= pax 18USE_TOOLS+= pax
19 19
20PKG_DESTDIR_SUPPORT= user-destdir 20PKG_DESTDIR_SUPPORT= user-destdir
21 21
22NSIS_SRC= ${DISTNAME:=-src} 22NSIS_SRC= ${DISTNAME:=-src}
23NSIS_VER= 2.12 23NSIS_VER= 2.12
24WRKSRC= ${WRKDIR}/${NSIS_SRC} 24WRKSRC= ${WRKDIR}/${NSIS_SRC}
25NO_CONFIGURE= yes 25NO_CONFIGURE= yes
26EXTRACT_OPTS_ZIP= -qo 26EXTRACT_OPTS_ZIP= -qo
27 27
28EVAL_PREFIX+= SCONS_PREFIX=scons 28EVAL_PREFIX+= SCONS_PREFIX=scons
29SCONS_BIN= ${SCONS_PREFIX}/bin/scons 29SCONS_BIN= ${SCONS_PREFIX}/bin/scons
30MAKENSIS_BIN= ${PREFIX}/share/nsis/makensis 30MAKENSIS_BIN= ${PREFIX}/share/nsis/makensis
31 31
32INSTALLATION_DIRS= bin share/nsis 32INSTALLATION_DIRS= bin share/nsis
33 33
34SUBST_CLASSES+= makensis 34SUBST_CLASSES+= makensis
35SUBST_STAGE.makensis= post-patch 35SUBST_STAGE.makensis= post-patch
36SUBST_FILES.makensis= makensis.sh 36SUBST_FILES.makensis= makensis.sh
37SUBST_SED.makensis= -e s,@@SH@@,${SH:Q}, 37SUBST_SED.makensis= -e s,@@SH@@,${SH:Q},
38SUBST_SED.makensis+= -e s,@@MAKENSIS@@,${MAKENSIS_BIN:Q}, 38SUBST_SED.makensis+= -e s,@@MAKENSIS@@,${MAKENSIS_BIN:Q},
39 39
40post-extract: 40post-extract:
41 ${CP} ${FILESDIR:Q}/makensis.sh ${WRKSRC:Q} 41 ${CP} ${FILESDIR:Q}/makensis.sh ${WRKSRC:Q}
42 chmod -R go-w ${WRKDIR}/* 42 chmod -R go-w ${WRKDIR}/*
43 43
44do-build: 44do-build:
45 cd ${WRKSRC:Q} && \ 45 cd ${WRKSRC:Q} && \
46 ${SCONS_BIN:Q} SKIPSTUBS=all SKIPPLUGINS=all \ 46 ${SCONS_BIN:Q} SKIPSTUBS=all SKIPPLUGINS=all \
47 SKIPUTILS=all SKIPMISC=all VERSION=${NSIS_VER:Q} 47 SKIPUTILS=all SKIPMISC=all VERSION=${NSIS_VER:Q}
48 48
49do-install: 49do-install:
50 ${INSTALL_PROGRAM} ${WRKSRC:Q}/build/release/makensis/makensis \ 50 ${INSTALL_PROGRAM} ${WRKSRC:Q}/build/release/makensis/makensis \
51 ${DESTDIR}${MAKENSIS_BIN:Q} 51 ${DESTDIR}${MAKENSIS_BIN:Q}
52 ${INSTALL_SCRIPT} ${WRKSRC:Q}/makensis.sh \ 52 ${INSTALL_SCRIPT} ${WRKSRC:Q}/makensis.sh \
53 ${DESTDIR}${PREFIX:Q}/bin/makensis 53 ${DESTDIR}${PREFIX:Q}/bin/makensis
54 cd ${WRKDIR:Q}/${DISTNAME:Q} && pax -rw . \ 54 cd ${WRKDIR:Q}/${DISTNAME:Q} && pax -rw . \
55 ${DESTDIR}${PREFIX:Q}/share/nsis 55 ${DESTDIR}${PREFIX:Q}/share/nsis
56 56
57.include "../../mk/bsd.pkg.mk" 57.include "../../mk/bsd.pkg.mk"