propagate help msg changes to architectures

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

2 files changed, 26 insertions, 15 deletions

diff --git a/Master/bin/i386-freebsd/mktexlsr b/Master/bin/i386-freebsd/mktexlsr
index 2c4ac96f3dd..77aa99e0042 100755
--- a/Master/bin/i386-freebsd/mktexlsr
+++ b/Master/bin/i386-freebsd/mktexlsr
@@ -11,13 +11,14 @@
 # <te@dbs.uni-hannover.de>, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr 9164 2008-07-02 17:42:11Z karl $'
+version='$Id: mktexlsr 14402 2009-07-23 17:09:15Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
-usage="Usage: $progname [DIR]...
+usage="Usage: $progname [OPTION]... [DIR]...
 
-Rebuild ls-R filename databases.  If one or more arguments DIRS are
-given, these are used as the directories in which to build ls-R. Else
-all directories in the search path for ls-R files (\$TEXMFDBS) are used.
+Rebuild ls-R filename databases used by TeX.  If one or more arguments
+DIRS are given, these are used as the directories in which to build
+ls-R. Else all directories in the search path for ls-R files
+(\$TEXMFDBS) are used.
 
 Options:
   --dry-run  do not actually update anything
@@ -29,6 +30,9 @@ Options:
   
 If standard input is a terminal, --verbose is on by default.
 
+For more information, see the &lsquo;Filename database&rsquo; section of
+Kpathsea manual available at http://tug.org/kpathsea.
+
 Report bugs to tex-k@tug.org.
 "
 
diff --git a/Master/bin/i386-freebsd/updmap b/Master/bin/i386-freebsd/updmap
index e09c817451b..723bde70a02 100755
--- a/Master/bin/i386-freebsd/updmap
+++ b/Master/bin/i386-freebsd/updmap
@@ -94,8 +94,7 @@ export PATH
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 # the version string
-version=1211742332 # seconds since `00:00:00 1970-01-01 UTC'
-                   # date '+%s' (with GNU date)
+version='$Id: updmap 14402 2009-07-23 17:09:15Z karl $'
 
 # 
 ###############################################################################
@@ -108,11 +107,14 @@ help()
 Usage: updmap [OPTION]...  [COMMAND]...
 
 Update the default font map files used by pdftex, dvips, and dvipdfm, as
-determined by updmap.cfg.  Among other things, these font map files are
-used to determine which fonts should be found as bitmaps and which as
-outlines, and to determine which fonts are included in the output.
+determined by updmap.cfg (the one returned by running "kpsewhich
+updmap.cfg").
 
-By default, the filename database is also rebuilt (with mktexlsr).
+Among other things, these font map files are used to determine which
+fonts should be used as bitmaps and which as outlines, and to determine
+which fonts are included in the output.
+
+By default, the TeX filename database is also rebuilt (with mktexlsr).
 
 Valid options:
   --cnffile FILE            read FILE for the updmap configuration
@@ -134,9 +136,10 @@ Valid commands:
                              dvipsPreferOutline LW35 dvipsDownloadBase35
                              pdftexDownloadBase14 dvipdfmDownloadBase14
   --setoption OPTION=VALUE  see above, just different syntax
-  --enable MAPTYPE MAPFILE  add MAPFILE as a MAPTYPE, one of: Map MixedMap
-  --enable Map=MAPFILE      add MAPFILE as a Map
-  --enable MixedMap=MAPFILE add or enable MAPFILE as a MixedMap
+  --enable MAPTYPE MAPFILE  add "MAPTYPE MAPFILE" to updmap.cfg,
+                              where MAPTYPE is either Map or MixedMap
+  --enable Map=MAPFILE      add "Map MAPFILE" to updmap.cfg
+  --enable MixedMap=MAPFILE add "MixedMap MAPFILE" to updmap.cfg
   --disable MAPFILE         disable MAPFILE, whether Map or MixedMap
   --syncwithtrees           entries with unavailable map files will be
                              disabled in the config file
@@ -153,6 +156,9 @@ fonts that are available as both Type 1 and Metafont.
 To see the precise locations of the various files that will be read and
 written, run updmap -n.
 
+For step-by-step instructions on making new fonts known to TeX, see
+http://tug.org/fonts/fontinstall.html.
+
 Report bugs to <tex-k@tug.org>.
 eof
   (exit 0); exit
@@ -774,7 +780,7 @@ cleanup()
 {
   rc=$1
   $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
-    && { cd / && rm -rf "$tmpdir"; }
+    && { cd $orig_pwd && rm -rf "$tmpdir"; }
   (exit $rc); exit $rc
 }
 
@@ -1323,6 +1329,7 @@ main()
   link_cmd="ln -s"
   copy_cmd="cp"
   copy=false
+  orig_pwd=`pwd`
 
   cfgparam=
   outputdirparam=