diff options
| author | dsainty <dsainty@pkgsrc.org> | 2021-09-13 11:44:45 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2021-09-13 11:44:45 +0000 |
| commit | 810bf2c8d490d98f81a30337e683bb9115895bd6 (patch) | |
| tree | 8570d9bc1333c2d67ea63fba3d5fc722a24e4534 | |
| parent | 7399817e3b6f6bb282fce80b5077db875009a716 (diff) | |
| download | pkgsrc-810bf2c8d490d98f81a30337e683bb9115895bd6.tar.gz | |
Install java-rxtx in a consistent location regardless of whether the JRE
is built-in or via Pkgsrc.
This removes the JAVA_INSTALL_BASE hack that used to work, but no longer
does. It's also more consistent with other packages to install in a
private location.
Bump PKGREVISION for the installation location change.
| -rw-r--r-- | comms/java-rxtx/Makefile | 27 | ||||
| -rw-r--r-- | comms/java-rxtx/PLIST | 6 |
2 files changed, 8 insertions, 25 deletions
diff --git a/comms/java-rxtx/Makefile b/comms/java-rxtx/Makefile index 9701e9f365b..2cc59618954 100644 --- a/comms/java-rxtx/Makefile +++ b/comms/java-rxtx/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2021/09/13 11:37:34 dsainty Exp $ +# $NetBSD: Makefile,v 1.14 2021/09/13 11:44:45 dsainty Exp $ # DISTNAME= rxtx-2.1-7r2 PKGNAME= java-rxtx-2.1.7r2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= comms java MASTER_SITES= http://rxtx.qbang.org/pub/rxtx/ EXTRACT_SUFX= .zip @@ -33,34 +33,17 @@ JNILIB= jnilib JNILIB= la .endif -.if ${MACHINE_ARCH} == "x86_64" -JAVA_MACHINE_ARCH= amd64 -.elif !empty(MACHINE_CPU:Marm*) -JAVA_MACHINE_ARCH= arm -.else -JAVA_MACHINE_ARCH= ${MACHINE_ARCH} -.endif - .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} - -RXTX_PATH= ${JAVA_INSTALL_BASE}/jre/lib/${JAVA_MACHINE_ARCH} -JHOME_PATH= ${JAVA_INSTALL_BASE}/jre/lib/ext +RXTX_PATH= ${PREFIX}/lib/java/rxtx +JHOME_PATH= ${PREFIX}/lib/java/rxtx 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} +INSTALLATION_DIRS+= lib/java/rxtx -PLIST_SUBST+= JAVA_MACHINE_ARCH=${JAVA_MACHINE_ARCH:Q} -PLIST_SUBST+= JAVA_HOME="${JAVA_INSTALL_BASE:C/^${PREFIX}\///}" PLIST_SUBST+= JNILIB=${JNILIB} pre-configure: diff --git a/comms/java-rxtx/PLIST b/comms/java-rxtx/PLIST index 858df59ca6b..7b23271c0d7 100644 --- a/comms/java-rxtx/PLIST +++ b/comms/java-rxtx/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.5 2021/09/13 11:37:34 dsainty Exp $ -${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar -${JAVA_HOME}/jre/lib/${JAVA_MACHINE_ARCH}/librxtxSerial.${JNILIB} +@comment $NetBSD: PLIST,v 1.6 2021/09/13 11:44:45 dsainty Exp $ +lib/java/rxtx/RXTXcomm.jar +lib/java/rxtx/librxtxSerial.${JNILIB} |