Use net-snmp instead of ucd-snmp.

3 files changed, 54 insertions, 8 deletions

diff --git a/net/gkrellm1-snmp/Makefile b/net/gkrellm1-snmp/Makefile
index e4ded1f5826..bcf9839e3e8 100644
--- a/net/gkrellm1-snmp/Makefile
+++ b/net/gkrellm1-snmp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/03/26 02:27:48 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/29 16:27:30 cube Exp $
 
 DISTNAME=		gkrellm_snmp-0.18
 PKGNAME=		gkrellm-snmp-0.18
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		net sysutils
 MASTER_SITES=		http://triq.net/gkrellm/
 
@@ -18,7 +18,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gkrellm_snmp.so ${PREFIX}/lib/gkrellm/plugins/
 
 .include "../../graphics/imlib/buildlink2.mk"
-.include "../../net/ucd-snmp/buildlink2.mk"
+.include "../../net/net-snmp/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 .include "../../sysutils/gkrellm1/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
diff --git a/net/gkrellm1-snmp/distinfo b/net/gkrellm1-snmp/distinfo
index 75b807437a4..702bb92510d 100644
--- a/net/gkrellm1-snmp/distinfo
+++ b/net/gkrellm1-snmp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/02/24 23:27:25 cube Exp $
+$NetBSD: distinfo,v 1.2 2004/03/29 16:27:30 cube Exp $
 
 SHA1 (gkrellm_snmp-0.18.tar.gz) = c1aa5edf8e86aedb377c454cf1f249d956ec8a67
 Size (gkrellm_snmp-0.18.tar.gz) = 15450 bytes
 SHA1 (patch-aa) = b8c84280e496febff37579914d700b4980f8cc37
-SHA1 (patch-ab) = caa2acd64e3a58596b599fb22d72df69effbbc05
+SHA1 (patch-ab) = f9a8f15814e0c57b1fd8b05612ffbc321a150ca8
diff --git a/net/gkrellm1-snmp/patches/patch-ab b/net/gkrellm1-snmp/patches/patch-ab
index 8526e967b28..1daa9e5d854 100644
--- a/net/gkrellm1-snmp/patches/patch-ab
+++ b/net/gkrellm1-snmp/patches/patch-ab
@@ -1,8 +1,26 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/02/24 23:27:26 cube Exp $
+$NetBSD: patch-ab,v 1.2 2004/03/29 16:27:30 cube Exp $
 
---- gkrellm_snmp.c.orig	Thu Sep  6 22:15:30 2001
+--- gkrellm_snmp.c.orig	2001-07-27 20:06:41.000000000 +0000
 +++ gkrellm_snmp.c
-@@ -88,6 +88,7 @@
+@@ -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;
  };
  
@@ -10,3 +28,31 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/02/24 23:27:26 cube Exp $
  
  /*
   * 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 */