[pkgsrc/pkgsrc-2015Q1]: pkgsrc/comms/java-rxtx Pullup ticket #4687 - requeste...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3e975ed5cb9b
branches:  pkgsrc-2015Q1
changeset: 649199:3e975ed5cb9b
user:      tron <tron%pkgsrc.org@localhost>
date:      Mon Apr 27 21:47:25 2015 +0000

description:
Pullup ticket #4687 - requested by joerg
comms/java-rxtx: build fix

Revisions pulled up:
- comms/java-rxtx/Makefile                                      1.5

---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Fri Apr 24 20:16:54 UTC 2015

   Modified Files:
        pkgsrc/comms/java-rxtx: Makefile

   Log Message:
   Uses libtool, so replace with our version. Use the correct machine
   directory on NetBSD/ARM.

diffstat:

 comms/java-rxtx/Makefile |  13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r cb97ba202280 -r 3e975ed5cb9b comms/java-rxtx/Makefile
--- a/comms/java-rxtx/Makefile  Sun Apr 26 08:47:38 2015 +0000
+++ b/comms/java-rxtx/Makefile  Mon Apr 27 21:47:25 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/03/29 12:40:24 dsainty Exp $
+# $NetBSD: Makefile,v 1.4.18.1 2015/04/27 21:47:25 tron Exp $
 #
 
 DISTNAME=      rxtx-2.1-7r2
@@ -14,6 +14,7 @@
 LICENSE=       gnu-lgpl-v2 # or later
 
 USE_TOOLS+=    aclocal autoconf autoheader automake gmake unzip
+USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++
 GNU_CONFIGURE= yes
 MAKE_JOBS_SAFE=        no
@@ -26,7 +27,15 @@
 
 MAKE_ENV+=     JAVA_HOME=${PKG_JAVA_HOME}
 
-JAVA_MACHINE_ARCH=     ${MACHINE_ARCH:S/x86_64/amd64/}
+.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
+.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}