From 10293a009c8aad1f99a5dfb77b1a4d032af8294e Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Mon, 12 Jul 2010 19:03:13 +0000
Subject: [PATCH] regen patches

---
 mail/metamail/patches/patch-bin_showaudio     | 20 ++++++++++---------
 mail/metamail/patches/patch-bin_showpartial   | 18 ++++++++---------
 mail/metamail/patches/patch-bin_showpicture   | 14 ++++++-------
 mail/metamail/patches/patch-config_h          | 10 +++++-----
 .../patches/patch-metamail_metamail_c         |  8 ++++----
 .../patches/patch-metamail_splitmail_c        |  8 ++++----
 6 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/mail/metamail/patches/patch-bin_showaudio b/mail/metamail/patches/patch-bin_showaudio
index 4b0b515ca53..a8bae3f685f 100644
--- a/mail/metamail/patches/patch-bin_showaudio
+++ b/mail/metamail/patches/patch-bin_showaudio
@@ -1,7 +1,7 @@
-$OpenBSD: patch-bin_showaudio,v 1.1 2002/02/20 21:18:02 pvalchev Exp $
---- bin/showaudio.orig	Wed Feb  2 16:21:26 1994
-+++ bin/showaudio	Wed Feb 20 14:06:43 2002
-@@ -15,9 +15,35 @@
+$OpenBSD: patch-bin_showaudio,v 1.2 2010/07/12 19:03:13 naddy Exp $
+--- bin/showaudio.orig	Thu Feb  3 00:21:26 1994
++++ bin/showaudio	Mon Jul 12 21:01:43 2010
+@@ -15,11 +15,37 @@
  # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
  #
  
@@ -16,8 +16,8 @@ $OpenBSD: patch-bin_showaudio,v 1.1 2002/02/20 21:18:02 pvalchev Exp $
 +    else
 +        set METAMAIL_TMPDIR=~/metamail_tmp
 +    endif
-+endif
-+
+ endif
+ 
 +# Set a sensible umask value
 +umask 077
 +
@@ -36,10 +36,12 @@ $OpenBSD: patch-bin_showaudio,v 1.1 2002/02/20 21:18:02 pvalchev Exp $
 +        exit 2
 +    endif
 +
- endif
- 
++endif
++
  # First, figure out which machine to play it on!
-@@ -33,7 +59,7 @@ set AUDIOLOGMAIL=andrew@thumper.bellcore
+ set thishost=`hostname`
+ 
+@@ -33,7 +59,7 @@ set AUDIOLOGMAIL=andrew@thumper.bellcore.com
  set ORG="Bellcore"
  set STDINPUT=0
  if ("$1" == "-p") then
diff --git a/mail/metamail/patches/patch-bin_showpartial b/mail/metamail/patches/patch-bin_showpartial
index ffa787a7217..5a47eb69b43 100644
--- a/mail/metamail/patches/patch-bin_showpartial
+++ b/mail/metamail/patches/patch-bin_showpartial
@@ -1,7 +1,7 @@
-$OpenBSD: patch-bin_showpartial,v 1.1 2002/02/20 21:18:02 pvalchev Exp $
---- bin/showpartial.orig	Wed Feb  2 16:21:29 1994
-+++ bin/showpartial	Wed Feb 20 14:06:43 2002
-@@ -2,8 +2,44 @@
+$OpenBSD: patch-bin_showpartial,v 1.2 2010/07/12 19:03:13 naddy Exp $
+--- bin/showpartial.orig	Thu Feb  3 00:21:29 1994
++++ bin/showpartial	Mon Jul 12 21:01:43 2010
+@@ -2,23 +2,59 @@
  # (The "-fb" might need to be changed to "-f" on some systems)
  #
  
@@ -24,8 +24,8 @@ $OpenBSD: patch-bin_showpartial,v 1.1 2002/02/20 21:18:02 pvalchev Exp $
 +    else
 +        set METAMAIL_TMPDIR=~/metamail_tmp
 +    endif
-+endif
-+
+ endif
+ 
 +# Set a sensible umask value
 +umask 077
 +
@@ -44,10 +44,10 @@ $OpenBSD: patch-bin_showpartial,v 1.1 2002/02/20 21:18:02 pvalchev Exp $
 +        exit 2
 +    endif
 +
- endif
- 
++endif
++
  set TREEROOT=${METAMAIL_TMPDIR}/m-prts-`whoami`
-@@ -11,14 +47,14 @@ if ($#argv < 3 || $#argv > 4) then
+ if ($#argv < 3 || $#argv > 4) then
      echo "Usage:  showpartial file id partnum totalnum"
      exit -1
  endif
diff --git a/mail/metamail/patches/patch-bin_showpicture b/mail/metamail/patches/patch-bin_showpicture
index 2472c10fe08..dba2d0800e1 100644
--- a/mail/metamail/patches/patch-bin_showpicture
+++ b/mail/metamail/patches/patch-bin_showpicture
@@ -1,6 +1,6 @@
-$OpenBSD: patch-bin_showpicture,v 1.1 2002/02/20 21:18:02 pvalchev Exp $
---- bin/showpicture.orig	Mon Feb  7 10:59:54 1994
-+++ bin/showpicture	Wed Feb 20 14:06:43 2002
+$OpenBSD: patch-bin_showpicture,v 1.2 2010/07/12 19:03:13 naddy Exp $
+--- bin/showpicture.orig	Mon Feb  7 18:59:54 1994
++++ bin/showpicture	Mon Jul 12 21:01:43 2010
 @@ -15,15 +15,42 @@
  # WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
  #
@@ -15,8 +15,8 @@ $OpenBSD: patch-bin_showpicture,v 1.1 2002/02/20 21:18:02 pvalchev Exp $
 +    else
 +        set METAMAIL_TMPDIR=~/metamail_tmp
 +    endif
-+endif
-+
+ endif
+ 
 +# Set a sensible umask value
 +umask 077
 +
@@ -35,8 +35,8 @@ $OpenBSD: patch-bin_showpicture,v 1.1 2002/02/20 21:18:02 pvalchev Exp $
 +        exit 2
 +    endif
 +
- endif
- 
++endif
++
  if (! $?X_VIEWER) then
 -set X_VIEWER="xloadimage -view -quiet -geometry +1+1"
 +  set X_VIEWER="xloadimage -view -quiet -geometry +1+1"
diff --git a/mail/metamail/patches/patch-config_h b/mail/metamail/patches/patch-config_h
index c4cfb970836..25b23de28ec 100644
--- a/mail/metamail/patches/patch-config_h
+++ b/mail/metamail/patches/patch-config_h
@@ -1,7 +1,7 @@
-$OpenBSD: patch-config_h,v 1.2 2003/04/26 14:55:32 sturm Exp $
+$OpenBSD: patch-config_h,v 1.3 2010/07/12 19:03:13 naddy Exp $
 --- config.h.orig	Wed Nov 24 16:36:07 1993
-+++ config.h	Thu Apr 24 22:06:39 2003
-@@ -73,7 +73,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
++++ config.h	Mon Jul 12 21:01:43 2010
+@@ -73,7 +73,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
  #ifdef SYSV
  #define RESET_PROGRAM "tput clear"
  #else
@@ -10,7 +10,7 @@ $OpenBSD: patch-config_h,v 1.2 2003/04/26 14:55:32 sturm Exp $
  #define RESET_PROGRAM "/usr/bin/reset"
  #else
  #define RESET_PROGRAM "/usr/ucb/reset"
-@@ -155,9 +155,13 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
+@@ -155,9 +155,13 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
  #ifdef NeXT
  #define sigtype void
  #else
@@ -24,7 +24,7 @@ $OpenBSD: patch-config_h,v 1.2 2003/04/26 14:55:32 sturm Exp $
  
  #ifdef MSDOS
  #define PATH_SEPARATOR ';'
-@@ -173,7 +177,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
+@@ -173,7 +177,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
  #else
  #define PATH_SEPARATOR ':'
  #ifndef STDPATH
diff --git a/mail/metamail/patches/patch-metamail_metamail_c b/mail/metamail/patches/patch-metamail_metamail_c
index 4929175da46..5442f0cee4b 100644
--- a/mail/metamail/patches/patch-metamail_metamail_c
+++ b/mail/metamail/patches/patch-metamail_metamail_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-metamail_metamail_c,v 1.2 2004/02/28 20:19:48 naddy Exp $
---- metamail/metamail.c.orig	1994-02-17 02:57:19.000000000 +0100
-+++ metamail/metamail.c	2004-02-28 18:37:27.000000000 +0100
-@@ -29,7 +29,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE
+$OpenBSD: patch-metamail_metamail_c,v 1.3 2010/07/12 19:03:13 naddy Exp $
+--- metamail/metamail.c.orig	Thu Feb 17 02:57:19 1994
++++ metamail/metamail.c	Mon Jul 12 21:01:43 2010
+@@ -29,7 +29,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
  #ifdef BORLAND
  #define F_OK 0
  extern unsigned _stklen = 16384;
diff --git a/mail/metamail/patches/patch-metamail_splitmail_c b/mail/metamail/patches/patch-metamail_splitmail_c
index 8e5dbfecbfe..cc92de78751 100644
--- a/mail/metamail/patches/patch-metamail_splitmail_c
+++ b/mail/metamail/patches/patch-metamail_splitmail_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-metamail_splitmail_c,v 1.2 2004/02/28 20:19:48 naddy Exp $
---- metamail/splitmail.c.orig	1994-01-31 23:23:14.000000000 +0100
-+++ metamail/splitmail.c	2004-02-28 19:01:14.000000000 +0100
-@@ -41,8 +41,8 @@ extern char *malloc(), *index(), *getmyn
+$OpenBSD: patch-metamail_splitmail_c,v 1.3 2010/07/12 19:03:14 naddy Exp $
+--- metamail/splitmail.c.orig	Mon Jan 31 23:23:14 1994
++++ metamail/splitmail.c	Mon Jul 12 21:01:43 2010
+@@ -41,8 +41,8 @@ extern char *malloc(), *index(), *getmyname();
  #define VERBOSEDELIVERYCMD VerboseDeliveryCmd
  #else
  extern char *getenv();