summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robby Workman2012-07-30 23:26:36 +0200
committer Erik Hanson2012-08-01 02:34:11 +0200
commitf7105b06862d001142bcf86d294373f222d9f34c (patch)
tree4d9bfea70459734d34673784983016a3bd51c45c
parent9e3ad55842eb83fe6b90b28a2d5fad5ef7ff52dd (diff)
downloadslackbuilds-f7105b06862d001142bcf86d294373f222d9f34c.tar.gz
office/texlive: Updated for version 20120701.
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
-rw-r--r--office/texlive/README2
-rw-r--r--office/texlive/README.tlpkg20
-rw-r--r--office/texlive/branch2011/01-off-by-one-fix-for-enctex-xetex.patch30
-rw-r--r--office/texlive/branch2011/02-synctex-coordinate-fix.patch70
-rw-r--r--office/texlive/branch2011/03-create-README.branch2011.patch39
-rw-r--r--office/texlive/branch2011/04-line_number_fix_from_r24155.patch165
-rw-r--r--office/texlive/branch2011/05-update_README.branch2011.patch35
-rw-r--r--office/texlive/branch2011/06-buffer_overrun_fix_from_r24337.patch17
-rw-r--r--office/texlive/branch2011/07-fix_memory_corruption_from_r23592.patch49
-rw-r--r--office/texlive/branch2011/08-e-ptex_fixes_from_r23688.patch61
-rw-r--r--office/texlive/branch2011/09-update_branch_log.patch38
-rw-r--r--office/texlive/branch2011/10-luatex_array_fix_from_r24353.patch35
-rw-r--r--office/texlive/branch2011/11-update_branch_log.patch22
-rw-r--r--office/texlive/branch2011/12-import_test_cases_from_r24155.patch222
-rw-r--r--office/texlive/branch2011/13-distribute_README.branch2011.patch36
-rw-r--r--office/texlive/branch2011/14-set_tardate_branch2011.patch100
-rw-r--r--office/texlive/branch2011/15-update_generated_files.patch362
-rw-r--r--office/texlive/branch2011/16-update_branch_log.patch74
-rw-r--r--office/texlive/branch2011/17-import_ttf2pk_bugfix_from_r24454.patch46
-rw-r--r--office/texlive/branch2011/18-update_branch_log.patch50
-rw-r--r--office/texlive/branch2011/19-import_cautious_create_remove_man_link.patch90
-rw-r--r--office/texlive/branch2011/20-update_branch_log.patch25
-rw-r--r--office/texlive/branch2012/README (renamed from office/texlive/branch2011/README)2
-rw-r--r--office/texlive/doinst.sh17
-rw-r--r--office/texlive/epstopdf/README26
-rw-r--r--office/texlive/epstopdf/epstopdf.188
-rw-r--r--office/texlive/epstopdf/epstopdf.man1.pdfbin6863 -> 0 bytes
-rw-r--r--office/texlive/epstopdf/epstopdf.pl612
-rw-r--r--office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff16
-rw-r--r--office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff16
-rw-r--r--office/texlive/profile.d/texlive.csh4
-rw-r--r--office/texlive/profile.d/texlive.sh4
-rw-r--r--office/texlive/texlive.SlackBuild182
-rw-r--r--office/texlive/texlive.info12
34 files changed, 104 insertions, 2463 deletions
diff --git a/office/texlive/README b/office/texlive/README
index c02eefdb6d..0b5a26698d 100644
--- a/office/texlive/README
+++ b/office/texlive/README
@@ -11,6 +11,6 @@ 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.
+before installing TeXLive (but NOT before BUILDING it).
This requires libsigsegv.
diff --git a/office/texlive/README.tlpkg b/office/texlive/README.tlpkg
index c729676332..dfe9fcdc18 100644
--- a/office/texlive/README.tlpkg
+++ b/office/texlive/README.tlpkg
@@ -1,14 +1,14 @@
-The TeXLive Package Manager, including tlmgr(1), is shipped with this TeXLive
-package, but it's not expected to work properly (if at all). The general
-consensus from the TeXLive users mailing list is that distributions should
-not be shipping tlpkg, and while I certainly agree with that, I elected to
-ship it anyway on the off chance that some users find it desirable.
+The TeXLive Package Manager, including tlmgr(1), is not shipped with this
+TeXLive package, as it's not expected to work properly (if at all). The
+general consensus from the TeXLive users mailing list is that distributions
+should not be shipping tlpkg.
-That being said, the *proper* way to upgrade TeXLive (or any part of it) is
-through your distribution's package manager, which in this case would mean
-that you wait for a new/updated build script from SlackBuilds.org. If you
-elect to try tlmgr(1) and it doesn't work at all, or worse, it messes up
-part of your TeXLive installation, you have only yourself to blame.
+The *proper* way to upgrade TeXLive (or any part of it) is through your
+distribution's package manager, which in this case would mean that you wait
+for a new/updated build script from SlackBuilds.org (or a package from the
+person who built your package). If you elect to try tlmgr(1) (by installing
+it yourself) and it doesn't work at all, or worse, it messes up part of your
+TeXLive installation, you have only yourself to blame.
--rworkman :-)
diff --git a/office/texlive/branch2011/01-off-by-one-fix-for-enctex-xetex.patch b/office/texlive/branch2011/01-off-by-one-fix-for-enctex-xetex.patch
deleted file mode 100644
index e629dd3962..0000000000
--- a/office/texlive/branch2011/01-off-by-one-fix-for-enctex-xetex.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-r23740 | karl | 2011-08-29 00:14:50 +0000 (Mon, 29 Aug 2011) | 1 line
-
-branch2011: import off-by-one fix for enctex/xetex initialization (original r23187, see also email http://tug.org/pipermail/tldistro/2011q3/000120.html)
-
-Index: Build/source/texk/web2c/xetexdir/xetex.ch
-===================================================================
---- Build/source/texk/web2c/xetexdir/xetex.ch (revision 23739)
-+++ Build/source/texk/web2c/xetexdir/xetex.ch (revision 23740)
-@@ -328,7 +328,7 @@
- {Initialize enc\TeX\ data.}
- for i:=0 to 255 do mubyte_read[i]:=null;
- for i:=0 to 255 do mubyte_write[i]:=0;
--for i:=0 to 128 do mubyte_cswrite[i]:=null;
-+for i:=0 to 127 do mubyte_cswrite[i]:=null;
- mubyte_keep := 0; mubyte_start := false;
- write_noexpanding := false; cs_converting := false;
- special_printing := false; message_printing := false;
-Index: Build/source/texk/web2c/enctex.ch
-===================================================================
---- Build/source/texk/web2c/enctex.ch (revision 23739)
-+++ Build/source/texk/web2c/enctex.ch (revision 23740)
-@@ -42,7 +42,7 @@
- {Initialize enc\TeX\ data.}
- for i:=0 to 255 do mubyte_read[i]:=null;
- for i:=0 to 255 do mubyte_write[i]:=0;
--for i:=0 to 128 do mubyte_cswrite[i]:=null;
-+for i:=0 to 127 do mubyte_cswrite[i]:=null;
- mubyte_keep := 0; mubyte_start := false;
- write_noexpanding := false; cs_converting := false;
- special_printing := false; message_printing := false;
diff --git a/office/texlive/branch2011/02-synctex-coordinate-fix.patch b/office/texlive/branch2011/02-synctex-coordinate-fix.patch
deleted file mode 100644
index 873175896a..0000000000
--- a/office/texlive/branch2011/02-synctex-coordinate-fix.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-r23716 | karl | 2011-08-26 23:29:30 +0000 (Fri, 26 Aug 2011) | 1 line
-
-branch2011: import synctex coordinate fix from trunk r23644
-
-Index: Build/source/texk/web2c/synctexdir/synctex-luatex.h
-===================================================================
---- Build/source/texk/web2c/synctexdir/synctex-luatex.h (revision 23715)
-+++ Build/source/texk/web2c/synctexdir/synctex-luatex.h (revision 23716)
-@@ -1,6 +1,6 @@
- /* synctex-luatex.h
-
-- Copyright (c) 2010 Taco Hoekwater <taco@luatex.org>
-+ Copyright (c) 2010, 2011 Taco Hoekwater <taco@luatex.org>
-
- This file is part of LuaTeX.
-
-@@ -50,9 +50,12 @@
- #define SYNCTEX_HEIGHT(NODE) height(NODE)
- #define SYNCTEX_VALUE int_par(synctex_code)
-
--#define SYNCTEX_CURV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v)
--#define SYNCTEX_CURH static_pdf->posstruct->pos.h
-+#define SYNCTEX_CURVV (dimen_par(page_height_code)-static_pdf->posstruct->pos.v)
-+#define SYNCTEX_CURHH static_pdf->posstruct->pos.h
-
-+#define SYNCTEX_CURV (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURVV:SYNCTEX_CURVV-4736287)
-+#define SYNCTEX_CURH (static_pdf->o_mode==OMODE_PDF?SYNCTEX_CURHH:SYNCTEX_CURHH-4736287)
-+
- #define SYNCTEX_GET_JOB_NAME() makecstring(job_name)
- #define SYNCTEX_GET_LOG_NAME() get_full_log_name()
-
-Index: Build/source/texk/web2c/synctexdir/ChangeLog
-===================================================================
---- Build/source/texk/web2c/synctexdir/ChangeLog (revision 23715)
-+++ Build/source/texk/web2c/synctexdir/ChangeLog (revision 23716)
-@@ -1,3 +1,8 @@
-+2011-08-22 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
-+
-+ * synctex-luatex.h, synctex-xetex.h: Define SYNCTEX_CURH and
-+ SYNCTEX_CURH to yield correct coordinates in dvi and pdf mode.
-+
- 2011-06-11 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
-
- * synctex_parser_utils.c: fix a typo.
-Index: Build/source/texk/web2c/synctexdir/synctex-xetex.h
-===================================================================
---- Build/source/texk/web2c/synctexdir/synctex-xetex.h (revision 23715)
-+++ Build/source/texk/web2c/synctexdir/synctex-xetex.h (revision 23716)
-@@ -1,9 +1,9 @@
- /*
--Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr
-+Copyright (c) 2008-2011 jerome DOT laurens AT u-bourgogne DOT fr
-
- This file is part of the SyncTeX package.
-
--Latest Revision: Wed Jul 1 11:16:29 UTC 2009
-+Latest Revision: Wed Aug 22 07:20:29 UTC 2011
-
- License:
- --------
-@@ -57,6 +57,9 @@
- # define SYNCTEX_OFFSET_IS_PDF (nopdfoutput==0)
- # define SYNCTEX_OUTPUT (nopdfoutput!=0?"xdv":"pdf")
-
-+#define SYNCTEX_CURH ((nopdfoutput==0)?(curh+4736287):curh)
-+#define SYNCTEX_CURV ((nopdfoutput==0)?(curv+4736287):curv)
-+
- /* WARNING:
- The definition below must be in sync with their eponym declarations in synctex-xetex.ch1
- */
diff --git a/office/texlive/branch2011/03-create-README.branch2011.patch b/office/texlive/branch2011/03-create-README.branch2011.patch
deleted file mode 100644
index 03fc88049a..0000000000
--- a/office/texlive/branch2011/03-create-README.branch2011.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-r23991 | karl | 2011-09-17 15:17:33 +0000 (Sat, 17 Sep 2011) | 1 line
-
-branch2011: README.branch2011 file to record branch commits
-
-Index: Build/source/README.branch2011
-===================================================================
---- Build/source/README.branch2011 (revision 0)
-+++ Build/source/README.branch2011 (revision 23991)
-@@ -0,0 +1,22 @@
-+$Id$
-+Public domain. Originally written 2011 by Karl Berry.
-+
-+This file records commits made to the bug-fix branch (only).
-+
-+------------------------------------------------------------------------
-+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
-+ M /branches/branch2011/Build/source/texk/web2c/synctexdir/synctex-luatex.h
-+ 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)
-+------------------------------------------------------------------------
-
-Property changes on: Build/source/README.branch2011
-___________________________________________________________________
-Added: svn:keywords
- + Date Author Id
-Added: svn:eol-style
- + native
-
diff --git a/office/texlive/branch2011/04-line_number_fix_from_r24155.patch b/office/texlive/branch2011/04-line_number_fix_from_r24155.patch
deleted file mode 100644
index 3fd54b505e..0000000000
--- a/office/texlive/branch2011/04-line_number_fix_from_r24155.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-r24159 | karl | 2011-09-30 23:23:37 +0000 (Fri, 30 Sep 2011) | 1 line
-
-branch2011: import line number fix from trunk r24155
-
-Index: Build/source/texk/web2c/luatexdir/tex/inputstack.w
-===================================================================
---- Build/source/texk/web2c/luatexdir/tex/inputstack.w (revision 24158)
-+++ Build/source/texk/web2c/luatexdir/tex/inputstack.w (revision 24159)
-@@ -307,12 +307,13 @@
- print_int(iname - 1);
- print_char('>');
- };
-- } else if (iindex != in_open) { /* input from a pseudo file */
-- tprint_nl("l.");
-- print_int(line_stack[iindex + 1]);
- } else {
- tprint_nl("l.");
-- print_int(line);
-+ if (iindex == in_open) {
-+ print_int(line);
-+ } else { /* input from a pseudo file */
-+ print_int(line_stack[iindex + 1]);
-+ }
- }
- print_char(' ');
- PSEUDO_PRINT_THE_LINE();
-Index: Build/source/texk/web2c/luatexdir/tex/printing.w
-===================================================================
---- Build/source/texk/web2c/luatexdir/tex/printing.w (revision 24158)
-+++ Build/source/texk/web2c/luatexdir/tex/printing.w (revision 24159)
-@@ -946,7 +946,7 @@
- if (level == in_open)
- print_int(line);
- else
-- print_int(line_stack[iindex + 1 - (in_open - level)]);
-+ print_int(line_stack[level + 1]);
- tprint(": ");
- }
- }
-Index: Build/source/texk/web2c/tex.ch
-===================================================================
---- Build/source/texk/web2c/tex.ch (revision 24158)
-+++ Build/source/texk/web2c/tex.ch (revision 24159)
-@@ -4532,7 +4532,7 @@
- else begin
- print_nl (""); print (full_source_filename_stack[level]); print (":");
- if level=in_open then print_int (line)
-- else print_int (line_stack[index+1-(in_open-level)]);
-+ else print_int (line_stack[level+1]);
- print (": ");
- end;
- end;
-Index: Build/source/texk/web2c/tests/wprob.tex
-===================================================================
---- Build/source/texk/web2c/tests/wprob.tex (revision 0)
-+++ Build/source/texk/web2c/tests/wprob.tex (revision 24159)
-@@ -0,0 +1,15 @@
-+\catcode`\%=14
-+
-+\catcode`\{=1
-+\catcode`\}=2
-+\catcode`\#=6
-+
-+\def\err#1{%
-+ \errmessage{Could not open file #1}%
-+}
-+\scantokens{
-+ \err{NoSuchFile.eps}
-+} % The message above should be >>./wprob.tex:12: Could not open...<<
-+\end
-+
-+
-
-Property changes on: Build/source/texk/web2c/tests/wprob.tex
-___________________________________________________________________
-Added: svn:eol-style
- + native
-
-Index: Build/source/texk/web2c/etexdir/wprob.test
-===================================================================
---- Build/source/texk/web2c/etexdir/wprob.test (revision 0)
-+++ Build/source/texk/web2c/etexdir/wprob.test (revision 24159)
-@@ -0,0 +1,14 @@
-+#! /bin/sh
-+
-+# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
-+# You may freely use, modify and/or distribute this file.
-+
-+rm -rf wprob.*
-+cp $srcdir/tests/wprob.tex .
-+
-+TEXMFCNF=$srcdir/../kpathsea \
-+ ./etex --ini --etex --file-line-error --interaction=nonstopmode wprob.tex
-+
-+grep '^\./wprob\.tex:12: Could not open file NoSuchFile\.eps\.$' \
-+ wprob.log || exit 1
-+
-Index: Build/source/texk/web2c/etexdir/etex.ch
-===================================================================
---- Build/source/texk/web2c/etexdir/etex.ch (revision 24158)
-+++ Build/source/texk/web2c/etexdir/etex.ch (revision 24159)
-@@ -871,10 +871,9 @@
- @x [22] m.313 l.6809 - e-TeX scan_tokens
- else begin print_nl("l."); print_int(line);
- @y
--else if index<>in_open then {input from a pseudo file}
-- begin print_nl("l."); print_int(line_stack[index+1]);
-- end
--else begin print_nl("l."); print_int(line);
-+else begin print_nl("l.");
-+ if index=in_open then print_int(line)
-+ else print_int(line_stack[index+1]); {input from a pseudo file}
- @z
- %---------------------------------------
- @x [22] m.314 l.6831 - e-TeX basic
-Index: Build/source/texk/web2c/alephdir/eobase.ch
-===================================================================
---- Build/source/texk/web2c/alephdir/eobase.ch (revision 24158)
-+++ Build/source/texk/web2c/alephdir/eobase.ch (revision 24159)
-@@ -805,10 +805,9 @@
- @x [22] m.313 l.6794 - e-TeX scan_tokens
- else begin print_nl("l."); print_int(line);
- @y
--else if index<>in_open then {input from a pseudo file}
-- begin print_nl("l."); print_int(line_stack[index+1]);
-- end
--else begin print_nl("l."); print_int(line);
-+else begin print_nl("l.");
-+ if index=in_open then print_int(line)
-+ else print_int(line_stack[index+1]); {input from a pseudo file}
- @z
- %---------------------------------------
- @x [22] m.314 l.6814 - e-TeX basic
-Index: Build/source/texk/web2c/alephdir/com16bit.ch
-===================================================================
---- Build/source/texk/web2c/alephdir/com16bit.ch (revision 24158)
-+++ Build/source/texk/web2c/alephdir/com16bit.ch (revision 24159)
-@@ -2784,7 +2784,7 @@
- else begin
- print_nl (""); print (full_source_filename_stack[level]); print (":");
- if level=in_open then print_int (line)
-- else print_int (line_stack[index+1-(in_open-level)]);
-+ else print_int (line_stack[level+1]);
- print (": ");
- end;
- end;
-Index: Build/source/texk/web2c/pdftexdir/wprob.test
-===================================================================
---- Build/source/texk/web2c/pdftexdir/wprob.test (revision 0)
-+++ Build/source/texk/web2c/pdftexdir/wprob.test (revision 24159)
-@@ -0,0 +1,14 @@
-+#! /bin/sh
-+
-+# Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
-+# You may freely use, modify and/or distribute this file.
-+
-+rm -rf wprob.*
-+cp $srcdir/tests/wprob.tex .
-+
-+TEXMFCNF=$srcdir/../kpathsea \
-+ ./pdftex --ini --etex --file-line-error --interaction=nonstopmode wprob.tex
-+
-+grep '^\./wprob\.tex:12: Could not open file NoSuchFile\.eps\.$' \
-+ wprob.log || exit 1
-+
diff --git a/office/texlive/branch2011/05-update_README.branch2011.patch b/office/texlive/branch2011/05-update_README.branch2011.patch
deleted file mode 100644
index e061114360..0000000000
--- a/office/texlive/branch2011/05-update_README.branch2011.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-r24160 | karl | 2011-09-30 23:24:53 +0000 (Fri, 30 Sep 2011) | 1 line
-
-update README.branch2011
-
-Index: Build/source/README.branch2011
-===================================================================
---- Build/source/README.branch2011 (revision 24159)
-+++ Build/source/README.branch2011 (revision 24160)
-@@ -4,6 +4,21 @@
- This file records commits made to the bug-fix branch (only).
-
- ------------------------------------------------------------------------
-+r24159 | karl | 2011-10-01 01:23:37 +0200 (Sat, 01 Oct 2011) | 1 line
-+Changed paths:
-+ M /branches/branch2011/Build/source/texk/web2c/alephdir/com16bit.ch
-+ M /branches/branch2011/Build/source/texk/web2c/alephdir/eobase.ch
-+ M /branches/branch2011/Build/source/texk/web2c/etexdir/etex.ch
-+ A /branches/branch2011/Build/source/texk/web2c/etexdir/wprob.test
-+ M /branches/branch2011/Build/source/texk/web2c/luatexdir/tex/inputstack.w
-+ M /branches/branch2011/Build/source/texk/web2c/luatexdir/tex/printing.w
-+ A /branches/branch2011/Build/source/texk/web2c/pdftexdir/wprob.test
-+ A /branches/branch2011/Build/source/texk/web2c/tests/wprob.tex
-+ M /branches/branch2011/Build/source/texk/web2c/tex.ch
-+
-+branch2011: import line number fix from trunk r24155
-+
-+------------------------------------------------------------------------
- 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
-@@ -19,4 +34,3 @@
- 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/06-buffer_overrun_fix_from_r24337.patch b/office/texlive/branch2011/06-buffer_overrun_fix_from_r24337.patch
deleted file mode 100644
index e54389c0a1..0000000000
--- a/office/texlive/branch2011/06-buffer_overrun_fix_from_r24337.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-r24346 | karl | 2011-10-20 23:50:28 +0000 (Thu, 20 Oct 2011) | 1 line
-
-branch2011: import buffer overrun fix from trunk r24337
-
-Index: Build/source/texk/dvipsk/dospecial.c
-===================================================================
---- Build/source/texk/dvipsk/dospecial.c (revision 24345)
-+++ Build/source/texk/dvipsk/dospecial.c (revision 24346)
-@@ -112,7 +112,7 @@
- fgetboundingbox(char *f, float *llx_p, float *lly_p, float *urx_p, float *ury_p)
- {
- FILE *fp;
-- char buf[BUFSIZ];
-+ char buf[BUFSIZ+1];
-
- fp = search(figpath, f, READ);
- if (fp == 0)
diff --git a/office/texlive/branch2011/07-fix_memory_corruption_from_r23592.patch b/office/texlive/branch2011/07-fix_memory_corruption_from_r23592.patch
deleted file mode 100644
index e466312c28..0000000000
--- a/office/texlive/branch2011/07-fix_memory_corruption_from_r23592.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-r24347 | karl | 2011-10-20 23:54:25 +0000 (Thu, 20 Oct 2011) | 1 line
-
-branch2011: import memory corruption, part of r23592, per Hironori Kitagawa, 19 Oct 2011 07:44:35
-
-Index: Build/source/texk/web2c/ptexdir/ptex-base.ch
-===================================================================
---- Build/source/texk/web2c/ptexdir/ptex-base.ch (revision 24346)
-+++ Build/source/texk/web2c/ptexdir/ptex-base.ch (revision 24347)
-@@ -5855,6 +5855,9 @@
- var @!jc:KANJI_code; {temporary register for KANJI}
- @!sp,@!mp,@!ep:pointer;
- begin@/
-+if f=null_font then
-+ begin get_jfm_pos:=kchar_type(null_font)(0); return;
-+ end;
- jc:=toDVI(kcode);
- sp:=1; { start position }
- ep:=font_num_ext[f]-1; { end position }
-@@ -6684,11 +6687,13 @@
- goto main_loop_j+3;
- @#
- main_loop_j+1: space_factor:=1000;
-- fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l;
-- link(tail):=main_p; tail:=main_p; last_jchr:=tail;
-- fast_get_avail(main_p); info(main_p):=KANJI(cur_chr);
-- link(tail):=main_p; tail:=main_p;
-- cx:=cur_chr; @<Insert kinsoku penalty@>;
-+ if main_f<>null_font then
-+ begin fast_get_avail(main_p); font(main_p):=main_f; character(main_p):=cur_l;
-+ link(tail):=main_p; tail:=main_p; last_jchr:=tail;
-+ fast_get_avail(main_p); info(main_p):=KANJI(cur_chr);
-+ link(tail):=main_p; tail:=main_p;
-+ cx:=cur_chr; @<Insert kinsoku penalty@>;
-+ end;
- ins_kp:=false;
- again_2:
- get_next;
-@@ -6724,7 +6729,10 @@
- @#
- main_loop_j+3:
- if ins_kp=true then @<Insert |pre_break_penalty| of |cur_chr|@>;
-- @<Look ahead for glue or kerning@>;
-+ if main_f<>null_font then
-+ begin @<Look ahead for glue or kerning@>;
-+ end
-+ else inhibit_glue_flag:=false;
- if ins_kp=false then begin { Kanji -> Kanji }
- goto main_loop_j+1;
- end else if ins_kp=true then begin { Kanji -> Ascii }
diff --git a/office/texlive/branch2011/08-e-ptex_fixes_from_r23688.patch b/office/texlive/branch2011/08-e-ptex_fixes_from_r23688.patch
deleted file mode 100644
index 36e4dd2d3c..0000000000
--- a/office/texlive/branch2011/08-e-ptex_fixes_from_r23688.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-r24348 | karl | 2011-10-20 23:59:55 +0000 (Thu, 20 Oct 2011) | 1 line
-
-branch2011: import e-ptex fixes from trunk r23688
-
-Index: Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0
-===================================================================
---- Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0 (revision 24347)
-+++ Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0 (revision 24348)
-@@ -1,4 +1,4 @@
--Copyright (c) 2008, 2009 jerome DOT laurens AT u-bourgogne DOT fr
-+Copyright (c) 2008-2011 jerome DOT laurens AT u-bourgogne DOT fr
-
- This file is part of the SyncTeX package.
-
-@@ -82,21 +82,11 @@
- link(prev_p):=p;
- @z
-
--@x etex.ch l.4126
-- if is_char_node(p) then r:=get_avail
-- else case type(p) of
-+@x etex.ch l.4186
- hlist_node,vlist_node: begin r:=get_node(box_node_size);
-- mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
-- words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
-- end;
- @y
-- if is_char_node(p) then r:=get_avail
-- else case type(p) of
- hlist_node,vlist_node: begin r:=get_node(box_node_size);
- @<Copy the box {\sl Sync\TeX} information@>;
-- mem[r+6]:=mem[p+6]; mem[r+5]:=mem[p+5]; {copy the last two words}
-- words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
-- end;
- @z
-
- @x synctex-e-mem.ch0 l.100
-Index: Build/source/texk/web2c/eptexdir/eptex.ech
-===================================================================
---- Build/source/texk/web2c/eptexdir/eptex.ech (revision 24347)
-+++ Build/source/texk/web2c/eptexdir/eptex.ech (revision 24348)
-@@ -283,6 +283,19 @@
- othercases goto next_p
- @z
-
-+@x e-pTeX: just_copy
-+ hlist_node,vlist_node: begin r:=get_node(box_node_size);
-+@y
-+ dir_node,
-+ hlist_node,vlist_node: begin r:=get_node(box_node_size);
-+@z
-+@x e-pTeX: just_copy
-+ words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
-+@y
-+ words:=5; list_ptr(r):=null; {this affects |mem[r+5]|}
-+ add_glue_ref(space_ptr(r)); add_glue_ref(xspace_ptr(r));
-+@z
-+
- @x e-pTeX: ifcsname l.28620
- buffer[m]:=info(p) mod @'400; incr(m); p:=link(p);
- @y
diff --git a/office/texlive/branch2011/09-update_branch_log.patch b/office/texlive/branch2011/09-update_branch_log.patch
deleted file mode 100644
index a80c42dcfd..0000000000
--- a/office/texlive/branch2011/09-update_branch_log.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-r24349 | karl | 2011-10-21 00:04:02 +0000 (Fri, 21 Oct 2011) | 1 line
-
-update branch log
-
-Index: Build/source/README.branch2011
-===================================================================
---- Build/source/README.branch2011 (revision 24348)
-+++ Build/source/README.branch2011 (revision 24349)
-@@ -2,8 +2,29 @@
- Public domain. Originally written 2011 by Karl Berry.
-
- This file records commits made to the bug-fix branch (only).
-+------------------------------------------------------------------------
-+r24348 | karl | 2011-10-21 01:59:55 +0200 (Fri, 21 Oct 2011) | 1 line
-+Changed paths:
-+ M /branches/branch2011/Build/source/texk/web2c/eptexdir/eptex.ech
-+ M /branches/branch2011/Build/source/texk/web2c/synctexdir/synctex-e-rec.ch0
-
-+branch2011: import e-ptex fixes from trunk r23688
-+
- ------------------------------------------------------------------------
-+r24347 | karl | 2011-10-21 01:54:25 +0200 (Fri, 21 Oct 2011) | 1 line
-+Changed paths:
-+ M /branches/branch2011/Build/source/texk/web2c/ptexdir/ptex-base.ch
-+
-+branch2011: import memory corruption, part of r23592, per Hironori Kitagawa, 19 Oct 2011 07:44:35
-+
-+------------------------------------------------------------------------
-+r24346 | karl | 2011-10-21 01:50:28 +0200 (Fri, 21 Oct 2011) | 1 line
-+Changed paths:
-+ M /branches/branch2011/Build/source/texk/dvipsk/dospecial.c
-+
-+branch2011: import buffer overrun fix from trunk r24337
-+
-+------------------------------------------------------------------------
- r24159 | karl | 2011-10-01 01:23:37 +0200 (Sat, 01 Oct 2011) | 1 line
- Changed paths:
- M /branches/branch2011/Build/source/texk/web2c/alephdir/com16bit.ch
diff --git a/office/texlive/branch2011/10-luatex_array_fix_from_r24353.patch b/office/texlive/branch2011/10-luatex_array_fix_from_r24353.patch
deleted file mode 100644
index d2fadb9d10..0000000000
--- a/office/texlive/branch2011/10-luatex_array_fix_from_r24353.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-r24363 | karl | 2011-10-22 23:08:32 +0000 (Sat, 22 Oct 2011) | 1 line
-
-branch2011: import luatex array fix from trunk r24353
-
-Index: Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c
-===================================================================
---- Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c (revision 24362)
-+++ Build/source/texk/web2c/luatexdir/luafontloader/fontforge/fontforge/psread.c (revision 24363)
-@@ -385,7 +385,7 @@
- wrapper->top = io;
- }
-
--static int ioescapestopped(IO *wrapper, struct psstack *stack, int sp) {
-+static int ioescapestopped(IO *wrapper, struct psstack *stack, int sp, const size_t bsize) {
- _IO *io = wrapper->top, *iop;
- int wasstopped;
-
-@@ -396,7 +396,7 @@
- free(io);
- if ( wasstopped ) {
- wrapper->top = iop;
-- if ( sp<(int)(sizeof(stack)/sizeof(stack[0])) ) {
-+ if ( sp<(int)bsize ) {
- stack[sp].type = ps_bool;
- stack[sp++].u.tf = true;
- }
-@@ -1609,7 +1609,7 @@
- }
- break;
- case pt_stop:
-- sp = ioescapestopped(wrapper,stack,sp);
-+ sp = ioescapestopped(wrapper,stack,sp,sizeof(stack)/sizeof(stack[0]));
- break;
- case pt_load:
- if ( sp>=1 && stack[sp-1].type==ps_lit ) {
diff --git a/office/texlive/branch2011/11-update_branch_log.patch b/office/texlive/branch2011/11-update_branch_log.patch
deleted file mode 100644
index 48fa9dc489..0000000000
--- a/office/texlive/branch2011/11-update_branch_log.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-r24364 | karl | 2011-10-22 23:09:20 +0000 (Sat, 22 Oct 2011) | 1 line
-
-update branch log
-
-Index: Build/source/README.branch2011
-===================================================================
---- Build/source/README.branch2011 (revision 24363)
-+++ Build/source/README.branch2011 (revision 24364)
-@@ -3,6 +3,13 @@
-
- This file records commits made to the bug-fix branch (only).
- ------------------------------------------------------------------------
-+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
-+
-+branch2011: import luatex array fix from trunk r24353
-+
-+------------------------------------------------------------------------
- r24348 | karl | 2011-10-21 01:59:55 +0200 (Fri, 21 Oct 2011) | 1 line
- Changed paths:
- M /branches/branch2011/Build/source/texk/web2c/eptexdir/eptex.ech
diff --git a/office/texlive/branch2011/12-import_test_cases_from_r24155.patch b/office/texlive/branch2011/12-import_test_cases_from_r24155.patch
deleted file mode 100644
index 4388a0f7b8..0000000000
--- a/office/texlive/branch2011/12-import_test_cases_from_r24155.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-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
deleted file mode 100644
index 4190a793aa..0000000000
--- a/office/texlive/branch2011/13-distribute_README.branch2011.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 3d4632f5a7..0000000000
--- a/office/texlive/branch2011/14-set_tardate_branch2011.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-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
deleted file mode 100644
index 5b1a815b86..0000000000
--- a/office/texlive/branch2011/15-update_generated_files.patch
+++ /dev/null
@@ -1,362 +0,0 @@
-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
deleted file mode 100644
index 2b469c7e9d..0000000000
--- a/office/texlive/branch2011/16-update_branch_log.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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
deleted file mode 100644
index 446f98fdad..0000000000
--- a/office/texlive/branch2011/17-import_ttf2pk_bugfix_from_r24454.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index 15670086bb..0000000000
--- a/office/texlive/branch2011/18-update_branch_log.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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
deleted file mode 100644
index a4cc7d0b9f..0000000000
--- a/office/texlive/branch2011/19-import_cautious_create_remove_man_link.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-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
deleted file mode 100644
index 71df80dab3..0000000000
--- a/office/texlive/branch2011/20-update_branch_log.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/branch2012/README
index 41e346f104..54d43468f7 100644
--- a/office/texlive/branch2011/README
+++ b/office/texlive/branch2012/README
@@ -1,5 +1,5 @@
This directory should contain only patches from the stable branch of
-TeXLive 2011 <http://tug.org/svn/texlive/branches/branch2011>
+TeXLive 2012 <http://tug.org/svn/texlive/branches/branch2012>
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
diff --git a/office/texlive/doinst.sh b/office/texlive/doinst.sh
index 22da4eb4c2..ef65a367b2 100644
--- a/office/texlive/doinst.sh
+++ b/office/texlive/doinst.sh
@@ -1,17 +1,8 @@
-# Temporarily add /usr/share/texmf/bin to $PATH or
-# the updmap-sys and fmtutil-sys calls will not work
-TEMP_PATH=$PATH
-export PATH=/usr/share/texmf/bin:$PATH
-
# This one shouldn't be needed, but just in case...
-chroot . /usr/share/texmf/bin/mktexlsr 1>/dev/null 2>/dev/null
+chroot . /usr/bin/mktexlsr 1>/dev/null 2>/dev/null
# This is to generate /usr/share/texmf-var/ stuff
-chroot . /usr/share/texmf/bin/updmap-sys --nohash --syncwithtrees 1>/dev/null 2>/dev/null
-chroot . /usr/share/texmf/bin/mktexlsr 1>/dev/null 2>/dev/null
-chroot . /usr/share/texmf/bin/fmtutil-sys --all 1>/dev/null 2>/dev/null
-
-# Just in case...
-export PATH=$TEMP_PATH
-unset TEMP_PATH
+chroot . /usr/bin/updmap-sys --nohash --syncwithtrees 1>/dev/null 2>/dev/null
+chroot . /usr/bin/mktexlsr 1>/dev/null 2>/dev/null
+chroot . /usr/bin/fmtutil-sys --all 1>/dev/null 2>/dev/null
diff --git a/office/texlive/epstopdf/README b/office/texlive/epstopdf/README
deleted file mode 100644
index 0338f4fada..0000000000
--- a/office/texlive/epstopdf/README
+++ /dev/null
@@ -1,26 +0,0 @@
-$Id: README 15641 2009-10-04 16:42:16Z karl $
-This file is public domain. (Originally written by Karl Berry, 2009.)
-
-This is the README for the epstopdf script distribution.
-
-Primary distribution point: http://mirror.ctan.org/support/epstopdf/
- (list of mirrors at: http://ctan.org/mirrors)
-
-Home page: http://tug.org/epstopdf/
-
-Mailing list for bugs and discussion: http://lists.tug.org/tex-k
-When reporting bugs, please include an input file and command line
-options so the problem can be reproduced.
-
--------------------------------------------------------------------------
-The test-binary and test-bin2 files were supplied by Akira Kakuto and
-Reinhard Kotucha. They contain binary data. They are public domain.
-
-The test-binhdr* files were supplied by Martin von Gagern, constructed
-as follows. They contain binary junk before the EPS starts. We also
-use these to test different line endings. These files are public domain.
-
-{ echo -e '%Some\000binary\001comment'; dot -Tps <<< 'digraph{a->b}'; }
- > test-binhdr-lf.eps
-tr $'\n' $'\r' <test-binhdr-lf.eps >test-binhdr-cr.ps
-unix2dos <test-binhdr-lf.eps >test-binhdr-cr.ps
diff --git a/office/texlive/epstopdf/epstopdf.1 b/office/texlive/epstopdf/epstopdf.1
deleted file mode 100644
index ac57d1dc7d..0000000000
--- a/office/texlive/epstopdf/epstopdf.1
+++ /dev/null
@@ -1,88 +0,0 @@
-.TH EPSTOPDF 1 "18 March 2010"
-.\" $Id: epstopdf.1 18160 2010-05-09 00:02:00Z karl $
-.SH NAME
-epstopdf, repstopdf \- convert an EPS file to PDF
-.SH SYNOPSIS
-\fBepstopdf\fP [\fIoptions\fP] [\fIepsfile\fP]
-.SH DESCRIPTION
-\fBepstopdf\fP transforms the Encapsulated PostScript file \fIepsfile\fP
-(or standard input) so that it is guaranteed to start at the 0,0
-coordinate, and it sets a page size exactly corresponding to the
-BoundingBox. This means that when Ghostscript renders it, the result
-needs no cropping, and the PDF MediaBox is correct. By default, the
-result is piped to Ghostscript and a PDF version written.
-.P
-If the bounding box is not right, of course, there are problems.
-.SH OPTIONS
-.IP "\fB--outfile\fP=\fIfile\fP"
-write result to \fIfile\fP. If this option is not given, and
-\fB--nogs\fP or \fB--filter\fP is specified, write to standard output;
-otherwise, the default is to construct the output file name by replacing
-any extension in the input file with \fI.pdf\fP.
-.IP "\fB--\fP[\fBno\fP]\fBcompress\fP"
-use compression (default: on).
-.IP "\fB--\fP[\fBno\fP]\fBdebug\fP"
-write debugging info (default: off).
-.IP "\fB--\fP[\fBno\fP]\fBembed\fP"
-embed fonts (default: on).
-.IP "\fB--\fP[\fBno\fP]\fBexact\fP"
-scan ExactBoundingBox (default: off).
-.IP "\fB--\fP[\fBno\fP]\fBfilter\fP"
-read standard input and (unless \fB--outfile\fP is given) write standard
-output(default: off).
-.IP "\fB--\fP[\fBno\fP]\fBgs\fP"
-run Ghostscript (default: on). With \fB--nogs\fP, output (to standard
-output by default) the PostScript that would normally be converted; that
-is, the input PostScript as modified by \fBepstopdf\fP.
-.IP "\fB--\fP[\fBno\fP]\fBhires\fP"
-scan HiresBoundingBox (default: off).
-.IP "\fB--gscmd\fP=\fIval\fP"
-pipe output to \fIval\fP (default: [\fBgswin32c\fP on Windows, else \fBgs\fP])
-.IP "\fB--res\fP=\fIdpi\fP"
-set image resolution (default: [use gs default])
-.IP "\fB--autorotate\fP=\fIval\fP"
-set AutoRotatePages (default: None); recognized \fIval\fP choices:
-None, All, PageByPage. For EPS files, PageByPage is equivalent to All.
-.IP "\fB--restricted\fP=\fIval\fP"
-turn on restricted mode (default: [on for repstopdf, else off]);
-this forbids the use of \fB--gscmd\fP and imposes restrictions on the input and
-output file names according to the values of openin_any and openout_any (see
-the Web2c manual, http://tug.org/web2c).
-.IP "\fB--help\fP
-display help message and exit
-.IP "\fB--version\fP
-display version information and exit
-.SH EXAMPLES
-Examples which produce "test.pdf":
-.nf
-epstopdf test.eps
-produce postscript | epstopdf --filter >test.pdf
-produce postscript | epstopdf -f -d -o=test.pdf
-.fi
-Example: look for HiresBoundingBox and produce corrected PostScript:
-.nf
-epstopdf -d --nogs --hires test.ps >testcorr.ps
-.fi
-.SH BUGS
-The case of "%%BoundingBox: (atend)" when input is not seekable (e.g.,
-from a pipe) is not supported.
-.PP
-Report bugs in the program or this man page to tex-k@tug.org. When
-reporting bugs, please include an input file and the command line
-options specified, so the problem can be reproduced.
-.SH SEE ALSO
-\fBgs\fP(1),
-\fBpdfcrop\fP(1).
-.PP
-The epstopdf LaTeX package, part of the oberdiek bundle, which automates
-running this script on the fly under TeX: http://ctan.org/pkg/epstopdf-pkg.
-.SH AUTHOR
-The script was originally written by Sebastian Rahtz, for Elsevier
-Science, with subsequent contributions from Thomas Esser, Gerben Wierda
-and many others. Currently maintained by Karl Berry.
-.PP
-Man page originally written by Jim Van Zandt.
-.PP
-epstopdf home page: http://tug.org/epstopdf.
-.PP
-You may freely use, modify and/or distribute this file.
diff --git a/office/texlive/epstopdf/epstopdf.man1.pdf b/office/texlive/epstopdf/epstopdf.man1.pdf
deleted file mode 100644
index 41535a80bc..0000000000
--- a/office/texlive/epstopdf/epstopdf.man1.pdf
+++ /dev/null
Binary files differ
diff --git a/office/texlive/epstopdf/epstopdf.pl b/office/texlive/epstopdf/epstopdf.pl
deleted file mode 100644
index 9299839c41..0000000000
--- a/office/texlive/epstopdf/epstopdf.pl
+++ /dev/null
@@ -1,612 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q'
- if 0;
-use strict;
-
-# $Id: epstopdf.pl 18319 2010-05-17 16:34:21Z karl $
-# (Copyright lines below.)
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
-# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# ----------------------------------------------------------------
-#
-# This is a script to transform an EPS file such that:
-# a) it is guaranteed to start at the 0,0 coordinate.
-# b) it sets a page size exactly corresponding to the BoundingBox
-# This means that when Ghostscript renders it, the result needs no
-# cropping, and the PDF MediaBox is correct.
-# c) the result is piped to Ghostscript and a PDF version written.
-#
-# It needs a Level 2 PS interpreter.
-# If the input bounding box is not right, of course there will be problems.
-#
-# One thing not allowed for: the case of
-# "%%BoundingBox: (atend)" when input is not seekable (e.g., from a pipe),
-#
-# emacs-page
-# History
-# 2010/05/09 v2.16 (Karl Berry)
-# * make --nogs dump edited PostScript to stdout by default
-# (report from Reinhard Kotucha).
-# 2010/03/19 v2.15 (Karl Berry)
-# * let --outfile override --filter again.
-# * recognize MSWin64 as well as MSWin32, just in case.
-# 2010/03/08 v2.14 (Manuel P\'egouri\'e-Gonnard)
-# * In restricted mode, forbid --gscmd (all platforms) and call GS with full
-# path relative to self location (Windows).
-# 2010/02/26 v2.13 (Karl Berry)
-# * New release.
-# 2010/02/23 (Manuel P\'egouri\'e-Gonnard)
-# * Use kpsewhich for filename validation in restricted mode, both input and
-# output. Requires kpathsea 5.1.0 (TL2010), rejects the name with earlier
-# versions of kpsewhich.
-# * Call external programs with full path on win32 in order to avoid obvious
-# attacks with rogue versions of these programs in the current directory.
-# 2009/11/27 v2.12 (Karl Berry)
-# * Make --filter work again
-# 2009/11/25 (Manuel P\'egouri\'e-Gonnard)
-# * Better extension detection, suggested by A. Cherepanov.
-# 2009/10/18 (Manuel P\'egouri\'e-Gonnard)
-# * Better argument validation (Alexander Cherepanov).
-# * Use list form of pipe open() (resp. system()) to prevent injection.
-# Since Perl's fork() emulation doesn't work on Windows with Perl 5.8.8 from
-# TeX Live 2009, use a temporary file instead of a pipe on Windows.
-# 2009/10/14 (Manuel P\'egouri\'e-Gonnard)
-# * Added restricted mode.
-# 2009/09/27 v2.11 (Karl Berry)
-# * Fixed two bugs in the (atend) handling code (Martin von Gagern)
-# * Improved handling of CR line ending (Martin von Gagern)
-# * More error checking
-# * --version option
-# * Create source repository in TeX Live
-# 2009/07/17 v2.9.11gw
-# * Added -dSAFER to default gs options
-# TL2009 wants to use a restricted variant of -shell-escape,
-# allowing epstopdf to run. However without -dSAFER Ghostscript
-# allows writing to files (other than given in -sOutputFile)
-# and running commands (through Ghostscript pipe's language feature).
-# 2009/05/09 v2.9.10gw
-# * Changed cygwin name for ghostscript to gs
-# 2008/08/26 v2.9.9gw
-# * Switch to embed fonts (default=yes) (J.P. Chretien)
-# * turned no AutoRotatePages into an option (D. Kreil) (default = None)
-# * Added resolution switch (D. Kreil)
-# * Added BSD-style license
-# 2007/07/18 v2.9.8gw
-# 2007/05/18 v.2.9.7gw (Gerben Wierda)
-# * Merged both supplied 2.9.6 versions
-# 2007/05/15 v2.9.6tp (Theo Papadopoulo)
-# * Simplified the (atend) support
-# 2007/01/24 v2.9.6sw (Staszek Wawrykiewicz)
-# * patched to work also on Windows
-# 2005/10/06 v2.9.5gw (Gerben Wierda)
-# * Fixed a horrendous bug in the (atend) handling code
-# 2005/10/06 v2.9.4gw (Gerben Wierda)
-# * This has become the official version for now
-# 2005/10/01 v2.9.3draft (Gerben Wierda)
-# * Quote OutFilename
-# 2005/09/29 v2.9.2draft (Gerben Wierda)
-# * Quote OutFilename
-# 2004/03/17 v2.9.1draft (Gerben Wierda)
-# * No autorotate page
-# 2003/04/22 v2.9draft (Gerben Wierda)
-# * Fixed bug where with cr-eol files everything up to the first %!
-# * in the first 2048 bytes was gobbled (double ugh!)
-# 2002/02/21 v2.8draft (Gerben Wierda)
-# * Fixed bug where last line of buffer was not copied out (ugh!)
-# 2002/02/18 v2.8draft (Gerben Wierda)
-# * Handle different eol styles transparantly
-# * Applied fix from Peder Axensten for Freehand bug
-# 2001/03/05 v2.7 (Heiko Oberdiek)
-# * Newline before grestore for the case that there is no
-# whitespace at the end of the eps file.
-# 2000/11/05 v2.6 (Heiko Oberdiek)
-# * %%HiresBoundingBox corrected to %%HiResBoundingBox
-# 1999/05/06 v2.5 (Heiko Oberdiek)
-# * New options: --hires, --exact, --filter, --help.
-# * Many cosmetics: title, usage, ...
-# * New code for debug, warning, error
-# * Detecting of cygwin perl
-# * Scanning for %%{Hires,Exact,}BoundingBox.
-# * Scanning only the header in order not to get a wrong
-# BoundingBox of an included file.
-# * (atend) supported.
-# * uses strict; (earlier error detecting).
-# * changed first comment from '%!PS' to '%!';
-# * corrected (atend) pattern: '\s*\(atend\)'
-# * using of $bbxpat in all BoundingBox cases,
-# correct the first white space to '...Box:\s*$bb...'
-# * corrected first line (one line instead of two before 'if 0;';
-#
-# Thomas Esser, Sept. 1998: change initial lines to find
-# perl along $PATH rather than guessing a fixed location. The above
-# construction should work with most shells.
-#
-# Originally by Sebastian Rahtz, for Elsevier Science
-# with extra tricks from Hans Hagen's texutil and many more.
-# emacs-page
-
-### program identification
-my $program = "epstopdf";
-my $ident = '($Id: epstopdf.pl 18319 2010-05-17 16:34:21Z karl $) 2.16';
-my $copyright = <<END_COPYRIGHT ;
-Copyright 2009-2010 Karl Berry et al.
-Copyright 2002-2009 Gerben Wierda et al.
-Copyright 1998-2001 Sebastian Rahtz et al.
-License RBSD: Revised BSD <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-END_COPYRIGHT
-my $title = "$program $ident\n";
-
-my $on_windows = $^O =~ /^MSWin/;
-my $on_windows_or_cygwin = $on_windows || $^O eq "cygwin";
-
-### ghostscript command name
-my $GS = $on_windows ? "gswin32c" : "gs";
-
-### restricted mode
-my $restricted = 0;
-$restricted = 1 if $0 =~ /repstopdf/;
-
-### options
-$::opt_autorotate = "None";
-$::opt_compress = 1;
-$::opt_debug = 0;
-$::opt_embed = 1;
-$::opt_exact = 0;
-$::opt_filter = 0;
-$::opt_gs = 1;
-$::opt_gscmd = "";
-$::opt_hires = 0;
-$::opt_outfile = "";
-$::opt_res = 0;
-
-### usage
-my @bool = ("false", "true");
-my $resmsg = $::opt_res ? $::opt_res : "[use gs default]";
-my $rotmsg = $::opt_autorotate ? $::opt_autorotate : "[use gs default]";
-my $usage = <<"END_OF_USAGE";
-${title}Usage: $program [OPTION]... [EPSFILE]
-
-Convert EPS to PDF, by default using Ghostscript.
-
-Options:
- --help display this help and exit
- --version display version information and exit
-
- --outfile=FILE write result to FILE
- --(no)compress use compression (default: $bool[$::opt_compress])
- --(no)debug write debugging info (default: $bool[$::opt_debug])
- --(no)embed embed fonts (default: $bool[$::opt_embed])
- --(no)exact scan ExactBoundingBox (default: $bool[$::opt_exact])
- --(no)filter read standard input (default: $bool[$::opt_filter])
- --(no)gs run ghostscript (default: $bool[$::opt_gs])
- --(no)hires scan HiResBoundingBox (default: $bool[$::opt_hires])
- --gscmd=VAL pipe output to VAL (default: $GS)
- --res=DPI set image resolution (default: $resmsg)
- --autorotate=VAL set AutoRotatePages (default: $rotmsg)
- Recognized VAL choices: None, All, PageByPage
- For EPS files, PageByPage is equivalent to All
- --restricted use restricted mode (default: $bool[$restricted])
-
-Examples producing test.pdf:
- * $program test.eps
- * produce postscript | $program --filter >test.pdf
- * produce postscript | $program -f -d -o=test.pdf
-
-Example: look for HiResBoundingBox and produce corrected PostScript:
- * $program -d --nogs --hires test.ps >testcorr.ps
-
-When reporting bugs, please include an input file and command line
-options so the problem can be reproduced.
-
-Report bugs to: tex-k\@tug.org
-epstopdf home page: <http://tug.org/epstopdf/>
-END_OF_USAGE
-
-### process options
-use Getopt::Long;
-GetOptions (
- "autorotate=s", # \ref{val_autorotate}
- "compress!",
- "debug!",
- "embed!",
- "exact!",
- "filter!",
- "gs!",
- "gscmd=s", # \ref{val_gscmd}
- "help",
- "hires!",
- "outfile=s", # \ref{openout_any}
- "res=i", # validated by getopt ('i' specifier)
- "restricted",
- "version",
-) or die $usage;
-
-### help functions
-sub debug { print STDERR "* @_\n" if $::opt_debug; }
-sub warning { print STDERR "==> Warning: @_\n"; }
-sub error { die "$title!!! Error: @_\n"; }
-sub errorUsage { die "Error: @_ (try --help for more information)\n"; }
-
-### restricted option
-$restricted = 1 if $::opt_restricted;
-debug "Restricted mode activated" if $restricted;
-
-### safer external commands for Windows in restricted mode
-my $kpsewhich = 'kpsewhich';
-if ($restricted && $on_windows) {
- use File::Basename;
- my $mydirname = dirname $0;
- # $mydirname is the location of the Perl script
- $kpsewhich = "$mydirname/../../../bin/win32/$kpsewhich";
- $GS = "$mydirname/../../../tlpkg/tlgs/bin/$GS";
-}
-debug "kpsewhich command: $kpsewhich";
-
-### check if a name is "safe" according to kpse's open(in|out)_any
-# return true if name is ok, false otherwise
-sub safe_name
-{
- my ($mode, $name) = @_;
- my $option = "";
- $option = '-safe-in-name' if $mode eq 'in';
- $option = '-safe-out-name' if $mode eq 'out';
- error "Unknown check mode in safe_name(): $mode" unless $option;
- my @args = ($kpsewhich, '-progname', 'repstopdf', $option, $name);
- my $bad = system {$args[0]} @args;
- return ! $bad;
-}
-
-### help, version options.
-if ($::opt_help) {
- print $usage;
- exit (0);
-}
-
-if ($::opt_version) {
- print $title;
- print $copyright;
- exit (0);
-}
-
-### get input filename (\ref{openin_any} for validation)
-my $InputFilename = "";
-if ($::opt_filter) {
- @ARGV == 0 or
- errorUsage "Input file cannot be used with filter option";
- debug "Filtering: will read standard input";
-} else {
- @ARGV > 0 or errorUsage "Input filename missing";
- @ARGV < 2 or errorUsage "Unknown option or too many input files";
- $InputFilename = $ARGV[0];
- #-r $InputFilename or error "\"$InputFilename\" not readable";
- debug "Input filename:", $InputFilename;
-}
-
-### emacs-page
-### option gscmd
-if ($::opt_gscmd) {
- if ($restricted) { # \label{val_gscmd}
- error "Option forbidden in restricted mode: --gscmd";
- } else {
- debug "Switching from $GS to $::opt_gscmd";
- $GS = $::opt_gscmd;
- }
-}
-
-### start building GS command line for the pipe
-my @GS = ($GS);
-push @GS, qw(-q -dNOPAUSE -dSAFER -sDEVICE=pdfwrite);
-
-### option outfile
-my $OutputFilename = $::opt_outfile;
-if (! $OutputFilename) {
- if ($::opt_gs) {
- if ($::opt_filter) {
- debug "Filtering: will write standard output";
- $OutputFilename = "-";
- } else {
- # Ghostscript, no filter: replace input extension with .pdf.
- $OutputFilename = $InputFilename;
- my $ds = $on_windows_or_cygwin ? '\\/' : '/';
- $OutputFilename =~ s/\.[^\.$ds]*$//;
- $OutputFilename .= ".pdf";
- }
- } else {
- debug "No Ghostscript: will write standard output";
- $OutputFilename = "-";
- }
-}
-debug "Output filename:", $OutputFilename;
-push @GS, "-sOutputFile=$OutputFilename";
-
-### options compress, embed, res, autorotate
-push @GS, ('-dPDFSETTINGS=/prepress', '-dMaxSubsetPct=100',
- '-dSubsetFonts=true', '-dEmbedAllFonts=true') if $::opt_embed;
-push @GS, '-dUseFlateCompression=false' unless $::opt_compress;
-push @GS, "-r$::opt_res" if $::opt_res;
-$resmsg= $::opt_res ? $::opt_res : "[use gs default]";
-push @GS, "-dAutoRotatePages=/$::opt_autorotate" if $::opt_autorotate;
-$rotmsg = $::opt_autorotate ? $::opt_autorotate : "[use gs default]";
-# \label{val_autorotate}
-error "Invalid value for autorotate: '$::opt_autorotate' "
- . "(use 'All', 'None' or 'PageByPage')."
- if ($::opt_autorotate and
- not $::opt_autorotate =~ /^(None|All|PageByPage)$/);
-
-### option BoundingBox types
-my $BBName = "%%BoundingBox:";
-!($::opt_hires and $::opt_exact) or
- error "Options --hires and --exact cannot be used together";
-$BBName = "%%HiResBoundingBox:" if $::opt_hires;
-$BBName = "%%ExactBoundingBox:" if $::opt_exact;
-debug "BoundingBox comment:", $BBName;
-
-### validate input file name in restricted mode \label{openin_any}
-if ($restricted and not $::opt_filter
- and not safe_name('in', $InputFilename)) {
- error "Input filename '$InputFilename' not allowed in restricted mode.";
-}
-
-### validate output file name in restricted mode \label{openout_any}
-if ($restricted and not safe_name('out', $OutputFilename)) {
- error "Output filename '$OutputFilename' not allowed in restricted mode.";
-}
-
-### option gs
-if ($::opt_gs) {
- debug "Ghostscript command:", $GS;
- debug "Compression:", ($::opt_compress) ? "on" : "off";
- debug "Embedding:", ($::opt_embed) ? "on" : "off";
- debug "Rotation:", $rotmsg;
- debug "Resolution:", $resmsg;
-}
-
-### emacs-page
-### open input file
-if ($::opt_filter) {
- open(IN, '<-') || error("Cannot open stdin: $!");
-} else {
- open(IN, '<', $InputFilename) || error("Cannot open $InputFilename: $!");
-}
-binmode IN;
-
-### open output file
-my $outname; # used in error message at end
-my $tmp_filename; # temporary file for windows
-my $OUT; # filehandle for output (GS pipe or temporary file)
-use File::Temp 'tempfile';
-if ($::opt_gs) {
- if (! $on_windows_or_cygwin) { # list piped open works
- push @GS, qw(- -c quit);
- debug "Ghostscript pipe:", join(' ', @GS);
- open($OUT, '|-', @GS) or error "Cannot open Ghostscript for piped input";
- } else { # use a temporary file on Windows/Cygwin.
- ($OUT, $tmp_filename) = tempfile(UNLINK => 1);
- debug "Using temporary file '$tmp_filename'";
- }
- $outname = $GS;
-}
-else {
- debug "No Ghostscript: opening $OutputFilename";
- if ($OutputFilename eq "-") {
- $OUT = *STDOUT;
- } else {
- open($OUT, '>', $OutputFilename)
- || error ("Cannot write \"$OutputFilename\": $!");
- $outname = $OutputFilename;
- }
-}
-binmode $OUT;
-
-# reading a cr-eol file on a lf-eol system makes it impossible to parse
-# the header and besides it will read the intire file into yor line by line
-# scalar. this is also true the other way around.
-
-### emacs-page
-### scan a block, try to determine eol style
-
-my $buf;
-my $buflen;
-my @bufarray;
-my $inputpos;
-
-# We assume 2048 is big enough.
-my $EOLSCANBUFSIZE = 2048;
-
-$buflen = read(IN, $buf, $EOLSCANBUFSIZE);
-if ($buflen > 0) {
- my $crlfpos;
- my $lfpos;
- my $crpos;
-
- $inputpos = 0;
-
- # remove binary junk before header
- # if there is no header, we assume the file starts with ascii style and
- # we look for a eol style anyway, to prevent possible loading of the
- # entire file
- if ($buf =~ /%!/) {
- # throw away binary junk before %!
- $buf =~ s/(.*?)%!/%!/o;
- $inputpos = length($1);
- }
- $lfpos = index($buf, "\n");
- $crpos = index($buf, "\r");
- $crlfpos = index($buf, "\r\n");
-
- if ($crpos > 0 and ($lfpos == -1 or $lfpos > $crpos+1)) {
- # The first eol was a cr and it was not immediately followed by a lf
- $/ = "\r";
- debug "The first eol character was a CR ($crpos) and not immediately followed by a LF ($lfpos)";
- }
-
- # Now we have set the correct eol-character. Get one more line and add
- # it to our buffer. This will make the buffer contain an entire line
- # at the end. Then split the buffer in an array. We will draw lines from
- # that array until it is empty, then move again back to <IN>
- $buf .= <IN> unless eof(IN);
- $buflen = length($buf);
-
- # Some extra magic is needed here: if we set $/ to \r, Perl's re engine
- # still thinks eol is \n in regular expressions (not very nice) so we
- # cannot split on ^, but have to split on a look-behind for \r.
- if ($/ eq "\r") {
- @bufarray = split(/(?<=\r)/ms, $buf); # split after \r
- }
- else {
- @bufarray = split(/^/ms, $buf);
- }
-}
-
-### getline
-sub getline
-{
- if ($#bufarray >= 0) {
- $_ = shift(@bufarray);
- }
- else {
- $_ = <IN>;
- }
- $inputpos += length($_) if defined $_;
- return defined($_);
-}
-
-### scan first line
-my $header = 0;
-getline();
-if (/%!/) {
- # throw away binary junk before %!
- s/(.*)%!/%!/o;
-}
-$header = 1 if /^%/;
-debug "Scanning header for BoundingBox";
-print $OUT $_;
-
-### variables and pattern for BoundingBox search
-my $bbxpatt = '[0-9eE\.\-]';
- # protect backslashes: "\\" gets '\'
-my $BBValues = "\\s*($bbxpatt+)\\s+($bbxpatt+)\\s+($bbxpatt+)\\s+($bbxpatt+)";
-my $BBCorrected = 0;
-
-sub CorrectBoundingBox
-{
- my ($llx, $lly, $urx, $ury) = @_;
- debug "Old BoundingBox:", $llx, $lly, $urx, $ury;
- my ($width, $height) = ($urx - $llx, $ury - $lly);
- my ($xoffset, $yoffset) = (-$llx, -$lly);
- debug "New BoundingBox: 0 0", $width, $height;
- debug "Offset:", $xoffset, $yoffset;
-
- print $OUT "%%BoundingBox: 0 0 $width $height$/";
- print $OUT "<< /PageSize [$width $height] >> setpagedevice$/";
- print $OUT "gsave $xoffset $yoffset translate$/";
-}
-
-### emacs-page
-### scan header
-if ($header) {
- HEADER: while (getline()) {
- ### Fix for freehand bug ### by Peder Axensten
- next HEADER if(!/\S/);
-
- ### end of header
- if (!/^%/ or /^%%EndComments/) {
- print $OUT $_;
- last;
- }
-
- ### BoundingBox with values
- if (/^$BBName$BBValues/o) {
- CorrectBoundingBox $1, $2, $3, $4;
- $BBCorrected = 1;
- last;
- }
-
- ### BoundingBox with (atend)
- if (/^$BBName\s*\(atend\)/) {
- debug $BBName, "(atend)";
- if ($::opt_filter) {
- warning "Cannot look for BoundingBox in the trailer",
- "with option --filter";
- last;
- }
- my $pos = $inputpos;
- debug "Current file position:", $pos;
-
- # looking for %%BoundingBox
- while (getline()) {
- # skip over included documents
- my $nestDepth = 0;
- $nestDepth++ if /^%%BeginDocument/;
- $nestDepth-- if /^%%EndDocument/;
- if ($nestDepth == 0 && /^$BBName$BBValues/o) {
- CorrectBoundingBox $1, $2, $3, $4;
- $BBCorrected = 1;
- last;
- }
- }
-
- # go back
- seek(IN, $pos, 0) or error "Cannot go back to line \"$BBName (atend)\"";
- last;
- }
-
- # print header line
- print $OUT $_;
- }
-}
-
-### print rest of file
-while (getline()) {
- print $OUT $_;
-}
-
-### emacs-page
-### close files
-close(IN);
-print $OUT "$/grestore$/" if $BBCorrected;
-close($OUT);
-
-### actually run GS if we were writing to a temporary file
-if (defined $tmp_filename) {
- push @GS, $tmp_filename;
- push @GS, qw(-c quit);
- debug "Ghostscript command:", join(' ', @GS);
- system @GS;
-}
-
-# if ghostscript exited badly, we should too.
-if ($? & 127) {
- error(sprintf "Writing to $outname failed, signal %d\n", $? & 127);
-} elsif ($? != 0) {
- error(sprintf "Writing to $outname failed, error code %d\n", $? >> 8);
-}
-
-warning "BoundingBox not found" unless $BBCorrected;
-debug "Done.";
-
-# vim: ts=8 sw=2 expandtab:
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 dd1de3efe2..ed2a7daa93 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,7 +1,15 @@
-diff -Nur texlive-20110705-source.orig//texk/kpathsea/texmf.cnf texlive-20110705-source/texk/kpathsea/texmf.cnf
---- texlive-20110705-source.orig//texk/kpathsea/texmf.cnf 2011-06-18 17:10:46.000000000 -0500
-+++ texlive-20110705-source/texk/kpathsea/texmf.cnf 2011-07-22 21:30:42.459806437 -0500
-@@ -59,7 +59,7 @@
+--- 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
+@@ -51,7 +51,7 @@
+ % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
+ % Kpathsea sets SELFAUTOLOC (the directory with the binary),
+ % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent).
+-TEXMFROOT = $SELFAUTOPARENT
++TEXMFROOT = $SELFAUTODIR/share
+
+ % The tree containing runtime files related to the specific
+ % distribution and version.
+@@ -61,7 +61,7 @@
TEXMFDIST = $TEXMFROOT/texmf-dist
% Local additions to the distribution trees.
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 5c265e0563..3102e400bb 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,7 +1,15 @@
-diff -Nur texlive-20110705-texmf.orig//texmf/web2c/texmf.cnf texlive-20110705-texmf/texmf/web2c/texmf.cnf
---- texlive-20110705-texmf.orig//texmf/web2c/texmf.cnf 2011-06-18 17:10:46.000000000 -0500
-+++ texlive-20110705-texmf/texmf/web2c/texmf.cnf 2011-07-22 21:42:11.710930405 -0500
-@@ -59,7 +59,7 @@
+--- texlive-20120701-texmf/texmf/web2c/texmf.cnf.orig 2012-07-22 19:30:50.766408343 -0500
++++ texlive-20120701-texmf/texmf/web2c/texmf.cnf 2012-07-22 19:31:13.717121421 -0500
+@@ -51,7 +51,7 @@
+ % Redistributors will probably want $SELFAUTODIR/share, i.e., /usr/share.
+ % Kpathsea sets SELFAUTOLOC (the directory with the binary),
+ % SELFAUTODIR (its parent), and SELFAUTOPARENT (its grandparent).
+-TEXMFROOT = $SELFAUTOPARENT
++TEXMFROOT = $SELFAUTODIR/share
+
+ % The tree containing runtime files related to the specific
+ % distribution and version.
+@@ -61,7 +61,7 @@
TEXMFDIST = $TEXMFROOT/texmf-dist
% Local additions to the distribution trees.
diff --git a/office/texlive/profile.d/texlive.csh b/office/texlive/profile.d/texlive.csh
deleted file mode 100644
index eaadd94451..0000000000
--- a/office/texlive/profile.d/texlive.csh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/csh
-# Add path and MANPATH for TeXlive:
-set path = ( $path /usr/share/texmf/bin )
-setenv MANPATH ${MANPATH}:/usr/share/texmf/doc/man
diff --git a/office/texlive/profile.d/texlive.sh b/office/texlive/profile.d/texlive.sh
deleted file mode 100644
index f9daeaa293..0000000000
--- a/office/texlive/profile.d/texlive.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# Add PATH and MANPATH for TeXlive:
-PATH="$PATH:/usr/share/texmf/bin"
-MANPATH="$MANPATH:/usr/share/texmf/doc/man"
diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index 122485ff1c..5f1bf2d0c9 100644
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -2,7 +2,7 @@
# TeXLive build script for Slackware
-# Copyright 2009-2011 Robby Workman, Northport, AL, USA
+# Copyright 2009-2012 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/2011/
+# URL: ftp://tug.org/historic/systems/texlive/2012/
PRGNAM=texlive
-VERSION=20110705
-BUILD=${BUILD:-4}
+VERSION=20120701
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
SOURCE_VERS=$VERSION
TEXMF_VERS=$VERSION
-EXTRA_VERS=$VERSION
TEXI2HTML=5.0 # texi2html version - http://www.nongnu.org/texi2html/
@@ -79,81 +78,54 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Thanks to Karl Berry and the other TeXLive devs for agreeing to the extra
-# work required to maintain a -stable branch of each release
-# http://tug.org/svn/texlive/branches/branch2011
-patch -p2 < $CWD/branch2011/01-off-by-one-fix-for-enctex-xetex.patch
-patch -p2 < $CWD/branch2011/02-synctex-coordinate-fix.patch
-patch -p2 < $CWD/branch2011/03-create-README.branch2011.patch
-patch -p2 < $CWD/branch2011/04-line_number_fix_from_r24155.patch
-patch -p2 < $CWD/branch2011/05-update_README.branch2011.patch
-patch -p2 < $CWD/branch2011/06-buffer_overrun_fix_from_r24337.patch
-patch -p2 < $CWD/branch2011/07-fix_memory_corruption_from_r23592.patch
-patch -p2 < $CWD/branch2011/08-e-ptex_fixes_from_r23688.patch
-patch -p2 < $CWD/branch2011/09-update_branch_log.patch
-patch -p2 < $CWD/branch2011/10-luatex_array_fix_from_r24353.patch
-patch -p2 < $CWD/branch2011/11-update_branch_log.patch
-
-# Thanks to Peter Berntsen for the problem report and fix
+# Fix up some paths
patch -p1 < $CWD/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff
-# "kpsewhich -var-value=SELFAUTOPARENT" strips two trailing directories
-# from the location of the binaries, and this value is used by many
-# things in TeXLive (including tlmgr); therefore, it seems best to just
-# "go with the flow" and use "--enable-multiplatform" so the symlinks
-# that are automatically created will be correct...
-
-# Building with --without-etex as it is something for eclipse
-# Building with "--without-system-xpdf" because poppler API changes too often
-
-TL_BUILD_ENV="CFLAGS=\"$SLKCFLAGS\" CXXFLAGS=\"$SLKCFLAGS\"" \
-TL_CONFIGURE_ARGS="\
- --enable-multiplatform \
- --with-banner-add='TeX Live 2011/Slackware (SBo)' \
- --disable-native-texlive-build \
- --disable-static \
- --with-x \
- --without-etex \
- --without-system-xpdf \
- --enable-xindy \
- --with-clisp-runtime=system \
- --with-system-ncurses \
- --with-system-zlib \
- --with-system-libpng \
- --with-system-t1lib \
- --with-system-gd \
- --with-system-freetype2 \
- --build=$ARCH-slackware-linux" \
-./Build
-
-mkdir -p $PKG/usr/share/texmf/bin
-mv inst/bin/${ARCH}-slackware-linux-gnu/* $PKG/usr/share/texmf/bin
-
-# Install the README file while we're still here
+unset TEXMFCNF ; export TEXMFCNF
+LANG=C ; export LANG
+GNUMAKE=$(which make) ; export GNUMAKE
+KPATHSEA_WARNING=0 ; export KPATHSEA_WARNING
+
+mkdir build ; cd build
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ ../configure \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ --with-banner-add='TeX Live 2012/Slackware (rworkman)' \
+ --disable-native-texlive-build \
+ --enable-largefile \
+ --disable-missing \
+ --with-xdvi-x-toolkit=xaw \
+ --enable-shared \
+ --disable-static \
+ --with-x \
+ --without-etex \
+ --enable-xindy \
+ --with-clisp-runtime=system \
+ --with-system-poppler \
+ --with-system-xpdf \
+ --with-system-ncurses \
+ --with-system-zlib \
+ --with-system-libpng \
+ --with-system-t1lib \
+ --with-system-gd \
+ --with-system-freetype2 \
+ --build=$ARCH-slackware-linux
+ make
+ make install DESTDIR=$PKG
+cd ..
+
+# Create symlinks
+PATH="$PATH:$PKG/usr/bin" LD_LIBRARY_PATH+=$PKG/usr/lib${LIBDIRSUFFIX} \
+ texlinks -f $PKG/usr/share/texmf/web2c/fmtutil.cnf $PKG/usr/bin
+
+# Install the docs while we're still here
mkdir -p $PKG/usr/doc/texlive-$VERSION
-cp -a README $PKG/usr/doc/texlive-$VERSION
-
-# Now let's install the tlmgr stuff
-cd $TMP
-rm -rf texlive-$EXTRA_VERS-extra
-tar xvf $CWD/texlive-$EXTRA_VERS-extra.tar.xz
-cd texlive-$EXTRA_VERS-extra
-chown -R root:root .
-chmod -R a-s .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-mkdir -p $PKG/usr/doc/texlive-$VERSION/tlpkg
-cp -a tlpkg $PKG/usr/share/
-cd $TMP/texlive-$EXTRA_VERS-extra
- cp -a \
- readme-txt.dir/* readme-html.dir/* README* LICENSE* doc.html \
- $PKG/usr/doc/texlive-$VERSION/tlpkg
- cat $CWD/README.tlpkg > $PKG/usr/doc/texlive-$VERSION/tlpkg/README.SLACKWARE
-cd -
+cp -a ChangeLog README* $PKG/usr/doc/texlive-$VERSION
+cat $CWD/README.tlpkg > $PKG/usr/doc/texlive-$VERSION/README.tlpkg
# and now we'll install the texmf stuff
cd $TMP
@@ -168,12 +140,11 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Thanks to Peter Berntsen for the problem report and fix
+# Fix up some paths
patch -p1 < $CWD/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff
-mkdir -p $PKG/usr/share/{texmf,texmf-dist}
-mv texmf-dist/* $PKG/usr/share/texmf-dist
-mv texmf/* $PKG/usr/share/texmf
+mkdir -p $PKG/usr/share
+cp -a texmf texmf-dist $PKG/usr/share
# Now let's add texi2hmtl - http://www.nongnu.org/texi2html/
cd $TMP
@@ -190,8 +161,8 @@ find . \
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
- --bindir=/usr/share/texmf/bin \
- --mandir=/usr/share/texmf/doc/man \
+ --bindir=/usr/bin \
+ --mandir=/usr/man \
--infodir=/usr/info \
--build=$ARCH-slackware-linux
make
@@ -201,35 +172,13 @@ cp -a \
AUTHORS COPYING ChangeLog NEWS README TODO \
$PKG/usr/doc/texlive-$VERSION/texi2html-$TEXI2HTML
-# Now add epstopdf
-mkdir -p $PKG/usr/doc/texlive-$VERSION/eps2pdf
-cat $CWD/epstopdf/epstopdf.pl > $PKG/usr/share/texmf/bin/epstopdf
-cat $CWD/epstopdf/epstopdf.1 > $PKG/usr/share/texmf/doc/man/man1/epstopdf.1
-cat $CWD/epstopdf/epstopdf.man1.pdf > $PKG/usr/doc/texlive-$VERSION/eps2pdf/epstopdf.man1.pdf
-cat $CWD/epstopdf/README > $PKG/usr/doc/texlive-$VERSION/eps2pdf/README
-chmod 0755 $PKG/usr/share/texmf/bin/epstopdf
-
-# Compress man pages
-cd $PKG/usr/share/texmf/doc/man || exit 1
- find . -type f -name "Makefile" -exec rm -f {} \;
- find . -type f -name "*.pdf" -exec rm -f {} \;
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-cd -
+# Handle the man pages
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
# Handle the GNU info pages
-cd $PKG/usr/info
- mv $PKG/usr/share/texmf/doc/info/* .
- rm -rf $PKG/usr/share/texmf/doc/info
- rm -f dir
- gzip -9 *
-cd -
-
-# Add profile scripts
-mkdir -p $PKG/etc/profile.d
-cat $CWD/profile.d/texlive.sh > $PKG/etc/profile.d/texlive.sh
-cat $CWD/profile.d/texlive.csh > $PKG/etc/profile.d/texlive.csh
-chmod 0755 $PKG/etc/profile.d/*
+rm -f $PKG/usr/info/dir
+gzip -9 $PKG/usr/info/*
mkdir -p $PKG/install
cat $CWD/doinst.sh > $PKG/install/doinst.sh
@@ -237,16 +186,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
/sbin/makepkg -p -l y -c n $OUTPUT/texlive-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
-# Ignore this - it's for reference purposes :-) -RW
-# If we turn off --enable-multiplatform and place the
-# binaries only one folder deeper than texmf{,-dist}
-# we should have our own configuration.
-#cat > $PKG/usr/share/texmf.cnf <<EOF
-#% \$SELFAUTODIR will be /usr/share
-#TEXMFMAIN = \$SELFAUTODIR/texmf
-#TEXMFDIST = \$SELFAUTODIR/texmf-dist
-#TEXMFLOCAL = \$SELFAUTODIR/texmf-local
-#TEXMFSYSVAR = \$SELFAUTODIR/texmf-var
-#TEXMFSYSCONFIG = \$SELFAUTODIR/texmf-config
-#EOF
diff --git a/office/texlive/texlive.info b/office/texlive/texlive.info
index 4a70900cd4..d608232cf4 100644
--- a/office/texlive/texlive.info
+++ b/office/texlive/texlive.info
@@ -1,13 +1,11 @@
PRGNAM="texlive"
-VERSION="20110705"
+VERSION="20120701"
HOMEPAGE="http://tug.org/texlive/"
-DOWNLOAD="ftp://tug.org/historic/systems/texlive/2011/texlive-20110705-source.tar.xz \
- ftp://tug.org/historic/systems/texlive/2011/texlive-20110705-texmf.tar.xz \
- ftp://tug.org/historic/systems/texlive/2011/texlive-20110705-extra.tar.xz \
+DOWNLOAD="ftp://tug.org/historic/systems/texlive/2012/texlive-20120701-source.tar.xz \
+ ftp://tug.org/historic/systems/texlive/2012/texlive-20120701-texmf.tar.xz \
http://download.savannah.gnu.org/releases/texi2html/texi2html-5.0.tar.bz2"
-MD5SUM="968d238949e8a34a1fd74c374ddfe6f1 \
- ed7b558be35adf00a6c2e69609cd679a \
- 6b554b0534f58ad7e7f0b0dc6d072a2c \
+MD5SUM="1d38be7dac26440fd022a4708f454a2b \
+ 461ec82632654b2b34f1be3e03216bc6 \
f15ac876fcdc8be865b16535f480aa54"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""