[pkgsrc/trunk]: pkgsrc/textproc/qsubst use posix signals if available [no fun...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ef3dd593ee1
branches:  trunk
changeset: 512894:6ef3dd593ee1
user:      christos <christos%pkgsrc.org@localhost>
date:      Tue May 16 18:43:44 2006 +0000

description:
use posix signals if available [no functional change]

diffstat:

 textproc/qsubst/distinfo         |   4 ++--
 textproc/qsubst/patches/patch-ab |  36 ++++++++++++++++++++++++++++++------
 2 files changed, 32 insertions(+), 8 deletions(-)

diffs (86 lines):

diff -r 14a430f42736 -r 6ef3dd593ee1 textproc/qsubst/distinfo
--- a/textproc/qsubst/distinfo  Tue May 16 18:30:20 2006 +0000
+++ b/textproc/qsubst/distinfo  Tue May 16 18:43:44 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/03/24 16:27:40 christos Exp $
+$NetBSD: distinfo,v 1.6 2006/05/16 18:43:44 christos Exp $
 
 SHA1 (qsubst-20010422.tar.gz) = 9602b274ff10266b94a96adc90ded003f8cdeda8
 RMD160 (qsubst-20010422.tar.gz) = 443d5d5d2a014a286f436685c9e188255b6acd0a
 Size (qsubst-20010422.tar.gz) = 5965 bytes
 SHA1 (patch-aa) = d7ff425da3ddfaca2385e5d849457e74c89acfff
-SHA1 (patch-ab) = 913cbd6afe72636a3e6d157ecf4f6fc6cb6269bb
+SHA1 (patch-ab) = 1b740a8e82e0c6f20948b42cb03371fd028145fd
diff -r 14a430f42736 -r 6ef3dd593ee1 textproc/qsubst/patches/patch-ab
--- a/textproc/qsubst/patches/patch-ab  Tue May 16 18:30:20 2006 +0000
+++ b/textproc/qsubst/patches/patch-ab  Tue May 16 18:43:44 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2005/03/24 16:27:40 christos Exp $
+$NetBSD: patch-ab,v 1.3 2006/05/16 18:43:45 christos Exp $
 
 --- qsubst.c.orig      2001-04-22 01:35:35.000000000 -0400
-+++ qsubst.c   2005-03-24 11:23:34.000000000 -0500
++++ qsubst.c   2006-05-16 14:39:11.923906738 -0400
 @@ -105,7 +105,7 @@
  #include <signal.h>
  #include <stdio.h>
@@ -11,7 +11,31 @@
  #include <termcap.h>
  #include <termios.h>
  #include <unistd.h>
-@@ -166,9 +166,9 @@
+@@ -148,12 +148,23 @@
+ static void tstp_self(void)
+ {
+  void (*old_tstp)(int);
++#ifndef SIG_BLOCK
+  int mask;
+ 
+  mask = sigblock(0);
++#else
++ sigset_t set, oset;
++ sigemptyset(&set);
++ sigprocmask(SIG_BLOCK, &set, &oset);
++#endif
+  kill(getpid(),SIGTSTP);
+  old_tstp = signal(SIGTSTP,SIG_DFL);
++#ifndef SIG_BLOCK
+  sigsetmask(mask&~sigmask(SIGTSTP));
++#else
++ sigdelset(&oset, SIGTSTP);
++ sigprocmask(SIG_SETMASK, &set, &oset);
++#endif
+  signal(SIGTSTP,old_tstp);
+ }
+ 
+@@ -166,9 +177,9 @@
    { tstp_self();
      return;
    }
@@ -23,7 +47,7 @@
  }
  
  static void limit_above_below(void)
-@@ -181,7 +181,7 @@
+@@ -181,7 +192,7 @@
    }
  }
  
@@ -32,7 +56,7 @@
  {
   return( isascii(c) &&
         ( isalnum(c) ||
-@@ -231,7 +231,7 @@
+@@ -231,7 +242,7 @@
   tio.c_lflag &= ~(ICANON|ECHOKE|ECHOE|ECHO|ECHONL);
   tio.c_cc[VMIN] = 1;
   tio.c_cc[VTIME] = 0;
@@ -41,7 +65,7 @@
   switch (read(0,&c,1))
    { case -1:
         break;
-@@ -240,7 +240,7 @@
+@@ -240,7 +251,7 @@
      case 1:
         break;
    }