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:
Revision Changes 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 -0000 1.9
+++ openpkg-src/js/js.patch 20 Aug 2006 15:42:27 -0000 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.xs 2006-06-29 19:20:44 +0200
-@@ -6,7 +6,7 @@
- #else
- #include <jsapi.h>
- #endif
--#include <malloc.h>
-+#include <stdlib.h>
-
- #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.orig 2006-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.spec 3 Aug 2006 13:33:05 -0000 1.25
+++ openpkg-src/js/js.spec 20 Aug 2006 15:42:27 -0000 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_file yes
@@ -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 Project www.openpkg.org
CVS Repository Commit List [email protected]
