diff options
-rw-r--r-- | emulators/BasiliskII/Makefile | 8 | ||||
-rw-r--r-- | emulators/BasiliskII/distinfo | 4 | ||||
-rw-r--r-- | emulators/BasiliskII/patches/patch-ad | 68 |
3 files changed, 71 insertions, 9 deletions
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile index 6c61bc7df6d..1441524608a 100644 --- a/emulators/BasiliskII/Makefile +++ b/emulators/BasiliskII/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2004/04/11 17:09:54 snj Exp $ +# $NetBSD: Makefile,v 1.16 2004/07/17 01:56:38 xtraeme Exp $ DISTNAME= BasiliskII_src_14032003 PKGNAME= BasiliskII-1.0.20030314 @@ -16,7 +16,11 @@ GNU_CONFIGURE= yes USE_GNU_TOOLS+= make USE_LANGUAGES= c c++ USE_X11= yes -CONFIGURE_ARGS+=--without-gtk --without-esd --disable-fbdev-dga --without-mon + +CONFIGURE_ARGS+= --without-gtk \ + --without-esd \ + --disable-fbdev-dga \ + --without-mon post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/BasiliskII diff --git a/emulators/BasiliskII/distinfo b/emulators/BasiliskII/distinfo index 2c73b81b8aa..67e672a4a36 100644 --- a/emulators/BasiliskII/distinfo +++ b/emulators/BasiliskII/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2004/01/23 08:42:14 agc Exp $ +$NetBSD: distinfo,v 1.7 2004/07/17 01:56:38 xtraeme Exp $ SHA1 (BasiliskII_src_14032003.tar.bz2) = 935e00e1401fc5dfaad7ac7d54184265bab0aeb8 Size (BasiliskII_src_14032003.tar.bz2) = 649594 bytes SHA1 (patch-aa) = e41d9a3a932bb312e2ea35372c4e46a45f0fcae9 SHA1 (patch-ab) = 17c94164ece847bd5695e8fb79ff5132c3c53859 SHA1 (patch-ac) = c74b28008032f8f31cbee1085d4873c36c7e71a5 -SHA1 (patch-ad) = 79b26444ea6c2b022ed219f04eb1ae45762cedfc +SHA1 (patch-ad) = c3bc05f1387c07bc0b4fc60e54a6c5f935a80785 diff --git a/emulators/BasiliskII/patches/patch-ad b/emulators/BasiliskII/patches/patch-ad index f64ceb5ef9c..c52973a1db3 100644 --- a/emulators/BasiliskII/patches/patch-ad +++ b/emulators/BasiliskII/patches/patch-ad @@ -1,8 +1,66 @@ -$NetBSD: patch-ad,v 1.1 2004/01/23 08:42:14 agc Exp $ +$NetBSD: patch-ad,v 1.2 2004/07/17 01:56:38 xtraeme Exp $ ---- sshpty.c 2004/01/23 07:41:29 1.1 -+++ sshpty.c 2004/01/23 07:52:50 -@@ -276,7 +276,7 @@ +--- sshpty.c.orig 2003-03-14 20:17:27.000000000 +0100 ++++ sshpty.c 2004-07-17 03:54:38.000000000 +0200 +@@ -18,6 +18,7 @@ + /* Selections from openssh's "includes.h" */ + #include "config.h" + ++#include <signal.h> + #include <stdio.h> + #include <ctype.h> + #include <errno.h> +@@ -144,19 +145,30 @@ + */ + int ptm; + char *pts; ++#ifdef __sunos__ + mysig_t old_signal; +- ++#else ++ sig_t old_signal; ++#endif + ptm = open("/dev/ptmx", O_RDWR | O_NOCTTY); + if (ptm < 0) { + error("/dev/ptmx: %.100s", strerror(errno)); + return 0; + } ++#ifdef __sunos__ + old_signal = mysignal(SIGCHLD, SIG_DFL); ++#else ++ old_signal = signal(SIGCHLD, SIG_DFL); ++#endif + if (grantpt(ptm) < 0) { + error("grantpt: %.100s", strerror(errno)); + return 0; + } ++#ifdef __sunos__ + mysignal(SIGCHLD, old_signal); ++#else ++ signal(SIGCHLD, old_signal); ++#endif + if (unlockpt(ptm) < 0) { + error("unlockpt: %.100s", strerror(errno)); + return 0; +@@ -174,7 +186,7 @@ + close(*ptyfd); + return 0; + } +-#ifndef HAVE_CYGWIN ++#if !defined(__NetBSD__) + /* + * Push the appropriate streams modules, as described in Solaris pts(7). + * HP-UX pts(7) doesn't have ttcompat module. +@@ -183,7 +195,7 @@ + error("ioctl I_PUSH ptem: %.100s", strerror(errno)); + if (ioctl(*ttyfd, I_PUSH, "ldterm") < 0) + error("ioctl I_PUSH ldterm: %.100s", strerror(errno)); +-#ifndef __hpux ++#if !defined(__NetBSD__) + if (ioctl(*ttyfd, I_PUSH, "ttcompat") < 0) + error("ioctl I_PUSH ttcompat: %.100s", strerror(errno)); + #endif +@@ -276,7 +288,7 @@ } /* set tty modes to a sane state for broken clients */ if (tcgetattr(*ptyfd, &tio) < 0) @@ -11,7 +69,7 @@ $NetBSD: patch-ad,v 1.1 2004/01/23 08:42:14 agc Exp $ else { tio.c_lflag |= (ECHO | ISIG | ICANON); tio.c_oflag |= (OPOST | ONLCR); -@@ -284,7 +284,7 @@ +@@ -284,7 +296,7 @@ /* Set the new modes for the terminal. */ if (tcsetattr(*ptyfd, TCSANOW, &tio) < 0) |