[Lunar-commits] <moonbase> texlive: updated to version 20100722
Duncan Gibson
engelsman at lunar-linux.org
Sun Sep 12 09:48:43 CEST 2010
commit 07f06b53b11d905a0d9b2c12eaf0b90e8c4ecdda
Author: Paul Bredbury <brebs at sent.com>
Date: Sun Sep 12 09:48:43 2010 +0200
texlive: updated to version 20100722
luatex and xindy now compile.
---
zbeta/texlive/BUILD | 53 +++++++++++++++++++++++++------------------
zbeta/texlive/CONFLICTS | 1 +
zbeta/texlive/DEPENDS | 10 +++-----
zbeta/texlive/DETAILS | 19 ++++++---------
zbeta/texlive/POST_INSTALL | 19 +++------------
5 files changed, 48 insertions(+), 54 deletions(-)
diff --git a/zbeta/texlive/BUILD b/zbeta/texlive/BUILD
index 2375057..3399e8c 100644
--- a/zbeta/texlive/BUILD
+++ b/zbeta/texlive/BUILD
@@ -1,35 +1,44 @@
(
- # Patches from http://scmweb.sourcemage.org/?p=smgl/grimoire.git;a=tree;f=latex/texlive
- patch_it $SOURCE_CACHE/$SOURCE2 1 &&
- patch_it $SOURCE_CACHE/$SOURCE3 0 &&
-
- # Hide warnings about unable to find its own config files
+ # Patch from http://scmweb.sourcemage.org/?p=smgl/grimoire.git;a=tree;f=latex/texlive
+ # Use Linux-sensible directories
+ patch_it $SOURCE_CACHE/$SOURCE2 0 &&
+
+ # Fonts dir
+ sedit 's:^\(OSFONTDIR =\).*:\1 /usr/share/fonts:' texk/kpathsea/texmf.cnf &&
+
+ # Use /usr/share/texmf and /usr/share/texmf-dist
+ find -name Makefile\* -print0 | xargs -0 sed -i -e "s:\${prefix}/texmf:\${datadir}/texmf:" &&
+ find -name configure -print0 | xargs -0 sed -i -e "s:\${prefix}/texmf:\${datadir}/texmf:" &&
+ find -name \*.info -print0 | xargs -0 sed -i -e "s:/usr/local:/usr:" &&
+ find -name \*.texi -print0 | xargs -0 sed -i -e "s:/usr/local:/usr:" &&
+ find -name \*.synctex -print0 | xargs -0 sed -i -e "s:/usr/local:/usr:" &&
+
+ # Direct symlinks from /usr/bin/ into /usr/*share*/texmf... rather than /usr/texmf...
+ sedit "s:\$(REL):/usr/share:" texk/texlive/linked_scripts/Makefile* &&
+ # Some of the symlinks are still wrong, e.g.:
+ # xmltools -> ../share/texmf-dist/scripts/context/stubs/unix/xmltools
+ # presumably should be:
+ # xmltools -> ../share/texmf-dist/scripts/context/ruby/xmltools.rb
+ # Show them by running: ls -l /usr/bin | grep stubs
+
+ # Prevent the ridiculous behaviour of deleting, then trying to replace, /usr/bin/man
+ sedit "s:rm -f man:true:" texk/texlive/linked_scripts/Makefile* &&
+ sedit "s:ln -s /usr/share/texmf/doc/man man:true:" texk/texlive/linked_scripts/Makefile* &&
+
+ # Hide warnings about being unable to find its own config files
export KPATHSEA_WARNING=0 &&
# Some options are from http://www.gentoo-portage.com/app-text/texlive-core
# and http://repos.archlinux.org/wsvn/packages/texlive-bin/trunk/
- OPTS+=" --datadir=/usr/share --disable-multiplatform --disable-native-texlive-build --with-pdftex --with-tetex --with-pdfetex --with-system-zlib --with-system-freetype2 --with-system-libpng --with-gs=gs --enable-xetex --enable-ipc --enable-shared" &&
-
- # luatex doesn't compile - anyway, latex & pdflatex are good enough :-)
- OPTS+=" --disable-luatex" &&
-
- # clisp (required by xindy) doesn't compile - see DEPENDS
- OPTS+=" --disable-xindy" &&
+ OPTS+=" --datadir=/usr/share --disable-multiplatform --disable-native-texlive-build --with-system-zlib --with-system-freetype2 --with-system-libpng --with-gs=gs --enable-etex --enable-luatex --enable-xetex --enable-ipc --enable-shared --enable-static=no" &&
default_build &&
- # In version 20091107, texlive does not install wrappers like latex automatically, so copy these files explicitly.
- local i &&
- for i in texk/texlive/* ; do
- if file "$i" | grep 'script text executable' > /dev/null 2>&1 ; then
- install -m755 "$i" /usr/bin/
- fi
- done &&
-
- ln -sfn mf /usr/bin/mf-nowin &&
+ # Create symlinks in /usr/bin/, for e.g. pdflatex
+ texlinks -q &&
# Idea from http://repos.archlinux.org/wsvn/packages/texlive-bin/trunk/
- install -m644 $SOURCE_CACHE/$SOURCE4 /etc/fonts/conf.d/09-texlive-fonts.conf
+ install -m644 $SOURCE_CACHE/$SOURCE3 /etc/fonts/conf.d/09-texlive-fonts.conf
) > $C_FIFO 2>&1
diff --git a/zbeta/texlive/CONFLICTS b/zbeta/texlive/CONFLICTS
index 7afbb65..51c445b 100644
--- a/zbeta/texlive/CONFLICTS
+++ b/zbeta/texlive/CONFLICTS
@@ -1,2 +1,3 @@
conflicts teTeX
+# teTeX-texmf's BUILD contains a stupid "rm -rf /usr/share/texmf", so don't remove this conflict
conflicts teTeX-texmf
diff --git a/zbeta/texlive/DEPENDS b/zbeta/texlive/DEPENDS
index d0399f6..3ec2d3f 100644
--- a/zbeta/texlive/DEPENDS
+++ b/zbeta/texlive/DEPENDS
@@ -10,13 +10,11 @@ depends libpng
depends freetype2
depends fontconfig
depends ghostscript
+depends lua
-optional_depends "t1lib" "--with-system-t1lib" "--without-system-t1lib" "for t1lib support"
+optional_depends "t1lib" "--with-system-t1lib" "--without-system-t1lib" "for t1lib support"
# This will look like the wrong way around. It means whether to install texlive's own version of lcdf-typetools, or use the lcdf-typetools module from moonbase.
-optional_depends "lcdf-typetools" "--disable-lcdf-typetools" "--enable-lcdf-typetools" "for Postscript support (if n, TeX Live's own version will be installed)"
+optional_depends "lcdf-typetools" "--disable-lcdf-typetools" "--enable-lcdf-typetools" "for Postscript support (if n, TeX Live's own version will be installed)"
-# Other xindy options in http://repos.archlinux.org/wsvn/packages/texlive-bin/trunk/
-# clisp doesn't even compile:
-# configure: error: cannot find sources (lispbibl.d) in /usr/bin or ..
-#optional_depends "clisp" "--enable-xindy" "--disable-xindy" "for xindy book-like indexes"
+optional_depends "clisp" "--enable-xindy" "--disable-xindy" "for xindy book-like indexes"
diff --git a/zbeta/texlive/DETAILS b/zbeta/texlive/DETAILS
index 2b35920..4a0b853 100644
--- a/zbeta/texlive/DETAILS
+++ b/zbeta/texlive/DETAILS
@@ -1,21 +1,18 @@
MODULE=texlive
- VERSION=20091107
+ VERSION=20100722
SOURCE=$MODULE-$VERSION-source.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION-source
- SOURCE2=texlive-20091107-fix_scripts_3.patch
- SOURCE3=texlive-20091107-texmf.cnf_fix.patch
- SOURCE4=texlive-20091107-09-texlive-fonts.conf
- SOURCE_URL=ftp://tug.org/historic/systems/texlive/2009/
+ SOURCE2=texlive-20091107-texmf.cnf_fix.patch
+ SOURCE3=texlive-20091107-09-texlive-fonts.conf
+ SOURCE_URL=ftp://tug.org/historic/systems/texlive/${VERSION:0:4}
SOURCE2_URL=$PATCH_URL
SOURCE3_URL=$PATCH_URL
- SOURCE4_URL=$PATCH_URL
- SOURCE_VFY=sha1:3e11287f16595209181dc2e0ae7c23809e2e73ee
- SOURCE2_VFY=sha1:f32083249d4503589536ae39bbe8bf9d943e631e
- SOURCE3_VFY=sha1:807b2d96c86b24cb0743909c13e08172925eee85
- SOURCE4_VFY=sha1:7277db188ded00af37364d03bbcf9614b851c847
+ SOURCE_VFY=sha1:c5573c0617f1a44235212277959f48fb76590542
+ SOURCE2_VFY=sha1:807b2d96c86b24cb0743909c13e08172925eee85
+ SOURCE3_VFY=sha1:7277db188ded00af37364d03bbcf9614b851c847
WEB_SITE=http://www.tug.org/texlive/
ENTERED=20100805
- UPDATED=20100805
+ UPDATED=20100909
SHORT="TeX distribution that includes web2c, pdfTeX, e-Tex and more"
# Text from http://www.tug.org/texlive/
diff --git a/zbeta/texlive/POST_INSTALL b/zbeta/texlive/POST_INSTALL
index 055dd2e..1fbaad5 100644
--- a/zbeta/texlive/POST_INSTALL
+++ b/zbeta/texlive/POST_INSTALL
@@ -1,18 +1,7 @@
-# Set up the Tex Live environment.
-# Some of this may be unnecessary, but TeX Live is too big (900mb) to check everything. It works.
-
-mktexlsr > /dev/null 2>&1
-
-# From http://repos.archlinux.org/wsvn/packages/texlive-core/trunk/texlive.install
-updmap-sys --quiet --nohash
+# From http://tug.org/pipermail/tlbuild/2010q2/001606.html
+# Comments out comicvn.map and mscorevn.map from /usr/share/texmf-config/web2c/updmap.cfg
+updmap-sys --quiet --syncwithtrees
# Hint from https://bbs.archlinux.org/viewtopic.php?pid=607603
# Prevent error message: Fatal format file error; I'm stymied
-# Will fail on luatex, which is not installed.
-fmtutil-sys --all > /dev/null 2>&1
-
-# From http://www.linuxforums.org/forum/linux-applications/75163-latex-error-i-cant-find-format-file-latex-fmt.html
-# initex latex.ltx > /dev/null && install -m644 latex.fmt /usr/share/texmf/web2c/
-
-texhash > /dev/null 2>&1
-mktexlsr > /dev/null 2>&1
+fmtutil-sys --quiet --all > /dev/null
More information about the Lunar-commits
mailing list