diff options
| -rw-r--r-- | lang/jamvm/Makefile | 5 | ||||
| -rw-r--r-- | lang/jamvm/PLIST | 3 | ||||
| -rw-r--r-- | lang/jamvm/distinfo | 11 | ||||
| -rw-r--r-- | lang/jamvm/patches/patch-aa | 53 | ||||
| -rw-r--r-- | lang/jamvm/patches/patch-bsdosc | 14 |
5 files changed, 49 insertions, 37 deletions
diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile index dc4b5c6bd44..a81bfc50bf7 100644 --- a/lang/jamvm/Makefile +++ b/lang/jamvm/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2006/05/21 15:43:09 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2007/06/05 14:08:43 rillig Exp $ # -DISTNAME= jamvm-1.4.2 -PKGREVISION= 1 +DISTNAME= jamvm-1.4.5 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=jamvm/} diff --git a/lang/jamvm/PLIST b/lang/jamvm/PLIST index 7845a78b5af..c498a2cb167 100644 --- a/lang/jamvm/PLIST +++ b/lang/jamvm/PLIST @@ -1,7 +1,8 @@ -@comment $NetBSD: PLIST,v 1.2 2006/05/21 15:43:09 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2007/06/05 14:08:43 rillig Exp $ bin/jamvm-java java/jamvm/bin/jamvm java/jamvm/include/jni.h +java/jamvm/lib/libjvm.la java/jamvm/share/jamvm/classes.zip @dirrm java/jamvm/share/jamvm @dirrm java/jamvm/share diff --git a/lang/jamvm/distinfo b/lang/jamvm/distinfo index 4e304679fa8..4ff8ce1462f 100644 --- a/lang/jamvm/distinfo +++ b/lang/jamvm/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.3 2006/05/16 21:33:03 tonio Exp $ +$NetBSD: distinfo,v 1.4 2007/06/05 14:08:43 rillig Exp $ -SHA1 (jamvm-1.4.2.tar.gz) = cfda95e52261d58e535a0c8ec03878304e9560c7 -RMD160 (jamvm-1.4.2.tar.gz) = ca9d26f90dd04e5aaefb1c33dda59a4f41456e31 -Size (jamvm-1.4.2.tar.gz) = 285593 bytes -SHA1 (patch-aa) = 4de74aaee822305f09ae4c0402f82715c8f216b4 +SHA1 (jamvm-1.4.5.tar.gz) = ad22e8eedf375230eae2917660c09c9063ffafd8 +RMD160 (jamvm-1.4.5.tar.gz) = 63221c64e285349494f9a3166dce7e2a58381a55 +Size (jamvm-1.4.5.tar.gz) = 547407 bytes +SHA1 (patch-aa) = e6cb00c963d82dd0617fb20e1e8a35527d891dd6 +SHA1 (patch-bsdosc) = ac223f74472ec6e9ed69cef04a0d343aa942e8de diff --git a/lang/jamvm/patches/patch-aa b/lang/jamvm/patches/patch-aa index 944b72ce6e7..730907db37f 100644 --- a/lang/jamvm/patches/patch-aa +++ b/lang/jamvm/patches/patch-aa @@ -1,36 +1,33 @@ -$NetBSD: patch-aa,v 1.2 2006/05/16 21:33:03 tonio Exp $ +$NetBSD: patch-aa,v 1.3 2007/06/05 14:08:43 rillig Exp $ ---- configure.orig 2006-01-18 11:08:36.000000000 +0100 -+++ configure -@@ -1943,19 +1943,25 @@ host_os=`echo $ac_cv_host | sed 's/^\([^ - - - case "$host" in --i[456]86-*-linux*) host_cpu=i386 host_os=linux ;; --i[456]86-*-kfreebsd*) host_cpu=i386 host_os=linux ;; -+i[3456]86-*-linux*) host_cpu=i386 host_os=linux ;; -+i[3456]86-*-kfreebsd*) host_cpu=i386 host_os=linux ;; - i386-*-openbsd*) host_os=linux libdl_needed=no ;; - i386-*-freebsd*) host_os=linux libdl_needed=no ;; -+i386-*-netbsd*) host_os=linux libdl_needed=no ;; -+i386-*-dragonfly*) host_os=linux libdl_needed=no ;; +--- configure.orig 2007-02-05 04:23:22.000000000 +0100 ++++ configure 2007-06-05 16:03:18.000000000 +0200 +@@ -2029,18 +2029,24 @@ i[3456]86-*-kfreebsd*) host_cpu=i386 hos + i[3456]86-*-darwin*) host_cpu=i386 host_os=darwin ;; + i386-*-openbsd*) host_os=bsd libdl_needed=no ;; + i386-*-freebsd*) host_os=bsd libdl_needed=no ;; ++i386-*-netbsd*) host_os=bsd libdl_needed=no ;; ++i386-*-dragonfly*) host_os=bsd libdl_needed=no ;; x86_64-*-linux*) host_os=linux ;; - amd64-*-openbsd*) host_os=linux libdl_needed=no ;; - amd64-*-freebsd*) host_os=linux libdl_needed=no ;; -+amd64-*-netbsd*) host_os=linux libdl_needed=no ;; -+amd64-*-dragonfly*) host_os=linux libdl_needed=no ;; + hppa*-*-linux*) host_cpu=parisc host_os=linux ;; + mipsel-*-linux*) host_cpu=mips host_os=linux ;; + amd64-*-openbsd*) host_os=bsd libdl_needed=no ;; + amd64-*-freebsd*) host_os=bsd libdl_needed=no ;; ++amd64-*-netbsd*) host_os=bsd libdl_needed=no ;; ++amd64-*-dragonfly*) host_os=bsd libdl_needed=no ;; arm*-*-linux*) host_cpu=arm host_os=linux ;; - arm*-*-openbsd*) host_cpu=arm host_os=linux libdl_needed=no ;; - arm*-*-freebsd*) host_cpu=arm host_os=linux libdl_needed=no ;; -+arm*-*-netbsd*) host_cpu=arm host_os=linux libdl_needed=no ;; + arm*-*-openbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;; + arm*-*-freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;; ++arm*-*-netbsd*) host_cpu=arm host_os=bsd libdl_needed=no ;; powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;; - powerpc*-*-openbsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;; - powerpc*-*-freebsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;; -+powerpc*-*-netbsd*) host_cpu=powerpc host_os=linux libdl_needed=no ;; + powerpc*-*-openbsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;; + powerpc*-*-freebsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;; powerpc-*-darwin*) host_os=darwin ;; ++powerpc*-*-netbsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;; *) { { echo "$as_me:$LINENO: error: $host not supported" >&5 echo "$as_me: error: $host not supported" >&2;} -@@ -1984,7 +1990,7 @@ if test "${enable_int_caching+set}" = se + { (exit 1); exit 1; }; } ;; +@@ -2177,7 +2183,7 @@ if test "${enable_int_caching+set}" = se enableval="$enable_int_caching" else @@ -39,7 +36,7 @@ $NetBSD: patch-aa,v 1.2 2006/05/16 21:33:03 tonio Exp $ enable_int_caching=no fi fi; -@@ -3289,13 +3295,13 @@ done +@@ -20751,13 +20757,13 @@ done @@ -56,7 +53,7 @@ $NetBSD: patch-aa,v 1.2 2006/05/16 21:33:03 tonio Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -3358,7 +3364,7 @@ if test $ac_cv_lib_pthread_pthread_self +@@ -20820,7 +20826,7 @@ if test $ac_cv_lib_pthread_pthread_self #define HAVE_LIBPTHREAD 1 _ACEOF diff --git a/lang/jamvm/patches/patch-bsdosc b/lang/jamvm/patches/patch-bsdosc new file mode 100644 index 00000000000..01cc9abb96d --- /dev/null +++ b/lang/jamvm/patches/patch-bsdosc @@ -0,0 +1,14 @@ +$NetBSD: patch-bsdosc,v 1.1 2007/06/05 14:08:44 rillig Exp $ + +Needed for NetBSD 3.0. + +--- src/os/bsd/os.c.orig 2007-01-12 01:20:14.000000000 +0100 ++++ src/os/bsd/os.c 2007-06-05 16:01:18.000000000 +0200 +@@ -24,6 +24,7 @@ + #include <stdlib.h> + #include <dlfcn.h> + #include <sys/types.h> ++#include <sys/param.h> + #include <sys/sysctl.h> + #include <pthread.h> + |