[pkgsrc/trunk]: pkgsrc/sysutils/strace don't print warnings for #ifdef'ed sys...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8be6c5abc68a
branches:  trunk
changeset: 549258:8be6c5abc68a
user:      christos <christos%pkgsrc.org@localhost>
date:      Thu Oct 30 17:12:44 2008 +0000

description:
don't print warnings for #ifdef'ed syscalls with the same number.

diffstat:

 sysutils/strace/distinfo         |   4 ++--
 sysutils/strace/patches/patch-av |  15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diffs (59 lines):

diff -r afd763acf7c4 -r 8be6c5abc68a sysutils/strace/distinfo
--- a/sysutils/strace/distinfo  Thu Oct 30 16:35:08 2008 +0000
+++ b/sysutils/strace/distinfo  Thu Oct 30 17:12:44 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2008/05/08 20:03:26 christos Exp $
+$NetBSD: distinfo,v 1.10 2008/10/30 17:12:44 christos Exp $
 
 SHA1 (strace-4.5.15.tar.bz2) = a6bd153eeb1a25a50bb5a1d92887a4911ec9ad48
 RMD160 (strace-4.5.15.tar.bz2) = 0c6aaa8820a0985d89b21a5da9578b27435c8906
@@ -24,7 +24,7 @@
 SHA1 (patch-as) = b241a70fb33aabb8282578a124b04aca05f0d3f2
 SHA1 (patch-at) = da44d0101eb069ea231bdce7051af357e43cb3d1
 SHA1 (patch-au) = 44dc141b5877866ff452211a57f2ebf6fd63a0d0
-SHA1 (patch-av) = fc31e45bf956cf5ddc09e01a7b1a02f15ece7968
+SHA1 (patch-av) = fd5341cb658718f272931c3b8ea5f30f1b4f16ee
 SHA1 (patch-aw) = 6d9c8243df401fb18e621c8965667778640c9d01
 SHA1 (patch-ax) = 6bb4fdfaf26f9ded736f0aa8f0209815ccbea199
 SHA1 (patch-ay) = 9a6942117fc4d26a9256a573559597560295d9c0
diff -r afd763acf7c4 -r 8be6c5abc68a sysutils/strace/patches/patch-av
--- a/sysutils/strace/patches/patch-av  Thu Oct 30 16:35:08 2008 +0000
+++ b/sysutils/strace/patches/patch-av  Thu Oct 30 17:12:44 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.1 2007/04/27 19:45:02 christos Exp $
+$NetBSD: patch-av,v 1.2 2008/10/30 17:12:44 christos Exp $
 
---- /dev/null  2007-04-26 23:20:40.000000000 -0400
-+++ netbsd/syscalls.pl 2007-04-27 14:38:18.000000000 -0400
-@@ -0,0 +1,167 @@
+--- syscalls.pl.orig   2008-10-30 11:38:04.000000000 -0400
++++ syscalls.pl        2008-10-30 11:53:07.000000000 -0400
+@@ -0,0 +1,170 @@
 +#!/usr/pkg/bin/perl -w
 +#
 +# Copyright (c) 2000, Gaël Roualland <gael.roualland%iname.com@localhost>
@@ -30,7 +30,7 @@
 +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 +#
-+#      $Id: patch-av,v 1.1 2007/04/27 19:45:02 christos Exp $
++#      $Id: patch-av,v 1.2 2008/10/30 17:12:44 christos Exp $
 +#/
 +
 +# Buils syscall.h and syscallent.h from:
@@ -139,7 +139,8 @@
 +              $sysnum++;
 +          }
 +      } elsif ($num < $sysnum) {
-+          warn "error in master file: syscall $1 found, expecting $sysnum.";
++          next if ($num == $sysnum - 1); # perhaps #ifdef
++          warn "error in master file: syscall $num found, expecting $sysnum.";
 +          next;
 +      }
 +      
@@ -170,3 +171,5 @@
 +      # warn "unregognized line $_";
 +    }
 +}
++close(MASTER);
++exit 0;