office/texlive: Patched to use correct path of texmf-local tree

From: Peter Berntsen <ptrber@gmail.com>
To: rw@rlworkman.net
Subject: TexLive
Date: Sun, 16 Jan 2011 18:33:02 +0100

Hi,

Installed from source texlive-20100722. Thanks!

Writing a paper to Science and downloaded the style-files from
http://www.sciencemag.org/site/feature/contribinfo/prep/TeX_help/index.xhtml
Followed this wiki on how to install extra packages under texmf-local
http://en.wikibooks.org/wiki/LaTeX/Packages/Installing_Extra_Packages

Running texhash or mktexlsr. It did not find all directories in
/usr/share/texmf*

Edited TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local  on line 64 in
/usr/share/texmf/web2c/texmf.cnf
to  TEXMFLOCAL =$SELFAUTOPARENT/texmf-local

Now root@slack:~# mktexlsr
mktexlsr: Updating /usr/share/texmf/ls-R...
mktexlsr: Updating /usr/share/texmf-config/ls-R...
mktexlsr: Updating /usr/share/texmf-dist/ls-R...
mktexlsr: Updating /usr/share/texmf-local/ls-R...
mktexlsr: Updating /usr/share/texmf-var/ls-R...
mktexlsr: Done.

finds texmv-local/ls-R and the installed sty files can be used in all
directories.
Don't know if this is a 'bug' but it might be possible to change in
the default path generation to the texmf tree.
Of course one can put all extra style files in a ~/texmf but to use
texmf-local make it neat and clean.

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

4 files changed, 31 insertions, 2 deletions

diff --git a/office/texlive/doinst.sh b/office/texlive/doinst.sh
index 5d68eafc83541..22da4eb4c26ee 100644
--- a/office/texlive/doinst.sh
+++ b/office/texlive/doinst.sh
@@ -8,7 +8,7 @@ chroot . /usr/share/texmf/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 /usr/share/texmf-var 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...
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
new file mode 100644
index 0000000000000..41c5b89fd215a
--- /dev/null
+++ b/office/texlive/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff
@@ -0,0 +1,12 @@
+diff -Nur texlive-20100722-source.orig//texk/kpathsea/texmf.cnf texlive-20100722-source/texk/kpathsea/texmf.cnf
+--- texlive-20100722-source.orig//texk/kpathsea/texmf.cnf	2010-05-30 16:52:39.000000000 -0500
++++ texlive-20100722-source/texk/kpathsea/texmf.cnf	2011-01-24 14:38:46.317199461 -0600
+@@ -61,7 +61,7 @@
+ % A place for local additions to a "standard" texmf tree.
+ % This tree is not used for local configuration maintained by
+ % texconfig, it uses TEXMFCONFIG below.
+-TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local
++TEXMFLOCAL = $SELFAUTOPARENT/texmf-local
+ 
+ % TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
+ % With teTeX-3.0 or later, this must be set.
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
new file mode 100644
index 0000000000000..fa064e765195a
--- /dev/null
+++ b/office/texlive/patches/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff
@@ -0,0 +1,11 @@
+--- texlive-20100722-texmf.orig/texmf/web2c/texmf.cnf	2011-01-24 18:04:35.406411913 -0600
++++ texlive-20100722-texmf/texmf/web2c/texmf.cnf	2011-01-24 18:04:45.709266445 -0600
+@@ -61,7 +61,7 @@
+ % A place for local additions to a "standard" texmf tree.
+ % This tree is not used for local configuration maintained by
+ % texconfig, it uses TEXMFCONFIG below.
+-TEXMFLOCAL = $SELFAUTOPARENT/../texmf-local
++TEXMFLOCAL = $SELFAUTOPARENT/texmf-local
+ 
+ % TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
+ % With teTeX-3.0 or later, this must be set.
diff --git a/office/texlive/texlive.SlackBuild b/office/texlive/texlive.SlackBuild
index a7d27661bebd6..799b77f719a3a 100644
--- a/office/texlive/texlive.SlackBuild
+++ b/office/texlive/texlive.SlackBuild
@@ -27,7 +27,7 @@
 
 PRGNAM=texlive
 VERSION=20100722
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SOURCE_VERS=$VERSION
@@ -79,6 +79,9 @@ 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
+patch -p1 < $CWD/patches/source-fixup_texmf-local_tree_in_texmf_cnf.diff
+
 # etex is something for eclipse
 # Building with --disable-xindy as it requires libffcall
 # "kpsewhich -var-value=SELFAUTOPARENT" strips two trailing directories 
@@ -150,6 +153,9 @@ 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
+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