diff options
| author | dsainty <dsainty@pkgsrc.org> | 2013-02-19 23:35:48 +0000 |
|---|---|---|
| committer | dsainty <dsainty@pkgsrc.org> | 2013-02-19 23:35:48 +0000 |
| commit | 2ee4ffdd344ba0dbcfce629af888d0641e0b849e (patch) | |
| tree | c1479ebd4ffc602200e9e20335810b040168e1c5 /comms | |
| parent | 4eae5d8326499af0041530eedc5ca14d9840575a (diff) | |
| download | pkgsrc-2ee4ffdd344ba0dbcfce629af888d0641e0b849e.tar.gz | |
Fix package build for MACHINE_ARCH == x86_64
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/java-rxtx/Makefile | 9 | ||||
| -rw-r--r-- | comms/java-rxtx/PLIST | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/comms/java-rxtx/Makefile b/comms/java-rxtx/Makefile index 22c16393b30..fa94d5231c3 100644 --- a/comms/java-rxtx/Makefile +++ b/comms/java-rxtx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/02/11 01:13:19 dsainty Exp $ +# $NetBSD: Makefile,v 1.2 2013/02/19 23:35:48 dsainty Exp $ # DISTNAME= rxtx-2.1-7r2 @@ -28,10 +28,13 @@ MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME} # platforms. Disable it for consistency. CONFIGURE_ARGS+= --disable-PRINTER +JAVA_MACHINE_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/} + INSTALLATION_DIRS+= ${PKG_JAVA_HOME}/jre/lib/ext -INSTALLATION_DIRS+= ${PKG_JAVA_HOME}/jre/lib/${MACHINE_ARCH} +INSTALLATION_DIRS+= ${PKG_JAVA_HOME}/jre/lib/${JAVA_MACHINE_ARCH} -PLIST_SUBST+= JAVA_HOME="${PKG_JAVA_HOME:C/^${PREFIX}\///}" +PLIST_SUBST+= JAVA_MACHINE_ARCH=${JAVA_MACHINE_ARCH:Q} +PLIST_SUBST+= JAVA_HOME="${PKG_JAVA_HOME:C/^${PREFIX}\///}" pre-configure: set -e; cd ${WRKSRC}; \ diff --git a/comms/java-rxtx/PLIST b/comms/java-rxtx/PLIST index f13a5a09098..4dded64443a 100644 --- a/comms/java-rxtx/PLIST +++ b/comms/java-rxtx/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1 2013/02/11 01:13:19 dsainty Exp $ +@comment $NetBSD: PLIST,v 1.2 2013/02/19 23:35:48 dsainty Exp $ ${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar -${JAVA_HOME}/jre/lib/${MACHINE_ARCH}/librxtxSerial.la +${JAVA_HOME}/jre/lib/${JAVA_MACHINE_ARCH}/librxtxSerial.la |