biber 0.8.4 (21mar11)

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

13 files changed, 9 insertions, 8 deletions

diff --git a/Master/bin/amd64-freebsd/biber b/Master/bin/amd64-freebsd/biber
new file mode 100755
index 00000000000..950f7277306
--- /dev/null
+++ b/Master/bin/amd64-freebsd/biber
diff --git a/Master/bin/i386-cygwin/biber.exe b/Master/bin/i386-cygwin/biber.exe
new file mode 100755
index 00000000000..d3046749dc6
--- /dev/null
+++ b/Master/bin/i386-cygwin/biber.exe
diff --git a/Master/bin/i386-freebsd/biber b/Master/bin/i386-freebsd/biber
new file mode 100755
index 00000000000..da0226a7829
--- /dev/null
+++ b/Master/bin/i386-freebsd/biber
diff --git a/Master/bin/i386-linux/biber b/Master/bin/i386-linux/biber
new file mode 100755
index 00000000000..39b2b2bb3d6
--- /dev/null
+++ b/Master/bin/i386-linux/biber
diff --git a/Master/bin/i386-solaris/biber b/Master/bin/i386-solaris/biber
new file mode 100755
index 00000000000..24cfd1e2b11
--- /dev/null
+++ b/Master/bin/i386-solaris/biber
diff --git a/Master/bin/universal-darwin/biber b/Master/bin/universal-darwin/biber
new file mode 100755
index 00000000000..1d75171736b
--- /dev/null
+++ b/Master/bin/universal-darwin/biber
diff --git a/Master/bin/win32/biber.exe b/Master/bin/win32/biber.exe
new file mode 100755
index 00000000000..5d46d4d458f
--- /dev/null
+++ b/Master/bin/win32/biber.exe
diff --git a/Master/bin/x86_64-darwin/biber b/Master/bin/x86_64-darwin/biber
new file mode 100755
index 00000000000..278ae1616c8
--- /dev/null
+++ b/Master/bin/x86_64-darwin/biber
diff --git a/Master/bin/x86_64-linux/biber b/Master/bin/x86_64-linux/biber
new file mode 100755
index 00000000000..d630d258976
--- /dev/null
+++ b/Master/bin/x86_64-linux/biber
diff --git a/Master/bin/x86_64-solaris/biber b/Master/bin/x86_64-solaris/biber
new file mode 100755
index 00000000000..de8b84eea82
--- /dev/null
+++ b/Master/bin/x86_64-solaris/biber
diff --git a/Master/texmf-dist/doc/bibtex/biber/biber.pdf b/Master/texmf-dist/doc/bibtex/biber/biber.pdf
index 23c1b4c2f86..64999d66923 100644
--- a/Master/texmf-dist/doc/bibtex/biber/biber.pdf
+++ b/Master/texmf-dist/doc/bibtex/biber/biber.pdf
diff --git a/Master/texmf-dist/source/bibtex/biber/biblatex-biber.tar.gz b/Master/texmf-dist/source/bibtex/biber/biblatex-biber.tar.gz
index 0004d8f6f9c..81beec7a107 100644
--- a/Master/texmf-dist/source/bibtex/biber/biblatex-biber.tar.gz
+++ b/Master/texmf-dist/source/bibtex/biber/biblatex-biber.tar.gz
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 2bbbf976486..0cb7d357f55 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -4154,18 +4154,20 @@ sub POSTbiber {
   # biber uses different platform names.
   my %tl_platform = (
     "MSWIN"		=> "win32",
+    "amd64-freebsd"	=> "amd64-freebsd",
     "cygwin32"		=> "i386-cygwin",
-    "darwin_x86_i386"	=> "universal-darwin",
     "darwin_x86_64"	=> "x86_64-darwin",
+    "darwin_x86_i386"	=> "universal-darwin",
+    "i386-freebsd"	=> "i386-freebsd",
+    "i386-pc-solaris2"	=> "i386-solaris",
     "linux_x86_32"	=> "i386-linux",
     "linux_x86_64"	=> "x86_64-linux",
-    "solaris_i386"	=> "i386-solaris",
-    "solaris_x86_64"	=> "x86_64-solaris",
+    "x86_64-pc-solaris2" => "x86_64-solaris",
   );
 
   # handle the prebuilt binaries, which are zipped or tarred.
-  for my $archive (sort (<biber-*>)) {
-    next if $archive =~ /freebsd[68]\./;  # we only want freebsd7
+  for my $archive (sort (<biber[-.]*>)) {
+    next if $archive =~ /biber-solaris|freebsd[68]\./;  # we only want freebsd7
 
     my $unarchiver = &unarchiver ($archive);
     &SYSTEM ("$unarchiver $archive");
@@ -4178,8 +4180,7 @@ sub POSTbiber {
     # Put the executable in both the
     # (a) Master bin directory and
     # (b) Build source directory.
-    (my $biber_platform = $archive) =~ s/.*-(.*?)\..*/$1/;
-    ($biber_platform = $archive) =~ s/^.*\.// if ! $biber_platform;
+    (my $biber_platform = $archive) =~ s/biber[-.](.*?)\..*/$1/;
     my $tl_platform = $tl_platform{$biber_platform};
     die "unknown biber platform $biber_platform, goodbye" if ! $tl_platform;
 
@@ -4194,7 +4195,7 @@ sub POSTbiber {
   }
 
   # don't keep binary archive around in Master tree.
-  &SYSTEM ("$RM biber-*");
+  &SYSTEM ("$RM biber[-.]*");
 }
 
 # biber binaries are distributed in a variety of ways.  The idea here is