aboutsummaryrefslogtreecommitdiff
path: root/cad
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2008-02-03 20:34:51 +0000
committerMartin Wilke <miwi@FreeBSD.org>2008-02-03 20:34:51 +0000
commit14767221d6cb860e8c1ce4259c01ace598c97d27 (patch)
treefa8727367fe9c95a000e9469465fde6904dde24e /cad
parent5f82363f3e02b445728c6d929f9ed9438734297b (diff)
downloadports-14767221d6cb860e8c1ce4259c01ace598c97d27.tar.gz
ports-14767221d6cb860e8c1ce4259c01ace598c97d27.zip
Notes
Diffstat (limited to 'cad')
-rw-r--r--cad/brlcad/files/patch-src-vas4_vas_io.c31
1 files changed, 28 insertions, 3 deletions
diff --git a/cad/brlcad/files/patch-src-vas4_vas_io.c b/cad/brlcad/files/patch-src-vas4_vas_io.c
index 7e2b2a81a4de..b4471b7740c5 100644
--- a/cad/brlcad/files/patch-src-vas4_vas_io.c
+++ b/cad/brlcad/files/patch-src-vas4_vas_io.c
@@ -1,5 +1,3 @@
-Add the following patch to the files/ directory:
-
--- src/vas4/vas_io.c 2007-07-26 03:14:00.000000000 +0200
+++ src/vas4/vas_io.c 2007-12-28 11:30:45.000000000 +0100
@@ -41,6 +41,8 @@
@@ -11,7 +9,25 @@ Add the following patch to the files/ directory:
#if defined(HAVE_XOPEN)
# include <termios.h>
-@@ -149,7 +151,7 @@
+@@ -93,6 +95,8 @@
+
+ /* Setup VAS line */
+
++#ifndef HAVE_XOPEN
++
+ #ifdef HAVE_TERMIO_H
+
+ vtty.c_cflag = BAUD | CS8; /* Character size = 8 bits */
+@@ -137,7 +141,7 @@
+ # endif /* HAVE_SGTTY_H */
+ #endif /* HAVE_TERMIO_H */
+
+-#ifdef HAVE_XOPEN
++#else /* HAVE_XOPEN */
+ vtty.c_cflag = BAUD | CS8; /* Character size = 8 bits */
+ vtty.c_cflag &= ~CSTOPB; /* One stop bit */
+ vtty.c_cflag |= CREAD; /* Enable the reader */
+@@ -149,7 +153,7 @@
vtty.c_iflag |= IGNBRK|IGNPAR;
vtty.c_oflag &= ~(OPOST|ONLCR|OCRNL); /* Turn off all post-processing */
@@ -20,3 +36,12 @@ Add the following patch to the files/ directory:
vtty.c_cc[VMIN] = 1;
vtty.c_cc[VTIME] = 0;
+@@ -167,7 +171,7 @@
+ perror(VAS_PORT);
+ exit(2);
+ }
+-#endif
++#endif /* !HAVE_XOPEN */
+ }
+
+ /*