enable mfplain, eradicate mfmp

git-svn-id: svn://tug.org/texlive/trunk@10693 c570f23f-e606-0410-a88d-b1316a301751

35 files changed, 81 insertions, 77 deletions

diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index fc8481faa4d..ef7a1945a64 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-22  Karl Berry  <karl@tug.org>
+
+	* fmtutil (parse_line): pass --format=mp to kpsewhich when
+	engine=mpost, instead of --format=mpost.
+
 2008-07-08  Karl Berry  <karl@tug.org>
 
 	* texconfig (hyphen, formats): disable these functions,
diff --git a/Build/source/texk/tetex/fmtutil b/Build/source/texk/tetex/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Build/source/texk/tetex/fmtutil
+++ b/Build/source/texk/tetex/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/alpha-linux/fmtutil b/Master/bin/alpha-linux/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/alpha-linux/fmtutil
+++ b/Master/bin/alpha-linux/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/alpha-linux/mfplain b/Master/bin/alpha-linux/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/alpha-linux/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/fmtutil b/Master/bin/amd64-freebsd/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/amd64-freebsd/fmtutil
+++ b/Master/bin/amd64-freebsd/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/amd64-freebsd/mfplain b/Master/bin/amd64-freebsd/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/amd64-freebsd/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/fmtutil b/Master/bin/hppa-hpux/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/hppa-hpux/fmtutil
+++ b/Master/bin/hppa-hpux/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/hppa-hpux/mfplain b/Master/bin/hppa-hpux/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/hppa-hpux/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/fmtutil b/Master/bin/i386-freebsd/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/i386-freebsd/fmtutil
+++ b/Master/bin/i386-freebsd/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/i386-freebsd/mfplain b/Master/bin/i386-freebsd/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/i386-freebsd/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/i386-linux/fmtutil b/Master/bin/i386-linux/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/i386-linux/fmtutil
+++ b/Master/bin/i386-linux/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/i386-linux/mfplain b/Master/bin/i386-linux/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/i386-linux/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/i386-openbsd/fmtutil b/Master/bin/i386-openbsd/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/i386-openbsd/fmtutil
+++ b/Master/bin/i386-openbsd/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/i386-openbsd/mfplain b/Master/bin/i386-openbsd/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/i386-openbsd/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/fmtutil b/Master/bin/i386-solaris/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/i386-solaris/fmtutil
+++ b/Master/bin/i386-solaris/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/i386-solaris/mfplain b/Master/bin/i386-solaris/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/i386-solaris/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/mips-irix/fmtutil b/Master/bin/mips-irix/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/mips-irix/fmtutil
+++ b/Master/bin/mips-irix/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/mips-irix/mfplain b/Master/bin/mips-irix/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/mips-irix/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/powerpc-aix/fmtutil b/Master/bin/powerpc-aix/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/powerpc-aix/fmtutil
+++ b/Master/bin/powerpc-aix/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/powerpc-aix/mfplain b/Master/bin/powerpc-aix/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/powerpc-aix/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/fmtutil b/Master/bin/powerpc-linux/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/powerpc-linux/fmtutil
+++ b/Master/bin/powerpc-linux/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/powerpc-linux/mfplain b/Master/bin/powerpc-linux/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/powerpc-linux/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/sparc-linux/fmtutil b/Master/bin/sparc-linux/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/sparc-linux/fmtutil
+++ b/Master/bin/sparc-linux/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/sparc-linux/mfplain b/Master/bin/sparc-linux/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/sparc-linux/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/fmtutil b/Master/bin/sparc-solaris/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/sparc-solaris/fmtutil
+++ b/Master/bin/sparc-solaris/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/sparc-solaris/mfplain b/Master/bin/sparc-solaris/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/sparc-solaris/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/fmtutil b/Master/bin/universal-darwin/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/universal-darwin/fmtutil
+++ b/Master/bin/universal-darwin/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/universal-darwin/mfplain b/Master/bin/universal-darwin/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/universal-darwin/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/fmtutil b/Master/bin/x86_64-linux/fmtutil
index e3cdde40f6b..f86a06003de 100755
--- a/Master/bin/x86_64-linux/fmtutil
+++ b/Master/bin/x86_64-linux/fmtutil
@@ -611,9 +611,9 @@ parse_line()
   inifile=`echo $lastarg | sed 's%^\*%%'`
 
   case "$engine" in
-    mpost)  fmtfile="$format.mem";  kpsefmt=mpost; texengine=metapost;;
+    mpost)           fmtfile="$format.mem";  kpsefmt=mp; texengine=metapost;;
     mf|mfw|mf-nowin) fmtfile="$format.base"; kpsefmt=mf; texengine=metafont;;
-    *)      fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
+    *)               fmtfile="$format.fmt";  kpsefmt=tex; texengine=$engine;;
   esac
 
   # See if we can find $inifile for return code:
@@ -673,9 +673,9 @@ run_initex()
 
   jobswitch="-jobname=$format"
   case "$format" in
-    metafun) prgswitch=-progname=mpost;;
+    metafun)         prgswitch=-progname=mpost;;
     mptopdf|cont-??) prgswitch=-progname=context;;
-    *)       prgswitch=-progname=$format;;
+    *)               prgswitch=-progname=$format;;
   esac
 
   rm -f $fmtfile
diff --git a/Master/bin/x86_64-linux/mfplain b/Master/bin/x86_64-linux/mfplain
new file mode 120000
index 00000000000..96672bbb523
--- /dev/null
+++ b/Master/bin/x86_64-linux/mfplain
@@ -0,0 +1 @@
+mpost
\ No newline at end of file
diff --git a/Master/texmf-dist/metapost/config/mfmp.ini b/Master/texmf-dist/metapost/config/mfmp.ini
deleted file mode 100644
index b7d5669406c..00000000000
--- a/Master/texmf-dist/metapost/config/mfmp.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-% Thomas Esser, 1998. public domain.
-\input mfplain
-\dump
-\endinput
diff --git a/Master/texmf-dist/metapost/config/mpost.ini b/Master/texmf-dist/metapost/config/mpost.ini
deleted file mode 100644
index 18cd78cb56d..00000000000
--- a/Master/texmf-dist/metapost/config/mpost.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-% Thomas Esser, 1998. public domain.
-\input plain
-\dump
-\endinput
diff --git a/Master/texmf/fmtutil/fmtutil-hdr.cnf b/Master/texmf/fmtutil/fmtutil-hdr.cnf
index e0d1a9aacbc..75e01637a05 100644
--- a/Master/texmf/fmtutil/fmtutil-hdr.cnf
+++ b/Master/texmf/fmtutil/fmtutil-hdr.cnf
@@ -15,12 +15,10 @@
 # filename may be preceded by a *, which is ignored.
 # 
 # fmtutil always passes the -ini option to the engine.
-# 
 # If no pattern-file is desired, use -.
-#
 # Either spaces or tabs can be used as separators.
 # 
-# Other notes :
+# Other notes:
 # 1) tex and amstex just load hyphen.tex. No customization.
 #    You can have your own customized (via babel's hyphen.cfg)
 #    formats on top of plain by using "bplain.tex" instead of
diff --git a/Master/texmf/fmtutil/format.mfplain.cnf b/Master/texmf/fmtutil/format.mfplain.cnf
deleted file mode 100644
index b4b3312642c..00000000000
--- a/Master/texmf/fmtutil/format.mfplain.cnf
+++ /dev/null
@@ -1,3 +0,0 @@
-# ------------------------------------------------------------------
-# $Id$
-mfmp		mpost 	- 		-translate-file=cp227.tcx mfmp.ini
diff --git a/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc b/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
index d5354989511..bc3213bca6b 100644
--- a/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-metapost.tlpsrc
@@ -2,9 +2,7 @@ name bin-metapost
 category TLCore
 depend bin-kpathsea
 execute BuildFormat metapost
-execute BuildFormat mfplain
 runpattern f texmf/fmtutil/format.metapost.cnf
-runpattern f texmf/fmtutil/format.mfplain.cnf
 docpattern f texmf/doc/man/man1/dmp.*
 docpattern f texmf/doc/man/man1/dvitomp.*
 docpattern f texmf/doc/man/man1/makempx.*
@@ -14,7 +12,7 @@ docpattern f texmf/doc/man/man1/newer.*
 binpattern f bin/${ARCH}/dmp
 binpattern f bin/${ARCH}/dvitomp
 binpattern f bin/${ARCH}/makempx
+binpattern f bin/${ARCH}/mfplain
 binpattern f bin/${ARCH}/mpost
 binpattern f bin/${ARCH}/mpto
 binpattern f bin/${ARCH}/newer
-binpattern f bin/win32/mfplain.exe