new platform i386-solaris

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

1 files changed, 29 insertions, 14 deletions

diff --git a/Master/common.sh b/Master/common.sh
index 240c679b247..89cfb8c60b7 100755
--- a/Master/common.sh
+++ b/Master/common.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 # $Id$
 # 
-# common.sh -- common routines for the installation procedures.
+# common.sh -- common routines for the TeX Live installation scripts.
 # Do not call directly.
 # 
-# Copyright (c) Sebastian Rahtz, 2003, 2004, 2005, 2006.
+# Copyright (c) Sebastian Rahtz and Karl Berry 2003, 2004, 2005, 2006.
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -37,11 +37,12 @@ setvars()
   p_i386_darwin_n='Intel x86 with MacOSX/Darwin'
   p_i386_freebsd_n='Intel x86 with FreeBSD'
   p_i386_linux_n='Intel x86 with GNU/Linux'
+  p_i386_solaris_n='Intel x86 with Sun Solaris'
   p_mips_irix_n='SGI IRIX'
-  p_powerpc_aix_n='Power PC AIX'
+  p_powerpc_aix_n='PowerPC AIX'
   p_powerpc_darwin_n='Mac OSX/Darwin 5.3 or 6.*'
-  p_sparc_linux_n='Sun Sparc with GNU/Linux'
-  p_sparc_solaris_n='Sun Sparc Solaris'
+  p_sparc_linux_n='Sparc with GNU/Linux'
+  p_sparc_solaris_n='Sparc with Solaris'
   p_win32_n='Windows'
   p_x86_64_linux_n='Intel x86_64 with GNU/Linux'
 
@@ -565,7 +566,7 @@ menu_this_platform()
     while true; do
         cls
         textvar_show screen_5; echo
-      case `getopt NABCDEFGHIJKRQ 'Select the platform you are currently on'` in
+      case `getopt NABCDEFGHIJKLMRQ 'Select the platform you are currently on'` in
           N) this_system=''; this_platform_set ;;
           A) this_system=i386_linux; this_platform_set ;;
           B) this_system=win32; this_platform_set ;;
@@ -575,10 +576,12 @@ menu_this_platform()
           F) this_system=mips_irix; this_platform_set ;;
           G) this_system=powerpc_aix; this_platform_set ;;
           H) this_system=sparc_solaris; this_platform_set ;;
-          I) this_system=i386_freebsd; this_platform_set ;;
-          J) this_system=i386_cygwin; this_platform_set ;;
-          K) this_system=x86_64_linux; this_platform_set ;;
-          L) this_system=sparc_linux; this_platform_set ;;
+          I) this_system=i386_solaris; this_platform_set ;;
+          J) this_system=i386_freebsd; this_platform_set ;;
+          K) this_system=i386_cygwin; this_platform_set ;;
+          L) this_system=x86_64_linux; this_platform_set ;;
+          M) this_system=sparc_linux; this_platform_set ;;
+          # N above
           R) total_stat; return ;;
           Q) exit_on_confirm ;;
         esac
@@ -836,10 +839,11 @@ screen_5='Current platform: $this_platform_n
   <F> $p_mips_irix_n
   <G> $p_powerpc_aix_n
   <H> $p_sparc_solaris_n
-  <I> $p_i386_freebsd_n
-  <J> $p_i386_cygwin_n
-  <K> $p_x86_64_linux_n
-  <K> $p_sparc_linux_n
+  <I> $p_i386_solaris_n
+  <J> $p_i386_freebsd_n
+  <K> $p_i386_cygwin_n
+  <L> $p_x86_64_linux_n
+  <M> $p_sparc_linux_n
 
   <R>   return to main menu
   <Q>   quit
@@ -1326,6 +1330,17 @@ common_end_install()
     echo 
     echo "Add $TEXDIR/texmf/doc/man to MANPATH." >&2
     echo "Add $TEXDIR/texmf/doc/info to INFOPATH." >&2
+    
+    if test "$pd" = i386-solaris; then
+      # we should do this if i386-solaris is installed, not just if it's
+      # the current platform, but that seems pretty painful.
+      echo
+      echo "For i386-solaris, you must also install extra libraries:"
+      echo "  gzip -d <support/i386-solaris-libs.pkg.gz >/tmp/tlibs.pkg"
+      echo "  pkgadd -d /tmp/tlibs.pkg"
+      echo "(or the equivalent.)"
+      echo
+    fi
   fi
 
   $skip_systemstuff || greetings