regenerate patches with pkgdiff so they apply cleanly with

devel/patch.

10 files changed, 49 insertions, 48 deletions

diff --git a/news/inn/distinfo b/news/inn/distinfo
index 659d4c365e1..83f09425be0 100644
--- a/news/inn/distinfo
+++ b/news/inn/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.11 2004/07/07 12:38:24 tron Exp $
+$NetBSD: distinfo,v 1.12 2004/07/24 23:55:27 grant Exp $
 
 SHA1 (inn-2.4.1.tar.gz) = f36267eca56a643a37ed6c2903cd6fbb71e407f5
 Size (inn-2.4.1.tar.gz) = 1849845 bytes
-SHA1 (patch-aa) = 39fcd03440ece2246503197d217e04e4724bbb8d
-SHA1 (patch-ab) = c3360248137c07c0e1750860de79aa1f372a6352
-SHA1 (patch-ac) = dafbd4918eb771cf0bb49b9d2503125812fe6852
-SHA1 (patch-ad) = c782b0510c460a8942bb272e18e6d8d78901d4c9
-SHA1 (patch-ae) = 1177f68a567cbbf4b131548c8a1a595e3d3f29b8
-SHA1 (patch-af) = 0cfdb3c63f782dfe7120a1ae85fe86b8e0582639
-SHA1 (patch-ag) = d91e1710a12d6bf39564f550947f4705b0ffd585
-SHA1 (patch-ah) = 719ed7d26c23ce5170275995e4bd9e5a337199b9
-SHA1 (patch-ai) = 30caac4e6b269dc7cfac507ca1f8f0fe5ac11329
+SHA1 (patch-aa) = 548acc9d7b8386ed055fae772c8c26e5c6225da6
+SHA1 (patch-ab) = a681fdecf562088cfb25e8625be1380b32331af0
+SHA1 (patch-ac) = c37aa2ea182fafd01ee4a20dbcd67816217a8587
+SHA1 (patch-ad) = 1f4d4b15a478d6d35185977d8bc32a4e161665c5
+SHA1 (patch-ae) = 28c36db3fee701d7a46e656e0911356b0fa40c59
+SHA1 (patch-af) = fda097d52bd77500d287e30af8332d7e817a46a2
+SHA1 (patch-ag) = 0d513b856f1dc75e8d72294dc6e88ca52b0b9cd3
+SHA1 (patch-ah) = 0d3dbaab7fa70c96528beec8e7b3f05f74822512
+SHA1 (patch-ai) = 9d99bd095dc5cb4b9c99274c0adeaab779ca2c2d
diff --git a/news/inn/patches/patch-aa b/news/inn/patches/patch-aa
index cecfc9142a2..c0763f25f0d 100644
--- a/news/inn/patches/patch-aa
+++ b/news/inn/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2003/05/13 11:56:45 tron Exp $
+$NetBSD: patch-aa,v 1.10 2004/07/24 23:55:27 grant Exp $
 
---- configure.orig	2003-05-13 13:47:37.000000000 +0200
-+++ configure	2003-05-13 13:48:36.000000000 +0200
-@@ -964,8 +964,7 @@
+--- configure.orig	2004-01-08 09:47:19.000000000 +1100
++++ configure
+@@ -5684,8 +5684,7 @@ RNEWSMODE=0500
  if test "${enable_uucp_rnews+set}" = set; then
    enableval="$enable_uucp_rnews"
    if test "x$enableval" = xyes ; then
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.9 2003/05/13 11:56:45 tron Exp $
      fi
  fi
  
-@@ -2355,7 +2354,7 @@
+@@ -6522,7 +6521,7 @@ else
    echo "$ac_t""no" 1>&6
  fi
  
diff --git a/news/inn/patches/patch-ab b/news/inn/patches/patch-ab
index b727c13037b..12f79573af3 100644
--- a/news/inn/patches/patch-ab
+++ b/news/inn/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2001/02/08 16:23:07 tron Exp $
+$NetBSD: patch-ab,v 1.6 2004/07/24 23:55:28 grant Exp $
 
---- scripts/news.daily.in.orig	Mon May 17 10:26:41 1999
-+++ scripts/news.daily.in	Mon May 17 10:27:14 1999
-@@ -226,6 +226,10 @@
+--- scripts/news.daily.in.orig	2004-01-08 09:47:19.000000000 +1100
++++ scripts/news.daily.in
+@@ -223,6 +223,10 @@ fi
  
  cd ${PATHETC}
  
diff --git a/news/inn/patches/patch-ac b/news/inn/patches/patch-ac
index 55aaee196f6..ffb1e5dd94e 100644
--- a/news/inn/patches/patch-ac
+++ b/news/inn/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2001/02/08 16:23:07 tron Exp $
+$NetBSD: patch-ac,v 1.9 2004/07/24 23:55:28 grant Exp $
 
---- Makefile.global.in.orig	Thu Jan 11 09:55:23 2001
-+++ Makefile.global.in	Thu Feb  8 13:58:22 2001
-@@ -169,10 +169,10 @@
+--- Makefile.global.in.orig	2004-01-08 09:47:19.000000000 +1100
++++ Makefile.global.in
+@@ -225,10 +225,10 @@ PATHINBAD       = $(PATHINCOMING)/bad
  PATHOVERVIEW    = $(PATHSPOOL)/overview
  PATHOUTGOING    = $(PATHSPOOL)/outgoing
  
diff --git a/news/inn/patches/patch-ad b/news/inn/patches/patch-ad
index 58df5b67fc2..14ea08e44c2 100644
--- a/news/inn/patches/patch-ad
+++ b/news/inn/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2004/06/02 11:43:55 tron Exp $
+$NetBSD: patch-ad,v 1.6 2004/07/24 23:55:28 grant Exp $
 
---- scripts/rc.news.in.orig	2004-01-07 23:47:19.000000000 +0100
-+++ scripts/rc.news.in	2004-06-02 11:36:29.000000000 +0200
-@@ -76,6 +76,9 @@
+--- scripts/rc.news.in.orig	2004-01-08 09:47:19.000000000 +1100
++++ scripts/rc.news.in
+@@ -76,6 +76,9 @@ Xstop)
  ;;
  esac
  
diff --git a/news/inn/patches/patch-ae b/news/inn/patches/patch-ae
index dc7488d9ad1..bf740030d45 100644
--- a/news/inn/patches/patch-ae
+++ b/news/inn/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.8 2004/06/02 12:25:35 tron Exp $
+$NetBSD: patch-ae,v 1.9 2004/07/24 23:55:28 grant Exp $
 
---- frontends/rnews.c.orig	Wed Jan  7 23:47:19 2004
-+++ frontends/rnews.c	Wed Jun  2 14:19:30 2004
-@@ -822,10 +822,12 @@
+--- frontends/rnews.c.orig	2004-01-08 09:47:19.000000000 +1100
++++ frontends/rnews.c
+@@ -822,10 +822,12 @@ int main(int ac, char *av[])
      message_handlers_warn(1, message_log_syslog_err);
      message_handlers_die(1, message_log_syslog_err);
  
diff --git a/news/inn/patches/patch-af b/news/inn/patches/patch-af
index 8e93b903740..6aaf017b2c3 100644
--- a/news/inn/patches/patch-af
+++ b/news/inn/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.7 2004/07/07 12:38:25 tron Exp $
+$NetBSD: patch-af,v 1.8 2004/07/24 23:55:28 grant Exp $
 
---- innd/inndstart.c.orig	2004-01-07 23:47:19.000000000 +0100
-+++ innd/inndstart.c	2004-07-07 14:25:19.000000000 +0200
-@@ -136,6 +136,7 @@
+--- innd/inndstart.c.orig	2004-01-08 09:47:19.000000000 +1100
++++ innd/inndstart.c
+@@ -136,6 +136,7 @@ main(int argc, char *argv[])
      if (p && strcmp(p, "all") != 0 && strcmp(p, "any") != 0) {
          if (!inet_aton(p, &address))
              die("invalid bindaddress in inn.conf (%s)", p);
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.7 2004/07/07 12:38:25 tron Exp $
      }
  #ifdef HAVE_INET6
      address6 = in6addr_any;
-@@ -143,6 +144,7 @@
+@@ -143,6 +144,7 @@ main(int argc, char *argv[])
      if (p && strcmp(p, "all") != 0 && strcmp(p, "any") != 0) {
  	if (inet_pton(AF_INET6, p, &address6) < 1)
  	    die("invalid bindaddress6 in inn.conf (%s)", p);
diff --git a/news/inn/patches/patch-ag b/news/inn/patches/patch-ag
index d9830b29cc9..698844e520a 100644
--- a/news/inn/patches/patch-ag
+++ b/news/inn/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.7 2004/06/02 11:43:55 tron Exp $
+$NetBSD: patch-ag,v 1.8 2004/07/24 23:55:28 grant Exp $
 
---- control/pgpverify.in.orig	Mon May  6 08:02:07 2002
-+++ control/pgpverify.in	Sat Jul  6 16:58:05 2002
-@@ -90,7 +90,7 @@
+--- control/pgpverify.in.orig	2004-01-08 09:47:19.000000000 +1100
++++ control/pgpverify.in
+@@ -97,7 +97,7 @@ do '@LIBDIR@/innshellvars.pl';
  # Path to pgp binary; for PGP 5.0, set the path to the pgpv binary.
  # If you have INN and the script is able to successfully include your
  # innshellvars.pl file, the value of $inn::pgp will override this.
diff --git a/news/inn/patches/patch-ah b/news/inn/patches/patch-ah
index 334ed43b03f..a722354778e 100644
--- a/news/inn/patches/patch-ah
+++ b/news/inn/patches/patch-ah
@@ -1,8 +1,9 @@
-$NetBSD: patch-ah,v 1.6 2004/06/02 11:43:55 tron Exp $
+$NetBSD: patch-ah,v 1.7 2004/07/24 23:55:28 grant Exp $
 
---- site/Makefile.orig	Thu May  3 22:27:32 2001
-+++ site/Makefile	Sun Jun 24 13:01:33 2001
-@@ -85,21 +85,10 @@
+--- site/Makefile.orig	2004-01-08 09:47:19.000000000 +1100
++++ site/Makefile
+@@ -68,22 +68,11 @@ REST		= \
+ ALL		= $(MOST) $(REST)
  
  REST_INSTALLED	= \
 -	$D$(PATH_NEWSFEEDS) $D$(PATH_INNDHOSTS) \
diff --git a/news/inn/patches/patch-ai b/news/inn/patches/patch-ai
index 39a7dfef732..5b07297fbcd 100644
--- a/news/inn/patches/patch-ai
+++ b/news/inn/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.4 2004/06/02 11:43:55 tron Exp $
+$NetBSD: patch-ai,v 1.5 2004/07/24 23:55:28 grant Exp $
 
---- include/dbz.h.orig	2004-01-07 23:47:19.000000000 +0100
-+++ include/dbz.h	2004-06-02 13:02:04.000000000 +0200
-@@ -38,7 +38,7 @@
+--- include/dbz.h.orig	2004-01-08 09:47:19.000000000 +1100
++++ include/dbz.h
+@@ -38,7 +38,7 @@ typedef struct {
      bool             nonblock;
  } dbzoptions;