- allow 0 retries [1]

- remove s/microsecond/millisecond/ [1]
- use PLIST_FILES, remove pkg-plist [2]
- add SHA256 hash to distinfo [2]

PR:		[1] ports/83339
		[2] ports/83757
Submitted by:	[1] Andre Albsmeier <Andre.Albsmeier@siemens.com>
		[2] Jason Harris <jharris@widomaker.com>

5 files changed, 15 insertions, 39 deletions

diff --git a/net/fping/Makefile b/net/fping/Makefile
index d54c7279aa14..b8c6f59818c1 100644
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@@ -15,6 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}_to-ipv6
 MAINTAINER=	jharris@widomaker.com
 COMMENT=	Quickly ping N hosts w/o flooding the network
 
+PLIST_FILES=	sbin/fping
+
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--bindir="${PREFIX}/sbin"
diff --git a/net/fping/distinfo b/net/fping/distinfo
index 20005c028a8c..1157988784f1 100644
--- a/net/fping/distinfo
+++ b/net/fping/distinfo
@@ -1,4 +1,5 @@
 MD5 (fping-2.4b2_to-ipv6.tar.gz) = 3ad516765514249a40d3c5b6caab812a
 SHA1 (fping-2.4b2_to-ipv6.tar.gz) = d310c6fe951f64660d4c0a5f2bd1c5379c1e5bde
 RMD160 (fping-2.4b2_to-ipv6.tar.gz) = cff101a53baec9cc23063ff2004db69a3510c51f
+SHA256 (fping-2.4b2_to-ipv6.tar.gz) = 77e1a90af4fff4a5ffc4b70542c6ff44130558357e7d549f99a9eff23108d172
 SIZE (fping-2.4b2_to-ipv6.tar.gz) = 63333
diff --git a/net/fping/files/patch-02 b/net/fping/files/patch-02
index 70bccfff7f28..d9df3f7af3de 100644
--- a/net/fping/files/patch-02
+++ b/net/fping/files/patch-02
@@ -1,5 +1,5 @@
 --- fping.c.orig	Mon Jan 21 02:06:30 2002
-+++ fping.c	Sat Oct 25 21:33:01 2003
++++ fping.c	Tue Jul 12 18:11:30 2005
 @@ -42,7 +42,6 @@
   * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
   * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
@@ -63,6 +63,17 @@
  	ident = getpid() & 0xFFFF;
  
  	verbose_flag = 1;
+@@ -502,8 +504,8 @@
+ 			break;
+ 		
+ 		case 'r':
+-			if( !( retry = ( u_int )atoi( optarg ) ) )
+-				usage();
++			retry = ( u_int )atoi( optarg );
++
+ 
+ 			break;
+ 		
 @@ -823,6 +825,7 @@
  
  		while( fgets( line, 132, ping_file ) )
diff --git a/net/fping/files/patch-03 b/net/fping/files/patch-03
index 71d85b17b533..40c318f1abdd 100644
--- a/net/fping/files/patch-03
+++ b/net/fping/files/patch-03
@@ -6,42 +6,6 @@
  .SH NAME

  fping \- send ICMP ECHO_REQUEST packets to network hosts

  .SH SYNOPSIS

-@@ -79,7 +79,7 @@
- 

- somehost : 91.7 37.0 29.2 - 36.8

- 

--shows the response time in milliseconds for each of the five requests,

-+shows the response time in microseconds for each of the five requests,

- with the "-" indicating that no response was received to the fourth

- request.

- .IP \fB-d\fR 5

-@@ -107,7 +107,7 @@
- .IP \fB-h\fR 5

- Print usage message.

- .IP \fB-i\fIn\fR 5

--The minimum amount of time (in milliseconds) between sending a ping packet to any target (default is 25).

-+The minimum amount of time (in microseconds) between sending a ping packet to any target (default is 25).

- .IP \fB-l\fR 5

- Loop sending packets to each target indefinitely.  Can be interrupted

- with ctl-C; statistics about responses for each target are then displayed.

-@@ -117,7 +117,7 @@
- Same as -d.

- .IP \fB-p\fR 5

- In looping or counting modes (-l, -c, or -C), this parameter sets the

--time in milliseconds that

-+time in microseconds that

- .B fping

- waits between successive packets to an individual target.  Default is

- 1000.

-@@ -131,7 +131,7 @@
- .IP \fB-s\fR 5

- Print cumulative statistics upon exit.

- .IP \fB-t\fIn\fR 5

--Initial target timeout in milliseconds (default 500). In the default

-+Initial target timeout in microseconds (default 2500). In the default

- mode, this is the amount of time that 

- .B fping

- waits for a response to its first request.  Successive timeouts are

 @@ -152,12 +152,12 @@
  example none the less. 

  .nf

diff --git a/net/fping/pkg-plist b/net/fping/pkg-plist
deleted file mode 100644
index f17f2b873117..000000000000
--- a/net/fping/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-sbin/fping