spidermonkey17: Fix installation and other minor issues

[Leonardo Taccari <leot%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Feb 13 16:09:54 2016 +0100
Changeset:	efafae860a093b515186da3e16ba8151563f56ee

Modified Files:
	spidermonkey17/Makefile
	spidermonkey17/distinfo
	spidermonkey17/patches/patch-ml
Added Files:
	spidermonkey17/patches/patch-js_src_config_milestone.pl

Log Message:
spidermonkey17: Fix installation and other minor issues

o spidermonkey17 was broken due the use of defined() for aggregate types (that's
  is oblsolete). Adding the patch-js_src_config_milestone.pl fixes that (similar
  to wip/spidermonkey24).
o Generated js-config did not had the shebang. Add a kludge in order to always
  have it.
o Adjust various file permissions.

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

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

diffstat:
 spidermonkey17/Makefile                                 |  7 +++++++
 spidermonkey17/distinfo                                 |  3 ++-
 spidermonkey17/patches/patch-js_src_config_milestone.pl | 15 +++++++++++++++
 spidermonkey17/patches/patch-ml                         | 17 +++++++++++++++--
 4 files changed, 39 insertions(+), 3 deletions(-)

diffs:
diff --git a/spidermonkey17/Makefile b/spidermonkey17/Makefile
index 5bba67b..297b32d 100644
--- a/spidermonkey17/Makefile
+++ b/spidermonkey17/Makefile
@@ -28,6 +28,13 @@ PKGCONFIG_OVERRIDE+=	js/src/js.pc.in
 
 TEST_TARGET=		check
 
+# Adjust file permissions
+post-install:
+	${CHMOD} -x ${DESTDIR}${PREFIX}/include/js-17.0/*.*
+	${CHMOD} -x ${DESTDIR}${PREFIX}/include/js-17.0/*/*.*
+	${CHMOD} -x ${DESTDIR}${PREFIX}/lib/libmozjs-17.0.a
+	${CHMOD} -x ${DESTDIR}${PREFIX}/lib/pkgconfig/mozjs-17.0.pc
+
 PYTHON_FOR_BUILD_ONLY=	yes
 .include "../../lang/python/tool.mk"
 .include "../../devel/libffi/buildlink3.mk"
diff --git a/spidermonkey17/distinfo b/spidermonkey17/distinfo
index 561063f..ad7ec24 100644
--- a/spidermonkey17/distinfo
+++ b/spidermonkey17/distinfo
@@ -7,9 +7,10 @@ SHA1 (patch-ak) = 7cebf3e58ad14598fbe98c3d730c8a548c0bda1e
 SHA1 (patch-as) = c8e3aa309ae5115a8f4c17d477674f93afead538
 SHA1 (patch-bd) = c8ed2110c8b699d6880723dccf62e6976edfa65e
 SHA1 (patch-bf) = 7d18ec3cad441174a71770e7fa22b1cd2029d55b
+SHA1 (patch-js_src_config_milestone.pl) = 84dbc588e82ba1a6bcc901abe9b77ba316acac15
 SHA1 (patch-js_src_config_system-headers) = a9c5bc2d2c822eb3bd5e8f4ba43407f89b57c009
 SHA1 (patch-js_src_jscpucfg.h) = afce65ca5964fb732d96cf22902f89cd02aedf0d
 SHA1 (patch-js_src_jsgc.cpp) = 0e617094a4b7d87cdf801d9bc4ac1f52d909a12a
 SHA1 (patch-js_src_jsinterp.cpp) = bee8bdde7dd951dbfbe5b049eb502f7412fbf8e6
 SHA1 (patch-js_src_methodjit_MethodJIT.cpp) = f2b12fa554ec319b5848b1cc13ec17ef967b08d7
-SHA1 (patch-ml) = 71c4eb8822755dd17cd4add11687d8cf52a12f6f
+SHA1 (patch-ml) = fdb4452a613f7ca185cd6b936538bec9ef97c4c1
diff --git a/spidermonkey17/patches/patch-js_src_config_milestone.pl b/spidermonkey17/patches/patch-js_src_config_milestone.pl
new file mode 100644
index 0000000..4a93813
--- /dev/null
+++ b/spidermonkey17/patches/patch-js_src_config_milestone.pl
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Use of defined() for aggregates (array or hashes) is deprecated.
+
+--- js/src/config/milestone.pl.orig	2013-02-11 22:33:22.000000000 +0000
++++ js/src/config/milestone.pl
+@@ -55,7 +55,7 @@ $MILESTONE_FILE  = "$TOPSRCDIR/config/mi
+ #
+ my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
+ 
+-if (defined(@TEMPLATE_FILE)) {
++if (@TEMPLATE_FILE) {
+   my $TFILE;
+ 
+   foreach $TFILE (@TEMPLATE_FILE) {
diff --git a/spidermonkey17/patches/patch-ml b/spidermonkey17/patches/patch-ml
index 6dfdbba..3fa1fd1 100644
--- a/spidermonkey17/patches/patch-ml
+++ b/spidermonkey17/patches/patch-ml
@@ -1,8 +1,11 @@
 $NetBSD: patch-ml,v 1.3 2015/04/10 11:43:50 krytarowski Exp $
 
---- js/src/Makefile.in.orig	2012-08-24 22:55:38.000000000 +0000
+o Treat DragonFly like FreeBSD.
+o XXX: Kludge to add the shebang in the js-config script.
+
+--- js/src/Makefile.in.orig	2013-03-25 20:34:20.000000000 +0000
 +++ js/src/Makefile.in
-@@ -678,6 +678,9 @@ endif # _MSC_VER
+@@ -682,6 +682,9 @@ endif # _MSC_VER
  ifeq ($(OS_ARCH),FreeBSD)
  EXTRA_LIBS	+= -pthread
  endif
@@ -12,3 +15,13 @@ $NetBSD: patch-ml,v 1.3 2015/04/10 11:43:50 krytarowski Exp $
  ifeq ($(OS_ARCH),Linux)
  EXTRA_LIBS	+= -ldl
  endif
+@@ -778,7 +781,8 @@ JS_CONFIG_SUBSTITUTIONS=\
+ 
+ $(JS_CONFIG_NAME): js-config.in Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk $(topsrcdir)/config/rules.mk
+ 	$(RM) $@.tmp
+-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(JS_CONFIG_SUBSTITUTIONS) $< > $@.tmp \
++	echo '#!/bin/sh' > $@.tmp \
++	&& $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(JS_CONFIG_SUBSTITUTIONS) $< >> $@.tmp \
+ 	&& mv $@.tmp $@ && chmod +x $@
+ 
+ SCRIPTS = $(JS_CONFIG_NAME)