make this compile again.

6 files changed, 42 insertions, 31 deletions

diff --git a/sysutils/strace/Makefile b/sysutils/strace/Makefile
index 73ea7c0b307..f2139e435b9 100644
--- a/sysutils/strace/Makefile
+++ b/sysutils/strace/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2016/07/09 06:39:02 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2017/06/27 15:26:05 christos Exp $
 #
 
 DISTNAME=		strace-4.5.15
-PKGREVISION=		9
+PKGREVISION=		10
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=strace/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/strace/distinfo b/sysutils/strace/distinfo
index 9e5a58d14da..72f1732c661 100644
--- a/sysutils/strace/distinfo
+++ b/sysutils/strace/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2015/11/04 01:32:32 agc Exp $
+$NetBSD: distinfo,v 1.20 2017/06/27 15:26:05 christos Exp $
 
 SHA1 (strace-4.5.15.tar.bz2) = a6bd153eeb1a25a50bb5a1d92887a4911ec9ad48
 RMD160 (strace-4.5.15.tar.bz2) = 0c6aaa8820a0985d89b21a5da9578b27435c8906
@@ -13,7 +13,7 @@ SHA1 (patch-af) = 6cc8ea3dddff21d99b9b92e7535a4524a2a15a75
 SHA1 (patch-ag) = 3368bd7a2fca807cc093090c6a1a9e2d3c81bfb0
 SHA1 (patch-ah) = 72d6fd1cd92c22b5215f87fcf268fd375b3f7803
 SHA1 (patch-ai) = 01430e21dd0e6d2e19f93fab8846a3464ee5e7a0
-SHA1 (patch-aj) = 7aa9cce398f73191a968118ce8c67703d8363045
+SHA1 (patch-aj) = ec6ec95479392b0b75224d4282a7dba73896f767
 SHA1 (patch-ak) = 1b82f68c3a21bc24ce464f64bc91081a71f36199
 SHA1 (patch-al) = ea408e93a15c5fdd8054a65b409c60536ca928eb
 SHA1 (patch-am) = edb9a6a4b76b6f0a39427562fe96a73fea3ecf4a
@@ -23,10 +23,10 @@ SHA1 (patch-ap) = 8ed16f25eb9ef1c9c1499a77e7f39bf23d50e209
 SHA1 (patch-aq) = e900e4025525a598b0b1c7ce9586cd5fecd63093
 SHA1 (patch-ar) = 12b13f8b7e2054cbe57da6b502f3fe49b91de9ff
 SHA1 (patch-as) = b241a70fb33aabb8282578a124b04aca05f0d3f2
-SHA1 (patch-at) = da44d0101eb069ea231bdce7051af357e43cb3d1
-SHA1 (patch-au) = 39ce7d7234ac3df0a7db24d0310989015b981a91
+SHA1 (patch-at) = 22107308d404984f6b1231ddca10bbc05bec864f
+SHA1 (patch-au) = f457bd074e88dd457c16b921645f42fd744d3cb7
 SHA1 (patch-av) = fa71fcd3a91f2ed58d9880cf8ae76250eaaadf6d
-SHA1 (patch-aw) = 6d9c8243df401fb18e621c8965667778640c9d01
+SHA1 (patch-aw) = 3ea956a23d1dac2539b8dcbdacc6405536a52db5
 SHA1 (patch-ax) = 6bb4fdfaf26f9ded736f0aa8f0209815ccbea199
 SHA1 (patch-ay) = 9a6942117fc4d26a9256a573559597560295d9c0
 SHA1 (patch-az) = af6272c48668785dffd7c5b42b8fa2c8edb562d0
diff --git a/sysutils/strace/patches/patch-aj b/sysutils/strace/patches/patch-aj
index e993eed3c1a..f6258f41d75 100644
--- a/sysutils/strace/patches/patch-aj
+++ b/sysutils/strace/patches/patch-aj
@@ -1,10 +1,10 @@
-$NetBSD: patch-aj,v 1.5 2011/08/30 10:43:11 christos Exp $
+$NetBSD: patch-aj,v 1.6 2017/06/27 15:26:05 christos Exp $
 
---- /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 @@
+--- /dev/null	2017-06-27 11:06:52.222304505 -0400
++++ netbsd/ioctlent.sh	2017-06-27 11:08:32.016631491 -0400
+@@ -0,0 +1,125 @@
 +#!/bin/sh
-+#	$NetBSD: patch-aj,v 1.5 2011/08/30 10:43:11 christos Exp $
++#	$NetBSD: patch-aj,v 1.6 2017/06/27 15:26:05 christos Exp $
 +#
 +# Copyright (c) 1994
 +#	The Regents of the University of California.  All rights reserved.
@@ -66,7 +66,6 @@ $NetBSD: patch-aj,v 1.5 2011/08/30 10:43:11 christos Exp $
 +echo "#include <netinet/ip_mroute.h>"
 +echo "#include <netinet/ip_compat.h>"
 +echo "#include <net80211/ieee80211.h>"
-+echo "#include <netiso/iso.h>"
 +
 +echo "#define debug xxxdebug"	# XXX ip_fil.h
 +) > ioctlent.c
diff --git a/sysutils/strace/patches/patch-at b/sysutils/strace/patches/patch-at
index de7bb98e343..be598966734 100644
--- a/sysutils/strace/patches/patch-at
+++ b/sysutils/strace/patches/patch-at
@@ -1,8 +1,19 @@
-$NetBSD: patch-at,v 1.1 2007/04/27 19:45:02 christos Exp $
+$NetBSD: patch-at,v 1.2 2017/06/27 15:26:05 christos Exp $
 
---- stream.c.orig	2005-06-01 15:22:07.000000000 -0400
-+++ stream.c	2007-04-27 11:31:51.000000000 -0400
-@@ -50,7 +50,7 @@
+--- stream.c.orig	2006-12-13 14:57:23.000000000 -0500
++++ stream.c	2017-06-27 11:19:20.333389627 -0400
+@@ -41,8 +41,10 @@
+ #include <stropts.h>
+ #endif
+ #ifdef HAVE_SYS_CONF_H
++#if !defined(NETBSD)
+ #include <sys/conf.h>
+ #endif
++#endif
+ #ifdef HAVE_SYS_STREAM_H
+ #include <sys/stream.h>
+ #endif
+@@ -50,7 +52,7 @@
  #include <sys/tihdr.h>
  #endif
  
@@ -11,7 +22,7 @@ $NetBSD: patch-at,v 1.1 2007/04/27 19:45:02 christos Exp $
  
  #ifndef HAVE_STROPTS_H
  #define RS_HIPRI 1
-@@ -370,7 +370,7 @@
+@@ -397,7 +399,7 @@
  }
  #endif
  
@@ -20,7 +31,7 @@ $NetBSD: patch-at,v 1.1 2007/04/27 19:45:02 christos Exp $
  
  static const struct xlat stream_flush_options[] = {
  	{ FLUSHR,	"FLUSHR"	},
-@@ -1298,6 +1298,6 @@
+@@ -1325,6 +1327,6 @@
  	}
  }
  
diff --git a/sysutils/strace/patches/patch-au b/sysutils/strace/patches/patch-au
index 6761fc98b33..bcb70c23f12 100644
--- a/sysutils/strace/patches/patch-au
+++ b/sysutils/strace/patches/patch-au
@@ -1,7 +1,7 @@
-$NetBSD: patch-au,v 1.4 2009/12/29 22:03:41 spz Exp $
+$NetBSD: patch-au,v 1.5 2017/06/27 15:26:05 christos Exp $
 
---- syscall.c.orig	2006-12-21 23:13:33.000000000 +0100
-+++ syscall.c	2009-12-29 21:45:24.000000000 +0100
+--- syscall.c.orig	2006-12-21 17:13:33.000000000 -0500
++++ syscall.c	2017-06-27 11:17:20.342117800 -0400
 @@ -38,9 +38,9 @@
  #include <signal.h>
  #include <time.h>
@@ -49,7 +49,7 @@ $NetBSD: patch-au,v 1.4 2009/12/29 22:03:41 spz Exp $
  	    || sys_execv == func
  #endif
  #if UNIXWARE > 2
-@@ -756,9 +762,12 @@
+@@ -756,11 +762,14 @@
  	   )
  		return internal_exec(tcp);
  
@@ -60,11 +60,13 @@ $NetBSD: patch-au,v 1.4 2009/12/29 22:03:41 spz Exp $
 +	    sys_wait4 == func
 +#ifndef NETBSD
 +	    || sys_waitpid == func
-+#endif
 +#if defined(SVR4) || defined(ALLBSD) || defined(SUNOS4)
  	    || sys_wait == func
  #endif
++#endif
  #ifdef ALPHA
+ 	    || sys_osf_wait4 == func
+ #endif
 @@ -811,9 +820,9 @@
         static long rax;
  #endif
diff --git a/sysutils/strace/patches/patch-aw b/sysutils/strace/patches/patch-aw
index 66a188406fe..f6d72287f76 100644
--- a/sysutils/strace/patches/patch-aw
+++ b/sysutils/strace/patches/patch-aw
@@ -1,8 +1,8 @@
-$NetBSD: patch-aw,v 1.1 2007/04/27 19:45:02 christos Exp $
+$NetBSD: patch-aw,v 1.2 2017/06/27 15:26:05 christos Exp $
 
---- /dev/null	2007-04-26 23:20:40.000000000 -0400
-+++ netbsd/syscalls.print	2007-04-27 14:39:29.000000000 -0400
-@@ -0,0 +1,197 @@
+--- /dev/null 2017-06-27 11:06:52.638920130 -0400
++++ netbsd/syscalls.print	2017-06-27 11:16:21.707414336 -0400
+@@ -0,0 +1,196 @@
 +#
 +# Copyright (c) 2000, Gaël Roualland <gael.roualland@iname.com>
 +# All rights reserved.
@@ -29,7 +29,7 @@ $NetBSD: patch-aw,v 1.1 2007/04/27 19:45:02 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-aw,v 1.1 2007/04/27 19:45:02 christos Exp $
++#      $Id: patch-aw,v 1.2 2017/06/27 15:26:05 christos Exp $
 +#
 +# Printable syscalls
 +# syntax: syscall [printfunc]
@@ -188,8 +188,7 @@ $NetBSD: patch-aw,v 1.1 2007/04/27 19:45:02 christos Exp $
 +utime
 +utimes
 +vfork
-+wait
-+wait4
++__wait450 sys_wait4
 +waitpid
 +write
 +writev