(platform_desc): explicit macosx version numbers.

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

1 files changed, 10 insertions, 9 deletions

diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 31bb0ba818f..6f25d5868e9 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -299,14 +299,15 @@ sub platform_name {
     # (BTW, uname -r numbers are larger by 4 than the minor version.
     # We don't use uname numbers here.)
     #
-    my $mactex_version = 10;  # this will change in the future.
+    my $mactex_darwin = 10;  # the minor 10; this will change in the future.
     #
     # Most robust approach is apparently to check sw_vers (os version,
     # returns "10.x" values), and sysctl (processor hardware).
     chomp (my $sw_vers = `sw_vers -productVersion`);
     my ($os_major,$os_minor) = split (/\./, $sw_vers);
     if ($os_major != 10) {
-      warn "$0: only MacOSX is supported, not $OS $os_major.$os_minor (from $sw_vers)\n";
+      warn "$0: only MacOSX is supported, not $OS $os_major.$os_minor "
+           . " (from sw_vers -productVersion: $sw_vers)\n";
       return "unknown-unknown";
     }
     if ($os_minor >= $mactex_darwin) {
@@ -355,25 +356,25 @@ sub platform_desc {
     'armhf-linux'      => 'GNU/Linux on ARMhf',
     'hppa-hpux'        => 'HP-UX',
     'i386-cygwin'      => 'Cygwin on Intel x86',
-    'i386-darwin'      => 'MacOSX/Darwin legacy, on Intel x86',
+    'i386-darwin'      => 'MacOSX legacy (10.5-10.6) on Intel x86',
     'i386-freebsd'     => 'FreeBSD on Intel x86',
     'i386-kfreebsd'    => 'GNU/kFreeBSD on Intel x86',
-    'i386-openbsd'     => 'OpenBSD on Intel x86',
-    'i386-netbsd'      => 'NetBSD on Intel x86',
     'i386-linux'       => 'GNU/Linux on Intel x86',
+    'i386-netbsd'      => 'NetBSD on Intel x86',
+    'i386-openbsd'     => 'OpenBSD on Intel x86',
     'i386-solaris'     => 'Solaris on Intel x86',
     'mips-irix'        => 'SGI IRIX',
     'mipsel-linux'     => 'GNU/Linux on MIPSel',
     'powerpc-aix'      => 'AIX on PowerPC',
-    'powerpc-darwin'   => 'MacOSX/Darwin legacy on PowerPC',
+    'powerpc-darwin'   => 'MacOSX legacy (10.5) on PowerPC',
     'powerpc-linux'    => 'GNU/Linux on PowerPC',
     'sparc-linux'      => 'GNU/Linux on Sparc',
     'sparc-solaris'    => 'Solaris on Sparc',
-    'universal-darwin' => 'MacOSX/Darwin universal binaries',
+    'universal-darwin' => 'MacOSX universal binaries',
     'win32'            => 'Windows',
     'x86_64-cygwin'    => 'Cygwin on x86_64',
-    'x86_64-darwinlegacy' => 'MacOSX/Darwin legacy on x86_64',
-    'x86_64-darwin'    => 'MacOSX/Darwin current on x86_64',
+    'x86_64-darwin'    => 'MacOSX current on x86_64',
+    'x86_64-darwinlegacy' => 'MacOSX legacy (10.6-10.9) on x86_64',
     'x86_64-linux'     => 'GNU/Linux on x86_64',
     'x86_64-solaris'   => 'Solaris on x86_64',
   );