From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 25 14:20:06 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7842716A4CE for ; Thu, 25 Mar 2004 14:20:06 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6584C43D46 for ; Thu, 25 Mar 2004 14:20:06 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i2PMK6bv091284 for ; Thu, 25 Mar 2004 14:20:06 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i2PMK6ge091283; Thu, 25 Mar 2004 14:20:06 -0800 (PST) (envelope-from gnats) Resent-Date: Thu, 25 Mar 2004 14:20:06 -0800 (PST) Resent-Message-Id: <200403252220.i2PMK6ge091283@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Russell Jackson Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 79E0F16A4CF for ; Thu, 25 Mar 2004 14:11:25 -0800 (PST) Received: from cserv62.csub.edu (cserv62.csub.edu [136.168.10.62]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4B5F243D2D for ; Thu, 25 Mar 2004 14:11:25 -0800 (PST) (envelope-from rjackson@cserv62.csub.edu) Received: from cserv62.csub.edu (localhost [127.0.0.1]) by cserv62.csub.edu (8.12.9/8.12.9) with ESMTP id i2PMAMqD051971 for ; Thu, 25 Mar 2004 14:11:25 -0800 (PST) (envelope-from rjackson@cserv62.csub.edu) Received: (from rjackson@localhost) by cserv62.csub.edu (8.12.9/8.12.9/Submit) id i2PMALT3051970; Thu, 25 Mar 2004 14:10:21 -0800 (PST) (envelope-from rjackson) Message-Id: <200403252210.i2PMALT3051970@cserv62.csub.edu> Date: Thu, 25 Mar 2004 14:10:21 -0800 (PST) From: Russell Jackson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/64729: Update port: net-mgmt/sdig 0.30->0.40 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Russell Jackson List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Mar 2004 22:20:06 -0000 >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@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 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 - #include - --#include --#include --#include -+#include -+#include -+#include - - #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: