From olive@pasteur.fr  Wed Aug 20 05:12:01 2003
Return-Path: <olive@pasteur.fr>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3624816A4BF
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 20 Aug 2003 05:12:01 -0700 (PDT)
Received: from electre.pasteur.fr (electre.pasteur.fr [157.99.64.120])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EEEF443F85
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 20 Aug 2003 05:11:59 -0700 (PDT)
	(envelope-from olive@pasteur.fr)
Received: from mafate.sis.pasteur.fr (mafate.sis.pasteur.fr [157.99.64.42])
	by electre.pasteur.fr (8.12.9/8.12.9) with ESMTP id h7KCBwBX423737
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 20 Aug 2003 14:11:58 +0200 (CEST)
Received: by mafate.sis.pasteur.fr (Postfix, from userid 3494)
	id 529093F68C; Wed, 20 Aug 2003 14:11:58 +0200 (CEST)
Message-Id: <20030820121158.529093F68C@mafate.sis.pasteur.fr>
Date: Wed, 20 Aug 2003 14:11:58 +0200 (CEST)
From: Olivier Tharan <olive@oban.frmug.org>
Reply-To: Olivier Tharan <olive@oban.frmug.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [maintainer update] net/nload cosmetic changes - Makefile reduction
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         55803
>Category:       ports
>Synopsis:       [maintainer update] net/nload cosmetic changes - Makefile reduction
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 20 05:20:09 PDT 2003
>Closed-Date:    Wed Aug 20 05:41:15 PDT 2003
>Last-Modified:  Wed Aug 20 05:41:15 PDT 2003
>Originator:     Olivier Tharan
>Release:        FreeBSD 4.8-STABLE i386
>Organization:
>Environment:
System: FreeBSD mafate.sis.pasteur.fr 4.8-STABLE FreeBSD 4.8-STABLE #6: Mon Aug 4 10:31:11 CEST 2003 root@mafate.sis.pasteur.fr:/usr/obj/usr/src/sys/MAFATE i386


	
>Description:
Here is a patch to get rid of ${STRIP_CMD} as the upstream install target
already does it.

There is a new patch file, patch-ab, to have FreeBSD specifics in the
documentation (fxp0 instead of eth0).

Thanks to Volker Stolz!
>How-To-Repeat:
	
>Fix:

diff -urN nload.orig/Makefile nload/Makefile
--- nload.orig/Makefile	Wed Aug 20 13:42:48 2003
+++ nload/Makefile	Wed Aug 20 13:50:41 2003
@@ -19,7 +19,4 @@
 MAN1=		nload.1
 MANCOMPRESSED=	yes
 
-post-install:
-	${STRIP_CMD} ${PREFIX}/bin/nload
-
 .include <bsd.port.mk>
diff -urN nload.orig/files/patch-ab nload/files/patch-ab
--- nload.orig/files/patch-ab	Thu Jan  1 01:00:00 1970
+++ nload/files/patch-ab	Wed Aug 20 13:48:17 2003
@@ -0,0 +1,33 @@
+--- src/main.cpp.orig	Wed Aug 20 13:39:57 2003
++++ src/main.cpp	Wed Aug 20 13:40:16 2003
+@@ -441,7 +441,7 @@
+ 	"		default is \"%s\"\n"
+ 	"--help\n"
+ 	"-h		print this help\n\n"
+-	"example: %s -t 200 -s 7 -i 1024 -o 128 -U h eth0 eth1\n\n"
++	"example: %s -t 200 -s 7 -i 1024 -o 128 -U h fxp0 fxp1\n\n"
+ 	"The options above can also be changed at run time by pressing the 'o' key.\n\n",
+ 	PACKAGE,
+ 	VERSION,
+--- docs/nload.1.in.orig	Wed Aug 20 13:38:09 2003
++++ docs/nload.1.in	Wed Aug 20 13:38:31 2003
+@@ -85,7 +85,7 @@
+ The default is M.
+ .TP
+ .B devices
+-Network devices to use. The default device is "eth0".
++Network devices to use. The default device is "fxp0".
+ .TP
+ .B \-h, \-\-help
+ Show a short summary of these command line options.
+@@ -112,10 +112,6 @@
+ .TP
+ .B '+', '-'
+ Scroll the option window.
+-
+-.SH FILES
+-.I /proc/net/dev
+-is read by nload to get the network traffic data.
+ 
+ .SH VERSION
+ This is version @VERSION@ of nload.
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed  
State-Changed-By: krion 
State-Changed-When: Wed Aug 20 05:41:03 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=55803 
>Unformatted:
