Update to 0.17. Changes:

remove -I$(top_srcdir)/intl from src/Makefile.am
for systems which have libintl in /usr/lib.
refer /dev/ic/wi_ieee.h for systems which have this file.
(Thanks for the translation, soda!)

10 files changed, 18 insertions, 153 deletions

diff --git a/net/gtk_wicontrol/Makefile b/net/gtk_wicontrol/Makefile
index 3a0da958f18..292059e12c8 100644
--- a/net/gtk_wicontrol/Makefile
+++ b/net/gtk_wicontrol/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2003/03/01 00:34:43 grant Exp $
+# $NetBSD: Makefile,v 1.6 2003/03/04 15:00:26 wiz Exp $
 
-DISTNAME=	gtk_wicontrol-0.16
+DISTNAME=	gtk_wicontrol-0.17
 CATEGORIES=	net
 MASTER_SITES=	http://www.izawa.org/software/gtk_wicontrol/
 
diff --git a/net/gtk_wicontrol/distinfo b/net/gtk_wicontrol/distinfo
index 1ff55019e51..067495f37b2 100644
--- a/net/gtk_wicontrol/distinfo
+++ b/net/gtk_wicontrol/distinfo
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/05/30 16:16:29 agc Exp $
+$NetBSD: distinfo,v 1.6 2003/03/04 15:00:26 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) = db965a3b001113c5bd4e2537d39a89a47e1001f5
-SHA1 (patch-ad) = 459c231483dba268029d33b23f745d904dcabf5a
-SHA1 (patch-ae) = f9416a0396bde6d6b6a82e35c6fcba3fb6135c31
-SHA1 (patch-af) = 34a1e065bbe22a0986fa22b100e56ee1f72269d5
-SHA1 (patch-ag) = 70a1abced2533e993a9a658b7724cf96103aaf3d
-SHA1 (patch-ah) = 24462c63471fc3147673788ed3f9414d1f0d4e25
+SHA1 (gtk_wicontrol-0.17.tar.gz) = be477075dcc82b6a549d1d6b8f4bb6ef7be2bfc5
+Size (gtk_wicontrol-0.17.tar.gz) = 116130 bytes
+SHA1 (patch-aa) = b1b5a3f4764af06d345e6041e5cec0042334a7e2
diff --git a/net/gtk_wicontrol/patches/patch-aa b/net/gtk_wicontrol/patches/patch-aa
index 1f0182e3ecf..ecdc8219249 100644
--- a/net/gtk_wicontrol/patches/patch-aa
+++ b/net/gtk_wicontrol/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.1 2001/03/06 04:19:59 itojun Exp $
+$NetBSD: patch-aa,v 1.2 2003/03/04 15:00:27 wiz Exp $
 
---- src/Makefile.am-	Tue Mar  6 13:12:56 2001
-+++ src/Makefile.am	Tue Mar  6 13:13:00 2001
-@@ -1,7 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
- INCLUDES = \
--	-I$(top_srcdir)/intl \
- 	@GTK_CFLAGS@
- 
- bin_PROGRAMS = gtk_wicontrol
+--- configure.orig	Tue Mar  4 15:38:24 2003
++++ configure
+@@ -1924,7 +1924,7 @@ else
+     fi
+   done
+   IFS="$ac_save_ifs"
+-  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="gtk12-config"
++  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="gtk-config"
+   ;;
+ esac
+ fi
diff --git a/net/gtk_wicontrol/patches/patch-ab b/net/gtk_wicontrol/patches/patch-ab
deleted file mode 100644
index 18ef86e1363..00000000000
--- a/net/gtk_wicontrol/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/03/06 04:19:59 itojun Exp $
-
---- src/Makefile.in-	Tue Mar  6 13:15:27 2001
-+++ src/Makefile.in	Tue Mar  6 13:15:31 2001
-@@ -86,7 +86,7 @@
- VERSION = @VERSION@
- l = @l@
- 
--INCLUDES =  	-I$(top_srcdir)/intl 	@GTK_CFLAGS@
-+INCLUDES =  	@GTK_CFLAGS@
- 
- 
- bin_PROGRAMS = gtk_wicontrol
diff --git a/net/gtk_wicontrol/patches/patch-ac b/net/gtk_wicontrol/patches/patch-ac
deleted file mode 100644
index 8e2978ee930..00000000000
--- a/net/gtk_wicontrol/patches/patch-ac
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/05/30 16:16:30 agc Exp $
-
---- configure.orig	Tue Mar  6 02:56:44 2001
-+++ configure	Thu May 30 17:13:28 2002
-@@ -1632,7 +1632,7 @@
- fi
- done
- 
--for ac_hdr in dev/pcmcia/if_wi_ieee.h machine/if_wavelan_ieee.h
-+for ac_hdr in dev/pcmcia/if_wi_ieee.h machine/if_wavelan_ieee.h dev/ic/wi_ieee.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -3322,7 +3322,8 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+# For Solaris, make DATADIRNAME share.
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
diff --git a/net/gtk_wicontrol/patches/patch-ad b/net/gtk_wicontrol/patches/patch-ad
deleted file mode 100644
index da490082bf0..00000000000
--- a/net/gtk_wicontrol/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
- 
-+/* Define if you have the <dev/ic/wi_ieee.h> header file.  */
-+#undef HAVE_DEV_IC_WI_IEEE_H
-+
- /* Define if you have the <dev/pcmcia/if_wi_ieee.h> header file.  */
- #undef HAVE_DEV_PCMCIA_IF_WI_IEEE_H
- 
diff --git a/net/gtk_wicontrol/patches/patch-ae b/net/gtk_wicontrol/patches/patch-ae
deleted file mode 100644
index 70776ef735a..00000000000
--- a/net/gtk_wicontrol/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
deleted file mode 100644
index a1d99c17333..00000000000
--- a/net/gtk_wicontrol/patches/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
-$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
deleted file mode 100644
index 25c5c64606a..00000000000
--- a/net/gtk_wicontrol/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$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
deleted file mode 100644
index 13e9df94613..00000000000
--- a/net/gtk_wicontrol/patches/patch-ah
+++ /dev/null
@@ -1,21 +0,0 @@
-$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