tl-update-auto

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

1 files changed, 58 insertions, 74 deletions

diff --git a/Build/source/utils/asymptote/config.sub b/Build/source/utils/asymptote/config.sub
index ecc5c5e7342..d1f5b549034 100755
--- a/Build/source/utils/asymptote/config.sub
+++ b/Build/source/utils/asymptote/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-05-23'
+timestamp='2018-05-24'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -562,68 +562,6 @@ case $1 in
 		;;
 esac
 
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	bluegene*)
-		os=cnk
-		;;
-	scout)
-		;;
-	chorusos*)
-		os=chorusos
-		basic_machine=$1
-		;;
-	chorusrdb)
-		os=chorusrdb
-		basic_machine=$1
-		;;
-	hiux*)
-		os=hiuxwe2
-		;;
-	sco6)
-		os=sco5v6
-		;;
-	sco5)
-		os=sco3.2v5
-		;;
-	sco4)
-		os=sco3.2v4
-		;;
-	sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		;;
-	sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		;;
-	sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		;;
-	sco*)
-		os=sco3.2v2
-		;;
-	isc)
-		os=isc2.2
-		;;
-	lynx*178)
-		os=lynxos178
-		;;
-	lynx*5)
-		os=lynxos5
-		;;
-	lynx*)
-		os=lynxos
-		;;
-	ptx*)
-		basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'`
-		;;
-	psos*)
-		os=psos
-		;;
-esac
-
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
@@ -1357,6 +1295,9 @@ case $os in
 	auroraux)
 		os=auroraux
 		;;
+	bluegene*)
+		os=cnk
+		;;
 	solaris1 | solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1373,26 +1314,57 @@ case $os in
 	es1800*)
 		os=ose
 		;;
+	# Some version numbers need modification
+	chorusos*)
+		os=chorusos
+		;;
+	isc)
+		os=isc2.2
+		;;
+	sco6)
+		os=sco5v6
+		;;
+	sco5)
+		os=sco3.2v5
+		;;
+	sco4)
+		os=sco3.2v4
+		;;
+	sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		;;
+	sco3.2v[4-9]* | sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		;;
+	scout)
+		# Don't match below
+		;;
+	sco*)
+		os=sco3.2v2
+		;;
+	psos*)
+		os=psos
+		;;
 	# Now accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST end in a * to match a version number.
 	# sysv* is not here because it comes later, after sysvr4.
 	gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
-	     | *vms* | sco* | esix* | isc* | aix* | cnk* | sunos | sunos[34]*\
+	     | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
 	     | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
 	     | sym* | kopensolaris* | plan9* \
 	     | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
 	     | aos* | aros* | cloudabi* | sortix* \
 	     | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
 	     | clix* | riscos* | uniplus* | iris* | rtu* | xenix* \
-	     | hiux* | knetbsd* | mirbsd* | netbsd* \
+	     | knetbsd* | mirbsd* | netbsd* \
 	     | bitrig* | openbsd* | solidbsd* | libertybsd* \
 	     | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
 	     | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
 	     | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
 	     | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
-	     | chorusos* | chorusrdb* | cegcc* | glidix* \
-	     | cygwin* | msys* | pe* | psos* | moss* | proelf* | rtems* \
+	     | chorusrdb* | cegcc* | glidix* \
+	     | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
 	     | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
 	     | linux-newlib* | linux-musl* | linux-uclibc* \
 	     | uxpv* | beos* | mpeix* | udk* | moxiebox* \
@@ -1416,6 +1388,9 @@ case $os in
 			;;
 		esac
 		;;
+	hiux*)
+		os=hiuxwe2
+		;;
 	nto-qnx*)
 		;;
 	nto*)
@@ -1425,20 +1400,23 @@ case $os in
 	    | windows* | osx | abug | netware* | os9* \
 	    | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
 		;;
-	mac*)
-		os=`echo "$os" | sed -e 's|mac|macos|'`
-		;;
 	linux-dietlibc)
 		os=linux-dietlibc
 		;;
 	linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
-	sunos5*)
-		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+	lynx*178)
+		os=lynxos178
 		;;
-	sunos6*)
-		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+	lynx*5)
+		os=lynxos5
+		;;
+	lynx*)
+		os=lynxos
+		;;
+	mac*)
+		os=`echo "$os" | sed -e 's|mac|macos|'`
 		;;
 	opened*)
 		os=openedition
@@ -1446,6 +1424,12 @@ case $os in
 	os400*)
 		os=os400
 		;;
+	sunos5*)
+		os=`echo "$os" | sed -e 's|sunos5|solaris2|'`
+		;;
+	sunos6*)
+		os=`echo "$os" | sed -e 's|sunos6|solaris3|'`
+		;;
 	wince*)
 		os=wince
 		;;