pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/comms/java-rxtx Uses libtool, so replace with our vers...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4e4525750157
branches: trunk
changeset: 650548:4e4525750157
user: joerg <joerg%pkgsrc.org@localhost>
date: Fri Apr 24 20:16:54 2015 +0000
description:
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 53e7c5553549 -r 4e4525750157 comms/java-rxtx/Makefile
--- a/comms/java-rxtx/Makefile Fri Apr 24 18:53:00 2015 +0000
+++ b/comms/java-rxtx/Makefile Fri Apr 24 20:16:54 2015 +0000
@@ -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 @@
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}
Home |
Main Index |
Thread Index |
Old Index