Upgrade to version 1.14 of jikes.

The new version is a bug fix release.

Addresses PR 12946 from Hauke Fath <hf@tangro.de>

6 files changed, 44 insertions, 24 deletions

diff --git a/lang/jikes/Makefile b/lang/jikes/Makefile
index 99e3f60f5de..7c5af3883d7 100644
--- a/lang/jikes/Makefile
+++ b/lang/jikes/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 09:07:16 agc Exp $
+# $NetBSD: Makefile,v 1.6 2001/05/16 10:05:35 agc Exp $
 #
 
-DISTNAME=	jikes-1.12
+DISTNAME=	jikes-1.14
 CATEGORIES=	lang
-MASTER_SITES=	http://oss.software.ibm.com/developerworks/opensource/jikes/project/pub/
+MASTER_SITES=	http://oss.software.ibm.com/pub/jikes/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www10.software.ibm.com/developerworks/opensource/jikes/
diff --git a/lang/jikes/distinfo b/lang/jikes/distinfo
index 07592784979..524c5ab37a9 100644
--- a/lang/jikes/distinfo
+++ b/lang/jikes/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2001/04/17 09:19:35 agc Exp $
+$NetBSD: distinfo,v 1.2 2001/05/16 10:05:35 agc Exp $
 
-SHA1 (jikes-1.12.tar.gz) = 24456595fe0c2453b4685a5943e204655f6bc44b
-Size (jikes-1.12.tar.gz) = 568974 bytes
-SHA1 (patch-aa) = 8229b03b817fbbb1a2aa0713f12a5606b3964817
-SHA1 (patch-ab) = 26646e1d0127e31324da135d5bfb1c5b0ad9c55a
+SHA1 (jikes-1.14.tar.gz) = 8bd8dfe9fc429952c653906ddafe1100ed75ea17
+Size (jikes-1.14.tar.gz) = 609326 bytes
+SHA1 (patch-aa) = 138e70dac39f5559edfa790ff334b8b738354b87
+SHA1 (patch-ab) = d83db5618d457decb04c1cfa2989ec50e7a84a3b
+SHA1 (patch-ac) = 8298cdce338dc40c3f063b8a8d4690f8a103b78a
diff --git a/lang/jikes/patches/patch-aa b/lang/jikes/patches/patch-aa
index 839f796ef69..09480b08c25 100644
--- a/lang/jikes/patches/patch-aa
+++ b/lang/jikes/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2000/10/16 20:38:21 tv Exp $
+$NetBSD: patch-aa,v 1.2 2001/05/16 10:05:36 agc Exp $
 
---- configure.orig	Mon Oct 16 15:55:59 2000
-+++ configure	Mon Oct 16 15:57:17 2000
-@@ -2549,6 +2549,7 @@
- extern "C" void exit (int);
- #endif
+--- configure.orig	Fri May 11 07:28:30 2001
++++ configure	Wed May 16 09:51:31 2001
+@@ -3732,6 +3732,7 @@
+ #line 3732 "configure"
+ #include "confdefs.h"
  $ac_includes_default
 +#include <wchar.h>
  int
diff --git a/lang/jikes/patches/patch-ab b/lang/jikes/patches/patch-ab
index 1c8191684fc..ef0b6c3c5d4 100644
--- a/lang/jikes/patches/patch-ab
+++ b/lang/jikes/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2000/12/19 09:24:17 jlam Exp $
+$NetBSD: patch-ab,v 1.3 2001/05/16 10:05:36 agc Exp $
 
---- doc/Makefile.in.orig	Mon Oct 16 16:20:21 2000
-+++ doc/Makefile.in	Mon Oct 16 16:20:29 2000
-@@ -80,7 +80,7 @@
+--- doc/Makefile.in.orig	Fri Mar 30 07:23:12 2001
++++ doc/Makefile.in	Wed May 16 09:54:18 2001
+@@ -82,7 +82,7 @@
  
  man_MANS = jikes.1
  
@@ -10,4 +10,4 @@ $NetBSD: patch-ab,v 1.2 2000/12/19 09:24:17 jlam Exp $
 +docdir = $(prefix)/share/doc/html/${PACKAGE}
  
  doc_DATA = \
- contrib.html \
+ license.htm
diff --git a/lang/jikes/patches/patch-ac b/lang/jikes/patches/patch-ac
new file mode 100644
index 00000000000..e4e970e008e
--- /dev/null
+++ b/lang/jikes/patches/patch-ac
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1 2001/05/16 10:05:36 agc Exp $
+
+--- src/double.h	2001/05/16 08:56:03	1.1
++++ src/double.h	2001/05/16 08:56:55
+@@ -61,6 +61,8 @@
+ #ifndef Double_INCLUDED
+ #define Double_INCLUDED
+ 
++#include <sys/param.h>
++
+ #include "platform.h"
+ #include "long.h"
+ 
+@@ -112,7 +114,9 @@
+         POS_ZERO   = 0x00000000, // 0.0
+         NEG_INF    = 0xFF800000, // -Inf
+         POS_INF    = 0x7F800000, // +Inf
++#if !(defined(BSD) && BSD >= 199506)
+         NAN        = 0x7FC00000, // canonical NaN
++#endif
+         BYTE_MASK  = 0x000000FF, // mask off least significant byte
+         MAX_INT    = 0x7FFFFFFF, // maximum integer
+         MIN_INT    = 0x80000000, // minimum integer
diff --git a/lang/jikes/pkg/PLIST b/lang/jikes/pkg/PLIST
index e8955e2113d..d4ba070056a 100644
--- a/lang/jikes/pkg/PLIST
+++ b/lang/jikes/pkg/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2000/12/19 09:24:17 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/05/16 10:05:36 agc Exp $
 bin/jikes
 man/man1/jikes.1
-share/doc/html/jikes/contrib.html
-share/doc/html/jikes/jikes.gif
-share/doc/html/jikes/jikes.html
 share/doc/html/jikes/license.htm
-share/doc/html/jikes/news.html
 @dirrm share/doc/html/jikes