Wed May 23 07:19:23 2012 UTC ()
fd_set is a typedef, not a struct tag. Should fix Linux build.


(dholland)
diff -r1.7 -r1.8 pkgsrc/x11/xmindpath/distinfo
diff -r1.3 -r1.4 pkgsrc/x11/xmindpath/patches/patch-ab
cvs diff -r1.7 -r1.8 pkgsrc/x11/xmindpath/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xmindpath/distinfo 2009/07/07 17:38:13 1.7
+++ pkgsrc/x11/xmindpath/distinfo 2012/05/23 07:19:23 1.8
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.7 2009/07/07 17:38:13 joerg Exp $ 1$NetBSD: distinfo,v 1.8 2012/05/23 07:19:23 dholland Exp $
2 2
3SHA1 (magicpoint-1.09a.tar.gz) = 2903f7c42a30d558677fc1a93607fe7fc8c1fc0f 3SHA1 (magicpoint-1.09a.tar.gz) = 2903f7c42a30d558677fc1a93607fe7fc8c1fc0f
4RMD160 (magicpoint-1.09a.tar.gz) = 2ee96eed9c9e31d6c599447d421ae319483c3617 4RMD160 (magicpoint-1.09a.tar.gz) = 2ee96eed9c9e31d6c599447d421ae319483c3617
5Size (magicpoint-1.09a.tar.gz) = 816234 bytes 5Size (magicpoint-1.09a.tar.gz) = 816234 bytes
6SHA1 (patch-aa) = 8566a9bbab0538509ea5a1b383d357b403f0860c 6SHA1 (patch-aa) = 8566a9bbab0538509ea5a1b383d357b403f0860c
7SHA1 (patch-ab) = 7d86596abcd15ce1fea3a7b71ee9254facbd371e 7SHA1 (patch-ab) = 974f82cab1dcc87094768e77c626f3da49b7f1d1
8SHA1 (patch-ac) = ac6fadd92517a43d7f58e3c8ab888724a440b156 8SHA1 (patch-ac) = ac6fadd92517a43d7f58e3c8ab888724a440b156
9SHA1 (patch-ad) = 507022a52f6f3415678d56929d985f4f07fb9569 9SHA1 (patch-ad) = 507022a52f6f3415678d56929d985f4f07fb9569
10SHA1 (patch-ae) = 630e2bb00a051b08fbb02ff6961f394845172740 10SHA1 (patch-ae) = 630e2bb00a051b08fbb02ff6961f394845172740
cvs diff -r1.3 -r1.4 pkgsrc/x11/xmindpath/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/x11/xmindpath/patches/patch-ab 2007/10/01 11:02:45 1.3
+++ pkgsrc/x11/xmindpath/patches/patch-ab 2012/05/23 07:19:23 1.4
@@ -1,17 +1,21 @@ @@ -1,17 +1,21 @@
1$NetBSD: patch-ab,v 1.3 2007/10/01 11:02:45 rillig Exp $ 1$NetBSD: patch-ab,v 1.4 2012/05/23 07:19:23 dholland Exp $
2 2
3--- main.c.orig 1998-10-01 01:58:17.000000000 +0200 3- use standard headers
4+++ main.c 2007-10-01 12:55:46.375715000 +0200 4- fix solaris build
 5- fd_set isn't a struct
 6
 7--- main.c.orig 1998-09-30 23:58:17.000000000 +0000
 8+++ main.c
5@@ -33,16 +33,20 @@ 9@@ -33,16 +33,20 @@
6 */ 10 */
7  11
8 #include <sys/time.h> 12 #include <sys/time.h>
9+#include <err.h> 13+#include <err.h>
10 #include <stdio.h> 14 #include <stdio.h>
11 #include <unistd.h> 15 #include <unistd.h>
12 #include <stdlib.h> 16 #include <stdlib.h>
13 #include <fcntl.h> 17 #include <fcntl.h>
14 #include <termios.h> 18 #include <termios.h>
15 #include <signal.h> 19 #include <signal.h>
16+#include <string.h> 20+#include <string.h>
17 #include <X11/X.h> 21 #include <X11/X.h>
@@ -46,13 +50,22 @@ $NetBSD: patch-ab,v 1.3 2007/10/01 11:02 @@ -46,13 +50,22 @@ $NetBSD: patch-ab,v 1.3 2007/10/01 11:02
46+ raw.c_oflag &= ~OPOST; 50+ raw.c_oflag &= ~OPOST;
47+ raw.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN); 51+ raw.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
48+ raw.c_cflag &= ~(CSIZE|PARENB); 52+ raw.c_cflag &= ~(CSIZE|PARENB);
49+ raw.c_cflag |= CS8; 53+ raw.c_cflag |= CS8;
50+ cfsetispeed(&raw, B1200); 54+ cfsetispeed(&raw, B1200);
51+ cfsetospeed(&raw, B1200); 55+ cfsetospeed(&raw, B1200);
52+#else 56+#else
53 cfmakeraw(&raw); 57 cfmakeraw(&raw);
54 cfsetspeed(&raw, B1200); 58 cfsetspeed(&raw, B1200);
55+#endif 59+#endif
56 raw.c_cflag &= ~(CSIZE|PARENB|CSTOPB|MDMBUF); 60 raw.c_cflag &= ~(CSIZE|PARENB|CSTOPB|MDMBUF);
57 raw.c_cflag |= CS8|CREAD|CLOCAL; 61 raw.c_cflag |= CS8|CREAD|CLOCAL;
58 tcsetattr(fd, TCSANOW, &raw); 62 tcsetattr(fd, TCSANOW, &raw);
 63@@ -183,7 +204,7 @@ mainloop(fd)
 64 int fd;
 65 {
 66 struct timeval tv;
 67- struct fd_set rfd;
 68+ fd_set rfd;
 69 u_char buf[BUFSIZ];
 70 int nfd;
 71 int len;