Fix some integer witdth/type-casting issue which I saw on NetBSD/amd64

today, eliminating most warnings.

Bump rev.

6 files changed, 83 insertions, 3 deletions

diff --git a/lang/ossp-js/Makefile b/lang/ossp-js/Makefile
index bbff7c287ee..79afb478e6d 100644
--- a/lang/ossp-js/Makefile
+++ b/lang/ossp-js/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2008/02/06 10:08:01 bjs Exp $
+# $NetBSD: Makefile,v 1.3 2008/04/04 01:56:16 bjs Exp $
 #
 
 DISTNAME=	js-1.6.20070208
 PKGNAME=	ossp-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.ossp.org/pkg/lib/js/
 
@@ -24,6 +24,8 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 
+CFLAGS+=		-Wall
+
 PKGCONFIG_OVERRIDE+=	js.pc.in
 
 CONFIGURE_ARGS+=	--with-dso
diff --git a/lang/ossp-js/distinfo b/lang/ossp-js/distinfo
index d1e02b35f46..885a6065336 100644
--- a/lang/ossp-js/distinfo
+++ b/lang/ossp-js/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2008/02/06 10:08:25 bjs Exp $
+$NetBSD: distinfo,v 1.4 2008/04/04 01:56:16 bjs Exp $
 
 SHA1 (js-1.6.20070208.tar.gz) = 3c8c4b81637b84fa344334a2c0bb093244620d9e
 RMD160 (js-1.6.20070208.tar.gz) = e2e5a1f50026d50caae672bf1122f728991ca377
@@ -8,3 +8,7 @@ SHA1 (patch-ab) = a994f01aea48b20085c9f37fadf6683d0200f7ca
 SHA1 (patch-ac) = cfb32539e82762755090c90fd22978d541edb1d7
 SHA1 (patch-ad) = 9cee1435756bd1d6dec029d81444ec45418a4b18
 SHA1 (patch-ae) = 0a031230be8fc001e510a26d296b5bfdc2a7e1d7
+SHA1 (patch-af) = 214c8061cb3ff5969b9b0bfbf150c945bb3367a3
+SHA1 (patch-ag) = 5d6e87ebc3bef9123dd36e1041b2b575a427a664
+SHA1 (patch-ah) = 24889cbf3624aac2ff97f87244644b1b2e3bd9a2
+SHA1 (patch-ai) = c0d4fdf957b185ca172ddc2edc935c1ba7149c3e
diff --git a/lang/ossp-js/patches/patch-af b/lang/ossp-js/patches/patch-af
new file mode 100644
index 00000000000..8cc790975d6
--- /dev/null
+++ b/lang/ossp-js/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2008/04/04 01:56:16 bjs Exp $
+
+--- src/jsapi.c.orig	2007-02-08 04:39:05.000000000 -0500
++++ src/jsapi.c
+@@ -4078,7 +4078,7 @@ JS_EvaluateScript(JSContext *cx, JSObjec
+     JSBool ok;
+ 
+     CHECK_REQUEST(cx);
+-    chars = js_InflateString(cx, bytes, &length);
++    chars = js_InflateString(cx, bytes, (size_t *)&length);
+     if (!chars)
+         return JS_FALSE;
+     ok = JS_EvaluateUCScript(cx, obj, chars, length, filename, lineno, rval);
+@@ -4097,7 +4097,7 @@ JS_EvaluateScriptForPrincipals(JSContext
+     JSBool ok;
+ 
+     CHECK_REQUEST(cx);
+-    chars = js_InflateString(cx, bytes, &length);
++    chars = js_InflateString(cx, bytes, (size_t *)&length);
+     if (!chars)
+         return JS_FALSE;
+     ok = JS_EvaluateUCScriptForPrincipals(cx, obj, principals, chars, length,
diff --git a/lang/ossp-js/patches/patch-ag b/lang/ossp-js/patches/patch-ag
new file mode 100644
index 00000000000..b394bb4b24a
--- /dev/null
+++ b/lang/ossp-js/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2008/04/04 01:56:16 bjs Exp $
+
+--- src/jsdbgapi.c.orig	2006-04-04 10:09:45.000000000 -0400
++++ src/jsdbgapi.c
+@@ -940,7 +940,7 @@ JS_EvaluateInStackFrame(JSContext *cx, J
+     jschar *chars;
+     JSBool ok;
+ 
+-    chars = js_InflateString(cx, bytes, &length);
++    chars = js_InflateString(cx, bytes, (size_t *)&length);
+     if (!chars)
+         return JS_FALSE;
+     ok = JS_EvaluateUCInStackFrame(cx, fp, chars, length, filename, lineno,
diff --git a/lang/ossp-js/patches/patch-ah b/lang/ossp-js/patches/patch-ah
new file mode 100644
index 00000000000..ca544a63fdb
--- /dev/null
+++ b/lang/ossp-js/patches/patch-ah
@@ -0,0 +1,20 @@
+$NetBSD: patch-ah,v 1.1 2008/04/04 01:56:16 bjs Exp $
+
+--- src/jsosdep.h.orig	2005-07-07 18:35:39.000000000 -0400
++++ src/jsosdep.h
+@@ -89,6 +89,15 @@
+ #elif defined(FREEBSD)
+ #define JS_HAVE_LONG_LONG
+ 
++#elif defined(__NetBSD__)
++#define JS_HAVE_LONG_LONG
++
++#elif defined(__OpenBSD__)
++#define JS_HAVE_LONG_LONG
++
++#elif defined(__DragonFly__)
++#define JS_HAVE_LONG_LONG
++
+ #elif defined(SUNOS4)
+ #undef JS_HAVE_LONG_LONG
+ 
diff --git a/lang/ossp-js/patches/patch-ai b/lang/ossp-js/patches/patch-ai
new file mode 100644
index 00000000000..b0929b3ccdd
--- /dev/null
+++ b/lang/ossp-js/patches/patch-ai
@@ -0,0 +1,19 @@
+$NetBSD: patch-ai,v 1.1 2008/04/04 01:56:16 bjs Exp $
+
+--- src/jstypes.h.orig	2006-07-24 15:21:49.000000000 -0400
++++ src/jstypes.h
+@@ -387,8 +387,14 @@ typedef JSUint8 JSPackedBool;
+ /*
+ ** A JSWord is an integer that is the same size as a void*
+ */
++#ifdef HAVE_INTTYPES_H
++#include <stdint.h>
++typedef intptr_t JSWord;
++typedef uintptr_t JSUword;
++#else
+ typedef long JSWord;
+ typedef unsigned long JSUword;
++#endif
+ 
+ #include "jsotypes.h"
+