Disable inline threaded version of interpreter when compiled with Clang to

fix build on 10 and later.  Modernize the port while I am here.

HFH:		2015Q1

2 files changed, 32 insertions, 33 deletions

diff --git a/java/jamvm/Makefile b/java/jamvm/Makefile
index 013ffb62e3cb..c177bf91f6bd 100644
--- a/java/jamvm/Makefile
+++ b/java/jamvm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jamvm
 PORTVERSION=	1.5.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/JamVM%20${PORTVERSION}
 
@@ -14,30 +14,29 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${LOCALBASE}/share/classpath/glibj.zip:${PORTSDIR}/java/classpath
 
-GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-classpath-install-dir=${LOCALBASE}
-USES=		gmake libtool pkgconfig
+GNU_CONFIGURE=	yes
+OPTIONS_SUB=	yes
+USES=		compiler gmake libtool pkgconfig
 
 OPTIONS_DEFINE=	FFI ZIP
 OPTIONS_DEFAULT=FFI ZIP
 FFI_DESC=	use libffi to call native methods
 ZIP_DESC=	turn-on zip support in the bootstrap loader
 
+FFI_CONFIGURE_ENABLE=	ffi
+FFI_LIB_DEPENDS=	libffi.so:${PORTSDIR}/devel/libffi
+ZIP_BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
+ZIP_CONFIGURE_ENABLE=	zip
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MFFI}
-LIB_DEPENDS+=		libffi.so:${PORTSDIR}/devel/libffi
-CONFIGURE_ARGS+=	--enable-ffi
-.elif ${ARCH} == "sparc64"
+.if empty(PORT_OPTIONS:MFFI) && ${ARCH} == "sparc64"
 IGNORE=		for ${ARCH} requires libffi
 .endif
 
-.if ${PORT_OPTIONS:MZIP}
-BUILD_DEPENDS+=		zip:${PORTSDIR}/archivers/zip
-PLIST_SUB+=		WITH_ZIP="" WITHOUT_ZIP="@comment "
-.else
-CONFIGURE_ARGS+=	--disable-zip
-PLIST_SUB+=		WITH_ZIP="@comment " WITHOUT_ZIP=""
+.if ${COMPILER_TYPE} == clang
+CONFIGURE_ARGS+=	--disable-int-inlining
 .endif
 
 post-extract:
diff --git a/java/jamvm/pkg-plist b/java/jamvm/pkg-plist
index 33613a47a16c..9a14e5aced4b 100644
--- a/java/jamvm/pkg-plist
+++ b/java/jamvm/pkg-plist
@@ -2,23 +2,23 @@ bin/jamvm
 lib/libjvm.so
 lib/libjvm.so.0
 lib/libjvm.so.0.0.0
-%%WITH_ZIP%%lib/rt.jar
-%%WITH_ZIP%%%%DATADIR%%/classes.zip
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/gnu/classpath/VMStackWalker.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/gnu/classpath/VMSystemProperties.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/jamvm/ThreadInfoHelper.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/JarLauncher.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/VMClassLoaderData$Unloader.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/VMClassLoaderData.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMClass.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMClassLoader$PackageInfo.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMClassLoader.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMRuntime.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMString.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMThread.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/VMThrowable.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMConstructor.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMField.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMMethod.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/java/security/VMAccessController.class
-%%WITHOUT_ZIP%%%%DATADIR%%/classes/sun/reflect/annotation/AnnotationInvocationHandler.class
+%%ZIP%%lib/rt.jar
+%%ZIP%%%%DATADIR%%/classes.zip
+%%NO_ZIP%%%%DATADIR%%/classes/gnu/classpath/VMStackWalker.class
+%%NO_ZIP%%%%DATADIR%%/classes/gnu/classpath/VMSystemProperties.class
+%%NO_ZIP%%%%DATADIR%%/classes/jamvm/ThreadInfoHelper.class
+%%NO_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/JarLauncher.class
+%%NO_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/VMClassLoaderData$Unloader.class
+%%NO_ZIP%%%%DATADIR%%/classes/jamvm/java/lang/VMClassLoaderData.class
+%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMClass.class
+%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMClassLoader$PackageInfo.class
+%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMClassLoader.class
+%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMRuntime.class
+%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMString.class
+%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMThread.class
+%%NO_ZIP%%%%DATADIR%%/classes/java/lang/VMThrowable.class
+%%NO_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMConstructor.class
+%%NO_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMField.class
+%%NO_ZIP%%%%DATADIR%%/classes/java/lang/reflect/VMMethod.class
+%%NO_ZIP%%%%DATADIR%%/classes/java/security/VMAccessController.class
+%%NO_ZIP%%%%DATADIR%%/classes/sun/reflect/annotation/AnnotationInvocationHandler.class