diff options
| author | joerg <joerg@pkgsrc.org> | 2007-08-30 13:46:03 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-08-30 13:46:03 +0000 |
| commit | 49fed291e3e9a6bb96c35d5ae088c5684d55a7e9 (patch) | |
| tree | b0791c7783266b51611bb0b0862f972dd004e632 /editors/TeXmacs | |
| parent | 5ae5b7634c7712275e6690588de6cc8b688e0433 (diff) | |
| download | pkgsrc-49fed291e3e9a6bb96c35d5ae088c5684d55a7e9.tar.gz | |
Fix build on DragonFly. Should be easy to adopt for other systems
lacking pselect.
Diffstat (limited to 'editors/TeXmacs')
| -rw-r--r-- | editors/TeXmacs/distinfo | 4 | ||||
| -rw-r--r-- | editors/TeXmacs/patches/patch-aj | 39 |
2 files changed, 37 insertions, 6 deletions
diff --git a/editors/TeXmacs/distinfo b/editors/TeXmacs/distinfo index 72426e3fc68..7e5781b974e 100644 --- a/editors/TeXmacs/distinfo +++ b/editors/TeXmacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.46 2007/08/09 19:16:25 drochner Exp $ +$NetBSD: distinfo,v 1.47 2007/08/30 13:46:03 joerg Exp $ SHA1 (TeXmacs-1.0.6.10-src.tar.gz) = 0774bded87ff0fa373e048aeac91f171db95e151 RMD160 (TeXmacs-1.0.6.10-src.tar.gz) = 11ce6db065e6d7a060fecdd10e726320f88a11e6 @@ -10,4 +10,4 @@ SHA1 (patch-ad) = f36da65f9e9a808a4a8af4a41af0b4388f2c18fd SHA1 (patch-ae) = c313a19db160d9f1c0dc950a1eb465869cec777f SHA1 (patch-ag) = 2b1c0ce4aa0f6b824f08f05a95beacbb1722436b SHA1 (patch-ai) = 10c6e74b4b1b9b38a5da071f0ad00780ae8aa419 -SHA1 (patch-aj) = c6c3d07838bec0d92413d754409e2f703383c6c1 +SHA1 (patch-aj) = 8f07479a6857900b535a0fd7b1f61043164baf15 diff --git a/editors/TeXmacs/patches/patch-aj b/editors/TeXmacs/patches/patch-aj index 0bed49f5575..96aba5f8516 100644 --- a/editors/TeXmacs/patches/patch-aj +++ b/editors/TeXmacs/patches/patch-aj @@ -1,13 +1,44 @@ -$NetBSD: patch-aj,v 1.4 2007/08/09 19:16:25 drochner Exp $ +$NetBSD: patch-aj,v 1.5 2007/08/30 13:46:03 joerg Exp $ ---- plugins/r/src/tm_r.c.orig 2007-08-05 21:28:21.000000000 +0200 +--- plugins/r/src/tm_r.c.orig 2007-05-15 17:54:35.000000000 +0000 +++ plugins/r/src/tm_r.c -@@ -11,7 +11,7 @@ +@@ -11,7 +11,13 @@ #include <stdio.h> #include <sys/select.h> --#include <pty.h> ++#if defined(__DragonFly__) || defined(__FreeBSD__) ++#include <libutil.h> ++#elif defined(__NetBSD__) || defined(__OpenBSD__) +#include <util.h> ++#else + #include <pty.h> ++#endif #include <utmp.h> #include <unistd.h> #include <termios.h> +@@ -344,6 +350,10 @@ int main(int arc, char *argv[]) + char *TEXMACS_PATH, *TEXMACS_R, *TEXMACS_SEND, *TEXMACS_LIB ; + struct termios termi ; + sigset_t sigmask, orig_sigmask; ++#if defined(__DragonFly__) ++ sigset_t cur_sigmask; ++ int select_retval; ++#endif + + struct stat stat_buf; + +@@ -466,7 +476,14 @@ int main(int arc, char *argv[]) + #endif + + /* Main pselect switch --------------- */ ++#if defined(__DragonFly__) ++ sigprocmask(SIG_SETMASK, &orig_sigmask, &cur_sigmask); ++ select_retval = select( master+1, &rd, &wr, &er, NULL ); ++ sigprocmask(SIG_SETMASK, &cur_sigmask, NULL); ++ if ( select_retval > 0) { ++#else + if( pselect( master+1, &rd, &wr, &er, NULL, &orig_sigmask ) > 0 ) { ++#endif + if( FD_ISSET( STDIN_FILENO, &rd ) ) { + /* =============== read input from TeXmacs */ + nread = read_B( STDIN_FILENO, RB, 1000 ) ; |