summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2015-04-24 20:16:54 +0000
committerjoerg <joerg@pkgsrc.org>2015-04-24 20:16:54 +0000
commit7eb3b3c2353e20f02eecf949621487d70f08ced6 (patch)
tree6d20885251981f19657643b6f33a0d551c724555 /comms
parent7daf9c6cec4b34b372e36b366194a9858c9eb2a0 (diff)
downloadpkgsrc-7eb3b3c2353e20f02eecf949621487d70f08ced6.tar.gz
Uses libtool, so replace with our version. Use the correct machine
directory on NetBSD/ARM.
Diffstat (limited to 'comms')
-rw-r--r--comms/java-rxtx/Makefile13
1 files changed, 11 insertions, 2 deletions
diff --git a/comms/java-rxtx/Makefile b/comms/java-rxtx/Makefile
index 4a5d3a455cb..1a4736d059b 100644
--- a/comms/java-rxtx/Makefile
+++ b/comms/java-rxtx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/03/29 12:40:24 dsainty Exp $
+# $NetBSD: Makefile,v 1.5 2015/04/24 20:16:54 joerg Exp $
#
DISTNAME= rxtx-2.1-7r2
@@ -14,6 +14,7 @@ COMMENT= Java serial IO library
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 @@ PKG_JVMS_ACCEPTED= openjdk7 sun-jdk7 sun-jdk6 sun-jdk15 sun-jdk14
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}