New commits:
commit bd65ba9151a171b14177cb9ac804bd8380bf9c95
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
latex/texlive-texmf: version 20120701
commit 4921f126f1bda95f7007e009a00193c937ad54e2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
latex/texlive: version 20120701
diff --git a/latex/texlive-texmf/DETAILS b/latex/texlive-texmf/DETAILS
index 05dc9ec..06705b1 100755
--- a/latex/texlive-texmf/DETAILS
+++ b/latex/texlive-texmf/DETAILS
@@ -1,8 +1,8 @@
SPELL=texlive-texmf
- VERSION=20110705
+ VERSION=20120701
SOURCE="texlive-${VERSION}-texmf.tar.xz"
- SOURCE_URL[0]=ftp://tug.org/texlive/historic/${VERSION:0:4}/${SOURCE}
-
SOURCE_HASH=sha512:80cd946980f93aaee698b2c1fe668934c9378dbc9383bcac209e443b49b631c206c8cf7c7f53db26db392626521bb21aa7ceae5bff0255ecf78a397bcdcbfe0a
+
SOURCE_URL[0]=ftp://tug.org/historic/systems/texlive/${VERSION:0:4}/${SOURCE}
+
SOURCE_HASH=sha512:497524351b232952946384e301e0462b26e2ca36839ea702ca9358b7fea8c1c3f817f036f043337b4d0ae5325f3bfa1218c1bb0289eade2f9d35386c4ed90404
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE/.tar.xz}"
WEB_SITE="http://www.tug.org/texlive"
LICENSE[0]="LATER"
diff --git a/latex/texlive-texmf/HISTORY b/latex/texlive-texmf/HISTORY
index b671bf0..b0d1df4 100644
--- a/latex/texlive-texmf/HISTORY
+++ b/latex/texlive-texmf/HISTORY
@@ -1,3 +1,7 @@
+2012-09-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 20120701
+ * texmfcnf.lua_fix.patch: refreshed patch
+
2011-10-31 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD: patch texmfcnf.lua for proper luatex dirs
rm texmf.cnf so the version in the texlive spell is used
diff --git a/latex/texlive-texmf/texmfcnf.lua_fix.patch
b/latex/texlive-texmf/texmfcnf.lua_fix.patch
index b373a59..3949dab 100644
--- a/latex/texlive-texmf/texmfcnf.lua_fix.patch
+++ b/latex/texlive-texmf/texmfcnf.lua_fix.patch
@@ -1,19 +1,19 @@
---- texmf/web2c/texmfcnf.lua
-+++ texmf/web2c/texmfcnf.lua
+--- texmf/web2c/texmfcnf.lua.orig 2012-09-15 20:31:18.102902927 +0200
++++ texmf/web2c/texmfcnf.lua 2012-09-15 20:36:10.995089077 +0200
@@ -50,7 +50,7 @@
-- We have only one cache path but there can be more. The first
writable one
-- will be chosen but there can be more readable paths.
-- I don't like this texmf under home and texmf-home would make
more
-@@ -77,7 +77,7 @@
+@@ -76,7 +76,7 @@
-- We need texmfos for a few rare files but as I have a few
more bin trees
-- a hack is needed. Maybe other users also have
texmf-platform-new trees.
# move old local to new local, can eventually get rid of this
diff --git a/latex/texlive/PRE_BUILD b/latex/texlive/PRE_BUILD
index 9bd0d53..9ada7b5 100755
--- a/latex/texlive/PRE_BUILD
+++ b/latex/texlive/PRE_BUILD
@@ -1,16 +1,13 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $BUILD_DIRECTORY &&
-verify_file '' &&
-xz -dc $SOURCE_CACHE/$SOURCE | tar -xf -
-cd $SOURCE_DIRECTORY &&
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
# Use /usr/share/texmf and /usr/share/texmf-dist, adapted from lunarlinux
find -name Makefile\* -exec sed -i -e
"s:\(\$.\)prefix\(./tex\):\1datadir\2:" {} \; &&
find -name configure -exec sed -i -e "s:\(\$.\)prefix\(./tex\):\1datadir\2:"
{} \; &&
find -name \*.info -exec sed -i -e "s:/usr/local:/usr:" {} \; &&
find -name \*.texi -exec sed -i -e "s:/usr/local:/usr:" {} \; &&
-# fix the remaining locations
-patch -p0 < ${SPELL_DIRECTORY}/fix_paths.patch &&
+
+patch -p1 < ${SPELL_DIRECTORY}/fix_paths.patch
# the sed on the patch is live so it will take into
# account INSTALL_ROOT
@@ -20,4 +17,6 @@ sed "s:/usr/bin:$INSTALL_ROOT/usr/bin:g"
$SPELL_DIRECTORY/mtxrun_fix.patch | pat
% The tree containing runtime files related to the specific
% distribution and version.
-@@ -59,10 +59,10 @@ TEXMFMAIN = $TEXMFROOT/texmf
+@@ -61,10 +61,10 @@
TEXMFDIST = $TEXMFROOT/texmf-dist
% Local additions to the distribution trees.
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (e7d4590924dbf3139aaa483d12e1bd36f236c068),
Florian Franzmann, 09/16/2012