ports/64729: Update port: net-mgmt/sdig 0.30->0.40

[Russell Jackson]

>Number:         64729
>Category:       ports
>Synopsis:       Update port: net-mgmt/sdig 0.30->0.40
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 25 14:20:06 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Russell Jackson
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD cserv62.csub.edu 4.9-STABLE FreeBSD 4.9-STABLE #0: Mon Dec 15 16:35:36 PST 2003 rjackson at cserv62.csub.edu:/usr/obj/usr/src/sys/CSERV62 i386


	
>Description:
Update sdig port from 0.30 to 0.40

Note: sdig may still be waiting to be commited
	
>How-To-Repeat:
	
>Fix:
diff -urN sdig.orig/Makefile sdig/Makefile
--- sdig.orig/Makefile	Thu Mar 25 13:07:16 2004
+++ sdig/Makefile	Thu Mar 25 13:42:31 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdig
-PORTVERSION=	0.30
+PORTVERSION=	0.40
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.exploits.org/sdig/
 
@@ -15,6 +15,10 @@
 
 LIB_DEPENDS=	netsnmp.6:${PORTSDIR}/net-mgmt/net-snmp:install
 
+USE_GMAKE=yes
+GNU_CONFIGURE=yes
+
+MAN5=		sdig.conf.5
 MAN8=		sdig.8
 
 .include <bsd.port.mk>
diff -urN sdig.orig/distinfo sdig/distinfo
--- sdig.orig/distinfo	Thu Mar 25 13:07:16 2004
+++ sdig/distinfo	Thu Mar 25 13:31:40 2004
@@ -1,2 +1,2 @@
-MD5 (sdig-0.30.tar.gz) = 4424502de8ee2ac8ee6d599e0f16e3b2
-SIZE (sdig-0.30.tar.gz) = 25301
+MD5 (sdig-0.40.tar.gz) = 60132d49076f0e51d7cccc99cb72b7f4
+SIZE (sdig-0.40.tar.gz) = 72623
diff -urN sdig.orig/files/patch-Makefile sdig/files/patch-Makefile
--- sdig.orig/files/patch-Makefile	Thu Mar 25 13:07:16 2004
+++ sdig/files/patch-Makefile	Wed Dec 31 16:00:00 1969
@@ -1,46 +0,0 @@
---- Makefile.orig	Thu Mar 25 10:42:04 2004
-+++ Makefile	Thu Mar 25 12:45:08 2004
-@@ -1,21 +1,23 @@
- # sdig/Makefile: non-autoconf hack, for now
- #
- 
--CC	= gcc
--CFLAGS	= -O2 -Wall # -g -static
-+CC	?= gcc
-+CFLAGS	+= -Wall -I/usr/local/include# -g -static
-+
- PROGS   = sdig nbname swc
- 
- # change this to whatever it takes to make these things link on your system
- 
--UCDSNMP_CFLAGS = -lsnmp
--OPENSSL_CFLAGS = -L/usr/local/ssl/lib -lcrypto
-+UCDSNMP_LDFLAGS= -L/usr/local/lib -lnetsnmp
-+OPENSSL_LDFLAGS= -L/usr/local/ssl/lib -lcrypto
- 
- all: $(PROGS)
- 
--sdig: sdig.c common.o snmpget.o 
--	$(CC) $(CFLAGS) -o sdig sdig.c common.o snmpget.o $(UCDSNMP_CFLAGS) $(OPENSSL_CFLAGS)
-+sdig: sdig.o common.o snmpget.o 
-+	$(CC) $(CFLAGS) -o sdig sdig.o common.o snmpget.o $(UCDSNMP_LDFLAGS) $(OPENSSL_LDFLAGS)
- 
--swc: swc.c common.o
-+swc: swc.o common.o
-+	$(CC) $(CFLAGS) -o swc swc.o common.o
- 
- clean:
- 	rm -f $(PROGS) *.o
-@@ -23,9 +25,6 @@
- install: all
- 	cp sdig /usr/local/bin
- 	cp nbname /usr/local/bin
--	@if ( test -f /etc/sdig.conf ) \
--	then \
--		echo Not replacing existing file: /etc/sdig.conf; \
--	else \
--		cp sdig.conf /etc; \
--	fi
-+	cp swc /usr/local/bin
-+	cp sdig.8 /usr/local/man/man8
-+	cp sdig.conf /usr/local/etc/sdig.conf-sample
diff -urN sdig.orig/files/patch-Makefile.in sdig/files/patch-Makefile.in
--- sdig.orig/files/patch-Makefile.in	Wed Dec 31 16:00:00 1969
+++ sdig/files/patch-Makefile.in	Thu Mar 25 13:36:58 2004
@@ -0,0 +1,37 @@
+--- Makefile.in.orig	Fri Apr  4 08:35:54 2003
++++ Makefile.in	Thu Mar 25 13:36:34 2004
+@@ -9,8 +9,8 @@
+ MANDIR	= $(DESTDIR)@mandir@
+ 
+ # other definitions
+-CC	= @CC@
+-CFLAGS	= -Iinclude -O2 -Wall # -g -static
++CC	?= @CC@
++CFLAGS	+= -Iinclude -I/usr/local/include 
+ 
+ INSTALLCMD       = @INSTALL@
+ INSTALLMODE_BIN	 = 0755
+@@ -32,6 +32,9 @@
+ 	$(CC) $(CFLAGS) -o sdig sdig.o common.o snmpget.o \
+ 	$(NETSNMP_LIBS)
+ 
++snmpget.o: snmpget.c
++	$(CC) $(CFLAGS) -c snmpget.c
++
+ clean:
+ 	rm -f $(PROGS) *.o
+ 
+@@ -49,12 +52,7 @@
+ 
+ install-conf:
+ 	./install-sh -d $(CONFDIR)
+-	@if ( test -f $(CONFDIR)/sdig.conf ) \
+-	then \
+-		echo Not replacing existing file: $(CONFDIR)/sdig.conf; \
+-	else \
+-		$(INSTALLCMD) -m $(INSTALLMODE_CONF) sdig.conf $(CONFDIR); \
+-	fi
++	$(INSTALLCMD) -m $(INSTALLMODE_CONF) sdig.conf $(CONFDIR)/sdig.conf-sample
+ 
+ install-man:
+ 	./install-sh -d $(MANDIR)/man5
diff -urN sdig.orig/files/patch-sdig.c sdig/files/patch-sdig.c
--- sdig.orig/files/patch-sdig.c	Thu Mar 25 13:07:16 2004
+++ sdig/files/patch-sdig.c	Wed Dec 31 16:00:00 1969
@@ -1,11 +0,0 @@
---- sdig.c.orig	Thu Mar 25 11:31:51 2004
-+++ sdig.c	Thu Mar 25 11:32:04 2004
-@@ -34,7 +34,7 @@
- #include "snmpget.h"
- #include "version.h"
- 
--#define CONFIGFILE "/etc/sdig.conf"
-+#define CONFIGFILE "/usr/local/etc/sdig.conf"
- 
- 	stype	*firstsw = NULL;
- 	rtype	*firstrt = NULL;
diff -urN sdig.orig/files/patch-snmpget.c sdig/files/patch-snmpget.c
--- sdig.orig/files/patch-snmpget.c	Thu Mar 25 13:07:16 2004
+++ sdig/files/patch-snmpget.c	Wed Dec 31 16:00:00 1969
@@ -1,14 +0,0 @@
---- snmpget.c.orig	Thu Mar 25 10:35:19 2004
-+++ snmpget.c	Thu Mar 25 11:12:40 2004
-@@ -27,9 +27,9 @@
- #include <stdarg.h>
- #include <string.h>
- 
--#include <ucd-snmp/ucd-snmp-config.h>
--#include <ucd-snmp/ucd-snmp-includes.h>
--#include <ucd-snmp/system.h>
-+#include <net-snmp/net-snmp-config.h>
-+#include <net-snmp/net-snmp-includes.h>
-+#include <net-snmp/system/freebsd4.h>
- 
- #include "common.h"
diff -urN sdig.orig/pkg-plist sdig/pkg-plist
--- sdig.orig/pkg-plist	Thu Mar 25 13:07:16 2004
+++ sdig/pkg-plist	Thu Mar 25 13:31:01 2004
@@ -1,4 +1,2 @@
 bin/sdig
-bin/nbname
-bin/swc
 etc/sdig.conf-sample
	


>Release-Note:
>Audit-Trail:
>Unformatted: