Regenerate as unified diffs.

15 files changed, 87 insertions, 143 deletions

diff --git a/mail/mailagent/distinfo b/mail/mailagent/distinfo
index a889ac29155..79df6776280 100644
--- a/mail/mailagent/distinfo
+++ b/mail/mailagent/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2011/03/06 03:47:26 dholland Exp $
+$NetBSD: distinfo,v 1.5 2011/12/14 03:03:47 sbd Exp $
 
 SHA1 (mailagent-3.0.73.tar.gz) = c8a0329d79c98cb25bb53c79f06fcd63df58c418
 RMD160 (mailagent-3.0.73.tar.gz) = 70b2804fdd0602a20cb5a9f3391d460f47972570
@@ -8,10 +8,10 @@ SHA1 (patch-ab) = 06234ca205484e24dc175d828c6ecc82d4dc3342
 SHA1 (patch-ac) = 2431b92220a17eb8125eb31fabbd4a0827a150b3
 SHA1 (patch-ad) = d3e3e39c41219f8cbcff506046e2f00c0d659792
 SHA1 (patch-ae) = 9ba2345d2446321d7777bad4be74e8e8012529be
-SHA1 (patch-ag) = 2b7a56038d697f70f6aff2bd3538609a649f389d
-SHA1 (patch-ah) = 3c147f73ed410fe810b303da0be53d53f3ee5aa5
-SHA1 (patch-ai) = 5567148613abb872caff6b9869a4593f2ebdd5ec
-SHA1 (patch-aj) = cf12ed5cbc336c365cffde62476fe7c19e348766
-SHA1 (patch-ak) = b5f64263fda76827a1ed68b16f48f8970de3dd19
-SHA1 (patch-al) = db3f6453b5bc324587b967109dcc0e971ae51ac2
-SHA1 (patch-am) = e3857d6b364a3a22b9e82abb2c30297010a48a57
+SHA1 (patch-agent_edusers.SH) = 25896f576297e33814f59b30bbacb6c375c12a27
+SHA1 (patch-agent_magent.sh) = 39d4e9d6d848f2f51435bab13bb2f27fa391741f
+SHA1 (patch-agent_maildist.SH) = 7b94e87042aa416f6469d2b7cb0d1743db0eefba
+SHA1 (patch-agent_mailhelp.SH) = 0868f72362df49d169a5b45a226befb731cb0d49
+SHA1 (patch-agent_maillist.SH) = 811a179309462561202761e01eec56d3251417c2
+SHA1 (patch-agent_mailpatch.SH) = f25433d766c4acc8d7ffd41697cd217b82bb3cba
+SHA1 (patch-agent_package.SH) = 166319557ec0d6de3667e58010d10800e96da9dd
diff --git a/mail/mailagent/patches/patch-ag b/mail/mailagent/patches/patch-ag
deleted file mode 100644
index 132c900fca9..00000000000
--- a/mail/mailagent/patches/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ag,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/edusers.SH.orig	Thu Aug 10 15:34:55 1995
---- agent/edusers.SH	Thu Jul 25 19:55:26 1996
-***************
-*** 17,22 ****
-  echo "Extracting agent/edusers (with variable substitutions)"
-  $spitshell >edusers <<!GROK!THIS!
-  $startperl
-! 	eval "exec perl -S \$0 \$*"
-  		if \$running_under_some_shell;
-  
---- 17,22 ----
-  echo "Extracting agent/edusers (with variable substitutions)"
-  $spitshell >edusers <<!GROK!THIS!
-  $startperl
-! 	eval "exec $perlpath -S \$0 \$*"
-  		if \$running_under_some_shell;
-  
diff --git a/mail/mailagent/patches/patch-agent_edusers.SH b/mail/mailagent/patches/patch-agent_edusers.SH
new file mode 100644
index 00000000000..f26e2a1c636
--- /dev/null
+++ b/mail/mailagent/patches/patch-agent_edusers.SH
@@ -0,0 +1,11 @@
+$NetBSD: patch-agent_edusers.SH,v 1.1 2011/12/14 03:03:47 sbd Exp $
+
+--- agent/edusers.SH.orig	2001-03-17 18:31:17.000000000 +0000
++++ agent/edusers.SH
+@@ -18,5 +18,5 @@ echo "Extracting agent/edusers (with var
+ $spitshell >edusers <<!GROK!THIS!
+ $startperl
+-	eval "exec perl -S \$0 \$*"
++	eval "exec $perlpath -S \$0 \$*"
+ 		if \$running_under_some_shell;
+ 
diff --git a/mail/mailagent/patches/patch-agent_magent.sh b/mail/mailagent/patches/patch-agent_magent.sh
new file mode 100644
index 00000000000..b89bbaa8943
--- /dev/null
+++ b/mail/mailagent/patches/patch-agent_magent.sh
@@ -0,0 +1,13 @@
+$NetBSD: patch-agent_magent.sh,v 1.1 2011/12/14 03:03:47 sbd Exp $
+
+--- agent/magent.sh.orig	2001-03-17 18:31:21.000000000 +0000
++++ agent/magent.sh
+@@ -17,7 +17,7 @@ esac
+ echo "Extracting agent/magent (with variable substitutions)"
+ $spitshell >magent <<!GROK!THIS!
+ $startperl
+-	eval 'exec perl -S \$0 "\$@"'
++	eval 'exec $perlpath -S \$0 "\$@"'
+ 		if \$running_under_some_shell;
+ 
+ # You'll need to set up a .forward file that feeds your mail to this script,
diff --git a/mail/mailagent/patches/patch-agent_maildist.SH b/mail/mailagent/patches/patch-agent_maildist.SH
new file mode 100644
index 00000000000..528bb35c701
--- /dev/null
+++ b/mail/mailagent/patches/patch-agent_maildist.SH
@@ -0,0 +1,11 @@
+$NetBSD: patch-agent_maildist.SH,v 1.1 2011/12/14 03:03:47 sbd Exp $
+
+--- agent/maildist.SH.orig	2001-03-17 18:31:22.000000000 +0000
++++ agent/maildist.SH
+@@ -18,5 +18,5 @@ echo "Extracting agent/maildist (with va
+ $spitshell >maildist <<!GROK!THIS!
+ $startperl
+-	eval "exec perl -S \$0 \$*"
++	eval "exec $perlpath -S \$0 \$*"
+ 		if \$running_under_some_shell;
+ 
diff --git a/mail/mailagent/patches/patch-agent_mailhelp.SH b/mail/mailagent/patches/patch-agent_mailhelp.SH
new file mode 100644
index 00000000000..6f0d7fae9d1
--- /dev/null
+++ b/mail/mailagent/patches/patch-agent_mailhelp.SH
@@ -0,0 +1,11 @@
+$NetBSD: patch-agent_mailhelp.SH,v 1.1 2011/12/14 03:03:47 sbd Exp $
+
+--- agent/mailhelp.SH.orig	2001-03-17 18:31:22.000000000 +0000
++++ agent/mailhelp.SH
+@@ -18,5 +18,5 @@ echo "Extracting agent/mailhelp (with va
+ $spitshell >mailhelp <<!GROK!THIS!
+ $startperl
+-	eval "exec perl -S \$0 \$*"
++	eval "exec $perlpath -S \$0 \$*"
+ 		if \$running_under_some_shell;
+ 
diff --git a/mail/mailagent/patches/patch-agent_maillist.SH b/mail/mailagent/patches/patch-agent_maillist.SH
new file mode 100644
index 00000000000..048855bbab9
--- /dev/null
+++ b/mail/mailagent/patches/patch-agent_maillist.SH
@@ -0,0 +1,11 @@
+$NetBSD: patch-agent_maillist.SH,v 1.1 2011/12/14 03:03:47 sbd Exp $
+
+--- agent/maillist.SH.orig	2001-03-17 18:31:22.000000000 +0000
++++ agent/maillist.SH
+@@ -18,5 +18,5 @@ echo "Extracting agent/maillist (with va
+ $spitshell >maillist <<!GROK!THIS!
+ $startperl
+-	eval "exec perl -S \$0 \$*"
++	eval "exec $perlpath -S \$0 \$*"
+ 		if \$running_under_some_shell;
+ 
diff --git a/mail/mailagent/patches/patch-agent_mailpatch.SH b/mail/mailagent/patches/patch-agent_mailpatch.SH
new file mode 100644
index 00000000000..1e66f3f4a6d
--- /dev/null
+++ b/mail/mailagent/patches/patch-agent_mailpatch.SH
@@ -0,0 +1,11 @@
+$NetBSD: patch-agent_mailpatch.SH,v 1.1 2011/12/14 03:03:47 sbd Exp $
+
+--- agent/mailpatch.SH.orig	2001-03-17 18:31:22.000000000 +0000
++++ agent/mailpatch.SH
+@@ -18,5 +18,5 @@ echo "Extracting agent/mailpatch (with v
+ $spitshell >mailpatch <<!GROK!THIS!
+ $startperl
+-	eval "exec perl -S \$0 \$*"
++	eval "exec $perlpath -S \$0 \$*"
+ 		if \$running_under_some_shell;
+ 
diff --git a/mail/mailagent/patches/patch-agent_package.SH b/mail/mailagent/patches/patch-agent_package.SH
new file mode 100644
index 00000000000..7cd5d6b7642
--- /dev/null
+++ b/mail/mailagent/patches/patch-agent_package.SH
@@ -0,0 +1,11 @@
+$NetBSD: patch-agent_package.SH,v 1.1 2011/12/14 03:03:47 sbd Exp $
+
+--- agent/package.SH.orig	2001-03-17 18:31:23.000000000 +0000
++++ agent/package.SH
+@@ -18,5 +18,5 @@ echo "Extracting agent/package (with var
+ $spitshell >package <<!GROK!THIS!
+ $startperl
+-	eval "exec perl -S \$0 \$*"
++	eval "exec $perlpath -S \$0 \$*"
+ 		if \$running_under_some_shell;
+ 
diff --git a/mail/mailagent/patches/patch-ah b/mail/mailagent/patches/patch-ah
deleted file mode 100644
index 42f23c066f7..00000000000
--- a/mail/mailagent/patches/patch-ah
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ah,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/maildist.SH.orig	Wed Mar 22 05:51:25 1995
---- agent/maildist.SH	Thu Jul 25 19:53:05 1996
-***************
-*** 17,22 ****
-  echo "Extracting agent/maildist (with variable substitutions)"
-  $spitshell >maildist <<!GROK!THIS!
-  $startperl
-! 	eval "exec perl -S \$0 \$*"
-  		if \$running_under_some_shell;
-  
---- 17,22 ----
-  echo "Extracting agent/maildist (with variable substitutions)"
-  $spitshell >maildist <<!GROK!THIS!
-  $startperl
-! 	eval "exec $perlpath -S \$0 \$*"
-  		if \$running_under_some_shell;
-  
diff --git a/mail/mailagent/patches/patch-ai b/mail/mailagent/patches/patch-ai
deleted file mode 100644
index ddf11ba1dbd..00000000000
--- a/mail/mailagent/patches/patch-ai
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ai,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/mailhelp.SH.orig	Wed Mar 22 05:51:24 1995
---- agent/mailhelp.SH	Thu Jul 25 19:56:16 1996
-***************
-*** 17,22 ****
-  echo "Extracting agent/mailhelp (with variable substitutions)"
-  $spitshell >mailhelp <<!GROK!THIS!
-  $startperl
-! 	eval "exec perl -S \$0 \$*"
-  		if \$running_under_some_shell;
-  
---- 17,22 ----
-  echo "Extracting agent/mailhelp (with variable substitutions)"
-  $spitshell >mailhelp <<!GROK!THIS!
-  $startperl
-! 	eval "exec $perlpath -S \$0 \$*"
-  		if \$running_under_some_shell;
-  
diff --git a/mail/mailagent/patches/patch-aj b/mail/mailagent/patches/patch-aj
deleted file mode 100644
index 9effa3bf724..00000000000
--- a/mail/mailagent/patches/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aj,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/maillist.SH.orig	Thu Aug 10 15:38:06 1995
---- agent/maillist.SH	Thu Jul 25 19:54:00 1996
-***************
-*** 17,22 ****
-  echo "Extracting agent/maillist (with variable substitutions)"
-  $spitshell >maillist <<!GROK!THIS!
-  $startperl
-! 	eval "exec perl -S \$0 \$*"
-  		if \$running_under_some_shell;
-  
---- 17,22 ----
-  echo "Extracting agent/maillist (with variable substitutions)"
-  $spitshell >maillist <<!GROK!THIS!
-  $startperl
-! 	eval "exec $perlpath -S \$0 \$*"
-  		if \$running_under_some_shell;
-  
diff --git a/mail/mailagent/patches/patch-ak b/mail/mailagent/patches/patch-ak
deleted file mode 100644
index 86395d79955..00000000000
--- a/mail/mailagent/patches/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ak,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/mailpatch.SH.orig	Wed Mar 22 05:51:24 1995
---- agent/mailpatch.SH	Thu Jul 25 19:56:34 1996
-***************
-*** 17,22 ****
-  echo "Extracting agent/mailpatch (with variable substitutions)"
-  $spitshell >mailpatch <<!GROK!THIS!
-  $startperl
-! 	eval "exec perl -S \$0 \$*"
-  		if \$running_under_some_shell;
-  
---- 17,22 ----
-  echo "Extracting agent/mailpatch (with variable substitutions)"
-  $spitshell >mailpatch <<!GROK!THIS!
-  $startperl
-! 	eval "exec $perlpath -S \$0 \$*"
-  		if \$running_under_some_shell;
-  
diff --git a/mail/mailagent/patches/patch-al b/mail/mailagent/patches/patch-al
deleted file mode 100644
index ec7027d9480..00000000000
--- a/mail/mailagent/patches/patch-al
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-al,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/package.SH.orig	Thu Aug 10 15:34:35 1995
---- agent/package.SH	Thu Jul 25 19:54:42 1996
-***************
-*** 17,22 ****
-  echo "Extracting agent/package (with variable substitutions)"
-  $spitshell >package <<!GROK!THIS!
-  $startperl
-! 	eval "exec perl -S \$0 \$*"
-  		if \$running_under_some_shell;
-  
---- 17,22 ----
-  echo "Extracting agent/package (with variable substitutions)"
-  $spitshell >package <<!GROK!THIS!
-  $startperl
-! 	eval "exec $perlpath -S \$0 \$*"
-  		if \$running_under_some_shell;
-  
diff --git a/mail/mailagent/patches/patch-am b/mail/mailagent/patches/patch-am
deleted file mode 100644
index 0e1e77b3169..00000000000
--- a/mail/mailagent/patches/patch-am
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-am,v 1.2 1999/12/26 17:35:43 itojun Exp $
-
-*** agent/magent.sh.orig	Sat Sep 16 09:05:29 1995
---- agent/magent.sh	Thu Jul 25 19:58:11 1996
-***************
-*** 17,23 ****
-  echo "Extracting agent/magent (with variable substitutions)"
-  $spitshell >magent <<!GROK!THIS!
-  $startperl
-! 	eval 'exec perl -S \$0 "\$@"'
-  		if \$running_under_some_shell;
-  
-  # You'll need to set up a .forward file that feeds your mail to this script,
---- 17,23 ----
-  echo "Extracting agent/magent (with variable substitutions)"
-  $spitshell >magent <<!GROK!THIS!
-  $startperl
-! 	eval 'exec $perlpath -S \$0 "\$@"'
-  		if \$running_under_some_shell;
-  
-  # You'll need to set up a .forward file that feeds your mail to this script,