diff options
Diffstat (limited to 'comms/java-rxtx/patches')
-rw-r--r-- | comms/java-rxtx/patches/patch-Makefile_am | 19 | ||||
-rw-r--r-- | comms/java-rxtx/patches/patch-configure_in | 52 | ||||
-rw-r--r-- | comms/java-rxtx/patches/patch-src_I2CImp_c | 15 | ||||
-rw-r--r-- | comms/java-rxtx/patches/patch-src_RS485Imp_c | 15 | ||||
-rw-r--r-- | comms/java-rxtx/patches/patch-src_RawImp_c | 15 | ||||
-rw-r--r-- | comms/java-rxtx/patches/patch-src_SerialImp_c | 15 | ||||
-rw-r--r-- | comms/java-rxtx/patches/patch-src_SerialImp_cpp | 15 |
7 files changed, 146 insertions, 0 deletions
diff --git a/comms/java-rxtx/patches/patch-Makefile_am b/comms/java-rxtx/patches/patch-Makefile_am new file mode 100644 index 00000000000..3ad8d407d20 --- /dev/null +++ b/comms/java-rxtx/patches/patch-Makefile_am @@ -0,0 +1,19 @@ +$NetBSD: patch-Makefile_am,v 1.1 2013/02/11 01:13:20 dsainty Exp $ + +A Jar can't be stripped nor executed - it's data. + +Add DESTDIR support. + +--- Makefile.am.orig 2005-07-08 15:47:33.000000000 +1200 ++++ Makefile.am 2011-11-29 02:56:50.674521001 +1300 +@@ -86,8 +86,8 @@ + if [ -f $$i ];then \ + echo $$i; \ + fi; \ +- done` $(RXTX_PATH) +- $(INSTALL_PROGRAM) $(JARTARGET) $(JHOME)/ ++ done` $(DESTDIR)$(RXTX_PATH) ++ $(INSTALL_DATA) $(JARTARGET) $(DESTDIR)$(JHOME)/ + + clean-generic: + rm -rf $(DEST) $(TOP)/$(CLASSTOP) diff --git a/comms/java-rxtx/patches/patch-configure_in b/comms/java-rxtx/patches/patch-configure_in new file mode 100644 index 00000000000..4521541bd0b --- /dev/null +++ b/comms/java-rxtx/patches/patch-configure_in @@ -0,0 +1,52 @@ +$NetBSD: patch-configure_in,v 1.1 2013/02/11 01:13:20 dsainty Exp $ + +AM_CONFIG_HEADER is obsolete. + +UTS_RELEASE isn't even reliably available on Linux, let alone portable. + +Recognise Java 1.6, and openjdk7 as 1.7. + +--- configure.in.orig 2006-01-30 17:37:47.000000000 +1300 ++++ configure.in 2013-01-30 15:15:04.159793907 +1300 +@@ -17,7 +17,7 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + #------------------------------------------------------------------------- + AC_INIT(src/SerialImp.c) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CANONICAL_SYSTEM + AC_MSG_WARN(Trying libtool. If the following fails install libtool) + AC_PROG_CC +@@ -458,12 +458,12 @@ + [ case $OS_NAME in + Linux) + LDFLAGS=$LDFLAGS" -lpthread" +- check_kernel_headers ++ #check_kernel_headers + check_java_headers + CFLAGS=$CFLAGS" -D__need_timespec" + case $JAVA_VERSION in + +- 1.2*|1.3*|1.4*|1.5*) ++ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*) + #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 @@ + TARGETLIB="\$(target_triplet)/librxtxSerial.la \ + \$(target_triplet)/librxtxParallel.la" + case $JAVA_VERSION in +- 1.2*|1.3*|1.4*|1.5*) ++ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*) + #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 @@ + CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH" + + case $JAVA_VERSION in +- 1.2*|1.3*|1.4*|1.5*) ++ 1.2*|1.3*|1.4*|1.5*|1.6*|1.7*) + RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)" + ;; + 1.1*) diff --git a/comms/java-rxtx/patches/patch-src_I2CImp_c b/comms/java-rxtx/patches/patch-src_I2CImp_c new file mode 100644 index 00000000000..af605e991e2 --- /dev/null +++ b/comms/java-rxtx/patches/patch-src_I2CImp_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_I2CImp_c,v 1.1 2013/02/11 01:13:21 dsainty Exp $ + +UTS_RELEASE isn't even reliably available on Linux, let alone portable. + +--- src/I2CImp.c.orig 2011-11-29 00:39:56.242521000 +1300 ++++ src/I2CImp.c 2011-11-29 00:40:16.090521000 +1300 +@@ -86,7 +86,7 @@ + sigaction( SIGIO, NULL, &handler ); + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ +-#if defined(__linux__) ++#if 0 + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { diff --git a/comms/java-rxtx/patches/patch-src_RS485Imp_c b/comms/java-rxtx/patches/patch-src_RS485Imp_c new file mode 100644 index 00000000000..bb76e82ba23 --- /dev/null +++ b/comms/java-rxtx/patches/patch-src_RS485Imp_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_RS485Imp_c,v 1.1 2013/02/11 01:13:21 dsainty Exp $ + +UTS_RELEASE isn't even reliably available on Linux, let alone portable. + +--- src/RS485Imp.c.orig 2011-11-29 00:38:07.798521000 +1300 ++++ src/RS485Imp.c 2011-11-29 00:38:52.626521000 +1300 +@@ -86,7 +86,7 @@ + sigaction( SIGIO, NULL, &handler ); + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ +-#if defined(__linux__) ++#if 0 + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { diff --git a/comms/java-rxtx/patches/patch-src_RawImp_c b/comms/java-rxtx/patches/patch-src_RawImp_c new file mode 100644 index 00000000000..1fc27103217 --- /dev/null +++ b/comms/java-rxtx/patches/patch-src_RawImp_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_RawImp_c,v 1.1 2013/02/11 01:13:21 dsainty Exp $ + +UTS_RELEASE isn't even reliably available on Linux, let alone portable. + +--- src/RawImp.c.orig 2011-11-29 00:35:42.582521001 +1300 ++++ src/RawImp.c 2011-11-29 00:36:06.226521000 +1300 +@@ -230,7 +230,7 @@ + sigaction( SIGIO, NULL, &handler ); + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ +-#if defined(__linux__) ++#if 0 + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { diff --git a/comms/java-rxtx/patches/patch-src_SerialImp_c b/comms/java-rxtx/patches/patch-src_SerialImp_c new file mode 100644 index 00000000000..5b57e3545f8 --- /dev/null +++ b/comms/java-rxtx/patches/patch-src_SerialImp_c @@ -0,0 +1,15 @@ +$NetBSD: patch-src_SerialImp_c,v 1.1 2013/02/11 01:13:21 dsainty 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 @@ + #if DEBUG_TIMING + gettimeofday(&seloop, NULL); + #endif /* DEBUG_TIMING */ +-#if defined(DEBUG) && defined(__linux__) ++#if 0 + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { diff --git a/comms/java-rxtx/patches/patch-src_SerialImp_cpp b/comms/java-rxtx/patches/patch-src_SerialImp_cpp new file mode 100644 index 00000000000..27d8baac70f --- /dev/null +++ b/comms/java-rxtx/patches/patch-src_SerialImp_cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-src_SerialImp_cpp,v 1.1 2013/02/11 01:13:22 dsainty Exp $ + +UTS_RELEASE isn't even reliably available on Linux, let alone portable. + +--- src/SerialImp.cpp.orig 2011-11-29 00:31:50.230521000 +1300 ++++ src/SerialImp.cpp 2011-11-29 00:32:05.906521000 +1300 +@@ -101,7 +101,7 @@ + sigaction( SIGIO, NULL, &handler ); + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ +-#ifdef DEBUG ++#if 0 + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { |