8 files changed, 10 insertions, 121 deletions
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 3c3ce65fe030..6c8aee89e871 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -40,6 +40,16 @@ pre-extract:
 	  ${ECHO} "Do not build mailagent as root or it won't pass the sanity tests."; \
 	  ${FALSE}; fi
 
+post-patch:
+	@(cd ${WRKSRC}; \
+	  ${PERL} -pi.bak \
+	    -e 's|exec perl -S|exec ${PERL} -S|' \
+	    agent/edusers.SH agent/magent.sh agent/maildist.SH \
+	    agent/mailhelp.SH agent/maillist.SH agent/mailpatch.SH \
+	    agent/package.SH agent/test/TEST agent/test/atail \
+	    bin/perload misc/getcost/getcost misc/mime/unmime \
+	    misc/news/newsgate)
+
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/mailagent
 	@${MKDIR} ${PREFIX}/share/examples/mailagent/misc
diff --git a/mail/mailagent/files/patch-ag b/mail/mailagent/files/patch-ag
deleted file mode 100644
index eec23ec3f3e0..000000000000
--- a/mail/mailagent/files/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-*** 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/files/patch-ah b/mail/mailagent/files/patch-ah
deleted file mode 100644
index b8df3a24af6f..000000000000
--- a/mail/mailagent/files/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-*** 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/files/patch-ai b/mail/mailagent/files/patch-ai
deleted file mode 100644
index 4e83d8f946d5..000000000000
--- a/mail/mailagent/files/patch-ai
+++ /dev/null
@@ -1,17 +0,0 @@
-*** 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/files/patch-aj b/mail/mailagent/files/patch-aj
deleted file mode 100644
index 84251ae1e4d3..000000000000
--- a/mail/mailagent/files/patch-aj
+++ /dev/null
@@ -1,17 +0,0 @@
-*** 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/files/patch-ak b/mail/mailagent/files/patch-ak
deleted file mode 100644
index 227b4e0af9f2..000000000000
--- a/mail/mailagent/files/patch-ak
+++ /dev/null
@@ -1,17 +0,0 @@
-*** 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/files/patch-al b/mail/mailagent/files/patch-al
deleted file mode 100644
index 18597f522800..000000000000
--- a/mail/mailagent/files/patch-al
+++ /dev/null
@@ -1,17 +0,0 @@
-*** 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/files/patch-am b/mail/mailagent/files/patch-am
deleted file mode 100644
index 11b8de3b8c1b..000000000000
--- a/mail/mailagent/files/patch-am
+++ /dev/null
@@ -1,19 +0,0 @@
-*** 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,