Attachment #183185 for bug #219761

Lines 3-9 Link Here

(-)lang/spidermonkey17/Makefile (-3 / +5 lines)
3		3
4	PORTNAME= spidermonkey17	4	PORTNAME= spidermonkey17
5	DISTVERSION= 1.7.0	5	DISTVERSION= 1.7.0
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= lang	7	CATEGORIES= lang
8	MASTER_SITES= MOZILLA/js	8	MASTER_SITES= MOZILLA/js
9	DISTNAME= js-${DISTVERSION}	9	DISTNAME= js-${DISTVERSION}
Lines 40-46 Link Here
40	jsstr.h jstypes.h jsxdrapi.h jsxml.h \	40	jsstr.h jstypes.h jsxdrapi.h jsxml.h \
41	js.msg jsproto.tbl	41	js.msg jsproto.tbl
42		42
43	PLIST_FILES= bin/js lib/libjs.so lib/libjs.so.1 ${JSH:S,^,include/,}	43	PLIST_FILES= bin/js lib/libjs.so lib/libjs.so.1 ${JSH:S,^,include/js-1.7/,}
44	WRKSRC= ${WRKDIR}/${SRC_DIR}	44	WRKSRC= ${WRKDIR}/${SRC_DIR}
45	EXTRACT_AFTER_ARGS= --exclude js/jsd	45	EXTRACT_AFTER_ARGS= --exclude js/jsd
46		46
Lines 63-68 Link Here
63	${STAGEDIR}${PREFIX}/lib	63	${STAGEDIR}${PREFIX}/lib
64	${LN} -sf libjs.so ${STAGEDIR}${PREFIX}/lib/libjs.so.1	64	${LN} -sf libjs.so ${STAGEDIR}${PREFIX}/lib/libjs.so.1
65	${CP} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/jsautocfg.h ${WRKSRC}	65	${CP} ${WRKSRC}/${OPSYS}`${UNAME} -r`_DBG.OBJ/jsautocfg.h ${WRKSRC}
66	@${INSTALL_DATA} ${JSH:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/include/	66	@${MKDIR} ${STAGEDIR}${PREFIX}/include/js-1.7
		67	@${INSTALL_DATA} ${JSH:S,^,${WRKSRC}/,} \
		68	${STAGEDIR}${PREFIX}/include/js-1.7/
67		69
68	.include <bsd.port.mk>	70	.include <bsd.port.mk>

Lines 19-24 Link Here

(-)lang/p5-JavaScript-SpiderMonkey/Makefile (+1 lines)
19		19
20	USE_PERL5= configure	20	USE_PERL5= configure
21	USES= perl5	21	USES= perl5
		22	CFLAGS+= -I${LOCALBASE}/include/js-1.7/
22		23
23	post-patch:	24	post-patch:
24	@${REINPLACE_CMD} -e 's\|libjs.a\|libjs.so\|' ${WRKSRC}/Makefile.PL	25	@${REINPLACE_CMD} -e 's\|libjs.a\|libjs.so\|' ${WRKSRC}/Makefile.PL




--- Makefile.PL.orig	2011-10-23 12:27:21.000000000 +0200
+++ Makefile.PL	2017-06-03 21:50:44.801687000 +0200
@@ -68,13 +68,8 @@
       next if ! -f $libfile;
       my $include_path = $possible_install_paths{$install_path};
       foreach my $c_header(@c_header_files) {
-        if (-f "$include_path/$c_header") {
+        if (-f "$include_path/js-1.7/$c_header") {
           my $include_dir = "$include_path/$c_header";
-          $include_dir =~ s/$c_header$//;
-          push @JS_INCL_DIRS, $include_dir;
-        }
-        foreach my $headerfile(glob "$include_path/*/$c_header") {
-          my $include_dir = $headerfile;
           $include_dir =~ s/$c_header$//;
           push @JS_INCL_DIRS, $include_dir;
         }
-        foreach my $headerfile(glob "$include_path/*/$c_header") {
-          my $include_dir = $headerfile;
-          $include_dir =~ s/$c_header$//;
-          push @JS_INCL_DIRS, $include_dir;
-        }
       }
       if (scalar(@JS_INCL_DIRS) == scalar(@c_header_files)) {
         $JS_LIB_DIR = $libfile;

Lines 66-72 Link Here

(-)net/mediatomb/Makefile (-1 / +1 lines)
66	MYSQL_CONFIGURE_ON= --with-mysql-cfg="${LOCALBASE}/bin/mysql_config"	66	MYSQL_CONFIGURE_ON= --with-mysql-cfg="${LOCALBASE}/bin/mysql_config"
67		67
68	JS_CONFIGURE_ENABLE= libjs	68	JS_CONFIGURE_ENABLE= libjs
69	JS_CONFIGURE_ON= --with-js-h="${LOCALBASE}/include" \	69	JS_CONFIGURE_ON= --with-js-h="${LOCALBASE}/include/js-1.7" \
70	--with-js-libs="${LOCALBASE}/lib"	70	--with-js-libs="${LOCALBASE}/lib"
71	JS_LIB_DEPENDS= libjs.so:lang/spidermonkey17	71	JS_LIB_DEPENDS= libjs.so:lang/spidermonkey17
72		72

Lines 94-100 Link Here

(-)www/elinks/Makefile (-1 / +2 lines)
94	SPIDERMONKEY_BUILD_DEPENDS= ${LOCALBASE}/lib/libjs.so:lang/spidermonkey17	94	SPIDERMONKEY_BUILD_DEPENDS= ${LOCALBASE}/lib/libjs.so:lang/spidermonkey17
95	SPIDERMONKEY_RUN_DEPENDS= js:lang/spidermonkey17	95	SPIDERMONKEY_RUN_DEPENDS= js:lang/spidermonkey17
96	SPIDERMONKEY_LIB_DEPENDS= libnspr4.so:devel/nspr	96	SPIDERMONKEY_LIB_DEPENDS= libnspr4.so:devel/nspr
97	SPIDERMONKEY_CFLAGS= -I${LOCALBASE}/include/nspr	97	SPIDERMONKEY_CFLAGS= -I${LOCALBASE}/include/nspr \
		98	-I${LOCALBASE}/include/js-1.7
98	SPIDERMONKEY_LDFLAGS= -lnspr4 -pthread -lpthread -lm	99	SPIDERMONKEY_LDFLAGS= -lnspr4 -pthread -lpthread -lm
99	SPIDERMONKEY_CONFIGURE_ON= --enable-sm-scripting --with-spidermonkey	100	SPIDERMONKEY_CONFIGURE_ON= --enable-sm-scripting --with-spidermonkey
100	SPIDERMONKEY_CONFIGURE_OFF= --disable-sm-scripting --without-spidermonkey	101	SPIDERMONKEY_CONFIGURE_OFF= --disable-sm-scripting --without-spidermonkey

Return to bug 219761

Lines 1-14 Link Here

(-)lang/p5-JavaScript-SpiderMonkey/files/patch-Makefile.PL (-11 / +14 lines)
1	--- Makefile.PL.orig 2010-11-17 13:51:38.000000000 +0100	1	--- Makefile.PL.orig 2011-10-23 12:27:21.000000000 +0200
2	+++ Makefile.PL 2010-11-17 13:59:54.000000000 +0100	2	+++ Makefile.PL 2017-06-03 21:50:44.801687000 +0200
3	@@ -71,11 +71,6 @@	3	@@ -68,13 +68,8 @@
		4	next if ! -f $libfile;
		5	my $include_path = $possible_install_paths{$install_path};
		6	foreach my $c_header(@c_header_files) {
		7	- if (-f "$include_path/$c_header") {
		8	+ if (-f "$include_path/js-1.7/$c_header") {
		9	my $include_dir = "$include_path/$c_header";
		10	- $include_dir =~ s/$c_header$//;
		11	- push @JS_INCL_DIRS, $include_dir;
		12	- }
		13	- foreach my $headerfile(glob "$include_path/*/$c_header") {
		14	- my $include_dir = $headerfile;
4	$include_dir =~ s/$c_header$//;	15	$include_dir =~ s/$c_header$//;
5	push @JS_INCL_DIRS, $include_dir;	16	push @JS_INCL_DIRS, $include_dir;
6	}	17	}
7	- foreach my $headerfile(glob "$include_path/*/$c_header") {
8	- my $include_dir = $headerfile;
9	- $include_dir =~ s/$c_header$//;
10	- push @JS_INCL_DIRS, $include_dir;
11	- }
12	}
13	if (scalar(@JS_INCL_DIRS) == scalar(@c_header_files)) {
14	$JS_LIB_DIR = $libfile;