One file patch per patch file, and add RCS Id.

6 files changed, 89 insertions, 78 deletions

diff --git a/net/gtk_wicontrol/distinfo b/net/gtk_wicontrol/distinfo
index c19a4f1ca11..5a3e0d46152 100644
--- a/net/gtk_wicontrol/distinfo
+++ b/net/gtk_wicontrol/distinfo
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.3 2001/07/30 06:42:52 lukem Exp $
+$NetBSD: distinfo,v 1.4 2001/07/30 10:28:43 wiz Exp $
 
 SHA1 (gtk_wicontrol-0.16.tar.gz) = 8cee862198288f07412c08a4ceb3c7878d4bedcf
 Size (gtk_wicontrol-0.16.tar.gz) = 116401 bytes
 SHA1 (patch-aa) = de30273b805bd016057225e88567df62f478075a
 SHA1 (patch-ab) = 5051bb4bad557707a6d1717d59a7f3040734c8e2
 SHA1 (patch-ac) = c6d523dcfdf08cb1168ff98b34fde426ee00c4e1
-SHA1 (patch-ad) = e591a6a2b6600a06f7ba17e7589c57de2b210042
+SHA1 (patch-ad) = 459c231483dba268029d33b23f745d904dcabf5a
+SHA1 (patch-ae) = f9416a0396bde6d6b6a82e35c6fcba3fb6135c31
+SHA1 (patch-af) = 34a1e065bbe22a0986fa22b100e56ee1f72269d5
+SHA1 (patch-ag) = 70a1abced2533e993a9a658b7724cf96103aaf3d
+SHA1 (patch-ah) = 24462c63471fc3147673788ed3f9414d1f0d4e25
diff --git a/net/gtk_wicontrol/patches/patch-ad b/net/gtk_wicontrol/patches/patch-ad
index 9f533d04300..da490082bf0 100644
--- a/net/gtk_wicontrol/patches/patch-ad
+++ b/net/gtk_wicontrol/patches/patch-ad
@@ -1,5 +1,7 @@
---- ./config.h.in-	Mon Dec 18 04:53:05 2000
-+++ ./config.h.in	Mon Jul 30 15:13:24 2001
+$NetBSD: patch-ad,v 1.2 2001/07/30 10:28:44 wiz Exp $
+
+--- config.h.in.orig	Sun Dec 17 18:53:05 2000
++++ config.h.in
 @@ -104,6 +104,9 @@
  /* Define if you have the <argz.h> header file.  */
  #undef HAVE_ARGZ_H
@@ -10,77 +12,3 @@
  /* Define if you have the <dev/pcmcia/if_wi_ieee.h> header file.  */
  #undef HAVE_DEV_PCMCIA_IF_WI_IEEE_H
  
---- ./configure.in-	Tue Mar  6 13:55:59 2001
-+++ ./configure.in	Mon Jul 30 15:08:21 2001
-@@ -13,7 +13,7 @@ AC_HEADER_STDC
- AC_CHECK_HEADERS(sys/ioctl.h unistd.h)
- AC_CHECK_HEADER(net/if_var.h)
- AC_CHECK_HEADERS(net/if_ether.h net/ethernet.h)
--AC_CHECK_HEADERS(dev/pcmcia/if_wi_ieee.h machine/if_wavelan_ieee.h)
-+AC_CHECK_HEADERS(dev/pcmcia/if_wi_ieee.h machine/if_wavelan_ieee.h dev/ic/wi_ieee.h)
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-
---- ./src/callbacks.c-	Tue Mar  6 13:52:38 2001
-+++ ./src/callbacks.c	Mon Jul 30 15:14:33 2001
-@@ -28,12 +28,12 @@
- #endif
- #endif
-  
--#ifdef HAVE_DEV_PCMCIA_IF_WI_IEEE_H
-+#if defined(HAVE_DEV_PCMCIA_IF_WI_IEEE_H)
- #include <dev/pcmcia/if_wi_ieee.h>
--#else
--#ifdef HAVE_MACHINE_IF_WAVELAN_IEEE_H
-+#elif defined(HAVE_MACHINE_IF_WAVELAN_IEEE_H)
- #include <machine/if_wavelan_ieee.h>      
--#endif
-+#elif defined(HAVE_DEV_IC_WI_IEEE_H)
-+#include <dev/ic/wi_ieee.h>
- #endif
- 
- #include "callbacks.h"
-
---- ./src/main.c-	Sat Dec  2 13:49:05 2000
-+++ ./src/main.c	Mon Jul 30 15:14:41 2001
-@@ -27,13 +27,13 @@
- #include <net/ethernet.h>
- #endif
- #endif
--
--#ifdef HAVE_DEV_PCMCIA_IF_WI_IEEE_H
-+ 
-+#if defined(HAVE_DEV_PCMCIA_IF_WI_IEEE_H)
- #include <dev/pcmcia/if_wi_ieee.h>
--#else
--#ifdef HAVE_MACHINE_IF_WAVELAN_IEEE_H
--#include <machine/if_wavelan_ieee.h>
--#endif
-+#elif defined(HAVE_MACHINE_IF_WAVELAN_IEEE_H)
-+#include <machine/if_wavelan_ieee.h>      
-+#elif defined(HAVE_DEV_IC_WI_IEEE_H)
-+#include <dev/ic/wi_ieee.h>
- #endif
- 
- #include "interface.h"
-
---- ./src/wiinfo.c-	Sat Dec  2 13:08:45 2000
-+++ ./src/wiinfo.c	Mon Jul 30 15:14:45 2001
-@@ -28,12 +28,12 @@
- #endif
- #endif
-  
--#ifdef HAVE_DEV_PCMCIA_IF_WI_IEEE_H
-+#if defined(HAVE_DEV_PCMCIA_IF_WI_IEEE_H)
- #include <dev/pcmcia/if_wi_ieee.h>
--#else
--#ifdef HAVE_MACHINE_IF_WAVELAN_IEEE_H
-+#elif defined(HAVE_MACHINE_IF_WAVELAN_IEEE_H)
- #include <machine/if_wavelan_ieee.h>      
--#endif
-+#elif defined(HAVE_DEV_IC_WI_IEEE_H)
-+#include <dev/ic/wi_ieee.h>
- #endif
- 
- void 
diff --git a/net/gtk_wicontrol/patches/patch-ae b/net/gtk_wicontrol/patches/patch-ae
new file mode 100644
index 00000000000..70776ef735a
--- /dev/null
+++ b/net/gtk_wicontrol/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2001/07/30 10:28:44 wiz Exp $
+
+--- configure.in.orig	Tue Mar  6 03:55:59 2001
++++ configure.in
+@@ -13,7 +13,7 @@
+ AC_CHECK_HEADERS(sys/ioctl.h unistd.h)
+ AC_CHECK_HEADER(net/if_var.h)
+ AC_CHECK_HEADERS(net/if_ether.h net/ethernet.h)
+-AC_CHECK_HEADERS(dev/pcmcia/if_wi_ieee.h machine/if_wavelan_ieee.h)
++AC_CHECK_HEADERS(dev/pcmcia/if_wi_ieee.h machine/if_wavelan_ieee.h dev/ic/wi_ieee.h)
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
diff --git a/net/gtk_wicontrol/patches/patch-af b/net/gtk_wicontrol/patches/patch-af
new file mode 100644
index 00000000000..a1d99c17333
--- /dev/null
+++ b/net/gtk_wicontrol/patches/patch-af
@@ -0,0 +1,21 @@
+$NetBSD: patch-af,v 1.1 2001/07/30 10:28:44 wiz Exp $
+
+--- src/callbacks.c.orig	Tue Mar  6 03:52:38 2001
++++ src/callbacks.c
+@@ -28,12 +28,12 @@
+ #endif
+ #endif
+  
+-#ifdef HAVE_DEV_PCMCIA_IF_WI_IEEE_H
++#if defined(HAVE_DEV_PCMCIA_IF_WI_IEEE_H)
+ #include <dev/pcmcia/if_wi_ieee.h>
+-#else
+-#ifdef HAVE_MACHINE_IF_WAVELAN_IEEE_H
++#elif defined(HAVE_MACHINE_IF_WAVELAN_IEEE_H)
+ #include <machine/if_wavelan_ieee.h>      
+-#endif
++#elif defined(HAVE_DEV_IC_WI_IEEE_H)
++#include <dev/ic/wi_ieee.h>
+ #endif
+ 
+ #include "callbacks.h"
diff --git a/net/gtk_wicontrol/patches/patch-ag b/net/gtk_wicontrol/patches/patch-ag
new file mode 100644
index 00000000000..25c5c64606a
--- /dev/null
+++ b/net/gtk_wicontrol/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.1 2001/07/30 10:28:44 wiz Exp $
+
+--- src/main.c.orig	Sat Dec  2 03:49:05 2000
++++ src/main.c
+@@ -27,13 +27,13 @@
+ #include <net/ethernet.h>
+ #endif
+ #endif
+-
+-#ifdef HAVE_DEV_PCMCIA_IF_WI_IEEE_H
++ 
++#if defined(HAVE_DEV_PCMCIA_IF_WI_IEEE_H)
+ #include <dev/pcmcia/if_wi_ieee.h>
+-#else
+-#ifdef HAVE_MACHINE_IF_WAVELAN_IEEE_H
+-#include <machine/if_wavelan_ieee.h>
+-#endif
++#elif defined(HAVE_MACHINE_IF_WAVELAN_IEEE_H)
++#include <machine/if_wavelan_ieee.h>      
++#elif defined(HAVE_DEV_IC_WI_IEEE_H)
++#include <dev/ic/wi_ieee.h>
+ #endif
+ 
+ #include "interface.h"
diff --git a/net/gtk_wicontrol/patches/patch-ah b/net/gtk_wicontrol/patches/patch-ah
new file mode 100644
index 00000000000..13e9df94613
--- /dev/null
+++ b/net/gtk_wicontrol/patches/patch-ah
@@ -0,0 +1,21 @@
+$NetBSD: patch-ah,v 1.1 2001/07/30 10:28:44 wiz Exp $
+
+--- src/wiinfo.c.orig	Sat Dec  2 03:08:45 2000
++++ src/wiinfo.c
+@@ -28,12 +28,12 @@
+ #endif
+ #endif
+  
+-#ifdef HAVE_DEV_PCMCIA_IF_WI_IEEE_H
++#if defined(HAVE_DEV_PCMCIA_IF_WI_IEEE_H)
+ #include <dev/pcmcia/if_wi_ieee.h>
+-#else
+-#ifdef HAVE_MACHINE_IF_WAVELAN_IEEE_H
++#elif defined(HAVE_MACHINE_IF_WAVELAN_IEEE_H)
+ #include <machine/if_wavelan_ieee.h>      
+-#endif
++#elif defined(HAVE_DEV_IC_WI_IEEE_H)
++#include <dev/ic/wi_ieee.h>
+ #endif
+ 
+ void