fmtutil sync

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

22 files changed, 73 insertions, 73 deletions

diff --git a/Master/bin/alpha-linux/fmtutil b/Master/bin/alpha-linux/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/alpha-linux/fmtutil
+++ b/Master/bin/alpha-linux/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/amd64-freebsd/fmtutil b/Master/bin/amd64-freebsd/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/amd64-freebsd/fmtutil
+++ b/Master/bin/amd64-freebsd/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/amd64-kfreebsd/fmtutil b/Master/bin/amd64-kfreebsd/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/amd64-kfreebsd/fmtutil
+++ b/Master/bin/amd64-kfreebsd/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/i386-cygwin/fmtutil b/Master/bin/i386-cygwin/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/i386-cygwin/fmtutil
+++ b/Master/bin/i386-cygwin/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/i386-freebsd/fmtutil b/Master/bin/i386-freebsd/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/i386-freebsd/fmtutil
+++ b/Master/bin/i386-freebsd/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/i386-kfreebsd/fmtutil b/Master/bin/i386-kfreebsd/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/i386-kfreebsd/fmtutil
+++ b/Master/bin/i386-kfreebsd/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/i386-linux/fmtutil b/Master/bin/i386-linux/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/i386-linux/fmtutil
+++ b/Master/bin/i386-linux/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/i386-netbsd/fmtutil b/Master/bin/i386-netbsd/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/i386-netbsd/fmtutil
+++ b/Master/bin/i386-netbsd/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/i386-solaris/fmtutil b/Master/bin/i386-solaris/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/i386-solaris/fmtutil
+++ b/Master/bin/i386-solaris/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/mips-irix/fmtutil b/Master/bin/mips-irix/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/mips-irix/fmtutil
+++ b/Master/bin/mips-irix/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/powerpc-aix/fmtutil b/Master/bin/powerpc-aix/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/powerpc-aix/fmtutil
+++ b/Master/bin/powerpc-aix/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/powerpc-linux/fmtutil b/Master/bin/powerpc-linux/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/powerpc-linux/fmtutil
+++ b/Master/bin/powerpc-linux/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/sparc-linux/fmtutil b/Master/bin/sparc-linux/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/sparc-linux/fmtutil
+++ b/Master/bin/sparc-linux/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/sparc-solaris/fmtutil b/Master/bin/sparc-solaris/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/sparc-solaris/fmtutil
+++ b/Master/bin/sparc-solaris/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/universal-darwin/fmtutil b/Master/bin/universal-darwin/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/universal-darwin/fmtutil
+++ b/Master/bin/universal-darwin/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/x86_64-darwin/fmtutil b/Master/bin/x86_64-darwin/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/x86_64-darwin/fmtutil
+++ b/Master/bin/x86_64-darwin/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/x86_64-linux/fmtutil b/Master/bin/x86_64-linux/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/x86_64-linux/fmtutil
+++ b/Master/bin/x86_64-linux/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/bin/x86_64-solaris/fmtutil b/Master/bin/x86_64-solaris/fmtutil
index a61004f30ea..e3262e4737e 100755
--- a/Master/bin/x86_64-solaris/fmtutil
+++ b/Master/bin/x86_64-solaris/fmtutil
@@ -59,7 +59,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version='$Id: fmtutil 19225 2010-07-04 12:26:44Z preining $'
+version='$Id: fmtutil 23149 2011-06-27 21:32:19Z karl $'
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -142,7 +142,7 @@ eof
   cleanup 0
 }
 
-version()
+versionfunc()
 {
   cat <<eof
 $progname version $version
@@ -433,7 +433,7 @@ main()
       fullfmt=$1; shift
       case $fullfmt in
         ""|--help) help ;;
-        --version) version ;;
+        --version) versionfunc ;;
               --*) abort "unknown option $fullfmt, try --help" ;;
         *.fmt|*.mem|*.base)
           set x --byfmt `echo $fullfmt | sed 's@\.[a-z]*$@@'` ${1+"$@"}
@@ -512,7 +512,7 @@ main()
   case "$cmd" in
          "") abort "missing command; try $progname --help if you need it";;
        help) help;;
-    version) version;;
+    version) versionfunc;;
   esac
 
   if test -n "$cfgparam"; then
diff --git a/Master/texmf/doc/man/man1/fmtutil-sys.man1.pdf b/Master/texmf/doc/man/man1/fmtutil-sys.man1.pdf
index 79687d6f57d..ba1cbf6d5dc 100644
--- a/Master/texmf/doc/man/man1/fmtutil-sys.man1.pdf
+++ b/Master/texmf/doc/man/man1/fmtutil-sys.man1.pdf
diff --git a/Master/texmf/doc/man/man1/fmtutil.1 b/Master/texmf/doc/man/man1/fmtutil.1
index 952e35192cd..39ed57bf8b5 100644
--- a/Master/texmf/doc/man/man1/fmtutil.1
+++ b/Master/texmf/doc/man/man1/fmtutil.1
@@ -1,4 +1,4 @@
-.TH FMTUTIL 1 "July 2010" "TeX Live" "TeX Live"
+.TH FMTUTIL 1 "June 2011" "TeX Live" "TeX Live"
 .SH "NAME"
 fmtutil \- utility for maintaining TeX format files
 .PP
diff --git a/Master/texmf/doc/man/man1/fmtutil.man1.pdf b/Master/texmf/doc/man/man1/fmtutil.man1.pdf
index a3372df743c..a96ca967b9b 100644
--- a/Master/texmf/doc/man/man1/fmtutil.man1.pdf
+++ b/Master/texmf/doc/man/man1/fmtutil.man1.pdf
diff --git a/Master/texmf/doc/man/man1/mktexfmt.man1.pdf b/Master/texmf/doc/man/man1/mktexfmt.man1.pdf
index 3c75f579564..773189659ed 100644
--- a/Master/texmf/doc/man/man1/mktexfmt.man1.pdf
+++ b/Master/texmf/doc/man/man1/mktexfmt.man1.pdf