Don't use variable strings as format strings. Don't link with -lc_r on

the BSDs, use -lpthread. Accept openjdk8.

4 files changed, 42 insertions, 17 deletions

diff --git a/comms/java-rxtx/Makefile b/comms/java-rxtx/Makefile
index b635f7ea16f..2dd8e469e48 100644
--- a/comms/java-rxtx/Makefile
+++ b/comms/java-rxtx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2015/06/27 06:30:03 dsainty Exp $
+# $NetBSD: Makefile,v 1.8 2015/08/13 20:16:22 joerg Exp $
 #
 
 DISTNAME=	rxtx-2.1-7r2
 PKGNAME=	java-rxtx-2.1.7r2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	comms java
 MASTER_SITES=	http://rxtx.qbang.org/pub/rxtx/
 EXTRACT_SUFX=	.zip
@@ -23,7 +23,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 # Configuration looks for certain versions of JDK - this list can be expanded
 # if the patches are also appropriately updated.
-PKG_JVMS_ACCEPTED= oracle-jdk8 openjdk7 sun-jdk7 sun-jdk6 sun-jdk15 sun-jdk14
+PKG_JVMS_ACCEPTED= oracle-jdk8 openjdk8 openjdk7 sun-jdk7 sun-jdk6 sun-jdk15 sun-jdk14
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/comms/java-rxtx/distinfo b/comms/java-rxtx/distinfo
index 3bb4fbd8693..b5124e2bab7 100644
--- a/comms/java-rxtx/distinfo
+++ b/comms/java-rxtx/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.2 2013/03/29 12:40:24 dsainty Exp $
+$NetBSD: distinfo,v 1.3 2015/08/13 20:16:22 joerg Exp $
 
 SHA1 (rxtx-2.1-7r2.zip) = 1d9ef2f80b23bc08b8fdeaa547ee78cb5f76e613
 RMD160 (rxtx-2.1-7r2.zip) = dc569a654fbef58aa521013e170c0200b8b3668f
 Size (rxtx-2.1-7r2.zip) = 1345757 bytes
 SHA1 (patch-Makefile_am) = a0f4bdf62bab3c21bfe062cd489b5f9b8941194c
-SHA1 (patch-configure_in) = 3a7917c8e418af2df3ae38fae24ab479d3b0f7f9
+SHA1 (patch-configure_in) = 4cdfa8c7c870e1d03df1571071e898360496d970
 SHA1 (patch-src_I2CImp_c) = 2d6bba8aa2f1460722dc69d17da091cb55f5c844
 SHA1 (patch-src_RS485Imp_c) = 6606b79c629556fd010e8d38ec3a0f88c2d8ecfd
 SHA1 (patch-src_RawImp_c) = eedc53a9f30e77a8a5437003177e9b20adf64f28
-SHA1 (patch-src_SerialImp_c) = ea2751b5d5e97ef6255b3e01f45696e70a197b9d
+SHA1 (patch-src_SerialImp_c) = 48090325853a39638e9f94f8413d9799b305a149
 SHA1 (patch-src_SerialImp_cpp) = 8453cbc8a71ec00be4ce97e05ba4055af5e59079
diff --git a/comms/java-rxtx/patches/patch-configure_in b/comms/java-rxtx/patches/patch-configure_in
index 1a205acad58..b16e81740f7 100644
--- a/comms/java-rxtx/patches/patch-configure_in
+++ b/comms/java-rxtx/patches/patch-configure_in
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure_in,v 1.2 2013/03/29 12:40:25 dsainty Exp $
+$NetBSD: patch-configure_in,v 1.3 2015/08/13 20:16:22 joerg Exp $
 
 AM_CONFIG_HEADER is obsolete.
 
@@ -10,8 +10,8 @@ The printer port support is experimental, and only supported on some
 platforms.  Disable it for consistency, using a patch since
 --disable-PRINTER only works on Linux.
 
---- configure.in.orig	2006-01-30 17:37:47.000000000 +1300
-+++ configure.in	2013-03-30 01:16:29.425838439 +1300
+--- configure.in.orig	2006-01-30 04:37:47.000000000 +0000
++++ configure.in
 @@ -17,7 +17,7 @@
  #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  #-------------------------------------------------------------------------
@@ -21,7 +21,7 @@ platforms.  Disable it for consistency, using a patch since
  AC_CANONICAL_SYSTEM
  AC_MSG_WARN(Trying libtool.  If the following fails install libtool)
  AC_PROG_CC
-@@ -458,12 +458,12 @@
+@@ -458,12 +458,12 @@ fi
  [ case $OS_NAME in 
  Linux)
  	LDFLAGS=$LDFLAGS" -lpthread"
@@ -36,7 +36,14 @@ platforms.  Disable it for consistency, using a patch since
  		#fix_parameters $JPATH/jre/lib/javax.comm.properties
  		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
  		JHOME=$JPATH"/jre/lib/ext"
-@@ -533,7 +533,7 @@
+@@ -527,13 +527,13 @@ Linux)
+ ;;
+ 
+ *BSD)
+-	LDFLAGS=$LDFLAGS" -lc_r"
++	LDFLAGS=$LDFLAGS" -lpthread"
+ 	JHOME=$JPATH/"lib"
+ 	CFLAGS=$CFLAGS" -D_NO_POSIX=1 -D_NO_XOPEN4=1"
  	TARGETLIB="\$(target_triplet)/librxtxSerial.la \
  			\$(target_triplet)/librxtxParallel.la"
  	case $JAVA_VERSION in
@@ -45,7 +52,7 @@ platforms.  Disable it for consistency, using a patch since
  		#fix_parameters $JPATH/jre/lib/javax.comm.properties
  		CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
  		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
-@@ -721,7 +721,7 @@
+@@ -721,7 +721,7 @@ Solaris*)
  	CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
  
  	case $JAVA_VERSION in
@@ -54,7 +61,7 @@ platforms.  Disable it for consistency, using a patch since
  		RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
  	;;
  	1.1*)
-@@ -816,6 +816,8 @@
+@@ -816,6 +816,8 @@ QNX)
  ;;
  esac ]
  
diff --git a/comms/java-rxtx/patches/patch-src_SerialImp_c b/comms/java-rxtx/patches/patch-src_SerialImp_c
index 5b57e3545f8..3e01ef6e00b 100644
--- a/comms/java-rxtx/patches/patch-src_SerialImp_c
+++ b/comms/java-rxtx/patches/patch-src_SerialImp_c
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_SerialImp_c,v 1.1 2013/02/11 01:13:21 dsainty Exp $
+$NetBSD: patch-src_SerialImp_c,v 1.2 2015/08/13 20:16:22 joerg Exp $
 
 UTS_RELEASE isn't even reliably available on Linux, let alone portable.
 
---- src/SerialImp.c.orig	2011-11-29 00:22:44.514521000 +1300
-+++ src/SerialImp.c	2011-11-29 00:23:01.778521001 +1300
-@@ -279,7 +279,7 @@
+--- src/SerialImp.c.orig	2006-01-29 22:19:04.000000000 +0000
++++ src/SerialImp.c
+@@ -279,7 +279,7 @@ JNIEXPORT void JNICALL RXTXPort(Initiali
  #if DEBUG_TIMING
  	gettimeofday(&seloop, NULL);
  #endif /* DEBUG_TIMING */
@@ -13,3 +13,21 @@ UTS_RELEASE isn't even reliably available on Linux, let alone portable.
  	/* Lets let people who upgraded kernels know they may have problems */
  	if (uname (&name) == -1)
  	{
+@@ -4946,7 +4946,7 @@ void throw_java_exception( JNIEnv *env, 
+ void report_warning(char *msg)
+ {
+ #ifndef DEBUG_MW
+-	fprintf(stderr, msg);
++	fprintf(stderr, "%s", msg);
+ #else
+ 	mexWarnMsgTxt( (const char *) msg );
+ #endif /* DEBUG_MW */
+@@ -4983,7 +4983,7 @@ void report_verbose(char *msg)
+ void report_error(char *msg)
+ {
+ #ifndef DEBUG_MW
+-	fprintf(stderr, msg);
++	fprintf(stderr, "%s", msg);
+ #else
+ 	mexWarnMsgTxt( msg );
+ #endif /* DEBUG_MW */