summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm51
-rw-r--r--Master/tlpkg/doc/packages.txt8
-rwxr-xr-xMaster/tlpkg/installer/wget/wget.i386-kfreebsdbin0 -> 315044 bytes
-rw-r--r--Master/tlpkg/installer/xz/xz.i386-kfreebsdbin0 -> 145760 bytes
-rw-r--r--Master/tlpkg/installer/xz/xzdec.i386-kfreebsdbin0 -> 67808 bytes
5 files changed, 30 insertions, 29 deletions
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<i386-linux> we return C<Intel x86 with GNU/Linux>.
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}";
diff --git a/Master/tlpkg/doc/packages.txt b/Master/tlpkg/doc/packages.txt
index d809d81f4bd..dbd34db3efe 100644
--- a/Master/tlpkg/doc/packages.txt
+++ b/Master/tlpkg/doc/packages.txt
@@ -6,10 +6,10 @@ on the CTAN-to-TL update process.
To add a new architecture:
- check that the config.guess output maps to our architecture name
- (the `platform' routine in TeXLive/TLUtils.pm)
-- create directory in Master/bin and add at least one file
-- add xz, xzdec, maybe wget binaries in Master/tlpkg/installer
-- add description in Master/tlpkg/TeXLive/TLUtils.pm
+ in the `platform' routine in TeXLive/TLUtils.pm.
+- add the abbreviation to the full-name mapping in `platform_desc'.
+- create directory in Master/bin and add at least one file.
+- add xz, xzdec, maybe wget binaries in Master/tlpkg/installer.
- regenerate tlpdb.
To remove an architecture:
diff --git a/Master/tlpkg/installer/wget/wget.i386-kfreebsd b/Master/tlpkg/installer/wget/wget.i386-kfreebsd
new file mode 100755
index 00000000000..f9798c5e946
--- /dev/null
+++ b/Master/tlpkg/installer/wget/wget.i386-kfreebsd
Binary files differ
diff --git a/Master/tlpkg/installer/xz/xz.i386-kfreebsd b/Master/tlpkg/installer/xz/xz.i386-kfreebsd
new file mode 100644
index 00000000000..3e180d1d81b
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xz.i386-kfreebsd
Binary files differ
diff --git a/Master/tlpkg/installer/xz/xzdec.i386-kfreebsd b/Master/tlpkg/installer/xz/xzdec.i386-kfreebsd
new file mode 100644
index 00000000000..a0379e9df48
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xzdec.i386-kfreebsd
Binary files differ