fix some patches to eliminate fuzz.

patch from Jeremy C. Reed in PR pkg/20810.

4 files changed, 23 insertions, 26 deletions

diff --git a/net/host/distinfo b/net/host/distinfo
index aef2ce8e049..45065f988fd 100644
--- a/net/host/distinfo
+++ b/net/host/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 11:23:17 wiz Exp $
+$NetBSD: distinfo,v 1.3 2003/10/11 14:18:57 grant Exp $
 
 SHA1 (host_991529.tar.Z) = 28097ee01a94bb82cec69a3be556a869ea236b5f
 Size (host_991529.tar.Z) = 184455 bytes
-SHA1 (patch-aa) = c81d805bd1648bf25c92687f4eecc5b514ec61ea
+SHA1 (patch-aa) = f9b4e0668419adb2223b315bb7facd03f1fa7e83
 SHA1 (patch-ab) = 471a67439f2e5847b510f0e73bb857226c79c450
-SHA1 (patch-ac) = d7e72221a45b82c4454cb8d00aaae50a0340aad6
-SHA1 (patch-ad) = 44a38670f2557b1b7812aee98e300c760584e1a5
+SHA1 (patch-ac) = b03893231b796f70412025eca7b8fb0884348e3a
+SHA1 (patch-ad) = 5440b41333d829e8522fb85189c8fe3159f74166
diff --git a/net/host/patches/patch-aa b/net/host/patches/patch-aa
index 228b632b5c2..2d26f406071 100644
--- a/net/host/patches/patch-aa
+++ b/net/host/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2003/10/11 14:18:58 grant Exp $
 
---- Makefile.orig	Wed Mar 15 22:51:39 2000
-+++ Makefile
+--- Makefile.orig	2000-03-15 13:51:39.000000000 -0800
++++ Makefile	2003-03-19 14:15:48.000000000 -0800
 @@ -4,11 +4,13 @@
  # Adapt the installation directories to your local standards.
  # ----------------------------------------------------------------------
@@ -18,14 +18,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $
  
  BINDIR = $(DESTBIN)
  MANDIR = $(DESTMAN)/man1
-@@ -38,7 +40,10 @@
- SYSDEFS = -DNO_YP_LOOKUP
- #endif
+@@ -40,6 +42,9 @@
  
  SYSDEFS =
-+
+ 
 +#if defined(NetBSD) && you have not removed support for $HOSTALIASES
 +SYSDEFS = ${ALLOW_HOSTALIASES}
- 
++
  # ----------------------------------------------------------------------
  # Configuration definitions.
+ # See also the header file conf.h for more configuration definitions.
diff --git a/net/host/patches/patch-ac b/net/host/patches/patch-ac
index 3c03008e4fe..7ac0d52f560 100644
--- a/net/host/patches/patch-ac
+++ b/net/host/patches/patch-ac
@@ -1,9 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2003/10/11 14:18:58 grant Exp $
 
---- mxlookup.orig	Sun Jan  8 01:07:04 1995
-+++ mxlookup
-@@ -26,10 +26,10 @@
- # Setup environment.
+--- mxlookup.orig	1995-01-07 16:07:04.000000000 -0800
++++ mxlookup	2003-03-19 14:17:45.000000000 -0800
+@@ -27,9 +27,9 @@
  # ----------------------------------------------------------------------
  
  # This is where the ``host'' executable lives.
diff --git a/net/host/patches/patch-ad b/net/host/patches/patch-ad
index 15cc52dbbc9..8480a606ca0 100644
--- a/net/host/patches/patch-ad
+++ b/net/host/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2003/10/11 14:18:58 grant Exp $
 
---- rblookup.orig	Wed Jan 27 01:50:22 1999
-+++ rblookup
+--- rblookup.orig	1999-01-26 16:50:22.000000000 -0800
++++ rblookup	2003-03-19 14:18:44.000000000 -0800
 @@ -12,8 +12,8 @@
  # of the Mail Abuse Prevention System. See: http://maps.vix.com/rbl
  #
@@ -13,8 +13,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $
  #
  #	Returns:
  #		zero if the given host was found on the blacklist.
-@@ -44,25 +44,72 @@
- # Setup environment.
+@@ -45,24 +45,71 @@
  # ----------------------------------------------------------------------
  
  # This is where the ``host'' executable lives.
@@ -93,7 +92,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $
  # ----------------------------------------------------------------------
  
  EX_OK=0
-@@ -85,8 +134,11 @@
+@@ -85,8 +132,11 @@
  # ----------------------------------------------------------------------
  
  verbose=
@@ -107,7 +106,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $
  
  skip=
  for i
-@@ -95,7 +147,9 @@
+@@ -95,7 +145,9 @@
  
  	case "$i" in
  	-orbs)	orbs=true ;;
@@ -118,7 +117,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $
  	-i)	reverse=true ;;
  	-v)	verbose="-v" ;;
  	-d)	exec=echo ;;
-@@ -105,28 +159,10 @@
+@@ -105,28 +157,10 @@
  	shift
  done
  
@@ -149,7 +148,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/03/10 17:06:37 wiz Exp $
  # ----------------------------------------------------------------------
  
  invalid ()
-@@ -180,20 +216,42 @@
+@@ -180,20 +214,42 @@
  
  exitstat=$EX_UNAVAILABLE