[pkgsrc/trunk]: pkgsrc/comms/java-rxtx If the JVM is built-in, at least insta...

[dsainty <dsainty%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/992d5fa8810f
branches:  trunk
changeset: 651826:992d5fa8810f
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Thu May 14 18:12:11 2015 +0000

description:
If the JVM is built-in, at least install under PREFIX still, rather than
attempting to install into the built-in JAVA_HOME.

Use 'arm' as JAVA_MACHINE_ARCH generally (correct for at least Linux, as
well as NetBSD).

diffstat:

 comms/java-rxtx/Makefile |  32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 deletions(-)

diffs (58 lines):

diff -r cb1cbdaf1cd6 -r 992d5fa8810f comms/java-rxtx/Makefile
--- a/comms/java-rxtx/Makefile  Thu May 14 17:38:45 2015 +0000
+++ b/comms/java-rxtx/Makefile  Thu May 14 18:12:11 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/04/24 20:16:54 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2015/05/14 18:12:11 dsainty Exp $
 #
 
 DISTNAME=      rxtx-2.1-7r2
@@ -25,27 +25,39 @@
 # if the patches are also appropriately updated.
 PKG_JVMS_ACCEPTED= openjdk7 sun-jdk7 sun-jdk6 sun-jdk15 sun-jdk14
 
-MAKE_ENV+=     JAVA_HOME=${PKG_JAVA_HOME}
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "x86_64"
 JAVA_MACHINE_ARCH=     amd64
-.elif ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm"
-JAVA_MACHINE_ARCH=    arm
+.elif !empty(MACHINE_CPU:Marm*)
+JAVA_MACHINE_ARCH=     arm
 .else
 JAVA_MACHINE_ARCH=     ${MACHINE_ARCH}
 .endif
 
-INSTALLATION_DIRS+=    ${PKG_JAVA_HOME}/jre/lib/ext
-INSTALLATION_DIRS+=    ${PKG_JAVA_HOME}/jre/lib/${JAVA_MACHINE_ARCH}
+.include "../../mk/java-vm.mk"
+
+# Inconveniently, for built-in JRE's, PKG_JAVA_HOME will be set to the native
+# directory - which we should not be messing with.  But prior to builtin.mk
+# processing, PKG_JAVA_HOME will match the Pkgsrc JRE home, which is a
+# suitable installation location for Native JRE, as well as being the
+# correct installation location for Pkgsrc JRE.
+JAVA_INSTALL_BASE:=    ${PKG_JAVA_HOME}
 
-PLIST_SUBST+=  JAVA_MACHINE_ARCH=${JAVA_MACHINE_ARCH:Q}
-PLIST_SUBST+=  JAVA_HOME="${PKG_JAVA_HOME:C/^${PREFIX}\///}"
+RXTX_PATH=     ${JAVA_INSTALL_BASE}/jre/lib/${JAVA_MACHINE_ARCH}
+JHOME_PATH=    ${JAVA_INSTALL_BASE}/jre/lib/ext
 
+MAKE_ENV+=     JAVA_HOME=${PKG_JAVA_HOME:Q}
+MAKE_FLAGS+=   RXTX_PATH=${RXTX_PATH:Q}
+MAKE_FLAGS+=   JHOME=${JHOME_PATH:Q}
+ 
+INSTALLATION_DIRS+=    ${RXTX_PATH:Q} ${JHOME_PATH:Q}
+ 
+PLIST_SUBST+=  JAVA_MACHINE_ARCH=${JAVA_MACHINE_ARCH:Q}
+PLIST_SUBST+=  JAVA_HOME="${JAVA_INSTALL_BASE:C/^${PREFIX}\///}"
+ 
 pre-configure:
        set -e; cd ${WRKSRC}; \
        aclocal; autoheader; automake -a --foreign -i; autoconf
 
-.include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"