i386-solaris binaries for tl08 from asyropoulos

git-svn-id: svn://tug.org/texlive/trunk@8563 c570f23f-e606-0410-a88d-b1316a301751
author: Karl Berry <karl@freefriends.org> 2008-06-04 18:30:37 +0000
committer: Karl Berry <karl@freefriends.org> 2008-06-04 18:30:37 +0000
commit: b6d68988659b77f8fe2fd7ce56f40d29ac81f6eb (patch)
tree: a1e589387ef4f4a5a6846102b65100c1d5d245a8
parent: 79e3831f6773e021d2e76c753cd156721ddd7621 (diff)
151 files changed, 226 insertions, 1097 deletions
diff --git a/Build/source/README b/Build/source/README
index 39213aeb200..3e58a2bafb7 100644
--- a/Build/source/README
+++ b/Build/source/README
@@ -55,15 +55,19 @@ env LD_OPTIONS=-R/usr/local/lib ./Build
 
 
 Build information:
+  amd64-freebsd: built on Freebsd 7.0-RELEASE amd64,
+    --with-fontconfig=/usr/local
+
   i386-linux: Debian sarge, gcc 3.3.5, libc 2.3.2, Linux 2.6.9-67.0.4.ELsmp
     chroot /home/texlive/sarge && cd /tmp/source && Build
     
-  i386-darwin: built on MacOSX 10.4
-  powerpc-darwin: built on MacOSX 10.4
-  
-  amd64-freebsd: built on Freebsd 7.0-RELEASE amd64,
-    --with-fontconfig=/usr/local
+  i386-darwin: MacOSX 10.4 with support for 10.3, 10.4, and 10.5
 
+  i386-solaris: Solaris 10 11/06 s10x_u3wos_10 X86
+    system gcc (GCC) 3.4.3 (csl-sol210-3_4-branch+sol_rpath)
+
+  powerpc-darwin: like i386-darwin
+  
   sparc-solaris
 OS: Sun Solaris 8
 compiler: Sun Studio 11
diff --git a/Master/bin/i386-solaris/afm2pl b/Master/bin/i386-solaris/afm2pl
index 2a7e8dfbf3b..e2a201a2776 100755
--- a/Master/bin/i386-solaris/afm2pl
+++ b/Master/bin/i386-solaris/afm2pl
diff --git a/Master/bin/i386-solaris/afm2tfm b/Master/bin/i386-solaris/afm2tfm
index cd75e3f8b73..92d61d3abd3 100755
--- a/Master/bin/i386-solaris/afm2tfm
+++ b/Master/bin/i386-solaris/afm2tfm
diff --git a/Master/bin/i386-solaris/aleph b/Master/bin/i386-solaris/aleph
index d6925dd8e4f..b03adeee3ab 100755
--- a/Master/bin/i386-solaris/aleph
+++ b/Master/bin/i386-solaris/aleph
diff --git a/Master/bin/i386-solaris/bbox b/Master/bin/i386-solaris/bbox
index e31e1e760e7..0c68f029cff 100755
--- a/Master/bin/i386-solaris/bbox
+++ b/Master/bin/i386-solaris/bbox
diff --git a/Master/bin/i386-solaris/bg5conv b/Master/bin/i386-solaris/bg5conv
index a25dc4f1969..ca951be0622 100755
--- a/Master/bin/i386-solaris/bg5conv
+++ b/Master/bin/i386-solaris/bg5conv
diff --git a/Master/bin/i386-solaris/bibtex b/Master/bin/i386-solaris/bibtex
index 85391a4449d..681e83c025e 100755
--- a/Master/bin/i386-solaris/bibtex
+++ b/Master/bin/i386-solaris/bibtex
diff --git a/Master/bin/i386-solaris/bibtex8 b/Master/bin/i386-solaris/bibtex8
index 5d13d712f97..07d39b4b2ee 100755
--- a/Master/bin/i386-solaris/bibtex8
+++ b/Master/bin/i386-solaris/bibtex8
diff --git a/Master/bin/i386-solaris/cef5conv b/Master/bin/i386-solaris/cef5conv
index 0e70388ad1e..a4843e4e1ba 100755
--- a/Master/bin/i386-solaris/cef5conv
+++ b/Master/bin/i386-solaris/cef5conv
diff --git a/Master/bin/i386-solaris/cefconv b/Master/bin/i386-solaris/cefconv
index 83c7b3f4971..8938b6c12b8 100755
--- a/Master/bin/i386-solaris/cefconv
+++ b/Master/bin/i386-solaris/cefconv
diff --git a/Master/bin/i386-solaris/cefsconv b/Master/bin/i386-solaris/cefsconv
index 3c36f01cf60..3a481f440d7 100755
--- a/Master/bin/i386-solaris/cefsconv
+++ b/Master/bin/i386-solaris/cefsconv
diff --git a/Master/bin/i386-solaris/cfftot1 b/Master/bin/i386-solaris/cfftot1
index b10efc9d71d..cd94bc8b670 100755
--- a/Master/bin/i386-solaris/cfftot1
+++ b/Master/bin/i386-solaris/cfftot1
diff --git a/Master/bin/i386-solaris/ctangle b/Master/bin/i386-solaris/ctangle
index 7c6842e9937..195d22526d6 100755
--- a/Master/bin/i386-solaris/ctangle
+++ b/Master/bin/i386-solaris/ctangle
diff --git a/Master/bin/i386-solaris/ctie b/Master/bin/i386-solaris/ctie
index 2db377ca924..36d25acec4b 100755
--- a/Master/bin/i386-solaris/ctie
+++ b/Master/bin/i386-solaris/ctie
diff --git a/Master/bin/i386-solaris/cweave b/Master/bin/i386-solaris/cweave
index 0d94122cd3d..31ad53b5cde 100755
--- a/Master/bin/i386-solaris/cweave
+++ b/Master/bin/i386-solaris/cweave
diff --git a/Master/bin/i386-solaris/detex b/Master/bin/i386-solaris/detex
index 8b1c5f6de8c..330ddf5b252 100755
--- a/Master/bin/i386-solaris/detex
+++ b/Master/bin/i386-solaris/detex
diff --git a/Master/bin/i386-solaris/devnag b/Master/bin/i386-solaris/devnag
index c34a57d9d7e..1a9a12e8268 100755
--- a/Master/bin/i386-solaris/devnag
+++ b/Master/bin/i386-solaris/devnag
diff --git a/Master/bin/i386-solaris/disdvi b/Master/bin/i386-solaris/disdvi
index c21f0f60e56..fad39bd2fa3 100755
--- a/Master/bin/i386-solaris/disdvi
+++ b/Master/bin/i386-solaris/disdvi
diff --git a/Master/bin/i386-solaris/dmp b/Master/bin/i386-solaris/dmp
index 0a4ac1411f7..3c1fc58f41f 100755
--- a/Master/bin/i386-solaris/dmp
+++ b/Master/bin/i386-solaris/dmp
diff --git a/Master/bin/i386-solaris/dt2dv b/Master/bin/i386-solaris/dt2dv
index eea922ef5d3..93aabf48a88 100755
--- a/Master/bin/i386-solaris/dt2dv
+++ b/Master/bin/i386-solaris/dt2dv
diff --git a/Master/bin/i386-solaris/dv2dt b/Master/bin/i386-solaris/dv2dt
index 1e64967eed2..1d5158d0dcc 100755
--- a/Master/bin/i386-solaris/dv2dt
+++ b/Master/bin/i386-solaris/dv2dt
diff --git a/Master/bin/i386-solaris/dvi2tty b/Master/bin/i386-solaris/dvi2tty
index 37990f4801c..1ca36b53349 100755
--- a/Master/bin/i386-solaris/dvi2tty
+++ b/Master/bin/i386-solaris/dvi2tty
diff --git a/Master/bin/i386-solaris/dviasm b/Master/bin/i386-solaris/dviasm
new file mode 120000
index 00000000000..2b15762a267
--- /dev/null
+++ b/Master/bin/i386-solaris/dviasm
@@ -0,0 +1 @@
+../../texmf-dist/scripts/dviasm/dviasm.py
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/dvibook b/Master/bin/i386-solaris/dvibook
index 2e0773bd59e..6d2e1f6a765 100755
--- a/Master/bin/i386-solaris/dvibook
+++ b/Master/bin/i386-solaris/dvibook
diff --git a/Master/bin/i386-solaris/dviconcat b/Master/bin/i386-solaris/dviconcat
index ee40e8ebd6d..5e341b02660 100755
--- a/Master/bin/i386-solaris/dviconcat
+++ b/Master/bin/i386-solaris/dviconcat
diff --git a/Master/bin/i386-solaris/dvicopy b/Master/bin/i386-solaris/dvicopy
index 8250ed2b224..49192039878 100755
--- a/Master/bin/i386-solaris/dvicopy
+++ b/Master/bin/i386-solaris/dvicopy
diff --git a/Master/bin/i386-solaris/dvidvi b/Master/bin/i386-solaris/dvidvi
index 73e5253ba8b..b682f2a44f0 100755
--- a/Master/bin/i386-solaris/dvidvi
+++ b/Master/bin/i386-solaris/dvidvi
diff --git a/Master/bin/i386-solaris/dvigif b/Master/bin/i386-solaris/dvigif
new file mode 120000
index 00000000000..c1eef0afe05
--- /dev/null
+++ b/Master/bin/i386-solaris/dvigif
@@ -0,0 +1 @@
+dvipng
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/dvilj b/Master/bin/i386-solaris/dvilj
index adbc893f859..cf84589f71a 100755
--- a/Master/bin/i386-solaris/dvilj
+++ b/Master/bin/i386-solaris/dvilj
diff --git a/Master/bin/i386-solaris/dvilj2p b/Master/bin/i386-solaris/dvilj2p
index 9a973f65457..2b4a02dbe3f 100755
--- a/Master/bin/i386-solaris/dvilj2p
+++ b/Master/bin/i386-solaris/dvilj2p
diff --git a/Master/bin/i386-solaris/dvilj4 b/Master/bin/i386-solaris/dvilj4
index 0d9f898633d..946492aceab 100755
--- a/Master/bin/i386-solaris/dvilj4
+++ b/Master/bin/i386-solaris/dvilj4
diff --git a/Master/bin/i386-solaris/dvilj4l b/Master/bin/i386-solaris/dvilj4l
index 57301f9bb19..8df5f10221c 100755
--- a/Master/bin/i386-solaris/dvilj4l
+++ b/Master/bin/i386-solaris/dvilj4l
diff --git a/Master/bin/i386-solaris/dvipdfm b/Master/bin/i386-solaris/dvipdfm
index 646e0913fd5..e8376df825d 100755
--- a/Master/bin/i386-solaris/dvipdfm
+++ b/Master/bin/i386-solaris/dvipdfm
diff --git a/Master/bin/i386-solaris/dvipdfmx b/Master/bin/i386-solaris/dvipdfmx
index 06c6dfc505f..178053dc0c1 100755
--- a/Master/bin/i386-solaris/dvipdfmx
+++ b/Master/bin/i386-solaris/dvipdfmx
diff --git a/Master/bin/i386-solaris/dvipng b/Master/bin/i386-solaris/dvipng
index e5aff86ef9f..3510f895410 100755
--- a/Master/bin/i386-solaris/dvipng
+++ b/Master/bin/i386-solaris/dvipng
diff --git a/Master/bin/i386-solaris/dvipos b/Master/bin/i386-solaris/dvipos
index a6bc48e7361..c05e46e1d3c 100755
--- a/Master/bin/i386-solaris/dvipos
+++ b/Master/bin/i386-solaris/dvipos
diff --git a/Master/bin/i386-solaris/dvips b/Master/bin/i386-solaris/dvips
index 04aff122b9c..2b73158d20a 100755
--- a/Master/bin/i386-solaris/dvips
+++ b/Master/bin/i386-solaris/dvips
diff --git a/Master/bin/i386-solaris/dviselect b/Master/bin/i386-solaris/dviselect
index d3ee8fcceaf..cab7af84e4b 100755
--- a/Master/bin/i386-solaris/dviselect
+++ b/Master/bin/i386-solaris/dviselect
diff --git a/Master/bin/i386-solaris/dvitodvi b/Master/bin/i386-solaris/dvitodvi
index f93e8f648a0..3357fd1feb3 100755
--- a/Master/bin/i386-solaris/dvitodvi
+++ b/Master/bin/i386-solaris/dvitodvi
diff --git a/Master/bin/i386-solaris/dvitomp b/Master/bin/i386-solaris/dvitomp
index c651ec9aba4..27b7115b8f3 100755
--- a/Master/bin/i386-solaris/dvitomp
+++ b/Master/bin/i386-solaris/dvitomp
diff --git a/Master/bin/i386-solaris/dvitype b/Master/bin/i386-solaris/dvitype
index 60aced6222f..7f1f44dca5c 100755
--- a/Master/bin/i386-solaris/dvitype
+++ b/Master/bin/i386-solaris/dvitype
diff --git a/Master/bin/i386-solaris/ebb b/Master/bin/i386-solaris/ebb
index cd08a6d6765..ab4195592f6 100755..120000
--- a/Master/bin/i386-solaris/ebb
+++ b/Master/bin/i386-solaris/ebb
diff --git a/Master/bin/i386-solaris/epsffit b/Master/bin/i386-solaris/epsffit
index 003d84ff867..aef6a40edcd 100755
--- a/Master/bin/i386-solaris/epsffit
+++ b/Master/bin/i386-solaris/epsffit
diff --git a/Master/bin/i386-solaris/extconv b/Master/bin/i386-solaris/extconv
index b656e49a750..6a6b41035b1 100755
--- a/Master/bin/i386-solaris/extconv
+++ b/Master/bin/i386-solaris/extconv
diff --git a/Master/bin/i386-solaris/extractbb b/Master/bin/i386-solaris/extractbb
new file mode 120000
index 00000000000..ab4195592f6
--- /dev/null
+++ b/Master/bin/i386-solaris/extractbb
@@ -0,0 +1 @@
+dvipdfmx
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/getnonfreefonts b/Master/bin/i386-solaris/getnonfreefonts
index 9c419e65bd7..26aadc46261 100755..120000
--- a/Master/bin/i386-solaris/getnonfreefonts
+++ b/Master/bin/i386-solaris/getnonfreefonts
@@ -1,306 +1 @@
-#!/usr/bin/env perl
-
-## getnonfreefonts
-## Copyright 2006-2008 Reinhard Kotucha <reinhard.kotucha@web.de>
-#
-# This work may be distributed and/or modified under the
-# conditions of the LaTeX Project Public License, either version 1.3
-# of this license or (at your option) any later version.
-# The latest version of this license is in
-#   http://www.latex-project.org/lppl.txt
-# 
-# The current maintainer is Reinhard Kotucha.
-
-my $TL_version='2008';
-
-my $getfont_url="ftp://tug.org/tex/getnonfreefonts/getfont$TL_version";
-
-use File::Copy;
-use Getopt::Long;
-$Getopt::Long::autoabbrev=0;
-
-$opt_lsfonts=0;
-$opt_force=0;
-
-sub usage {
-    print <<'EOF';
-Usage:
-    getnonfreefonts[-sys] [-a|--all] [-d|--debug] [-f|--force]
-        [-l|--lsfonts] [-v|--verbose] [--version] [font1] [font2] ...
-
-    getnonfreefonts installs fonts in $TEXMFHOME.
-    getnonfreefonts-sys installs fonts in $TEXMFLOCAL.
-
-    Options:
-        -a|--all      Install all fonts.
-
-        -d|--debug    Provide additional messages for debugging.
-
-        -f|--force    Install fonts even if they are installed already.
-
-        -h|--help     Print this message.
-
-        -l|--lsfonts  List all fonts available.
-
-        -v|--verbose  Be more verbose.
-
-        --version     Print version number.
-
-EOF
-;
-}
-
-@ARGS=@ARGV;
-
-GetOptions 
-    "all|a",
-    "debug|d",
-    "force|f",
-    "help|h",
-    "lsfonts|l",
-    "verbose|v",
-    "version",
-    "sys";
-
-$^W=1 if $opt_debug;
-
-my $sys=($0=~/-sys$/)? 1:0;
-$sys=1 if $opt_sys;
-
-@allpackages=@ARGV;
-
-print "$TL_version\n" and exit 0 if $opt_version; 
-
-if ($opt_help or !@ARGS) {
-    print "\nThis is getnonfreefonts";
-    print '-sys' if ($sys);
-    print ", version $TL_version.\n\n";
-    usage; 
-}
-
-
-sub message {
-    my $message=shift;
-    if ($message=~/^\[/) {
-	print "$message\n";
-    } else {
-	printf "%-60s", $message;
-    }
-}
-
-
-sub debug_msg {
-    my $message=shift;
-    if ($opt_debug) {
-	print STDERR "DEBUG: $message.\n";
-    }
-}
-
-
-sub expand_var {
-    my $var=shift;
-
-    if (-d "/usr/bin") {
-	open KPSEWHICH, 'kpsewhich --expand-var=\$' . "$var |";
-    } else {
-	open KPSEWHICH, 'kpsewhich --expand-var=$'  . "$var |";
-    }
-    while (<KPSEWHICH>) {
-	chop;
-	return "$_";
-    }
-    close KPSEWHICH;
-}
-
-
-# get TMP|TEMP|TMPDIR environment variable
-
-if ($opt_debug) {
-    for my $var ("TMP","TEMP","TMPDIR") {
-	if (defined $ENV{$var}) {
-	    debug_msg "Environment variable $var='$ENV{$var}'";
-	} else {
-	    debug_msg "Environment variable $var not set";
-	}
-    }
-}
-
-
-if (defined $ENV{'TMP'}) {
-    $SYSTMP="$ENV{'TMP'}";
-} elsif (defined $ENV{'TEMP'}) {
-    $SYSTMP="$ENV{'TEMP'}";
-} elsif (defined $ENV{'TMPDIR'}) {
-    $SYSTMP="$ENV{'TMPDIR'}";
-} else {
-    $SYSTMP="/tmp";
-}
-
-debug_msg "Internal variable SYSTMP set to '$SYSTMP'";
-
-# Windows usually uses backslashes though forward slashes are probably
-# allowed.  Perl always needs forward slashes.
-
-# We convert backslashes to forward slashes on Windows.
-$SYSTMP=~s/\\/\//g if ($^O=~/^MSWin(32|64)/i);
-
-
-debug_msg "Internal variable SYSTMP converted to '$SYSTMP'";
-
-sub check_tmpdir{
-die "! ERROR: The temporary directory '$SYSTMP' doesn't exist.\n"
-    unless (-d "$SYSTMP");
-
-die "! ERROR: The temporary directory '$SYSTMP' is not writable.\n"
-    unless (-w "$SYSTMP");
-}
-
-# Determine INSTALLROOT.
-
-if ($opt_debug) {
-    my @path=split ':', $ENV{PATH};
-    for my $dir (@path) {
-	debug_msg "Search for kpsewhich in '$dir'";
-	opendir DIR, "$dir";
-	my @kpsewichs=grep /^kpsewhich/, readdir DIR;
-	closedir DIR;
-	for (@kpsewichs) {
-	    debug_msg "Found $dir/$_" if /^kpsewhich/;
-	}
-    }
-}
-
-
-$INSTALLROOTNAME=($sys)? 'TEXMFLOCAL':'TEXMFHOME';
-
-$INSTALLROOT=expand_var "$INSTALLROOTNAME";
-
-($sys)? debug_msg "sys=true":debug_msg "sys=false";
-
-debug_msg "INSTALLROOT='$INSTALLROOT'";
-
-$INSTALLROOT=~s/\\/\//g if ($^O=~/^MSWin(32|64)/i);
-
-debug_msg "Internal variable INSTALLROOT converted to '$INSTALLROOT'";
-
-sub check_installroot {
-    die "! ERROR: The variable $INSTALLROOTNAME is not set.\n"
-	unless length ("$INSTALLROOT") > 0;
-
-    die "! ERROR: The install directory '$INSTALLROOT' doesn't " .
-	"exist.\n" .
-	"         If this is the correct path, please create " .
-	"this directory manually.\n" 
-	unless (-d "$INSTALLROOT");
-    
-    die "! ERROR: The install directory '$INSTALLROOT' is not writable.\n"
-	unless (-w "$INSTALLROOT");
-}
-
-if ($opt_help or !@ARGS) {
-    print <<"ENDUSAGE";
-  Directories:
-       temporary: '$SYSTMP/getfont-<PID>'
-       install:   '$INSTALLROOT'
-
-ENDUSAGE
-check_tmpdir;
-check_installroot;
-exit 0;
-}
-
-check_tmpdir;
-check_installroot;
-
-my $tmpdir="$SYSTMP/getfont-$$";
-debug_msg "Internal variable tmpdir set to '$tmpdir'";
-
-mkdir "$tmpdir" or die "! ERROR: Can't mkdir '$tmpdir'.";
-chdir "$tmpdir" or die "! ERROR: Can't cd '$tmpdir'.";
-
-sub remove_tmpdir {
-    chdir "$SYSTMP" or die "! ERROR: Can't cd '$SYSTMP'.\n";
-    opendir TMPDIR, "$tmpdir" 
-	or print "! ERROR: Can't read directory '$tmpdir'.\n";
-
-    @alltmps=readdir TMPDIR;
-    closedir TMPDIR;
-
-    foreach $file (@alltmps) {
-	next if $file=~/^\./;
-	unlink "$tmpdir/$file";
-    }
-    rmdir "$tmpdir" or die "! ERROR: Can't remove directory '$tmpdir'.\n";
-}
-
-# Signal handlers.
-
-my @common_signals=qw(INT ILL FPE SEGV TERM ABRT);
-my @signals_UNIX=qw(QUIT BUS PIPE);
-my @signals_Win32=qw(BREAK);
-
-
-if ($^O=~/^MSWin(32|64)$/i) {
-    @signals=(@common_signals, @signals_Win32);
-} else {
-    @signals=(@common_signals, @signals_UNIX);
-}
-
-debug_msg "Supported signals: @signals\n";
-
-foreach my $signal (@signals) {
-    $SIG{"$signal"}=\&remove_tmpdir;
-}
-
-# Download the script from tug.org.
-
-debug_msg "Running 'wget $getfont_url'";
-
-system ('wget', "$getfont_url") == 0 or die "! Error: Can't execute wget.\n";
-
-# Download the fonts.
-
-my @getfont=('perl', "./getfont$TL_version", '--getnonfreefonts');
-push @getfont, "--installroot=$INSTALLROOT";
-push @getfont, '--lsfonts' if $opt_lsfonts;
-push @getfont, '--force' if $opt_force;
-push @getfont, '--debug' if $opt_debug;
-push @getfont, '--verbose' if $opt_verbose;
-push @getfont, '--sys' if $sys;
-push @getfont, '--all' if $opt_all;
-push @getfont, @allpackages;
-
-debug_msg "Running '@getfont'";
-
-system @getfont;
-
-# Evaluate the exit status.  It will be 2 if something had been
-# installed and in this case we need to run texhash/updmap.
-
-my $exit_code=$?;
-my $exit_status=int($exit_code/256);
-
-if ($sys) {		     
-    debug_msg "Info: Execute updmap-sys if exit status is 2";
-} else {
-    debug_msg "Info: Execute updmap if exit status is 2";
-}
-
-debug_msg "Exit status of getfont$TL_version is $exit_status";
-
-if ($exit_status==2) {
-    print "\n";
-    system 'texhash', "$INSTALLROOT";
-    $updmap_command=($sys)? 'updmap-sys':'updmap';
-    @updmap=("$updmap_command");
-    push @updmap, '--quiet' unless $opt_verbose;
-    print "\n";
-    message "Updating map files ($updmap_command)...";
-    system @updmap;
-    
-    message $?? '[failed]':'[done]';
-}
-
-remove_tmpdir;
-
-__END__
+../../texmf/scripts/texlive/getnonfreefonts.pl
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/gftodvi b/Master/bin/i386-solaris/gftodvi
index 73fd764480e..c29a1843420 100755
--- a/Master/bin/i386-solaris/gftodvi
+++ b/Master/bin/i386-solaris/gftodvi
diff --git a/Master/bin/i386-solaris/gftopk b/Master/bin/i386-solaris/gftopk
index 45935a9139c..926da3b18f5 100755
--- a/Master/bin/i386-solaris/gftopk
+++ b/Master/bin/i386-solaris/gftopk
diff --git a/Master/bin/i386-solaris/gftype b/Master/bin/i386-solaris/gftype
index 2ef237b0864..e0cf29fe730 100755
--- a/Master/bin/i386-solaris/gftype
+++ b/Master/bin/i386-solaris/gftype
diff --git a/Master/bin/i386-solaris/gsftopk b/Master/bin/i386-solaris/gsftopk
index 09f26b189df..c3ef3493861 100755
--- a/Master/bin/i386-solaris/gsftopk
+++ b/Master/bin/i386-solaris/gsftopk
diff --git a/Master/bin/i386-solaris/hbf2gf b/Master/bin/i386-solaris/hbf2gf
index 020a5ed64b8..2a1c34e24bc 100755
--- a/Master/bin/i386-solaris/hbf2gf
+++ b/Master/bin/i386-solaris/hbf2gf
diff --git a/Master/bin/i386-solaris/ht b/Master/bin/i386-solaris/ht
index 9336545fb4e..ecd829558cd 100755..120000
--- a/Master/bin/i386-solaris/ht
+++ b/Master/bin/i386-solaris/ht
@@ -1,7 +1 @@
-#!/bin/sh
-$1 $2
-$1 $2
-$1 $2
-tex4ht $2
-t4ht $2  $3     # -d~/WWW/temp/ -m644
-
+../../texmf-dist/scripts/tex4ht/ht.sh
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/htcontext b/Master/bin/i386-solaris/htcontext
index 34d534636eb..d2754ae84fc 100755..120000
--- a/Master/bin/i386-solaris/htcontext
+++ b/Master/bin/i386-solaris/htcontext
@@ -1,7 +1 @@
-#!/bin/sh
-        texexec --arg="ht-1=$2" --use=tex4ht --dvi --nobackend $5 $1 
-        tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
-
-
-
+../../texmf-dist/scripts/tex4ht/htcontext.sh
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/htlatex b/Master/bin/i386-solaris/htlatex
index 1b8b7cea74a..fe0feaa8185 100755..120000
--- a/Master/bin/i386-solaris/htlatex
+++ b/Master/bin/i386-solaris/htlatex
@@ -1,9 +1 @@
-#!/bin/sh
-        latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
-        latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
-        latex $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
-        tex4ht -f/$1  -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
-
-
-
+../../texmf-dist/scripts/tex4ht/htlatex.sh
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/htmex b/Master/bin/i386-solaris/htmex
index b4aa3d9a06e..29032d7b670 100755..120000
--- a/Master/bin/i386-solaris/htmex
+++ b/Master/bin/i386-solaris/htmex
@@ -1,9 +1 @@
-#!/bin/sh
-        mex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        mex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        mex $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
-
-
-
+../../texmf-dist/scripts/tex4ht/htmex.sh
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/httex b/Master/bin/i386-solaris/httex
index 44920e72077..ece1bd19046 100755..120000
--- a/Master/bin/i386-solaris/httex
+++ b/Master/bin/i386-solaris/httex
@@ -1,9 +1 @@
-#!/bin/sh
-        tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
-
-
-
+../../texmf-dist/scripts/tex4ht/httex.sh
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/httexi b/Master/bin/i386-solaris/httexi
index 0ce3cb4a589..aa6cd5c8561 100755..120000
--- a/Master/bin/i386-solaris/httexi
+++ b/Master/bin/i386-solaris/httexi
@@ -1,10 +1 @@
-#!/bin/sh
-        tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex  $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\let\svrm=\rm\def\rm{\svrm\ifx\c\comment\def\rm{\let\rm=\svrm\catcode`\@=12\catcode`\\=0 \csname tex4ht\endcsname\catcode`\@=0\catcode`\\=13 }\expandafter\rm\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex4ht -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -f/$1 $4 ## -d~/WWW/temp/ -m644 
-#        texindex ?
-
-
-
+../../texmf-dist/scripts/tex4ht/httexi.sh
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/htxelatex b/Master/bin/i386-solaris/htxelatex
index 5d0a57d9e67..dcaa0fc882c 100755..120000
--- a/Master/bin/i386-solaris/htxelatex
+++ b/Master/bin/i386-solaris/htxelatex
@@ -1,9 +1 @@
-#!/bin/sh
-        xelatex -no-pdf $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
-        xelatex -no-pdf $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
-        xelatex -no-pdf $5 '\makeatletter\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\def\Link#1.a.b.c.{\g@addto@macro\@documentclasshook{\RequirePackage[#1,html]{tex4ht}}\let\HCode\documentstyle\def\documentstyle{\let\documentstyle\HCode\expandafter\def\csname tex4ht\endcsname{#1,html}\def\HCode####1{\documentstyle[tex4ht,}\@ifnextchar[{\HCode}{\documentstyle[tex4ht]}}}\makeatother\HCode '$2'.a.b.c.\input ' $1
-        tex4ht -.xdv -f/$1  -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -.xdv -f/$1 $4 ## -d~/WWW/temp/ -m644 
-
-
-
+../../texmf-dist/scripts/tex4ht/htxelatex.sh
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/htxetex b/Master/bin/i386-solaris/htxetex
index 3386f1e0be4..c6cf37bfae9 100755..120000
--- a/Master/bin/i386-solaris/htxetex
+++ b/Master/bin/i386-solaris/htxetex
@@ -1,9 +1 @@
-#!/bin/sh
-        xetex -no-pdf $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        xetex -no-pdf $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        xetex -no-pdf $5 '\def\Link#1.a.b.c.{\expandafter\def\csname tex4ht\endcsname{\expandafter\def\csname tex4ht\endcsname{#1,html}\input tex4ht.sty }}\def\HCode{\futurelet\HCode\HChar}\def\HChar{\ifx"\HCode\def\HCode"##1"{\Link##1}\expandafter\HCode\else\expandafter\Link\fi}\HCode '$2'.a.b.c.\input ' $1
-        tex4ht -.xdv -f/$1 -i~/tex4ht.dir/texmf/tex4ht/ht-fonts/$3
-        t4ht -.xdv -f/$1 $4 ## -d~/WWW/temp/ -m644 
-
-
-
+../../texmf-dist/scripts/tex4ht/htxetex.sh
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/info b/Master/bin/i386-solaris/info
index ce97865e147..55d6146d3d6 100755
--- a/Master/bin/i386-solaris/info
+++ b/Master/bin/i386-solaris/info
diff --git a/Master/bin/i386-solaris/infokey b/Master/bin/i386-solaris/infokey
index 80b1240096a..8dcbe4edfa6 100755
--- a/Master/bin/i386-solaris/infokey
+++ b/Master/bin/i386-solaris/infokey
diff --git a/Master/bin/i386-solaris/install-info b/Master/bin/i386-solaris/install-info
index 0cc36cd90a0..28752b70c60 100755
--- a/Master/bin/i386-solaris/install-info
+++ b/Master/bin/i386-solaris/install-info
diff --git a/Master/bin/i386-solaris/kpseaccess b/Master/bin/i386-solaris/kpseaccess
index 30576fc243f..dd1123e8238 100755
--- a/Master/bin/i386-solaris/kpseaccess
+++ b/Master/bin/i386-solaris/kpseaccess
diff --git a/Master/bin/i386-solaris/kpsereadlink b/Master/bin/i386-solaris/kpsereadlink
index b8b2deb8e43..376d0fb5fab 100755
--- a/Master/bin/i386-solaris/kpsereadlink
+++ b/Master/bin/i386-solaris/kpsereadlink
diff --git a/Master/bin/i386-solaris/kpsestat b/Master/bin/i386-solaris/kpsestat
index fb1c66766ba..4e8c0d47021 100755
--- a/Master/bin/i386-solaris/kpsestat
+++ b/Master/bin/i386-solaris/kpsestat
diff --git a/Master/bin/i386-solaris/kpsewhich b/Master/bin/i386-solaris/kpsewhich
index 8a91318a017..06de1713998 100755
--- a/Master/bin/i386-solaris/kpsewhich
+++ b/Master/bin/i386-solaris/kpsewhich
diff --git a/Master/bin/i386-solaris/lacheck b/Master/bin/i386-solaris/lacheck
index 761b71c7412..971cd337f7f 100755
--- a/Master/bin/i386-solaris/lacheck
+++ b/Master/bin/i386-solaris/lacheck
diff --git a/Master/bin/i386-solaris/luatex b/Master/bin/i386-solaris/luatex
index 20a2eb62e9e..dc29d3605ac 100755
--- a/Master/bin/i386-solaris/luatex
+++ b/Master/bin/i386-solaris/luatex
diff --git a/Master/bin/i386-solaris/mag b/Master/bin/i386-solaris/mag
index 7e0342a1c27..1d3967f68c9 100755
--- a/Master/bin/i386-solaris/mag
+++ b/Master/bin/i386-solaris/mag
diff --git a/Master/bin/i386-solaris/makeindex b/Master/bin/i386-solaris/makeindex
index 91086b38323..1688afeac7f 100755
--- a/Master/bin/i386-solaris/makeindex
+++ b/Master/bin/i386-solaris/makeindex
diff --git a/Master/bin/i386-solaris/makeinfo b/Master/bin/i386-solaris/makeinfo
index 35153306ed3..7b8b4d1cfa1 100755
--- a/Master/bin/i386-solaris/makeinfo
+++ b/Master/bin/i386-solaris/makeinfo
diff --git a/Master/bin/i386-solaris/makempx b/Master/bin/i386-solaris/makempx
index fb382d1e254..de03ba1f485 100755
--- a/Master/bin/i386-solaris/makempx
+++ b/Master/bin/i386-solaris/makempx
diff --git a/Master/bin/i386-solaris/mf b/Master/bin/i386-solaris/mf
index ec3690f2107..a505ecca95f 100755
--- a/Master/bin/i386-solaris/mf
+++ b/Master/bin/i386-solaris/mf
diff --git a/Master/bin/i386-solaris/mf-nowin b/Master/bin/i386-solaris/mf-nowin
index 2189291b07b..26c5343f09d 100755
--- a/Master/bin/i386-solaris/mf-nowin
+++ b/Master/bin/i386-solaris/mf-nowin
diff --git a/Master/bin/i386-solaris/mft b/Master/bin/i386-solaris/mft
index b477fa0b45e..25ef729e977 100755
--- a/Master/bin/i386-solaris/mft
+++ b/Master/bin/i386-solaris/mft
diff --git a/Master/bin/i386-solaris/mk4ht b/Master/bin/i386-solaris/mk4ht
index 796872ece31..4b7480809ba 100755..120000
--- a/Master/bin/i386-solaris/mk4ht
+++ b/Master/bin/i386-solaris/mk4ht
@@ -1,384 +1 @@
-#!/usr/bin/env perl
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-# mk4ht                                 2007-11-14-18:40 %
-# Copyright (C) 2003--2007               Eitan M. Gurari %
-#                                                        %
-#                                                        %
-# This work may be distributed and/or modified under the %
-# conditions of the LaTeX Project Public License, either %
-# version 1.3 of this license or (at your option) any    %
-# later version. The latest version of this license is   %
-# in                                                     %
-#   http://www.latex-project.org/lppl.txt                %
-# and version 1.3 or later is part of all distributions  %
-# of LaTeX version 2003/12/01 or later.                  %
-#                                                        %
-# This work has the LPPL maintenance status "maintained".%
-#                                                        %
-# This Current Maintainer of this work                   %
-# is Eitan M. Gurari.                                    %
-#                                                        %
-#                             gurari@cse.ohio-state.edu  %
-#                 http://www.cse.ohio-state.edu/~gurari  %
-#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-use strict;
-$^W=1; # turn warning on
-my @options = (
- "",     "ht",        "",         "", "", "-cvalidatehtml",
- "ht",   "htlatex",   "latex",    "", "", "-cvalidatehtml",
- "ht",   "httex",     "tex",      "", "", "-cvalidatehtml",
- "ht",   "httexi",    "texi",     "", "", "-cvalidatehtml",
- "ht",   "htcontext", "context",  "", "", "-cvalidatehtml",
- "ht",   "htxetex",   "xetex",    "", "", "-cvalidatehtml",
- "ht",   "htxelatex", "xelatex",  "", "", "-cvalidatehtml",
- "xh", "xhlatex",  "latex",   "xhtml", "", "-cvalidate",
- "xh", "xhtex",    "tex",     "xhtml", "", "-cvalidate",
- "xh", "xhtexi",   "texi",    "xhtml", "", "-cvalidate",
- "xh", "xhcontext","context", "xhtml", "", "-cvalidat",
- "xh", "xhxelatex", "xelatex", "xhtml", "", "-cvalidate",
- "xh", "xhxetex",  "xetex",   "xhtml", "", "-cvalidate",
- "uxh", "uxhlatex",  "latex",   "xhtml,uni-html4", " -cunihtf", "-cvalidate",
- "uxh", "uxhtex",    "tex",     "xhtml,uni-html4", " -cunihtf", "-cvalidate",
- "uxh", "uxhtexi",   "texi",    "xhtml,uni-html4", " -cunihtf", "-cvalidate",
- "uxh", "uxhcontext","context",  "xhtml,uni-html4", " -cunihtf", "-cvalidate",
- "uxh", "uxhxelatex",  "xelatex",   "xhtml,uni-html4", " -cunihtf", "-cvalidate",
- "uxh", "uxhxetex",    "xetex",     "xhtml,uni-html4", " -cunihtf", "-cvalidate",
- "xhm", "xhmlatex", "latex",  "xhtml,mathml", " -cunihtf", "-cvalidate",
- "xhm", "xhmtex",   "tex",    "xhtml,mathml", " -cunihtf", "-cvalidate",
- "xhm", "xhmtexi",  "texi",   "xhtml,mathml", " -cunihtf", "-cvalidate",
- "xhm", "xhmcontext","context", "xhtml,mathml", " -cunihtf", "-cvalidate",
- "xhm", "xhmxelatex", "xelatex",  "xhtml,mathml", " -cunihtf", "-cvalidate",
- "xhm", "xhmxetex",   "xetex",    "xhtml,mathml", " -cunihtf", "-cvalidate",
- "mz", "mzlatex",   "latex",   "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
- "mz", "mztex",     "tex",     "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
- "mz", "mztexi",    "texi",    "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
- "mz", "mzcontext", "context", "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
- "mz", "mzxelatex", "xelatex",   "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
- "mz", "mzxetex",   "xetex",     "xhtml,mozilla", " -cmozhtf",  "-cvalidate",
- "oo", "oolatex",   "latex",   "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
- "oo", "ootex",     "tex",     "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
- "oo", "ootexi",    "texi",    "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
- "oo", "oocontext", "context", "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
- "oo", "ooxelatex",   "xelatex",   "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
- "oo", "ooxetex",     "xetex",     "xhtml,ooffice", "ooffice/\! -cmozhtf",  "-cooxtpipes -coo",
- "es", "eslatex",   "latex",   "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
- "es", "estex",     "tex",     "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
- "es", "estexi",    "texi",    "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
- "es", "escontext", "context", "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
- "es", "esxelatex",   "xelatex",   "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
- "es", "esxetex",     "xetex",     "xhtml,emspk", " -cemspkhtf -s4es",  "-cemspk",
- "js", "jslatex",   "latex",   "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
- "js", "jstex",     "tex",     "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
- "js", "jstexi",    "texi",    "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
- "js", "jscontext", "context", "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
- "js", "jsxelatex",   "xelatex",   "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
- "js", "jsxetex",     "xetex",     "xhtml,jsml", " -cjsmlhtf",  "-cjsml",
- "jm", "jmlatex",   "latex",   "xhtml,jsmath", " -cmozhtf", "",
- "jm", "jmtex",     "tex",     "xhtml,jsmath", " -cmozhtf", "",
- "jm", "jmtexi",    "texi",    "xhtml,jsmath", " -cmozhtf", "",
- "jm", "jmcontext", "context", "xhtml,jsmath", " -cmozhtf", "",
- "jm", "jmxelatex",   "xelatex",   "xhtml,jsmath", " -cmozhtf", "",
- "jm", "jmxetex",     "xetex",     "xhtml,jsmath", " -cmozhtf", "",
- "tei",  "teilatex",  "latex",   "xhtml,tei",    " -cunihtf",  "-cvalidate",
- "tei",  "teitex",    "tex",     "xhtml,tei",    " -cunihtf",  "-cvalidate",
- "tei",  "teitexi",   "texi",    "xhtml,tei",    " -cunihtf",  "-cvalidate",
- "tei",  "teicontext","context", "xhtml,tei",    " -cunihtf",  "-cvalidate",
- "teim", "teimlatex", "latex",   "xhtml,tei-mml"," -cunihtf",  "-cvalidate",
- "teim", "teimtex",   "tex",     "xhtml,tei-mml"," -cunihtf",  "-cvalidate",
- "teim", "teimtexi",  "texi",    "xhtml,tei-mml"," -cunihtf",  "-cvalidate",
- "teim", "teimcontext","context","xhtml,tei-mml"," -cunihtf",  "-cvalidate",
- "tei",  "teixelatex",  "xelatex",   "xhtml,tei",    " -cunihtf",  "-cvalidate",
- "tei",  "teixetex",    "xetex",     "xhtml,tei",    " -cunihtf",  "-cvalidate",
- "db",  "dblatex",   "latex",   "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
- "db",  "dbtex",     "tex",     "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
- "db",  "dbtexi",    "texi",    "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
- "db",  "dbcontext", "context", "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
- "dbm", "dbmlatex",  "latex",   "xhtml,docbook-mml", " -cunihtf",  "-cdocbk",
- "dbm", "dbmtex",    "tex",     "xhtml,docbook-mml", " -cunihtf",  "-cdocbk",
- "dbm", "dbmtexi",   "texi",    "xhtml,docbook-mml", " -cunihtf",  "-cdocbk",
- "dbm", "dbmcontext","context", "xhtml,docbook-mml", " -cunihtf",  "-cdocbk",
- "db",  "dbxelatex",   "xelatex",   "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
- "db",  "dbxetex",     "xetex",     "xhtml,docbook",     " -cunihtf",  "-cvalidate -cdocbk",
- "w", "wlatex",   "latex",   "xhtml,word", " -csymhtf", "",
- "w", "wtex",     "tex",     "xhtml,word", " -csymhtf", "",
- "w", "wtexi",    "texi",    "xhtml,word", " -csymhtf", "",
- "w", "wcontext", "context", "xhtml,word", " -csymhtf", "",
- "w", "wxelatex",   "xelatex",   "xhtml,word", " -csymhtf", "",
- "w", "wxetex",     "xetex",     "xhtml,word", " -csymhtf", "",
- "jh", "jhlatex",  "latex",  "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh", "jhtex",    "tex",    "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh", "jhtexi",   "texi",   "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh", "jhcontext","context", "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh", "jhxelatex",  "xelatex",  "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh", "jhxetex",    "xetex",    "html,javahelp,3.2,unicode", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp -cvalidatehtml",
- "jh1", "jh1latex",  "latex",  "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
- "jh1", "jh1tex",    "tex",    "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
- "jh1", "jh1texi",   "texi",   "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
- "jh1", "jh1context","context", "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
- "jh1", "jh1xelatex",  "xelatex",  "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
- "jh1", "jh1xetex",    "xetex",    "html,javahelp,3.2,unicode,jh1.0", " -cmozhtf -u10", " -d%1-doc/ -cjavahelp",
-
-);
-
-sub showInstrucions(){
-  print " option1:  mk4ht #1 \"#2\" \"#3\" \"#4\" \"#5\"\n";
-  print " \n";
-  print "    #1: htlatex, xhlatex, mzlatex, oolatex, dblatex, dbmlatex,\n";
-  print "        jhlatex, eslatex, teilatex, teimlatex, uxhlatex,  \n";
-  print "        wlatex, xhmlatex\n";
-  print " \n";
-  print "        also 'tex', 'texi', 'context', 'xetex', and 'xelatex'\n";
-  print "        instead of 'latex'\n";
-  print " \n";
-  print "    #2: file name\n";
-  print "    #3: optional arguments for latex/tex/... \n";
-  print "    #4: optional arguments for tex4ht.c\n";
-  print "    #5: optional arguments for t4ht.c\n";
-  print " \n";
-  print " option2:  mk4ht ht #2 #3 \"#4\" \"#5\"\n";
-  print " \n";
-  print "    #1: ht\n";
-  print "    #2: latex, tex\n";
-  print "    #3: file name\n";
-  print "    #4: optional arguments for tex4ht.c\n";
-  print "    #5: optional arguments for t4ht.c\n";
-  print " \n";
-  print " Within the program, in column three of the options\n";
-  print " variable, the  requests for the commands \"latex\",\n";
-  print " \"tex\", etc. can be replaced with other equivalent\n";
-  print " commands (e.g., \"tex -fmt=latex\").\n";
-
-  print "--------------------------------------------------------------------------\n";
-print "           Private configuration file: mk4ht.cfg\n";
-print "--------------------------------------------------------------------------\n";
-print "\n";
-print "A private configuration file mk4ht.cfg or .mk4ht may be placed at the\n";
-print "work or home directory, to update existing commands and introduce new\n";
-print "ones. The configuration file may contain records of the following\n";
-print "kinds.\n";
-print "\n";
-print "   #  Comment\n";
-print "    \n";
-print "   name = type\n";
-print "          Defines a ht*tex like command, and assocites to it the \n";
-print "          TeX compiler of the specified type. Examples of TeX \n";
-print "          types: latex, tex, texi, context, xetex, and xelatex.\n";
-print "    \n";
-print "   name.tex = options\n";
-print "          Command line options for the compilation under\n";
-print "          the (la)tex compiler\n";
-print "      \n";
-print "   name.tex4ht = options\n";
-print "          Command line options for tex4ht.c \n";
-print "    \n";
-print "   name.t4ht = options\n";
-print "          Command line options for t4ht.c\n";
-print "    \n";
-print "Each record should appear in a different line.  Variants\n";
-print "`name.tex += options', `name.tex4ht += options',\n";
-print "`name.t4ht += options' of the above records are also allowed.\n";
-print "They append the listed options to the base values.\n";
-print "\n";
-print "Example:\n";
-print "\n";
-print "   foohlatex         = latex\n";
-print "   foohlatex.tex     = xhtml,uni-html4\n";
-print "   foohlatex.tex4ht += -cunihtf\n";
-print "   foohlatex.t4ht    = -cvalidate\n";
-print "   htlatex.t4ht     += -d./\n";
-
-
-  print "--------------------------------------------------------------------------\n";
-print "           Deleting files\n";
-print "--------------------------------------------------------------------------\n";
-print "\n";
-print "The configuration file mk4ht.cfg may also contain requests for\n";
-print "removing files created in the work directory during the compilation.\n";
-print "The requests are to be made through records of the following forms.\n";
-print "\n";
-print "   clean ext1 ext2 ...\n";
-print "     The extensions of the file name to be removed.\n";
-print "   \n";
-print "   clean.name ext1 ext2 ...\n";
-print "     Conditional request. The `name' refers to the ht*tex \n";
-print "     like command in use.\n";
-print "\n";
-print "Example:\n";
-print "  clean             dvi idv\n";
-print "  clean.foohlatex   lg \n";
-print "  clean.htlatex     lg tmp\n";
-
-}
-
-print "mk4ht (2007-11-14-18:40)\n";
-if(  !@ARGV  ){
-  print "improper command\n";
-  showInstrucions(); exit(1);
-}
-my @command=("","","","","");
-my $i=0;
-my $j=0;
-my $param;
-my $name;
-my $compiler;
-my $tex;
-my $tex4ht;
-my $t4ht;
-my $texp;
-my $tex4htp = "";
-my $t4htp = "";
-my @ext;
-
-foreach $param (@ARGV) {
-  if( $i == 0 ){
-    my $inf;
-open $inf, "<mk4ht.cfg"
-or
-(  open $inf, "<.mk4ht"
-   or
-  (
-     open $inf, "<" . $ENV{HOME} . "/mk4ht.cfg"
-     or
-     (
-        open $inf, "<" . $ENV{HOME} . "/.mk4ht"
-        or $inf = ""
-) )  )
-;
-
-if( $inf ){
-   print "(mk4ht cfg)\n";
-   while(<$inf>) {
-     my($line) = $_;
-     chomp($line);      # remove eoln char
-     if ($line =~ m|\s*#.*|) {}
-     elsif($line =~ m|^\s*(\S*)\.(\S*)\s*\+=\s*(.*\S)\s*$|) {
-         if( ($param."tex4ht") eq ($1.$2) ){
-              $tex4htp = $tex4htp . " " . $3;
-         }
-         elsif( ($param."t4ht") eq ($1.$2) ){
-              $t4htp = $t4htp . " " . $3;
-         }
-         elsif( ($param."tex") eq ($1.$2) ){
-              $texp = $texp . "," . $3;
-         }
-     }
-     elsif($line =~ m|^\s*(\S*)\.(\S*)\s*=\s*(.*\S)\s*$|) {
-         if( ($param."tex4ht") eq ($1.$2) ){
-              $tex4ht = $3 . " ";
-              $tex4htp = "";
-         }
-         elsif( ($param."t4ht") eq ($1.$2) ){
-              $t4ht = $3 . " ";
-              $t4htp = "";
-         }
-         elsif( ($param."tex") eq ($1.$2) ){
-              $tex = $3 . ",";
-              $texp = "";
-         }
-     }
-     elsif($line =~ m|^\s*(\S*)\s*=\s*(.*\S)\s*$|) {
-         if( $param eq $1 ){
-              $name = $1;
-              $compiler = $2;
-         }
-     }
-     elsif($line =~ m|^\s*clean\s+(.+)|){
-   my(@array) = split(' ',$1);
-   push(@ext,@array);
-} elsif($line =~ m|^\s*clean\.(\S+)\s+(.+)|){
-   if( $1 eq @ARGV[0] ){
-      my(@array) = split(' ',$2);
-      push(@ext,@array);
-}  }
-
-     elsif ($line) { print "--- Error --- " . $line . "\n"; }
-   }
-   close $inf;
-}
-
-    for( $j=1; $j<$#options; $j+=6 ){
-      if( $param eq $options[$j] ){
-         if( $name ){
-            $command[0] = "ht".$compiler;
-if( $tex    ){ $command[2] = $tex;    } else { $command[2] = ""; }
-if( $tex4ht ){ $command[3] = $tex4ht; } else { $command[3] = ""; }
-if( $t4ht   ){ $command[4] = $t4ht;   } else { $command[4] = ""; }
-
-         } else {
-            if( $options[$j-1] eq "" ){
-  $command[0] = $options[$j];
-} else {
-  $command[0] = "ht".$options[$j+1];
-}
-if( $tex    ){ $command[2] = $tex;    } else { $command[2] = $options[$j+2]; }
-if( $tex4ht ){ $command[3] = $tex4ht; } else { $command[3] = $options[$j+3]; }
-if( $t4ht   ){ $command[4] = $t4ht;   } else { $command[4] = $options[$j+4]; }
-
-         }
-         if( $texp   ){ $command[2] = $command[2] . "," . $texp; }
-if( $tex4htp){ $command[3] = $command[3] . " " . $tex4htp; }
-if( $t4htp  ){ $command[4] = $command[4] . " " . $t4htp; }
-
-         last;
-    } }
-    if( $j>$#options ){
-      if( $name ){ $command[0] = "ht".$compiler;
-if( $tex    ){ $command[2] = $tex;    } else { $command[2] = ""; }
-if( $tex4ht ){ $command[3] = $tex4ht; } else { $command[3] = ""; }
-if( $t4ht   ){ $command[4] = $t4ht;   } else { $command[4] = ""; }
- }
-      else {
-          print "improper command: $param \n";
-          showInstrucions(); exit(1);
-    } }
-  } elsif ( $i== 1 ) {
-    $command[1] = $param;
-  } elsif ( $i== 2 ) {
-    if( $command[2] eq "" ){
-      $command[2] = $param;
-    } else {
-      $command[2] = $param. "," . $command[2];
-    }
-  } elsif ( $i== 3 ) {
-    $command[3] = $param . $command[3];
-  } else {
-    $command[4] = $param. " " .$command[4];
-  }
-  $i++;
-}
-my $cmd;
-open (KPSEA, "kpsewhich " . $command[0] . " |");
-if ($cmd = <KPSEA>){
-  $cmd =~ s/\s+$//;
-} else {
-  $cmd = $command[0];
-}
-close KPSEA;
-
-my $commando = $cmd . " "    . $command[1] . " \"".
-            $command[2] . "\" \"". $command[3] . "\" \"" .
-            $command[4] . "\"";
-print "$commando\n";
-my $rtrn;
-if( $rtrn = system($commando) ){
-   print "--- error --- failed to execute command\n";
-} else {
-   my $file;
-my $ext;
-my(@array) = split('\.',@ARGV[1]);
-my $texFile = @array[0];
-opendir(DIR,".") ;
-while ($file = readdir(DIR) ){
-  if(index($file,$texFile) == 0 ){
-    foreach $ext(@ext){
-    if (index($file,$ext,length($file)-length($ext)) != -1){
-      if( stat($file)){
-         unlink($file);
-         print  "Deleted: ". $file . "\n";
-} } } } }
-closedir(DIR);
-
-}
-exit( $rtrn );
-
+../../texmf-dist/scripts/tex4ht/mk4ht.pl
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/mktexlsr b/Master/bin/i386-solaris/mktexlsr
index 9f729e4d495..bd9b56b1906 100755
--- a/Master/bin/i386-solaris/mktexlsr
+++ b/Master/bin/i386-solaris/mktexlsr
@@ -13,12 +13,13 @@
 # <te@dbs.uni-hannover.de>, Okt., 1994.
 # Public domain.
 
-version='$Id: mktexlsr,v 1.46 2005/06/21 14:32:26 olaf Exp $'
+version='$Id: mktexlsr 8399 2008-05-28 22:19:34Z karl $'
 progname=`echo $0 | sed 's%.*/%%'`
 usage="Usage: $progname [DIR]...
 
-Only options are --help, --version, and --verbose.  If standard input is
-a terminal, --verbose is on by default.
+The only options are --help, --version, --verbose, --quiet, and --silent.
+If standard input is a terminal, --verbose is on by default.
+--quiet and --silent are synonyms, and cancel --verbose.
 
 Rebuild all necessary ls-R filename databases completely. If one or
 more arguments DIRS are given, these are used as texmf directories to
@@ -55,17 +56,22 @@ if tty -s; then verbose=true; else verbose=false; fi
 
 # A copy of some stuff from mktex.opt, so we can run in the presence of
 # terminally damaged ls-R files.
-if test "x$1" = x--help || test "x$1" = x-help; then
-  echo "$usage"
-  exit 0
-elif test "x$1" = x--version || test "x$1" = x-version; then
-  echo "`basename $0` $version"
-  kpsewhich --version
-  exit 0
-elif test "x$1" = x--verbose || test "x$1" = x-verbose; then
-  verbose=true
+while test $# -gt 0; do
+  if test "x$1" = x--help || test "x$1" = x-help; then
+    echo "$usage"
+    exit 0
+  elif test "x$1" = x--version || test "x$1" = x-version; then
+    echo "`basename $0` $version"
+    kpsewhich --version
+    exit 0
+  elif test "x$1" = x--verbose || test "x$1" = x-verbose; then
+    verbose=true
+  elif test "x$1" = x--quiet || test "x$1" = x--silent \
+       || test "x$1" = x-quiet || test "x$1" = x-silent ; then
+    verbose=false
+  fi
   shift
-fi
+done
 
 # mktexupd and mktexlsr make sure they're coordinated via this.  A copy
 # is found mktex.opt.
@@ -138,18 +144,19 @@ for TEXMFLS_R in "$@"; do
   echo "$ls_R_magic" >"$db_file_tmp"
 
   # The main task. We put ./: in the output, so top-level files can be
-  # found via ls-R. Probably irrelevant in practice.
-  # The sed command inserts the leading ./ for directory names, and
-  # removes ., .., and .svn entries from the list.  Also omit contents
-  # of any .svn directories; sed apparently requires that we do that
-  # operation in a separate invocation.
-  # We do not try to support colons in directory names.
+  # found via ls-R. Probably irrelevant in practice.  The sed command
+  # inserts the leading ./ for directory names, and removes ., .., and
+  # version control entries from the list.  Also omit contents of any
+  # the version directories; sed apparently requires that we do that
+  # operation in a separate invocation.  We do not try to support colons
+  # in directory names.
   # 
   echo "./:" >>"$db_file_tmp"
+  vc_dirs='\.\(bzr\|git\|hg\|svn\)\|CVS\|RCS\|_darcs'
   (cd "$TEXMFLS_R" && \ls -LRa 2>/dev/null) \
-   | sed -e '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^\.svn$/d;' \
-        -e '/^[\.\/]*lsR[0-9]*\.tmp:*$/d' \
-   | sed -e '/\.svn.*:$/,/^$/d' \
+   | sed -e '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^'$vc_dirs'$/d;' \
+         -e '/^[\.\/]*lsR[0-9]*\.tmp:*$/d' \
+   | sed -e /$vc_dirs'.*:$/,/^$/d' \
    >>"$db_file_tmp"
 
   # To be really safe, a loop.
diff --git a/Master/bin/i386-solaris/mmafm b/Master/bin/i386-solaris/mmafm
index ed26ea2108f..39b0958360b 100755
--- a/Master/bin/i386-solaris/mmafm
+++ b/Master/bin/i386-solaris/mmafm
diff --git a/Master/bin/i386-solaris/mmpfb b/Master/bin/i386-solaris/mmpfb
index ccf8548a1a9..13e03adfd30 100755
--- a/Master/bin/i386-solaris/mmpfb
+++ b/Master/bin/i386-solaris/mmpfb
diff --git a/Master/bin/i386-solaris/mpost b/Master/bin/i386-solaris/mpost
index e0df01ca430..a8bfb6dc72a 100755
--- a/Master/bin/i386-solaris/mpost
+++ b/Master/bin/i386-solaris/mpost
diff --git a/Master/bin/i386-solaris/mpto b/Master/bin/i386-solaris/mpto
index 894bcf52fcf..655bf8c41f1 100755
--- a/Master/bin/i386-solaris/mpto
+++ b/Master/bin/i386-solaris/mpto
diff --git a/Master/bin/i386-solaris/musixflx b/Master/bin/i386-solaris/musixflx
index a6447a23818..cf370d65ed2 100755
--- a/Master/bin/i386-solaris/musixflx
+++ b/Master/bin/i386-solaris/musixflx
diff --git a/Master/bin/i386-solaris/newer b/Master/bin/i386-solaris/newer
index ea9c8fa33c5..b5905ca1d60 100755
--- a/Master/bin/i386-solaris/newer
+++ b/Master/bin/i386-solaris/newer
diff --git a/Master/bin/i386-solaris/odvicopy b/Master/bin/i386-solaris/odvicopy
index d2016970ab0..e90beb738d8 100755
--- a/Master/bin/i386-solaris/odvicopy
+++ b/Master/bin/i386-solaris/odvicopy
diff --git a/Master/bin/i386-solaris/odvitype b/Master/bin/i386-solaris/odvitype
index 18423806926..8d22cc937bf 100755
--- a/Master/bin/i386-solaris/odvitype
+++ b/Master/bin/i386-solaris/odvitype
diff --git a/Master/bin/i386-solaris/omega b/Master/bin/i386-solaris/omega
index 6c938c96b80..89de9dd167e 100755
--- a/Master/bin/i386-solaris/omega
+++ b/Master/bin/i386-solaris/omega
diff --git a/Master/bin/i386-solaris/omfonts b/Master/bin/i386-solaris/omfonts
index c64778f36eb..6894bcf13c6 100755
--- a/Master/bin/i386-solaris/omfonts
+++ b/Master/bin/i386-solaris/omfonts
diff --git a/Master/bin/i386-solaris/otangle b/Master/bin/i386-solaris/otangle
index caac5ba7332..bdc69737b42 100755
--- a/Master/bin/i386-solaris/otangle
+++ b/Master/bin/i386-solaris/otangle
diff --git a/Master/bin/i386-solaris/otfinfo b/Master/bin/i386-solaris/otfinfo
index b9ff8d35b24..a20307587da 100755
--- a/Master/bin/i386-solaris/otfinfo
+++ b/Master/bin/i386-solaris/otfinfo
diff --git a/Master/bin/i386-solaris/otftotfm b/Master/bin/i386-solaris/otftotfm
index a38c1fcce30..24af2f0a585 100755
--- a/Master/bin/i386-solaris/otftotfm
+++ b/Master/bin/i386-solaris/otftotfm
diff --git a/Master/bin/i386-solaris/otp2ocp b/Master/bin/i386-solaris/otp2ocp
index 1ffa421cc13..dbe7dde92b9 100755
--- a/Master/bin/i386-solaris/otp2ocp
+++ b/Master/bin/i386-solaris/otp2ocp
diff --git a/Master/bin/i386-solaris/outocp b/Master/bin/i386-solaris/outocp
index 5bc3dbbf329..dff82322dde 100755
--- a/Master/bin/i386-solaris/outocp
+++ b/Master/bin/i386-solaris/outocp
diff --git a/Master/bin/i386-solaris/patgen b/Master/bin/i386-solaris/patgen
index c48e37f79ef..9b923652f87 100755
--- a/Master/bin/i386-solaris/patgen
+++ b/Master/bin/i386-solaris/patgen
diff --git a/Master/bin/i386-solaris/pdfclose b/Master/bin/i386-solaris/pdfclose
index c483892842c..0b4e392b644 100755
--- a/Master/bin/i386-solaris/pdfclose
+++ b/Master/bin/i386-solaris/pdfclose
diff --git a/Master/bin/i386-solaris/pdfopen b/Master/bin/i386-solaris/pdfopen
index ca07a2f4bba..a1dc8193996 100755
--- a/Master/bin/i386-solaris/pdfopen
+++ b/Master/bin/i386-solaris/pdfopen
diff --git a/Master/bin/i386-solaris/pdftex b/Master/bin/i386-solaris/pdftex
index 4c98ca9886e..4666d1b0045 100755
--- a/Master/bin/i386-solaris/pdftex
+++ b/Master/bin/i386-solaris/pdftex
diff --git a/Master/bin/i386-solaris/pdfthumb b/Master/bin/i386-solaris/pdfthumb
index 98fcf307468..cfb7d400fa8 100755..120000
--- a/Master/bin/i386-solaris/pdfthumb
+++ b/Master/bin/i386-solaris/pdfthumb
@@ -1,29 +1 @@
-#!/bin/sh
-#
-#  pdfthumb shell script file                 last update: 13 Sep 2002
-#
-#  minimal usage:
-#	pdfthumb input.pdf output.pdf
-#
-#  Note: input.pdf and output.pdf must be different.
-#	 GhostScript (gs) must me available to create the images.
-#	 Unfortunately it fails on some input files for unknown reasons.
-#
-#  It is assumed that you have at least Java 1.2.x installed
-#  and can call it with the command java. Otherwise specify the
-#  path for your Java runtime system.
-#
-#  Modify this script such that jarfile contains the full path
-#  of the pp4p.jar file.
-#
-#jarfile=/common/Java/lib/ppower4/pp4p.jar
-#
-#  If you use a web2c distribution, you can place pp4p.jar 
-#  e.g. into the directory texmf/java/ppower4, run mktexlsr,
-#  comment the assignment above and uncomment the assignment below.
-#  Thanks to Reinhard Kotucha for contributing this suggestion.
-#
-jarfile=`kpsewhich -progname=java -format='other binary files' pp4p.jar`
-# 
-#
-java -cp ${jarfile} de.tu_darmstadt.sp.pdftools.ThumbGen "$@"
+../../texmf-dist/scripts/ppower4/pdfthumb.texlua
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/pdftosrc b/Master/bin/i386-solaris/pdftosrc
index fb91c2e583c..6d738bed6f8 100755
--- a/Master/bin/i386-solaris/pdftosrc
+++ b/Master/bin/i386-solaris/pdftosrc
diff --git a/Master/bin/i386-solaris/pfb2pfa b/Master/bin/i386-solaris/pfb2pfa
index f63cf170937..e216976bc1f 100755
--- a/Master/bin/i386-solaris/pfb2pfa
+++ b/Master/bin/i386-solaris/pfb2pfa
diff --git a/Master/bin/i386-solaris/pk2bm b/Master/bin/i386-solaris/pk2bm
index 01111862348..d541728fa7a 100755
--- a/Master/bin/i386-solaris/pk2bm
+++ b/Master/bin/i386-solaris/pk2bm
diff --git a/Master/bin/i386-solaris/pktogf b/Master/bin/i386-solaris/pktogf
index fbdaef048b5..2c143f9496b 100755
--- a/Master/bin/i386-solaris/pktogf
+++ b/Master/bin/i386-solaris/pktogf
diff --git a/Master/bin/i386-solaris/pktype b/Master/bin/i386-solaris/pktype
index 721b8c2c883..69e0bc2a98a 100755
--- a/Master/bin/i386-solaris/pktype
+++ b/Master/bin/i386-solaris/pktype
diff --git a/Master/bin/i386-solaris/pltotf b/Master/bin/i386-solaris/pltotf
index 19a35a66aea..6888d0e9fc4 100755
--- a/Master/bin/i386-solaris/pltotf
+++ b/Master/bin/i386-solaris/pltotf
diff --git a/Master/bin/i386-solaris/pooltype b/Master/bin/i386-solaris/pooltype
index 243d59edd6a..ede7b519e43 100755
--- a/Master/bin/i386-solaris/pooltype
+++ b/Master/bin/i386-solaris/pooltype
diff --git a/Master/bin/i386-solaris/ps2pk b/Master/bin/i386-solaris/ps2pk
index 3cb09aa3bd6..2cbd76dbd50 100755
--- a/Master/bin/i386-solaris/ps2pk
+++ b/Master/bin/i386-solaris/ps2pk
diff --git a/Master/bin/i386-solaris/psbook b/Master/bin/i386-solaris/psbook
index d8fca5fa388..1a2a5fa81c1 100755
--- a/Master/bin/i386-solaris/psbook
+++ b/Master/bin/i386-solaris/psbook
diff --git a/Master/bin/i386-solaris/psnup b/Master/bin/i386-solaris/psnup
index f2801452a72..f5cd6f36196 100755
--- a/Master/bin/i386-solaris/psnup
+++ b/Master/bin/i386-solaris/psnup
diff --git a/Master/bin/i386-solaris/psresize b/Master/bin/i386-solaris/psresize
index bbc342d3fd2..71dfe3ebf6e 100755
--- a/Master/bin/i386-solaris/psresize
+++ b/Master/bin/i386-solaris/psresize
diff --git a/Master/bin/i386-solaris/psselect b/Master/bin/i386-solaris/psselect
index f68e769f62c..091e1ba2435 100755
--- a/Master/bin/i386-solaris/psselect
+++ b/Master/bin/i386-solaris/psselect
diff --git a/Master/bin/i386-solaris/pstops b/Master/bin/i386-solaris/pstops
index de9b2a184d8..3da0d812c27 100755
--- a/Master/bin/i386-solaris/pstops
+++ b/Master/bin/i386-solaris/pstops
diff --git a/Master/bin/i386-solaris/rungs b/Master/bin/i386-solaris/rungs
new file mode 120000
index 00000000000..3efeab3b3d4
--- /dev/null
+++ b/Master/bin/i386-solaris/rungs
@@ -0,0 +1 @@
+../../texmf/scripts/texlive/rungs.tlu
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/simpdftex b/Master/bin/i386-solaris/simpdftex
index 86f8ec0e623..e5d5d4218b3 100755
--- a/Master/bin/i386-solaris/simpdftex
+++ b/Master/bin/i386-solaris/simpdftex
@@ -2,8 +2,8 @@
 
 # Created by Gerben Wierda, May 2001
 # Rewritten by Gerben Wierda, January 2002
-
-# Modified by Joachim Kock, May 2003 
+# Modified by Joachim Kock, May 2003
+# Modified by Gerben Wierda, April 2007
 
 # COPYRIGHT Gerben Wierda 2001--2004
 # This file is free software. You are free to use this file in any way you like
@@ -111,19 +111,26 @@
 #		In the future, the old modes (altpdflatex and friends) through
 #		symlinks will disappear from my distribution, though they will
 #		still work.
+# 2007/05/07	Added dvipdfm support with compatibility with the patched version
+#		that is available on the net (simpdftex_dpmx)
+#		Changed version string to date-based string
+# 2007/08/09	Protected echo command against broken builtin versions by running
+#		/bin/echo explicitly. There may exist /bin/echo implementations
+#		that do not support -n and this script will have to be changed
+#		before it works on such a system
 
 # FEATURE: it seems -u +foo.map -u -foo.map does not work. So --extradvipsopts
 # cannot be used to remove a map from the standard list
 
 # BUG: Handling of file name extensions is not completely equialent to TeX
 # i.e. foo.bar.bla gets you foo.bar.pdf not foo.bar.bla.pdf
-# Give all extensions
+# Hint: Give all extensions explicitely on the command line
 
-version='$Revision: 2.18 $'
+version='20070809'
 calledas=`basename "$0"`
 if [ "${calledas}" = "simpdftex" ]
 then
-	argwithoutlead=`echo -n "$1"|sed 's/^--//'`
+	argwithoutlead=`/bin/echo -n "$1"|sed 's/^--//'`
 	if [ "$1" != "" -a "$1" = "${argwithoutlead}" ]
 	then
 		formatname="$1"
@@ -133,6 +140,8 @@ then
 fi
 argvbackup="$*"
 
+dviprogram="dvips" # Might be dvips, dvipdfm or dvipdfmx
+
 # maxpkdvipsopts: use only pfb's for real PS fonts, bitmaps are default for the others
 maxpkdvipsopts="-Ppk"
 # maxpfbdvipsopts: use as many pfb's as possible
@@ -159,33 +168,39 @@ distillerprog="ps2pdf13"
 distillerfilter="no"
 unset outdir
 debug="no"
+dvipdfmoptions=""
 
 usage()
 {
 	cat <<_eof_help
 This is simpdftex, $version
 
-Usage: simpdftex formatname
+Usage: simpdftex formatname [--mode modestring]
 	[--dvipsopts dvipsoptstring] [--extradvipsopts dvipsoptstring] [--pdf]
 	[--default] [--maxpk] [--maxpfb] [--extendedname] [--no-echo-version]
 	[--tex-path dir] [--keep-psfile] [--distiller-path dir] [--debug]
 	[--distiller prog] [--distiller-filter prog] [--help]
-	[--outdir dir] [--extratexopts texoptsstring] tex-or-dvi-file
+	[--outdir dir] [--extratexopts texoptsstring]
+	[--dvipdfmopts dvipdfmoptstring] tex-or-dvi-file
 
 simpdftex is a way to do pdf{e}{la}tex without having pdf{e}{la}tex. It needs a
-working TeX environment and ghostscript. Since pdf{e}{la}tex cannot handle
-insertion of .eps graphics, simpdftex gives an alternative. The output for both
-systems is comparable.
+working TeX environment and one of three ways to turn  DVI file into PDF:
+	- dvips + a distiller like ghostscript
+	- dvipdfm
+	- dvipdfmx
+Since pdf{e}{la}tex cannot handle insertion of .eps graphics, simpdftex gives an
+alternative when using dvips mode. The output for both systems is comparable.
 
 simpdftex compiles the file with {LA}TeX, processes the DVI file with dvips into
-PostScript and uses gs to produce pdf (with ps2pdf). There is finegrained
-control over the resulting filename and the options with which dvips produces
-the PostScript intermediary file.
+PostScript and uses gs to produce pdf (with ps2pdf). Or it uses dvipdfm or
+dvipdfmx to turn the DVI file into PDF. There is finegrained control over the
+resulting filename and the options with which dvips produces the PostScript
+intermediary file.
 
 Dvips will call Metafont to produce bitmaps or include PostScript .pfb files
 depending on the flags. See below.
 
-Default settings is normal name, maximal use of pfb's, just like pdf{la}tex,
+The default setting is normal name, maximal use of pfb's, just like pdf{la}tex,
 in other words, "pdftex file.tex" and "altpdftex file.tex" both produce an
 output file file.pdf. For pdftex, output options are controlled by pdftex.cfg,
 for altpdftext by config.ps (unless --pdf is given).
@@ -195,6 +210,15 @@ Arguments:
 		If a .dvi file is given, skip the TeX process. Otherwise, TeX
 		the input file, dvips the resulting dvi file and ps2pdf the
 		resulting ps file
+	--mode
+		Tell simpdftex how to go from DVI to PDF. There are three modes:
+		- dvips
+		- dvipdfm
+		- dvipdfmx
+	--dpx
+		Compatibility flag with simpdftex_dpmx. Equal to --mode dvipdfmx
+	--dpm
+		Compatibility flag with simpdftex_dpmx. Equal to --mode dvipdfm
 	--help
 		Display this message and exit
 	--no-echo-version
@@ -216,6 +240,7 @@ Arguments:
 		optimal results for the chosen printer.
 		For file contents (not name) equivalent to:
 		--dvipsopts "-Ppk"
+		Not yet functional for the other modes.
 	--maxpfb
 		Use PostScript pfb files whenever possible. This produces
 		optimal results for the screen.
@@ -223,6 +248,7 @@ Arguments:
 		--dvipsopts "-Poutline"
 		If any font is included as TeX pk bitmap, it is rendered
 		at the default resolution.
+		Not yet functional for the other modes.
 	--pdf
 		Select .pdfmode extension for the output file name if
 		--extendedname has been set. Use printer definition
@@ -268,11 +294,13 @@ Arguments:
 		--distiller=/usr/local/alternate/bin/ps2pdf
 		--distiller=pstill
 		Using this flag sets the distiller filter mode to off
+		This flag only makes sense in dvips mode
 	--distiller-filter prog
 		Use a distiller executable or executable script which is
 		called with the PS input as standard input and which writes
 		the PDF output to standard output. E.g.:
 		--distiller-filter=u-psbuild
+		This flag only makes sense in dvips mode
 	--distiller-path
 		Give path needed by the distiller binary. This path is added
 		to the begin of you PATH environment before the distiller is
@@ -282,6 +310,12 @@ Arguments:
 		/usr/local/bin/ps2pdf find another gs than intended. By giving
 		an empty path, the path is not changed before the distiller
 		program is run. The default is empty.
+		This flag only makes sense in dvips mode
+	--dvipdfmopts
+		Give arbitrary arguments to dvipdfm or dvipdfmx, e.g.
+		--dvipdfmopts "-c"
+		Sets extension for --extendedfilename to .custom. --dvipdfmopts
+		overrides other flags that set dvipdfmopts.
 	--outdir dir
 		Write files here *if* our current directory is unwritable. This
 		mimicks the TEXMFOUTPUT environment variable of TeX, but
@@ -313,6 +347,15 @@ do
 		outputpostfix=".custom"
 		dvipsoptions="$1"
 		;;
+	--dvipdfmopts)
+		outputpostfix=".custom"
+		shift
+		dvipdfmoptions="$1"
+		;;
+        --dvipdfopts)	# Compatibility with simpdftex_dpmx
+		shift
+		dvipdfmoptions="$1"
+		;;
 	--extradvipsopts)
 		shift
 		extradvipsoptions="$1"
@@ -360,6 +403,16 @@ do
 		distillerprog="$1"
 		distillerfilter="no"
 		;;
+	--mode)
+		shift
+		if [ "$1" = "dvips" -o "$1" = "dvipdfm" -o "$1" = "dvipdfmx" ]
+		then
+			dviprogram="$1"
+		else
+			/bin/echo "Unknown mode $1"
+			exit 1
+		fi
+		;;
 	--outdir)
 		shift
 		export TEXINPUTS=`pwd`:`kpsewhich --expand-var '$TEXINPUTS'`
@@ -376,8 +429,14 @@ do
 	--no-echo-version)
 		echoversion="no"
 		;;
+        --dpx)	# Compatibility with simpdftex_dpmx
+                dviprogram="dvipdfmx"
+                ;;
+        --dpm)	# Compatibility with simpdftex_dpmx
+                dviprogram="dvipdfm"
+                ;;
 	--*)
-		echo "Unknown option $1"
+		/bin/echo "Unknown option $1"
 		exit 1;;
 	"")
 		;;
@@ -389,15 +448,56 @@ done
 
 if [ "${echoversion}" = "yes" -a "${debug}" = "no" ]
 then
-	echo "### This is $0, Version ${version}"
+	/bin/echo "### This is $0, Version ${version}"
 fi
 
 if [ "${debug}" = "yes" ]
 then
-	echo "##### This is $0, Version ${version}"
-	echo "##### Arguments: ${argvbackup}"
+	/bin/echo "##### This is $0, Version ${version}"
+	/bin/echo "##### Arguments: ${argvbackup}"
 fi
 
+run_dvipdfm()
+{
+	/bin/echo "### ${texpath}/${dviprogram} ${dvipdfmoptions} -o ${pdffile} ${dvifile}"
+	"${texpath}/${dviprogram}" ${dvipdfmoptions} -o "${pdffile}" "${dvifile}" || \
+		{ /bin/echo "### FAILED to generate ${pdffile} (${status})"; \
+		  exit 1; }
+}
+
+run_dvips()
+{
+	/bin/echo "### ${texpath}/${dviprogram} -R ${dvipsoptions} ${extradvipsoptions} -o ${psfile} ${dvifile}"
+	"${texpath}/${dviprogram}" -R ${dvipsoptions} ${extradvipsoptions} -o "${psfile}" "${dvifile}" || \
+		{ /bin/echo "### FAILED to generate ${psfile} (${status})"; \
+		  exit 1; }
+
+	if [ "${keeppsfile}" = "yes" ]; then
+		/bin/echo "### Saving intermediary ps file ${psfile} as ${savedpsfile}"
+		/bin/cp "${psfile}" "${savedpsfile}" || \
+			/bin/echo "### FAILED to save ${psfile} (${status})"
+	fi
+
+	if [ "${distillerpath}" != "" ]; then
+		PATH="${distillerpath}:${PATH}";export PATH
+		if [ "${debug}" = "yes" ]; then
+			/bin/echo "##### PATH set to ${PATH}"
+		fi
+	fi
+
+	if [ "${distillerfilter}" = "yes" ]; then
+		/bin/echo "### ${distillerprog} <${psfile} >${pdffile}"
+		"${distillerprog}" <"${psfile}" >"${pdffile}" || \
+			{ /bin/echo "### FAILED to generate ${pdffile} (${status})"
+			  exit 1; }
+	else
+		/bin/echo "### ${distillerprog} ${psfile} ${pdffile}"
+		"${distillerprog}" "${psfile}" "${pdffile}" || \
+			{ /bin/echo "### FAILED to generate ${pdffile} (${status})"
+			  exit 1; }
+	fi
+}
+
 cleanup()
 {
 	if [ "${tmpdir}" != "" -a "${debug}" = "no" ]
@@ -418,7 +518,7 @@ main()
 {
 	if [ "${file}" = "" ]
 	then
-		echo "simpdftex Empty argument: tex-or-dvi-file-name"
+		/bin/echo "simpdftex Empty argument: tex-or-dvi-file-name"
 		exit 1
 	fi
 
@@ -431,8 +531,8 @@ main()
 
 	startwithdvi="no"
 	basename=`basename "${file}"`
-	nosuffixbasename=`echo -n ${basename}|sed 's/\.[^.]*$//'`
-	nodvisuffixbasename=`echo -n ${basename}|sed 's/\.[dD][vV][iI]$//'`
+	nosuffixbasename=`/bin/echo -n ${basename}|sed 's/\.[^.]*$//'`
+	nodvisuffixbasename=`/bin/echo -n ${basename}|sed 's/\.[dD][vV][iI]$//'`
 	if [ "${nodvisuffixbasename}" = "${nosuffixbasename}" -a \
 		"${basename}" != "${nosuffixbasename}" ]
 	then
@@ -454,14 +554,14 @@ main()
 
 			fi
 		else
-			echo "### Cannot write in current directory and no redirect found. Bailing out..."
+			/bin/echo "### Cannot write in current directory and no redirect found. Bailing out..."
 			exit 1
 		fi
 	fi
 
 	# Assume the command is called altpdf* where the rest is the actual tex
 	# program to be run
-	texprogram=`echo ${calledas}|sed 's/altpdf//'`
+	texprogram=`/bin/echo ${calledas}|sed 's/altpdf//'`
 	if [ "${texprogram}" = "omega" -o "${texprogram}" = "lambda" ]
 	then
 		dvips="odvips"
@@ -492,72 +592,56 @@ main()
 
 	if [ "${debug}" = "yes" ]
 	then
-		echo "##### TeX file: $texfile"
-		echo "##### DVI file: $dvifile"
-		echo "##### PS file: $psfile"
-		echo "##### Saved PS file: $savedpsfile"
-		echo "##### Created PDF file: $pdffile"
-		echo "##### Final PDF file: $savedpdffile"
-		echo "##### Environment:"
+		/bin/echo "##### TeX file: $texfile"
+		/bin/echo "##### DVI file: $dvifile"
+		if [ "${dviprogram}" = "dvips" ]
+		then
+			/bin/echo "##### PS file: $psfile"
+			/bin/echo "##### Saved PS file: $savedpsfile"
+		fi
+		/bin/echo "##### Created PDF file: $pdffile"
+		/bin/echo "##### Final PDF file: $savedpdffile"
+		/bin/echo "##### Environment:"
 		env | sed 's/^/##### /g'
 	fi
 
 	if [ "${startwithdvi}" = "yes" ]; then
-		echo "### Skipping ${texprogram} ${texfile} [dvi->pdf only]"
+		/bin/echo "### Skipping ${texprogram} ${texfile} [dvi->pdf only]"
 	else
-		echo "### ${texpath}/${texprogram} ${texfile}"
+		/bin/echo "### ${texpath}/${texprogram} ${texfile}"
 		"${texpath}/${texprogram}" ${extratexoptions} "${texfile}" || \
-			echo "### WARNING: TeX returned non zero exit status ${status}"
-	fi
-
-	echo "### ${texpath}/${dvips} -R ${dvipsoptions} ${extradvipsoptions} -o ${psfile} ${dvifile}"
-	"${texpath}/${dvips}" -R ${dvipsoptions} ${extradvipsoptions} -o "${psfile}" "${dvifile}" || \
-		{ echo "### FAILED to generate ${psfile} (${status})"; \
-		  exit 1; }
-
-	if [ "${keeppsfile}" = "yes" ]; then
-		echo "### Saving intermediary ps file ${psfile} as ${savedpsfile}"
-		/bin/cp "${psfile}" "${savedpsfile}" || \
-			echo "### FAILED to save ${psfile} (${status})"
+			/bin/echo "### WARNING: TeX returned non zero exit status ${status}"
 	fi
 
-	if [ "${distillerpath}" != "" ]; then
-		PATH="${distillerpath}:${PATH}";export PATH
-		if [ "${debug}" = "yes" ]; then
-			echo "##### PATH set to ${PATH}"
-		fi
-	fi
-
-	if [ "${distillerfilter}" = "yes" ]; then
-		echo "### ${distillerprog} <${psfile} >${pdffile}"
-		"${distillerprog}" <"${psfile}" >"${pdffile}" || \
-			{ echo "### FAILED to generate ${pdffile} (${status})"
-			  exit 1; }
-	else
-		echo "### ${distillerprog} ${psfile} ${pdffile}"
-		"${distillerprog}" "${psfile}" "${pdffile}" || \
-			{ echo "### FAILED to generate ${pdffile} (${status})"
-			  exit 1; }
-	fi
+	case "${dviprogram}" in
+	"dvips")
+		run_dvips;;
+	"dvipdfm")
+		run_dvipdfm;;
+	"dvipdfmx")
+		run_dvipdfm;;
+	*)
+		/bin/echo "### ERROR: wrong dvipdf mode ${dviprogram}"
+	esac
 
-	echo "### Copying/moving pdf file ${pdffile} to ${savedpdffile}"
+	/bin/echo "### Copying/moving pdf file ${pdffile} to ${savedpdffile}"
 	/bin/cp "${pdffile}" "${savedpdffile}.${tmpext}" || \
-		echo "### FAILED to copy ${pdffile} (${status})"
+		/bin/echo "### FAILED to copy ${pdffile} (${status})"
 	/bin/rm -f "${savedpdffile}"
 	/bin/mv "${savedpdffile}.${tmpext}" "${savedpdffile}" || \
-		echo "### FAILED to rename ${savedpdffile}.${tmpext} (${status})"
+		/bin/echo "### FAILED to rename ${savedpdffile}.${tmpext} (${status})"
 
 	if [ "${startwithdvi}" = "yes" ]; then
 		if [ "${keeppsfile}" = "yes" ]; then
-			echo "### Succesfully generated ${savedpdffile} and ${savedpsfile}"
+			/bin/echo "### Succesfully generated ${savedpdffile} and ${savedpsfile}"
 		else
-			echo "### Succesfully generated ${savedpdffile}"
+			/bin/echo "### Succesfully generated ${savedpdffile}"
 		fi
 	else
 		if [ "${keeppsfile}" = "yes" ]; then
-			echo "### Succesfully generated ${dvifile}, ${savedpdffile} and ${savedpsfile}"
+			/bin/echo "### Succesfully generated ${dvifile}, ${savedpdffile} and ${savedpsfile}"
 		else
-			echo "### Succesfully generated ${dvifile} and ${savedpdffile}"
+			/bin/echo "### Succesfully generated ${dvifile} and ${savedpdffile}"
 		fi
 	fi
 
diff --git a/Master/bin/i386-solaris/sjisconv b/Master/bin/i386-solaris/sjisconv
index 39d300d06d1..7bf707e12c7 100755
--- a/Master/bin/i386-solaris/sjisconv
+++ b/Master/bin/i386-solaris/sjisconv
diff --git a/Master/bin/i386-solaris/synctex b/Master/bin/i386-solaris/synctex
new file mode 100755
index 00000000000..76fed7414f9
--- /dev/null
+++ b/Master/bin/i386-solaris/synctex
diff --git a/Master/bin/i386-solaris/t1ascii b/Master/bin/i386-solaris/t1ascii
index f5038cf08f8..70b21cd0732 100755
--- a/Master/bin/i386-solaris/t1ascii
+++ b/Master/bin/i386-solaris/t1ascii
diff --git a/Master/bin/i386-solaris/t1asm b/Master/bin/i386-solaris/t1asm
index aa29886d8ed..3a0d50514be 100755
--- a/Master/bin/i386-solaris/t1asm
+++ b/Master/bin/i386-solaris/t1asm
diff --git a/Master/bin/i386-solaris/t1binary b/Master/bin/i386-solaris/t1binary
index 028512cb1f8..7548645b62a 100755
--- a/Master/bin/i386-solaris/t1binary
+++ b/Master/bin/i386-solaris/t1binary
diff --git a/Master/bin/i386-solaris/t1disasm b/Master/bin/i386-solaris/t1disasm
index c2b6d71238a..70866d1a3fe 100755
--- a/Master/bin/i386-solaris/t1disasm
+++ b/Master/bin/i386-solaris/t1disasm
diff --git a/Master/bin/i386-solaris/t1dotlessj b/Master/bin/i386-solaris/t1dotlessj
index 3fcd000f076..afee16426ed 100755
--- a/Master/bin/i386-solaris/t1dotlessj
+++ b/Master/bin/i386-solaris/t1dotlessj
diff --git a/Master/bin/i386-solaris/t1lint b/Master/bin/i386-solaris/t1lint
index 9c3bd503cfd..a62d52bdd5e 100755
--- a/Master/bin/i386-solaris/t1lint
+++ b/Master/bin/i386-solaris/t1lint
diff --git a/Master/bin/i386-solaris/t1mac b/Master/bin/i386-solaris/t1mac
index a3d7d4d171b..9b915a472f9 100755
--- a/Master/bin/i386-solaris/t1mac
+++ b/Master/bin/i386-solaris/t1mac
diff --git a/Master/bin/i386-solaris/t1reencode b/Master/bin/i386-solaris/t1reencode
index 48ff98d6337..a27bd61c3d8 100755
--- a/Master/bin/i386-solaris/t1reencode
+++ b/Master/bin/i386-solaris/t1reencode
diff --git a/Master/bin/i386-solaris/t1testpage b/Master/bin/i386-solaris/t1testpage
index fc12323fac0..2bd1beceac3 100755
--- a/Master/bin/i386-solaris/t1testpage
+++ b/Master/bin/i386-solaris/t1testpage
diff --git a/Master/bin/i386-solaris/t1unmac b/Master/bin/i386-solaris/t1unmac
index a1f34d86d36..6249e675b99 100755
--- a/Master/bin/i386-solaris/t1unmac
+++ b/Master/bin/i386-solaris/t1unmac
diff --git a/Master/bin/i386-solaris/t4ht b/Master/bin/i386-solaris/t4ht
index d868bec4916..53ae6bdf888 100755
--- a/Master/bin/i386-solaris/t4ht
+++ b/Master/bin/i386-solaris/t4ht
diff --git a/Master/bin/i386-solaris/tangle b/Master/bin/i386-solaris/tangle
index f8e000781f7..38b69e47db8 100755
--- a/Master/bin/i386-solaris/tangle
+++ b/Master/bin/i386-solaris/tangle
diff --git a/Master/bin/i386-solaris/tcdialog b/Master/bin/i386-solaris/tcdialog
index 6037c578782..de17dfe70f6 100755
--- a/Master/bin/i386-solaris/tcdialog
+++ b/Master/bin/i386-solaris/tcdialog
diff --git a/Master/bin/i386-solaris/tex b/Master/bin/i386-solaris/tex
index f964b261002..1c5491ea166 100755
--- a/Master/bin/i386-solaris/tex
+++ b/Master/bin/i386-solaris/tex
diff --git a/Master/bin/i386-solaris/tex2xindy b/Master/bin/i386-solaris/tex2xindy
new file mode 100755
index 00000000000..28b43ff7f77
--- /dev/null
+++ b/Master/bin/i386-solaris/tex2xindy
diff --git a/Master/bin/i386-solaris/tex4ht b/Master/bin/i386-solaris/tex4ht
index 0a5050b5529..72c36a0866f 100755
--- a/Master/bin/i386-solaris/tex4ht
+++ b/Master/bin/i386-solaris/tex4ht
diff --git a/Master/bin/i386-solaris/texdoc b/Master/bin/i386-solaris/texdoc
index a3d1a8639ae..821fdbaa30e 100755..120000
--- a/Master/bin/i386-solaris/texdoc
+++ b/Master/bin/i386-solaris/texdoc
@@ -1,207 +1 @@
-#!/bin/sh
-# $Id: texdoc 6434 2008-01-28 09:34:08Z martin $
-#
-# Thomas Esser, David Aspinall, Simon Wilkinson.
-# Public domain.
-#
-# Simple script to attempt to find documentation for tex files.
-# Uses kpsewhich to find a .dvi, .pdf or .ps file along the
-# 'TeX system documentation' ($TEXDOCS, default: $TEXMF/doc) search path.
-#
-# Original version by David Aspinall <da@dcs.ed.ac.uk>
-#
-# This version rewritten for use with bash 2 and teTeX under Linux by
-# Simon Wilkinson <sxw@dcs.ed.ac.uk>
-#
-# Changes for web2c-7.2 resp. teTeX-0.9 and portability fixes by
-# Thomas Esser <te@dbs.uni-hannover.de>, Jun 14 1998
-#
-# Support for compressed documentation implemented by adopting changes
-# made by debian. Thomas Esser, Dec. 2004.
-
-test -f /bin/sh5 && test -z "$RUNNING_SH5" \
-  && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
-  && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; }
-unset RUNNING_SH5
-
-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
-
-needsCleanup=false
-progname=texdoc
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
-
-###############################################################################
-# setupTmpDir()
-#   set up a temp directory and a trap to remove it
-###############################################################################
-setupTmpDir()
-{
-  $needsCleanup && return
-
-  trap 'cleanup --force' 1 2 3 7 13 15
-  needsCleanup=true
-  mkdir "$tmpdir" || abort "could not create directory \`$tmpdir'"
-}
-
-###############################################################################
-# abort(errmsg) 
-#   print `errmsg' to stderr and exit with error code 1
-###############################################################################
-abort()
-{   
-  warn "$progname: $1."
-  cleanup
-  (exit 1)
-  exit 1
-}                              
-
-###############################################################################
-# cleanup()
-#   clean up the temp area
-###############################################################################
-cleanup()
-{
-  case $1 in
-    --force)
-        $needsCleanup && test -n "$tmpdir" && test -d "$tmpdir" \
-          && { rm -f "$tmpdir"/*; cd /; rmdir "$tmpdir"; }
-        ;;
-    *)  # directory might not be empty if some other viewer is still
-        # running, so be quiet about it
-        rmdir $tmpdir >/dev/null 2>&1;;
-  esac
-}
-
-
-# Viewing programs, according to filename extension.  (You can
-# override or add to them by setting environment variables).
-# MacOS X: does not have X11 by default, so give dvi a low priority
-case `(uname -s) 2>/dev/null` in
-  Darwin)
-	: ${TEXDOCVIEW_dvi='(open %s >/dev/console 2>&1 || xdvi %s &) || echo "Method for opening %s did not work"'}
-	: ${TEXDOCVIEW_ps='open %s'}
-	: ${TEXDOCVIEW_pdf='open %s'}
-	: ${TEXDOCVIEW_html='open %s'}
-	: ${TEXDOCVIEW_txt="open -a TextEdit.app %s"}
-	: ${TEXDOCVIEW_="open -a TextEdit.app %s"} # no extension, default to pager
-        extlist='.pdf .ps .txt .dvi .html'
-	;;
-  *)
-	: ${TEXDOCVIEW_dvi='(xdvi %s) &'}
-	: ${TEXDOCVIEW_pdf='(acroread %s) &'}
-	: ${TEXDOCVIEW_ps='(gv %s) &'}
-        : ${TEXDOCVIEW_html='firefox -remote openURL'"'(%s)'"' 2>/dev/null || firefox %s &'}
-	: ${TEXDOCVIEW_txt="${PAGER-more} %s"}
-	: ${TEXDOCVIEW_="${PAGER-more} %s"} # no extension, default to pager
-        extlist='.dvi .dvi.gz .dvi.bz2 .pdf .pdf.gz .pdf.bz2 .ps .ps.gz .ps.bz2 .txt .txt.gz .txt.bz2 .html'
-
-        # Commands run to uncompress files, according to filename extension.
-        : ${TEXDOCUNZIP_gz='gzip -d -c'}
-        : ${TEXDOCUNZIP_bz2='bzip2 -d -c'}
-	;;
-esac
-
-mode=viewer
-help='Usage: texdoc [OPTION]... [NAME]...
-  Search for NAME in the TeX documentation and start a viewer.
-
-  --help        show this help
-  -v		verbose mode: show viewer command
-  -l            just list all matching files. Do not start a viewer.
-  -s            search the disk. remaining arguments will be passed
-                as egrep patterns to filter the find output.'
-
-verbosemode=false
-while 
-  case $1 in
-     -s)     mode=search; shift; break;;
-     -l)     mode=list;;
-     -v)     verbosemode=true;;
-     *-help)
-             echo "$help" >&2
-             exit 1;;
-     -*)     echo "texdoc: option $1 not recognized" 1>&2;;
-      *)     break;;
-  esac
-do shift; done
-
-case $# in
-  0)
-    echo "$help" >&2
-    exit 1
-    ;;
-esac
-
-for name
-do
-  case $mode in
-    search)
-      find `kpsewhich --expand-path='$TEXDOCS' | tr : ' '` -type f -print |
-        egrep $name
-      continue
-      ;;
-  esac
-
-  case $name in
-    texdoc)
-      man texdoc; continue;;
-  esac
-
-  found=false
-  for ext in "" $extlist; do
-
-    filename=`kpsewhich -format='TeX system documentation' $name$ext 2>/dev/null`
-    test -z "$filename" && continue
-    found=true
-
-    if test $mode = list; then
-      echo $filename
-    else
-      dir=`echo $filename | sed 's%/[^/]*$%%'`
-      ext=`echo $filename | sed -n 's%.*\.\([^/]*\)$%\1%p'`
-
-      eval uncompress="\$TEXDOCUNZIP_$ext"
-      if test -n "$uncompress"
-      then
-        ext=`echo $filename | sed -e "s|\\.$ext\$||" | sed 's%.*\.%%'`
-      fi
-      viewer=\$"TEXDOCVIEW_$ext"
-      if test -n "$uncompress"; then
-        src=`echo "$filename" | sed -e 's%.*/%%' -e 's%\.[^.]*$%%'`
-
-        # only one viewer per file, if the same file is given more
-        # than once
-        test -f "$tmpdir/$src" && break
-
-        setupTmpDir
-        eval "$uncompress $filename > $tmpdir/$src"
-        filename=$tmpdir/$src
-        viewer=`eval echo $viewer | sed -e "s|%s|$filename; rm -f $filename; cleanup|"`
-      else
-        viewer=`eval echo $viewer | sed -e "s|%s|$filename|g"`
-      fi
-
-      if test -z "$viewer"
-      then 
-        echo "Don't know how to view file type $ext" 1>&2
-        echo "(matching file was $filename)" 1>&2
-      else 
-        $verbosemode && echo $viewer
-        test -n "$dir" && test -d "$dir" && cd "$dir"
-        eval $viewer
-        break     # just stop after the first usable extension
-      fi
-    fi
-
-  done
-  $found || echo "Can't find documentation for \`$name'" 1>&2
-done
-
-cleanup
-(exit 0)
-exit 0
+../../texmf/scripts/texlive/texdoc.tlu
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/texindex b/Master/bin/i386-solaris/texindex
index 4eff0ab555d..e7acb8634fa 100755
--- a/Master/bin/i386-solaris/texindex
+++ b/Master/bin/i386-solaris/texindex
diff --git a/Master/bin/i386-solaris/texindy b/Master/bin/i386-solaris/texindy
new file mode 120000
index 00000000000..e9a29f8828c
--- /dev/null
+++ b/Master/bin/i386-solaris/texindy
@@ -0,0 +1 @@
+../../texmf/scripts/xindy/texindy.pl
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/texlinks b/Master/bin/i386-solaris/texlinks
index bfe1b75db16..48657905634 100755
--- a/Master/bin/i386-solaris/texlinks
+++ b/Master/bin/i386-solaris/texlinks
@@ -6,6 +6,7 @@
 # the lines given in fmtutil.cnf.
 
 # History:
+#   (Further changes in ChangeLog.)
 #   Tue Oct  9 14:23:01 BST 2007
 #      Added unlink option (-u) to aid OpenBSD package uninstall
 #      Edd Barrett <vext01@gmail.com>
@@ -13,7 +14,7 @@
 #      remove special cases for csplain,cslatex,pdfcslatex,pdfcsplain
 #   Fr Apr  8 19:15:05 CEST 2005
 #      cleanup now has an argument for the return code
-#   So Mär 27 18:52:06 CEST 2005
+#   So Mar 27 18:52:06 CEST 2005
 #       honor $TMPDIR, $TEMP and $TMP, not just $TMP
 #   Mon May 10 20:52:48 CEST 2004
 #       kpseaccess instead of access
@@ -38,8 +39,7 @@ export PATH
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 cnf=fmtutil.cnf   # name of the config file
-version=1192147136 # seconds since `00:00:00 1970-01-01 UTC'
-                   # date '+%s' (with GNU date)
+version=20080528.1847 # utc timestamp 
 progname=texlinks
 
 usage='Usage: texlinks [OPTION]... [DIRECTORY]...
@@ -58,8 +58,9 @@ Mandatory arguments to long options are mandatory for short options too.
   -u, --unlink	       remove symlinks created by texlinks
 
 The DIRECTORY arguments are an optional list of directories in which to
-operate.  If no directories are specified the list of directories
-depends on the --multiplatform option.
+operate.  If no directories are specified and --multiplatform is
+likewise not specified, the directory of this script itself is used.
+With --multiplatform, all child dirs of an upper-level bin/ dir are used.
 
 Report bugs to tex-k@tug.org.'
 
@@ -149,6 +150,7 @@ install_link()
 
   case $src in
     */cont-??|*/metafun|*/mptopdf)
+      # context includes wrapper scripts that create/run these.
       verbose_echo "skipped ConTeXtish symlink $src -> $dest (special case)"
       ;;
     *)
diff --git a/Master/bin/i386-solaris/texlua b/Master/bin/i386-solaris/texlua
new file mode 120000
index 00000000000..8d727021583
--- /dev/null
+++ b/Master/bin/i386-solaris/texlua
@@ -0,0 +1 @@
+luatex
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/tftopl b/Master/bin/i386-solaris/tftopl
index a77611ca58f..a3fe70f7d61 100755
--- a/Master/bin/i386-solaris/tftopl
+++ b/Master/bin/i386-solaris/tftopl
diff --git a/Master/bin/i386-solaris/tie b/Master/bin/i386-solaris/tie
index 796b9e5fa5b..9d30a9d9834 100755
--- a/Master/bin/i386-solaris/tie
+++ b/Master/bin/i386-solaris/tie
diff --git a/Master/bin/i386-solaris/ttf2afm b/Master/bin/i386-solaris/ttf2afm
index ee7fa1c1c47..ef39a4d5891 100755
--- a/Master/bin/i386-solaris/ttf2afm
+++ b/Master/bin/i386-solaris/ttf2afm
diff --git a/Master/bin/i386-solaris/ttf2pk b/Master/bin/i386-solaris/ttf2pk
index 8b6c143ca3f..39d3b49c326 100755
--- a/Master/bin/i386-solaris/ttf2pk
+++ b/Master/bin/i386-solaris/ttf2pk
diff --git a/Master/bin/i386-solaris/ttf2tfm b/Master/bin/i386-solaris/ttf2tfm
index 35d185a7be3..60cd8568047 100755
--- a/Master/bin/i386-solaris/ttf2tfm
+++ b/Master/bin/i386-solaris/ttf2tfm
diff --git a/Master/bin/i386-solaris/ttftotype42 b/Master/bin/i386-solaris/ttftotype42
index 582ea0d6b80..2989701bdc7 100755
--- a/Master/bin/i386-solaris/ttftotype42
+++ b/Master/bin/i386-solaris/ttftotype42
diff --git a/Master/bin/i386-solaris/vftovp b/Master/bin/i386-solaris/vftovp
index e5904856df4..1f7a17a7fed 100755
--- a/Master/bin/i386-solaris/vftovp
+++ b/Master/bin/i386-solaris/vftovp
diff --git a/Master/bin/i386-solaris/vptovf b/Master/bin/i386-solaris/vptovf
index f905beefed0..4c925621bb4 100755
--- a/Master/bin/i386-solaris/vptovf
+++ b/Master/bin/i386-solaris/vptovf
diff --git a/Master/bin/i386-solaris/weave b/Master/bin/i386-solaris/weave
index 35bd7fe2744..da75116b308 100755
--- a/Master/bin/i386-solaris/weave
+++ b/Master/bin/i386-solaris/weave
diff --git a/Master/bin/i386-solaris/xdvi-xaw.bin b/Master/bin/i386-solaris/xdvi-xaw.bin
index 6dffee88e77..e7a77971276 100755
--- a/Master/bin/i386-solaris/xdvi-xaw.bin
+++ b/Master/bin/i386-solaris/xdvi-xaw.bin
diff --git a/Master/bin/i386-solaris/xdvipdfmx b/Master/bin/i386-solaris/xdvipdfmx
index d1d5325b4c0..2cf7e615d27 100755
--- a/Master/bin/i386-solaris/xdvipdfmx
+++ b/Master/bin/i386-solaris/xdvipdfmx
diff --git a/Master/bin/i386-solaris/xetex b/Master/bin/i386-solaris/xetex
index d1e274ce213..ae425546305 100755
--- a/Master/bin/i386-solaris/xetex
+++ b/Master/bin/i386-solaris/xetex
diff --git a/Master/bin/i386-solaris/xindy b/Master/bin/i386-solaris/xindy
new file mode 120000
index 00000000000..ddaf92f5c89
--- /dev/null
+++ b/Master/bin/i386-solaris/xindy
@@ -0,0 +1 @@
+../../texmf/scripts/xindy/xindy.pl
+\ No newline at end of file
diff --git a/Master/bin/i386-solaris/xindy.mem b/Master/bin/i386-solaris/xindy.mem
new file mode 100644
index 00000000000..ca23be5ffcf
--- /dev/null
+++ b/Master/bin/i386-solaris/xindy.mem
diff --git a/Master/bin/i386-solaris/xindy.run b/Master/bin/i386-solaris/xindy.run
new file mode 100755
index 00000000000..4a25bcf3ac6
--- /dev/null
+++ b/Master/bin/i386-solaris/xindy.run
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index e9890c22bb0..54292a4a7f4 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -105,6 +105,9 @@ for tlname in $tlnames; do
     default_bin_loc=$download_loc;;
     # too many subdirs, extract bin manually.
     #http://students.dec.bmth.ac.uk/ebarrett/files/texlive2008_OpenBSD_bin_rc1.tgz -O $default_bin_loc;;
+   i386-solaris)
+    default_bin_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.lzma
+    $download http://193.92.244.84/~apostolo/i386-pc-solaris2.10.tar.lzma -O $default_bin_loc;;
    powerpc-darwin|i386-darwin)
     default_bin_loc=$download_loc
     $download http://www.uoregon.edu/~koch/$tlname.tar.gz -O $default_bin_loc;;
@@ -126,7 +129,12 @@ for tlname in $tlnames; do
   if test -f "$bin_loc"; then
     srcdir=$tmpdir/unpacked
     mkdir $srcdir
-    (cd $srcdir && tar xf $bin_loc) || exit 1
+    if echo "$bin_loc" | grep 'lzma$' >/dev/null; then
+      lzma=--lzma  # tar xf doesn't quite know lzma yet
+    else
+      lzma=
+    fi
+    (cd $srcdir && tar xf $bin_loc $lzma) || exit 1
     
   elif test -d "$bin_loc"; then
     srcdir=$bin_loc  # already have a directory
author	Karl Berry <karl@freefriends.org>	2008-06-04 18:30:37 +0000
committer	Karl Berry <karl@freefriends.org>	2008-06-04 18:30:37 +0000
commit	b6d68988659b77f8fe2fd7ce56f40d29ac81f6eb (patch)
tree	a1e589387ef4f4a5a6846102b65100c1d5d245a8
parent	79e3831f6773e021d2e76c753cd156721ddd7621 (diff)