8 files changed, 27 insertions, 9 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index c493b149399..7f0cc0f1c96 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -219,12 +219,12 @@ sub platform
       die "$0: could not run $config_guess, cannot proceed, sorry"
         if ! $guessed_platform;
 
-      $guessed_platform =~ s/^x86_64-(.*)-freebsd/amd64-$1-freebsd/;
+      $guessed_platform =~ s/^x86_64-(.*)-k?freebsd/amd64-$1-k?freebsd/;
       my $CPU; # CPU type as reported by config.guess.
       my $OS;  # O/S type as reported by config.guess.
       ($CPU = $guessed_platform) =~ s/(.*?)-.*/$1/;
       $CPU =~ s/^alpha(.*)/alpha/;   # alphaev56 or whatever
-      $CPU =~ s/powerpc64/powerpc/;  # we don't distinguish on ppc64
+      $CPU =~ s/powerpc64/powerpc/;  # we don't distinguish ppc64
       for my $os (@OSs) {
         # Match word boundary at the beginning of the os name so that
         #   freebsd and kfreebsd are distinguished.
@@ -264,6 +264,7 @@ sub platform_desc {
     'alpha-linux'      => 'DEC Alpha with GNU/Linux',
     'alphaev5-osf'     => 'DEC Alphaev5 OSF',
     'amd64-freebsd'    => 'x86_64 with FreeBSD',
+    'amd64-kfreebsd'   => 'x86_64 with GNU/FreeBSD',
     'hppa-hpux'        => 'HP-UX',
     'i386-cygwin'      => 'Intel x86 with Cygwin',
     'i386-darwin'      => 'Intel x86 with MacOSX/Darwin',
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 850d11d3271..5a029b99108 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -104,6 +104,11 @@ for tlname in $tlnames; do
     default_bin_loc=$download_loc
     grab="$download -O $download_loc"
     $grab http://anthesphoria.net/FreeBSD/TeXLive-Devel/bin-r18349/amd64-freebsd7-r18349.tar.xz;;
+   amd64-kfreebsd)
+    download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
+    default_bin_loc=$download_loc
+    grab="$download -O $download_loc"
+    $grab ftp://ftp.cea.fr/incoming/y2k01/braslau/x86_64-unknown-kfreebsd8.0-gnu.tar.xz;;
    hppa-hpux)
     default_bin_loc=$download_loc
     $grab http://www.jtartlabs.com/test/hppa2.0-hp-hpux10.20.tar.gz;;
@@ -115,6 +120,11 @@ for tlname in $tlnames; do
     default_bin_loc=$download_loc
     grab="$download -O $download_loc"
     $grab http://anthesphoria.net/FreeBSD/TeXLive-Devel/bin-r18349/i386-freebsd7-r18349.tar.xz;;
+   i386-kfreebsd)
+    download_loc=${TMPDIR-$tmpdir}/tl.$tlname.tar.xz
+    default_bin_loc=$download_loc
+    grab="$download -O $download_loc"
+    $grab ftp://ftp.cea.fr/incoming/y2k01/braslau/i686-unknown-kfreebsd8.0-gnu.tar.xz;;
    i386-linux)
     default_bin_loc=/home/texlive/sarge/tmp/source/inst/bin/i686-pc-linux-gnu;;
    i386-netbsd)
diff --git a/Master/tlpkg/installer/wget/wget.amd64-kfreebsd b/Master/tlpkg/installer/wget/wget.amd64-kfreebsd
new file mode 100755
index 00000000000..2ff61094131
--- /dev/null
+++ b/Master/tlpkg/installer/wget/wget.amd64-kfreebsd
diff --git a/Master/tlpkg/installer/xz/xz.amd64-kfreebsd b/Master/tlpkg/installer/xz/xz.amd64-kfreebsd
new file mode 100755
index 00000000000..4f314109f84
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xz.amd64-kfreebsd
diff --git a/Master/tlpkg/installer/xz/xzdec.amd64-kfreebsd b/Master/tlpkg/installer/xz/xzdec.amd64-kfreebsd
new file mode 100755
index 00000000000..ed87d553bed
--- /dev/null
+++ b/Master/tlpkg/installer/xz/xzdec.amd64-kfreebsd
diff --git a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
index eb97170088a..f8759b3797e 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installer.tlpsrc
@@ -30,7 +30,10 @@ binpattern f/win32 install-tl-advanced.bat
 binpattern f tlpkg/installer/xz/xzdec.${ARCH}
 #
 # list the platforms for which we provide wget:
-binpattern f/powerpc-aix,sparc-solaris,\
+binpattern f/\
+amd64-freebsd,amd64-kfreebsd,\
+i386-freebsd,i386-kfreebsd,
+powerpc-aix,sparc-solaris,\
 universal-darwin,win32,x86_64-darwin \
   tlpkg/installer/wget/wget.${ARCH}
 #
diff --git a/Master/tlpkg/tlpsrc/asymptote.tlpsrc b/Master/tlpkg/tlpsrc/asymptote.tlpsrc
index a97037aa5b2..b18e7ed4f2d 100644
--- a/Master/tlpkg/tlpsrc/asymptote.tlpsrc
+++ b/Master/tlpkg/tlpsrc/asymptote.tlpsrc
@@ -1,5 +1,6 @@
 category TLCore
-binpattern f/!mips-irix,powerpc-aix,sparc-linux,sparc-solaris,i386-kfreebsd \
+binpattern f/!amd64-kfreebsd,mips-irix,powerpc-aix,\
+sparc-linux,sparc-solaris,i386-kfreebsd \
            bin/${ARCH}/*asy
 binpattern f/i386-cygwin bin/i386-cygwin/freeglut.dll
 binpattern d/win32 tlpkg/asymptote
diff --git a/Master/tlpkg/tlpsrc/xindy.tlpsrc b/Master/tlpkg/tlpsrc/xindy.tlpsrc
index 3b517dbafe7..37952d769dd 100644
--- a/Master/tlpkg/tlpsrc/xindy.tlpsrc
+++ b/Master/tlpkg/tlpsrc/xindy.tlpsrc
@@ -3,16 +3,19 @@ category TLCore
 runpattern d texmf/xindy
 runpattern d texmf/scripts/xindy
 #
-binpattern f/!mips-irix,i386-kfreebsd bin/${ARCH}/texindy
-binpattern f/!mips-irix,i386-kfreebsd bin/${ARCH}/tex2xindy
-binpattern f/!mips-irix,i386-kfreebsd bin/${ARCH}/xindy
+# Not all platforms provide xindy.
+binpattern f/!amd64-kfreebsd,i386-kfreebsd,mips-irix bin/${ARCH}/texindy
+binpattern f/!amd64-kfreebsd,i386-kfreebsd,mips-irix bin/${ARCH}/tex2xindy
+binpattern f/!amd64-kfreebsd,i386-kfreebsd,mips-irix bin/${ARCH}/xindy
 #
 # cygwin and windows have to use a different name for the clisp executable.
-binpattern f/!mips-irix,i386-kfreebsd,i386-cygwin bin/${ARCH}/xindy.run
+binpattern f/!amd64-kfreebsd,i386-kfreebsd,i386-cygwin,mips-irix \
+bin/${ARCH}/xindy.run
 binpattern f/i386-cygwin,win32 bin/${ARCH}/xindy-lisp.exe
 #
 # universaldarwin has to split the mem file by architecture.
-binpattern f/!universal-darwin,mips-irix,i386-kfreebsd bin/${ARCH}/xindy.mem
+binpattern f/!amd64-kfreebsd,i386-kfreebsd,mips-irix,\
+universal-darwin bin/${ARCH}/xindy.mem
 binpattern f/universal-darwin bin/universal-darwin/xindy-i386.mem
 binpattern f/universal-darwin bin/universal-darwin/xindy-ppc.mem
 #