diff options
| author | cheusov <cheusov> | 2012-10-21 21:07:11 +0000 |
|---|---|---|
| committer | cheusov <cheusov> | 2012-10-21 21:07:11 +0000 |
| commit | d1b3e1b4cf9bf023bf451bfe5f1bd5a079f95f38 (patch) | |
| tree | 5ac2bf6bb9fd609259b5dc55cfcea1c8b75380ac /lang/spidermonkey | |
| parent | 45052430b5a96d986c16d94e3b05e848a9d17d09 (diff) | |
| download | pkgsrc-d1b3e1b4cf9bf023bf451bfe5f1bd5a079f95f38.tar.gz | |
Add CONFLICTS with lang/js. Fix some pkglint warnings
Diffstat (limited to 'lang/spidermonkey')
| -rw-r--r-- | lang/spidermonkey/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile index 8fa19ef2cbc..41c819dd8e5 100644 --- a/lang/spidermonkey/Makefile +++ b/lang/spidermonkey/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2012/10/02 20:11:54 asau Exp $ +# $NetBSD: Makefile,v 1.26 2012/10/21 21:07:11 cheusov Exp $ DISTNAME= js-1.8.0-rc1 PKGNAME= spidermonkey-1.8.0rc1 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_MOZILLA_ALL:=js/} @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.mozilla.org/js/spidermonkey/ COMMENT= Standalone JavaScript implementation in C +CONFLICTS= js-[0-9]* + WRKSRC= ${WRKDIR}/js/src MAKE_JOBS_SAFE= no @@ -19,7 +21,7 @@ USE_TOOLS+= gmake pkg-config MAKE_FILE= Makefile.ref CFLAGS+= -DJS_USE_FDLIBM_MATH=0 -MAKE_FLAGS+= BUILD_OPT=1 LDFLAGS=${LDFLAGS:Q} PREFIX=${PREFIX:Q} +MAKE_FLAGS+= BUILD_OPT=1 LDFLAGS=${LDFLAGS:Q} PREFIX=${PREFIX} INSTALLATION_DIRS= bin include lib @@ -58,7 +60,7 @@ do-install: ${DESTDIR}${PREFIX}/bin ${INSTALL_LIB} ${WRKSRC}/${BUILDDIRPREFIX}_OPT.OBJ/libjs.${SO_SUFFIX} \ ${DESTDIR}${PREFIX}/lib - ${CP} ${WRKSRC}/${BUILDDIRPREFIX}_OPT.OBJ/jsautocfg.h ${WRKSRC} + ${INSTALL_DATA} ${WRKSRC}/${BUILDDIRPREFIX}_OPT.OBJ/jsautocfg.h ${WRKSRC} ${INSTALL_DATA} ${WRKSRC}/*.h ${DESTDIR}${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/*.tbl ${DESTDIR}${PREFIX}/include |