From 16d4328eddf7525d22a0e8b113432a9ed343935b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 8 Mar 2010 00:54:42 +0000 Subject: binaries for i386-kfreebsd, from Alan Braslau git-svn-id: svn://tug.org/texlive/trunk@17370 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/TeXLive/TLUtils.pm | 51 +++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 25 deletions(-) (limited to 'Master/tlpkg/TeXLive') diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 1e66119079e..c77c17a55b4 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -204,8 +204,8 @@ sub platform { $::_platform_="win32"; } else { my $config_guess = "$::installerdir/tlpkg/installer/config.guess"; - my @OSs = qw(aix cygwin darwin freebsd hpux irix linux netbsd - openbsd solaris); + my @OSs = qw(aix cygwin darwin freebsd hpux irix + kfreebsd linux netbsd openbsd solaris); # We cannot rely on #! in config.guess but have to call /bin/sh # explicitly because sometimes the 'noexec' flag is set in @@ -223,7 +223,7 @@ sub platform { $CPU =~ s/^alpha(.*)/alpha/; # alphaev56 or whatever $CPU =~ s/powerpc64/powerpc/; # we don't distinguish on ppc64 for my $os (@OSs) { - $OS = $os if $guessed_platform =~ /$os/; + $OS = $os if $guessed_platform =~ /\b$os\b/; } if ($OS eq "darwin") { $CPU = "universal"; # TL provides universal binaries @@ -250,32 +250,33 @@ given C we return C. sub platform_desc { my ($platform) = @_; - my %platform_name=( - 'alpha-linux' => 'DEC Alpha with GNU/Linux', - 'alphaev5-osf' => 'DEC Alphaev5 OSF', - 'amd64-freebsd' => 'x86_64 with FreeBSD', - 'hppa-hpux' => 'HP-UX', - 'i386-cygwin' => 'Intel x86 with Cygwin', - 'i386-darwin' => 'Intel x86 with MacOSX/Darwin', - 'i386-freebsd' => 'Intel x86 with FreeBSD', - 'i386-openbsd' => 'Intel x86 with OpenBSD', - 'i386-netbsd' => 'Intel x86 with NetBSD', - 'i386-linux' => 'Intel x86 with GNU/Linux', - 'i386-solaris' => 'Intel x86 with Sun Solaris', - 'mips-irix' => 'SGI IRIX', - 'powerpc-aix' => 'PowerPC with AIX', - 'powerpc-darwin' => 'PowerPC with MacOSX/Darwin', - 'powerpc-linux' => 'PowerPC with GNU/Linux', - 'sparc-linux' => 'Sparc with GNU/Linux', - 'sparc-solaris' => 'Sparc with Solaris', + my %platform_name = ( + 'alpha-linux' => 'DEC Alpha with GNU/Linux', + 'alphaev5-osf' => 'DEC Alphaev5 OSF', + 'amd64-freebsd' => 'x86_64 with FreeBSD', + 'hppa-hpux' => 'HP-UX', + 'i386-cygwin' => 'Intel x86 with Cygwin', + 'i386-darwin' => 'Intel x86 with MacOSX/Darwin', + 'i386-freebsd' => 'Intel x86 with FreeBSD', + 'i386-kfreebsd' => 'Intel x86 with GNU/FreeBSD', + 'i386-openbsd' => 'Intel x86 with OpenBSD', + 'i386-netbsd' => 'Intel x86 with NetBSD', + 'i386-linux' => 'Intel x86 with GNU/Linux', + 'i386-solaris' => 'Intel x86 with Sun Solaris', + 'mips-irix' => 'SGI IRIX', + 'powerpc-aix' => 'PowerPC with AIX', + 'powerpc-darwin' => 'PowerPC with MacOSX/Darwin', + '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' - ); + 'win32' => 'Windows', + 'x86_64-linux' => 'x86_64 with GNU/Linux' + ); # the inconsistency between amd64-freebsd and x86_64-linux is # unfortunate (it's the same hardware), but the os people say those - # are the conventional names on the respective os's, so ... + # are the conventional names on the respective os's, so we follow suit. if (exists $platform_name{$platform}) { return "$platform_name{$platform}"; -- cgit v1.2.3