From billf@jade.chc-chimes.com  Mon Oct 12 13:57:04 1998
Received: from jade.chc-chimes.com (jade.chc-chimes.com [206.67.97.83])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id NAA10709
          for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Oct 1998 13:56:59 -0700 (PDT)
          (envelope-from billf@jade.chc-chimes.com)
Received: (from billf@localhost)
	by jade.chc-chimes.com (8.8.8/8.8.8) id QAA04316;
	Mon, 12 Oct 1998 16:55:46 -0400 (EDT)
	(envelope-from billf)
Message-Id: <199810122055.QAA04316@jade.chc-chimes.com>
Date: Mon, 12 Oct 1998 16:55:46 -0400 (EDT)
From: Bill Fumerola <billf@jade.chc-chimes.com>
Reply-To: billf@jade.chc-chimes.com
To: FreeBSD-gnats-submit@freebsd.org
Subject: update port: net/ntop
X-Send-Pr-Version: 3.2

>Number:         8292
>Category:       ports
>Synopsis:       update port: net/ntop
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    billf
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 12 14:00:01 PDT 1998
>Closed-Date:    Wed Nov 11 16:04:22 PST 1998
>Last-Modified:  Wed Nov 11 16:05:44 PST 1998
>Originator:     Bill Fumerola
>Release:        FreeBSD 2.2.7-STABLE i386
>Organization:
Computer Horizons Corp
>Environment:
>Description:

ntop continues to provide more detail on the packets it does statistics
on, and now it has a little built in web server. how neat.

patches: patch-aa, patch-ab, and patch-ac should be retired to the attic
never to be seen again. patch-ad and patch-ae are drasticly different, and
I even considered just making them -af and -ag, this is up to the
committer (whoever that may be).

>How-To-Repeat:
>Fix:
--- md5	Mon Oct 12 16:23:01 1998
+++ files/md5	Mon Oct 12 16:23:00 1998
@@ -1 +1 @@
-MD5 (ntop-0.4-src.tar.gz) = 6867ac4fd7390de478ce0c401c11e23e
+MD5 (ntop-1.0.src.tar.gz) = 25ad6dc31771e96ceacb0cd824f20d1c
--- patches/OLDpatch-ad	Mon Oct 12 16:28:46 1998
+++ patches/patch-ad	Mon Oct 12 16:44:18 1998
@@ -1,23 +1,11 @@
---- Makefile.in.old    Mon Aug 10 21:23:13 1998
-+++ Makefile.in        Mon Aug 10 21:23:39 1998
-@@ -38,17 +38,17 @@
+--- Makefile.in.orig	Tue Oct  6 11:27:31 1998
++++ Makefile.in	Mon Oct 12 16:43:50 1998
+@@ -38,7 +38,7 @@
  CC = @CC@
  PROG = ntop
  CCOPT = @V_CCOPT@
--INCLS = -I. -I/usr/5include @V_INCLS@
-+INCLS = -I. -I/usr/include -I/usr/local/include @V_INCLS@
+-INCLS = -I. @V_INCLS@
++INCLS = -I. -I/usr/local/include @V_INCLS@
  DEFS = @DEFS@
  
  # Standard CFLAGS
- CFLAGS = $(CCOPT) $(DEFS) $(INCLS)
- 
- # Standard LDFLAGS
--LDFLAGS = @LDFLAGS@ -L/usr/5lib
-+LDFLAGS = @LDFLAGS@ -L/usr/lib
- 
- # Standard LIBS
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lncurses
- 
- INSTALL = @INSTALL@
- 
--- patches/OLDpatch-ae	Mon Oct 12 16:46:45 1998
+++ patches/patch-ae	Mon Oct 12 16:48:46 1998
@@ -1,16 +1,22 @@
---- ntop.c.orig	Mon Aug 10 22:44:18 1998
-+++ ntop.c	Mon Aug 10 22:45:29 1998
-@@ -298,11 +298,11 @@
- usage()
- {
-   extern char version[];
--  extern char pcap_version[];
-+/*  extern char pcap_version[]; */
+--- ntop.c.old	Mon Oct 12 16:47:22 1998
++++ ntop.c	Mon Oct 12 16:47:52 1998
+@@ -64,7 +64,7 @@
+ extern void scanTimedoutTCPSessions(time_t theTime);
+ extern int optind, opterr;
+ extern time_t nextSessionTimeoutScan;
+-extern char *optarg, version[], pcap_version[];
++extern char *optarg, version[]; // , pcap_version[]
  
-   (void)fprintf(stderr, "%s v.%s for %s\n", program_name, 
- 		version, osName);
--  (void)fprintf(stderr, "[libpcap version %s]\n", pcap_version);
-+/*  (void)fprintf(stderr, "[libpcap version %s]\n", pcap_version); */
-   (void)fprintf(stderr, "Written by %s.\n", author);
-   (void)fprintf(stderr, "\nUsage: %s [-r (refresh time [default 3 secs]]\n\t"
- 		"    [-n (numeric IP addresses)]\n\t"
+ /* Globals */
+ char *program_name, *device;
+@@ -439,8 +439,8 @@
+     clrscr(); /* clear the screen */  
+   }
+ 
+-  sprintf(buf, "%s v.%s for %s [libpcap version %s]", 
+-	  program_name, version, osName, pcap_version); 
++  sprintf(buf, "%s v.%s for %s", 
++	  program_name, version, osName); 
+   if(cursesMode) { mvprintw (row++, 0, buf); } else fprintf(stderr, "%s\n", buf);
+   sprintf(buf, "Written by %s.", author);
+   if(cursesMode) { mvprintw (row, 0, buf); row+=2; } else fprintf(stderr, "%s\n\n", buf);
--- Makefile.old	Mon Oct 12 16:23:01 1998
+++ Makefile	Mon Oct 12 16:50:40 1998
@@ -1,22 +1,22 @@
 # New ports collection makefile for:   ntop
-# Version required:    0.2.2
+# Version required:    1.0
 # Date created:        10 August 1998
 # Whom:                Bill Fumerola <billf@chc-chimes.com>
 #
 # $Id: Makefile,v 1.3 1998/09/05 21:43:26 hoek Exp $
 #
 
-DISTNAME=	ntop-0.4-src
-PKGNAME=	ntop-0.4
+DISTNAME=	ntop-1.0.src
+PKGNAME=	ntop-1.0
 CATEGORIES=	net
-MASTER_SITES=	http://jake.unipi.it/~deri/ntop/
+MASTER_SITES=	ftp://ftp.unipi.it/pub/local/ntop/source/
 
 MAINTAINER=	billf@chc-chimes.com
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_AUTOCONF=	yes
 ALL_TARGET=
-INSTALL_TARGET=	install install-man
+INSTALL_TARGET=	install
 CFLAGS+=	-D__dead=
 
 MAN8=		ntop.8

----------

I am including the new patch-ad and patch-ae in case the committer just
wants to make patch-af and patch-ag

----------

patch-ad

--- Makefile.in.orig	Tue Oct  6 11:27:31 1998
+++ Makefile.in	Mon Oct 12 16:43:50 1998
@@ -38,7 +38,7 @@
 CC = @CC@
 PROG = ntop
 CCOPT = @V_CCOPT@
-INCLS = -I. @V_INCLS@
+INCLS = -I. -I/usr/local/include @V_INCLS@
 DEFS = @DEFS@
 
 # Standard CFLAGS


------

patch-ae


--- ntop.c.old	Mon Oct 12 16:47:22 1998
+++ ntop.c	Mon Oct 12 16:47:52 1998
@@ -64,7 +64,7 @@
 extern void scanTimedoutTCPSessions(time_t theTime);
 extern int optind, opterr;
 extern time_t nextSessionTimeoutScan;
-extern char *optarg, version[], pcap_version[];
+extern char *optarg, version[]; // , pcap_version[]
 
 /* Globals */
 char *program_name, *device;
@@ -439,8 +439,8 @@
     clrscr(); /* clear the screen */  
   }
 
-  sprintf(buf, "%s v.%s for %s [libpcap version %s]", 
-	  program_name, version, osName, pcap_version); 
+  sprintf(buf, "%s v.%s for %s", 
+	  program_name, version, osName); 
   if(cursesMode) { mvprintw (row++, 0, buf); } else fprintf(stderr, "%s\n", buf);
   sprintf(buf, "Written by %s.", author);
   if(cursesMode) { mvprintw (row, 0, buf); row+=2; } else fprintf(stderr, "%s\n\n", buf);
>Release-Note:
>Audit-Trail:

From: Bill Fenner <fenner@parc.xerox.com>
To: billf@jade.chc-chimes.com
Cc: FreeBSD-gnats-submit@FreeBSD.ORG
Subject: Re: ports/8292: update port: net/ntop 
Date: Thu, 15 Oct 1998 16:46:17 PDT

 In message <199810122055.QAA04316@jade.chc-chimes.com>you write:
 >+-extern char *optarg, version[], pcap_version[];
 >++extern char *optarg, version[]; // , pcap_version[]
 
 This diff is only needed on -stable; 3.0 has a new enough libpcap.
 
   Bill

From: Bill Fumerola <billf@chc-chimes.com>
To: freebsd-gnats-submit@freebsd.org
Cc:  Subject: ports/8292 Re: FreeBSD ports: 1 unfetchable distfiles: net/ntop
Date: Wed, 21 Oct 1998 13:39:19 -0400 (EDT)

 On Wed, 21 Oct 1998, Bill Fenner wrote:
 
 > 
 > Dear billf@chc-chimes.com,
 > 
 > 	You are listed as the FreeBSD port maintainer for 1 port
 > whose distfiles are not fetchable from their MASTER_SITES.  Could you
 > please visit
 > 
 > http://www.freebsd.org/~fenner/portsurvey/billf@chc-chimes.com.html
 > 
 > and correct the problems listed there?  The individual port with
 > a problem is net/ntop.
 
 I realize that this is an automated message, but I'd like to attach it to
 the audit trail of my PR.
 
 - bill fumerola [root/billf]@chc-chimes.com - computer horizons corp -
 -  ph:(800)252.2421 x128 / bfumerol@computerhorizons.com - BF1560  -
 
 	"Logic, like whiskey, loses its beneficial effect 
 	when taken in too large quantities" -Lord Dunsany
 
 
 
 
 
Responsible-Changed-From-To: freebsd-ports->billf 
Responsible-Changed-By: billf 
Responsible-Changed-When: Wed Nov 11 14:48:36 PST 1998 
Responsible-Changed-Why:  
It is my port. 
State-Changed-From-To: open->closed 
State-Changed-By: billf 
State-Changed-When: Wed Nov 11 16:04:22 PST 1998 
State-Changed-Why:  
changes implmented in v1.4 of the makefile 
I'd thank the author here I guess, but it was me before I 
had commit privledges. :> 
>Unformatted:
