On Wed, Sep 14, 2011 at 5:47 PM, Brad <b...@comstyle.com> wrote:
> An update to JamVM 1.5.4.
>
> sparc64 builds just fine. sparc should build Ok but gcj needs to be
> built on sparc first to be able to build classpath.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/lang/jamvm/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 8 Mar 2011 09:36:04 -0000 1.14
> +++ Makefile 14 Sep 2011 20:01:53 -0000
> @@ -1,43 +1,48 @@
> # $OpenBSD: Makefile,v 1.14 2011/03/08 09:36:04 sthen 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/}
>
> -HOMEPAGE= http://jamvm.sourceforge.net/
> +SHARED_LIBS= jvm 0.0
>
> -MAINTAINER= Frederick C. Druseikis <fdrusei...@sc.edu>
> +HOMEPAGE= http://jamvm.sourceforge.net/
>
> -# 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
> -
> -USE_LIBTOOL= Yes
> -
> -BUILD_DEPENDS= lang/jikes>=1.22
> -BUILD_DEPENDS+= lang/classpath>=0.98
> +WANTLIB= c m pthread z
>
> -RUN_DEPENDS= lang/classpath>=0.98
> +.if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
> +WANTLIB+= ffi
>
> -WANTLIB= c m z pthread
> +LIB_DEPENDS= devel/libffi
> +.endif
>
> -CONFIGURE_ARGS+= --with-classpath-install-dir=${LOCALBASE}
> -CONFIGURE_ARGS+= --libdir=${LOCALBASE}/lib/jamvm
> -CONFIGURE_ARGS+= --includedir=${LOCALBASE}/include/jamvm
> -CONFIGURE_ARGS+= --disable-tls
> +BUILD_DEPENDS= lang/jikes>=1.22 \
> + lang/classpath>=0.98
> +
> +RUN_DEPENDS= lang/classpath>=0.98
> +
> +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
> Index: distinfo
> ===================================================================
> RCS file: /home/cvs/ports/lang/jamvm/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 22 Jul 2009 00:31:57 -0000 1.5
> +++ distinfo 14 Sep 2011 20:01:53 -0000
> @@ -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
> Index: patches/patch-configure
> ===================================================================
> RCS file: /home/cvs/ports/lang/jamvm/patches/patch-configure,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-configure
> --- patches/patch-configure 22 Jul 2009 00:31:57 -0000 1.3
> +++ patches/patch-configure 14 Sep 2011 20:01:53 -0000
> @@ -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 ;;
> +--- 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
> Index: patches/patch-src_hooks_c
> ===================================================================
> RCS file: /home/cvs/ports/lang/jamvm/patches/patch-src_hooks_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_hooks_c
> --- patches/patch-src_hooks_c 16 Jun 2009 15:37:46 -0000 1.1
> +++ patches/patch-src_hooks_c 14 Sep 2011 20:01:53 -0000
> @@ -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, ...) {
> +--- 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) {
Brad,
1) you can also cvs rm this above patch ^^^^^ i.e patch-src_hooks_c.
Robert Lougher confirmed in a private email that it is not needed.
2) you can remove Maintainer per his request in email to ports@.
thanks
