Added three patches to make the package work on Solaris.

4 files changed, 118 insertions, 1 deletions

diff --git a/x11/xmindpath/distinfo b/x11/xmindpath/distinfo
index 2df224202b5..1a87fb218c1 100644
--- a/x11/xmindpath/distinfo
+++ b/x11/xmindpath/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 17:36:24 wiz Exp $
+$NetBSD: distinfo,v 1.6 2007/10/01 11:02:44 rillig Exp $
 
 SHA1 (magicpoint-1.09a.tar.gz) = 2903f7c42a30d558677fc1a93607fe7fc8c1fc0f
 RMD160 (magicpoint-1.09a.tar.gz) = 2ee96eed9c9e31d6c599447d421ae319483c3617
 Size (magicpoint-1.09a.tar.gz) = 816234 bytes
 SHA1 (patch-aa) = 8566a9bbab0538509ea5a1b383d357b403f0860c
+SHA1 (patch-ab) = 7d86596abcd15ce1fea3a7b71ee9254facbd371e
+SHA1 (patch-ac) = ac6fadd92517a43d7f58e3c8ab888724a440b156
+SHA1 (patch-ad) = 507022a52f6f3415678d56929d985f4f07fb9569
diff --git a/x11/xmindpath/patches/patch-ab b/x11/xmindpath/patches/patch-ab
new file mode 100644
index 00000000000..79d4da81a06
--- /dev/null
+++ b/x11/xmindpath/patches/patch-ab
@@ -0,0 +1,58 @@
+$NetBSD: patch-ab,v 1.3 2007/10/01 11:02:45 rillig Exp $
+
+--- main.c.orig	1998-10-01 01:58:17.000000000 +0200
++++ main.c	2007-10-01 12:55:46.375715000 +0200
+@@ -33,16 +33,20 @@
+  */
+ 
+ #include <sys/time.h>
++#include <err.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
+ #include <termios.h>
+ #include <signal.h>
++#include <string.h>
+ #include <X11/X.h>
+ #include <X11/extensions/XTest.h>
+ #include <X11/keysym.h>
+ 
++#include "uucplock.h"
++
+ #ifdef X_DISPLAY_MISSING
+ # error this program cannot be compiled without X11.
+ #endif
+@@ -51,6 +55,13 @@
+ # define REMOTE_DEVICE	"/dev/tty02"	/*biased to VAIO505 :-P*/
+ #endif
+ 
++#ifndef __P
++# define __P(X) X
++#endif
++#ifndef MDMBUF
++# define MDMBUF 0
++#endif
++
+ static char *remote = REMOTE_DEVICE;
+ static int debug = 0;
+ #define dprintf(x)	{ if (debug) fprintf x; }
+@@ -144,8 +155,18 @@ main(argc, argv)
+ 	}
+ 	tcgetattr(fd, &old);
+ 	raw = old;
++#if defined(__sun)
++	raw.c_iflag &= ~(IMAXBEL|IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
++	raw.c_oflag &= ~OPOST;
++	raw.c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
++	raw.c_cflag &= ~(CSIZE|PARENB);
++	raw.c_cflag |= CS8;
++	cfsetispeed(&raw, B1200);
++	cfsetospeed(&raw, B1200);
++#else
+ 	cfmakeraw(&raw);
+ 	cfsetspeed(&raw, B1200);
++#endif
+ 	raw.c_cflag &= ~(CSIZE|PARENB|CSTOPB|MDMBUF);
+ 	raw.c_cflag |= CS8|CREAD|CLOCAL;
+ 	tcsetattr(fd, TCSANOW, &raw);
diff --git a/x11/xmindpath/patches/patch-ac b/x11/xmindpath/patches/patch-ac
new file mode 100644
index 00000000000..682be778c09
--- /dev/null
+++ b/x11/xmindpath/patches/patch-ac
@@ -0,0 +1,44 @@
+$NetBSD: patch-ac,v 1.1 2007/10/01 11:02:45 rillig Exp $
+
+--- uucplock.c.orig	1999-12-02 03:58:31.000000000 +0100
++++ uucplock.c	2007-10-01 12:47:24.989964000 +0200
+@@ -35,9 +35,13 @@
+ static char sccsid[] = "@(#)uucplock.c	5.5 (Berkeley) 6/1/90";
+ #endif /* not lint */
+ 
+-#include <sys/file.h>
+-#include <sys/dir.h>
++#include <dirent.h>
+ #include <errno.h>
++#include <fcntl.h>
++#include <signal.h>
++#include <stdio.h>
++#include <string.h>
++#include <unistd.h>
+ 
+ #include "pathnames.h"
+ 
+@@ -47,13 +51,12 @@ static char sccsid[] = "@(#)uucplock.c	5
+  * 	  -1 - failure
+  */
+ 
++int
+ uu_lock(ttyname)
+ 	char *ttyname;
+ {
+-	extern int errno;
+ 	int fd, pid;
+ 	char tbuf[sizeof(_PATH_LOCKDIRNAME) + MAXNAMLEN];
+-	off_t lseek();
+ 
+ 	(void)snprintf(tbuf, sizeof(tbuf), _PATH_LOCKDIRNAME, ttyname);
+ 	fd = open(tbuf, O_RDWR|O_CREAT|O_EXCL, 0664);
+@@ -81,7 +84,7 @@ uu_lock(ttyname)
+ 		 * The process that locked the file isn't running, so
+ 		 * we'll lock it ourselves
+ 		 */
+-		if (lseek(fd, 0L, L_SET) < 0) {
++		if (lseek(fd, 0L, SEEK_SET) < 0) {
+ 			(void)close(fd);
+ 			perror("lock lseek");
+ 			return(-1);
diff --git a/x11/xmindpath/patches/patch-ad b/x11/xmindpath/patches/patch-ad
new file mode 100644
index 00000000000..43fe8fce259
--- /dev/null
+++ b/x11/xmindpath/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2007/10/01 11:02:45 rillig Exp $
+
+--- uucplock.h.orig	2007-10-01 12:47:25.072297000 +0200
++++ uucplock.h	2007-10-01 12:47:25.072925000 +0200
+@@ -0,0 +1,7 @@
++#ifndef UUCPLOCK_H
++#define UUCPLOCK_H
++
++extern int uu_lock(char *);
++extern int uu_unlock(char *);
++
++#endif