2 files changed, 15 insertions, 11 deletions
diff --git a/lang/p5-JavaScript-SpiderMonkey/Makefile b/lang/p5-JavaScript-SpiderMonkey/Makefile
index 4432d1065c21..c38d32afab7b 100644
--- a/lang/p5-JavaScript-SpiderMonkey/Makefile
+++ b/lang/p5-JavaScript-SpiderMonkey/Makefile
@@ -19,6 +19,7 @@ TEST_DEPENDS=	p5-Log-Log4perl>=0:devel/p5-Log-Log4perl
 
 USE_PERL5=	configure
 USES=		perl5
+CFLAGS+=	-I${LOCALBASE}/include/js-1.7/
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libjs.a|libjs.so|' ${WRKSRC}/Makefile.PL
diff --git a/lang/p5-JavaScript-SpiderMonkey/files/patch-Makefile.PL b/lang/p5-JavaScript-SpiderMonkey/files/patch-Makefile.PL
index ff6543e5e2bd..77fda483f1f1 100644
--- a/lang/p5-JavaScript-SpiderMonkey/files/patch-Makefile.PL
+++ b/lang/p5-JavaScript-SpiderMonkey/files/patch-Makefile.PL
@@ -1,14 +1,17 @@
---- Makefile.PL.orig	2010-11-17 13:51:38.000000000 +0100
-+++ Makefile.PL	2010-11-17 13:59:54.000000000 +0100
-@@ -71,11 +71,6 @@
-           $include_dir =~ s/$c_header$//;
-           push @JS_INCL_DIRS, $include_dir;
-         }
--        foreach my $headerfile(glob "$include_path/*/$c_header") {
--          my $include_dir = $headerfile;
+--- 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;
 -        }
-       }
-       if (scalar(@JS_INCL_DIRS) == scalar(@c_header_files)) {
-         $JS_LIB_DIR = $libfile;
+-        foreach my $headerfile(glob "$include_path/*/$c_header") {
+-          my $include_dir = $headerfile;
+           $include_dir =~ s/$c_header$//;
+           push @JS_INCL_DIRS, $include_dir;
+         }