Update to version 2.0.3. This is the GKrellM-2 port of the wireless

plugin.

5 files changed, 60 insertions, 51 deletions

diff --git a/net/gkrellm-wireless/Makefile b/net/gkrellm-wireless/Makefile
index 46a1eccf42a..6b6ad556065 100644
--- a/net/gkrellm-wireless/Makefile
+++ b/net/gkrellm-wireless/Makefile
@@ -1,25 +1,20 @@
-# $NetBSD: Makefile,v 1.9 2004/01/24 14:50:05 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/24 23:35:52 cube Exp $
 
-DISTNAME=		gkrellmwireless-0.2.2
-PKGNAME=		gkrellm-wireless-0.2.2
-PKGREVISION=		4
+DISTNAME=		gkrellmwireless-2.0.3
+PKGNAME=		${DISTNAME:S/gkrellm/gkrellm-/}
 CATEGORIES=		net sysutils
 MASTER_SITES=		http://gkrellm.luon.net/files/
 
-MAINTAINER=		jasper@pointless.net
+MAINTAINER=		cube@NetBSD.org
 HOMEPAGE=		http://gkrellm.luon.net/gkrellmwireless.phtml
 COMMENT=		Wavelan signal strength monitor for gkrellm
 
 ONLY_FOR_PLATFORM=	*BSD-*-* Linux-*-*
 
-USE_BUILDLINK2=		# defined
+WRKSRC=			${WRKDIR}/gkrellmwireless
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
-	${INSTALL_PROGRAM} ${WRKSRC}/wireless.so ${PREFIX}/lib/gkrellm/plugins/
-
-.include "../../graphics/imlib/buildlink2.mk"
-.include "../../sysutils/gkrellm/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../sysutils/gkrellm/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gkrellm-wireless/PLIST b/net/gkrellm-wireless/PLIST
index 316ba179ce5..7c42e6a89ed 100644
--- a/net/gkrellm-wireless/PLIST
+++ b/net/gkrellm-wireless/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:28 zuntum Exp $
-lib/gkrellm/plugins/wireless.so
+@comment $NetBSD: PLIST,v 1.2 2004/02/24 23:35:52 cube Exp $
+lib/gkrellm2/plugins/wireless.so
diff --git a/net/gkrellm-wireless/distinfo b/net/gkrellm-wireless/distinfo
index da0a5fe0816..5e52e8cde7f 100644
--- a/net/gkrellm-wireless/distinfo
+++ b/net/gkrellm-wireless/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2002/06/27 11:02:06 fredb Exp $
+$NetBSD: distinfo,v 1.3 2004/02/24 23:35:52 cube Exp $
 
-SHA1 (gkrellmwireless-0.2.2.tar.gz) = 184d1aa034e4cf4a76d279d8bf0dcc278b134252
-Size (gkrellmwireless-0.2.2.tar.gz) = 7971 bytes
-SHA1 (patch-aa) = df80eba1947398684988f199c462185b1ab02c0d
-SHA1 (patch-ab) = 79aa9a9648e9bd450662a88521cc7e75f38ffd3e
+SHA1 (gkrellmwireless-2.0.3.tar.gz) = a5ed777fe05e58f36aa58158b6d85cfbba69108f
+Size (gkrellmwireless-2.0.3.tar.gz) = 9557 bytes
+SHA1 (patch-aa) = 2e23ee2d90b4b2f4fab85ada6d50084705d41ae9
+SHA1 (patch-ab) = 1c5920518b8b3b9adb7f5d644a6b88a73fa8b73d
diff --git a/net/gkrellm-wireless/patches/patch-aa b/net/gkrellm-wireless/patches/patch-aa
index 285e88007ad..060a6c0cc14 100644
--- a/net/gkrellm-wireless/patches/patch-aa
+++ b/net/gkrellm-wireless/patches/patch-aa
@@ -1,35 +1,38 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/31 00:30:21 damon Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/24 23:35:52 cube Exp $
 
---- Makefile.orig	Sun Sep  9 10:12:41 2001
+--- Makefile.orig	2003-12-06 14:19:55.000000000 +0100
 +++ Makefile
-@@ -12,6 +12,9 @@
- 	GTK_CONFIG = gtk-config
- endif
+@@ -16,15 +16,15 @@ endif
+ GTK_CFLAGS = `$(GTK_CONFIG) --cflags` 
+ GTK_LIB = `$(GTK_CONFIG) --libs`
  
-+ifeq ($(OS),NetBSD)
-+	GTK_CONFIG = gtk-config
-+endif
- 
- GTK_INCLUDE = `$(GTK_CONFIG) --cflags gthread`
- GTK_LIB = `$(GTK_CONFIG) --libs gthread`
-@@ -20,17 +23,17 @@
- IMLIB_LIB = `imlib-config --libs-gdk`
- 
- 
--FLAGS = -g -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(INCLUDE)
-+CFLAGS += -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(INCLUDE) -I${PREFIX}/include
- LIBS = $(GTK_LIB) $(IMLIB_LIB)
+-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
++CFLAGS += -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE)
+ LIBS = $(GTK_LIB)
  LFLAGS = -shared
  
 -CC = gcc $(CFLAGS) $(FLAGS)
-+CC = gcc $(CFLAGS)
++#CC = gcc $(CFLAGS) $(FLAGS)
  
  OBJS = wireless.o
  
- INSTALL = install -c -s 
- INSTALL_PERMS = -m 755
--PLUGIN_DIR = /usr/lib/gkrellm/plugins
-+PLUGIN_DIR = ${PREFIX}/lib/gkrellm/plugins
- 
+-PLUGIN_DIR = /usr/lib/gkrellm2/plugins
++PLUGIN_DIR = ${PREFIX}/lib/gkrellm2/plugins
  
+ INSTALL = install -c
+ INSTALL_PROGRAM = $(INSTALL) -s
+@@ -32,12 +32,12 @@ INSTALL_PROGRAM = $(INSTALL) -s
  all:	wireless.so
+ 
+ wireless.so: $(OBJS)
+-	$(CC) $(OBJS) -o wireless.so $(LFLAGS) $(LIBS)
++	$(CC) $(CFLAGS) $(OBJS) -o wireless.so $(LFLAGS) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o core *.so* *.bak *~
+ 
+ install :
+-	$(INSTALL) $(INSTALL_PERMS) wireless.so $(PLUGIN_DIR)
++	$(BSD_INSTALL_DATA) wireless.so $(PLUGIN_DIR)
+ wireless.o: wireless.c
+ 
diff --git a/net/gkrellm-wireless/patches/patch-ab b/net/gkrellm-wireless/patches/patch-ab
index 615df690522..f308a186875 100644
--- a/net/gkrellm-wireless/patches/patch-ab
+++ b/net/gkrellm-wireless/patches/patch-ab
@@ -1,17 +1,28 @@
-$NetBSD: patch-ab,v 1.1 2002/06/27 11:02:09 fredb Exp $
+$NetBSD: patch-ab,v 1.2 2004/02/24 23:35:52 cube Exp $
 
---- wireless.h.orig	Sun Sep  9 09:25:55 2001
+--- wireless.h.orig	Sat Dec  6 13:19:55 2003
 +++ wireless.h
-@@ -32,7 +32,11 @@
+@@ -34,12 +34,23 @@
+ #endif
+ 
+ #ifdef __NetBSD__
++  #include <sys/param.h>
++  #include <sys/socket.h>
++  #include <sys/sockio.h>
+   #include <net/if.h>
+   #include <net/if_dl.h>
    #include <net/if_ether.h>
    #include <net/if_media.h>
++# if __NetBSD_Version__ > 106290000
++  #include <net80211/ieee80211.h>
++#else
    #include <net/if_ieee80211.h>
--  #include <dev/pcmcia/if_wi_ieee.h>
++#endif
 +# if __NetBSD_Version__ > 105210000
-+    #include <dev/ic/wi_ieee.h>
++  #include <dev/ic/wi_ieee.h>
 +# else
-+    #include <dev/pcmcia/if_wi_ieee.h>
+   #include <dev/pcmcia/if_wi_ieee.h>
 +# endif
  #endif
  
- #define PLUGIN_CONFIG_KEYWORD "gkrellmwireless"
+ #ifdef __linux__