[pkgsrc/trunk]: pkgsrc/net Update fping and fping6 to 2.4b2nb1.

[abs <abs%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ac3f3ef4083
branches:  trunk
changeset: 460783:6ac3f3ef4083
user:      abs <abs%pkgsrc.org@localhost>
date:      Thu Sep 04 12:47:37 2003 +0000

description:
Update fping and fping6 to 2.4b2nb1.
        Add !defined(__NetBSD__) to a broken __alpha__ test.

diffstat:

 net/fping/Makefile          |   3 ++-
 net/fping/distinfo          |   3 ++-
 net/fping/patches/patch-aa  |  17 +++++++++++++++++
 net/fping6/distinfo         |   3 ++-
 net/fping6/patches/patch-ab |  17 +++++++++++++++++
 5 files changed, 40 insertions(+), 3 deletions(-)

diffs (77 lines):

diff -r ca51a29091a3 -r 6ac3f3ef4083 net/fping/Makefile
--- a/net/fping/Makefile        Thu Sep 04 11:48:43 2003 +0000
+++ b/net/fping/Makefile        Thu Sep 04 12:47:37 2003 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:51:10 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/04 12:47:37 abs Exp $
 # FreeBSD Id: ports/net/fping/Makefile,v 1.10 2000/04/20 20:18:57 mharo Exp
 
 DISTNAME=      fping-2.4b2_to
 PKGNAME=       fping-2.4b2
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  http://www.fping.com/download/
 
diff -r ca51a29091a3 -r 6ac3f3ef4083 net/fping/distinfo
--- a/net/fping/distinfo        Thu Sep 04 11:48:43 2003 +0000
+++ b/net/fping/distinfo        Thu Sep 04 12:47:37 2003 +0000
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.5 2003/03/24 16:42:56 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2003/09/04 12:47:37 abs Exp $
 
 SHA1 (fping-2.4b2_to.tar.gz) = 9318f2ec4b389cd74ca32f561fea95f9528f16a3
 Size (fping-2.4b2_to.tar.gz) = 60968 bytes
+SHA1 (patch-aa) = df15ec2bd474636c0950b465f918791657b7f5d8
diff -r ca51a29091a3 -r 6ac3f3ef4083 net/fping/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/fping/patches/patch-aa        Thu Sep 04 12:47:37 2003 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.6 2003/09/04 12:47:38 abs Exp $
+
+--- fping.c.orig       Fri Jul 20 18:10:26 2001
++++ fping.c
+@@ -1547,8 +1547,10 @@ int wait_for_reply( void )
+ 
+       ip = ( struct ip* )buffer;
+ 
+-#if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ )
+-      /* The alpha headers are decidedly broken.
++#if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ ) && !defined( __NetBSD__ )
++      /* The alpha headers are decidedly broken. 
++       * XXX _WHAT_ 'alpha'? OSF? True64? Linux?... Certainly not NetBSD
++       * XXX If defining for a particular broken OS then _include the OS_.
+        * Using an ANSI compiler, it provides ip_vhl instead of ip_hl and
+        * ip_v.  So, to get ip_hl, we mask off the bottom four bits.
+        */
diff -r ca51a29091a3 -r 6ac3f3ef4083 net/fping6/distinfo
--- a/net/fping6/distinfo       Thu Sep 04 11:48:43 2003 +0000
+++ b/net/fping6/distinfo       Thu Sep 04 12:47:37 2003 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/03/24 15:21:36 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2003/09/04 12:47:39 abs Exp $
 
 SHA1 (fping-2.4b2_to-ipv6.tar.gz) = d310c6fe951f64660d4c0a5f2bd1c5379c1e5bde
 Size (fping-2.4b2_to-ipv6.tar.gz) = 63333 bytes
 SHA1 (patch-aa) = 4cf9043f7106d9c85b2401a63d1c1dd50d4ee8f0
+SHA1 (patch-ab) = c09f49b1d5851a8a871b7b910c3d53554629e55e
diff -r ca51a29091a3 -r 6ac3f3ef4083 net/fping6/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/fping6/patches/patch-ab       Thu Sep 04 12:47:37 2003 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1 2003/09/04 12:47:39 abs Exp $
+
+--- fping.c.orig       Thu Sep  4 13:44:10 2003
++++ fping.c
+@@ -1625,8 +1625,10 @@ int wait_for_reply( void )
+ 
+       ip = ( struct ip* )buffer;
+ #ifndef IPV6
+-#if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ )
+-      /* The alpha headers are decidedly broken.
++#if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ ) && !defined( __NetBSD__ )
++      /* The alpha headers are decidedly broken. 
++       * XXX _WHAT_ 'alpha'? OSF? True64? Linux?... Certainly not NetBSD
++       * XXX If defining for a particular broken OS then _include the OS_.
+        * Using an ANSI compiler, it provides ip_vhl instead of ip_hl and
+        * ip_v.  So, to get ip_hl, we mask off the bottom four bits.
+        */