cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.5.4 and remove MAINTAINER as requested.

Browse Source 
From Brad <brad@comstyle.com> and Amit Kulkarni <amitkulz@gmail.com>
This commit is contained in:
kurt 2011-09-23 23:39:57 +00:00
parent 378c061449
commit bc70758475
9 changed files with 76 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lang/jamvm/Makefile
View File

@ -1,43 +1,48 @@
# $OpenBSD: Makefile,v 1.14 2011/03/08 09:36:04 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2011/09/23 23:39:57 kurt Exp $
ONLY_FOR_ARCHS= arm amd64 i386 powerpc
ONLY_FOR_ARCHS= amd64 arm i386 powerpc sparc64
COMMENT= free, standards-compliant jvm with a small footprint
DISTNAME= jamvm-1.5.3
REVISION= 0
DISTNAME= jamvm-1.5.4
CATEGORIES= lang java
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=jamvm/}
SHARED_LIBS= jvm 0.0
HOMEPAGE= http://jamvm.sourceforge.net/
MAINTAINER= Frederick C. Druseikis <fdruseikis@sc.edu>
# GPL 2
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
USE_GMAKE= Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
WANTLIB= c m pthread z
USE_LIBTOOL= Yes
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
WANTLIB+= ffi
BUILD_DEPENDS= lang/jikes>=1.22
BUILD_DEPENDS+= lang/classpath>=0.98
LIB_DEPENDS= devel/libffi
.endif
RUN_DEPENDS= lang/classpath>=0.98
BUILD_DEPENDS= lang/jikes>=1.22 \
lang/classpath>=0.98
WANTLIB= c m z pthread
RUN_DEPENDS= lang/classpath>=0.98
CONFIGURE_ARGS+= --with-classpath-install-dir=${LOCALBASE}
CONFIGURE_ARGS+= --libdir=${LOCALBASE}/lib/jamvm
CONFIGURE_ARGS+= --includedir=${LOCALBASE}/include/jamvm
CONFIGURE_ARGS+= --disable-tls
USE_LIBTOOL= Yes
USE_GMAKE= Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --includedir=${LOCALBASE}/include/jamvm \
--libdir=${LOCALBASE}/lib/jamvm \
--with-classpath-install-dir=${LOCALBASE} \
--disable-tls
.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.endif
post-install:
@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share

10
lang/jamvm/distinfo
View File

@ -1,5 +1,5 @@
MD5 (jamvm-1.5.3.tar.gz) = zohhY2WNdIETsFcN+uEq6g==
RMD160 (jamvm-1.5.3.tar.gz) = Pei1vcVAddYLn2Y7JG+DbSVw2QM=
SHA1 (jamvm-1.5.3.tar.gz) = YGMJG9zvn5ZZh3BF9cRnq001CQI=
SHA256 (jamvm-1.5.3.tar.gz) = 8nlatiY13xybxsSnuQ9T0NhGwMJvXsezUvaHUGQH69g=
SIZE (jamvm-1.5.3.tar.gz) = 636313
MD5 (jamvm-1.5.4.tar.gz) = dlTpZXaR9fCcT0ge1Ghhdg==
RMD160 (jamvm-1.5.4.tar.gz) = eqKj0owNlTwNAEij+MSNwnSuEKA=
SHA1 (jamvm-1.5.4.tar.gz) = JoY8eNWw38waFJLSSvWNGSgxtRA=
SHA256 (jamvm-1.5.4.tar.gz) = eGVpNpi8QyLKvhAUpLfr3sG8Ha9F8aRFe26QikRGsSQ=
SIZE (jamvm-1.5.4.tar.gz) = 656283

48
lang/jamvm/patches/patch-configure
View File

@ -1,11 +1,37 @@
$OpenBSD: patch-configure,v 1.3 2009/07/22 00:31:57 kurt Exp $
--- configure.orig Mon Apr 13 21:06:12 2009
+++ configure Thu Jun 18 14:34:12 2009
@@ -2557,6 +2557,7 @@ i386-*-solaris*) host_cpu=x86 host_os=solaris ;;
x86_64-*-linux*) host_os=linux ;;
hppa*-*-linux*) host_cpu=parisc host_os=linux ;;
mipsel-*-linux*) host_cpu=mips host_os=linux ;;
+x86_64-*-openbsd*) host_os=bsd libdl_needed=no ;;
amd64-*-openbsd*) host_os=bsd libdl_needed=no ;;
amd64-*-freebsd*) host_os=bsd libdl_needed=no ;;
arm*-*-linux*) host_cpu=arm host_os=linux ;;
$OpenBSD: patch-configure,v 1.4 2011/09/23 23:39:57 kurt Exp $
--- configure.orig Thu Dec 31 13:41:44 2009
+++ configure Wed Sep 14 15:15:27 2011
@@ -2698,6 +2698,7 @@ powerpc*-*-openbsd*) host_cpu=powerpc host_os=bsd libd
powerpc*-*-freebsd*) host_cpu=powerpc host_os=bsd libdl_needed=no ;;
powerpc-*-darwin*) host_os=darwin ;;
sparc*-*-freebsd*) host_cpu=sparc host_os=bsd libdl_needed=no ;;
+sparc*-*-openbsd*) host_cpu=sparc host_os=bsd libdl_needed=no ;;
*) { { $as_echo "$as_me:$LINENO: error: $host not supported" >&5
$as_echo "$as_me: error: $host not supported" >&2;}
{ (exit 1); exit 1; }; } ;;
@@ -21329,13 +21330,13 @@ _ACEOF
else
-{ $as_echo "$as_me:$LINENO: checking for pthread_self in -lpthread" >&5
-$as_echo_n "checking for pthread_self in -lpthread... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking for pthread_self in -pthread" >&5
+$as_echo_n "checking for pthread_self in -pthread... " >&6; }
if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -21399,7 +21400,7 @@ if test "x$ac_cv_lib_pthread_pthread_self" = x""yes; t
#define HAVE_LIBPTHREAD 1
_ACEOF
- LIBS="-lpthread $LIBS"
+ LIBS="-pthread $LIBS"
else
{ { $as_echo "$as_me:$LINENO: error: libpthread is missing" >&5

11
lang/jamvm/patches/patch-src_hooks_c
View File

@ -1,13 +1,14 @@
$OpenBSD: patch-src_hooks_c,v 1.1 2009/06/16 15:37:46 kurt Exp $
--- src/hooks.c.orig Sat Feb 24 17:53:31 2007
+++ src/hooks.c Sat Apr 11 17:06:42 2009
@@ -29,8 +29,8 @@ void jam_fprintf(FILE *stream, const char *fmt, ...) {
$OpenBSD: patch-src_hooks_c,v 1.2 2011/09/23 23:39:57 kurt Exp $
--- src/hooks.c.orig Thu Dec 31 13:40:47 2009
+++ src/hooks.c Thu Sep 8 20:33:02 2011
@@ -29,8 +29,9 @@ void jam_fprintf(FILE *stream, const char *fmt, ...) {
va_start(ap, fmt);
(*vfprintf_hook)(stream, fmt, ap);
-
va_end(ap);
+ fflush(stream);
+
+ fflush(stream);
}
void jamvm_exit(int status) {

12
lang/jamvm/patches/patch-src_interp_engine_interp_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_interp_engine_interp_h,v 1.1 2009/07/22 00:31:57 kurt Exp $
--- src/interp/engine/interp.h.orig Sat Feb 21 22:05:48 2009
+++ src/interp/engine/interp.h Mon Jul 6 20:50:51 2009
@@ -37,7 +37,7 @@
#include <sys/param.h>
#endif
-#if (defined(BYTE_ORDER) && (BYTE_ORDER == BIG_ENDIAN)) || defined(_BIG_ENDIAN)
+#if (defined(BYTE_ORDER) && (BYTE_ORDER == BIG_ENDIAN)) || (!defined(BYTE_ORDER) && defined(_BIG_ENDIAN))
#define FLOAT_CONST(val) (uintptr_t)val << (sizeof(uintptr_t) * 8 - 32)
#else
#define FLOAT_CONST(val) val

14
lang/jamvm/patches/patch-src_interp_inlining_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_interp_inlining_c,v 1.1 2009/07/22 00:31:57 kurt Exp $
--- src/interp/inlining.c.orig Tue Jan 20 20:59:48 2009
+++ src/interp/inlining.c Fri Jun 19 12:07:26 2009
@@ -927,7 +927,9 @@ void inlineBlock(MethodBlock *mb, BasicBlock *block, T
inlineBlocks doesn't free the blocks as previously scanned
blocks may be inlined later */
- while(start != end->next) {
+ end = end->next;
+
+ while(start != end) {
BasicBlock *next = start->next;
sysFree(start->opcodes);

11
lang/jamvm/patches/patch-src_os_bsd_os_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_os_bsd_os_c,v 1.2 2009/06/16 15:37:46 kurt Exp $
--- src/os/bsd/os.c.orig Sat Feb 24 11:13:12 2007
+++ src/os/bsd/os.c Sun Mar 15 21:53:36 2009
@@ -23,6 +23,7 @@
#include <string.h>
#include <stdlib.h>
#include <dlfcn.h>
+#include <sys/param.h>
#include <sys/types.h>
#include <sys/sysctl.h>
#include <pthread.h>

11
lang/jamvm/patches/patch-src_thread_h
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_thread_h,v 1.1 2009/07/22 00:31:57 kurt Exp $
--- src/thread.h.orig Thu Jun 18 14:34:44 2009
+++ src/thread.h Thu Jun 18 14:35:06 2009
@@ -20,7 +20,6 @@
*/
#ifndef CREATING
-#include <alloca.h>
#include <pthread.h>
#include <setjmp.h>
#include <stdlib.h>

3
lang/jamvm/pkg/PLIST
View File

@ -1,10 +1,11 @@
@comment $OpenBSD: PLIST,v 1.4 2010/11/04 16:54:14 kurt Exp $
@comment $OpenBSD: PLIST,v 1.5 2011/09/23 23:39:57 kurt Exp $
@bin bin/jamvm
include/jamvm/
include/jamvm/jni.h
lib/jamvm/
lib/jamvm/libjvm.a
lib/jamvm/libjvm.la
@lib lib/jamvm/libjvm.so.${LIBjvm_VERSION}
lib/jamvm/rt.jar
share/jamvm/
share/jamvm/classes.zip