Update to sablevm 1.13

This fixes PR pkg/30022

(selected parts of changelog)
* Version 1.13
- Updated the class library to the GNU Classpath 0.19 release.
- Fixed internal libffi on ia64.
- Fixed possible interpeter crashes on ia64.
- Other small bugfixes.
* Version 1.12
- Fixed write barriers for generational garbage collector.
- Imported GNU Classpath 0.16 release (plus later fixes).
- Disabled inlined engine on alpha.
- Added jar-sablevm wrapper for fastjar.
- Fixed NaN -> int conversion.
- Improved AIX support.
- Improved Cygwin support (but not in SableVM SDK).
* Version 1.11
- Fixed many important bugs of version 1.1.10.
- Imported GNU Classpath CVS snapshot as of March 12, 2005.
- Added assertions to check that the env pointer is valid in JNI calls.
- Implemented non-blocking locking, and used it to solve a hashcode bug.
- Solved many subtle bugs resulting in incompletely initialized
  threads and stack corruption.
- Added creation of rt.jar symlink to libclasspath.jar.
* Version 1.1.10
- Imported the code of GNU Classpath 0.14.
- Implemented most of the missing JNI 1.2 functions.
- Implemented the new JNI 1.4 nio related functions.
- Fixed the java-sablevm wrapper to better handle LD_LIBRARY_PATH,
  -Djava.library.path and CLASSPATH setting.
- Disabled the timezone setting in java-sablevm wrapper - classpath
  should now do it on its own.
- Fixed Object.wait() when timeout is specified.  This fixes Ant pauses.
- Changed _svmm_fatal_error() to actually print the function name,
  when possible.
- Added thread IDs to verbose instruction output
- Implemented Java_java_lang_VMRuntime_[free|total|max]Memory().
- Implemented basic JDK home support.
- Fixed various bugs.
* Version 1.1.9
- Added the necessary support to run both Eclipse 2 and Eclipse 3
  without using external libraries.  Instructions are available
  at http://sablevm.org/wiki/Eclipse .
- Merged code from GNU Classpath 0.13 release.
- Improved error messages related to exceptions at bootstrap (ie.
  binding to non-existant native methods).
- Implemented some missing JNI functions.
- Added some missing system-dependant Java properties.
- Enabled "real life brokenness" option by default to better handle
  native code not adhering to the Java specs.
- Improved cross-compiliation support.
* Version 1.1.8
- Imported a new GNU Classpath CVS snapshot as of December 28, 2004.
- Implemented some missing JNI functions needed by qt/java.
- Set BOOTCLASSPATH in java-sablevm to help jikes find our libs.
- Wrapped the exception thrown by a constructor or a method invoked
  through reflection in an InvocationTargetException instance.
- Added ProtectionDomain handling for classes loaded via j.l.ClassLoader.
- Started to use URLClassLoader instead of gnu.j.l.SystemClassLoader,
  which apparently was used by us exclusively.
- Enabled GCC unused and long-long warnings, then fixed tons of warnings.
- Implemented [Get|Release]PrimitiveArrayCritical.
- Solved a class loading related deadlock.
- Fixed a VMThread.sleep bug.
- Passed the class name as a parameter to LinkageError and
  ClassCircularityError in java.lang.ClassLoader.
- Added function name as message to UnsatisfiedLinkError for missing
  native functions.
* Version 1.1.7
- Imported new GNU Classpath CVS snapshot as of Sun Oct 10 18:00:00 UTC 2004.
- Added handling of Jar/Zip files on boot classpath (closes BUG:2).
- Provided user-friendly failure messages for bootstrap problems.  This
  should get rid of the hated "sablevm: cannot create vm".
- Allowed for multiple elements and prepending/appending to boot class path.
- Added --with-profiling switch to make most functions non-"static".
- Made sablevm-classpath install its files in more standard locations.
- Explicitely disallowed compilation of classpath with gcj or kjc (it
  never worked reliably).
- Made jikes and gcc be less verbose by default (to avoid confusion).
- Removed some obsolete code from various places.
- Added new Generational Garbage Collector ("experimental", available on
  request, by passing --with-gc=gencopy to configure).
- Made several bugfixes of:
  - JNI methods not returning NULL on errors (closes BUG:12).
  - IsInstanceOf always returning JNI_FALSE (closes BUG:63).
  - A copy&paste mistake in PopLocalFrame (closes BUG:62).
  - Several JNI methods not returning NULL on errors (closes BUG:12).
  - IsInstanceOf always returning JNI_FALSE (closes BUG:63).
  - "New array" memory allocation size overflow (closes BUG:8).
  - Out-of-source builds (closes BUG:55).
  - Handling of 'double' values on ARM.
  - FPU in 64-bit precision mode on Linux / Intel x86 (closes BUG:1).
  - F2L, F2I, D2L, D2I not checking for overflows (closes BUG:54).
  - SIGPIPE killing the VM (closes BUG:51).
  - GNU make detection on non-GNU/Linux platforms.
  - Case-insensitive grepping for "Main-Class:" string in MANIFEST.MF.
* Version 1.1.6
- Synchronized sablevm-classpath with the latest GNU Classpath CVS
  (post 0.10 release) as of July 10, 2004.
- Improved AWT and Swing support.
- Added additional checks to autogen.sh for FreeBSD.
- Added new DecoderUS_ASCII, Spring and SpringLayout classes.
- Added a sablevm.verbose.synchronization (DEBUG) option to help
  debugging deadlocks.
- Improved TimeZone handling.
- Added useful additional information in stack dumps.
* Version 1.1.5
- Synchronized sablevm-classpath with the latest GNU Classpath CVS as of May 29, 2004.
- Improved the support for Ant 1.6.
- Switched to libtool handling to find the right library suffixes.
  This helps some platforms like OpenBSD and Cygwin.
- Fixed a corner case problem with class loading.
- Made some other small bug fixes.
* Version 1.1.4
- Updated sablevm-classpath with the recent GNU Classpath 0.09 release
  and later GNU Classpath CVS changes as of May 4, 2004.
- Improved support for AWT and Swing.
- Eliminated the dependency lt_dlopen(NULL) which seem broken on some
  platforms such as Cygwin and some *BSD.
- Switched to new, complete implementation of VMProcess/Process from
  GNU Classpath instead of using our own previous partial
  implementation.
- Added x86_64 (AMD64) support to the already supported 8 other
  architectures of Debian GNU/Linux (alpha, hppa, i386, ia64, m68k,
  powerpc, s390, sparc).  The support for the remaining mips and
  mipsel architectures of Debian is apparently implemented but it has
  not yet been confirmed.
- Improved autodetection of build parameters on non-GNU/Linux systems.
  This includes selection of dynamic libraries, availability of m4
  preprocessor and auto-disabling "signals for exceptions" on
  platforms that don't seem to support signals.

5 files changed, 38 insertions, 40 deletions

diff --git a/lang/sablevm/Makefile b/lang/sablevm/Makefile
index a6dd921077f..83ee60142c8 100644
--- a/lang/sablevm/Makefile
+++ b/lang/sablevm/Makefile
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.15 2006/03/02 18:47:22 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/15 22:20:02 tonio Exp $
 #
 
-DISTNAME=	sablevm-1.1.3
-PKGREVISION=	8
+DISTNAME=	sablevm-1.13
 CATEGORIES=	lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sablevm/} \
-		http://devel.sablevm.org/download/1.1.3/
+MASTER_SITES=	http://sablevm.org/download/release/1.13/
 
 MAINTAINER=	pancake@phreaker.net
 HOMEPAGE=	http://www.sablevm.org/
 COMMENT=	SableVM free Java virtual machine
 
 DEPENDS+=	unzip>=5.50:../../archivers/unzip
-DEPENDS+=	sablevm-classpath-1.1.3nb4:../../lang/sablevm-classpath
+DEPENDS+=	sablevm-classpath-1.13:../../lang/sablevm-classpath
 
 GNU_CONFIGURE=		yes
 GNU_CONFIGURE_PREFIX=	${JAVA_HOME}
@@ -23,12 +21,12 @@ USE_LIBTOOL=		yes
 
 JAVA_NAME=		sablevm
 JAVA_HOME=		${PREFIX}/java/sablevm
-JAVA_WRAPPERS=		java
+JAVA_WRAPPERS+=		java
 JAVA_WRAPPER_BIN.java=	${JAVA_HOME}/bin/sablevm
 
-PRINT_PLIST_AWK+=	/^@dirrm java\/sablevm$$/ \
-				{ print "@comment in sablevm-classpath: " $$0; \
-				  next; }
+PRINT_PLIST_AWK+=     /^@dirrm java\/sablevm$$/ \
+			{ print "@comment in sablevm-classpath: " $$0; \
+				next; }
 
 BUILDLINK_PASSTHRU_RPATHDIRS+=	${JAVA_HOME}/lib
 
@@ -37,6 +35,7 @@ LDFLAGS+=	-lsemaphore
 BUILDLINK_TRANSFORM+=	l:rt:semaphore
 .include "../../devel/pthread-sem/buildlink3.mk"
 .endif
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
diff --git a/lang/sablevm/PLIST b/lang/sablevm/PLIST
index a53dd80d7d3..3c0aac0b9bd 100644
--- a/lang/sablevm/PLIST
+++ b/lang/sablevm/PLIST
@@ -1,17 +1,30 @@
-@comment $NetBSD: PLIST,v 1.5 2005/11/04 13:44:37 tonio Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/04/15 22:20:02 tonio Exp $
 bin/sablevm-java
+java/sablevm/bin/jar-sablevm
 java/sablevm/bin/java-sablevm
+java/sablevm/bin/javac-sablevm
 java/sablevm/bin/sablevm
 java/sablevm/include/jni.h
 java/sablevm/include/jni_system_specific.h
 java/sablevm/lib/libsablevm.la
-man/man1/java-sablevm.1
-man/man1/sablevm.1
+java/sablevm/lib/sablevm/bin/jar
+java/sablevm/lib/sablevm/bin/java
+java/sablevm/lib/sablevm/bin/javac
+java/sablevm/lib/sablevm/bin/jdb
+java/sablevm/lib/sablevm/include/jni.h
+java/sablevm/lib/sablevm/include/jni_system_specific.h
+java/sablevm/lib/sablevm/jre/bin
 java/sablevm/share/sablevm/AUTHORS
 java/sablevm/share/sablevm/LGPL-2.1
 java/sablevm/share/sablevm/LICENSE
+man/man1/java-sablevm.1
+man/man1/sablevm.1
 @dirrm java/sablevm/share/sablevm
-@dirrm java/sablevm/man
+@dirrm java/sablevm/share
+@dirrm java/sablevm/lib/sablevm/jre
+@dirrm java/sablevm/lib/sablevm/include
+@dirrm java/sablevm/lib/sablevm/bin
+@dirrm java/sablevm/lib/sablevm
 @dirrm java/sablevm/lib
 @dirrm java/sablevm/include
 @dirrm java/sablevm/bin
diff --git a/lang/sablevm/distinfo b/lang/sablevm/distinfo
index 330a84b3737..6af7cdfae04 100644
--- a/lang/sablevm/distinfo
+++ b/lang/sablevm/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/01/11 23:19:56 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/04/15 22:20:02 tonio Exp $
 
-SHA1 (sablevm-1.1.3.tar.gz) = 7b38a3c12a1ddc7fe5eae37207d8b4b44412c050
-RMD160 (sablevm-1.1.3.tar.gz) = 3a172d3513ad5298457ab8bc77728beafd7d9311
-Size (sablevm-1.1.3.tar.gz) = 654232 bytes
-SHA1 (patch-aa) = b0fa698bd8107a2a65838bc80e056d0cef20e73c
-SHA1 (patch-ab) = 325eadfa78f44c4db674482218757feca39d0fad
+SHA1 (sablevm-1.13.tar.gz) = 153b403ca8a9d3a96c2a48ac0e25a4e5e7f05cfd
+RMD160 (sablevm-1.13.tar.gz) = b7ea39bf5437d4bd986ce0e3a016f2b6e0e7e173
+Size (sablevm-1.13.tar.gz) = 1336864 bytes
+SHA1 (patch-aa) = c7927b22b4294c8d2f31c3a5b99e7179a1faa396
diff --git a/lang/sablevm/patches/patch-aa b/lang/sablevm/patches/patch-aa
index 3ee08b74ad0..783090dcd52 100644
--- a/lang/sablevm/patches/patch-aa
+++ b/lang/sablevm/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2006/01/11 23:19:56 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2006/04/15 22:20:02 tonio Exp $
 
---- configure.orig	2006-01-11 22:37:08.000000000 +0000
+--- configure.orig	2005-12-07 18:56:07.000000000 +0100
 +++ configure
-@@ -19678,13 +19678,13 @@ else
-   echo ***ERROR: libpopt is missing; exit 1
- fi
- 
--echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5
+@@ -19967,13 +19967,13 @@ case $host in
+ 	*-freebsd*)
+ 	    	    ;;
+ 	*)
+-	    echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5
 -echo $ECHO_N "checking for pthread_self in -lpthread... $ECHO_C" >&6
 +echo "$as_me:$LINENO: checking for pthread_self in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
 +echo $ECHO_N "checking for pthread_self in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
diff --git a/lang/sablevm/patches/patch-ab b/lang/sablevm/patches/patch-ab
deleted file mode 100644
index aacaa5620c0..00000000000
--- a/lang/sablevm/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/01/11 23:19:56 joerg Exp $
-
---- src/libsablevm/Makefile.in.orig	2006-01-11 23:05:18.000000000 +0000
-+++ src/libsablevm/Makefile.in
-@@ -341,7 +341,7 @@ noinst_HEADERS = \
- 	util.m4.c \
- 	vm_args.m4.c
- 
--libsablevm_la_LIBADD = -lpthread -lm -lffi -lltdl -lrt
-+libsablevm_la_LIBADD = -lm -lffi -lltdl ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
- libsablevm_la_LDFLAGS = -release @LIBRELEASE@
- INCLUDES = \
- 	-I$(srcdir)/include -I$(srcdir)/inlinability \