[pkgsrc/trunk]: pkgsrc/editors/TeXmacs Fix build on DragonFly. Should be easy...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/03113e5ce4f5
branches:  trunk
changeset: 532758:03113e5ce4f5
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Aug 30 13:46:03 2007 +0000

description:
Fix build on DragonFly. Should be easy to adopt for other systems
lacking pselect.

diffstat:

 editors/TeXmacs/distinfo         |   4 ++--
 editors/TeXmacs/patches/patch-aj |  39 +++++++++++++++++++++++++++++++++++----
 2 files changed, 37 insertions(+), 6 deletions(-)

diffs (67 lines):

diff -r 12541aec5158 -r 03113e5ce4f5 editors/TeXmacs/distinfo
--- a/editors/TeXmacs/distinfo  Thu Aug 30 13:31:45 2007 +0000
+++ b/editors/TeXmacs/distinfo  Thu Aug 30 13:46:03 2007 +0000
@@ -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-ae) = c313a19db160d9f1c0dc950a1eb465869cec777f
 SHA1 (patch-ag) = 2b1c0ce4aa0f6b824f08f05a95beacbb1722436b
 SHA1 (patch-ai) = 10c6e74b4b1b9b38a5da071f0ad00780ae8aa419
-SHA1 (patch-aj) = c6c3d07838bec0d92413d754409e2f703383c6c1
+SHA1 (patch-aj) = 8f07479a6857900b535a0fd7b1f61043164baf15
diff -r 12541aec5158 -r 03113e5ce4f5 editors/TeXmacs/patches/patch-aj
--- a/editors/TeXmacs/patches/patch-aj  Thu Aug 30 13:31:45 2007 +0000
+++ b/editors/TeXmacs/patches/patch-aj  Thu Aug 30 13:46:03 2007 +0000
@@ -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 ) ;