Regen some patches to get correct line number offsets; some patch(1) care.

7 files changed, 31 insertions, 28 deletions

diff --git a/comms/mgetty+sendfax/distinfo b/comms/mgetty+sendfax/distinfo
index ecc1d8f2e0f..437eb488c76 100644
--- a/comms/mgetty+sendfax/distinfo
+++ b/comms/mgetty+sendfax/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.20 2005/02/23 19:14:52 jwise Exp $
+$NetBSD: distinfo,v 1.21 2005/03/07 11:29:28 wiz Exp $
 
 SHA1 (mgetty1.1.31-Jul24.tar.gz) = a6f20da26b49bbfa695791edec7d0a2247b79e2d
 RMD160 (mgetty1.1.31-Jul24.tar.gz) = 255eec0838ce5bfad04c53d478a4505e74111a07
 Size (mgetty1.1.31-Jul24.tar.gz) = 998462 bytes
-SHA1 (patch-aa) = 249ec3d2425d359a5d89241978ff9ac6122d0eb6
+SHA1 (patch-aa) = 9b6d9d6af2245f3dfea235bc2e044a2151bc4187
 SHA1 (patch-ab) = 25c7ac6eb05551ac45ddc3b1fa85c47ea2823b66
 SHA1 (patch-ac) = e256174179415b558c22cc14c6a6402f94bf8893
 SHA1 (patch-ad) = 7c4a96eaf7c83e9d907a74317252f752b4c689e6
-SHA1 (patch-ae) = f274db8059463f8b915c2d2faa86aa0e956e5a2c
-SHA1 (patch-af) = 9c4c62ba7f509cbdd4735fe1f08e488cfa769403
-SHA1 (patch-ag) = 943aa837a285663ff6cf5ab07c3f908f499c2074
+SHA1 (patch-ae) = 04f35280e337fb766152b7d9badcd0c417aa1739
+SHA1 (patch-af) = b5a36405c7e3783810f513d890190352fe2008cb
+SHA1 (patch-ag) = f12e39005c78a94f641ccbdbbfa51b5181821148
 SHA1 (patch-ah) = 7ca56968f891eefe361d6c2635771ac6e0a36a5b
-SHA1 (patch-ai) = d3f4795898b435b04124cac5af0289157a86c659
+SHA1 (patch-ai) = a69003a5a28196c5a57bf538b20a31e2371683c7
 SHA1 (patch-aj) = 37d88c1a4f8d5826f7113dd120c32e89cc442e5d
 SHA1 (patch-ak) = 18f9570f35909089a4083fa24903dfea14dcc475
 SHA1 (patch-al) = 2a6dcf13d65446d2064228b1024517e599892a60
-SHA1 (patch-am) = 6b7516b3f857f65c0ecc7963f39e433e4ef8771d
+SHA1 (patch-am) = 682ed20b5dae0aadfae477741ccba10bc98266d8
 SHA1 (patch-ap) = 4b101e76df0081cc62c6fcfb424300019c09819b
diff --git a/comms/mgetty+sendfax/patches/patch-aa b/comms/mgetty+sendfax/patches/patch-aa
index 39291a1a5af..d5c219000fb 100644
--- a/comms/mgetty+sendfax/patches/patch-aa
+++ b/comms/mgetty+sendfax/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 1998/11/15 20:45:30 tron Exp $
+$NetBSD: patch-aa,v 1.3 2005/03/07 11:29:28 wiz Exp $
 
---- fax/faxspool.in.orig	Fri Aug  8 21:43:55 1997
-+++ fax/faxspool.in	Mon Dec 29 22:31:59 1997
-@@ -299,11 +299,11 @@
+--- fax/faxspool.in.orig	2004-07-17 12:17:49.000000000 +0200
++++ fax/faxspool.in
+@@ -389,11 +389,11 @@ fs_cvt_pdf()
  # user name (for authentification)
  ##########
  
diff --git a/comms/mgetty+sendfax/patches/patch-ae b/comms/mgetty+sendfax/patches/patch-ae
index 8fa6c9d5af8..dee99bcb89d 100644
--- a/comms/mgetty+sendfax/patches/patch-ae
+++ b/comms/mgetty+sendfax/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2002/03/09 17:17:06 fredb Exp $
+$NetBSD: patch-ae,v 1.3 2005/03/07 11:29:28 wiz Exp $
 
---- doc/mgetty.texi-in.orig	Sun Jan  6 11:40:55 2002
+--- doc/mgetty.texi-in.orig	2004-07-24 16:54:40.000000000 +0200
 +++ doc/mgetty.texi-in
 @@ -7,6 +7,10 @@
  @finalout
@@ -13,7 +13,7 @@ $NetBSD: patch-ae,v 1.2 2002/03/09 17:17:06 fredb Exp $
  This is the online documentation for the mgetty + sendfax
  package.
  
-@@ -3718,7 +3722,7 @@
+@@ -3825,7 +3829,7 @@ Mgetty should be run from @file{/etc/tty
  @code{man ttys} (there is no @file{/etc/inittab}).
  
  Open issues:
diff --git a/comms/mgetty+sendfax/patches/patch-af b/comms/mgetty+sendfax/patches/patch-af
index c1519f803ff..186172ac936 100644
--- a/comms/mgetty+sendfax/patches/patch-af
+++ b/comms/mgetty+sendfax/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2003/09/25 20:27:12 fredb Exp $
+$NetBSD: patch-af,v 1.6 2005/03/07 11:29:28 wiz Exp $
 
---- logfile.c.orig	2002-11-25 07:08:26.000000000 -0600
+--- logfile.c.orig	2003-01-14 22:30:20.000000000 +0100
 +++ logfile.c
-@@ -56,9 +56,11 @@ extern int atexit _PROTO(( void (*)(void
+@@ -58,9 +58,11 @@ extern int atexit _PROTO(( void (*)(void
  /* Most systems have these variables but do not declare them. On many
     of those systems that _do_ declare them, it won't hurt */
  
diff --git a/comms/mgetty+sendfax/patches/patch-ag b/comms/mgetty+sendfax/patches/patch-ag
index bde7696a3c0..3c7678bb450 100644
--- a/comms/mgetty+sendfax/patches/patch-ag
+++ b/comms/mgetty+sendfax/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1 1999/05/07 19:35:27 tron Exp $
+$NetBSD: patch-ag,v 1.2 2005/03/07 11:29:28 wiz Exp $
 
---- g3/Makefile.orig	Mon Feb  3 00:45:58 1997
-+++ g3/Makefile	Fri May  7 21:29:43 1999
-@@ -42,5 +42,5 @@
+--- g3/Makefile.orig	2004-07-20 14:44:25.000000000 +0200
++++ g3/Makefile
+@@ -45,8 +45,8 @@ install: all
  #
  # make symlink for "g3topbm" (so third-party fax viewers won't fail)
  #
@@ -10,3 +10,6 @@ $NetBSD: patch-ag,v 1.1 1999/05/07 19:35:27 tron Exp $
 -	test -x g3topbm || ln -s g32pbm g3topbm
 +#	-cd $(BINDIR) ; \
 +#	test -x g3topbm || ln -s g32pbm g3topbm
+ 
+ 
+ # test suite
diff --git a/comms/mgetty+sendfax/patches/patch-ai b/comms/mgetty+sendfax/patches/patch-ai
index d63849f20ce..246ed79be1d 100644
--- a/comms/mgetty+sendfax/patches/patch-ai
+++ b/comms/mgetty+sendfax/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.2 2003/09/20 16:39:38 fredb Exp $
+$NetBSD: patch-ai,v 1.3 2005/03/07 11:29:28 wiz Exp $
 
---- fax/Makefile.orig
+--- fax/Makefile.orig	2003-10-09 14:38:49.000000000 +0200
 +++ fax/Makefile
-@@ -12,6 +12,9 @@
+@@ -12,6 +12,9 @@ FAX_SCRIPTS=faxspool faxrunq faxq faxrm 
  zigzag: 
  	cd .. ; $(MAKE) subdirs
  
@@ -23,7 +23,7 @@ $NetBSD: patch-ai,v 1.2 2003/09/20 16:39:38 fredb Exp $
  #
  # /etc/magic
  #
-@@ -67,4 +70,4 @@
+@@ -82,4 +85,4 @@ install: all
  #
  # faxspool.rules sample file
  #
diff --git a/comms/mgetty+sendfax/patches/patch-am b/comms/mgetty+sendfax/patches/patch-am
index 1a97c9e97c2..c7533cdc151 100644
--- a/comms/mgetty+sendfax/patches/patch-am
+++ b/comms/mgetty+sendfax/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1 2003/02/26 21:45:46 fredb Exp $
+$NetBSD: patch-am,v 1.2 2005/03/07 11:29:28 wiz Exp $
 
---- mgetty.c.orig	2002-12-05 05:54:03.000000000 -0600
+--- mgetty.c.orig	2003-11-17 20:09:41.000000000 +0100
 +++ mgetty.c
-@@ -512,7 +512,8 @@
+@@ -518,7 +518,8 @@ int main _P2((argc, argv), int argc, cha
  
      rmlocks();