[pkgsrc/trunk]: pkgsrc/lang/spidermonkey Add CONFLICTS with lang/js. Fix some...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1baf384b92b1
branches:  trunk
changeset: 610263:1baf384b92b1
user:      cheusov <cheusov%pkgsrc.org@localhost>
date:      Sun Oct 21 21:07:11 2012 +0000

description:
Add CONFLICTS with lang/js. Fix some pkglint warnings

diffstat:

 lang/spidermonkey/Makefile |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 7b35d9daaed7 -r 1baf384b92b1 lang/spidermonkey/Makefile
--- a/lang/spidermonkey/Makefile        Sun Oct 21 21:06:05 2012 +0000
+++ b/lang/spidermonkey/Makefile        Sun Oct 21 21:07:11 2012 +0000
@@ -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 @@
 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 @@
 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 @@
          ${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