summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-09-22 07:33:53 +0000
committerTim Harder <radhermit@gentoo.org>2011-09-22 07:33:53 +0000
commit048b757ba841a22ab8b3d177be3afd782befda73 (patch)
tree6a158390291abee0ab5d275ac46bd28e29efc87c /dev-java
parentUnmask freeradius (diff)
downloadgentoo-2-048b757ba841a22ab8b3d177be3afd782befda73.tar.gz
gentoo-2-048b757ba841a22ab8b3d177be3afd782befda73.tar.bz2
gentoo-2-048b757ba841a22ab8b3d177be3afd782befda73.zip
Use correct patch.
(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/rxtx/ChangeLog6
-rw-r--r--dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch21
2 files changed, 10 insertions, 17 deletions
diff --git a/dev-java/rxtx/ChangeLog b/dev-java/rxtx/ChangeLog
index b57cee1af48e..642e7e808c3a 100644
--- a/dev-java/rxtx/ChangeLog
+++ b/dev-java/rxtx/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/rxtx
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.17 2011/09/22 07:17:57 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/rxtx/ChangeLog,v 1.18 2011/09/22 07:33:53 radhermit Exp $
+
+ 22 Sep 2011; Tim Harder <radhermit@gentoo.org>
+ files/rxtx-2.2_pre2-add-ttyACM.patch:
+ Use correct patch.
22 Sep 2011; Tim Harder <radhermit@gentoo.org> rxtx-2.1.7.2-r2.ebuild,
rxtx-2.1.7.2-r3.ebuild:
diff --git a/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch b/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch
index cf1e1d9bfea0..ac3a0a9dbee5 100644
--- a/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch
+++ b/dev-java/rxtx/files/rxtx-2.2_pre2-add-ttyACM.patch
@@ -1,21 +1,10 @@
---- rxtx-2.2pre2/CNI/RXTXCommDriver.java.orig 2010-02-12 09:13:00.032700879 -0800
-+++ rxtx-2.2pre2/CNI/RXTXCommDriver.java 2010-02-12 09:13:57.504441037 -0800
-@@ -556,8 +556,10 @@
+--- rxtx-2.2pre2/src/gnu/io/RXTXCommDriver.java.orig
++++ rxtx-2.2pre2/src/gnu/io/RXTXCommDriver.java
+@@ -574,6 +574,7 @@
if(osName.equals("Linux"))
{
String[] Temp = {
+ "ttyACM", // linux USB modems
"ttyS", // linux Serial Ports
- "ttySA" // for the IPAQs
-+ "ttyUSB", //linux USB serial converters
- };
- CandidatePortPrefixes=Temp;
- }
-@@ -573,6 +575,7 @@
- "ttyircomm", // linux IrCommdevices (IrDA serial emu)
- "ttycosa0c", // linux COSA/SRP synchronous serial card
- "ttycosa1c", // linux COSA/SRP synchronous serial card
-+ "ttyACM", // linux USB modems
- "ttyC", // linux cyclades cards
- "ttyCH",// linux Chase Research AT/PCI-Fast serial card
- "ttyD", // linux Digiboard serial card
+ "ttySA", // for the IPAQs
+ "ttyUSB", // for USB frobs