spidermonkey185: various cosmetic fixes and improvements

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: spidermonkey185: various cosmetic fixes and improvements
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Fri, 29 Jan 2016 16:40:12 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Fri Jan 29 17:40:12 2016 +0100
Changeset:	e6e4a357f1899a6e24eaf610a98eeb52fa1e4f16

Modified Files:
	spidermonkey185/Makefile
	spidermonkey185/PLIST
	spidermonkey185/distinfo
	spidermonkey185/patches/patch-v8-dtoa_platform.cc
	spidermonkey185/patches/patch-v8-dtoa_platform.h

Log Message:
spidermonkey185: various cosmetic fixes and improvements

o Append the version to the various binaries and install headers in
  <js-1.8.5/...> instead of <js/...> to avoid confusion with other
  spidermonkeys and for consistency.
o Adjust js-config, mozjs185.pc and PLIST for the above change
o Fix possible PLIST issues for MACHINE_ARCHes different from i386 or x86_64,
  from FreeBSD port.
o Add a newline in the patches (thanks pkglint) and various minor cosmetic
  fixes.

PKGREVISION++

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e6e4a357f1899a6e24eaf610a98eeb52fa1e4f16

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

diffstat:
 spidermonkey185/Makefile                          |  47 +++++-
 spidermonkey185/PLIST                             | 191 +++++++++++-----------
 spidermonkey185/distinfo                          |   4 +-
 spidermonkey185/patches/patch-v8-dtoa_platform.cc |   1 +
 spidermonkey185/patches/patch-v8-dtoa_platform.h  |   1 +
 5 files changed, 138 insertions(+), 106 deletions(-)

diffs:
diff --git a/spidermonkey185/Makefile b/spidermonkey185/Makefile
index 8a6dea9..603d868 100644
--- a/spidermonkey185/Makefile
+++ b/spidermonkey185/Makefile
@@ -3,7 +3,7 @@
 
 DISTNAME=	js185-1.0.0
 PKGNAME=	${DISTNAME:S/js/spidermonkey/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_MOZILLA:=js/}
 
@@ -12,20 +12,28 @@ HOMEPAGE=	https://developer.mozilla.org/en/SpiderMonkey
 COMMENT=	Standalone JavaScript implementation in C
 LICENSE=	mpl-1.1
 
-BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
-
 WRKSRC=		${WRKDIR}/js-1.8.5/js/src
-USE_TOOLS+=	pkg-config perl:build gmake
+
+USE_TOOLS+=	gmake pkg-config perl:build zip:build
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 
-MAKE_JOBS_SAFE=	NO
-
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-system-nspr
+CONFIGURE_ARGS+=	--with-pthreads
 CONFIGURE_ARGS+=	--enable-threadsafe
 
-#XXX workaround for js-config command and mozjs185.pc
+SUBST_CLASSES+=			js-config pc
+SUBST_STAGE.js-config=		pre-configure
+SUBST_STAGE.pc=			pre-configure
+SUBST_MESSAGE.js-config=	Adjust CFLAGS in js-config
+SUBST_MESSAGE.pc=		Adjust CFLAGS in mozjs185.pc
+SUBST_FILES.js-config=		js-config.in
+SUBST_FILES.pc=			mozjs185.pc.in
+SUBST_SED.js-config+=		-e '/includedir/ s,js,js-1.8.5,g'
+SUBST_SED.pc+=			-e '/Cflags:/ s,js,js-1.8.5,g'
+
+# XXX: workaround for js-config command and mozjs185.pc
 CONFIGURE_ENV+=		MOZILLA_VERSION=4.0
 
 PKGCONFIG_OVERRIDE+=	ctypes/libffi/libffi.pc.in
@@ -33,12 +41,33 @@ PKGCONFIG_OVERRIDE+=	mozjs185.pc.in
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "arm"
+PLIST_SUBST+=	ARCH=ARM
+.elif ${MACHINE_ARCH} == "mips"
+PLIST_SUBST+=	ARCH=MIPS
+.elif ${MACHINE_ARCH} == "powerpc"
+PLIST_SUBST+=	ARCH=PPC
+.elif ${MACHINE_ARCH} == "sparc"
+PLIST_SUBST+=	ARCH=Sparc
+.elif ${MACHINE_ARCH} == "x86_64"
 PLIST_SUBST+=	ARCH=X64
 .else
 PLIST_SUBST+=	ARCH=${MACHINE_ARCH}
 .endif
 
+TEST_TARGET=		check
+
+# o Install js interpreter
+# o Install the binaries and headers with a proper version suffix
+# o Adjust headers permissions
+post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/js ${DESTDIR}${PREFIX}/bin/js185
+	${MV} ${DESTDIR}${PREFIX}/bin/js-config ${DESTDIR}${PREFIX}/bin/js185-config
+	${MV} ${DESTDIR}${PREFIX}/include/js ${DESTDIR}${PREFIX}/include/js-1.8.5
+	${CHMOD} -x ${DESTDIR}${PREFIX}/include/js-1.8.5/*
+
+PYTHON_FOR_BUILD_ONLY=	yes
 .include "../../lang/python/application.mk"
 .include "../../devel/nspr/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/spidermonkey185/PLIST b/spidermonkey185/PLIST
index 29a1226..588f352 100644
--- a/spidermonkey185/PLIST
+++ b/spidermonkey185/PLIST
@@ -1,99 +1,100 @@
 @comment $NetBSD: PLIST,v 1.2 2012/11/03 15:07:33 thomasklausner Exp $
-bin/js-config
-include/js/Allocator.h
-include/js/Assembler.h
-include/js/CodeAlloc.h
-include/js/Containers.h
-include/js/Fragmento.h
-include/js/LIR.h
-include/js/LIRopcode.tbl
-include/js/Native.h
-include/js/NativeCommon.h
-include/js/Native${ARCH}.h
-include/js/RegAlloc.h
-include/js/VMPI.h
-include/js/Writer.h
-include/js/avmplus.h
-include/js/js-config.h
-include/js/js.msg
-include/js/jsanalyze.h
-include/js/jsapi.h
-include/js/jsarena.h
-include/js/jsarray.h
-include/js/jsatom.h
-include/js/jsautocfg.h
-include/js/jsautokw.h
-include/js/jsbit.h
-include/js/jsbool.h
-include/js/jsbuiltins.h
-include/js/jscell.h
-include/js/jsclist.h
-include/js/jsclone.h
-include/js/jscntxt.h
-include/js/jscompartment.h
-include/js/jscompat.h
-include/js/jsdate.h
-include/js/jsdbgapi.h
-include/js/jsdhash.h
-include/js/jsdtoa.h
-include/js/jsemit.h
-include/js/jsfriendapi.h
-include/js/jsfun.h
-include/js/jsgc.h
-include/js/jsgcchunk.h
-include/js/jsgcstats.h
-include/js/jshash.h
-include/js/jshashtable.h
-include/js/jshotloop.h
-include/js/jsinterp.h
-include/js/jsinttypes.h
-include/js/jsiter.h
-include/js/jslock.h
-include/js/jslong.h
-include/js/jsmath.h
-include/js/jsobj.h
-include/js/jsobjinlines.h
-include/js/json.h
-include/js/jsopcode.h
-include/js/jsopcode.tbl
-include/js/jsopcodeinlines.h
-include/js/jsotypes.h
-include/js/jsparse.h
-include/js/jsperf.h
-include/js/jsprf.h
-include/js/jsprobes.h
-include/js/jspropertycache.h
-include/js/jspropertycacheinlines.h
-include/js/jspropertytree.h
-include/js/jsproto.tbl
-include/js/jsproxy.h
-include/js/jsprvtd.h
-include/js/jspubtd.h
-include/js/jsreflect.h
-include/js/jsregexp.h
-include/js/jsscan.h
-include/js/jsscope.h
-include/js/jsscript.h
-include/js/jsscriptinlines.h
-include/js/jsstaticcheck.h
-include/js/jsstdint.h
-include/js/jsstr.h
-include/js/jstl.h
-include/js/jstracer.h
-include/js/jstypedarray.h
-include/js/jstypes.h
-include/js/jsutil.h
-include/js/jsval.h
-include/js/jsvalue.h
-include/js/jsvector.h
-include/js/jsversion.h
-include/js/jswrapper.h
-include/js/jsxdrapi.h
-include/js/jsxml.h
-include/js/nanojit.h
-include/js/njconfig.h
-include/js/njcpudetect.h
-include/js/prmjtime.h
+bin/js185
+bin/js185-config
+include/js-1.8.5/Allocator.h
+include/js-1.8.5/Assembler.h
+include/js-1.8.5/CodeAlloc.h
+include/js-1.8.5/Containers.h
+include/js-1.8.5/Fragmento.h
+include/js-1.8.5/LIR.h
+include/js-1.8.5/LIRopcode.tbl
+include/js-1.8.5/Native.h
+include/js-1.8.5/NativeCommon.h
+include/js-1.8.5/Native${ARCH}.h
+include/js-1.8.5/RegAlloc.h
+include/js-1.8.5/VMPI.h
+include/js-1.8.5/Writer.h
+include/js-1.8.5/avmplus.h
+include/js-1.8.5/js-config.h
+include/js-1.8.5/js.msg
+include/js-1.8.5/jsanalyze.h
+include/js-1.8.5/jsapi.h
+include/js-1.8.5/jsarena.h
+include/js-1.8.5/jsarray.h
+include/js-1.8.5/jsatom.h
+include/js-1.8.5/jsautocfg.h
+include/js-1.8.5/jsautokw.h
+include/js-1.8.5/jsbit.h
+include/js-1.8.5/jsbool.h
+include/js-1.8.5/jsbuiltins.h
+include/js-1.8.5/jscell.h
+include/js-1.8.5/jsclist.h
+include/js-1.8.5/jsclone.h
+include/js-1.8.5/jscntxt.h
+include/js-1.8.5/jscompartment.h
+include/js-1.8.5/jscompat.h
+include/js-1.8.5/jsdate.h
+include/js-1.8.5/jsdbgapi.h
+include/js-1.8.5/jsdhash.h
+include/js-1.8.5/jsdtoa.h
+include/js-1.8.5/jsemit.h
+include/js-1.8.5/jsfriendapi.h
+include/js-1.8.5/jsfun.h
+include/js-1.8.5/jsgc.h
+include/js-1.8.5/jsgcchunk.h
+include/js-1.8.5/jsgcstats.h
+include/js-1.8.5/jshash.h
+include/js-1.8.5/jshashtable.h
+include/js-1.8.5/jshotloop.h
+include/js-1.8.5/jsinterp.h
+include/js-1.8.5/jsinttypes.h
+include/js-1.8.5/jsiter.h
+include/js-1.8.5/jslock.h
+include/js-1.8.5/jslong.h
+include/js-1.8.5/jsmath.h
+include/js-1.8.5/jsobj.h
+include/js-1.8.5/jsobjinlines.h
+include/js-1.8.5/json.h
+include/js-1.8.5/jsopcode.h
+include/js-1.8.5/jsopcode.tbl
+include/js-1.8.5/jsopcodeinlines.h
+include/js-1.8.5/jsotypes.h
+include/js-1.8.5/jsparse.h
+include/js-1.8.5/jsperf.h
+include/js-1.8.5/jsprf.h
+include/js-1.8.5/jsprobes.h
+include/js-1.8.5/jspropertycache.h
+include/js-1.8.5/jspropertycacheinlines.h
+include/js-1.8.5/jspropertytree.h
+include/js-1.8.5/jsproto.tbl
+include/js-1.8.5/jsproxy.h
+include/js-1.8.5/jsprvtd.h
+include/js-1.8.5/jspubtd.h
+include/js-1.8.5/jsreflect.h
+include/js-1.8.5/jsregexp.h
+include/js-1.8.5/jsscan.h
+include/js-1.8.5/jsscope.h
+include/js-1.8.5/jsscript.h
+include/js-1.8.5/jsscriptinlines.h
+include/js-1.8.5/jsstaticcheck.h
+include/js-1.8.5/jsstdint.h
+include/js-1.8.5/jsstr.h
+include/js-1.8.5/jstl.h
+include/js-1.8.5/jstracer.h
+include/js-1.8.5/jstypedarray.h
+include/js-1.8.5/jstypes.h
+include/js-1.8.5/jsutil.h
+include/js-1.8.5/jsval.h
+include/js-1.8.5/jsvalue.h
+include/js-1.8.5/jsvector.h
+include/js-1.8.5/jsversion.h
+include/js-1.8.5/jswrapper.h
+include/js-1.8.5/jsxdrapi.h
+include/js-1.8.5/jsxml.h
+include/js-1.8.5/nanojit.h
+include/js-1.8.5/njconfig.h
+include/js-1.8.5/njcpudetect.h
+include/js-1.8.5/prmjtime.h
 lib/libmozjs185-1.0.a
 lib/libmozjs185.so
 lib/libmozjs185.so.1.0
diff --git a/spidermonkey185/distinfo b/spidermonkey185/distinfo
index f5c435a..da44217 100644
--- a/spidermonkey185/distinfo
+++ b/spidermonkey185/distinfo
@@ -4,5 +4,5 @@ SHA1 (js185-1.0.0.tar.gz) = 52a01449c48d7a117b35f213d3e4263578d846d6
 RMD160 (js185-1.0.0.tar.gz) = 23e6ddc81d5b63e015aecc1a104b2d3d3ced5005
 Size (js185-1.0.0.tar.gz) = 6164605 bytes
 SHA1 (patch-configure) = 77366fff7e8b766b5691d0432b8740d4c8c362a6
-SHA1 (patch-v8-dtoa_platform.cc) = fe417a25a9e839b9cd4aabef6bcd07021c969613
-SHA1 (patch-v8-dtoa_platform.h) = f1c70437c21b18444cdbb52e2bc4f87c8dbb998d
+SHA1 (patch-v8-dtoa_platform.cc) = 24670e996fcc7ca0d1e7b1b3765a67ac05e9a661
+SHA1 (patch-v8-dtoa_platform.h) = 1d618d8f51e3ee169606297950d3030fcf72abbc
diff --git a/spidermonkey185/patches/patch-v8-dtoa_platform.cc b/spidermonkey185/patches/patch-v8-dtoa_platform.cc
index 650b1d8..f5e79e5 100644
--- a/spidermonkey185/patches/patch-v8-dtoa_platform.cc
+++ b/spidermonkey185/patches/patch-v8-dtoa_platform.cc
@@ -1,6 +1,7 @@
 $NetBSD: patch-v8-dtoa_platform.cc,v 1.1 2014/02/03 13:52:53 fhajny Exp $
 
 fpclassify is defined on Illumos.
+
 --- v8-dtoa/platform.cc.orig	2011-03-31 19:08:36.000000000 +0000
 +++ v8-dtoa/platform.cc
 @@ -111,6 +111,7 @@ int fpclassify(double x) {
diff --git a/spidermonkey185/patches/patch-v8-dtoa_platform.h b/spidermonkey185/patches/patch-v8-dtoa_platform.h
index 80ebf93..d490585 100644
--- a/spidermonkey185/patches/patch-v8-dtoa_platform.h
+++ b/spidermonkey185/patches/patch-v8-dtoa_platform.h
@@ -1,6 +1,7 @@
 $NetBSD: patch-v8-dtoa_platform.h,v 1.1 2014/02/03 13:52:53 fhajny Exp $
 
 fpclassify is defined on Illumos.
+
 --- v8-dtoa/platform.h.orig	2011-03-31 19:08:36.000000000 +0000
 +++ v8-dtoa/platform.h
 @@ -67,7 +67,9 @@ int strncasecmp(const char* s1, const ch
Prev by Date: Updated poedit.
Next by Date: openal-soft: Update to 1.17.2, fix config file path, fix OSS device path substitution.
Previous by Thread: Updated poedit.
Next by Thread: openal-soft: Update to 1.17.2, fix config file path, fix OSS device path substitution.
Indexes:
Home | Main Index | Thread Index | Old Index