19 files changed, 1 insertions, 283 deletions
diff --git a/net/Makefile b/net/Makefile
index a5a97a6d551..1e615d4dae4 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.663 2007/04/01 21:18:45 wiz Exp $
+# $NetBSD: Makefile,v 1.664 2007/04/01 21:36:16 wiz Exp $
 #
 
 COMMENT=	Networking tools
@@ -115,11 +115,8 @@ SUBDIR+=	gift-openft
 SUBDIR+=	giftcurs
 SUBDIR+=	gini
 SUBDIR+=	gkrellm-multiping
-SUBDIR+=	gkrellm-ping
 SUBDIR+=	gkrellm-snmp
 SUBDIR+=	gkrellm-wireless
-SUBDIR+=	gkrellm1-snmp
-SUBDIR+=	gkrellm1-wireless
 SUBDIR+=	gnapfetch
 SUBDIR+=	gnet
 SUBDIR+=	gnet1
diff --git a/net/gkrellm-ping/DESCR b/net/gkrellm-ping/DESCR
deleted file mode 100644
index cdae7ea88c8..00000000000
--- a/net/gkrellm-ping/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-GKrellM Ping is a gkrellm plugin that watches a given server and can list
- the returned ping time
diff --git a/net/gkrellm-ping/Makefile b/net/gkrellm-ping/Makefile
deleted file mode 100644
index 04ae6585710..00000000000
--- a/net/gkrellm-ping/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.20 2006/04/17 13:46:43 wiz Exp $
-
-DISTNAME=	gkrellmPing-0.2-3
-PKGNAME=	gkrellm-ping-0.2.3
-PKGREVISION=	8
-CATEGORIES=	net sysutils
-MASTER_SITES=	http://gkrellmping.dweb.ro/downloads/
-
-MAINTAINER=	damon@NetBSD.org
-HOMEPAGE=	http://gkrellmping.dweb.ro/
-COMMENT=	gkrellm ping plugin
-
-WRKSRC=		${WRKDIR}/gkrellmPing
-USE_TOOLS+=	gmake
-
-INSTALLATION_DIRS=	lib/gkrellm/plugins
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
-	${INSTALL_PROGRAM} ${WRKSRC}/gkrellmPing.so ${PREFIX}/lib/gkrellm/plugins/
-
-.include "../../sysutils/gkrellm1/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/gkrellm-ping/PLIST b/net/gkrellm-ping/PLIST
deleted file mode 100644
index 6e4a1db1428..00000000000
--- a/net/gkrellm-ping/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:55:26 zuntum Exp $
-lib/gkrellm/plugins/gkrellmPing.so
diff --git a/net/gkrellm-ping/distinfo b/net/gkrellm-ping/distinfo
deleted file mode 100644
index af9395446d2..00000000000
--- a/net/gkrellm-ping/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:13:47 agc Exp $
-
-SHA1 (gkrellmPing-0.2-3.tar.gz) = 9e2e6167bce18d66e7ddfa57d60af4ebf2ad39b8
-RMD160 (gkrellmPing-0.2-3.tar.gz) = a478a2048f6b8ad62063cb9a085ed7a428113c08
-Size (gkrellmPing-0.2-3.tar.gz) = 11901 bytes
-SHA1 (patch-aa) = 439b74a13ce89d513b7088f46e3f7c08e73c3c79
-SHA1 (patch-ab) = 8afc1538f0555b6aaac657a7c6da15e939d9a5ce
diff --git a/net/gkrellm-ping/patches/patch-aa b/net/gkrellm-ping/patches/patch-aa
deleted file mode 100644
index e1c64cf0338..00000000000
--- a/net/gkrellm-ping/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/10/31 16:30:52 damon Exp $
-
---- Makefile.orig	Sat May 19 17:40:38 2001
-+++ Makefile
-@@ -1,13 +1,13 @@
- # Modify INCLUDE to point to gkrellm.h (if it's not in /usr/local/include)
--INCLUDE	=
-+INCLUDE	=${LOCALBASE}/include
- 
- CC	= gcc
--CFLAGS	= -Wall -O2 -fPIC -I$(INCLUDE)					\
-+CFLAGS	+= -fPIC -I$(INCLUDE)					\
- 	  `gtk-config --cflags` `imlib-config --cflags-gdk`
- LDFLAGS	=
- TARGET	= gkrellmPing
- 
--
-+all: $(TARGET).so
- 
- $(TARGET).so: $(TARGET).o
- 	$(CC) -shared -Wl $< -o $@
diff --git a/net/gkrellm-ping/patches/patch-ab b/net/gkrellm-ping/patches/patch-ab
deleted file mode 100644
index 495d5e57a9b..00000000000
--- a/net/gkrellm-ping/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/10/31 00:24:38 damon Exp $
-
---- gkrellmPing.c.orig	Tue Oct 30 19:01:33 2001
-+++ gkrellmPing.c
-@@ -32,7 +32,7 @@
- #define	STYLE_NAME	"gkrellmPing"
- 
- #define VERSION		"0.2-2"
--#define DEF_COMMAND	"ping 127.0.0.1 -c 1 | grep round-trip"
-+#define DEF_COMMAND	"ping -c 1 127.0.0.1 | grep round-trip"
- #define DEF_NONE_MSG	"Unknown Host"
- #define DEF_VIEW_MSG	"Ping: %s ms"
- #define DEF_SEPS	"=/// ;2"
diff --git a/net/gkrellm1-snmp/DESCR b/net/gkrellm1-snmp/DESCR
deleted file mode 100644
index 99e826d9ac2..00000000000
--- a/net/gkrellm1-snmp/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-gkrellm-snmp is a plugin for gkrellm that can show the value of an oid on an
-snmp enabled device
diff --git a/net/gkrellm1-snmp/Makefile b/net/gkrellm1-snmp/Makefile
deleted file mode 100644
index 8c98a84f42c..00000000000
--- a/net/gkrellm1-snmp/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.13 2007/03/25 05:55:26 wiz Exp $
-
-DISTNAME=		gkrellm_snmp-0.18
-PKGNAME=		gkrellm-snmp-0.18
-PKGREVISION=		12
-CATEGORIES=		net sysutils
-MASTER_SITES=		http://triq.net/gkrellm/
-
-MAINTAINER=		jasper@pointless.net
-HOMEPAGE=		http://triq.net/gkrellm_snmp.html
-COMMENT=		Simple SNMP monitor for gkrellm
-
-USE_TOOLS+=		gmake
-INSTALLATION_DIRS=	lib/gkrellm/plugins
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
-	${INSTALL_PROGRAM} ${WRKSRC}/gkrellm_snmp.so ${PREFIX}/lib/gkrellm/plugins/
-
-.include "../../graphics/imlib/buildlink3.mk"
-.include "../../net/net-snmp/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../sysutils/gkrellm1/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/gkrellm1-snmp/PLIST b/net/gkrellm1-snmp/PLIST
deleted file mode 100644
index 71ad192f18e..00000000000
--- a/net/gkrellm1-snmp/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 23:27:25 cube Exp $
-lib/gkrellm/plugins/gkrellm_snmp.so
diff --git a/net/gkrellm1-snmp/distinfo b/net/gkrellm1-snmp/distinfo
deleted file mode 100644
index 369b33a9074..00000000000
--- a/net/gkrellm1-snmp/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:13:47 agc Exp $
-
-SHA1 (gkrellm_snmp-0.18.tar.gz) = c1aa5edf8e86aedb377c454cf1f249d956ec8a67
-RMD160 (gkrellm_snmp-0.18.tar.gz) = e989afa881ae880f9b1c5a16e1eb339b2a6dec0e
-Size (gkrellm_snmp-0.18.tar.gz) = 15450 bytes
-SHA1 (patch-aa) = b8c84280e496febff37579914d700b4980f8cc37
-SHA1 (patch-ab) = f9a8f15814e0c57b1fd8b05612ffbc321a150ca8
diff --git a/net/gkrellm1-snmp/patches/patch-aa b/net/gkrellm1-snmp/patches/patch-aa
deleted file mode 100644
index 574f05c369f..00000000000
--- a/net/gkrellm1-snmp/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 23:27:26 cube Exp $
-
---- Makefile.orig	Tue Apr  3 09:25:07 2001
-+++ Makefile
-@@ -5,7 +5,7 @@
- IMLIB_CONFIG = imlib-config
- SYSLIB = -lsnmp
- # we need lib crypto if libsnmp has privacy support.
--SYSLIB += -lcrypto -L/usr/local/ssl/lib -L/usr/ssl/lib
-+SYSLIB += -lcrypto
- 
- # FreeBSD
- #GTK_CONFIG = gtk12-config
-@@ -14,8 +14,8 @@
- #PLUGIN_DIR = /usr/X11R6/libexec/gkrellm/plugins/
- 
- USER_PLUGIN_DIR = $(HOME)/.gkrellm/plugins
--PLUGIN_DIR = /usr/share/gkrellm/plugins
--GKRELLM_INCLUDE = -I/usr/local/include
-+PLUGIN_DIR = ${PREFIX}/lib/gkrellm/plugins
-+GKRELLM_INCLUDE = -I${PREFIX}/include
- 
- GTK_INCLUDE = `$(GTK_CONFIG) --cflags`
- GTK_LIB = `$(GTK_CONFIG) --libs`
diff --git a/net/gkrellm1-snmp/patches/patch-ab b/net/gkrellm1-snmp/patches/patch-ab
deleted file mode 100644
index 1daa9e5d854..00000000000
--- a/net/gkrellm1-snmp/patches/patch-ab
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/03/29 16:27:30 cube Exp $
-
---- gkrellm_snmp.c.orig	2001-07-27 20:06:41.000000000 +0000
-+++ gkrellm_snmp.c
-@@ -33,14 +33,9 @@
- #include <stdio.h>
- #include <sys/types.h>
- 
--#include <ucd-snmp/asn1.h>
--#include <ucd-snmp/mib.h>
--#include <ucd-snmp/parse.h>
--
--#include <ucd-snmp/snmp.h>
--#include <ucd-snmp/snmp_api.h>
--#include <ucd-snmp/snmp_client.h>
--#include <ucd-snmp/snmp_impl.h> /* special ASN types */
-+#include <net-snmp/net-snmp-config.h>
-+#include <net-snmp/net-snmp-includes.h>
-+
- #ifdef DEBUG_SNMP
- #include <ucd-snmp/snmp_debug.h>
- #endif /* DEBUG_SNMP */
-@@ -88,6 +83,7 @@ struct Reader {
- 	GtkTooltips             *tooltip;
- };
- 
-+oid *snmp_parse_oid(const char *argv, oid *root, size_t *rootlen);
- 
- /*
-  * caller needs to free the returned gchar*
-@@ -277,7 +273,8 @@ retry:
-       if (response->errstat == SNMP_ERR_NOERROR){
-         /* just render all vars */
-         for(vars = response->variables; vars; vars = vars->next_variable) {
--	    sprint_variable(textbuf, vars->name, vars->name_length, vars);
-+	    snprint_variable(textbuf, 1023, vars->name, vars->name_length, vars);
-+	    textbuf[1023] = '\0';
- 	    if (result) {
- 	        tmp = result;
- 		result = g_strdup_printf("%s\n%s\n", tmp, textbuf);
-@@ -375,7 +372,7 @@ snmp_input(int op,
-     u_long time = 0;
-     Reader *reader = NULL;
- 
--    if (op == RECEIVED_MESSAGE) {
-+    if (op == NETSNMP_CALLBACK_OP_RECEIVED_MESSAGE) {
- 
-         if (pdu->errstat == SNMP_ERR_NOERROR) {
- 
-@@ -415,7 +412,7 @@ snmp_input(int op,
-         }
- 
- 
--    } else if (op == TIMED_OUT){
-+    } else if (op == NETSNMP_CALLBACK_OP_TIMED_OUT){
-         error = g_strdup_printf("Error! SNMP Timeout.");
-     }
-     /* we use session's callback magic to pass back data */
diff --git a/net/gkrellm1-wireless/DESCR b/net/gkrellm1-wireless/DESCR
deleted file mode 100644
index 728f8c57d97..00000000000
--- a/net/gkrellm1-wireless/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-gkrellmwireless is a plugin for gkrellm that shows the signal
-strength/quality/noise of a wireless ethernet card.
-
-Currently only wi(4) (Lucent ORiNOCO and derivatives) interfaces are supported.
diff --git a/net/gkrellm1-wireless/Makefile b/net/gkrellm1-wireless/Makefile
deleted file mode 100644
index cfbe0e0d943..00000000000
--- a/net/gkrellm1-wireless/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2006/04/17 13:46:43 wiz Exp $
-
-DISTNAME=		gkrellmwireless-0.2.2
-PKGNAME=		gkrellm-wireless-0.2.2
-PKGREVISION=		8
-CATEGORIES=		net sysutils
-MASTER_SITES=		http://gkrellm.luon.net/files/
-
-MAINTAINER=		jasper@pointless.net
-HOMEPAGE=		http://gkrellm.luon.net/gkrellmwireless.phtml
-COMMENT=		Wavelan signal strength monitor for gkrellm
-
-USE_TOOLS+=		gmake
-INSTALLATION_DIRS=	lib/gkrellm/plugins
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
-	${INSTALL_PROGRAM} ${WRKSRC}/wireless.so ${PREFIX}/lib/gkrellm/plugins/
-
-.include "../../graphics/imlib/buildlink3.mk"
-.include "../../sysutils/gkrellm1/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/gkrellm1-wireless/PLIST b/net/gkrellm1-wireless/PLIST
deleted file mode 100644
index cbdda0a6cf6..00000000000
--- a/net/gkrellm1-wireless/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/24 23:28:35 cube Exp $
-lib/gkrellm/plugins/wireless.so
diff --git a/net/gkrellm1-wireless/distinfo b/net/gkrellm1-wireless/distinfo
deleted file mode 100644
index 344a1f3d510..00000000000
--- a/net/gkrellm1-wireless/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:13:47 agc Exp $
-
-SHA1 (gkrellmwireless-0.2.2.tar.gz) = 184d1aa034e4cf4a76d279d8bf0dcc278b134252
-RMD160 (gkrellmwireless-0.2.2.tar.gz) = aafb2ce0ed6d43af7a70e9a944fa3f9bb7c4ff85
-Size (gkrellmwireless-0.2.2.tar.gz) = 7971 bytes
-SHA1 (patch-aa) = df80eba1947398684988f199c462185b1ab02c0d
-SHA1 (patch-ab) = 562d62972c385ef019be93cbb6f9fe5a0bf05c62
diff --git a/net/gkrellm1-wireless/patches/patch-aa b/net/gkrellm1-wireless/patches/patch-aa
deleted file mode 100644
index ccf6abb0d9d..00000000000
--- a/net/gkrellm1-wireless/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/24 23:28:35 cube Exp $
-
---- Makefile.orig	Sun Sep  9 10:12:41 2001
-+++ Makefile
-@@ -12,6 +12,9 @@
- 	GTK_CONFIG = gtk-config
- endif
- 
-+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)
- LFLAGS = -shared
- 
--CC = gcc $(CFLAGS) $(FLAGS)
-+CC = gcc $(CFLAGS)
- 
- OBJS = wireless.o
- 
- INSTALL = install -c -s 
- INSTALL_PERMS = -m 755
--PLUGIN_DIR = /usr/lib/gkrellm/plugins
-+PLUGIN_DIR = ${PREFIX}/lib/gkrellm/plugins
- 
- 
- all:	wireless.so
diff --git a/net/gkrellm1-wireless/patches/patch-ab b/net/gkrellm1-wireless/patches/patch-ab
deleted file mode 100644
index d4d60f41c81..00000000000
--- a/net/gkrellm1-wireless/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/09/12 22:19:27 wiz Exp $
-
---- wireless.h.orig	2001-09-09 16:25:55.000000000 +0200
-+++ wireless.h
-@@ -31,8 +31,16 @@
-   #include <net/if_dl.h>
-   #include <net/if_ether.h>
-   #include <net/if_media.h>
-+# if __NetBSD_Version__ > 106250000
-+  #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>
-+# else
-+    #include <dev/pcmcia/if_wi_ieee.h>
-+# endif
- #endif
- 
- #define PLUGIN_CONFIG_KEYWORD "gkrellmwireless"