office/texlive: Included more patches from branch2011

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

11 files changed, 1007 insertions, 2 deletions

diff --git a/office/texlive/branch2011/12-import_test_cases_from_r24155.patch b/office/texlive/branch2011/12-import_test_cases_from_r24155.patch
new file mode 100644
index 0000000000..4388a0f7b8
--- /dev/null
+++ b/office/texlive/branch2011/12-import_test_cases_from_r24155.patch
@@ -0,0 +1,222 @@
+r24404 | peter | 2011-10-26 09:57:08 +0000 (Wed, 26 Oct 2011) | 1 line
+
+branch2011: import test cases for line number fix from trunk r24155
+
+Index: Build/source/texk/web2c/Makefile.in
+===================================================================
+--- Build/source/texk/web2c/Makefile.in	(revision 24364)
++++ Build/source/texk/web2c/Makefile.in	(revision 24404)
+@@ -1219,6 +1219,10 @@
+ EXTRA_LIBRARIES = libmf.a libmplib.a libkanji.a libpdftex.a liblua51.a \
+ 	libluasocket.a libluamisc.a libff.a libluatex.a libxetex.a \
+ 	libxetexmm.a libmd5.a
++
++# wprob.test
++
++# wprob.test
+ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h \
+ 	triptrap-sh tangle.web tangle.ch tangleboot.pin cwebdir \
+ 	ctangleboot.cin cwebboot.cin cwebboot.hin tangle.test \
+@@ -1265,39 +1269,39 @@
+ 	mplibdir/ChangeLog $(mpost_web) $(mp_tests) $(libmplib_web) \
+ 	mplibdir/lmplib.c $(etex_web_srcs) $(etex_ch_srcs) \
+ 	etexdir/ChangeLog etexdir/INSTALL etexdir/README \
+-	etexdir/etex_gen.tex $(etex_tests) etexdir/etrip/etrip.diffs \
+-	etexdir/etrip/etrip.fot etexdir/etrip/etrip.log \
+-	etexdir/etrip/etrip.out etexdir/etrip/etrip.pl \
+-	etexdir/etrip/etrip.tex etexdir/etrip/etrip.typ \
+-	etexdir/etrip/etrip1.in etexdir/etrip/etrip2.in \
+-	etexdir/etrip/etrip3.in etexdir/etrip/etripin.log \
+-	etexdir/etrip/etripman.tex etexdir/etrip/texmf.cnf \
+-	etexdir/etrip/trip2.in $(ptex_tests) $(ptex_web_srcs) \
+-	$(ptex_ch_srcs) ptexdir/ptex.defines ptexdir/pbibtex.ch \
+-	web2c/cvtbib.sed ptexdir/pdvitype.ch ptexdir/ppltotf.ch \
+-	ptexdir/ptftopl.ch ptexdir/COPYRIGHT ptexdir/COPYRIGHT.jis \
+-	ptexdir/ChangeLog ptexdir/Changes.txt ptexdir/INSTALL.txt \
+-	ptexdir/README.txt ptexdir/tests/nissya_bib.aux \
+-	ptexdir/tests/nissya.bst ptexdir/tests/sample.bib \
+-	tests/memdata1.bst tests/memdata2.bst tests/memdata3.bst \
+-	ptexdir/tests/goth10.tfm ptexdir/tests/sample.dvi \
+-	ptexdir/tests/min10.pl ptexdir/tests/min10.tfm \
+-	ptexdir/tests/tmin10.pl ptexdir/tests/tmin10.tfm \
+-	ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/texmf.cnf \
+-	$(eptex_tests) $(eptex_web_srcs) $(eptex_ch_srcs) \
+-	eptexdir/eptex.defines eptexdir/ChangeLog \
++	etexdir/etex_gen.tex $(etex_tests) tests/wprob.tex \
++	etexdir/etrip/etrip.diffs etexdir/etrip/etrip.fot \
++	etexdir/etrip/etrip.log etexdir/etrip/etrip.out \
++	etexdir/etrip/etrip.pl etexdir/etrip/etrip.tex \
++	etexdir/etrip/etrip.typ etexdir/etrip/etrip1.in \
++	etexdir/etrip/etrip2.in etexdir/etrip/etrip3.in \
++	etexdir/etrip/etripin.log etexdir/etrip/etripman.tex \
++	etexdir/etrip/texmf.cnf etexdir/etrip/trip2.in $(ptex_tests) \
++	$(ptex_web_srcs) $(ptex_ch_srcs) ptexdir/ptex.defines \
++	ptexdir/pbibtex.ch web2c/cvtbib.sed ptexdir/pdvitype.ch \
++	ptexdir/ppltotf.ch ptexdir/ptftopl.ch ptexdir/COPYRIGHT \
++	ptexdir/COPYRIGHT.jis ptexdir/ChangeLog ptexdir/Changes.txt \
++	ptexdir/INSTALL.txt ptexdir/README.txt \
++	ptexdir/tests/nissya_bib.aux ptexdir/tests/nissya.bst \
++	ptexdir/tests/sample.bib tests/memdata1.bst tests/memdata2.bst \
++	tests/memdata3.bst ptexdir/tests/goth10.tfm \
++	ptexdir/tests/sample.dvi ptexdir/tests/min10.pl \
++	ptexdir/tests/min10.tfm ptexdir/tests/tmin10.pl \
++	ptexdir/tests/tmin10.tfm ptexdir/ptrip/ptrip.diffs \
++	ptexdir/ptrip/texmf.cnf $(eptex_tests) $(eptex_web_srcs) \
++	$(eptex_ch_srcs) eptexdir/eptex.defines eptexdir/ChangeLog \
+ 	eptexdir/ChangeLog.TL eptexdir/README.txt \
+ 	eptexdir/eptrip/eptrip.diffs eptexdir/eptrip/etrip.log \
+ 	eptexdir/eptrip/etrip.tex eptexdir/eptrip/texmf.cnf \
+ 	$(pdftex_ch_srcs) etexdir/etex.ch pdftexdir/pdftex.defines \
+ 	pdftexdir/pdftex.h pdftexdir/ChangeLog pdftexdir/NEWS \
+ 	pdftexdir/README pdftexdir/change-files.txt $(pdftex_tests) \
+-	pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
+-	luatexdir/ptexlib.h luatexdir/getluatexsvnversion.sh \
+-	$(luatex_tests) luatexdir/lua51/Makefile \
+-	luatexdir/lua51/liolib.c luatexdir/lua51/lua.c \
+-	luatexdir/lua51/luac.c luatexdir/lua51/print.c \
+-	luatexdir/luasocket/src/socket_lua.c \
++	tests/wprob.tex pdftexdir/regex/COPYING.LIB \
++	pdftexdir/regex/README luatexdir/ptexlib.h \
++	luatexdir/getluatexsvnversion.sh $(luatex_tests) \
++	luatexdir/lua51/Makefile luatexdir/lua51/liolib.c \
++	luatexdir/lua51/lua.c luatexdir/lua51/luac.c \
++	luatexdir/lua51/print.c luatexdir/luasocket/src/socket_lua.c \
+ 	luatexdir/luasocket/src/ftp_lua.c \
+ 	luatexdir/luasocket/src/http_lua.c \
+ 	luatexdir/luasocket/src/smtp_lua.c \
+@@ -1456,8 +1460,8 @@
+ 	tests/xptmr.mpx tests/xstory.mpx $(nodist_libmplib_a_SOURCES) \
+ 	mp-tangle mpmath-tangle psout-tangle svgout-tangle \
+ 	$(nodist_etex_SOURCES) etex.web etex.ch etex-web2c etex.p \
+-	etex.pool etex-tangle etrip.diffs $(pweb_programs:=.c) \
+-	$(pweb_programs:=.h) $(pweb_programs:=.p) \
++	etex.pool etex-tangle etrip.diffs wprob.log wprob.tex \
++	$(pweb_programs:=.c) $(pweb_programs:=.h) $(pweb_programs:=.p) \
+ 	$(pweb_programs:=-web2c) $(pweb_programs:=.web) \
+ 	$(nodist_ptex_SOURCES) ptex.web ptex.ch ptex-web2c ptex.p \
+ 	ptex.pool ptex-tangle tests/nissya_bib.* tests/xexampl.aux \
+@@ -1467,7 +1471,7 @@
+ 	$(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c eptex.p \
+ 	eptex.pool eptex-tangle eptrip.diffs $(nodist_pdftex_SOURCES) \
+ 	pdftex.ch pdftex-web2c pdftex.p pdftex.pool pdftex-tangle \
+-	$(nodist_libluatex_a_SOURCES) txt2zlib.c \
++	wprob.log wprob.tex $(nodist_libluatex_a_SOURCES) txt2zlib.c \
+ 	$(nodist_xetex_SOURCES) xetex.web xetex-web2c xetex.p \
+ 	xetex.pool xetex-tangle $(omegaware_programs:=.c) \
+ 	$(omegaware_programs:=.h) $(omegaware_programs:=.p) \
+@@ -1681,7 +1685,7 @@
+ 
+ # e-TeX Tests
+ #
+-etex_tests = etexdir/etrip.test
++etex_tests = etexdir/wprob.test etexdir/etrip.test
+ ptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
+ ptex_ldadd = $(pproglib) $(PTEXENC_LIBS) $(LDADD)
+ p_tangle = WEBINPUTS=.:$(srcdir)/ptexdir:$(srcdir) $(buildenv) $(TANGLE)
+@@ -1806,7 +1810,7 @@
+ 
+ # pdfTeX Tests
+ #
+-pdftex_tests = pdftexdir/pdftex.test
++pdftex_tests = pdftexdir/wprob.test pdftexdir/pdftex.test
+ libpdftex_a_CPPFLAGS = $(pdftex_cppflags)
+ libpdftex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
+ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
+@@ -9056,7 +9060,6 @@
+ # Generate etex.ch
+ etex.ch: tie$(EXEEXT) etex.web $(etex_ch_srcs)
+ 	$(tie) -c etex.ch etex.web $(etex_ch_srcs)
+-
+ # etrip.test
+ etrip.diffs: etex$(EXEEXT)
+ 	$(triptrap_diffs) $@
+Index: Build/source/texk/web2c/etexdir/ChangeLog
+===================================================================
+--- Build/source/texk/web2c/etexdir/ChangeLog	(revision 24364)
++++ Build/source/texk/web2c/etexdir/ChangeLog	(revision 24404)
+@@ -1,3 +1,8 @@
++2011-09-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
++
++	* wprob.test: New shell script to test for uninitialized line.
++	* am/etex.am: Add the new test.
++
+ 2011-04-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
+ 
+ 	* etex.ch: Version 2.3, dated April 7, 2011.
+
+Property changes on: Build/source/texk/web2c/etexdir/wprob.test
+___________________________________________________________________
+Added: svn:executable
+   + *
+
+Index: Build/source/texk/web2c/etexdir/am/etex.am
+===================================================================
+--- Build/source/texk/web2c/etexdir/am/etex.am	(revision 24364)
++++ Build/source/texk/web2c/etexdir/am/etex.am	(revision 24404)
+@@ -1,6 +1,6 @@
+ ## texk/web2c/etexdir/am/etex.am: Makefile fragment for e-TeX.
+ ##
+-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
++## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+ ## You may freely use, modify and/or distribute this file.
+ 
+ ## e-TeX
+@@ -76,7 +76,7 @@
+ 
+ # e-TeX Tests
+ #
+-etex_tests = etexdir/etrip.test
++etex_tests = etexdir/wprob.test etexdir/etrip.test
+ 
+ EXTRA_DIST += $(etex_tests)
+ 
+@@ -88,6 +88,9 @@
+ endif ETEX
+ DISTCLEANFILES += etrip.diffs
+ 
++# wprob.test
++EXTRA_DIST += tests/wprob.tex
++DISTCLEANFILES += wprob.log wprob.tex
+ # etrip.test
+ etrip.diffs: etex$(EXEEXT)
+ 	$(triptrap_diffs) $@
+
+Property changes on: Build/source/texk/web2c/pdftexdir/wprob.test
+___________________________________________________________________
+Added: svn:executable
+   + *
+
+Index: Build/source/texk/web2c/pdftexdir/ChangeLog
+===================================================================
+--- Build/source/texk/web2c/pdftexdir/ChangeLog	(revision 24364)
++++ Build/source/texk/web2c/pdftexdir/ChangeLog	(revision 24404)
+@@ -1,3 +1,8 @@
++2011-09-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
++
++	* wprob.test: New shell script to test for uninitialized line.
++	* am/pdftex.am: Add the new test.
++
+ 2011-05-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
+ 
+ 	* writepng.c: #define PNG_FP_1 for libpng < 1.5.0.
+Index: Build/source/texk/web2c/pdftexdir/am/pdftex.am
+===================================================================
+--- Build/source/texk/web2c/pdftexdir/am/pdftex.am	(revision 24364)
++++ Build/source/texk/web2c/pdftexdir/am/pdftex.am	(revision 24404)
+@@ -88,7 +88,7 @@
+ 
+ # pdfTeX Tests
+ #
+-pdftex_tests = pdftexdir/pdftex.test
++pdftex_tests = pdftexdir/wprob.test pdftexdir/pdftex.test
+ 
+ EXTRA_DIST += $(pdftex_tests)
+ 
+@@ -96,3 +96,7 @@
+ TESTS += $(pdftex_tests)
+ endif PDFTEX
+ 
++# wprob.test
++EXTRA_DIST += tests/wprob.tex
++DISTCLEANFILES += wprob.log wprob.tex
++
diff --git a/office/texlive/branch2011/13-distribute_README.branch2011.patch b/office/texlive/branch2011/13-distribute_README.branch2011.patch
new file mode 100644
index 0000000000..4190a793aa
--- /dev/null
+++ b/office/texlive/branch2011/13-distribute_README.branch2011.patch
@@ -0,0 +1,36 @@
+r24405 | peter | 2011-10-26 10:00:04 +0000 (Wed, 26 Oct 2011) | 1 line
+
+branch2011: distribute README.branch2011
+
+Index: Build/source/Makefile.in
+===================================================================
+--- Build/source/Makefile.in	(revision 24404)
++++ Build/source/Makefile.in	(revision 24405)
+@@ -342,6 +342,7 @@
+ distcleancheck_listfiles = find . -type f -o -type l -print
+ EXTRA_DIST = \
+ 	Build \
++	README.branch2011 \
+ 	README.coding \
+ 	README.config \
+ 	README.cross \
+Index: Build/source/Makefile.am
+===================================================================
+--- Build/source/Makefile.am	(revision 24404)
++++ Build/source/Makefile.am	(revision 24405)
+@@ -1,6 +1,6 @@
+ ## Makefile.am for the TeX Live top-level
+ ##
+-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
++## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+ ## You may freely use, modify and/or distribute this file.
+ ##
+ ## Use 'aclocal --force' (for "computed m4_sinclude")
+@@ -15,6 +15,7 @@
+ 
+ EXTRA_DIST = \
+ 	Build \
++	README.branch2011 \
+ 	README.coding \
+ 	README.config \
+ 	README.cross \
diff --git a/office/texlive/branch2011/14-set_tardate_branch2011.patch b/office/texlive/branch2011/14-set_tardate_branch2011.patch
new file mode 100644
index 0000000000..3d4632f5a7
--- /dev/null
+++ b/office/texlive/branch2011/14-set_tardate_branch2011.patch
@@ -0,0 +1,100 @@
+r24406 | peter | 2011-10-26 10:03:55 +0000 (Wed, 26 Oct 2011) | 1 line
+
+branch2011: set tardate=branch2011 such that 'make dist' creates tex-live-branch2011.tar.*
+
+Index: Build/source/configure
+===================================================================
+--- Build/source/configure	(revision 24405)
++++ Build/source/configure	(revision 24406)
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.68 for TeX Live 2011-04-12.
++# Generated by GNU Autoconf 2.68 for TeX Live branch2011.
+ #
+ # Report bugs to <tex-k@tug.org>.
+ #
+@@ -570,8 +570,8 @@
+ # Identity of this package.
+ PACKAGE_NAME='TeX Live'
+ PACKAGE_TARNAME='tex-live'
+-PACKAGE_VERSION='2011-04-12'
+-PACKAGE_STRING='TeX Live 2011-04-12'
++PACKAGE_VERSION='branch2011'
++PACKAGE_STRING='TeX Live branch2011'
+ PACKAGE_BUGREPORT='tex-k@tug.org'
+ PACKAGE_URL=''
+ 
+@@ -1460,7 +1460,7 @@
+   # Omit some internal or obsolete options to make the list less imposing.
+   # This message is too long to be a string in the A/UX 3.1 sh.
+   cat <<_ACEOF
+-\`configure' configures TeX Live 2011-04-12 to adapt to many kinds of systems.
++\`configure' configures TeX Live branch2011 to adapt to many kinds of systems.
+ 
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+ 
+@@ -1534,7 +1534,7 @@
+ 
+ if test -n "$ac_init_help"; then
+   case $ac_init_help in
+-     short | recursive ) echo "Configuration of TeX Live 2011-04-12:";;
++     short | recursive ) echo "Configuration of TeX Live branch2011:";;
+    esac
+   cat <<\_ACEOF
+ 
+@@ -1820,7 +1820,7 @@
+ test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
+-TeX Live configure 2011-04-12
++TeX Live configure branch2011
+ generated by GNU Autoconf 2.68
+ 
+ Copyright (C) 2010 Free Software Foundation, Inc.
+@@ -2421,7 +2421,7 @@
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+-It was created by TeX Live $as_me 2011-04-12, which was
++It was created by TeX Live $as_me branch2011, which was
+ generated by GNU Autoconf 2.68.  Invocation command line was
+ 
+   $ $0 $@
+@@ -9847,7 +9847,7 @@
+ 
+ # Define the identity of the package.
+  PACKAGE='tex-live'
+- VERSION='2011-04-12'
++ VERSION='branch2011'
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -21041,7 +21041,7 @@
+ # report actual input values of CONFIG_FILES etc. instead of their
+ # values after options handling.
+ ac_log="
+-This file was extended by TeX Live $as_me 2011-04-12, which was
++This file was extended by TeX Live $as_me branch2011, which was
+ generated by GNU Autoconf 2.68.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+@@ -21098,7 +21098,7 @@
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+-TeX Live config.status 2011-04-12
++TeX Live config.status branch2011
+ configured by $0, generated by GNU Autoconf 2.68,
+   with options \\"\$ac_cs_config\\"
+ 
+Index: Build/source/tardate.ac
+===================================================================
+--- Build/source/tardate.ac	(revision 24405)
++++ Build/source/tardate.ac	(revision 24406)
+@@ -8,4 +8,4 @@
+ dnl --------------------------------------------------------
+ dnl
+ dnl  m4-include this file to define the current TeX Live tarball version
+-m4_define([tex_live_tardate], [2011-04-12])
++m4_define([tex_live_tardate], [branch2011])
diff --git a/office/texlive/branch2011/15-update_generated_files.patch b/office/texlive/branch2011/15-update_generated_files.patch
new file mode 100644
index 0000000000..5b1a815b86
--- /dev/null
+++ b/office/texlive/branch2011/15-update_generated_files.patch
@@ -0,0 +1,362 @@
+r24407 | peter | 2011-10-26 10:05:08 +0000 (Wed, 26 Oct 2011) | 1 line
+
+branch2011: update generated files
+
+Index: Build/source/libs/zziplib/configure
+===================================================================
+--- Build/source/libs/zziplib/configure	(revision 24406)
++++ Build/source/libs/zziplib/configure	(revision 24407)
+@@ -727,8 +727,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/libs/teckit/configure
+===================================================================
+--- Build/source/libs/teckit/configure	(revision 24406)
++++ Build/source/libs/teckit/configure	(revision 24407)
+@@ -738,13 +738,8 @@
+ CCC
+ CC
+ CFLAGS
+-LDFLAGS
+-LIBS
+-CPPFLAGS
+ CXXCPP
+-CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/afm2pl/configure
+===================================================================
+--- Build/source/texk/afm2pl/configure	(revision 24406)
++++ Build/source/texk/afm2pl/configure	(revision 24407)
+@@ -758,8 +758,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/dtl/configure
+===================================================================
+--- Build/source/texk/dtl/configure	(revision 24406)
++++ Build/source/texk/dtl/configure	(revision 24407)
+@@ -758,8 +758,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/xdvik/configure
+===================================================================
+--- Build/source/texk/xdvik/configure	(revision 24406)
++++ Build/source/texk/xdvik/configure	(revision 24407)
+@@ -800,7 +800,6 @@
+ LIBS
+ CPPFLAGS
+ CPP
+-CPPFLAGS
+ XMKMF'
+ ac_subdirs_all='squeeze'
+ 
+Index: Build/source/texk/lacheck/configure
+===================================================================
+--- Build/source/texk/lacheck/configure	(revision 24406)
++++ Build/source/texk/lacheck/configure	(revision 24407)
+@@ -755,8 +755,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/dvipos/configure
+===================================================================
+--- Build/source/texk/dvipos/configure	(revision 24406)
++++ Build/source/texk/dvipos/configure	(revision 24407)
+@@ -758,8 +758,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/devnag/configure
+===================================================================
+--- Build/source/texk/devnag/configure	(revision 24406)
++++ Build/source/texk/devnag/configure	(revision 24407)
+@@ -669,8 +669,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/dvi2tty/configure
+===================================================================
+--- Build/source/texk/dvi2tty/configure	(revision 24406)
++++ Build/source/texk/dvi2tty/configure	(revision 24407)
+@@ -759,8 +759,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/bibtex8/configure
+===================================================================
+--- Build/source/texk/bibtex8/configure	(revision 24406)
++++ Build/source/texk/bibtex8/configure	(revision 24407)
+@@ -758,8 +758,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/seetexk/configure
+===================================================================
+--- Build/source/texk/seetexk/configure	(revision 24406)
++++ Build/source/texk/seetexk/configure	(revision 24407)
+@@ -758,8 +758,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/xdvipdfmx/configure
+===================================================================
+--- Build/source/texk/xdvipdfmx/configure	(revision 24406)
++++ Build/source/texk/xdvipdfmx/configure	(revision 24407)
+@@ -787,8 +787,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/detex/configure
+===================================================================
+--- Build/source/texk/detex/configure	(revision 24406)
++++ Build/source/texk/detex/configure	(revision 24407)
+@@ -762,8 +762,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/ttf2pk/configure
+===================================================================
+--- Build/source/texk/ttf2pk/configure	(revision 24406)
++++ Build/source/texk/ttf2pk/configure	(revision 24407)
+@@ -765,8 +765,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/gsftopk/configure
+===================================================================
+--- Build/source/texk/gsftopk/configure	(revision 24406)
++++ Build/source/texk/gsftopk/configure	(revision 24407)
+@@ -758,8 +758,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/ttfdump/configure
+===================================================================
+--- Build/source/texk/ttfdump/configure	(revision 24406)
++++ Build/source/texk/ttfdump/configure	(revision 24407)
+@@ -751,8 +751,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/makejvf/configure
+===================================================================
+--- Build/source/texk/makejvf/configure	(revision 24406)
++++ Build/source/texk/makejvf/configure	(revision 24407)
+@@ -762,8 +762,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/dvidvi/configure
+===================================================================
+--- Build/source/texk/dvidvi/configure	(revision 24406)
++++ Build/source/texk/dvidvi/configure	(revision 24407)
+@@ -758,8 +758,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/dvipng/configure
+===================================================================
+--- Build/source/texk/dvipng/configure	(revision 24406)
++++ Build/source/texk/dvipng/configure	(revision 24407)
+@@ -813,8 +813,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/cjkutils/configure
+===================================================================
+--- Build/source/texk/cjkutils/configure	(revision 24406)
++++ Build/source/texk/cjkutils/configure	(revision 24407)
+@@ -768,8 +768,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/tex4htk/configure
+===================================================================
+--- Build/source/texk/tex4htk/configure	(revision 24406)
++++ Build/source/texk/tex4htk/configure	(revision 24407)
+@@ -762,8 +762,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/ptexenc/configure
+===================================================================
+--- Build/source/texk/ptexenc/configure	(revision 24406)
++++ Build/source/texk/ptexenc/configure	(revision 24407)
+@@ -762,8 +762,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/ps2pkm/configure
+===================================================================
+--- Build/source/texk/ps2pkm/configure	(revision 24406)
++++ Build/source/texk/ps2pkm/configure	(revision 24407)
+@@ -758,8 +758,7 @@
+ LDFLAGS
+ LIBS
+ CPPFLAGS
+-CPP
+-CPPFLAGS'
++CPP'
+ 
+ 
+ # Initialize some variables set by options.
+Index: Build/source/texk/xdv2pdf/configure
+===================================================================
+--- Build/source/texk/xdv2pdf/configure	(revision 24406)
++++ Build/source/texk/xdv2pdf/configure	(revision 24407)
+@@ -763,7 +763,6 @@
+ enable_libtool_lock
+ enable_largefile
+ enable_compiler_warnings
+-with_gnu_ld
+ with_system_kpathsea
+ with_kpathsea_includes
+ with_kpathsea_libdir
+@@ -777,19 +776,12 @@
+ LIBS
+ CPPFLAGS
+ CPP
+-CPPFLAGS
+ CXX
+ CXXFLAGS
+-LDFLAGS
+-LIBS
+-CPPFLAGS
+ CCC
+ CXXCPP
+ OBJC
+-OBJCFLAGS
+-LDFLAGS
+-LIBS
+-OBJC'
++OBJCFLAGS'
+ 
+ 
+ # Initialize some variables set by options.
diff --git a/office/texlive/branch2011/16-update_branch_log.patch b/office/texlive/branch2011/16-update_branch_log.patch
new file mode 100644
index 0000000000..2b469c7e9d
--- /dev/null
+++ b/office/texlive/branch2011/16-update_branch_log.patch
@@ -0,0 +1,74 @@
+r24408 | peter | 2011-10-26 10:11:55 +0000 (Wed, 26 Oct 2011) | 1 line
+
+update branch log
+
+Index: Build/source/README.branch2011
+===================================================================
+--- Build/source/README.branch2011	(revision 24407)
++++ Build/source/README.branch2011	(revision 24408)
+@@ -3,6 +3,65 @@
+ 
+ This file records commits made to the bug-fix branch (only).
+ ------------------------------------------------------------------------
++r24407 | peter | 2011-10-26 12:05:08 +0200 (Wed, 26 Oct 2011) | 1 line
++Changed paths:
++   M /branches/branch2011/Build/source/libs/teckit/configure
++   M /branches/branch2011/Build/source/libs/zziplib/configure
++   M /branches/branch2011/Build/source/texk/afm2pl/configure
++   M /branches/branch2011/Build/source/texk/bibtex8/configure
++   M /branches/branch2011/Build/source/texk/cjkutils/configure
++   M /branches/branch2011/Build/source/texk/detex/configure
++   M /branches/branch2011/Build/source/texk/devnag/configure
++   M /branches/branch2011/Build/source/texk/dtl/configure
++   M /branches/branch2011/Build/source/texk/dvi2tty/configure
++   M /branches/branch2011/Build/source/texk/dvidvi/configure
++   M /branches/branch2011/Build/source/texk/dvipng/configure
++   M /branches/branch2011/Build/source/texk/dvipos/configure
++   M /branches/branch2011/Build/source/texk/gsftopk/configure
++   M /branches/branch2011/Build/source/texk/lacheck/configure
++   M /branches/branch2011/Build/source/texk/makejvf/configure
++   M /branches/branch2011/Build/source/texk/ps2pkm/configure
++   M /branches/branch2011/Build/source/texk/ptexenc/configure
++   M /branches/branch2011/Build/source/texk/seetexk/configure
++   M /branches/branch2011/Build/source/texk/tex4htk/configure
++   M /branches/branch2011/Build/source/texk/ttf2pk/configure
++   M /branches/branch2011/Build/source/texk/ttfdump/configure
++   M /branches/branch2011/Build/source/texk/xdv2pdf/configure
++   M /branches/branch2011/Build/source/texk/xdvik/configure
++   M /branches/branch2011/Build/source/texk/xdvipdfmx/configure
++
++branch2011: update generated files
++
++------------------------------------------------------------------------
++r24406 | peter | 2011-10-26 12:03:55 +0200 (Wed, 26 Oct 2011) | 1 line
++Changed paths:
++   M /branches/branch2011/Build/source/configure
++   M /branches/branch2011/Build/source/tardate.ac
++
++branch2011: set tardate=branch2011 such that 'make dist' creates tex-live-branch2011.tar.*
++
++------------------------------------------------------------------------
++r24405 | peter | 2011-10-26 12:00:04 +0200 (Wed, 26 Oct 2011) | 1 line
++Changed paths:
++   M /branches/branch2011/Build/source/Makefile.am
++   M /branches/branch2011/Build/source/Makefile.in
++
++branch2011: distribute README.branch2011
++
++------------------------------------------------------------------------
++r24404 | peter | 2011-10-26 11:57:08 +0200 (Wed, 26 Oct 2011) | 1 line
++Changed paths:
++   M /branches/branch2011/Build/source/texk/web2c/Makefile.in
++   M /branches/branch2011/Build/source/texk/web2c/etexdir/ChangeLog
++   M /branches/branch2011/Build/source/texk/web2c/etexdir/am/etex.am
++   M /branches/branch2011/Build/source/texk/web2c/etexdir/wprob.test
++   M /branches/branch2011/Build/source/texk/web2c/pdftexdir/ChangeLog
++   M /branches/branch2011/Build/source/texk/web2c/pdftexdir/am/pdftex.am
++   M /branches/branch2011/Build/source/texk/web2c/pdftexdir/wprob.test
++
++branch2011: import test cases for line number fix from trunk r24155
++
++------------------------------------------------------------------------
+ r24363 | karl | 2011-10-23 01:08:32 +0200 (Sun, 23 Oct 2011) | 1 line
+ Changed paths:
+    M /branches/branch2011/Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c
diff --git a/office/texlive/branch2011/17-import_ttf2pk_bugfix_from_r24454.patch b/office/texlive/branch2011/17-import_ttf2pk_bugfix_from_r24454.patch
new file mode 100644
index 0000000000..446f98fdad
--- /dev/null
+++ b/office/texlive/branch2011/17-import_ttf2pk_bugfix_from_r24454.patch
@@ -0,0 +1,46 @@
+r24460 | peter | 2011-11-02 15:38:52 +0000 (Wed, 02 Nov 2011) | 1 line
+
+branch2011: import ttf2pk bug fix from trunk r24454
+
+Index: Build/source/texk/ttf2pk/ChangeLog
+===================================================================
+--- Build/source/texk/ttf2pk/ChangeLog	(revision 24408)
++++ Build/source/texk/ttf2pk/ChangeLog	(revision 24460)
+@@ -1,3 +1,8 @@
++2011-11-02  Peter Breitenlohner  <peb@mppmu.mpg.de>
++
++	* ttf2pk.c (main): Bug fix: mapfiles is malloc()ed, so do not
++	realloc() mapfiles+offset.
++
+ 2011-04-29  Peter Breitenlohner  <peb@mppmu.mpg.de>
+ 
+ 	* parse.c, ttfenc.c: Bug fix. Increase buffer size for increased
+Index: Build/source/texk/ttf2pk/ttf2pk.c
+===================================================================
+--- Build/source/texk/ttf2pk/ttf2pk.c	(revision 24408)
++++ Build/source/texk/ttf2pk/ttf2pk.c	(revision 24460)
+@@ -300,7 +300,8 @@
+   long inenc_array[256];
+   char *fontname;
+   size_t fontname_len;
+-  char *pk_filename, *tfm_filename, *enc_filename, *map_filename;
++  char *pk_filename, *tfm_filename, *enc_filename;
++  char *map_filename = NULL;
+   char *real_ttfname, *real_map_filename;
+   int dpi = 0, ptsize;
+   Boolean hinting = True;
+@@ -374,11 +375,14 @@
+   p = mapfiles;
+   while (*p)
+   {
++    if (map_filename)
++      free(map_filename);
+     map_filename = p;
+     while (*p != '\n')
+       p++;
+     *p++ = '\0';
+ 
++    map_filename = newstring(map_filename);
+     real_map_filename = TeX_search_map_file(&map_filename);
+     if (!real_map_filename)
+     {
diff --git a/office/texlive/branch2011/18-update_branch_log.patch b/office/texlive/branch2011/18-update_branch_log.patch
new file mode 100644
index 0000000000..15670086bb
--- /dev/null
+++ b/office/texlive/branch2011/18-update_branch_log.patch
@@ -0,0 +1,50 @@
+r24461 | peter | 2011-11-02 15:44:51 +0000 (Wed, 02 Nov 2011) | 1 line
+
+update branch log
+
+Index: Build/source/README.branch2011
+===================================================================
+--- Build/source/README.branch2011	(revision 24460)
++++ Build/source/README.branch2011	(revision 24461)
+@@ -3,6 +3,14 @@
+ 
+ This file records commits made to the bug-fix branch (only).
+ ------------------------------------------------------------------------
++r24460 | peter | 2011-11-02 16:38:52 +0100 (Wed, 02 Nov 2011) | 1 line
++Changed paths:
++   M /branches/branch2011/Build/source/texk/ttf2pk/ChangeLog
++   M /branches/branch2011/Build/source/texk/ttf2pk/ttf2pk.c
++
++branch2011: import ttf2pk bug fix from trunk r24454
++
++------------------------------------------------------------------------
+ r24407 | peter | 2011-10-26 12:05:08 +0200 (Wed, 26 Oct 2011) | 1 line
+ Changed paths:
+    M /branches/branch2011/Build/source/libs/teckit/configure
+@@ -106,6 +114,14 @@
+ branch2011: import line number fix from trunk r24155
+ 
+ ------------------------------------------------------------------------
++r23740 | karl | 2011-08-29 02:14:50 +0200 (Mon, 29 Aug 2011) | 1 line
++Changed paths:
++   M /branches/branch2011/Build/source/texk/web2c/enctex.ch
++   M /branches/branch2011/Build/source/texk/web2c/xetexdir/xetex.ch
++
++branch2011: import off-by-one fix for enctex/xetex initialization (original r23187, see also email http://tug.org/pipermail/tldistro/2011q3/000120.html)
++
++------------------------------------------------------------------------
+ r23716 | karl | 2011-08-27 01:29:30 +0200 (Sat, 27 Aug 2011) | 1 line
+ Changed paths:
+    M /branches/branch2011/Build/source/texk/web2c/synctexdir/ChangeLog
+@@ -113,11 +129,3 @@
+    M /branches/branch2011/Build/source/texk/web2c/synctexdir/synctex-xetex.h
+ 
+ branch2011: import synctex coordinate fix from trunk r23644
+-
+-------------------------------------------------------------------------
+-r23740 | karl | 2011-08-29 02:14:50 +0200 (Mon, 29 Aug 2011) | 1 line
+-Changed paths:
+-   M /branches/branch2011/Build/source/texk/web2c/enctex.ch
+-   M /branches/branch2011/Build/source/texk/web2c/xetexdir/xetex.ch
+-
+-branch2011: import off-by-one fix for enctex/xetex initialization (original r23187, see also email http://tug.org/pipermail/tldistro/2011q3/000120.html)
diff --git a/office/texlive/branch2011/19-import_cautious_create_remove_man_link.patch b/office/texlive/branch2011/19-import_cautious_create_remove_man_link.patch
new file mode 100644
index 0000000000..a4cc7d0b9f
--- /dev/null
+++ b/office/texlive/branch2011/19-import_cautious_create_remove_man_link.patch
@@ -0,0 +1,90 @@
+r24766 | peter | 2011-12-05 12:23:16 +0000 (Mon, 05 Dec 2011) | 2 lines
+
+branch2011: import more cautious creation and removal of man link
+from trunk r24727, r24728, and r24765
+
+Index: Build/source/texk/texlive/linked_scripts/Makefile.in
+===================================================================
+--- Build/source/texk/texlive/linked_scripts/Makefile.in	(revision 24461)
++++ Build/source/texk/texlive/linked_scripts/Makefile.in	(revision 24766)
+@@ -650,10 +650,12 @@
+ 	    echo "creating link '$$link' -> '$$file'"; \
+ 	    $(LN_S) $$file $$link || exit 1; \
+ 	  done && \
+-	  rm -f man && \
+-	  if test -d $(REL)/texmf/doc/man; then \
+-	    echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
+-	    (ln -s $(REL)/texmf/doc/man man || :); \
++	  if test -d "$$REL/texmf/doc/man" \
++	     && test -z "$(TL_INSTALL_OMIT_MAN_LINK)" \
++	     && (test -h man || test ! -e man); then \
++	    echo "creating link 'man' -> '$$REL/texmf/doc/man'"; \
++	    rm -f man; \
++	    (ln -s "$$REL/texmf/doc/man" man || :); \
+ 	  else :; fi
+ 
+ uninstall-hook:
+@@ -667,7 +669,9 @@
+ 	  link=`echo $$s | sed 's,.*:,,'`; \
+ 	  rm -f $(DESTDIR)$(bindir)/$$link$(WINEXT); \
+ 	done
+-@WIN32_FALSE@	rm -f $(DESTDIR)$(bindir)/man
++@WIN32_FALSE@	if test -h $(DESTDIR)$(bindir)/man; then \
++@WIN32_FALSE@	  rm -f $(DESTDIR)$(bindir)/man; \
++@WIN32_FALSE@	else :; fi
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+Index: Build/source/texk/texlive/linked_scripts/ChangeLog
+===================================================================
+--- Build/source/texk/texlive/linked_scripts/ChangeLog	(revision 24461)
++++ Build/source/texk/texlive/linked_scripts/ChangeLog	(revision 24766)
+@@ -1,3 +1,13 @@
++2011-12-05  Peter Breitenlohner  <peb@mppmu.mpg.de>
++
++	* Makefile.am (uninstall-hook): Only remove man if it is a link.
++
++2011-12-03  Karl Berry  <karl@tug.org>
++
++	* Makefile.am (install-data-hook): only create the man link if it
++	is a link already, and if TL_INSTALL_OMIT_MAN_LINK is unset
++	in the environment.  Report from Bruce Dubbs, 18 Nov 2011 18:56:22.
++
+ 2011-05-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
+ 
+ 	* Makefile.am (bin_links): Move mpost:metafun and mpost:mfplain
+Index: Build/source/texk/texlive/linked_scripts/Makefile.am
+===================================================================
+--- Build/source/texk/texlive/linked_scripts/Makefile.am	(revision 24461)
++++ Build/source/texk/texlive/linked_scripts/Makefile.am	(revision 24766)
+@@ -199,12 +199,15 @@
+ 	    echo "creating link '$$link' -> '$$file'"; \
+ 	    $(LN_S) $$file $$link || exit 1; \
+ 	  done && \
+-	  rm -f man && \
+-	  if test -d $(REL)/texmf/doc/man; then \
+-	    echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
+-	    (ln -s $(REL)/texmf/doc/man man || :); \
++	  if test -d "$$REL/texmf/doc/man" \
++	     && test -z "$(TL_INSTALL_OMIT_MAN_LINK)" \
++	     && (test -h man || test ! -e man); then \
++	    echo "creating link 'man' -> '$$REL/texmf/doc/man'"; \
++	    rm -f man; \
++	    (ln -s "$$REL/texmf/doc/man" man || :); \
+ 	  else :; fi
+-## man dir link for those mans which can use it.
++## man dir link for those mans which can use it, but don't overwrite a
++## real file, e.g., /usr/bin/man.
+ 
+ ## For WIN32 (MinGW or native) we have wrapper binaries with .exe,
+ ## for Cygwin and Unix we have symlinks without .exe.
+@@ -224,6 +227,8 @@
+ 	  rm -f $(DESTDIR)$(bindir)/$$link$(WINEXT); \
+ 	done
+ if !WIN32
+-	rm -f $(DESTDIR)$(bindir)/man
++	if test -h $(DESTDIR)$(bindir)/man; then \
++	  rm -f $(DESTDIR)$(bindir)/man; \
++	else :; fi
+ endif !WIN32
+ 
diff --git a/office/texlive/branch2011/20-update_branch_log.patch b/office/texlive/branch2011/20-update_branch_log.patch
new file mode 100644
index 0000000000..71df80dab3
--- /dev/null
+++ b/office/texlive/branch2011/20-update_branch_log.patch
@@ -0,0 +1,25 @@
+r24767 | peter | 2011-12-05 12:27:37 +0000 (Mon, 05 Dec 2011) | 1 line
+
+update branch log
+
+Index: Build/source/README.branch2011
+===================================================================
+--- Build/source/README.branch2011	(revision 24766)
++++ Build/source/README.branch2011	(revision 24767)
+@@ -3,6 +3,16 @@
+ 
+ This file records commits made to the bug-fix branch (only).
+ ------------------------------------------------------------------------
++r24766 | peter | 2011-12-05 13:23:16 +0100 (Mon, 05 Dec 2011) | 2 lines
++Changed paths:
++   M /branches/branch2011/Build/source/texk/texlive/linked_scripts/ChangeLog
++   M /branches/branch2011/Build/source/texk/texlive/linked_scripts/Makefile.am
++   M /branches/branch2011/Build/source/texk/texlive/linked_scripts/Makefile.in
++
++branch2011: import more cautious creation and removal of man link
++from trunk r24727, r24728, and r24765
++
++------------------------------------------------------------------------
+ r24460 | peter | 2011-11-02 16:38:52 +0100 (Wed, 02 Nov 2011) | 1 line
+ Changed paths:
+    M /branches/branch2011/Build/source/texk/ttf2pk/ChangeLog
diff --git a/office/texlive/branch2011/README b/office/texlive/branch2011/README
index 8ba12fddea..41e346f104 100644
--- a/office/texlive/branch2011/README
+++ b/office/texlive/branch2011/README
@@ -5,5 +5,5 @@ 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
 
 From an svn checkout, something like this will generate patches:
-  svn diff diff -r from#####:to##### > patchname
+  svn diff -r from#####:to##### > patchname
 
diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index abd351312b..122485ff1c 100644
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -27,7 +27,7 @@
 
 PRGNAM=texlive
 VERSION=20110705
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 
 SOURCE_VERS=$VERSION