[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 02-Dec-2009 19:22:34 Branch: HEAD Handle: 2009120218223400 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20091109 -> 20091202 Summary: RevisionChanges Path 1.34+12 -12 openpkg-src/js/js.patch 1.107 +2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.33 -r1.34 js.patch --- openpkg-src/js/js.patch 5 Apr 2009 13:07:47 - 1.33 +++ openpkg-src/js/js.patch 2 Dec 2009 18:22:34 - 1.34 @@ -1,6 +1,6 @@ -Index: JavaScript-1.12/Makefile.PL JavaScript-1.12/Makefile.PL.orig 2008-08-11 20:46:58 +0200 -+++ JavaScript-1.12/Makefile.PL 2008-10-18 20:18:19 +0200 +Index: JavaScript-1.14/Makefile.PL +--- JavaScript-1.14/Makefile.PL.orig 2009-08-31 21:18:33 +0200 JavaScript-1.14/Makefile.PL 2009-12-02 17:03:09 +0100 @@ -93,7 +93,7 @@ if (exists $ENV{JS_LIB}) { @libs = get_paths($ENV{JS_LIB}); @@ -41,11 +41,11 @@ close $test_script; my $exe = tmpnam();; --my $cc = join(" ", $Config{cc}, $libs, @ccflags, "-l${lib}", "-o", $exe, (map { "-I$_" } @incs), "test_js.c"); +-my $cc = join(" ", $Config{cc}, @ccflags, "-o", $exe, "test_js.c", "-I.", (map { "-I$_" } @incs), $libs, "-l${lib}" ); +my $cc = join(" ", $Config{cc}, @ccflags, (map { "-I$_" } @incs), "-o", $exe, "test_js.c", $libs, split(/\s+/, "-l${lib}")); qx($cc); if ($?) { - print "Failed compiling test_js.c. ABORTING\n"; + print "Failed compiling test_js.c. ABORTING\n\n$cc\n"; @@ -186,11 +186,6 @@ # Get js version and require 1.7 or later my ($engine, $version, $date) = split/\s+/, qx($exe); @@ -58,9 +58,9 @@ # Dispose temp stuff unlink($exe); -Index: JavaScript-1.12/PJS_Context.c JavaScript-1.12/PJS_Context.c.orig 2009-02-13 14:49:21 +0100 -+++ JavaScript-1.12/PJS_Context.c2009-04-05 10:37:07 +0200 +Index: JavaScript-1.14/PJS_Context.c +--- JavaScript-1.14/PJS_Context.c.orig 2009-08-24 22:59:18 +0200 JavaScript-1.14/PJS_Context.c2009-12-02 17:00:20 +0100 @@ -96,7 +96,9 @@ croak("Failed to create JSContext"); } @@ -73,7 +73,7 @@ if (JS_InitStandardClasses(pcx->cx, obj) == JS_FALSE) { Index: JavaScript-SpiderMonkey-0.19/Makefile.PL --- JavaScript-SpiderMonkey-0.19/Makefile.PL.orig2007-06-08 21:03:08 +0200 -+++ JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-10-18 20:18:19 +0200 JavaScript-SpiderMonkey-0.19/Makefile.PL 2009-12-02 17:00:20 +0100 @@ -31,6 +31,7 @@ ); @@ -92,7 +92,7 @@ ($] >= 5.005 ?## Add these new keywords supported since 5.005 Index: JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm --- JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm.orig2007-09-05 14:00:17 +0200 -+++ JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-10-18 20:18:19 +0200 JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2009-12-02 17:00:20 +0100 @@ -75,7 +75,6 @@ use strict; use warnings; @@ -119,7 +119,7 @@ 1; Index: js-1.6.20070208/jslint.js --- js-1.6.20070208/jslint.js.orig 2007-02-08 10:28:02 +0100 -+++ js-1.6.20070208/jslint.js2008-10-18 20:18:19 +0200 js-1.6.20070208/jslint.js2009-12-02 17:00:20 +0100 @@ -2567,7 +2567,7 @@ var script = file.readAll(); file.close(); @@ -131,7 +131,7 @@ print((e.evidence || ''). replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1")); Index: js-1.6.20070208/src/perlconnect/Makefile.PL.in --- js-1.6.20070208/src/perlconnect/Makefile.PL.in.orig 2006-07-24 21:53:02 +0200 -+++ js-1.6.20070208/src/perlconnect/Makefile.PL.in 2008-10-18 20:18:19 +0200 js-1.6.20070208/src/perlconnect/Makefile.PL.in 2009-12-02 17:00:20 +0100 @@ -7,5 +7,6 @@ INC => "-I..", LIBS => "-L../../.libs -ljs @LIBS@", @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.106 -r1.107 js.spec --- openpkg-src/js/js.spec9 Nov 2009 18:34:06 - 1.106 +++ openpkg-src/js/js.spec2 Dec 2009 18:22:34 - 1.107 @@ -23,7 +23,7 @@ # package version %define V_js 1.6.20070208 -%define V_javascript 1.12 +
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 05-Apr-2009 15:07:48 Branch: HEAD Handle: 2009040514074700 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20090404 -> 20090405 Summary: RevisionChanges Path 1.33+16 -3 openpkg-src/js/js.patch 1.93+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.32 -r1.33 js.patch --- openpkg-src/js/js.patch 27 Mar 2009 10:35:09 - 1.32 +++ openpkg-src/js/js.patch 5 Apr 2009 13:07:47 - 1.33 @@ -1,6 +1,6 @@ -Index: JavaScript-1.11/Makefile.PL JavaScript-1.11/Makefile.PL.orig 2008-08-11 20:46:58 +0200 -+++ JavaScript-1.11/Makefile.PL 2008-10-18 20:18:19 +0200 +Index: JavaScript-1.12/Makefile.PL +--- JavaScript-1.12/Makefile.PL.orig 2008-08-11 20:46:58 +0200 JavaScript-1.12/Makefile.PL 2008-10-18 20:18:19 +0200 @@ -93,7 +93,7 @@ if (exists $ENV{JS_LIB}) { @libs = get_paths($ENV{JS_LIB}); @@ -58,6 +58,19 @@ # Dispose temp stuff unlink($exe); +Index: JavaScript-1.12/PJS_Context.c +--- JavaScript-1.12/PJS_Context.c.orig 2009-02-13 14:49:21 +0100 JavaScript-1.12/PJS_Context.c2009-04-05 10:37:07 +0200 +@@ -96,7 +96,9 @@ + croak("Failed to create JSContext"); + } + ++#ifdef JSOPTION_DONT_REPORT_UNCAUGHT + JS_SetOptions(pcx->cx, JSOPTION_DONT_REPORT_UNCAUGHT); ++#endif + + obj = JS_NewObject(pcx->cx, &global_class, NULL, NULL); + if (JS_InitStandardClasses(pcx->cx, obj) == JS_FALSE) { Index: JavaScript-SpiderMonkey-0.19/Makefile.PL --- JavaScript-SpiderMonkey-0.19/Makefile.PL.orig2007-06-08 21:03:08 +0200 +++ JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-10-18 20:18:19 +0200 @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.92 -r1.93 js.spec --- openpkg-src/js/js.spec4 Apr 2009 07:55:38 - 1.92 +++ openpkg-src/js/js.spec5 Apr 2009 13:07:47 - 1.93 @@ -23,7 +23,7 @@ # package version %define V_js 1.6.20070208 -%define V_javascript 1.11 +%define V_javascript 1.12 %define V_javascript_spidermonkey 0.19 %define V_javascript_squish 0.07 %define V_javascript_code 0.08 @@ -43,7 +43,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20090404 +Release: 20090405 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: r...@openpkg.org Module: openpkg-src Date: 27-Mar-2009 11:35:10 Branch: HEAD Handle: 2009032710350900 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20090304 -> 20090327 Summary: RevisionChanges Path 1.32+0 -21 openpkg-src/js/js.patch 1.91+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.31 -r1.32 js.patch --- openpkg-src/js/js.patch 18 Oct 2008 18:26:46 - 1.31 +++ openpkg-src/js/js.patch 27 Mar 2009 10:35:09 - 1.32 @@ -126,24 +126,3 @@ +INSTALLDIRS => 'vendor', ); -Index: jsapigen-0.2.1/src/parser.y jsapigen-0.2.1/src/parser.y.orig 2008-10-18 16:32:28 +0200 -+++ jsapigen-0.2.1/src/parser.y 2008-10-18 20:19:28 +0200 -@@ -140,7 +140,7 @@ - - prologue - : {$$ = NULL;} --| TOK_PROLOGUE {char *str = strndup($1+2, strlen($1)-4); -+| TOK_PROLOGUE {char *str = strdup($1+2); str[strlen($1)-4] = '\0'; - if (!str) { - perror("strdup"); YYABORT; - } -@@ -152,7 +152,7 @@ - - epilogue - : {$$ = NULL;} --| TOK_EPILOGUE {char *str = strndup($1+2, strlen($1)-4); -+| TOK_EPILOGUE {char *str = strdup($1+2); str[strlen($1)-4] = '\0'; - if (!str) { - perror("strdup"); YYABORT; - } @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.90 -r1.91 js.spec --- openpkg-src/js/js.spec4 Mar 2009 22:01:41 - 1.90 +++ openpkg-src/js/js.spec27 Mar 2009 10:35:09 - 1.91 @@ -30,7 +30,7 @@ %define V_javascript_jslint 0.06 %define V_javascript_engine 0.031 %define V_jsmin 20080803 -%define V_jsapigen0.2.1 +%define V_jsapigen0.3 # package information Name: js @@ -43,7 +43,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20090304 +Release: 20090327 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 18-Oct-2008 20:26:47 Branch: HEAD Handle: 2008101819264601 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20081002 -> 20081018 Summary: RevisionChanges Path 1.31+27 -24 openpkg-src/js/js.patch 1.88+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.30 -r1.31 js.patch --- openpkg-src/js/js.patch 8 Sep 2008 18:03:47 - 1.30 +++ openpkg-src/js/js.patch 18 Oct 2008 18:26:46 - 1.31 @@ -1,6 +1,6 @@ Index: JavaScript-1.11/Makefile.PL JavaScript-1.11/Makefile.PL.orig 2008-05-08 15:23:20 +0200 -+++ JavaScript-1.11/Makefile.PL 2008-08-02 11:57:11 +0200 +--- JavaScript-1.11/Makefile.PL.orig 2008-08-11 20:46:58 +0200 JavaScript-1.11/Makefile.PL 2008-10-18 20:18:19 +0200 @@ -93,7 +93,7 @@ if (exists $ENV{JS_LIB}) { @libs = get_paths($ENV{JS_LIB}); @@ -19,7 +19,7 @@ push @defines, "JS_THREADSAFE" if $enable_threadsafe eq "y"; } -@@ -117,7 +117,7 @@ +@@ -125,7 +125,7 @@ push @defines, "JS_C_STRINGS_ARE_UTF8" if $ENV{JS_UTF8}; } else { @@ -28,7 +28,7 @@ push @defines, "JS_C_STRINGS_ARE_UTF8" if $enable_utf8 eq "y"; } -@@ -129,7 +129,7 @@ +@@ -137,7 +137,7 @@ } } else { @@ -37,7 +37,7 @@ if ($enable_e4x eq "y") { push @extra_headers, "jsxml"; push @defines, "JS_ENABLE_E4X"; -@@ -167,7 +167,7 @@ +@@ -175,7 +175,7 @@ close $test_script; my $exe = tmpnam();; @@ -46,7 +46,7 @@ qx($cc); if ($?) { print "Failed compiling test_js.c. ABORTING\n"; -@@ -178,11 +178,6 @@ +@@ -186,11 +186,6 @@ # Get js version and require 1.7 or later my ($engine, $version, $date) = split/\s+/, qx($exe); my ($v2) = $version =~ /^(\d+\.\d+)/; @@ -60,7 +60,7 @@ unlink($exe); Index: JavaScript-SpiderMonkey-0.19/Makefile.PL --- JavaScript-SpiderMonkey-0.19/Makefile.PL.orig2007-06-08 21:03:08 +0200 -+++ JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-08-02 11:57:11 +0200 JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-10-18 20:18:19 +0200 @@ -31,6 +31,7 @@ ); @@ -79,7 +79,7 @@ ($] >= 5.005 ?## Add these new keywords supported since 5.005 Index: JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm --- JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm.orig2007-09-05 14:00:17 +0200 -+++ JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-08-02 11:57:11 +0200 JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-10-18 20:18:19 +0200 @@ -75,7 +75,6 @@ use strict; use warnings; @@ -106,7 +106,7 @@ 1; Index: js-1.6.20070208/jslint.js --- js-1.6.20070208/jslint.js.orig 2007-02-08 10:28:02 +0100 -+++ js-1.6.20070208/jslint.js2008-08-02 11:57:30 +0200 js-1.6.20070208/jslint.js2008-10-18 20:18:19 +0200 @@ -2567,7 +2567,7 @@ var script = file.readAll(); file.close(); @@ -118,7 +118,7 @@ print((e.evidence || ''). replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1")); Index: js-1.6.20070208/src/perlconnect/Makefile.PL.in --- js-1.6.20070208/src/perlconnect/Makefile.PL.in.orig 2006-07-24 21:53:02 +0200 -+++ js-1.6.20070208/src/perlconnect/Makefile.PL.in 2008-08-02 11:57:11 +0200 js-1.6.20070208/src/perlconnect/Makefile.PL.in 2008-10-18 20:18:19 +0200 @@ -7,5 +7,6 @@ INC => "-I..", LIBS => "-L../../.libs -ljs @LIBS@", @@ -126,21 +126,24 @@ +INSTALLDIRS => 'vendor', ); -Index: jsapigen-0.2.0/src/parser.y jsapigen-0.2.0/src/parser.y.orig 2008-08-22 14:16:28 +0200 -+++ jsapigen-0.2.0/src/parser.y 2008-08-25 11:01:55 +0200 -@@ -141,12 +141,12 @@ - ; +Index: jsapigen-0.2.1/src/parser.y +--- jsapigen-0.2.1/src/parser.y.orig 2008-10-18 16:32:28 +0200 jsapigen-0.2.1/src/parser.y 2008-10-18 20:19:28 +0200 +@@ -140,7 +140,7 @@ prologue --: TOK_PROLOGUE {char *str = strndup($1+2, strlen($1)-4); -+: TOK_PROLOGUE {char *str = strdup($1+2); str[strlen($1)-4] = '\0'; - $$ = node_create_data_leaf(NODE_PROLOGUE, str);} - ; + : {$$ = NULL;} +-| TOK_PROLOGUE {char *str = strndup($1+2, strlen($1)-4); ++| TOK_PROLOGUE {char *str = st
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 08-Sep-2008 20:03:48 Branch: HEAD Handle: 2008090819034700 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20080902 -> 20080908 Summary: RevisionChanges Path 1.30+3 -3 openpkg-src/js/js.patch 1.82+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.29 -r1.30 js.patch --- openpkg-src/js/js.patch 25 Aug 2008 09:48:51 - 1.29 +++ openpkg-src/js/js.patch 8 Sep 2008 18:03:47 - 1.30 @@ -126,9 +126,9 @@ +INSTALLDIRS => 'vendor', ); -Index: jsapigen-0.1.0/src/parser.y jsapigen-0.1.0/src/parser.y.orig 2008-08-22 14:16:28 +0200 -+++ jsapigen-0.1.0/src/parser.y 2008-08-25 11:01:55 +0200 +Index: jsapigen-0.2.0/src/parser.y +--- jsapigen-0.2.0/src/parser.y.orig 2008-08-22 14:16:28 +0200 jsapigen-0.2.0/src/parser.y 2008-08-25 11:01:55 +0200 @@ -141,12 +141,12 @@ ; @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.81 -r1.82 js.spec --- openpkg-src/js/js.spec2 Sep 2008 17:13:09 - 1.81 +++ openpkg-src/js/js.spec8 Sep 2008 18:03:47 - 1.82 @@ -30,7 +30,7 @@ %define V_javascript_jslint 0.06 %define V_javascript_engine 0.024 %define V_jsmin 20080803 -%define V_jsapigen0.1.0 +%define V_jsapigen0.2.0 # package information Name: js @@ -43,7 +43,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20080902 +Release: 20080908 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 25-Aug-2008 11:48:52 Branch: HEAD Handle: 2008082510485100 Modified files: openpkg-src/js js.patch js.spec Log: optionally add jsapigen tool Summary: RevisionChanges Path 1.29+18 -0 openpkg-src/js/js.patch 1.80+36 -4 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.28 -r1.29 js.patch --- openpkg-src/js/js.patch 24 Aug 2008 07:23:11 - 1.28 +++ openpkg-src/js/js.patch 25 Aug 2008 09:48:51 - 1.29 @@ -126,3 +126,21 @@ +INSTALLDIRS => 'vendor', ); +Index: jsapigen-0.1.0/src/parser.y +--- jsapigen-0.1.0/src/parser.y.orig 2008-08-22 14:16:28 +0200 jsapigen-0.1.0/src/parser.y 2008-08-25 11:01:55 +0200 +@@ -141,12 +141,12 @@ + ; + + prologue +-: TOK_PROLOGUE {char *str = strndup($1+2, strlen($1)-4); ++: TOK_PROLOGUE {char *str = strdup($1+2); str[strlen($1)-4] = '\0'; + $$ = node_create_data_leaf(NODE_PROLOGUE, str);} + ; + + epilogue +-: TOK_EPILOGUE {char *str = strndup($1+2, strlen($1)-4); ++: TOK_EPILOGUE {char *str = strdup($1+2); str[strlen($1)-4] = '\0'; + $$ = node_create_data_leaf(NODE_EPILOGUE, str);} + ; + @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.79 -r1.80 js.spec --- openpkg-src/js/js.spec24 Aug 2008 07:23:11 - 1.79 +++ openpkg-src/js/js.spec25 Aug 2008 09:48:51 - 1.80 @@ -30,6 +30,7 @@ %define V_javascript_jslint 0.06 %define V_javascript_engine 0.024 %define V_jsmin 20080803 +%define V_jsapigen0.1.0 # package information Name: js @@ -42,11 +43,12 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20080824 +Release: 20080825 # package options %option with_fileyes %option with_dso yes +%option with_jsapigenno %option with_perlno %option with_editlineno %option with_utf8no @@ -59,7 +61,8 @@ Source4: http://www.cpan.org/modules/by-module/JavaScript/JavaScript-Code-%{V_javascript_code}.tar.gz Source5: http://www.cpan.org/modules/by-module/JavaScript/JavaScript-JSLint-%{V_javascript_jslint}.tar.gz Source6: http://www.cpan.org/modules/by-module/JavaScript/JE-%{V_javascript_engine}.tar.gz -Source7: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/jsmin/jsmin-%{V_jsmin}.c +Source7: http://switch.dl.sourceforge.net/jsapigen/jsapigen-%{V_jsapigen}.tar.gz +Source8: ftp://ftp.openpkg.org/sources/CPY/VERSIONED/jsmin/jsmin-%{V_jsmin}.c Patch0: js.patch # build information @@ -75,6 +78,9 @@ BuildPreReq: editline PreReq: editline %endif +%if "%{with_jsapigen}" == "yes" +BuildPreReq: flex, bison +%endif AutoReq: no AutoReqProv: no @@ -123,6 +129,11 @@ url = http://www.cpan.org/modules/by-module/JavaScript/ regex = JE-(__VER__)\.tar\.gz } +prog js:jsapigen = { +version = %{V_jsapigen} +url = http://prdownloads.sourceforge.net/jsapigen/ +regex = jsapigen-(__VER__)\.tar\.gz +} prog js:jsmin = { version = %{V_jsmin} url = ftp://ftp.openpkg.org/sources/CPY/VERSIONED/jsmin/ @@ -137,6 +148,7 @@ %setup -q -D -T -a 4 %setup -q -D -T -a 5 %setup -q -D -T -a 6 +%setup -q -D -T -a 7 %patch -p0 %build @@ -170,9 +182,22 @@ %{l_make} %{l_mflags} ) || exit $? -# build add-on tool +# build add-on tool "jsmin" %{l_cc} -o jsmin %{SOURCE jsmin-%{V_jsmin}.c} +# build add-on tool "jsapigen" +%if "%{with_jsapigen}" == "yes" +( cd jsapigen-%{V_jsapigen} + CC="%{l_cc}" \ + CFLAGS="%{l_cflags -O}" \ + GREP="grep" \ + ./configure \ + --prefix=%{l_prefix} \ + --mandir=%{l_prefix}/man + %{l_make} %{l_mflags} +) || exit $? +%endif + %if "%{with_perl}" == "yes" # build add-on Perl bindings ( cd JavaScript-%{V_javascript} @@ -219,10 +24
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Aug-2008 09:23:11 Branch: HEAD Handle: 2008082408231100 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20080823 -> 20080824 Summary: RevisionChanges Path 1.28+3 -3 openpkg-src/js/js.patch 1.79+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.27 -r1.28 js.patch --- openpkg-src/js/js.patch 12 Aug 2008 15:35:24 - 1.27 +++ openpkg-src/js/js.patch 24 Aug 2008 07:23:11 - 1.28 @@ -1,6 +1,6 @@ -Index: JavaScript-1.10/Makefile.PL JavaScript-1.10/Makefile.PL.orig 2008-05-08 15:23:20 +0200 -+++ JavaScript-1.10/Makefile.PL 2008-08-02 11:57:11 +0200 +Index: JavaScript-1.11/Makefile.PL +--- JavaScript-1.11/Makefile.PL.orig 2008-05-08 15:23:20 +0200 JavaScript-1.11/Makefile.PL 2008-08-02 11:57:11 +0200 @@ -93,7 +93,7 @@ if (exists $ENV{JS_LIB}) { @libs = get_paths($ENV{JS_LIB}); @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.78 -r1.79 js.spec --- openpkg-src/js/js.spec23 Aug 2008 21:24:49 - 1.78 +++ openpkg-src/js/js.spec24 Aug 2008 07:23:11 - 1.79 @@ -23,7 +23,7 @@ # package version %define V_js 1.6.20070208 -%define V_javascript 1.10 +%define V_javascript 1.11 %define V_javascript_spidermonkey 0.19 %define V_javascript_squish 0.07 %define V_javascript_code 0.08 @@ -42,7 +42,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20080823 +Release: 20080824 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 12-Aug-2008 17:35:25 Branch: HEAD Handle: 2008081216352400 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20080804 -> 20080812 Summary: RevisionChanges Path 1.27+3 -3 openpkg-src/js/js.patch 1.77+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.26 -r1.27 js.patch --- openpkg-src/js/js.patch 4 Aug 2008 17:15:22 - 1.26 +++ openpkg-src/js/js.patch 12 Aug 2008 15:35:24 - 1.27 @@ -1,6 +1,6 @@ -Index: JavaScript-1.09/Makefile.PL JavaScript-1.09/Makefile.PL.orig 2008-05-08 15:23:20 +0200 -+++ JavaScript-1.09/Makefile.PL 2008-08-02 11:57:11 +0200 +Index: JavaScript-1.10/Makefile.PL +--- JavaScript-1.10/Makefile.PL.orig 2008-05-08 15:23:20 +0200 JavaScript-1.10/Makefile.PL 2008-08-02 11:57:11 +0200 @@ -93,7 +93,7 @@ if (exists $ENV{JS_LIB}) { @libs = get_paths($ENV{JS_LIB}); @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.76 -r1.77 js.spec --- openpkg-src/js/js.spec4 Aug 2008 17:15:22 - 1.76 +++ openpkg-src/js/js.spec12 Aug 2008 15:35:24 - 1.77 @@ -23,7 +23,7 @@ # package version %define V_js 1.6.20070208 -%define V_javascript 1.09 +%define V_javascript 1.10 %define V_javascript_spidermonkey 0.19 %define V_javascript_squish 0.07 %define V_javascript_code 0.08 @@ -42,7 +42,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20080804 +Release: 20080812 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 04-Aug-2008 19:15:22 Branch: HEAD Handle: 2008080418152200 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20080802 -> 20080804 Summary: RevisionChanges Path 1.26+3 -3 openpkg-src/js/js.patch 1.76+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.25 -r1.26 js.patch --- openpkg-src/js/js.patch 2 Aug 2008 09:59:11 - 1.25 +++ openpkg-src/js/js.patch 4 Aug 2008 17:15:22 - 1.26 @@ -1,6 +1,6 @@ -Index: JavaScript-1.08/Makefile.PL JavaScript-1.08/Makefile.PL.orig 2008-05-08 15:23:20 +0200 -+++ JavaScript-1.08/Makefile.PL 2008-08-02 11:57:11 +0200 +Index: JavaScript-1.09/Makefile.PL +--- JavaScript-1.09/Makefile.PL.orig 2008-05-08 15:23:20 +0200 JavaScript-1.09/Makefile.PL 2008-08-02 11:57:11 +0200 @@ -93,7 +93,7 @@ if (exists $ENV{JS_LIB}) { @libs = get_paths($ENV{JS_LIB}); @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.75 -r1.76 js.spec --- openpkg-src/js/js.spec2 Aug 2008 07:53:55 - 1.75 +++ openpkg-src/js/js.spec4 Aug 2008 17:15:22 - 1.76 @@ -23,7 +23,7 @@ # package version %define V_js 1.6.20070208 -%define V_javascript 1.08 +%define V_javascript 1.09 %define V_javascript_spidermonkey 0.19 %define V_javascript_squish 0.07 %define V_javascript_code 0.08 @@ -42,7 +42,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20080802 +Release: 20080804 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 09-May-2008 07:02:07 Branch: HEAD Handle: 2008050906020501 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20080508 -> 20080509 Summary: RevisionChanges Path 1.24+30 -30 openpkg-src/js/js.patch 1.71+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.23 -r1.24 js.patch --- openpkg-src/js/js.patch 8 May 2008 12:02:37 - 1.23 +++ openpkg-src/js/js.patch 9 May 2008 05:02:05 - 1.24 @@ -1,16 +1,16 @@ -Index: JavaScript-1.07/Makefile.PL JavaScript-1.07/Makefile.PL.orig 2008-04-19 18:59:06 +0200 -+++ JavaScript-1.07/Makefile.PL 2008-05-07 09:08:08 +0200 -@@ -92,7 +92,7 @@ - # Override with $ENV{JS_LIB} and $ENV{JS_INC} +Index: JavaScript-1.08/Makefile.PL +--- JavaScript-1.08/Makefile.PL.orig 2008-05-08 15:23:20 +0200 JavaScript-1.08/Makefile.PL 2008-05-09 06:58:41 +0200 +@@ -93,7 +93,7 @@ if (exists $ENV{JS_LIB}) { @libs = get_paths($ENV{JS_LIB}); + $ENV{DYLD_LIBRARY_PATH} = $ENV{LD_LIBRARY_PATH} = $ENV{JS_LIB}; -$lib = "js"; +$lib = "js -lm"; } if (exists $ENV{JS_INC}) { @incs = get_paths($ENV{JS_INC}); -@@ -107,7 +107,7 @@ +@@ -108,7 +108,7 @@ push @defines, "JS_THREADSAFE" if $ENV{JS_THREADSAFE}; } else { @@ -19,7 +19,7 @@ push @defines, "JS_THREADSAFE" if $enable_threadsafe eq "y"; } -@@ -116,7 +116,7 @@ +@@ -117,7 +117,7 @@ push @defines, "JS_C_STRINGS_ARE_UTF8" if $ENV{JS_UTF8}; } else { @@ -28,7 +28,7 @@ push @defines, "JS_C_STRINGS_ARE_UTF8" if $enable_utf8 eq "y"; } -@@ -128,7 +128,7 @@ +@@ -129,7 +129,7 @@ } } else { @@ -37,30 +37,30 @@ if ($enable_e4x eq "y") { push @extra_headers, "jsxml"; push @defines, "JS_ENABLE_E4X"; -@@ -164,7 +164,7 @@ - END_OF_SOURCE - close $test_script; - my $exe = tmpnam(); --system($Config{cc}, $libs, @ccflags, "-l${lib}", "-o", $exe, (map { "-I$_" } @incs), "test_js.c"); -+system($Config{cc}, @ccflags, (map { "-I$_" } @incs), "-o", $exe, "test_js.c", $libs, split(/\s+/, "-l${lib}")); - if ($?) { - print "Failed compiling test_js.c. ABORTING\n"; - exit 0; -@@ -174,11 +174,6 @@ - # Get js version and require 1.7 or later - my ($engine, $version, $date) = split/\s+/, qx($exe); - my ($v2) = $version =~ /^(\d+\.\d+)/; --if ($v2 < 1.7) { --if (prompt("I require SpiderMonkey version 1.7 or later but found ${version}. Try anyways? [y/N]", "N") ne "y") { --exit 0; +@@ -167,7 +167,7 @@ + close $test_script; + + my $exe = tmpnam();; +-my $cc = join(" ", $Config{cc}, $libs, @ccflags, "-l${lib}", "-o", $exe, (map { "-I$_" } @incs), "test_js.c"); ++my $cc = join(" ", $Config{cc}, @ccflags, (map { "-I$_" } @incs), "-o", $exe, "test_js.c", $libs, split(/\s+/, "-l${lib}")); + qx($cc); + if ($?) { + print "Failed compiling test_js.c. ABORTING\n"; +@@ -178,11 +178,6 @@ + # Get js version and require 1.7 or later + my ($engine, $version, $date) = split/\s+/, qx($exe); + my ($v2) = $version =~ /^(\d+\.\d+)/; +-if ($v2 < 1.7) { +-if (prompt("I require SpiderMonkey version 1.7 or later but found ${version}. Try anyways? [y/N]", "N") ne "y") { +-exit 0; +-} -} --} - # Dispose temp stuff - unlink($exe); + # Dispose temp stuff + unlink($exe); Index: JavaScript-SpiderMonkey-0.19/Makefile.PL --- JavaScript-SpiderMonkey-0.19/Makefile.PL.orig2007-06-08 21:03:08 +0200 -+++ JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-05-07 09:06:01 +0200 JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-05-09 06:56:29 +0200 @@ -31,6 +31,7 @@ ); @@ -79,7 +79,7 @@ ($] >= 5.005 ?## Add these new keywords supported since 5.005 Index: JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm --- JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm.orig2007-09-05 14:00:17 +0200 -+++ JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-05-07 09:06:01 +0200 JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-05-09 06:56:29 +0200 @@ -75,7 +75,6 @@ use strict; use warnings; @@ -106,7 +106,7 @@ 1; Index: js-1.6.20070208/src/perlconnect/Makefile.PL.in --- j
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 08-May-2008 14:02:38 Branch: HEAD Handle: 2008050813023700 Modified files: openpkg-src/js js.patch js.spec Log: consistently use 'vendor' instead of 'site' install directory for Perl modules Summary: RevisionChanges Path 1.23+10 -0 openpkg-src/js/js.patch 1.70+1 -1 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.22 -r1.23 js.patch --- openpkg-src/js/js.patch 7 May 2008 07:24:00 - 1.22 +++ openpkg-src/js/js.patch 8 May 2008 12:02:37 - 1.23 @@ -104,3 +104,13 @@ } 1; +Index: js-1.6.20070208/src/perlconnect/Makefile.PL.in +--- js-1.6.20070208/src/perlconnect/Makefile.PL.in.orig 2006-07-24 21:53:02 +0200 js-1.6.20070208/src/perlconnect/Makefile.PL.in 2008-05-08 13:58:18 +0200 +@@ -7,5 +7,6 @@ + INC => "-I..", + LIBS => "-L../../.libs -ljs @LIBS@", + VERSION_FROM => 'JS.pm', ++INSTALLDIRS => 'vendor', + ); + @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.69 -r1.70 js.spec --- openpkg-src/js/js.spec7 May 2008 07:24:00 - 1.69 +++ openpkg-src/js/js.spec8 May 2008 12:02:37 - 1.70 @@ -42,7 +42,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20080507 +Release: 20080508 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 07-May-2008 09:24:00 Branch: HEAD Handle: 200805070824 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20080419 -> 20080507 Summary: RevisionChanges Path 1.22+7 -7 openpkg-src/js/js.patch 1.69+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.21 -r1.22 js.patch --- openpkg-src/js/js.patch 19 Apr 2008 08:33:24 - 1.21 +++ openpkg-src/js/js.patch 7 May 2008 07:24:00 - 1.22 @@ -1,6 +1,6 @@ -Index: JavaScript-1.06/Makefile.PL JavaScript-1.06/Makefile.PL.orig 2008-03-27 17:08:05 +0100 -+++ JavaScript-1.06/Makefile.PL 2008-04-03 09:36:31 +0200 +Index: JavaScript-1.07/Makefile.PL +--- JavaScript-1.07/Makefile.PL.orig 2008-04-19 18:59:06 +0200 JavaScript-1.07/Makefile.PL 2008-05-07 09:08:08 +0200 @@ -92,7 +92,7 @@ # Override with $ENV{JS_LIB} and $ENV{JS_INC} if (exists $ENV{JS_LIB}) { @@ -45,14 +45,14 @@ +system($Config{cc}, @ccflags, (map { "-I$_" } @incs), "-o", $exe, "test_js.c", $libs, split(/\s+/, "-l${lib}")); if ($?) { print "Failed compiling test_js.c. ABORTING\n"; - exit 1; + exit 0; @@ -174,11 +174,6 @@ # Get js version and require 1.7 or later my ($engine, $version, $date) = split/\s+/, qx($exe); my ($v2) = $version =~ /^(\d+\.\d+)/; -if ($v2 < 1.7) { -if (prompt("I require SpiderMonkey version 1.7 or later but found ${version}. Try anyways? [y/N]", "N") ne "y") { --exit 1; +-exit 0; -} -} @@ -60,7 +60,7 @@ unlink($exe); Index: JavaScript-SpiderMonkey-0.19/Makefile.PL --- JavaScript-SpiderMonkey-0.19/Makefile.PL.orig2007-06-08 21:03:08 +0200 -+++ JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-04-03 09:36:11 +0200 JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-05-07 09:06:01 +0200 @@ -31,6 +31,7 @@ ); @@ -79,7 +79,7 @@ ($] >= 5.005 ?## Add these new keywords supported since 5.005 Index: JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm --- JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm.orig2007-09-05 14:00:17 +0200 -+++ JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-04-03 09:36:11 +0200 JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-05-07 09:06:01 +0200 @@ -75,7 +75,6 @@ use strict; use warnings; @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.68 -r1.69 js.spec --- openpkg-src/js/js.spec19 Apr 2008 08:33:25 - 1.68 +++ openpkg-src/js/js.spec7 May 2008 07:24:00 - 1.69 @@ -23,7 +23,7 @@ # package version %define V_js 1.6.20070208 -%define V_javascript 1.06 +%define V_javascript 1.07 %define V_javascript_spidermonkey 0.19 %define V_javascript_squish 0.07 %define V_javascript_code 0.08 @@ -42,7 +42,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20080419 +Release: 20080507 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 19-Apr-2008 10:33:25 Branch: HEAD Handle: 2008041909332401 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20080403 -> 20080419 Summary: RevisionChanges Path 1.21+3 -3 openpkg-src/js/js.patch 1.68+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.20 -r1.21 js.patch --- openpkg-src/js/js.patch 3 Apr 2008 07:47:38 - 1.20 +++ openpkg-src/js/js.patch 19 Apr 2008 08:33:24 - 1.21 @@ -1,6 +1,6 @@ -Index: JavaScript-1.05/Makefile.PL JavaScript-1.05/Makefile.PL.orig 2008-03-27 17:08:05 +0100 -+++ JavaScript-1.05/Makefile.PL 2008-04-03 09:36:31 +0200 +Index: JavaScript-1.06/Makefile.PL +--- JavaScript-1.06/Makefile.PL.orig 2008-03-27 17:08:05 +0100 JavaScript-1.06/Makefile.PL 2008-04-03 09:36:31 +0200 @@ -92,7 +92,7 @@ # Override with $ENV{JS_LIB} and $ENV{JS_INC} if (exists $ENV{JS_LIB}) { @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.67 -r1.68 js.spec --- openpkg-src/js/js.spec3 Apr 2008 07:47:38 - 1.67 +++ openpkg-src/js/js.spec19 Apr 2008 08:33:25 - 1.68 @@ -23,7 +23,7 @@ # package version %define V_js 1.6.20070208 -%define V_javascript 1.05 +%define V_javascript 1.06 %define V_javascript_spidermonkey 0.19 %define V_javascript_squish 0.07 %define V_javascript_code 0.08 @@ -42,7 +42,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20080403 +Release: 20080419 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 03-Apr-2008 09:47:39 Branch: HEAD Handle: 2008040308473800 Modified files: openpkg-src/js js.patch js.spec Log: fix building Perl modules Summary: RevisionChanges Path 1.20+33 -3 openpkg-src/js/js.patch 1.67+1 -1 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.19 -r1.20 js.patch --- openpkg-src/js/js.patch 2 Apr 2008 08:13:16 - 1.19 +++ openpkg-src/js/js.patch 3 Apr 2008 07:47:38 - 1.20 @@ -1,6 +1,15 @@ Index: JavaScript-1.05/Makefile.PL --- JavaScript-1.05/Makefile.PL.orig 2008-03-27 17:08:05 +0100 -+++ JavaScript-1.05/Makefile.PL 2008-04-02 09:43:36 +0200 JavaScript-1.05/Makefile.PL 2008-04-03 09:36:31 +0200 +@@ -92,7 +92,7 @@ + # Override with $ENV{JS_LIB} and $ENV{JS_INC} + if (exists $ENV{JS_LIB}) { + @libs = get_paths($ENV{JS_LIB}); +-$lib = "js"; ++$lib = "js -lm"; + } + if (exists $ENV{JS_INC}) { + @incs = get_paths($ENV{JS_INC}); @@ -107,7 +107,7 @@ push @defines, "JS_THREADSAFE" if $ENV{JS_THREADSAFE}; } @@ -28,9 +37,30 @@ if ($enable_e4x eq "y") { push @extra_headers, "jsxml"; push @defines, "JS_ENABLE_E4X"; +@@ -164,7 +164,7 @@ + END_OF_SOURCE + close $test_script; + my $exe = tmpnam(); +-system($Config{cc}, $libs, @ccflags, "-l${lib}", "-o", $exe, (map { "-I$_" } @incs), "test_js.c"); ++system($Config{cc}, @ccflags, (map { "-I$_" } @incs), "-o", $exe, "test_js.c", $libs, split(/\s+/, "-l${lib}")); + if ($?) { + print "Failed compiling test_js.c. ABORTING\n"; + exit 1; +@@ -174,11 +174,6 @@ + # Get js version and require 1.7 or later + my ($engine, $version, $date) = split/\s+/, qx($exe); + my ($v2) = $version =~ /^(\d+\.\d+)/; +-if ($v2 < 1.7) { +-if (prompt("I require SpiderMonkey version 1.7 or later but found ${version}. Try anyways? [y/N]", "N") ne "y") { +-exit 1; +-} +-} + + # Dispose temp stuff + unlink($exe); Index: JavaScript-SpiderMonkey-0.19/Makefile.PL --- JavaScript-SpiderMonkey-0.19/Makefile.PL.orig2007-06-08 21:03:08 +0200 -+++ JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-04-02 09:16:35 +0200 JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-04-03 09:36:11 +0200 @@ -31,6 +31,7 @@ ); @@ -49,7 +79,7 @@ ($] >= 5.005 ?## Add these new keywords supported since 5.005 Index: JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm --- JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm.orig2007-09-05 14:00:17 +0200 -+++ JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-04-02 09:16:35 +0200 JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-04-03 09:36:11 +0200 @@ -75,7 +75,6 @@ use strict; use warnings; @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.66 -r1.67 js.spec --- openpkg-src/js/js.spec2 Apr 2008 08:13:16 - 1.66 +++ openpkg-src/js/js.spec3 Apr 2008 07:47:38 - 1.67 @@ -42,7 +42,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20080402 +Release: 20080403 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 02-Apr-2008 10:13:17 Branch: HEAD Handle: 2008040209131600 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20080317 -> 20080402 Summary: RevisionChanges Path 1.19+24 -15 openpkg-src/js/js.patch 1.66+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.18 -r1.19 js.patch --- openpkg-src/js/js.patch 18 Nov 2007 01:57:51 - 1.18 +++ openpkg-src/js/js.patch 2 Apr 2008 08:13:16 - 1.19 @@ -1,28 +1,37 @@ -Index: JavaScript-1.04/Makefile.PL JavaScript-1.04/Makefile.PL.orig 2007-02-21 16:57:19 +0100 -+++ JavaScript-1.04/Makefile.PL 2007-02-24 17:10:08 +0100 -@@ -94,7 +94,7 @@ +Index: JavaScript-1.05/Makefile.PL +--- JavaScript-1.05/Makefile.PL.orig 2008-03-27 17:08:05 +0100 JavaScript-1.05/Makefile.PL 2008-04-02 09:43:36 +0200 +@@ -107,7 +107,7 @@ push @defines, "JS_THREADSAFE" if $ENV{JS_THREADSAFE}; } else { -my $enable_threadsafe = prompt("Is your SpiderMonkey compiled with JS_THREADSAFE (most things will fail if you answer wrong)? [y/N]"); +my $enable_threadsafe = 'n'; - push @defines, "JS_THREADSAFE" if $enable_threadsafe eq 'y'; + push @defines, "JS_THREADSAFE" if $enable_threadsafe eq "y"; } -@@ -103,7 +103,7 @@ +@@ -116,7 +116,7 @@ push @defines, "JS_C_STRINGS_ARE_UTF8" if $ENV{JS_UTF8}; } else { -my $enable_utf8 = prompt("Is your SpiderMonkey compiled with support for unicode (t/23-unicode.t will fail if you answer wrong) ? [y/N]", "N"); -+my $enable_utf8 = 'n'; - push @defines, "JS_C_STRINGS_ARE_UTF8" if $enable_utf8 eq 'y'; ++my $enable_utf8 = 'n'; + push @defines, "JS_C_STRINGS_ARE_UTF8" if $enable_utf8 eq "y"; } +@@ -128,7 +128,7 @@ + } + } + else { +-my $enable_e4x = prompt("Do you want support for E4X (requires SpiderMonkey > 1.5) ? [y/N]", "N"); ++my $enable_e4x = 'n'; + if ($enable_e4x eq "y") { + push @extra_headers, "jsxml"; + push @defines, "JS_ENABLE_E4X"; Index: JavaScript-SpiderMonkey-0.19/Makefile.PL JavaScript-SpiderMonkey-0.19/Makefile.PL.orig2006-07-28 11:30:08 +0200 -+++ JavaScript-SpiderMonkey-0.19/Makefile.PL 2007-02-24 17:09:41 +0100 -@@ -30,6 +30,7 @@ +--- JavaScript-SpiderMonkey-0.19/Makefile.PL.orig2007-06-08 21:03:08 +0200 JavaScript-SpiderMonkey-0.19/Makefile.PL 2008-04-02 09:16:35 +0200 +@@ -31,6 +31,7 @@ ); my %possible_install_paths = ( @@ -30,7 +39,7 @@ "../js/src/*" => "../js/src", "/usr/lib" => "/usr/include", "/usr/local/lib" => "/usr/local/include", -@@ -120,7 +121,6 @@ +@@ -142,7 +143,6 @@ 'NAME' => 'JavaScript::SpiderMonkey', 'VERSION_FROM' => 'SpiderMonkey.pm', # finds $VERSION 'PREREQ_PM' => { @@ -39,8 +48,8 @@ }, # e.g., Module::Name => 1.1 ($] >= 5.005 ?## Add these new keywords supported since 5.005 Index: JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm.orig2006-07-28 11:36:39 +0200 -+++ JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2007-02-24 17:09:41 +0100 +--- JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm.orig2007-09-05 14:00:17 +0200 JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2008-04-02 09:16:35 +0200 @@ -75,7 +75,6 @@ use strict; use warnings; @@ -49,7 +58,7 @@ require Exporter; require DynaLoader; -@@ -557,14 +556,7 @@ +@@ -577,14 +576,7 @@ ## sub debug_enabled { ## @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.65 -r1.66 js.spec --- openpkg-src/js/js.spec17 Mar 2008 09:43:48 - 1.65 +++ openpkg-src/js/js.spec2 Apr 2008 08:13:16 - 1.66 @@ -23,7 +23,7 @@ # package version %define V_js 1.6.20070208 -%define V_javascript 1.04 +%define V_javascript 1.05 %define V_javascript_spidermonkey 0.19 %define V_javascript_squish 0.07 %defi
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Christoph Schug Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 18-Nov-2007 02:57:51 Branch: HEAD Handle: 2007111801575100 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20071106 -> 20071118 Summary: RevisionChanges Path 1.18+3 -3 openpkg-src/js/js.patch 1.59+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.17 -r1.18 js.patch --- openpkg-src/js/js.patch 5 Sep 2007 18:44:49 - 1.17 +++ openpkg-src/js/js.patch 18 Nov 2007 01:57:51 - 1.18 @@ -1,6 +1,6 @@ -Index: JavaScript-1.03/Makefile.PL JavaScript-1.03/Makefile.PL.orig 2007-02-21 16:57:19 +0100 -+++ JavaScript-1.03/Makefile.PL 2007-02-24 17:10:08 +0100 +Index: JavaScript-1.04/Makefile.PL +--- JavaScript-1.04/Makefile.PL.orig 2007-02-21 16:57:19 +0100 JavaScript-1.04/Makefile.PL 2007-02-24 17:10:08 +0100 @@ -94,7 +94,7 @@ push @defines, "JS_THREADSAFE" if $ENV{JS_THREADSAFE}; } @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.58 -r1.59 js.spec --- openpkg-src/js/js.spec6 Nov 2007 15:50:47 - 1.58 +++ openpkg-src/js/js.spec18 Nov 2007 01:57:51 - 1.59 @@ -24,7 +24,7 @@ # package version %define V_js 1.6.20070208 -%define V_javascript 1.03 +%define V_javascript 1.04 %define V_javascript_spidermonkey 0.19 %define V_javascript_squish 0.05 %define V_javascript_code 0.08 @@ -43,7 +43,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20071106 +Release: 20071118 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 05-Sep-2007 20:44:50 Branch: HEAD Handle: 2007090519444900 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20070809 -> 20070905 Summary: RevisionChanges Path 1.17+6 -6 openpkg-src/js/js.patch 1.56+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.16 -r1.17 js.patch --- openpkg-src/js/js.patch 9 Jun 2007 08:07:44 - 1.16 +++ openpkg-src/js/js.patch 5 Sep 2007 18:44:49 - 1.17 @@ -19,9 +19,9 @@ push @defines, "JS_C_STRINGS_ARE_UTF8" if $enable_utf8 eq 'y'; } -Index: JavaScript-SpiderMonkey-0.18/Makefile.PL JavaScript-SpiderMonkey-0.18/Makefile.PL.orig2006-07-28 11:30:08 +0200 -+++ JavaScript-SpiderMonkey-0.18/Makefile.PL 2007-02-24 17:09:41 +0100 +Index: JavaScript-SpiderMonkey-0.19/Makefile.PL +--- JavaScript-SpiderMonkey-0.19/Makefile.PL.orig2006-07-28 11:30:08 +0200 JavaScript-SpiderMonkey-0.19/Makefile.PL 2007-02-24 17:09:41 +0100 @@ -30,6 +30,7 @@ ); @@ -38,9 +38,9 @@ 'Data::Dumper' => 0, }, # e.g., Module::Name => 1.1 ($] >= 5.005 ?## Add these new keywords supported since 5.005 -Index: JavaScript-SpiderMonkey-0.18/SpiderMonkey.pm JavaScript-SpiderMonkey-0.18/SpiderMonkey.pm.orig2006-07-28 11:36:39 +0200 -+++ JavaScript-SpiderMonkey-0.18/SpiderMonkey.pm 2007-02-24 17:09:41 +0100 +Index: JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm +--- JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm.orig2006-07-28 11:36:39 +0200 JavaScript-SpiderMonkey-0.19/SpiderMonkey.pm 2007-02-24 17:09:41 +0100 @@ -75,7 +75,6 @@ use strict; use warnings; @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.55 -r1.56 js.spec --- openpkg-src/js/js.spec9 Aug 2007 18:07:55 - 1.55 +++ openpkg-src/js/js.spec5 Sep 2007 18:44:49 - 1.56 @@ -25,7 +25,7 @@ # package version %define V_js 1.6.20070208 %define V_javascript 1.03 -%define V_javascript_spidermonkey 0.18 +%define V_javascript_spidermonkey 0.19 %define V_javascript_squish 0.05 %define V_javascript_code 0.08 %define V_javascript_jslint 0.06 @@ -43,7 +43,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20070809 +Release: 20070905 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 09-Jun-2007 10:07:45 Branch: HEAD Handle: 2007060909074400 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20070603 -> 20070609 Summary: RevisionChanges Path 1.16+6 -6 openpkg-src/js/js.patch 1.51+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.15 -r1.16 js.patch --- openpkg-src/js/js.patch 24 Feb 2007 16:12:38 - 1.15 +++ openpkg-src/js/js.patch 9 Jun 2007 08:07:44 - 1.16 @@ -19,9 +19,9 @@ push @defines, "JS_C_STRINGS_ARE_UTF8" if $enable_utf8 eq 'y'; } -Index: JavaScript-SpiderMonkey-0.17/Makefile.PL JavaScript-SpiderMonkey-0.17/Makefile.PL.orig2006-07-28 11:30:08 +0200 -+++ JavaScript-SpiderMonkey-0.17/Makefile.PL 2007-02-24 17:09:41 +0100 +Index: JavaScript-SpiderMonkey-0.18/Makefile.PL +--- JavaScript-SpiderMonkey-0.18/Makefile.PL.orig2006-07-28 11:30:08 +0200 JavaScript-SpiderMonkey-0.18/Makefile.PL 2007-02-24 17:09:41 +0100 @@ -30,6 +30,7 @@ ); @@ -38,9 +38,9 @@ 'Data::Dumper' => 0, }, # e.g., Module::Name => 1.1 ($] >= 5.005 ?## Add these new keywords supported since 5.005 -Index: JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm.orig2006-07-28 11:36:39 +0200 -+++ JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm 2007-02-24 17:09:41 +0100 +Index: JavaScript-SpiderMonkey-0.18/SpiderMonkey.pm +--- JavaScript-SpiderMonkey-0.18/SpiderMonkey.pm.orig2006-07-28 11:36:39 +0200 JavaScript-SpiderMonkey-0.18/SpiderMonkey.pm 2007-02-24 17:09:41 +0100 @@ -75,7 +75,6 @@ use strict; use warnings; @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.50 -r1.51 js.spec --- openpkg-src/js/js.spec3 Jun 2007 08:16:07 - 1.50 +++ openpkg-src/js/js.spec9 Jun 2007 08:07:44 - 1.51 @@ -25,7 +25,7 @@ # package version %define V_js 1.6.20070208 %define V_javascript 1.03 -%define V_javascript_spidermonkey 0.17 +%define V_javascript_spidermonkey 0.18 %define V_javascript_squish 0.05 %define V_javascript_code 0.08 %define V_javascript_jslint 0.06 @@ -43,7 +43,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20070603 +Release: 20070609 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Feb-2007 17:12:39 Branch: HEAD Handle: 2007022416123800 Modified files: openpkg-src/js js.patch js.spec Log: repair patch Summary: RevisionChanges Path 1.15+28 -27 openpkg-src/js/js.patch 1.38+1 -1 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.14 -r1.15 js.patch --- openpkg-src/js/js.patch 22 Feb 2007 06:25:45 - 1.14 +++ openpkg-src/js/js.patch 24 Feb 2007 16:12:38 - 1.15 @@ -1,7 +1,28 @@ +Index: JavaScript-1.03/Makefile.PL +--- JavaScript-1.03/Makefile.PL.orig 2007-02-21 16:57:19 +0100 JavaScript-1.03/Makefile.PL 2007-02-24 17:10:08 +0100 +@@ -94,7 +94,7 @@ + push @defines, "JS_THREADSAFE" if $ENV{JS_THREADSAFE}; + } + else { +-my $enable_threadsafe = prompt("Is your SpiderMonkey compiled with JS_THREADSAFE (most things will fail if you answer wrong)? [y/N]"); ++my $enable_threadsafe = 'n'; + push @defines, "JS_THREADSAFE" if $enable_threadsafe eq 'y'; + } + +@@ -103,7 +103,7 @@ + push @defines, "JS_C_STRINGS_ARE_UTF8" if $ENV{JS_UTF8}; + } + else { +-my $enable_utf8 = prompt("Is your SpiderMonkey compiled with support for unicode (t/23-unicode.t will fail if you answer wrong) ? [y/N]", "N"); ++my $enable_utf8 = 'n'; + push @defines, "JS_C_STRINGS_ARE_UTF8" if $enable_utf8 eq 'y'; + } + Index: JavaScript-SpiderMonkey-0.17/Makefile.PL JavaScript-SpiderMonkey-0.17/Makefile.PL.orig2006-07-22 22:49:27 +0200 -+++ JavaScript-SpiderMonkey-0.17/Makefile.PL 2006-07-22 22:51:30 +0200 -@@ -27,6 +27,7 @@ +--- JavaScript-SpiderMonkey-0.17/Makefile.PL.orig2006-07-28 11:30:08 +0200 JavaScript-SpiderMonkey-0.17/Makefile.PL 2007-02-24 17:09:41 +0100 +@@ -30,6 +30,7 @@ ); my %possible_install_paths = ( @@ -9,7 +30,7 @@ "../js/src/*" => "../js/src", "/usr/lib" => "/usr/include", "/usr/local/lib" => "/usr/local/include", -@@ -108,7 +108,6 @@ +@@ -120,7 +121,6 @@ 'NAME' => 'JavaScript::SpiderMonkey', 'VERSION_FROM' => 'SpiderMonkey.pm', # finds $VERSION 'PREREQ_PM' => { @@ -18,8 +39,8 @@ }, # e.g., Module::Name => 1.1 ($] >= 5.005 ?## Add these new keywords supported since 5.005 Index: JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm.orig2006-06-13 15:46:00 +0200 -+++ JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm 2006-06-29 19:20:44 +0200 +--- JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm.orig2006-07-28 11:36:39 +0200 JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm 2007-02-24 17:09:41 +0100 @@ -75,7 +75,6 @@ use strict; use warnings; @@ -28,7 +49,7 @@ require Exporter; require DynaLoader; -@@ -555,14 +554,7 @@ +@@ -557,14 +556,7 @@ ## sub debug_enabled { ## @@ -44,23 +65,3 @@ } 1; -Index: JavaScript-1.03/Makefile.PL JavaScript-1.03/Makefile.PL 2007-02-21 16:57:19 +0100 -+++ JavaScript-1.03/Makefile.PL 2007-02-22 07:15:52 +0100 -@@ -94,7 +94,7 @@ - push @defines, "JS_THREADSAFE" if $ENV{JS_THREADSAFE}; - } - else { --my $enable_threadsafe = prompt("Is your SpiderMonkey compiled with JS_THREADSAFE (most things will fail if you answer wrong)? [y/N]"); -+my $enable_threadsafe = 'n'; - push @defines, "JS_THREADSAFE" if $enable_threadsafe eq 'y'; - } - -@@ -103,7 +103,6 @@ - push @defines, "JS_C_STRINGS_ARE_UTF8" if $ENV{JS_UTF8}; - } - else { --my $enable_utf8 = prompt("Is your SpiderMonkey compiled with support for unicode (t/23-unicode.t will fail if you answer wrong) ? [y/N]", "N"); - push @defines, "JS_C_STRINGS_ARE_UTF8" if $enable_utf8 eq 'y'; - } - @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.37 -r1.38 js.spec --- openpkg-src/js/js.spec22 Feb 2007 06:25:45 - 1.37 +++ openpkg-src/js/js.spec24 Feb 2007 16:12:38 - 1.38 @@ -42,7 +42,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20070222 +Release
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Christoph Schug Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 22-Feb-2007 07:25:45 Branch: HEAD Handle: 2007022206254500 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20070213 -> 20070222 Summary: RevisionChanges Path 1.14+12 -19 openpkg-src/js/js.patch 1.37+3 -3 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.13 -r1.14 js.patch --- openpkg-src/js/js.patch 13 Feb 2007 07:28:22 - 1.13 +++ openpkg-src/js/js.patch 22 Feb 2007 06:25:45 - 1.14 @@ -44,11 +44,11 @@ } 1; -Index: JavaScript-1.02/Makefile.PL JavaScript-1.02/Makefile.PL.orig 2006-08-13 17:37:46 +0200 -+++ JavaScript-1.02/Makefile.PL 2006-08-20 17:57:22 +0200 -@@ -22,7 +22,7 @@ - push @defines, "JS_THREADSAFE"; +Index: JavaScript-1.03/Makefile.PL +--- JavaScript-1.03/Makefile.PL 2007-02-21 16:57:19 +0100 JavaScript-1.03/Makefile.PL 2007-02-22 07:15:52 +0100 +@@ -94,7 +94,7 @@ + push @defines, "JS_THREADSAFE" if $ENV{JS_THREADSAFE}; } else { -my $enable_threadsafe = prompt("Is your SpiderMonkey compiled with JS_THREADSAFE (most things will fail if you answer wrong)? [y/N]"); @@ -56,18 +56,11 @@ push @defines, "JS_THREADSAFE" if $enable_threadsafe eq 'y'; } -@@ -82,8 +82,13 @@ - my $libs = join(" ", map { "-L$_" } @libs); - - # Check if we need to enable JS_C_STRINGS_ARE_UTF8? --my $enable_utf8 = prompt("Is your SpiderMonkey compiled with support for unicode (t/23-unicode.t will fail if you answer wrong) ? [y/N]", "N"); -+if($ENV{JS_C_STRINGS_ARE_UTF8}) { -+push @defines, "JS_C_STRINGS_ARE_UTF8"; -+} -+else { -+my $enable_utf8 = 'n'; - push @defines, "JS_C_STRINGS_ARE_UTF8" if $enable_utf8 eq 'y'; -+} - +@@ -103,7 +103,6 @@ + push @defines, "JS_C_STRINGS_ARE_UTF8" if $ENV{JS_UTF8}; + } + else { +-my $enable_utf8 = prompt("Is your SpiderMonkey compiled with support for unicode (t/23-unicode.t will fail if you answer wrong) ? [y/N]", "N"); + push @defines, "JS_C_STRINGS_ARE_UTF8" if $enable_utf8 eq 'y'; + } - WriteMakefile('NAME'=> 'JavaScript', @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.36 -r1.37 js.spec --- openpkg-src/js/js.spec13 Feb 2007 07:28:22 - 1.36 +++ openpkg-src/js/js.spec22 Feb 2007 06:25:45 - 1.37 @@ -24,7 +24,7 @@ # package version %define V_js 1.6.20070208 -%define V_javascript 1.02 +%define V_javascript 1.03 %define V_javascript_spidermonkey 0.17 %define V_javascript_squish 0.05 %define V_javascript_code 0.08 @@ -42,7 +42,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20070213 +Release: 20070222 # package options %option with_fileyes @@ -172,7 +172,7 @@ export JS_LIB="../js-%{V_js}/.libs" export JS_INC="../js-%{V_js}/src" %if "%{with_utf8}" == "yes" - export JS_C_STRINGS_ARE_UTF8=1 + export JS_UTF8="1" %endif %{l_prefix}/bin/perl-openpkg configure build ) || exit $? @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Christoph Schug Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 13-Feb-2007 08:28:22 Branch: HEAD Handle: 2007021307282200 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20070212 -> 20070213 Summary: RevisionChanges Path 1.13+3 -3 openpkg-src/js/js.patch 1.36+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.12 -r1.13 js.patch --- openpkg-src/js/js.patch 12 Feb 2007 16:20:05 - 1.12 +++ openpkg-src/js/js.patch 13 Feb 2007 07:28:22 - 1.13 @@ -44,9 +44,9 @@ } 1; -Index: JavaScript-1.01/Makefile.PL JavaScript-1.01/Makefile.PL.orig 2006-08-13 17:37:46 +0200 -+++ JavaScript-1.01/Makefile.PL 2006-08-20 17:57:22 +0200 +Index: JavaScript-1.02/Makefile.PL +--- JavaScript-1.02/Makefile.PL.orig 2006-08-13 17:37:46 +0200 JavaScript-1.02/Makefile.PL 2006-08-20 17:57:22 +0200 @@ -22,7 +22,7 @@ push @defines, "JS_THREADSAFE"; } @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.35 -r1.36 js.spec --- openpkg-src/js/js.spec12 Feb 2007 16:20:05 - 1.35 +++ openpkg-src/js/js.spec13 Feb 2007 07:28:22 - 1.36 @@ -24,7 +24,7 @@ # package version %define V_js 1.6.20070208 -%define V_javascript 1.01 +%define V_javascript 1.02 %define V_javascript_spidermonkey 0.17 %define V_javascript_squish 0.05 %define V_javascript_code 0.08 @@ -42,7 +42,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20070212 +Release: 20070213 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Christoph Schug Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 12-Feb-2007 17:20:05 Branch: HEAD Handle: 2007021216200500 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20070208 20070208 -> 20070212 Summary: RevisionChanges Path 1.12+3 -3 openpkg-src/js/js.patch 1.35+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.11 -r1.12 js.patch --- openpkg-src/js/js.patch 20 Aug 2006 16:02:37 - 1.11 +++ openpkg-src/js/js.patch 12 Feb 2007 16:20:05 - 1.12 @@ -44,9 +44,9 @@ } 1; -Index: JavaScript-1.00_02/Makefile.PL JavaScript-1.00_02/Makefile.PL.orig 2006-08-13 17:37:46 +0200 -+++ JavaScript-1.00_02/Makefile.PL 2006-08-20 17:57:22 +0200 +Index: JavaScript-1.01/Makefile.PL +--- JavaScript-1.01/Makefile.PL.orig 2006-08-13 17:37:46 +0200 JavaScript-1.01/Makefile.PL 2006-08-20 17:57:22 +0200 @@ -22,7 +22,7 @@ push @defines, "JS_THREADSAFE"; } @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.34 -r1.35 js.spec --- openpkg-src/js/js.spec8 Feb 2007 15:01:02 - 1.34 +++ openpkg-src/js/js.spec12 Feb 2007 16:20:05 - 1.35 @@ -24,7 +24,7 @@ # package version %define V_js 1.6.20070208 -%define V_javascript 1.00_02 +%define V_javascript 1.01 %define V_javascript_spidermonkey 0.17 %define V_javascript_squish 0.05 %define V_javascript_code 0.08 @@ -42,7 +42,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20070208 +Release: 20070212 # package options %option with_fileyes @@ . __ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Aug-2006 18:02:37 Branch: HEAD Handle: 2006082017023700 Modified files: openpkg-src/js js.patch js.spec Log: upgrade to our new upstream OSSP version and add build option for the new UTF-8 support Summary: RevisionChanges Path 1.11+27 -0 openpkg-src/js/js.patch 1.27+8 -1 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.10 -r1.11 js.patch --- openpkg-src/js/js.patch 20 Aug 2006 15:42:27 - 1.10 +++ openpkg-src/js/js.patch 20 Aug 2006 16:02:37 - 1.11 @@ -44,3 +44,30 @@ } 1; +Index: JavaScript-1.00_02/Makefile.PL +--- JavaScript-1.00_02/Makefile.PL.orig 2006-08-13 17:37:46 +0200 JavaScript-1.00_02/Makefile.PL 2006-08-20 17:57:22 +0200 +@@ -22,7 +22,7 @@ + push @defines, "JS_THREADSAFE"; + } + else { +-my $enable_threadsafe = prompt("Is your SpiderMonkey compiled with JS_THREADSAFE (most things will fail if you answer wrong)? [y/N]"); ++my $enable_threadsafe = 'n'; + push @defines, "JS_THREADSAFE" if $enable_threadsafe eq 'y'; + } + +@@ -82,8 +82,13 @@ + my $libs = join(" ", map { "-L$_" } @libs); + + # Check if we need to enable JS_C_STRINGS_ARE_UTF8? +-my $enable_utf8 = prompt("Is your SpiderMonkey compiled with support for unicode (t/23-unicode.t will fail if you answer wrong) ? [y/N]", "N"); ++if($ENV{JS_C_STRINGS_ARE_UTF8}) { ++push @defines, "JS_C_STRINGS_ARE_UTF8"; ++} ++else { ++my $enable_utf8 = 'n'; + push @defines, "JS_C_STRINGS_ARE_UTF8" if $enable_utf8 eq 'y'; ++} + + + WriteMakefile('NAME'=> 'JavaScript', @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.26 -r1.27 js.spec --- openpkg-src/js/js.spec20 Aug 2006 15:42:27 - 1.26 +++ openpkg-src/js/js.spec20 Aug 2006 16:02:37 - 1.27 @@ -23,7 +23,7 @@ ## # package version -%define V_js 1.6.20060803 +%define V_js 1.6.20060820 %define V_javascript 1.00_02 %define V_javascript_spidermonkey 0.17 %define V_javascript_squish 0.05 @@ -48,6 +48,7 @@ %option with_dso yes %option with_perlno %option with_editlineno +%option with_utf8no # list of sources Source0: ftp://ftp.ossp.org/pkg/lib/js/js-%{V_js}.tar.gz @@ -148,6 +149,9 @@ %if "%{with_dso}" == "yes" --with-dso \ %endif +%if "%{with_utf8}" == "yes" + --with-utf8 \ +%endif --disable-shared %{l_make} %{l_mflags} ) || exit $? @@ -157,6 +161,9 @@ ( cd JavaScript-%{V_javascript} export JS_LIB="../js-%{V_js}/.libs" export JS_INC="../js-%{V_js}/src" +%if "%{with_utf8}" == "yes" + export JS_C_STRINGS_ARE_UTF8=1 +%endif %{l_prefix}/bin/perl-openpkg configure build ) || exit $? ( cd JavaScript-SpiderMonkey-%{V_javascript_spidermonkey} @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 20-Aug-2006 17:42:27 Branch: HEAD Handle: 2006082016422700 Modified files: openpkg-src/js js.patch js.spec Log: upgrade to newer module Summary: RevisionChanges Path 1.10+0 -48 openpkg-src/js/js.patch 1.26+5 -7 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.9 -r1.10 js.patch --- openpkg-src/js/js.patch 28 Jul 2006 14:28:43 - 1.9 +++ openpkg-src/js/js.patch 20 Aug 2006 15:42:27 - 1.10 @@ -1,51 +1,3 @@ -Index: JavaScript-0.55/JavaScript.xs JavaScript-0.55/JavaScript.xs.orig 2005-06-29 21:07:06 +0200 -+++ JavaScript-0.55/JavaScript.xs2006-06-29 19:20:44 +0200 -@@ -6,7 +6,7 @@ - #else - #include - #endif --#include -+#include - - #define _IS_UNDEF(a) (SvANY(a) == SvANY(&PL_sv_undef)) - -Index: JavaScript-0.55/Makefile.PL JavaScript-0.55/Makefile.PL.orig 2005-06-28 23:49:03 +0200 -+++ JavaScript-0.55/Makefile.PL 2006-06-29 19:20:44 +0200 -@@ -10,30 +10,13 @@ - $define .= " -DXP_UNIX"; - } - --my $inc = ''; -- --if(-f "/etc/gentoo-release") { --# Gentoo puts libjs in a slightly hidden spot. --$inc = '-I/usr/lib/MozillaFirefox/include/js/ -I/usr/lib/MozillaFirefox/'; --} -- --#test for debian type include files... --if (-f "/usr/include/smjs/jsapi.h" or -f "/usr/local/include/smjs/jsapi.h") { --$define .= " -DINCLUDES_IN_SMJS" --} -+my $inc = '-I../js/src'; - - if($ENV{JS_THREADSAFE}) { - $define .= " -DJS_THREADSAFE"; - } - --my $lib = "-ljs"; --#test for debian type libsmjs --#this could probably be done better, but I'm not sure how to --#get this platform independant --if (-f "/usr/lib/libsmjs.so" or -f "/usr/local/lib/libsmjs.so") { --$lib = "-lsmjs"; --} -- -+my $lib = "-L../js/src -ljs"; - - WriteMakefile( - 'NAME' => 'JavaScript', Index: JavaScript-SpiderMonkey-0.17/Makefile.PL --- JavaScript-SpiderMonkey-0.17/Makefile.PL.orig2006-07-22 22:49:27 +0200 +++ JavaScript-SpiderMonkey-0.17/Makefile.PL 2006-07-22 22:51:30 +0200 @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.25 -r1.26 js.spec --- openpkg-src/js/js.spec3 Aug 2006 13:33:05 - 1.25 +++ openpkg-src/js/js.spec20 Aug 2006 15:42:27 - 1.26 @@ -24,7 +24,7 @@ # package version %define V_js 1.6.20060803 -%define V_javascript 0.55 +%define V_javascript 1.00_02 %define V_javascript_spidermonkey 0.17 %define V_javascript_squish 0.05 %define V_javascript_code 0.05 @@ -41,7 +41,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20060803 +Release: 20060820 # package options %option with_fileyes @@ -51,7 +51,7 @@ # list of sources Source0: ftp://ftp.ossp.org/pkg/lib/js/js-%{V_js}.tar.gz -Source1: http://www.cpan.org/modules/by-module/JavaScript/JavaScript-%{V_javascript}.tar.gz +Source1: http://www.cpan.org/modules/by-authors/id/C/CL/CLAESJAC/JavaScript-%{V_javascript}.tar.gz Source2: http://www.cpan.org/modules/by-module/JavaScript/JavaScript-SpiderMonkey-%{V_javascript_spidermonkey}.tar.gz Source3: http://www.cpan.org/modules/by-module/JavaScript/JavaScript-Squish-%{V_javascript_squish}.tar.gz Source4: http://www.cpan.org/modules/by-module/JavaScript/JavaScript-Code-%{V_javascript_code}.tar.gz @@ -155,10 +155,8 @@ %if "%{with_perl}" == "yes" # build add-on Perl bindings ( cd JavaScript-%{V_javascript} - %{l_shtool} subst \ - -e 's;-I\.\./js/src;-I../js-%{V_js}/src;' \ - -e 's;-L\.\./js/src;-L../js-%{V_js}/.libs;' \ - Makefile.PL + export JS_LIB="../js-%{V_js}/.libs" + export JS_INC="../js-%{V_js}/src" %{l_prefix}/bin/perl-openpkg configure build ) || exit $? ( cd JavaScript-SpiderMonkey-%{V_javascript_spidermonkey} @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 28-Jul-2006 16:28:44 Branch: HEAD Handle: 2006072815284301 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.6.20060724 20060724 -> 20060728 Summary: RevisionChanges Path 1.9 +6 -6 openpkg-src/js/js.patch 1.20+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.8 -r1.9 js.patch --- openpkg-src/js/js.patch 23 Jul 2006 12:39:31 - 1.8 +++ openpkg-src/js/js.patch 28 Jul 2006 14:28:43 - 1.9 @@ -46,9 +46,9 @@ WriteMakefile( 'NAME' => 'JavaScript', -Index: JavaScript-SpiderMonkey-0.16/Makefile.PL JavaScript-SpiderMonkey-0.16/Makefile.PL.orig2006-07-22 22:49:27 +0200 -+++ JavaScript-SpiderMonkey-0.16/Makefile.PL 2006-07-22 22:51:30 +0200 +Index: JavaScript-SpiderMonkey-0.17/Makefile.PL +--- JavaScript-SpiderMonkey-0.17/Makefile.PL.orig2006-07-22 22:49:27 +0200 JavaScript-SpiderMonkey-0.17/Makefile.PL 2006-07-22 22:51:30 +0200 @@ -27,6 +27,7 @@ ); @@ -65,9 +65,9 @@ 'Data::Dumper' => 0, }, # e.g., Module::Name => 1.1 ($] >= 5.005 ?## Add these new keywords supported since 5.005 -Index: JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm.orig2006-06-13 15:46:00 +0200 -+++ JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm 2006-06-29 19:20:44 +0200 +Index: JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm +--- JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm.orig2006-06-13 15:46:00 +0200 JavaScript-SpiderMonkey-0.17/SpiderMonkey.pm 2006-06-29 19:20:44 +0200 @@ -75,7 +75,6 @@ use strict; use warnings; @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.19 -r1.20 js.spec --- openpkg-src/js/js.spec24 Jul 2006 20:42:11 - 1.19 +++ openpkg-src/js/js.spec28 Jul 2006 14:28:44 - 1.20 @@ -25,7 +25,7 @@ # package version %define V_js 1.6.20060724 %define V_javascript 0.55 -%define V_javascript_spidermonkey 0.16 +%define V_javascript_spidermonkey 0.17 %define V_javascript_squish 0.05 %define V_javascript_code 0.05 %define V_javascript_jslint 0.04 @@ -41,7 +41,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20060724 +Release: 20060728 # package options %option with_perlno @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 29-Jun-2006 19:36:19 Branch: HEAD Handle: 2006062918361800 Modified files: openpkg-src/js js.patch js.spec Log: upgrade to JavaScript 1.6 as contained in Mozilla Firefox 1.5.0.5 Summary: RevisionChanges Path 1.7 +75 -145openpkg-src/js/js.patch 1.15+5 -4 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.6 -r1.7 js.patch --- openpkg-src/js/js.patch 14 Jun 2006 07:17:03 - 1.6 +++ openpkg-src/js/js.patch 29 Jun 2006 17:36:18 - 1.7 @@ -1,6 +1,6 @@ Index: JavaScript-0.55/JavaScript.xs --- JavaScript-0.55/JavaScript.xs.orig 2005-06-29 21:07:06 +0200 -+++ JavaScript-0.55/JavaScript.xs2006-03-06 22:39:04 +0100 JavaScript-0.55/JavaScript.xs2006-06-29 19:20:44 +0200 @@ -6,7 +6,7 @@ #else #include @@ -12,7 +12,7 @@ Index: JavaScript-0.55/Makefile.PL --- JavaScript-0.55/Makefile.PL.orig 2005-06-28 23:49:03 +0200 -+++ JavaScript-0.55/Makefile.PL 2006-03-06 22:39:04 +0100 JavaScript-0.55/Makefile.PL 2006-06-29 19:20:44 +0200 @@ -10,30 +10,13 @@ $define .= " -DXP_UNIX"; } @@ -47,8 +47,8 @@ WriteMakefile( 'NAME' => 'JavaScript', Index: JavaScript-SpiderMonkey-0.16/Makefile.PL JavaScript-SpiderMonkey-0.16/Makefile.PL.orig2006-02-28 18:13:08 +0100 -+++ JavaScript-SpiderMonkey-0.16/Makefile.PL 2006-03-06 22:39:27 +0100 +--- JavaScript-SpiderMonkey-0.16/Makefile.PL.orig2006-06-13 13:59:05 +0200 JavaScript-SpiderMonkey-0.16/Makefile.PL 2006-06-29 19:20:44 +0200 @@ -108,7 +108,6 @@ 'NAME' => 'JavaScript::SpiderMonkey', 'VERSION_FROM' => 'SpiderMonkey.pm', # finds $VERSION @@ -58,8 +58,8 @@ }, # e.g., Module::Name => 1.1 ($] >= 5.005 ?## Add these new keywords supported since 5.005 Index: JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm.orig2006-03-06 17:48:27 +0100 -+++ JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm 2006-03-06 22:39:04 +0100 +--- JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm.orig2006-06-13 15:46:00 +0200 JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm 2006-06-29 19:20:44 +0200 @@ -75,7 +75,6 @@ use strict; use warnings; @@ -84,10 +84,51 @@ } 1; +Index: js/src/config.mk +--- js/src/config.mk.orig2003-11-15 01:10:55 +0100 js/src/config.mk 2006-06-29 19:20:44 +0200 +@@ -114,7 +114,7 @@ + + ifdef BUILD_OPT + OPTIMIZER = -O +-DEFINES+= -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami) ++DEFINES+= -UDEBUG -DNDEBUG + OBJDIR_TAG = _OPT + else + ifdef USE_MSVC +@@ -122,7 +122,7 @@ + else + OPTIMIZER = -g + endif +-DEFINES+= -DDEBUG -DDEBUG_$(shell whoami) ++DEFINES+= -DDEBUG + OBJDIR_TAG = _DBG + endif + +Index: js/src/config/SunOS5.10_i86pc.mk +--- /dev/null2006-06-29 19:26:24 +0200 js/src/config/SunOS5.10_i86pc.mk 2006-06-29 19:20:44 +0200 +@@ -0,0 +1,16 @@ ++ ++CC = gcc ++LD = ld ++CCC = g++ ++CFLAGS += -Wall -Wno-format ++MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS) ++RANLIB = echo ++CPU_ARCH= $(shell uname -m) ++GFX_ARCH= x ++OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -DSOLARIS -DHAVE_LOCALTIME_R -DHAVE_VA_COPY -DVA_COPY=va_copy -DPIC -fPIC ++OS_LIBS = -lsocket -lnsl -ldl ++LDFLAGS = ++NOSUCHFILE = /solaris-rm-f-sucks ++JS_EDITLINE = 1 ++OS_TEST = i86pc ++ Index: js/src/jsapi.c js/src/jsapi.c.orig 2005-10-22 12:19:14 +0200 -+++ js/src/jsapi.c 2006-03-06 22:39:04 +0100 -@@ -125,7 +125,7 @@ +--- js/src/jsapi.c.orig 2006-06-16 04:01:22 +0200 js/src/jsapi.c 2006-06-29 19:20:44 +0200 +@@ -130,7 +130,7 @@ static JSBool TryArgumentFormatter(JSContext *cx, const char **formatp, JSBool fromJS, @@ -96,7 +137,7 @@ { const char *format; JSArgumentFormatMap *map; -@@ -263,8 +263,7 @@ +@@ -259,8 +259,7 @@ break; default: format--; @@ -106,7 +147,7 @@ return JS_FALSE; } /* NB: the formatter already updated sp, so we continue here. */ -@@ -366,8 +365,7 @@ +@@ -362,8 +361,7 @@ break; default:
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 14-Jun-2006 09:17:03 Branch: HEAD Handle: 2006061408170300 Modified files: openpkg-src/js js.patch js.spec Log: modifying package: js-1.5 20060606 -> 20060614 Summary: RevisionChanges Path 1.6 +6 -6 openpkg-src/js/js.patch 1.12+2 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.5 -r1.6 js.patch --- openpkg-src/js/js.patch 6 Jun 2006 13:08:14 - 1.5 +++ openpkg-src/js/js.patch 14 Jun 2006 07:17:03 - 1.6 @@ -46,9 +46,9 @@ WriteMakefile( 'NAME' => 'JavaScript', -Index: JavaScript-SpiderMonkey-0.15/Makefile.PL JavaScript-SpiderMonkey-0.15/Makefile.PL.orig2006-02-28 18:13:08 +0100 -+++ JavaScript-SpiderMonkey-0.15/Makefile.PL 2006-03-06 22:39:27 +0100 +Index: JavaScript-SpiderMonkey-0.16/Makefile.PL +--- JavaScript-SpiderMonkey-0.16/Makefile.PL.orig2006-02-28 18:13:08 +0100 JavaScript-SpiderMonkey-0.16/Makefile.PL 2006-03-06 22:39:27 +0100 @@ -108,7 +108,6 @@ 'NAME' => 'JavaScript::SpiderMonkey', 'VERSION_FROM' => 'SpiderMonkey.pm', # finds $VERSION @@ -57,9 +57,9 @@ 'Data::Dumper' => 0, }, # e.g., Module::Name => 1.1 ($] >= 5.005 ?## Add these new keywords supported since 5.005 -Index: JavaScript-SpiderMonkey-0.15/SpiderMonkey.pm JavaScript-SpiderMonkey-0.15/SpiderMonkey.pm.orig2006-03-06 17:48:27 +0100 -+++ JavaScript-SpiderMonkey-0.15/SpiderMonkey.pm 2006-03-06 22:39:04 +0100 +Index: JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm +--- JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm.orig2006-03-06 17:48:27 +0100 JavaScript-SpiderMonkey-0.16/SpiderMonkey.pm 2006-03-06 22:39:04 +0100 @@ -75,7 +75,6 @@ use strict; use warnings; @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.11 -r1.12 js.spec --- openpkg-src/js/js.spec6 Jun 2006 13:08:14 - 1.11 +++ openpkg-src/js/js.spec14 Jun 2006 07:17:03 - 1.12 @@ -25,7 +25,7 @@ # package version %define V_js 1.5 %define V_javascript 0.55 -%define V_javascript_spidermonkey 0.15 +%define V_javascript_spidermonkey 0.16 # package information Name: js @@ -38,7 +38,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20060606 +Release: 20060614 # package options %option with_perl no @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 06-Jun-2006 15:08:15 Branch: HEAD Handle: 2006060614081400 Modified files: openpkg-src/js js.patch js.spec Log: port to Solaris 10/x86 and get rid of 'whoami' related warnings under Solaris Summary: RevisionChanges Path 1.5 +41 -0 openpkg-src/js/js.patch 1.11+4 -2 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.4 -r1.5 js.patch --- openpkg-src/js/js.patch 6 Mar 2006 21:51:48 - 1.4 +++ openpkg-src/js/js.patch 6 Jun 2006 13:08:14 - 1.5 @@ -289,3 +289,44 @@ endif all: +Index: js/src/config/SunOS5.10_i86pc.mk +--- js/src/config/SunOS5.10_i86pc.mk.orig2006-06-06 14:24:18.124955215 +0200 js/src/config/SunOS5.10_i86pc.mk 2006-06-06 14:24:07.034374207 +0200 +@@ -0,0 +1,16 @@ ++ ++CC = gcc ++LD = ld ++CCC = g++ ++CFLAGS += -Wall -Wno-format ++MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS) ++RANLIB = echo ++CPU_ARCH= $(shell uname -m) ++GFX_ARCH= x ++OS_CFLAGS = -DXP_UNIX -DSVR4 -DSYSV -DSOLARIS -DHAVE_LOCALTIME_R -DHAVE_VA_COPY -DVA_COPY=va_copy -DPIC -fPIC ++OS_LIBS = -lsocket -lnsl -ldl ++LDFLAGS = ++NOSUCHFILE = /solaris-rm-f-sucks ++JS_EDITLINE = 1 ++OS_TEST = i86pc ++ +Index: js/src/config.mk +--- js/src/config.mk.orig2003-11-15 01:10:55.0 +0100 js/src/config.mk 2006-06-06 14:32:09.769085477 +0200 +@@ -114,7 +114,7 @@ + + ifdef BUILD_OPT + OPTIMIZER = -O +-DEFINES+= -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami) ++DEFINES+= -UDEBUG -DNDEBUG + OBJDIR_TAG = _OPT + else + ifdef USE_MSVC +@@ -122,7 +122,7 @@ + else + OPTIMIZER = -g + endif +-DEFINES+= -DDEBUG -DDEBUG_$(shell whoami) ++DEFINES+= -DDEBUG + OBJDIR_TAG = _DBG + endif + @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.10 -r1.11 js.spec --- openpkg-src/js/js.spec6 Mar 2006 21:51:48 - 1.10 +++ openpkg-src/js/js.spec6 Jun 2006 13:08:14 - 1.11 @@ -38,7 +38,7 @@ Group:Language License: MPL/GPL/LGPL Version: %{V_js} -Release: 20060306 +Release: 20060606 # package options %option with_perl no @@ -101,7 +101,9 @@ ( cd js/src cp Makefile.ref Makefile case "%{l_platform -t}" in - *-freebsd* ) cp config/Linux_All.mk config/`uname -s``uname -r`.mk ;; + *-freebsd*) cp config/Linux_All.mk config/`uname -s``uname -r`.mk ;; + sun*-sunos5.1[01] ) cp config/SunOS5.9.mk config/`uname -s``uname -r`.mk ;; + ix86*-sunos* ) rm -f lock_SunOS.s ;; esac touch config/`uname -s``uname -r`.mk %{l_make} %{l_mflags} \ @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 06-Mar-2006 22:51:48 Branch: HEAD Handle: 2006030621514800 Modified files: openpkg-src/js js.patch js.spec Log: add two additional Perl bindings Summary: RevisionChanges Path 1.4 +122 -24openpkg-src/js/js.patch 1.10+76 -30 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.3 -r1.4 js.patch --- openpkg-src/js/js.patch 29 Jan 2006 21:19:31 - 1.3 +++ openpkg-src/js/js.patch 6 Mar 2006 21:51:48 - 1.4 @@ -1,6 +1,92 @@ -Index: jsapi.c jsapi.c.orig 2005-10-22 12:19:14 +0200 -+++ jsapi.c 2006-01-29 22:17:08 +0100 +Index: JavaScript-0.55/JavaScript.xs +--- JavaScript-0.55/JavaScript.xs.orig 2005-06-29 21:07:06 +0200 JavaScript-0.55/JavaScript.xs2006-03-06 22:39:04 +0100 +@@ -6,7 +6,7 @@ + #else + #include + #endif +-#include ++#include + + #define _IS_UNDEF(a) (SvANY(a) == SvANY(&PL_sv_undef)) + +Index: JavaScript-0.55/Makefile.PL +--- JavaScript-0.55/Makefile.PL.orig 2005-06-28 23:49:03 +0200 JavaScript-0.55/Makefile.PL 2006-03-06 22:39:04 +0100 +@@ -10,30 +10,13 @@ + $define .= " -DXP_UNIX"; + } + +-my $inc = ''; +- +-if(-f "/etc/gentoo-release") { +-# Gentoo puts libjs in a slightly hidden spot. +-$inc = '-I/usr/lib/MozillaFirefox/include/js/ -I/usr/lib/MozillaFirefox/'; +-} +- +-#test for debian type include files... +-if (-f "/usr/include/smjs/jsapi.h" or -f "/usr/local/include/smjs/jsapi.h") { +-$define .= " -DINCLUDES_IN_SMJS" +-} ++my $inc = '-I../js/src'; + + if($ENV{JS_THREADSAFE}) { + $define .= " -DJS_THREADSAFE"; + } + +-my $lib = "-ljs"; +-#test for debian type libsmjs +-#this could probably be done better, but I'm not sure how to +-#get this platform independant +-if (-f "/usr/lib/libsmjs.so" or -f "/usr/local/lib/libsmjs.so") { +-$lib = "-lsmjs"; +-} +- ++my $lib = "-L../js/src -ljs"; + + WriteMakefile( + 'NAME' => 'JavaScript', +Index: JavaScript-SpiderMonkey-0.15/Makefile.PL +--- JavaScript-SpiderMonkey-0.15/Makefile.PL.orig2006-02-28 18:13:08 +0100 JavaScript-SpiderMonkey-0.15/Makefile.PL 2006-03-06 22:39:27 +0100 +@@ -108,7 +108,6 @@ + 'NAME' => 'JavaScript::SpiderMonkey', + 'VERSION_FROM' => 'SpiderMonkey.pm', # finds $VERSION + 'PREREQ_PM' => { +-'Log::Log4perl' => 0, + 'Data::Dumper' => 0, +}, # e.g., Module::Name => 1.1 + ($] >= 5.005 ?## Add these new keywords supported since 5.005 +Index: JavaScript-SpiderMonkey-0.15/SpiderMonkey.pm +--- JavaScript-SpiderMonkey-0.15/SpiderMonkey.pm.orig2006-03-06 17:48:27 +0100 JavaScript-SpiderMonkey-0.15/SpiderMonkey.pm 2006-03-06 22:39:04 +0100 +@@ -75,7 +75,6 @@ + use strict; + use warnings; + use Data::Dumper; +-use Log::Log4perl qw(:easy); + + require Exporter; + require DynaLoader; +@@ -555,14 +554,7 @@ + ## + sub debug_enabled { + ## +-my $logger = Log::Log4perl::get_logger("JavaScript::SpiderMonkey"); +-if(Log::Log4perl->initialized() and $logger->is_debug()) { +-# print "DEBUG IS ENABLED\n"; +-return 1; +-} else { +-# print "DEBUG IS DISABLED\n"; +-return 0; +-} ++return 0; + } + + 1; +Index: js/src/jsapi.c +--- js/src/jsapi.c.orig 2005-10-22 12:19:14 +0200 js/src/jsapi.c 2006-03-06 22:39:04 +0100 @@ -125,7 +125,7 @@ static JSBool @@ -39,9 +125,9 @@ atom = NULL; attrs &= ~JSPROP_INDEX; } else { -Index: jscntxt.c jscntxt.c.orig 2004-08-19 19:57:36 +0200 -+++ jscntxt.c2006-01-29 22:17:08 +0100 +Index: js/src/jscntxt.c +--- js/src/jscntxt.c.orig2004-08-19 19:57:36 +0200 js/src/jscntxt.c 2006-03-06 22:39:04 +0100 @@ -334,7 +334,7 @@ { const JSResolvingKey *key = (const JSResolvingKey *)ptr; @@ -51,9 +137,9 @@ } JS_PUBLIC_API(JSBool) -Index: jsdtoa.c jsdtoa.c.orig2004-04-04 00:11:11 +0200 -+++ jsdtoa.c 2006-01-29 22:17:08 +0100 +Index: js/src/jsdtoa.c +--- js/src/jsdtoa.c.orig 2004-04-04 00:11:11 +0200 js/src/jsdtoa.c 2006-03-06 22:39:
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 25-Oct-2005 08:39:40 Branch: HEAD Handle: 2005102507394000 Modified files: openpkg-src/js js.patch js.spec Log: upgrading package: js 1.5rc6a -> 1.5 Summary: RevisionChanges Path 1.2 +0 -12 openpkg-src/js/js.patch 1.6 +28 -31 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r1.1 -r1.2 js.patch --- openpkg-src/js/js.patch 27 Jun 2004 12:01:11 - 1.1 +++ openpkg-src/js/js.patch 25 Oct 2005 06:39:40 - 1.2 @@ -1,15 +1,3 @@ -Index: perlconnect/JS.xs perlconnect/JS.xs.orig 2002-03-19 05:28:56 +0100 -+++ perlconnect/JS.xs2004-06-27 13:53:22 +0200 -@@ -56,7 +56,7 @@ - - #include - #include "jsperlpvt.h" --#include -+#include - - /* __REMOVE__ */ - /* #include */ Index: rules.mk --- rules.mk.orig2003-11-15 01:11:04 +0100 +++ rules.mk 2004-06-27 13:54:04 +0200 @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.5 -r1.6 js.spec --- openpkg-src/js/js.spec24 Mar 2005 11:19:09 - 1.5 +++ openpkg-src/js/js.spec25 Oct 2005 06:39:40 - 1.6 @@ -22,10 +22,6 @@ ## SUCH DAMAGE. ## -# package version -%define V_major 1.5 -%define V_minor rc6a - # package information Name: js Summary: Mozilla JavaScript (JS) @@ -36,14 +32,14 @@ Class:EVAL Group:Language License: MPL/GPL/LGPL -Version: %{V_major}%{V_minor} -Release: 20040627 +Version: 1.5 +Release: 20051025 # package options %option with_perl no # list of sources -Source0: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{V_major}-%{V_minor}.tar.gz +Source0: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{version}.tar.gz Source1: js.pc Patch0: js.patch @@ -69,7 +65,7 @@ %track prog js = { -version = %{V_major}-%{V_minor} +version = %{version} url = http://ftp.mozilla.org/pub/mozilla.org/js/ regex = js-(__VER__)\.tar\.gz } @@ -79,31 +75,32 @@ %patch -p0 -d js/src %build -( cd js/src - # prepare build environment - cp Makefile.ref Makefile - case "%{l_platform -t}" in - *-freebsd* ) cp config/Linux_All.mk config/`uname -s``uname -r`.mk ;; - esac - - # build components - %{l_make} %{l_mflags} \ - CC="%{l_cc}" \ - XCFLAGS="%{l_cppflags} %{l_cflags -O}" \ - XLDFLAGS="%{l_ldflags}" \ - BUILD_OPT=1 \ - JS_EDITLINE=1 +cd js/src + +# build components +cp Makefile.ref Makefile +case "%{l_platform -t}" in +*-freebsd* ) cp config/Linux_All.mk config/`uname -s``uname -r`.mk ;; +esac +touch config/`uname -s``uname -r`.mk +%{l_make} %{l_mflags} \ +CC="%{l_cc}" \ +XCFLAGS="%{l_cppflags} %{l_cflags -O}" \ +XLDFLAGS="%{l_ldflags}" \ +BUILD_OPT=1 \ +JS_EDITLINE=1 + %if "%{with_perl}" == "yes" - objdir="`echo *.OBJ`" - %{l_shtool} subst \ - -e "s:\\(\$inc.=.\"\\).*\\(\";\\):\\1-I../$objdir -I..\\2:g" \ - -e "s:\\(\$libpath.=.\"\\).*\\(\";\\):\\1-L../$objdir\\2:g" \ - perlconnect/Makefile.PL - %{l_prefix}/bin/perl-openpkg prepare - %{l_prefix}/bin/perl-openpkg -d perlconnect -A "-c" configure - %{l_prefix}/bin/perl-openpkg -d perlconnect build +# build Perl API +objdir="`echo *.OBJ`" +%{l_shtool} subst \ +-e "s:\\(\$inc.=.\"\\).*\\(\";\\):\\1-I../$objdir -I..\\2:g" \ +-e "s:\\(\$libpath.=.\"\\).*\\(\";\\):\\1-L../$objdir\\2:g" \ +perlconnect/Makefile.PL +%{l_prefix}/bin/perl-openpkg prepare +%{l_prefix}/bin/perl-openpkg -d perlconnect -A "-c" configure +%{l_prefix}/bin/perl-openpkg -d perlconnect build %endif -) || exit $? %install # create installation hierarchy @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/js/ js.patch js.spec
OpenPKG CVS Repository http://cvs.openpkg.org/ Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /e/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 27-Jun-2004 14:01:12 Branch: HEAD Handle: -NONE- Added files: openpkg-src/js js.patch Modified files: openpkg-src/js js.spec Log: add optional Perl binding (allowing to execute JS code from within Perl) and refactor substs into a separate patch file Summary: RevisionChanges Path 1.1 +24 -0 openpkg-src/js/js.patch 1.3 +28 -4 openpkg-src/js/js.spec patch -p0 <<'@@ .' Index: openpkg-src/js/js.patch $ cvs diff -u -r0 -r1.1 js.patch --- /dev/null 2004-06-27 14:01:11.0 +0200 +++ js.patch 2004-06-27 14:01:11.0 +0200 @@ -0,0 +1,24 @@ +Index: perlconnect/JS.xs +--- perlconnect/JS.xs.orig 2002-03-19 05:28:56 +0100 perlconnect/JS.xs2004-06-27 13:53:22 +0200 +@@ -56,7 +56,7 @@ + + #include + #include "jsperlpvt.h" +-#include ++#include + + /* __REMOVE__ */ + /* #include */ +Index: rules.mk +--- rules.mk.orig2003-11-15 01:11:04 +0100 rules.mk 2004-06-27 13:54:04 +0200 +@@ -58,7 +58,7 @@ + # TARGETS = $(LIBRARY) # $(PROGRAM) not supported for MSVC yet + TARGETS += $(SHARED_LIBRARY) $(PROGRAM) # it is now + else +-TARGETS += $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) ++TARGETS += $(LIBRARY) $(PROGRAM) + endif + + all: @@ . patch -p0 <<'@@ .' Index: openpkg-src/js/js.spec $ cvs diff -u -r1.2 -r1.3 js.spec --- openpkg-src/js/js.spec27 Jun 2004 11:07:41 - 1.2 +++ openpkg-src/js/js.spec27 Jun 2004 12:01:11 - 1.3 @@ -40,15 +40,23 @@ Version: %{V_major}%{V_minor} Release: 20040627 +# package options +%option with_perl no + # list of sources Source0: http://ftp.mozilla.org/pub/mozilla.org/js/js-%{V_major}-%{V_minor}.tar.gz Source1: js.pc +Patch0: js.patch # build information Prefix: %{l_prefix} BuildRoot:%{l_buildroot} BuildPreReq: OpenPKG, openpkg >= 20040130, gcc, make PreReq: OpenPKG, openpkg >= 20040130 +%if "%{with_perl}" == "yes" +BuildPreReq: perl, perl-openpkg +PreReq: perl +%endif AutoReq: no AutoReqProv: no @@ -69,6 +77,7 @@ %prep %setup -q -c +%patch -p0 -d js/src %build ( cd js/src @@ -77,9 +86,6 @@ case "%{l_platform -t}" in *-freebsd* ) cp config/Linux_All.mk config/`uname -s``uname -r`.mk ;; esac - %{l_shtool} subst \ - -e 's;^\(TARGETS.*\)$(SHARED_LIBRARY)\(.*\)$;\1\2;' \ - rules.mk # build components %{l_make} %{l_mflags} \ @@ -88,6 +94,16 @@ XLDFLAGS="%{l_ldflags}" \ BUILD_OPT=1 \ JS_EDITLINE=1 +%if "%{with_perl}" == "yes" + objdir="`echo *.OBJ`" + %{l_shtool} subst \ + -e "s:\\(\$inc.=.\"\\).*\\(\";\\):\\1-I../$objdir -I..\\2:g" \ + -e "s:\\(\$libpath.=.\"\\).*\\(\";\\):\\1-L../$objdir\\2:g" \ + perlconnect/Makefile.PL + %{l_prefix}/bin/perl-openpkg prepare + %{l_prefix}/bin/perl-openpkg -d perlconnect -A "-c" configure + %{l_prefix}/bin/perl-openpkg -d perlconnect build +%endif ) || exit $? %install @@ -114,7 +130,15 @@ fdlibm/*.OBJ/libfdm.a $RPM_BUILD_ROOT%{l_prefix}/lib/libjsfdlibm.a %{l_shtool} install -c -m 644 \ fdlibm/fdlibm.h $RPM_BUILD_ROOT%{l_prefix}/include/js/ +%if "%{with_perl}" == "yes" + %{l_prefix}/bin/perl-openpkg -d perlconnect install +%endif ) || exit $? +%if "%{with_perl}" == "yes" +%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup +%else +>perl-openpkg-files +%endif # install pkgconfig(1) file %{l_shtool} install -c -m 644 %{l_value -s -a} \ @@ -123,7 +147,7 @@ # determine installation files %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \ -%{l_files_std} \ +%{l_files_std} `cat perl-openpkg-files` \ '%not %dir %{l_prefix}/lib/pkgconfig' %files -f files @@ . __ The OpenPKG Projectwww.openpkg.org CVS Repository Commit List [EMAIL PROTECTED]