diff options
-rw-r--r-- | lang/jamvm/Makefile | 6 | ||||
-rw-r--r-- | lang/jamvm/PLIST | 3 | ||||
-rw-r--r-- | lang/jamvm/distinfo | 10 | ||||
-rw-r--r-- | lang/jamvm/patches/patch-aa | 46 |
4 files changed, 31 insertions, 34 deletions
diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile index a81bfc50bf7..4879b57d367 100644 --- a/lang/jamvm/Makefile +++ b/lang/jamvm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.6 2007/06/05 14:08:43 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2008/09/07 06:41:44 dholland Exp $ # -DISTNAME= jamvm-1.4.5 +DISTNAME= jamvm-1.5.1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=jamvm/} @@ -9,6 +9,8 @@ MAINTAINER= pancake@phreaker.net HOMEPAGE= http://jamvm.sourceforge.net/ COMMENT= Compact Java Virtual Machine +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= classpath>=0.19:../../lang/classpath GNU_CONFIGURE= yes diff --git a/lang/jamvm/PLIST b/lang/jamvm/PLIST index c498a2cb167..387cc60ad0e 100644 --- a/lang/jamvm/PLIST +++ b/lang/jamvm/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.3 2007/06/05 14:08:43 rillig Exp $ +@comment $NetBSD: PLIST,v 1.4 2008/09/07 06:41:44 dholland Exp $ bin/jamvm-java java/jamvm/bin/jamvm java/jamvm/include/jni.h java/jamvm/lib/libjvm.la +java/jamvm/lib/rt.jar 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 4ff8ce1462f..94b136bcaf0 100644 --- a/lang/jamvm/distinfo +++ b/lang/jamvm/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2007/06/05 14:08:43 rillig Exp $ +$NetBSD: distinfo,v 1.5 2008/09/07 06:41:44 dholland Exp $ -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 (jamvm-1.5.1.tar.gz) = fc2707aac5977e5423fd79ee61b9fe7611e34cb7 +RMD160 (jamvm-1.5.1.tar.gz) = 78ecf51bff6e67b3e6debd8c1294432b19f4e0d1 +Size (jamvm-1.5.1.tar.gz) = 599084 bytes +SHA1 (patch-aa) = 997b09e5a4e4bc5694b272a8d70e8f5e48ed5594 SHA1 (patch-bsdosc) = ac223f74472ec6e9ed69cef04a0d343aa942e8de diff --git a/lang/jamvm/patches/patch-aa b/lang/jamvm/patches/patch-aa index 730907db37f..1263e8841c9 100644 --- a/lang/jamvm/patches/patch-aa +++ b/lang/jamvm/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.3 2007/06/05 14:08:43 rillig Exp $ +$NetBSD: patch-aa,v 1.4 2008/09/07 06:41:44 dholland Exp $ ---- 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 ;; +--- configure~ 2008-03-01 23:16:07.000000000 -0500 ++++ configure 2008-09-07 02:34:29.000000000 -0400 +@@ -2549,17 +2549,25 @@ i[3456]86-*-darwin*) host_cpu=i386 host_ + arm*-*-darwin*) host_cpu=arm host_os=darwin libdl_needed=no ;; i386-*-openbsd*) host_os=bsd libdl_needed=no ;; i386-*-freebsd*) host_os=bsd libdl_needed=no ;; +i386-*-netbsd*) host_os=bsd libdl_needed=no ;; @@ -11,39 +11,33 @@ $NetBSD: patch-aa,v 1.3 2007/06/05 14:08:43 rillig Exp $ x86_64-*-linux*) host_os=linux ;; 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 ;; +-amd64-*-openbsd*) host_os=bsd libdl_needed=no ;; +-amd64-*-freebsd*) host_os=bsd libdl_needed=no ;; ++x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;; ++x86_64-*-freebsd*) host_os=bsd libdl_needed=no ;; ++x86_64-*-netbsd*) host_os=bsd libdl_needed=no ;; ++x86_64-*-dragonfly*) host_os=bsd libdl_needed=no ;; arm*-*-linux*) host_cpu=arm host_os=linux ;; 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 ;; ++arm*-*-dragonfly*) host_cpu=arm host_os=bsd libdl_needed=no ;; powerpc*-*-linux*) host_cpu=powerpc host_os=linux ;; 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 ;; ++powerpc*-*-dragonfly*) host_cpu=powerpc host_os=bsd libdl_needed=no ;; + powerpc-*-darwin*) host_os=darwin ;; *) { { echo "$as_me:$LINENO: error: $host not supported" >&5 echo "$as_me: error: $host not supported" >&2;} - { (exit 1); exit 1; }; } ;; -@@ -2177,7 +2183,7 @@ if test "${enable_int_caching+set}" = se - enableval="$enable_int_caching" - - else -- if test "$host_cpu" == i386; then -+ if test "$host_cpu" = i386; then - enable_int_caching=no - fi - fi; -@@ -20751,13 +20757,13 @@ done +@@ -20707,13 +20715,13 @@ done --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 +-{ 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; } if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -53,7 +47,7 @@ $NetBSD: patch-aa,v 1.3 2007/06/05 14:08:43 rillig Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -20820,7 +20826,7 @@ if test $ac_cv_lib_pthread_pthread_self +@@ -20773,7 +20781,7 @@ if test $ac_cv_lib_pthread_pthread_self #define HAVE_LIBPTHREAD 1 _ACEOF |