Split patch-af because it was patching four files.

5 files changed, 49 insertions, 43 deletions

diff --git a/x11/rxvt/distinfo b/x11/rxvt/distinfo
index 8a4345b25d9..24fef39a3af 100644
--- a/x11/rxvt/distinfo
+++ b/x11/rxvt/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.14 2004/06/20 21:02:01 christos Exp $
+$NetBSD: distinfo,v 1.15 2004/09/15 17:55:53 minskim Exp $
 
 SHA1 (rxvt-2.7.10.tar.bz2) = 16eae23c3227e28e5e7a53a58eaa3226affe65f9
 Size (rxvt-2.7.10.tar.bz2) = 493199 bytes
 SHA1 (patch-aa) = 11656b4c2d9e22055d203669b588b626079aa320
 SHA1 (patch-ab) = 62ef5b28f8842b769829fed0d217a9c54f48c832
+SHA1 (patch-ac) = 3478e6bf322312743ba4fcfab4b13a90fa5d8191
 SHA1 (patch-ad) = 86047c69fa397d71f3e71ae476bd7addd153729f
 SHA1 (patch-ae) = 76221e9b3cd35a0f40fb6128e0bf9d74d232d907
-SHA1 (patch-af) = 5bf2e4a2136694f6a11ff95013fc292bc88f3175
+SHA1 (patch-af) = e99cda3cc58b1af3bf4d7ecadf55877308c3aee9
+SHA1 (patch-ag) = 9af27e00f94392092471a21f713698e772aebac7
+SHA1 (patch-ah) = 5e6fcf6b4b4fe1111b97d0b916501ab5855a755a
diff --git a/x11/rxvt/patches/patch-ac b/x11/rxvt/patches/patch-ac
new file mode 100644
index 00000000000..6d88bbcd502
--- /dev/null
+++ b/x11/rxvt/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.7 2004/09/15 17:55:53 minskim Exp $
+
+--- autoconf/configure.in.orig	2003-03-06 20:32:27.000000000 -0600
++++ autoconf/configure.in
+@@ -393,6 +393,7 @@ AC_CHECK_HEADERS( \
+ 	sys/ioctl.h \
+ 	sys/select.h \
+ 	sys/sockio.h \
++	sys/stropts.h \
+ 	sys/strredir.h \
+ 	sys/time.h \
+ 	utmp.h \
diff --git a/x11/rxvt/patches/patch-af b/x11/rxvt/patches/patch-af
index c157a043467..7ffa5e213ad 100644
--- a/x11/rxvt/patches/patch-af
+++ b/x11/rxvt/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.7 2004/06/20 21:02:01 christos Exp $
+$NetBSD: patch-af,v 1.8 2004/09/15 17:55:53 minskim Exp $
 
---- configure.orig	2003-03-26 01:07:26.000000000 -0500
-+++ configure	2004-06-20 13:33:24.000000000 -0400
-@@ -9481,6 +9481,7 @@
+--- configure.orig	2003-03-26 00:07:26.000000000 -0600
++++ configure
+@@ -9481,6 +9481,7 @@ fi
  
  
  
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.7 2004/06/20 21:02:01 christos Exp $
  for ac_header in \
  	assert.h \
  	fcntl.h \
-@@ -9496,6 +9497,7 @@
+@@ -9496,6 +9497,7 @@ for ac_header in \
  	sys/ioctl.h \
  	sys/select.h \
  	sys/sockio.h \
@@ -18,39 +18,3 @@ $NetBSD: patch-af,v 1.7 2004/06/20 21:02:01 christos Exp $
  	sys/strredir.h \
  	sys/time.h \
  	utmp.h \
-
---- autoconf/configure.in.orig	2004-06-20 13:31:57.000000000 -0400
-+++ autoconf/configure.in	2004-06-20 13:32:13.000000000 -0400
-@@ -393,6 +393,7 @@
- 	sys/ioctl.h \
- 	sys/select.h \
- 	sys/sockio.h \
-+	sys/stropts.h \
- 	sys/strredir.h \
- 	sys/time.h \
- 	utmp.h \
-
---- autoconf/config.h.in.orig	2004-06-20 13:31:21.000000000 -0400
-+++ autoconf/config.h.in	2004-06-20 13:31:48.000000000 -0400
-@@ -123,6 +123,9 @@
- /* Define to 1 if you have the <sys/strredir.h> header file. */
- #undef HAVE_SYS_STRREDIR_H
- 
-+/* Define to 1 if you have the <sys/stropts.h> header file. */
-+#undef HAVE_SYS_STROPTS_H
-+
- /* Define to 1 if you have the <sys/time.h> header file. */
- #undef HAVE_SYS_TIME_H
- 
-
---- src/ptytty.c.orig	2002-09-19 03:40:39.000000000 -0400
-+++ src/ptytty.c	2004-06-20 13:34:32.000000000 -0400
-@@ -46,7 +46,7 @@
- #ifdef HAVE_SYS_IOCTL_H
- # include <sys/ioctl.h>
- #endif
--#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__)
-+#ifdef HAVE_SYS_STROPTS_H
- # include <sys/stropts.h>      /* for I_PUSH */
- #endif
- 
diff --git a/x11/rxvt/patches/patch-ag b/x11/rxvt/patches/patch-ag
new file mode 100644
index 00000000000..a7a6a1e66ec
--- /dev/null
+++ b/x11/rxvt/patches/patch-ag
@@ -0,0 +1,14 @@
+$NetBSD: patch-ag,v 1.3 2004/09/15 17:55:53 minskim Exp $
+
+--- autoconf/config.h.in.orig	2003-02-19 18:35:55.000000000 -0600
++++ autoconf/config.h.in
+@@ -123,6 +123,9 @@
+ /* Define to 1 if you have the <sys/strredir.h> header file. */
+ #undef HAVE_SYS_STRREDIR_H
+ 
++/* Define to 1 if you have the <sys/stropts.h> header file. */
++#undef HAVE_SYS_STROPTS_H
++
+ /* Define to 1 if you have the <sys/time.h> header file. */
+ #undef HAVE_SYS_TIME_H
+ 
diff --git a/x11/rxvt/patches/patch-ah b/x11/rxvt/patches/patch-ah
new file mode 100644
index 00000000000..57a7f071f35
--- /dev/null
+++ b/x11/rxvt/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.7 2004/09/15 17:55:53 minskim Exp $
+
+--- src/ptytty.c.orig	2002-09-19 02:40:39.000000000 -0500
++++ src/ptytty.c
+@@ -46,7 +46,7 @@
+ #ifdef HAVE_SYS_IOCTL_H
+ # include <sys/ioctl.h>
+ #endif
+-#if defined(PTYS_ARE_PTMX) && !defined(__CYGWIN32__)
++#ifdef HAVE_SYS_STROPTS_H
+ # include <sys/stropts.h>      /* for I_PUSH */
+ #endif
+