add universal-darwin binaries and support

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

6 files changed, 9 insertions, 9 deletions

diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 3271e7b9ca6..45a60a17389 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -181,7 +181,9 @@ sub platform {
       foreach my $os (@OSs) {
         $OS=$os if $guessed_platform=~/$os/;
       }
-      if ($CPU=~/^i.86$/) {
+      if ($OS eq "darwin") {
+        $CPU = "universal"; # TL provides universal binaries
+      } elsif ($CPU=~/^i.86$/) {
         $CPU=~s/i.86/i386/;
       }
       unless (defined $OS) {
@@ -223,6 +225,7 @@ sub platform_desc {
     'powerpc-linux'  => 'PowerPC with GNU/Linux',
     'sparc-linux'    => 'Sparc with GNU/Linux',
     'sparc-solaris'  => 'Sparc with Solaris',
+    'universal-darwin' => 'universal binaries for MacOSX/Darwin',
     'win32'          => 'Windows',
     'x86_64-linux'   => 'x86_64 with GNU/Linux'
       );
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index d8f2ae6faa2..beafedff830 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -111,7 +111,7 @@ for tlname in $tlnames; do
    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)
+   *-darwin)
     default_bin_loc=$download_loc
     $download http://www.uoregon.edu/~koch/$tlname.tar.gz -O $default_bin_loc;;
    powerpc-linux)
diff --git a/Master/tlpkg/installer/lzma/lzma.universal-darwin b/Master/tlpkg/installer/lzma/lzma.universal-darwin
new file mode 100755
index 00000000000..961d374d944
--- /dev/null
+++ b/Master/tlpkg/installer/lzma/lzma.universal-darwin
diff --git a/Master/tlpkg/installer/lzma/lzmadec.universal-darwin b/Master/tlpkg/installer/lzma/lzmadec.universal-darwin
new file mode 100755
index 00000000000..897487cb4e0
--- /dev/null
+++ b/Master/tlpkg/installer/lzma/lzmadec.universal-darwin
diff --git a/Master/tlpkg/installer/wget/wget.universal-darwin b/Master/tlpkg/installer/wget/wget.universal-darwin
new file mode 100755
index 00000000000..56f879e1bc1
--- /dev/null
+++ b/Master/tlpkg/installer/wget/wget.universal-darwin
diff --git a/Master/tlpkg/tlpsrc/xetex.tlpsrc b/Master/tlpkg/tlpsrc/xetex.tlpsrc
index 95e677b822d..12300476570 100644
--- a/Master/tlpkg/tlpsrc/xetex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xetex.tlpsrc
@@ -4,13 +4,10 @@ category TLCore
 execute BuildFormat xetex
 runpattern f texmf/fmtutil/format.xetex.cnf
 #
-# these are only needed for darwin only.
-# use the arch specific patterns to get rid of many warning of not hit patterns
-#binpattern f bin/${ARCH}/xdv2pdf
-binpattern f/powerpc-darwin bin/powerpc-darwin/T1Wrap
-binpattern f/i386-darwin bin/i386-darwin/T1Wrap
-binpattern f/powerpc-darwin bin/powerpc-darwin/xdv2pdf
-binpattern f/i386-darwin bin/i386-darwin/xdv2pdf
+# these are only needed for darwin only, so 
+# use  arch specific patterns to avoid warnings about not-hit patterns.
+binpattern f/universal-darwin bin/universal-darwin/T1Wrap
+binpattern f/universal-darwin bin/universal-darwin/xdv2pdf
 #
 docpattern d texmf-dist/doc/xetex/base
 runpattern d texmf-dist/fonts/misc/xetex/fontmapping/base