Update to jikes-0.45. Still need a better master site.

3 files changed, 31 insertions, 68 deletions

diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index cf9b656395f8..e9cf112be551 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -3,44 +3,20 @@
 # Date created:         09 December 1998
 # Whom:                 Matthew Dillon <dillon@backplane.com>
 #
-# UNOFFICIAL PATCH SOURCES:
-#	ftp://ftp.crocodile.org/pub/jikes/
-#		maintained by Vadim Zaliva
-#
-# PATCH INFO:	(note: patches had to be regenerated, the patch files in
-#		patches/ are not exactly the same as the ftp source)
-#
-#	patches/patch-aa
-#	    patch to compile under FreeBSD (local)
-#
-#	patches/patch-ab
-#	    ftp://ftp.crocodile.org/pub/jikes/divide0.patch
-#
-#	patches/patch-ac
-#	    ftp://ftp.crocodile.org/pub/jikes/jikes-0.41-warnings1.patch
-#
-#	patches/patch-ad
-#	    ftp://ftp.crocodile.org/pub/jikes/jikes-array-clone.patch
-#
-#	(solaris compiler patch not required)
-#	    ftp://ftp.crocodile.org/pub/jikes/jikes-solaris2.6-gcc2.8.1.patch
-#
-#	patches/patch-ae
-#	    ftp://ftp.crocodile.org/pub/jikes/jikes.makedepend.patch
-#
-# $Id: Makefile,v 1.6 1998/12/22 08:05:33 asami Exp $
+# $Id: Makefile,v 1.7 1998/12/23 13:13:21 asami Exp $
 #
 
-DISTNAME=	jikes-0.41
+DISTNAME=	jikes-0.45
 CATEGORIES=	lang
-MASTER_SITES=	http://www.backplane.com/FreeBSDPorts/
+MASTER_SITES=	ftp://ftp.whistle.com/pub/archie/misc/
 
 MAINTAINER=	dillon@backplane.com
 
-WRKSRC=		${WRKDIR}/jikesos
+WRKSRC=		${WRKDIR}/jikes
 MAN1=		jikes.1
 MAKE_ENV=	FILESDIR=${FILESDIR}
 SCRIPTS_ENV=	FILESDIR=${FILESDIR} PKGDIR=${PKGDIR}
+PATCH_STRIP=	-p1
 
 # 	(sufficiently handled by pkg/MESSAGE, but if IBM has an issue then
 #	uncomment this section)
diff --git a/java/jikes/distinfo b/java/jikes/distinfo
index 7a1ad93f57a7..47c037ca56a5 100644
--- a/java/jikes/distinfo
+++ b/java/jikes/distinfo
@@ -1 +1 @@
-MD5 (jikes-0.41.tar.gz) = 95467d78436f6f2fa19cbe10e628117e
+MD5 (jikes-0.45.tar.gz) = 46a35451ced4937d9a75fa97b22f9d74
diff --git a/java/jikes/files/patch-aa b/java/jikes/files/patch-aa
index 649e3bf7b552..34abbf61b9d3 100644
--- a/java/jikes/files/patch-aa
+++ b/java/jikes/files/patch-aa
@@ -1,38 +1,25 @@
-*** jikes/src/Makefile.orig	Wed Dec  9 21:59:34 1998
---- jikes/src/Makefile	Wed Dec  9 22:02:10 1998
-***************
-*** 131,136 ****
---- 131,152 ----
-  O=o
-  SYSOBJECTS=
-  
-+ # g++ definitions (FreeBSD)
-+ CC=g++
-+ # use -W to see warnings (should review from time to time)
-+ CCREQUIREDFLAGS=-DGNU_LIBC5 -DUNIX -funsigned-char  -c -DTYPE_bool -ansi -I.
-+ CCDEBUGFLAGS=-DTEST -g
-+ CCOPTFLAGS=-O2
-+ CCFLAGS=$(CCREQUIREDFLAGS) $(CCDEBUGFLAGS)
-+ CCFLAGS=$(CCREQUIREDFLAGS) $(CCOPTFLAGS)
-+ ERASE=rm -f
-+ EXECUTABLE=jikes
-+ LD=g++
-+ LDDEBUGFLAGS=-g
-+ LDFLAGS=-L. -o$(EXECUTABLE)
-+ O=o
-+ SYSOBJECTS=
-+ 
-  
-  OBJECTS=jikes.$(O) scanner.$(O) code.$(O) zip.$(O) unzip.$(O) ast.$(O) diagnose.$(O) \
-  	parser.$(O) lpginput.$(O) lcase.$(O) javaact.$(O) error.$(O) set.$(O) symbol.$(O) \
---- jikes/src/jikes.cpp.orig	Tue Dec 15 21:46:33 1998
-+++ jikes/src/jikes.cpp	Tue Dec 15 21:47:17 1998
-@@ -75,7 +75,7 @@
-              << "+U                 do full dependence check including Zip and Jar files\n"
-              << "+V                 generate veracious listing\n"
-              << "+Z                 treat cautions as errors\n"
--             << "\nVersion 0.41 (01 Dec 98)"
-+             << "\nVersion 0.41-FreeBSD-ae (15 Dec 98)"
-              << " by Philippe Charles and David Shields, IBM Research.\n";
-         cerr << "Please report problems to shields@watson.ibm.com.\n" ;
-     cerr << "or via browser at http://www.ibm.com/research/jikes\n";
+diff -ur jikes.orig/src/Makefile work/jikes/src/Makefile
+--- jikes.orig/src/Makefile	Thu Feb 25 07:10:47 1999
++++ work/jikes/src/Makefile	Sun Feb 28 14:40:16 1999
+@@ -215,6 +215,21 @@
+ O=o
+ SYSOBJECTS=
+ 
++# g++ definitions (FreeBSD)
++CC=g++
++# use -W to see warnings (should review from time to time)
++CCREQUIREDFLAGS=-DGNU_LIBC5 -DIEEE_DIV_0 -DNO_WCHAR_H -DUNIX -funsigned-char  -c -DTYPE_bool -ansi -I.
++CCDEBUGFLAGS=-DTEST -g
++CCOPTFLAGS=-O2
++CCFLAGS=$(CCREQUIREDFLAGS) $(CCDEBUGFLAGS)
++CCFLAGS=$(CCREQUIREDFLAGS) $(CCOPTFLAGS)
++ERASE=rm -f
++EXECUTABLE=jikes
++LD=g++
++LDDEBUGFLAGS=-g
++LDFLAGS=-L. -o$(EXECUTABLE)
++O=o
++SYSOBJECTS=
+ 
+ OBJECTS=jikes.$(O) scanner.$(O) code.$(O) zip.$(O) unzip.$(O) ast.$(O) diagnose.$(O) \
+ 	parser.$(O) lpginput.$(O) javaact.$(O) error.$(O) set.$(O) symbol.$(O) \