[Midnightbsd-cvs] mports [21764] trunk/java/jamvm: update plist

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Aug 20 12:16:20 EDT 2016 

Revision: 21764
          http://svnweb.midnightbsd.org/mports/?rev=21764
Author:   laffer1
Date:     2016-08-20 12:16:20 -0400 (Sat, 20 Aug 2016)
Log Message:
-----------
update plist

Modified Paths:
--------------
    trunk/java/jamvm/Makefile
    trunk/java/jamvm/files/patch-configure
    trunk/java/jamvm/pkg-plist

Modified: trunk/java/jamvm/Makefile
===================================================================
--- trunk/java/jamvm/Makefile	2016-08-20 16:03:53 UTC (rev 21763)
+++ trunk/java/jamvm/Makefile	2016-08-20 16:16:20 UTC (rev 21764)
@@ -2,7 +2,7 @@
 
 PORTNAME=	jamvm
 PORTVERSION=	1.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/JamVM%20${PORTVERSION}
 
@@ -13,11 +13,12 @@
 
 RUN_DEPENDS=	${LOCALBASE}/share/classpath/glibj.zip:${PORTSDIR}/java/classpath
 
+CONFIGURE_ARGS=	--with-classpath-install-dir=${LOCALBASE}
 GNU_CONFIGURE=	yes
 OPTIONS_SUB=	yes
-CONFIGURE_ARGS=	--with-classpath-install-dir=${LOCALBASE}
-USES=		pkgconfig gmake
+USES=		compiler gmake libtool pkgconfig
 
+# temporary clang 3.3 in base 0.8/0.9 crashes
 USE_GCC=	any
 
 OPTIONS_DEFINE=	FFI ZIP
@@ -25,24 +26,24 @@
 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.mport.options.mk>
 
-.if ${PORT_OPTIONS:MFFI}
-LIB_DEPENDS+=		ffi:${PORTSDIR}/devel/libffi
-CONFIGURE_ARGS+=	--enable-ffi
-.endif
+.include <bsd.port.pre.mk>
 
-.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
 
-.include <bsd.port.pre.mk>
-
 post-extract:
 	@${REINPLACE_CMD} -e "s,\(^include_HEADERS = .*\)jni.h\(.*\),\1\2," ${WRKSRC}/src/Makefile.in
 
+post-install:
+	cd ${PREFIX} && ln -fs share/classpath/glibj.zip lib/rt.jar
+	${CP} -p ${WRKSRC}/lib/inst_classes.zip ${PREFIX}/share/jamvm/classes.zip
+
 .include <bsd.port.post.mk>

Modified: trunk/java/jamvm/files/patch-configure
===================================================================
--- trunk/java/jamvm/files/patch-configure	2016-08-20 16:03:53 UTC (rev 21763)
+++ trunk/java/jamvm/files/patch-configure	2016-08-20 16:16:20 UTC (rev 21764)
@@ -1,15 +1,40 @@
 --- configure.orig	2009-12-31 13:41:44.000000000 -0500
 +++ configure	2012-09-17 12:29:34.000000000 -0400
-@@ -2689,7 +2689,7 @@
+@@ -2683,28 +2683,27 @@
+ i[3456]86-*-darwin*) host_cpu=i386 host_os=darwin ;;
+ 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-*-freebsd*) os=bsd libdl_needed=no ;;
+ 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 ;;
 -x86_64-*-freebsd*) host_os=bsd libdl_needed=no ;;
-+amd64-*-freebsd*) host_os=bsd host_cpu=x86_64 libdl_needed=no ;;
++amd64-*-freebsd*) os=bsd host_cpu=x86_64 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 ;;
-@@ -21662,8 +21662,15 @@
+-arm*-*-freebsd*) host_cpu=arm host_os=bsd libdl_needed=no ;;
++arm*-*-freebsd*) host_cpu=arm 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*-*-freebsd*) host_cpu=powerpc os=bsd libdl_needed=no ;;
+ powerpc-*-darwin*) host_os=darwin ;;
+-sparc*-*-freebsd*) host_cpu=sparc host_os=bsd libdl_needed=no ;;
++sparc*-*-freebsd*) host_cpu=sparc 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; }; } ;;
+ esac
+ 
+ arch=$host_cpu
+-os=$host_os
+ 
+ 
+ 
+@@ -21662,8 +21661,15 @@
  if test "${ac_cv_lib_ffi_ffi_call+set}" = set; then
    $as_echo_n "(cached) " >&6
  else
@@ -26,7 +51,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21718,6 +21725,8 @@
+@@ -21718,6 +21724,8 @@
  rm -rf conftest.dSYM
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
@@ -35,7 +60,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffi_ffi_call" >&5
-@@ -21726,9 +21735,9 @@
+@@ -21726,9 +21734,9 @@
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBFFI 1
  _ACEOF

Modified: trunk/java/jamvm/pkg-plist
===================================================================
--- trunk/java/jamvm/pkg-plist	2016-08-20 16:03:53 UTC (rev 21763)
+++ trunk/java/jamvm/pkg-plist	2016-08-20 16:16:20 UTC (rev 21764)
@@ -1,37 +1,24 @@
 bin/jamvm
-lib/libjvm.la
-lib/libjvm.a
-%%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
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/classes/gnu/classpath
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/classes/gnu
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/classes/java/lang/reflect
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/classes/java/lang
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/classes/java/security
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/classes/java
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/classes/sun/reflect/annotation
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/classes/sun/reflect
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/classes/sun
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/classes/jamvm/java/lang
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/classes/jamvm/java
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/classes/jamvm
-%%WITHOUT_ZIP%%@dirrm %%DATADIR%%/classes
- at dirrm %%DATADIR%%
+lib/libjvm.so
+lib/libjvm.so.0
+lib/libjvm.so.0.0.0
+%%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

More information about the Midnightbsd-cvs mailing list