make it work for NetBSD-current

6 files changed, 70 insertions, 32 deletions

diff --git a/sysutils/strace/Makefile b/sysutils/strace/Makefile
index 713df3eabdf..d87f65d0861 100644
--- a/sysutils/strace/Makefile
+++ b/sysutils/strace/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2010/10/09 11:55:22 obache Exp $
+# $NetBSD: Makefile,v 1.16 2011/08/30 10:43:11 christos Exp $
 #
 
 DISTNAME=		strace-4.5.15
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=strace/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/strace/distinfo b/sysutils/strace/distinfo
index 54aaf22fe76..e269ae98ab0 100644
--- a/sysutils/strace/distinfo
+++ b/sysutils/strace/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2011/01/25 22:22:15 shattered Exp $
+$NetBSD: distinfo,v 1.16 2011/08/30 10:43:11 christos Exp $
 
 SHA1 (strace-4.5.15.tar.bz2) = a6bd153eeb1a25a50bb5a1d92887a4911ec9ad48
 RMD160 (strace-4.5.15.tar.bz2) = 0c6aaa8820a0985d89b21a5da9578b27435c8906
@@ -12,25 +12,25 @@ SHA1 (patch-af) = 6cc8ea3dddff21d99b9b92e7535a4524a2a15a75
 SHA1 (patch-ag) = 3368bd7a2fca807cc093090c6a1a9e2d3c81bfb0
 SHA1 (patch-ah) = 72d6fd1cd92c22b5215f87fcf268fd375b3f7803
 SHA1 (patch-ai) = 01430e21dd0e6d2e19f93fab8846a3464ee5e7a0
-SHA1 (patch-aj) = 53b2cfec02de87ead5eef202e880b739ab8dbc07
+SHA1 (patch-aj) = 7aa9cce398f73191a968118ce8c67703d8363045
 SHA1 (patch-ak) = 1b82f68c3a21bc24ce464f64bc91081a71f36199
 SHA1 (patch-al) = ea408e93a15c5fdd8054a65b409c60536ca928eb
 SHA1 (patch-am) = edb9a6a4b76b6f0a39427562fe96a73fea3ecf4a
 SHA1 (patch-an) = 23b55878f0f7c6b83b937219a3c730ec5c6cb7ea
 SHA1 (patch-ao) = 90c47a7437204258b7d17986f5a5a94a196d0a38
 SHA1 (patch-ap) = 8ed16f25eb9ef1c9c1499a77e7f39bf23d50e209
-SHA1 (patch-aq) = 41aa25ad9c1603e3202ec6dd381d4f6687ff5df0
+SHA1 (patch-aq) = e900e4025525a598b0b1c7ce9586cd5fecd63093
 SHA1 (patch-ar) = 12b13f8b7e2054cbe57da6b502f3fe49b91de9ff
 SHA1 (patch-as) = b241a70fb33aabb8282578a124b04aca05f0d3f2
 SHA1 (patch-at) = da44d0101eb069ea231bdce7051af357e43cb3d1
 SHA1 (patch-au) = 39ce7d7234ac3df0a7db24d0310989015b981a91
-SHA1 (patch-av) = 3ef234b5b6430744c91f6862afff1d733857dac9
+SHA1 (patch-av) = edad2a6a0251992fcecd1e05868ab9a173a00911
 SHA1 (patch-aw) = 6d9c8243df401fb18e621c8965667778640c9d01
 SHA1 (patch-ax) = 6bb4fdfaf26f9ded736f0aa8f0209815ccbea199
 SHA1 (patch-ay) = 9a6942117fc4d26a9256a573559597560295d9c0
 SHA1 (patch-az) = af6272c48668785dffd7c5b42b8fa2c8edb562d0
 SHA1 (patch-ba) = be8e2f79bd8818b99bdce63fb73802f1a4014b2f
 SHA1 (patch-bb) = e7e309d96ec9fa2398a968f29f7e6549ff81e37e
-SHA1 (patch-bc) = eebc8220e7cc04c44d1e99e6bafc498dca1db5ac
+SHA1 (patch-bc) = 051f1efbbb319dc06153736ac44677f65ea13cd0
 SHA1 (patch-bd) = 6ad13b8b0130886cc87218d9acfe46d8f9fc82ef
 SHA1 (patch-be) = 6326b50b3d9be0524d67770d67530069866edd9e
diff --git a/sysutils/strace/patches/patch-aj b/sysutils/strace/patches/patch-aj
index 300e3c05e5c..e993eed3c1a 100644
--- a/sysutils/strace/patches/patch-aj
+++ b/sysutils/strace/patches/patch-aj
@@ -1,10 +1,10 @@
-$NetBSD: patch-aj,v 1.4 2008/05/08 20:03:03 christos Exp $
+$NetBSD: patch-aj,v 1.5 2011/08/30 10:43:11 christos Exp $
 
---- /dev/null	2008-05-08 16:01:35.000000000 -0400
-+++ netbsd/ioctlent.sh	2008-05-08 15:54:29.000000000 -0400
-@@ -0,0 +1,125 @@
+--- /dev/null	2011-08-30 13:38:39.000000000 +0300
++++ netbsd/ioctlent.sh	2011-08-30 12:45:46.000000000 +0300
+@@ -0,0 +1,126 @@
 +#!/bin/sh
-+#	$NetBSD: patch-aj,v 1.4 2008/05/08 20:03:03 christos Exp $
++#	$NetBSD: patch-aj,v 1.5 2011/08/30 10:43:11 christos Exp $
 +#
 +# Copyright (c) 1994
 +#	The Regents of the University of California.  All rights reserved.
@@ -48,6 +48,7 @@ $NetBSD: patch-aj,v 1.4 2008/05/08 20:03:03 christos Exp $
 +echo "struct videomemory_t { int _xxx; };" # XXX arm video lossage
 +echo "typedef struct videomemory_t videomemory_t;" # XXX arm video lossage
 +echo "typedef int domid_t;" # XEN lossage
++echo "typedef int xen_pfn_t;" # XEN lossage
 +
 +echo "#include <sys/types.h>"
 +echo "#include <sys/param.h>"
diff --git a/sysutils/strace/patches/patch-aq b/sysutils/strace/patches/patch-aq
index dbe412674db..6e123553061 100644
--- a/sysutils/strace/patches/patch-aq
+++ b/sysutils/strace/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.3 2007/12/05 16:31:01 christos Exp $
+$NetBSD: patch-aq,v 1.4 2011/08/30 10:43:11 christos Exp $
 
---- signal.c.orig	2007-01-11 17:08:38.000000000 -0500
-+++ signal.c	2007-12-05 11:22:31.000000000 -0500
+--- signal.c.orig	2007-01-12 00:08:38.000000000 +0200
++++ signal.c	2011-08-30 12:50:29.000000000 +0300
 @@ -36,12 +36,27 @@
  #include "defs.h"
  
@@ -48,6 +48,38 @@ $NetBSD: patch-aq,v 1.3 2007/12/05 16:31:01 christos Exp $
  
  #endif /* !SVR4 */
  
+@@ -1165,13 +1180,13 @@
+ 		printsignal(tcp->u_arg[0]);
+ 		tprintf(", ");
+ 		switch (tcp->u_arg[1]) {
+-		case (int) SIG_ERR:
++		case (long) SIG_ERR:
+ 			tprintf("SIG_ERR");
+ 			break;
+-		case (int) SIG_DFL:
++		case (long) SIG_DFL:
+ 			tprintf("SIG_DFL");
+ 			break;
+-		case (int) SIG_IGN:
++		case (long) SIG_IGN:
+ #ifndef USE_PROCFS
+ 			if (tcp->u_arg[0] == SIGTRAP) {
+ 				tcp->flags |= TCB_SIGTRAPPED;
+@@ -1193,11 +1208,11 @@
+ 	}
+ 	else {
+ 		switch (tcp->u_rval) {
+-		    case (int) SIG_ERR:
++		    case (long) SIG_ERR:
+ 			tcp->auxstr = "SIG_ERR"; break;
+-		    case (int) SIG_DFL:
++		    case (long) SIG_DFL:
+ 			tcp->auxstr = "SIG_DFL"; break;
+-		    case (int) SIG_IGN:
++		    case (long) SIG_IGN:
+ 			tcp->auxstr = "SIG_IGN"; break;
+ 		    default:
+ 			tcp->auxstr = NULL;
 @@ -1489,7 +1504,7 @@
  
  #endif /* LINUX */
diff --git a/sysutils/strace/patches/patch-av b/sysutils/strace/patches/patch-av
index 0f332c4e91f..73f7c927e4f 100644
--- a/sysutils/strace/patches/patch-av
+++ b/sysutils/strace/patches/patch-av
@@ -1,8 +1,8 @@
-$NetBSD: patch-av,v 1.2 2008/10/30 17:12:44 christos Exp $
+$NetBSD: patch-av,v 1.3 2011/08/30 10:43:11 christos Exp $
 
---- 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 @@
+--- syscalls.pl.orig 2011-08-30 13:27:50.000000000 +0300
++++ syscalls.pl	2011-08-30 12:41:16.000000000 +0300
+@@ -0,0 +1,171 @@
 +#!/usr/pkg/bin/perl -w
 +#
 +# Copyright (c) 2000, Gaël Roualland <gael.roualland@iname.com>
@@ -30,7 +30,7 @@ $NetBSD: patch-av,v 1.2 2008/10/30 17:12:44 christos Exp $
 +# (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.2 2008/10/30 17:12:44 christos Exp $
++#      $Id: patch-av,v 1.3 2011/08/30 10:43:11 christos Exp $
 +#/
 +
 +# Buils syscall.h and syscallent.h from:
@@ -117,8 +117,7 @@ $NetBSD: patch-av,v 1.2 2008/10/30 17:12:44 christos Exp $
 +
 +    if (/^(\d+)\s+(\w+)\s+\{\s*([^}]+)\s*\}([^}]*)$/ ||
 +	/^(\d+)\s+(\w+)\s+\w+\s+\{\s*([^}]+)\s*\}([^}]*)$/) {
-+	my($compat, $proto, $ext, $name, $nargs, @args, $pfunc, $cat, $num);
-+
++	my($compat, $proto, $ext, $name, $nargs, @fun, @args, $pfunc, $cat, $num);
 +	$num = $1;
 +	if ($2 eq 'OBSOL' || $2 eq 'UNIMPL') {
 +	    $sysnum++;
@@ -143,13 +142,15 @@ $NetBSD: patch-av,v 1.2 2008/10/30 17:12:44 christos Exp $
 +	    warn "error in master file: syscall $num found, expecting $sysnum.";
 +	    next;
 +	}
++
++	# int|sys||name(args);
++	@fun = split(/\|/, $proto);
 +	
-+	if ($proto =~ /^[^\s]+\s+([^\s]+)\s*\(([^)]*)\);/) {
++	if ($fun[3] =~ /^(\w+)\(([^)]*)\); /) {
 +	    my @args = split(/,/, $2);
 +	    $nargs = @args;
 +	    $name = $1;
-+	    $name = substr($name, 1) if (substr($name, 0, 1) eq "*");
-+	    $name = substr($name, 4);
++	    $name = "__" . $name . $fun[2] if ($fun[2] ne "");
 +	    if (defined($sysprint{$name})) {
 +		$pfunc = $sysprint{$name};
 +		print SYSCALL "int $pfunc();\n";
@@ -165,7 +166,7 @@ $NetBSD: patch-av,v 1.2 2008/10/30 17:12:44 christos Exp $
 +	    print "  { $nargs,\t$cat,\t$pfunc,\t\"$name\"\t}, /* $sysnum */\n";
 +	    $sysnum++;
 +	} else {
-+	    warn "bad syscall specification for $sysnum: $proto";
++	    warn "bad syscall specification for $sysnum: >$fun[3]<";
 +	}
 +    } else {
 +	# warn "unregognized line $_";
diff --git a/sysutils/strace/patches/patch-bc b/sysutils/strace/patches/patch-bc
index 5db2bf5cdc1..fa4d1fa4eb2 100644
--- a/sysutils/strace/patches/patch-bc
+++ b/sysutils/strace/patches/patch-bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-bc,v 1.1 2007/12/05 16:31:01 christos Exp $
+$NetBSD: patch-bc,v 1.2 2011/08/30 10:43:11 christos Exp $
 
---- quota.c.orig	2006-10-15 20:30:53.000000000 -0400
-+++ quota.c	2007-12-05 11:04:38.000000000 -0500
-@@ -687,13 +687,13 @@
+--- quota.c.orig	2006-10-16 03:30:53.000000000 +0300
++++ quota.c	2011-08-30 12:49:51.000000000 +0300
+@@ -687,14 +687,17 @@
  
  #endif /* Linux */
  
@@ -16,9 +16,13 @@ $NetBSD: patch-bc,v 1.1 2007/12/05 16:31:01 christos Exp $
 -#ifdef FREEBSD
 +#ifdef ALLBSD
  #include <ufs/ufs/quota.h>
++#ifdef __NetBSD__
++#include <ufs/ufs/quota1.h>
++#endif
  #endif
  
-@@ -723,7 +723,7 @@
+ static const struct xlat quotacmds[] = {
+@@ -723,7 +726,7 @@
  		tprintf(", ");
  		printstr(tcp, tcp->u_arg[1], -1);
  #endif
@@ -27,7 +31,7 @@ $NetBSD: patch-bc,v 1.1 2007/12/05 16:31:01 christos Exp $
  		printpath(tcp, tcp->u_arg[0]);
  		tprintf(", ");
  		printxval(quotacmds, tcp->u_arg[1], "Q_???");
-@@ -733,4 +733,4 @@
+@@ -733,4 +736,4 @@
  	return 0;
  }