office/texlive: Updated for version 20140525.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

20 files changed, 99 insertions, 797 deletions

diff --git a/office/texlive/README b/office/texlive/README
index 8bcb47b9590fa..01a5520a4064f 100644
--- a/office/texlive/README
+++ b/office/texlive/README
@@ -1,17 +1,21 @@
 TeXLive (TeXLive binaries, support files, TeX formats)
 
-This package contains the binaries, support files, TeX formats and packages,
-and other files required for the TeXLive TeX distribution.  Included are
-input files for TeX, runtime configuration files, hyphenation tables,
-manpages, and the computer modern fonts.
+This package contains most binaries, support files, TeX formats and
+packages, and other files included in the TeXLive TeX distribution.
+Included are input files for TeX, runtime configuration files,
+hyphenation tables, manpages, and the computer modern fonts.
 
-The resulting package is very large, and a lot of space is required during
-the build process, so you might want to consider defining an alternate
+Some extra texmf can be found in the "texlive-texmf-extra" package
+and all of the docs can be found in the "texlive-texmf-docs" package,
+both of which are available at SlackBuilds.org.
+
+Have a look at the texscythe package to see how the texmf archives were
+created from the original download from upstream.
+
+The resulting packages are large, and a lot of space is required during
+the build processes, so you might want to consider defining an alternate
 location for TMP and OUTPUT if you have small /tmp partition.
 
 Note that this package is intended to completely replace (and then some) the
 tetex packages in Slackware, so you'll need to remove tetex and tetex-doc
 before installing TeXLive.
-
-Have a look at the texscythe package to see how the texmf tarball was
-created from the original download from upstream.
diff --git a/office/texlive/branch2013/r30928-new-metapost-release-1.803-source-files-from-r30833.diff b/office/texlive/branch2013/r30928-new-metapost-release-1.803-source-files-from-r30833.diff
deleted file mode 100644
index c924ea1bfc7f7..0000000000000
--- a/office/texlive/branch2013/r30928-new-metapost-release-1.803-source-files-from-r30833.diff
+++ /dev/null
@@ -1,245 +0,0 @@
-Index: Build/source/texk/web2c/mplibdir/mp.w
-===================================================================
---- Build/source/texk/web2c/mplibdir/mp.w	(revision 30927)
-+++ Build/source/texk/web2c/mplibdir/mp.w	(revision 30928)
-@@ -1,4 +1,4 @@
--% $Id: mp.w 1901 2013-05-22 14:42:19Z taco $
-+% $Id: mp.w 1918 2013-06-13 12:47:55Z taco $
- %
- % This file is part of MetaPost;
- % the MetaPost program is in the public domain.
-@@ -73,12 +73,12 @@
- @^extensions to \MP@>
- @^system dependencies@>
- 
--@d default_banner "This is MetaPost, Version 1.802" /* printed when \MP\ starts */
-+@d default_banner "This is MetaPost, Version 1.803" /* printed when \MP\ starts */
- @d true 1
- @d false 0
- 
- @<Metapost version header@>=
--#define metapost_version "1.802"
-+#define metapost_version "1.803"
- 
- @ The external library header for \MP\ is |mplib.h|. It contains a
- few typedefs and the header defintions for the externally used
-@@ -516,8 +516,8 @@
-   /* open the terminal for output */
-   t_open_out();
- #if DEBUG
--  setlinebuf(stdout);
--  setlinebuf(mp->term_out);
-+  setvbuf(stdout, (char *) NULL, _IONBF, 0);
-+  setvbuf(mp->term_out, (char *) NULL, _IONBF, 0);
- #endif
-   if (opt->math_mode == mp_math_scaled_mode) {
-     mp->math = mp_initialize_scaled_math(mp);
-@@ -8330,8 +8330,8 @@
- @ @c
- void mp_curl_ratio (MP mp, mp_number *ret, mp_number gamma_orig, mp_number a_tension, mp_number b_tension) {
-   mp_number alpha, beta, gamma, num, denom, ff; /* registers */
--  mp_number n1;
--  new_number (n1);
-+  mp_number arg1;
-+  new_number (arg1);
-   new_fraction (alpha);
-   new_fraction (beta);
-   new_fraction (gamma);
-@@ -8342,49 +8342,33 @@
-   make_fraction (beta, unity_t, b_tension);
-   number_clone (gamma, gamma_orig);
-   if (number_lessequal(alpha, beta)) {
--    mp_number arg1;
--    new_number (arg1);
-     make_fraction (ff, alpha, beta);
-     number_clone (arg1, ff);
-     take_fraction (ff, arg1, arg1);
-     number_clone (arg1, gamma);
-     take_fraction (gamma, arg1, ff);
-     convert_fraction_to_scaled (beta);
--    set_number_from_addition (arg1, alpha, three_t);
--    number_substract (arg1, beta);
--    take_fraction (denom, gamma, arg1);
--    set_number_from_substraction (arg1, fraction_three_t, alpha);
--    number_add (arg1, beta);
--    take_fraction (num, gamma, arg1);
--    free_number (arg1);
-+    take_fraction (denom, gamma, alpha);
-+    number_add (denom, three_t);
-   } else {
--    mp_number arg1, r1;
--    new_number (arg1);
--    new_number (r1);
-     make_fraction (ff, beta, alpha);
-     number_clone (arg1, ff);
-     take_fraction (ff, arg1, arg1);
-     take_fraction (arg1, beta, ff);
-     convert_fraction_to_scaled (arg1);
--    number_clone (beta, arg1);   
--    take_fraction (arg1, gamma, alpha);
--    new_number (denom);
--    {
--      set_number_from_div (n1, ff, twelvebits_3);
--      number_clone (denom, arg1);
--      number_add (denom, n1);
--      number_substract (denom, beta);
--    }
--    set_number_from_substraction (arg1, fraction_three_t, alpha);
--    take_fraction (num, gamma, arg1);
--    number_add (num, beta);
--    free_number (arg1);
--    free_number (r1);
-+    number_clone (beta, arg1);
-+    take_fraction (denom, gamma, alpha);
-+    set_number_from_div (arg1, ff, twelvebits_3);
-+    number_add (denom, arg1);
-   }
--  number_clone (n1, denom);
--  number_double (n1);
--  number_double (n1); /* n1 = 4*denom */
--  if (number_greaterequal(num, n1)) {
-+  number_substract (denom, beta);
-+  set_number_from_substraction (arg1, fraction_three_t, alpha);
-+  take_fraction (num, gamma, arg1);
-+  number_add (num, beta);
-+  number_clone (arg1, denom);
-+  number_double (arg1);
-+  number_double (arg1); /* arg1 = 4*denom */
-+  if (number_greaterequal(num, arg1)) {
-     number_clone(*ret, fraction_four_t);
-   } else {
-     make_fraction (*ret, num, denom);
-@@ -8395,7 +8379,7 @@
-   free_number (num);
-   free_number (denom);
-   free_number (ff);
--  free_number (n1);
-+  free_number (arg1);
- }
- 
- 
-Index: Build/source/texk/web2c/mplibdir/mpmathdouble.w
-===================================================================
---- Build/source/texk/web2c/mplibdir/mpmathdouble.w	(revision 30927)
-+++ Build/source/texk/web2c/mplibdir/mpmathdouble.w	(revision 30928)
-@@ -1,4 +1,4 @@
--% $Id: mpmathdouble.w 1892 2013-03-22 10:21:05Z taco $
-+% $Id: mpmathdouble.w 1915 2013-06-13 10:17:31Z taco $
- %
- % This file is part of MetaPost;
- % the MetaPost program is in the public domain.
-@@ -17,13 +17,13 @@
- @ Introduction.
- 
- @c 
--#define _ISOC99_SOURCE /* to get the round() prototype */
- #include <w2c/config.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
- #include "mpmathdouble.h" /* internal header */
-+#define ROUND(a) floor((a)+0.5)
- @h
- 
- @ @c
-@@ -402,11 +402,7 @@
- }
- void mp_number_angle_to_scaled (mp_number *A) {
-     A->type = mp_scaled_type;
--    if (A->data.dval >= 0) {
--      A->data.dval = round(A->data.dval) / angle_multiplier;
--    } else {
--      A->data.dval = -((-round(A->data.dval))/ angle_multiplier);
--    }
-+    A->data.dval = ROUND(A->data.dval) / angle_multiplier;
- }
- void mp_number_scaled_to_fraction (mp_number *A) {
-     A->type = mp_fraction_type;
-@@ -422,7 +418,7 @@
- 
- @c
- int mp_number_to_scaled(mp_number A) {
--  return (int)round(A.data.dval * 65536.0);
-+  return (int)ROUND(A.data.dval * 65536.0);
- }
- int mp_number_to_int(mp_number A) {
-   return (int)(A.data.dval);
-@@ -434,7 +430,7 @@
-   return A.data.dval;
- }
- int mp_number_odd(mp_number A) {
--  return odd((int)round(A.data.dval * 65536.0));
-+  return odd((int)ROUND(A.data.dval * 65536.0));
- }
- int mp_number_equal(mp_number A, mp_number B) {
-   return (A.data.dval==B.data.dval);
-@@ -962,7 +958,7 @@
- @ |round_unscaled| rounds a |scaled| and converts it to |int|
- @c
- int mp_round_unscaled(mp_number x_orig) {
--  int x = (int)round(x_orig.data.dval);
-+  int x = (int)ROUND(x_orig.data.dval);
-   return x;
- }
- 
-Index: Build/source/texk/web2c/mplibdir/ChangeLog
-===================================================================
---- Build/source/texk/web2c/mplibdir/ChangeLog	(revision 30927)
-+++ Build/source/texk/web2c/mplibdir/ChangeLog	(revision 30928)
-@@ -1,3 +1,7 @@
-+2013-06-16 Taco Hoekwater  <taco@luatex.org>
-+
-+	Import metapost 1.803 (released version)
-+
- 2013-05-22 Taco Hoekwater  <taco@luatex.org>
- 
- 	* svgout.w: fix a problem with overly large characters in
-Index: Build/source/texk/web2c/mplibdir/mpost.w
-===================================================================
---- Build/source/texk/web2c/mplibdir/mpost.w	(revision 30927)
-+++ Build/source/texk/web2c/mplibdir/mpost.w	(revision 30928)
-@@ -1,4 +1,4 @@
--% $Id: mpost.w 1895 2013-03-27 11:17:17Z taco $
-+% $Id: mpost.w 1916 2013-06-13 10:19:49Z taco $
- %
- % This file is part of MetaPost;
- % the MetaPost program is in the public domain.
-@@ -443,7 +443,7 @@
-       mpost_xfree(mpversion);
-     }
-   }
--
-+  
-   mpost_xfree (cnf_cmd);
-   return (int)(ret == 0);
- }
-@@ -1290,6 +1290,17 @@
- @ Now this is really it: \MP\ starts and ends here.
- 
- @c 
-+static char *cleaned_invocation_name(char *arg)
-+{
-+    char *ret, *dot;
-+    const char *start = xbasename(arg);
-+    ret = xstrdup(start);
-+    dot = strrchr(ret, '.');
-+    if (dot != NULL) {
-+        *dot = 0;               /* chop */
-+    }
-+    return ret;
-+}
- int
- #if defined(WIN32) && !defined(__MINGW32__) && defined(DLLPROC)
- DLLPROC (int argc, char **argv)
-@@ -1306,8 +1317,8 @@
-   options->ini_version       = (int)false;
-   options->print_found_names = (int)true;
-   {
--    const char *base = xbasename(argv[0]);
--    if (!strcmp(base, "dvitomp") || !strcasecmp(base, "dvitomp.exe"))
-+    const char *base = cleaned_invocation_name(argv[0]);
-+    if (FILESTRCASEEQ(base, "dvitomp"))
-       dvitomp_only=1;
-   }
-   if (dvitomp_only) {
diff --git a/office/texlive/branch2013/r30972-bug-fix-for-LuaTeX-crash-from-r30971.diff b/office/texlive/branch2013/r30972-bug-fix-for-LuaTeX-crash-from-r30971.diff
deleted file mode 100644
index b19735a206aff..0000000000000
--- a/office/texlive/branch2013/r30972-bug-fix-for-LuaTeX-crash-from-r30971.diff
+++ /dev/null
@@ -1,117 +0,0 @@
-Index: Build/source/texk/web2c/luatexdir/image/writepng.w
-===================================================================
---- Build/source/texk/web2c/luatexdir/image/writepng.w	(revision 30929)
-+++ Build/source/texk/web2c/luatexdir/image/writepng.w	(revision 30972)
-@@ -1,7 +1,7 @@
- % writepng.w
- %
- % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
--% Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
-+% Copyright 2006-2013 Taco Hoekwater <taco@@luatex.org>
- %
- % This file is part of LuaTeX.
- %
-@@ -23,8 +23,8 @@
-     "$Id: writepng.w 4442 2012-05-25 22:40:34Z hhenkel $"
-     "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/image/writepng.w $";
- 
-+#include "ptexlib.h"
- #include <assert.h>
--#include "ptexlib.h"
- #include "image/image.h"
- #include "image/writepng.h"
- 
-Index: Build/source/texk/web2c/luatexdir/image/writejp2.w
-===================================================================
---- Build/source/texk/web2c/luatexdir/image/writejp2.w	(revision 30929)
-+++ Build/source/texk/web2c/luatexdir/image/writejp2.w	(revision 30972)
-@@ -1,7 +1,7 @@
- % writejp2.w
- %
--% Copyright 2011-2012 Taco Hoekwater <taco@@luatex.org>
--% Copyright 2011-2012 Hartmut Henkel <hartmut@@luatex.org>
-+% Copyright 2011-2013 Taco Hoekwater <taco@@luatex.org>
-+% Copyright 2011-2013 Hartmut Henkel <hartmut@@luatex.org>
- %
- % This file is part of LuaTeX.
- %
-@@ -28,9 +28,9 @@
- ISO/IEC 15444-1, Second edition, 2004-09-15, file |15444-1annexi.pdf|.
- 
- @c
-+#include "ptexlib.h"
- #include <math.h>
- #include <assert.h>
--#include "ptexlib.h"
- #include "image/image.h"
- #include "image/writejp2.h"
- #include "image/writejbig2.h"   /* read2bytes(), read4bytes() */
-Index: Build/source/texk/web2c/luatexdir/image/writejbig2.w
-===================================================================
---- Build/source/texk/web2c/luatexdir/image/writejbig2.w	(revision 30929)
-+++ Build/source/texk/web2c/luatexdir/image/writejbig2.w	(revision 30972)
-@@ -1,8 +1,8 @@
- % writejbig2.w
- %
- % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
--% Copyright 2006-2012 Taco Hoekwater <taco@@luatex.org>
--% Copyright 2003-2012 Hartmut Henkel <hartmut@@luatex.org>
-+% Copyright 2006-2013 Taco Hoekwater <taco@@luatex.org>
-+% Copyright 2003-2013 Hartmut Henkel <hartmut@@luatex.org>
- %
- % This file is part of LuaTeX.
- %
-@@ -86,13 +86,10 @@
- 
- #undef DEBUG
- 
--#ifdef HAVE_CONFIG_H
--#include <w2c/config.h>
--#endif
-+#include "ptexlib.h"
- #include <stdlib.h>
- #include <stdio.h>
- #include <assert.h>
--#include "ptexlib.h"
- #include "image/image.h"
- 
- @ @c
-Index: Build/source/texk/web2c/luatexdir/image/writejpg.w
-===================================================================
---- Build/source/texk/web2c/luatexdir/image/writejpg.w	(revision 30929)
-+++ Build/source/texk/web2c/luatexdir/image/writejpg.w	(revision 30972)
-@@ -1,7 +1,7 @@
- % writejpg.w
- %
- % Copyright 1996-2006 Han The Thanh <thanh@@pdftex.org>
--% Copyright 2006-2011 Taco Hoekwater <taco@@luatex.org>
-+% Copyright 2006-2013 Taco Hoekwater <taco@@luatex.org>
- %
- % This file is part of LuaTeX.
- %
-@@ -23,8 +23,8 @@
-     "$Id: writejpg.w 4442 2012-05-25 22:40:34Z hhenkel $"
-     "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/image/writejpg.w $";
- 
-+#include "ptexlib.h"
- #include <assert.h>
--#include "ptexlib.h"
- #include "image/image.h"
- #include "image/writejpg.h"
- 
-Index: Build/source/texk/web2c/luatexdir/ChangeLog
-===================================================================
---- Build/source/texk/web2c/luatexdir/ChangeLog	(revision 30929)
-+++ Build/source/texk/web2c/luatexdir/ChangeLog	(revision 30972)
-@@ -1,3 +1,11 @@
-+2013-06-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
-+
-+	Bug fix for LuaTeX crash on 32bit Unix systems from Taco,
-+	tlbuild mail 26 Jun 2013 16:10:35,
-+	http://tug.org/pipermail/tex-live/2013-June/033782.html
-+	* image/writejbig2.w, image/writejp2.w, image/writejpg.w,
-+	image/writepng.w: Always first include ptexlib.h.
-+
- 2013-04-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
- 
- 	* lua/luainit.w: Handle '--luac' and '--luaconly' (from Akira).
diff --git a/office/texlive/branch2013/README b/office/texlive/branch2014/README
index e6083176fba22..629b02cf151be 100644
--- a/office/texlive/branch2013/README
+++ b/office/texlive/branch2014/README
@@ -1,11 +1,11 @@
 This directory should contain only patches from the stable branch of 
-TeXLive 2013 <http://tug.org/svn/texlive/branches/branch2013>
+TeXLive 2014 <http://tug.org/svn/texlive/branches/branch2014>
 
 Thanks to Karl Berry and the other TeXLive contributors for agreeing
 to maintain this and for linking it at http://tug.org/texlive/distro.html
 
 This will fetch a local svn checkout:
-  svn co svn://tug.org/texlive/branches/branch2013
+  svn co svn://tug.org/texlive/branches/branch2014
 
 From an svn checkout, something like this will generate patches:
   svn diff -r from#####:to##### > patchname
diff --git a/office/texlive/debian/upstream-svn31126-luatex b/office/texlive/debian/upstream-svn31126-luatex
deleted file mode 100644
index 0524e4ca1cf39..0000000000000
--- a/office/texlive/debian/upstream-svn31126-luatex
+++ /dev/null
@@ -1,37 +0,0 @@
-upstream svn31126 fix for luatex
----
- texk/web2c/luatexdir/ChangeLog    |    5 +++++
- texk/web2c/luatexdir/pdf/pdfgen.w |    4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
---- texlive-bin.orig/texk/web2c/luatexdir/ChangeLog
-+++ texlive-bin/texk/web2c/luatexdir/ChangeLog
-@@ -1,3 +1,8 @@
-+2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
-+
-+	* pdf/pdfgen.w: Use "%"LONGINTEGER_PRI"d" format specifier to
-+	print (LONGINTEGER_TYPE) casted longinteger and off_t variables.
-+
- 2013-06-27  Peter Breitenlohner  <peb@mppmu.mpg.de>
- 
- 	Bug fix for LuaTeX crash on 32bit Unix systems from Taco,
---- texlive-bin.orig/texk/web2c/luatexdir/pdf/pdfgen.w
-+++ texlive-bin/texk/web2c/luatexdir/pdf/pdfgen.w
-@@ -572,7 +572,7 @@
- {
-     char s[24];
-     int w;
--    w = snprintf(s, 23, "%" LONGINTEGER_PRI "d", n);
-+    w = snprintf(s, 23, "%" LONGINTEGER_PRI "d", (LONGINTEGER_TYPE) n);
-     check_nprintf(w, 23);
-     pdf_out_block(pdf, (const char *) s, (size_t) w);
- }
-@@ -719,7 +719,7 @@
-     if (pdf->seek_write_length && pdf->draftmode == 0) {
-         xfseeko(pdf->file, (off_t)pdf->stream_length_offset, SEEK_SET,
-                 pdf->job_name);
--        fprintf(pdf->file, "%" LONGINTEGER_PRI "i", pdf->stream_length);
-+        fprintf(pdf->file, "%" LONGINTEGER_PRI "i", (LONGINTEGER_TYPE) pdf->stream_length);
-         xfseeko(pdf->file, 0, SEEK_END, pdf->job_name);
-     }
-     pdf->seek_write_length = false;
diff --git a/office/texlive/debian/upstream-svn31303-dvipdfmx b/office/texlive/debian/upstream-svn31303-dvipdfmx
deleted file mode 100644
index 08aea061f2e4a..0000000000000
--- a/office/texlive/debian/upstream-svn31303-dvipdfmx
+++ /dev/null
@@ -1,16 +0,0 @@
-upstream svn31303 fix for dvipdfmx
----
- texk/dvipdfmx/src/jpegimage.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- texlive-bin.orig/texk/dvipdfmx/src/jpegimage.c
-+++ texlive-bin/texk/dvipdfmx/src/jpegimage.c
-@@ -360,7 +360,7 @@
-     struct JPEG_APPn_JFIF *app_data;
-     int i;
-     for (i = 0; i < j_info->num_appn; i++) {
--      if (j_info->appn[i].marker  == JM_APP0 ||
-+      if (j_info->appn[i].marker  == JM_APP0 &&
- 	  j_info->appn[i].app_sig == JS_APPn_JFIF)
-         break;
-     }
diff --git a/office/texlive/debian/upstream-svn31313-pdftex-luatex b/office/texlive/debian/upstream-svn31313-pdftex-luatex
deleted file mode 100644
index a2b17b59350f5..0000000000000
--- a/office/texlive/debian/upstream-svn31313-pdftex-luatex
+++ /dev/null
@@ -1,92 +0,0 @@
-upstream svn31313 fix for pdftex and luatex
----
- texk/web2c/luatexdir/ChangeLog       |    5 +++++
- texk/web2c/luatexdir/font/writettf.w |    7 +++----
- texk/web2c/pdftexdir/ChangeLog       |    5 +++++
- texk/web2c/pdftexdir/ttf2afm.c       |    6 +++---
- texk/web2c/pdftexdir/writettf.c      |    7 +++----
- 5 files changed, 19 insertions(+), 11 deletions(-)
-
---- texlive-bin.orig/texk/web2c/luatexdir/ChangeLog
-+++ texlive-bin/texk/web2c/luatexdir/ChangeLog
-@@ -1,3 +1,8 @@
-+2013-07-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
-+
-+	* font/writettf.w: Treat unknown 'post' table versions
-+	(found in some broken fonts) as 3.0, i.e., no Glyph names.
-+
- 2013-07-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
- 
- 	* pdf/pdfgen.w: Use "%"LONGINTEGER_PRI"d" format specifier to
---- texlive-bin.orig/texk/web2c/luatexdir/font/writettf.w
-+++ texlive-bin/texk/web2c/luatexdir/font/writettf.w
-@@ -816,14 +816,13 @@
-             }
-         }
-         break;
-+    default:
-+        pdftex_warn("unsupported format (%.8X) of `post' table, assuming 3.0",
-+                    (unsigned int) post_format);
-     case 0x00030000:
-         for (glyph = glyph_tab; glyph - glyph_tab < NMACGLYPHS; glyph++) {
-             glyph->name_index = (TTF_USHORT) (glyph - glyph_tab);
-         }
--        break;
--    default:
--        pdftex_fail("unsupported format (%.8X) of `post' table",
--                    (unsigned int) post_format);
-     }
- }
- 
---- texlive-bin.orig/texk/web2c/pdftexdir/ChangeLog
-+++ texlive-bin/texk/web2c/pdftexdir/ChangeLog
-@@ -1,3 +1,8 @@
-+2013-07-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
-+
-+	* ttf2afm.c, writettf.c: Treat unknown 'post' table versions
-+	(found in some broken fonts) as 3.0, i.e., no Glyph names.
-+
- 2013-04-22  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
- 
- 	* pdftex.web: pdftex_revision = "14"
---- texlive-bin.orig/texk/web2c/pdftexdir/ttf2afm.c
-+++ texlive-bin/texk/web2c/pdftexdir/ttf2afm.c
-@@ -521,15 +521,15 @@
-             }
-         }
-         break;
-+    default:
-+        ttf_warn("unsupported format (%.8X) of `post' table, assuming 3.0",
-+                 post_format);
-     case 0x00030000:
-         if (print_glyph == AS_NAME) {
-             ttf_warn
-                 ("no names available in `post' table, print glyph names as indices");
-             print_glyph = AS_INDEX;
-         }
--        break;
--    default:
--        ttf_fail("unsupported format (%.8X) of `post' table", post_format);
-     }
-     ttf_seek_tab("loca", 0);
-     if (loca_format == 1) {
---- texlive-bin.orig/texk/web2c/pdftexdir/writettf.c
-+++ texlive-bin/texk/web2c/pdftexdir/writettf.c
-@@ -517,14 +517,13 @@
-             }
-         }
-         break;
-+    default:
-+        pdftex_warn("unsupported format (%.8X) of `post' table, assuming 3.0",
-+                    (unsigned int) post_format);
-     case 0x00030000:
-         for (glyph = glyph_tab; glyph - glyph_tab < NMACGLYPHS; glyph++) {
-             glyph->name_index = glyph - glyph_tab;
-         }
--        break;
--    default:
--        pdftex_fail("unsupported format (%.8X) of `post' table",
--                    (unsigned int) post_format);
-     }
- }
- 
diff --git a/office/texlive/debian/upstream-svn31350-dvips b/office/texlive/debian/upstream-svn31350-dvips
deleted file mode 100644
index cc11598272e70..0000000000000
--- a/office/texlive/debian/upstream-svn31350-dvips
+++ /dev/null
@@ -1,30 +0,0 @@
-upstream svn31350 fix dvips
----
- texk/dvipsk/ChangeLog |    5 +++++
- texk/dvipsk/bbox.c    |    4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
---- texlive-branch2013-source.svn.orig/texk/dvipsk/ChangeLog
-+++ texlive-branch2013-source.svn/texk/dvipsk/ChangeLog
-@@ -1,3 +1,8 @@
-+2013-08-05  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
-+
-+	* bbox.c: Fix a bug in bbdopage() to obtain correct BoundingBox in
-+	vertical mode of pTeX.
-+
- 2013-04-07  Karl Berry  <karl@tug.org>
- 
- 	* resident.c (getdefaults) <m>: if <= 0, set to INT_MAX.
---- texlive-branch2013-source.svn.orig/texk/dvipsk/bbox.c
-+++ texlive-branch2013-source.svn/texk/dvipsk/bbox.c
-@@ -346,8 +346,8 @@
-             if (v - bcd->ury < lly) lly = v - bcd->ury;
-             if (v - bcd->lly > ury) ury = v - bcd->lly;
-          } else {
--            if (h + bcd->ury < llx) llx = h + bcd->ury;
--            if (h + bcd->lly > urx) urx = h + bcd->lly;
-+            if (h + bcd->ury > urx) urx = h + bcd->ury;
-+            if (h + bcd->lly < llx) llx = h + bcd->lly;
-             if (v + bcd->llx < lly) lly = v + bcd->llx;
-             if (v + bcd->urx > ury) ury = v + bcd->urx;
-          }
diff --git a/office/texlive/debian/upstream-svn31358-luatex b/office/texlive/debian/upstream-svn31358-luatex
deleted file mode 100644
index 1fbacc7775e2b..0000000000000
--- a/office/texlive/debian/upstream-svn31358-luatex
+++ /dev/null
@@ -1,28 +0,0 @@
-upstream svn31358 fix for luatex
----
- texk/web2c/luatexdir/ChangeLog       |    5 +++++
- texk/web2c/luatexdir/font/writecff.w |    2 ++
- 2 files changed, 7 insertions(+)
-
---- texlive-bin.orig/texk/web2c/luatexdir/ChangeLog
-+++ texlive-bin/texk/web2c/luatexdir/ChangeLog
-@@ -1,3 +1,8 @@
-+2013-08-06  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
-+
-+	* font/writecff.w: Fix a bug in write_cid_cff(). There was not
-+	pdf_end_dict() for the corresponding pdf_begin_dict().
-+
- 2013-07-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
- 
- 	* font/writettf.w: Treat unknown 'post' table versions
---- texlive-bin.orig/texk/web2c/luatexdir/font/writecff.w
-+++ texlive-bin/texk/web2c/luatexdir/font/writecff.w
-@@ -3389,6 +3389,8 @@
-             }
-             pdf_begin_obj(pdf, cidset, OBJSTM_NEVER);
-             pdf_begin_dict(pdf);
-+            pdf_dict_add_streaminfo(pdf);
-+            pdf_end_dict(pdf);
-             pdf_begin_stream(pdf);
-             pdf_out_block(pdf, stream, l);
-             pdf_end_stream(pdf);
diff --git a/office/texlive/debian/upstream-svn31547-dvips b/office/texlive/debian/upstream-svn31547-dvips
deleted file mode 100644
index 3df7eedff3d25..0000000000000
--- a/office/texlive/debian/upstream-svn31547-dvips
+++ /dev/null
@@ -1,30 +0,0 @@
-upstream svn31547 fix for dvips
----
- texk/dvipsk/ChangeLog |    5 +++++
- texk/dvipsk/writet1.c |    4 +++-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
---- texlive-branch2013-source.svn.orig/texk/dvipsk/ChangeLog
-+++ texlive-branch2013-source.svn/texk/dvipsk/ChangeLog
-@@ -1,3 +1,8 @@
-+2013-08-31  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
-+
-+	* writet1.c: Remove UniqueID in t1_subset_ascii_part().
-+	Report from Christian Zietz (czietz@gmx.net tug.org).
-+
- 2013-08-05  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
- 
- 	* bbox.c: Fix a bug in bbdopage() to obtain correct BoundingBox in
---- texlive-branch2013-source.svn.orig/texk/dvipsk/writet1.c
-+++ texlive-branch2013-source.svn/texk/dvipsk/writet1.c
-@@ -1167,7 +1167,9 @@
-     t1_getline();
-     while (!t1_prefix("/Encoding")) {
-         t1_scan_param();
--        t1_putline();
-+        if (!(t1_prefix("/UniqueID") &&
-+            !strncmp(t1_line_array + strlen(t1_line_array) -4, "def", 3)))
-+            t1_putline();
-         t1_getline();
-     }
-     if (is_reencoded(fm_cur))
diff --git a/office/texlive/debian/upstream-svn31621-mendex b/office/texlive/debian/upstream-svn31621-mendex
deleted file mode 100644
index 90b9b9eb7b319..0000000000000
--- a/office/texlive/debian/upstream-svn31621-mendex
+++ /dev/null
@@ -1,93 +0,0 @@
-upstream svn31621 fix for mendex
----
- texk/mendexk/ChangeLog         |    9 +++++++++
- texk/mendexk/Makefile.am       |    9 +++++++++
- texk/mendexk/fwrite.c          |    4 ++--
- texk/mendexk/tests/foo.idx     |    3 +++
- texk/mendexk/tests/foo.ind     |    5 +++++
- texk/mendexk/tests/mendex.test |   16 ++++++++++++++++
- 6 files changed, 44 insertions(+), 2 deletions(-)
-
---- texlive-bin.orig/texk/mendexk/ChangeLog
-+++ texlive-bin/texk/mendexk/ChangeLog
-@@ -1,3 +1,12 @@
-+2013-09-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
-+
-+	* fwrite.c: Bug fix as suggested by Akira, Karl, and Norbert.
-+
-+	* tests/mendex.test (new): Shell script for a test case.
-+	* tests/foo.idx (new): Test input.
-+	* tests/foo.ind (new): Expected output.
-+	* Makefile.am: Adapted.
-+
- 2012-11-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
- 
- 	* Makefile.am: Avoid use of deprecated INCLUDES.
---- texlive-bin.orig/texk/mendexk/Makefile.am
-+++ texlive-bin/texk/mendexk/Makefile.am
-@@ -50,3 +50,12 @@
- 	indexsty \
- 	mendex.doc
- 
-+## Tests
-+##
-+TESTS = tests/mendex.test
-+EXTRA_DIST += $(TESTS)
-+
-+## tests/mendex.test
-+EXTRA_DIST += tests/foo.idx tests/foo.ind
-+DISTCLEANFILES = foo.*
-+
---- texlive-bin.orig/texk/mendexk/fwrite.c
-+++ texlive-bin/texk/mendexk/fwrite.c
-@@ -15,7 +15,7 @@
- static void linecheck(char *lbuff, char *tmpbuff);
- static void crcheck(char *lbuff, FILE *fp);
- 
--#define TAIL(x) (x+strlen(x))
-+#define TAIL(x) ((x)+strlen(x))
- 
- /* if we don't have vsnprintf() */
- /* #define vsnprintf(buff,len,format,argptr) vsprintf(buff,format,argptr) */
-@@ -385,7 +385,7 @@
- 					}
- 					if (strlen(ind.p[j].enc)>0) {
- 						sprintf(tmpbuff,"%s%s%s",encap_prefix,ind.p[j].enc,encap_infix);
--						sprintf(tmpbuff,"%s%s%s",ind.p[j].page,encap_suffix,delim_n);
-+						sprintf(TAIL(tmpbuff),"%s%s%s",ind.p[j].page,encap_suffix,delim_n);
- 						linecheck(lbuff,tmpbuff);
- 					}
- 				}
---- /dev/null
-+++ texlive-bin/texk/mendexk/tests/foo.idx
-@@ -0,0 +1,3 @@
-+\indexentry{foo|(}{1}
-+\indexentry{foo|mac}{1}
-+\indexentry{foo|)}{1}
---- /dev/null
-+++ texlive-bin/texk/mendexk/tests/foo.ind
-@@ -0,0 +1,5 @@
-+\begin{theindex}
-+
-+  \item foo, \mac{1}, 1
-+
-+\end{theindex}
---- /dev/null
-+++ texlive-bin/texk/mendexk/tests/mendex.test
-@@ -0,0 +1,16 @@
-+#! /bin/sh
-+
-+# Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org>
-+# You may freely use, modify and/or distribute this file.
-+
-+TEXMFCNF=$srcdir/../kpathsea
-+export TEXMFCNF
-+
-+rm -f foo.*
-+
-+./mendex $srcdir/tests/foo.idx -o foo.ind1 -t foo.ilg1 \
-+	&& diff $srcdir/tests/foo.ind foo.ind1 || exit 1
-+
-+cat $srcdir/tests/foo.idx | ./mendex >foo.ind2 2>foo.ilg2 \
-+	&& diff $srcdir/tests/foo.ind foo.ind2 || exit 1
-+
diff --git a/office/texlive/debian/upstream-svn31735-metapost b/office/texlive/debian/upstream-svn31735-metapost
deleted file mode 100644
index 07a32c162aa14..0000000000000
--- a/office/texlive/debian/upstream-svn31735-metapost
+++ /dev/null
@@ -1,33 +0,0 @@
-upstream svn31735 fix for metapost
----
- texk/web2c/mplibdir/ChangeLog |    4 ++++
- texk/web2c/mplibdir/mp.w      |    4 ++--
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
---- texlive-bin.orig/texk/web2c/mplibdir/ChangeLog
-+++ texlive-bin/texk/web2c/mplibdir/ChangeLog
-@@ -1,3 +1,7 @@
-+2013-09-23  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
-+
-+	* mp.w: A bug is fixed by Taco.
-+
- 2013-06-16 Taco Hoekwater  <taco@luatex.org>
- 
- 	Import metapost 1.803 (released version)
---- texlive-bin.orig/texk/web2c/mplibdir/mp.w
-+++ texlive-bin/texk/web2c/mplibdir/mp.w
-@@ -1,4 +1,4 @@
--% $Id: mp.w 1918 2013-06-13 12:47:55Z taco $
-+% $Id: mp.w 1924 2013-09-20 15:02:58Z taco $
- %
- % This file is part of MetaPost;
- % the MetaPost program is in the public domain.
-@@ -32727,7 +32727,7 @@
-     mp_number arg1;
-     new_number (arg1);
-     number_clone (arg1, x);
--    number_multiply_int (x, 16);
-+    number_multiply_int (arg1, 16);
-     make_scaled (x, arg1, internal_value (mp_design_size));
-     free_number (arg1);
-   }
diff --git a/office/texlive/doinst.sh b/office/texlive/doinst.sh
index 072cbba786820..5bac0e7189d05 100644
--- a/office/texlive/doinst.sh
+++ b/office/texlive/doinst.sh
@@ -1,3 +1,4 @@
 chroot . /usr/bin/mktexlsr 1>/dev/null 2>/dev/null
-chroot . /usr/bin/updmap-sys --nohash --syncwithtrees 1>/dev/null 2>/dev/null
+#printf "y\n" | chroot . /usr/bin/updmap-sys --nohash --syncwithtrees 1>/dev/null 2>/dev/null
+chroot . /usr/bin/updmap-sys 1>/dev/null 2>/dev/null
 chroot . /usr/bin/fmtutil-sys --all 1>/dev/null 2>/dev/null
diff --git a/office/texlive/patches/fix-xaw3d-linkage-in-xdvik.diff b/office/texlive/patches/fix-xaw3d-linkage-in-xdvik.diff
new file mode 100644
index 0000000000000..d7297334e816c
--- /dev/null
+++ b/office/texlive/patches/fix-xaw3d-linkage-in-xdvik.diff
@@ -0,0 +1,21 @@
+diff -Nur texlive-20140525-source.orig/texk/xdvik/events.c texlive-20140525-source/texk/xdvik/events.c
+--- texlive-20140525-source.orig/texk/xdvik/events.c	2014-04-14 03:35:50.000000000 -0500
++++ texlive-20140525-source/texk/xdvik/events.c	2014-06-15 13:18:40.762860567 -0500
+@@ -5306,7 +5306,7 @@
+ 		}
+ 
+ 		if (actp->proc == Act_wheel) {
+-#  if XAW
++#  if !MOTIF
+ 		    if (globals.widgets.y_bar != NULL)
+ 			XtCallCallbacks(globals.widgets.y_bar, XtNscrollProc,
+ 			  cast_int_to_XtPointer(dist));
+@@ -5317,7 +5317,7 @@
+ #  endif /* MOTIF */
+ 		}
+ 		else {	/* Act_hwheel */
+-#  if XAW
++#  if !MOTIF
+ 		    if (globals.widgets.x_bar != NULL)
+ 			XtCallCallbacks(globals.widgets.x_bar, XtNscrollProc,
+ 			  cast_int_to_XtPointer(dist));
diff --git a/office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff b/office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff
index ed2a7daa9333f..0dd2427361733 100644
--- a/office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff
+++ b/office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff
@@ -1,5 +1,6 @@
---- bad/texk/kpathsea/texmf.cnf	2012-05-12 18:34:52.000000000 -0500
-+++ good/texk/kpathsea/texmf.cnf	2012-07-22 19:26:15.150854012 -0500
+diff -Nur texlive-20140525-source.orig/texk/kpathsea/texmf.cnf texlive-20140525-source/texk/kpathsea/texmf.cnf
+--- texlive-20140525-source.orig/texk/kpathsea/texmf.cnf	2014-04-22 16:07:54.000000000 -0500
++++ texlive-20140525-source/texk/kpathsea/texmf.cnf	2014-06-15 11:42:32.949359812 -0500
 @@ -51,7 +51,7 @@
  % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
  % Kpathsea sets SELFAUTOLOC (the directory with the binary),
@@ -7,13 +8,13 @@
 -TEXMFROOT = $SELFAUTOPARENT
 +TEXMFROOT = $SELFAUTODIR/share
  
- % The tree containing runtime files related to the specific
- % distribution and version.
-@@ -61,7 +61,7 @@
+ % The main tree of distributed packages and programs:
  TEXMFDIST = $TEXMFROOT/texmf-dist
+@@ -61,7 +61,7 @@
+ TEXMFMAIN = $TEXMFDIST
  
  % Local additions to the distribution trees.
--TEXMFLOCAL = $TEXMFROOT/../texmf-local
+-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local
 +TEXMFLOCAL = $TEXMFROOT/texmf-local
  
  % TEXMFSYSVAR, where *-sys store cached runtime data.
diff --git a/office/texlive/patches/texcount-scalar-fixup.diff b/office/texlive/patches/texcount-scalar-fixup.diff
deleted file mode 100644
index bdd166b81a5cb..0000000000000
--- a/office/texlive/patches/texcount-scalar-fixup.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- share/texmf-dist/scripts/texcount/texcount.pl.orig	2013-11-11 18:16:18.388313783 +0000
-+++ share/texmf-dist/scripts/texcount/texcount.pl	2013-11-11 18:16:32.407314117 +0000
-@@ -2218,7 +2218,7 @@
-   }
-   $template=~s/\{VER\}/$versionnumber/gi;
-   # TODO: Should base warnings and errors on TeXcode or Main object
--  $template=__process_template($template,"W|WARN|WARNING|WARNINGS",length(%warnings));
-+  $template=__process_template($template,"W|WARN|WARNING|WARNINGS",scalar(keys %warnings));
-   $template=__process_template($template,"E|ERR|ERROR|ERRORS",$errorcount);
-   $template=__process_template($template,"S|SUM",get_sum_count($count));
-   $template=__process_template($template,"T|TITLE",$count->{'title'}||"");
diff --git a/office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff b/office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff
index 8b76100f6d2bd..7b44f5c0a669c 100644
--- a/office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff
+++ b/office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff
@@ -1,5 +1,6 @@
---- texlive-20120701-texmf/texmf-dist/web2c/texmf.cnf.orig	2013-06-22 04:30:50.766408343 -0500
-+++ texlive-20120701-texmf/texmf-dist/web2c/texmf.cnf	2013-06-22 04:31:13.717121421 -0500
+diff -Nur texlive-20140525-texmf.orig/texmf-dist/web2c/texmf.cnf texlive-20140525-texmf/texmf-dist/web2c/texmf.cnf
+--- texlive-20140525-texmf.orig/texmf-dist/web2c/texmf.cnf	2014-04-22 16:07:54.000000000 -0500
++++ texlive-20140525-texmf/texmf-dist/web2c/texmf.cnf	2014-06-15 11:42:32.949359812 -0500
 @@ -51,7 +51,7 @@
  % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
  % Kpathsea sets SELFAUTOLOC (the directory with the binary),
@@ -7,13 +8,13 @@
 -TEXMFROOT = $SELFAUTOPARENT
 +TEXMFROOT = $SELFAUTODIR/share
  
- % The tree containing runtime files related to the specific
- % distribution and version.
-@@ -61,7 +61,7 @@
+ % The main tree of distributed packages and programs:
  TEXMFDIST = $TEXMFROOT/texmf-dist
+@@ -61,7 +61,7 @@
+ TEXMFMAIN = $TEXMFDIST
  
  % Local additions to the distribution trees.
--TEXMFLOCAL = $TEXMFROOT/../texmf-local
+-TEXMFLOCAL = $SELFAUTOGRANDPARENT/texmf-local
 +TEXMFLOCAL = $TEXMFROOT/texmf-local
  
  % TEXMFSYSVAR, where *-sys store cached runtime data.
diff --git a/office/texlive/slack-desc b/office/texlive/slack-desc
index 8e68682ff9990..c3c51c9d03331 100644
--- a/office/texlive/slack-desc
+++ b/office/texlive/slack-desc
@@ -8,12 +8,12 @@
        |-----handy-ruler------------------------------------------------------|
 texlive: TeXLive (TeXLive binaries, support files, TeX formats)
 texlive:
-texlive: This package contains the binaries, support files, TeX formats and
-texlive: packages, and other files required for the TeXLive TeX distribution.
+texlive: This package contains most binaries, support files, TeX formats and
+texlive: packages, and other files included in the TeXLive TeX distribution.
 texlive: Included are input files for TeX, runtime configuration files,
 texlive: hyphenation tables, manpages, and the computer modern fonts.
 texlive:
-texlive:
-texlive:
-texlive:
+texlive: Some extra texmf can be found in the "texlive-texmf-extra" package
+texlive: and all of the docs can be found in the "texlive-texmf-docs" package,
+texlive: both of which are available at SlackBuilds.org.
 texlive:
diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index de43183baa8c4..2811c1bda151f 100644
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -2,7 +2,7 @@
 
 # TeXLive build script for Slackware
 
-# Copyright 2009-2013  Robby Workman, Northport, AL, USA
+# Copyright 2009-2014  Robby Workman, Northport, AL, USA
 # Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -23,16 +23,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# URL: ftp://tug.org/historic/systems/texlive/2013/
+# URL: ftp://tug.org/historic/systems/texlive/2014/
 
 PRGNAM=texlive
-VERSION=20130530
-BUILD=${BUILD:-2}
+VERSION=20140525
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SOURCE_VERS=$VERSION
 TEXMF_VERS=$VERSION
-EXTRA_VERS=$VERSION
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -77,15 +76,15 @@ find -L . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-# Apply patches from branch2013
-for file in $CWD/branch2013/*.diff ; do patch -p2 < $file ; done
-
-# Apply patches from debian
-for file in $CWD/debian/* ; do patch -p1 < $file ; done
+# Apply patches from branch2014
+#for file in $CWD/branch2014/*.diff ; do patch -p2 < $file ; done
 
 # Fix up some paths
 patch -p1 < $CWD/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff
 
+# http://sourceforge.net/p/xdvi/bugs/391/ 
+patch -p1 < $CWD/patches/fix-xaw3d-linkage-in-xdvik.diff
+
 unset TEXMFCNF ; export TEXMFCNF
 LANG=C ; export LANG
 KPATHSEA_WARNING=0 ; export KPATHSEA_WARNING
@@ -135,23 +134,28 @@ PATH="$PATH:$PKG/usr/bin" LD_LIBRARY_PATH=$PKG/usr/lib${LIBDIRSUFFIX}:$LD_LIBRAR
 mkdir -p $PKG/usr/doc/texlive-$VERSION
 cp -a ChangeLog README* $PKG/usr/doc/texlive-$VERSION
 
+# Put a symlink to /usr/share/texmf-dist/doc in our Slackware docdir
+ln -s ../../share/texmf-dist/doc $PKG/usr/doc/$PRGNAM-$VERSION/doc
+
 # We won't make tlmgr easily available; it's still there, but
 # we'll make it harder to void the warranty :-)
 rm -f $PKG/usr/bin/tlmgr
 cat $CWD/README.tlpkg > $PKG/usr/doc/$PRGNAM-$VERSION/README.tlpkg
 
-# Add some perl modules, at least one of which is required by updmap
-mkdir -p $PKG/usr/share/perl5
-cp -a utils/biber/TeXLive $PKG/usr/share/perl5
-tar xvf $CWD/texlive-$EXTRA_VERS-extra.tar.xz \
-  --strip-components 2 \
-  -C $PKG/usr/share/perl5 \
-  texlive-20130530-extra/tlpkg/TeXLive/
+# Install biber
+if [ "$ARCH" = "x86_64" ]; then
+  tar xf $CWD/biber-linux_x86_64.tar.gz -C $PKG/usr/bin
+elif [ "$ARCH" = "i486" ]; then
+  tar xf $CWD/biber-linux_x86_32.tar.gz -C $PKG/usr/bin
+fi
+
+# Create some directories to make it clear that they're owned by this package
+mkdir -p $PKG/usr/share/texmf-config $PKG/usr/share/texmf-var
 
 # and now we'll install the texmf stuff
 cd $TMP
-rm -rf texlive-texmf-$TEXMF_VERS
-tar xvf $CWD/texlive-texmf-$TEXMF_VERS.tar.xz -C $PKG/usr/share
+rm -rf texlive-texmf-tetexish-$TEXMF_VERS
+tar xvf $CWD/texlive-texmf-tetexish-$TEXMF_VERS.tar.xz -C $PKG/usr/share
 cd $PKG/usr/share
 chown -R root:root .
 chmod -R a-s .
@@ -164,21 +168,19 @@ find -L . \
 # Fix up some paths
 patch -p1 < $CWD/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff
 
-# Thanks to David Woodfall for this patch
-patch -p1 < $CWD/patches/texcount-scalar-fixup.diff
-
 # Move manual pages to the correct place
 # There's some duplicates of stuff that's already present in /usr/man
 # from the texlive source we just compiled above, but I'm going to
-# work from the assumption that they're identical - I just don't have
-# the requisite number of fucks to give in order to ensure that.
+# work from the assumption that they're identical - here's why:
+# http://rlworkman.net/images/barren-field.jpg
 mv $PKG/usr/share/texmf-dist/doc/man/man1/*.1 $PKG/usr/man/man1
 # No, we don't care about the pdf versions of the manual pages
 rm -rf $PKG/usr/share/texmf-dist/doc/man
 
-# We're going to put docs in our standard location (with a compat link)
-mv $PKG/usr/share/texmf-dist/doc $PKG/usr/doc/$PRGNAM-$VERSION/
-ln -s ../../doc/$PRGNAM-$VERSION/doc $PKG/usr/share/texmf-dist/doc
+# Add some perl modules, at least one of which is required by updmap
+mkdir -p $PKG/usr/share/perl5
+mv $PKG/usr/share/tlpkg/TeXLive $PKG/usr/share/perl5
+rmdir $PKG/usr/share/tlpkg
 
 # Now that we have everything in place, build xindy
 cd $TMP/texlive-$SOURCE_VERS-source/utils/xindy
diff --git a/office/texlive/texlive.info b/office/texlive/texlive.info
index d259f6965e7a7..5984a0a31280f 100644
--- a/office/texlive/texlive.info
+++ b/office/texlive/texlive.info
@@ -1,14 +1,18 @@
 PRGNAM="texlive"
-VERSION="20130530"
+VERSION="20140525"
 HOMEPAGE="http://tug.org/texlive/"
-DOWNLOAD="ftp://tug.org/historic/systems/texlive/2013/texlive-20130530-source.tar.xz \
-          ftp://tug.org/historic/systems/texlive/2013/texlive-20130530-extra.tar.xz \
-          http://slackware.org.uk/people/rworkman/sources/14.1/texlive/texlive-texmf-20130530.tar.xz"
-MD5SUM="f52599c99fb1035399b907f4c54f1125 \
-        b4bd383995200a0af3585c7997b2f5d8 \
-        78f83a7f87844e8888095d23d58fe2fb"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+DOWNLOAD="ftp://tug.org/historic/systems/texlive/2014/texlive-20140525-source.tar.xz
+          http://harrier.slackbuilds.org/texlive-2014/texlive/texlive-texmf-tetexish-20140525.tar.xz \
+          http://downloads.sourceforge.net/project/biblatex-biber/biblatex-biber/1.8/binaries/Linux/biber-linux_x86_32.tar.gz
+MD5SUM="09ee265ff51637827559affc7304078c \
+        a8498dbad49e093a9608fe57b015bf3a \
+        1011bee56611d55a1818a8698afdc6ed"
+DOWNLOAD_x86_64="ftp://tug.org/historic/systems/texlive/2014/texlive-20140525-source.tar.xz
+                 http://harrier.slackbuilds.org/texlive-2014/texlive/texlive-texmf-tetexish-20140525.tar.xz \
+                 http://downloads.sourceforge.net/project/biblatex-biber/biblatex-biber/1.8/binaries/Linux/biber-linux_x86_64.tar.gz"
+MD5SUM_x86_64="09ee265ff51637827559affc7304078c \
+               a8498dbad49e093a9608fe57b015bf3a \
+               64715ade77a7d659fd43be8773ebfdb9"
 REQUIRES="%README% libsigsegv texi2html"
 MAINTAINER="Robby Workman"
 EMAIL="rworkman@slackbuilds.org"