switch to multi updmap:

- rename tetex/updmap.pl to tetex/updmap-single.pl
- rename texlive/mupdmap.pl to texlive/updmap.pl
  (we need the above two renames so that on Windows the automatic
  wrapper script works!)
- update the links in the bin dirs
- rename the not used texlive/mupdmap-sys.sh (we use tetex/updmap-sys.sh)


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

21 files changed, 18 insertions, 48 deletions

diff --git a/Master/bin/alpha-linux/updmap b/Master/bin/alpha-linux/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/alpha-linux/updmap
+++ b/Master/bin/alpha-linux/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/updmap b/Master/bin/amd64-freebsd/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/amd64-freebsd/updmap
+++ b/Master/bin/amd64-freebsd/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/amd64-kfreebsd/updmap b/Master/bin/amd64-kfreebsd/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/amd64-kfreebsd/updmap
+++ b/Master/bin/amd64-kfreebsd/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/updmap b/Master/bin/i386-cygwin/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/i386-cygwin/updmap
+++ b/Master/bin/i386-cygwin/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/updmap b/Master/bin/i386-freebsd/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/i386-freebsd/updmap
+++ b/Master/bin/i386-freebsd/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/i386-kfreebsd/updmap b/Master/bin/i386-kfreebsd/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/i386-kfreebsd/updmap
+++ b/Master/bin/i386-kfreebsd/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/i386-linux/updmap b/Master/bin/i386-linux/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/i386-linux/updmap
+++ b/Master/bin/i386-linux/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/updmap b/Master/bin/i386-netbsd/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/i386-netbsd/updmap
+++ b/Master/bin/i386-netbsd/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/updmap b/Master/bin/i386-solaris/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/i386-solaris/updmap
+++ b/Master/bin/i386-solaris/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/mips-irix/updmap b/Master/bin/mips-irix/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/mips-irix/updmap
+++ b/Master/bin/mips-irix/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-aix/updmap b/Master/bin/powerpc-aix/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/powerpc-aix/updmap
+++ b/Master/bin/powerpc-aix/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/updmap b/Master/bin/powerpc-linux/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/powerpc-linux/updmap
+++ b/Master/bin/powerpc-linux/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/sparc-linux/updmap b/Master/bin/sparc-linux/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/sparc-linux/updmap
+++ b/Master/bin/sparc-linux/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/updmap b/Master/bin/sparc-solaris/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/sparc-solaris/updmap
+++ b/Master/bin/sparc-solaris/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/universal-darwin/updmap b/Master/bin/universal-darwin/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/universal-darwin/updmap
+++ b/Master/bin/universal-darwin/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/updmap b/Master/bin/x86_64-darwin/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/x86_64-darwin/updmap
+++ b/Master/bin/x86_64-darwin/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/updmap b/Master/bin/x86_64-linux/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/x86_64-linux/updmap
+++ b/Master/bin/x86_64-linux/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/updmap b/Master/bin/x86_64-solaris/updmap
index 5eceaae6d41..fe608dfd964 120000
--- a/Master/bin/x86_64-solaris/updmap
+++ b/Master/bin/x86_64-solaris/updmap
@@ -1 +1 @@
-../../texmf/scripts/tetex/updmap.pl
\ No newline at end of file
+../../texmf/scripts/texlive/updmap.pl
\ No newline at end of file
diff --git a/Master/texmf/scripts/tetex/updmap.pl b/Master/texmf/scripts/tetex/updmap-single.pl
index ac3720d58bf..ac3720d58bf 100755
--- a/Master/texmf/scripts/tetex/updmap.pl
+++ b/Master/texmf/scripts/tetex/updmap-single.pl
diff --git a/Master/texmf/scripts/texlive/mupdmap-sys.sh b/Master/texmf/scripts/texlive/mupdmap-sys.sh
deleted file mode 100755
index 10b8090ee85..00000000000
--- a/Master/texmf/scripts/texlive/mupdmap-sys.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# (m)updmap-sys: Thomas Esser, public domain.
-
-# wrapper script for (m)updmap with TEXMFVAR and TEXMFCONFIG set to
-#   TEXMFSYSVAR / TEXMFSYSCONFIG
-
-test -f /bin/ksh && test -z "$RUNNING_KSH" \
-  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
-  && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
-unset RUNNING_KSH
-
-test -f /bin/bsh && test -z "$RUNNING_BSH" \
-  && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
-  && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
-unset RUNNING_BSH
-
-export PATH
-
-# hack around a bug in zsh:
-test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
-v=`kpsewhich -var-value TEXMFSYSVAR`
-c=`kpsewhich -var-value TEXMFSYSCONFIG`
-
-TEXMFVAR="$v"
-TEXMFCONFIG="$c"
-export TEXMFVAR TEXMFCONFIG
-
-exec mupdmap ${1+"$@"}
diff --git a/Master/texmf/scripts/texlive/mupdmap.pl b/Master/texmf/scripts/texlive/updmap.pl
index 1137347a423..1137347a423 100755
--- a/Master/texmf/scripts/texlive/mupdmap.pl
+++ b/Master/texmf/scripts/texlive/updmap.pl