summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authordsainty <dsainty@pkgsrc.org>2013-03-29 12:40:24 +0000
committerdsainty <dsainty@pkgsrc.org>2013-03-29 12:40:24 +0000
commit8113c282e954730baf48107d7f95983c7c05dcbe (patch)
tree646c12eff37b2f6d0d455725754c3230482cd6a3 /comms
parent871fed09b4e7a134338364d900ffdeef781f54dd (diff)
downloadpkgsrc-8113c282e954730baf48107d7f95983c7c05dcbe.tar.gz
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.
Diffstat (limited to 'comms')
-rw-r--r--comms/java-rxtx/Makefile7
-rw-r--r--comms/java-rxtx/PLIST3
-rw-r--r--comms/java-rxtx/distinfo4
-rw-r--r--comms/java-rxtx/patches/patch-configure_in17
4 files changed, 20 insertions, 11 deletions
diff --git a/comms/java-rxtx/Makefile b/comms/java-rxtx/Makefile
index 5dd2c60402e..4a5d3a455cb 100644
--- a/comms/java-rxtx/Makefile
+++ b/comms/java-rxtx/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2013/03/06 08:30:40 dsainty Exp $
+# $NetBSD: Makefile,v 1.4 2013/03/29 12:40:24 dsainty Exp $
#
DISTNAME= rxtx-2.1-7r2
PKGNAME= java-rxtx-2.1.7r2
+PKGREVISION= 1
CATEGORIES= comms java
MASTER_SITES= http://rxtx.qbang.org/pub/rxtx/
EXTRACT_SUFX= .zip
@@ -25,10 +26,6 @@ PKG_JVMS_ACCEPTED= openjdk7 sun-jdk7 sun-jdk6 sun-jdk15 sun-jdk14
MAKE_ENV+= JAVA_HOME=${PKG_JAVA_HOME}
-# The printer port support is experimental, and only supported on some
-# platforms. Disable it for consistency.
-CONFIGURE_ARGS+= --disable-PRINTER
-
JAVA_MACHINE_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/}
INSTALLATION_DIRS+= ${PKG_JAVA_HOME}/jre/lib/ext
diff --git a/comms/java-rxtx/PLIST b/comms/java-rxtx/PLIST
index 2535bbae12d..df8cabbc42c 100644
--- a/comms/java-rxtx/PLIST
+++ b/comms/java-rxtx/PLIST
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2013/03/28 21:18:32 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/03/29 12:40:24 dsainty Exp $
${JAVA_HOME}/jre/lib/ext/RXTXcomm.jar
-${JAVA_HOME}/jre/lib/${JAVA_MACHINE_ARCH}/librxtxParallel.la
${JAVA_HOME}/jre/lib/${JAVA_MACHINE_ARCH}/librxtxSerial.la
diff --git a/comms/java-rxtx/distinfo b/comms/java-rxtx/distinfo
index d6082e11e88..3bb4fbd8693 100644
--- a/comms/java-rxtx/distinfo
+++ b/comms/java-rxtx/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1 2013/02/11 01:13:20 dsainty Exp $
+$NetBSD: distinfo,v 1.2 2013/03/29 12:40:24 dsainty 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) = 9c8d4c8b49e7748656296028095389922b4296d0
+SHA1 (patch-configure_in) = 3a7917c8e418af2df3ae38fae24ab479d3b0f7f9
SHA1 (patch-src_I2CImp_c) = 2d6bba8aa2f1460722dc69d17da091cb55f5c844
SHA1 (patch-src_RS485Imp_c) = 6606b79c629556fd010e8d38ec3a0f88c2d8ecfd
SHA1 (patch-src_RawImp_c) = eedc53a9f30e77a8a5437003177e9b20adf64f28
diff --git a/comms/java-rxtx/patches/patch-configure_in b/comms/java-rxtx/patches/patch-configure_in
index 4521541bd0b..1a205acad58 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.1 2013/02/11 01:13:20 dsainty Exp $
+$NetBSD: patch-configure_in,v 1.2 2013/03/29 12:40:25 dsainty Exp $
AM_CONFIG_HEADER is obsolete.
@@ -6,8 +6,12 @@ UTS_RELEASE isn't even reliably available on Linux, let alone portable.
Recognise Java 1.6, and openjdk7 as 1.7.
+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-01-30 15:15:04.159793907 +1300
++++ configure.in 2013-03-30 01:16:29.425838439 +1300
@@ -17,7 +17,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#-------------------------------------------------------------------------
@@ -50,3 +54,12 @@ Recognise Java 1.6, and openjdk7 as 1.7.
RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
;;
1.1*)
+@@ -816,6 +816,8 @@
+ ;;
+ esac ]
+
++TARGETLIB="\$(target_triplet)/librxtxSerial.la"
++
+ AC_OUTPUT(Makefile)
+
+