Fix build failure:

NetBSD-current added dwarf.h and that made the code assume that sys/stropts.h
was present without greater need, since configure also checks for
HAVE_SYS_STROPTS_H.

6 files changed, 56 insertions, 5 deletions

diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 40b048af287..8677cf25871 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2009/10/30 12:02:46 tron Exp $
+# $NetBSD: Makefile,v 1.81 2010/01/01 19:38:44 spz Exp $
 
 DISTNAME=	screen-4.0.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	misc shells
 MASTER_SITES=	ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
 		http://komquats.com/distfiles/ \
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index 094e6b49184..62526680c2a 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.30 2009/03/05 09:59:12 jmmv Exp $
+$NetBSD: distinfo,v 1.31 2010/01/01 19:38:44 spz Exp $
 
 SHA1 (screen-4.0.3.tar.gz) = 7bc6e2f0959ffaae6f52d698c26c774e7dec3545
 RMD160 (screen-4.0.3.tar.gz) = 8c3903c1642ae30fd9d5706298919428552f7754
 Size (screen-4.0.3.tar.gz) = 840602 bytes
 SHA1 (patch-aa) = f3f56a45dc7ab55db41b1a8d16a26134691280b1
 SHA1 (patch-ab) = f4fc914ad9c48cb83cf3633630cb83e4a8e90ff5
-SHA1 (patch-ac) = 4eb492cd7cf9cf0df11337e91dc8f55f440de761
+SHA1 (patch-ac) = 36a1f3e465b511dc795ee9e7f016416b5312d6f0
 SHA1 (patch-ae) = dcdbb1ca08e36308f5659a90a5b6f31fb3a45691
+SHA1 (patch-ah) = 10af05907e368af17fa3bb5e24101aa4d260ab8a
 SHA1 (patch-ai) = 6d01c6c5bebfefc5c2cd4d3c642205eedbc6b155
 SHA1 (patch-aj) = 7cb56d912aa40a4840a9a690394dcf50b0dd319d
 SHA1 (patch-ak) = 5b2fe45dc82f9ed36256b06f27bffafe3071769d
@@ -16,3 +17,5 @@ SHA1 (patch-an) = 44712ae5875c60eac0d4d6ba5cc3731dbfd4458b
 SHA1 (patch-ao) = 81b0d64dd5918cd4d6fbc02dff0470a441a200d4
 SHA1 (patch-ap) = fd3717b70f3ade08de486e4ffad9cac39c11d3bf
 SHA1 (patch-aq) = 997a0ce76086f1dd966868b1fc9ca3bb96b4b4fb
+SHA1 (patch-ar) = cbbcb6e098e966d73c4f0bbbb26e655d88152224
+SHA1 (patch-as) = a6105d64d46df079d3f80965140c1d83b3e72268
diff --git a/misc/screen/patches/patch-ac b/misc/screen/patches/patch-ac
index f4c336def64..43a2c2581ac 100644
--- a/misc/screen/patches/patch-ac
+++ b/misc/screen/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.8 2004/07/15 04:05:40 atatat Exp $
+$NetBSD: patch-ac,v 1.9 2010/01/01 19:38:44 spz Exp $
 
 Cast to long before int when casting a pointer.  It still "loses
 precision" but in this case it doesn't matter and it quiets the
@@ -6,6 +6,15 @@ compiler.
 
 --- process.c.orig	2003-09-18 08:53:54.000000000 -0400
 +++ process.c
+@@ -37,7 +37,7 @@
+ #include "config.h"
+ 
+ /* for solaris 2.1, Unixware (SVR4.2) and possibly others: */
+-#ifdef SVR4
++#ifdef HAVE_SYS_STROPTS_H
+ # include <sys/stropts.h>
+ #endif
+ 
 @@ -5466,7 +5466,7 @@ char *data;	/* dummy */
        *buf = 0;
        return;
diff --git a/misc/screen/patches/patch-ah b/misc/screen/patches/patch-ah
new file mode 100644
index 00000000000..781917dec07
--- /dev/null
+++ b/misc/screen/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.4 2010/01/01 19:38:44 spz Exp $
+
+--- screen.c.orig	2003-09-08 14:26:41.000000000 +0000
++++ screen.c
+@@ -50,7 +50,7 @@
+ 
+ #include "config.h"
+ 
+-#ifdef SVR4
++#ifdef HAVE_SYS_STROPTS_H
+ # include <sys/stropts.h>
+ #endif
+ 
diff --git a/misc/screen/patches/patch-ar b/misc/screen/patches/patch-ar
new file mode 100644
index 00000000000..a84eb64eb75
--- /dev/null
+++ b/misc/screen/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2010/01/01 19:38:44 spz Exp $
+
+--- tty.c.dist.orig	2006-10-23 13:04:42.000000000 +0000
++++ tty.c.dist
+@@ -50,7 +50,7 @@
+ #endif
+ 
+ #include "config.h"
+-#ifdef SVR4
++#ifdef HAVE_SYS_STROPTS_H
+ #include <sys/stropts.h>	/* for I_POP */
+ #endif
+ 
diff --git a/misc/screen/patches/patch-as b/misc/screen/patches/patch-as
new file mode 100644
index 00000000000..511e29210c5
--- /dev/null
+++ b/misc/screen/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2010/01/01 19:38:44 spz Exp $
+
+--- tty.sh.orig	2003-09-08 14:24:25.000000000 +0000
++++ tty.sh
+@@ -76,7 +76,7 @@ exit 0
+ #endif
+ 
+ #include "config.h"
+-#ifdef SVR4
++#ifdef HAVE_SYS_STROPTS_H
+ #include <sys/stropts.h>	/* for I_POP */
+ #endif
+