texlive: 20120701 -> 20140525

texlive/.md5sum

@@ -1,5 +1,3 @@
-065df26bef424e4defc30af3ff0c4b46  source-fixup_texmf-local_tree_in_texmf_cnf.diff
 f15ac876fcdc8be865b16535f480aa54  texi2html-5.0.tar.bz2
-1d38be7dac26440fd022a4708f454a2b  texlive-20120701-source.tar.xz
-461ec82632654b2b34f1be3e03216bc6  texlive-20120701-texmf.tar.xz
-7d9ea36ef7e61c807bae8cf69244b64c  texmf-fixup_texmf-local_tree_in_texmf_cnf.diff
+09ee265ff51637827559affc7304078c  texlive-20140525-source.tar.xz
+645a6f1d3a0ef4a9c279dae02588eab7  texlive-20140525-texmf.tar.xz

texlive/Pkgfile

@@ -1,90 +1,95 @@
 # Description: TeX distribution for UNIX compatible systems.
-# URL: http://www.tug.org/tetex/
-# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
-# Packager: Danny Rawlins, monster dot romster at gmail dot com
-# Depends on: icu libgd libsigsegv poppler t1lib util-linux xz clisp
+# URL:         http://www.tug.org/tetex/
+# Maintainer:  Thomas Penteker, tek at serverop dot de
+# Packager:    Danny Rawlins, monster dot romster at gmail dot com
+# Depends on:  icu libgd libsigsegv poppler t1lib util-linux xz clisp
 
 name=texlive
-version=20120701
-release=2
-source=(ftp://tug.org/historic/systems/texlive/2012/$name-$version-source.tar.xz
-	ftp://tug.org/historic/systems/texlive/2012/$name-$version-texmf.tar.xz
-	http://download.savannah.gnu.org/releases/texi2html/texi2html-5.0.tar.bz2
-	source-fixup_texmf-local_tree_in_texmf_cnf.diff
-	texmf-fixup_texmf-local_tree_in_texmf_cnf.diff)
+version=20140525
+release=1
+source=(ftp://tug.org/historic/systems/texlive/2014/$name-$version-{texmf,source}.tar.xz
+        http://download.savannah.gnu.org/releases/texi2html/texi2html-5.0.tar.bz2)
 
 build() {
-	cd $name-$version-source
+  cd $name-$version-source
 
-	chmod -R a-s $SRC
-	find $SRC \
-		\( -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 {} \;
+  chmod -R a-s $SRC
 
-	# Fix up some paths
-	patch -p 1 -i $SRC/source-fixup_texmf-local_tree_in_texmf_cnf.diff
+  find $SRC \
+    \( -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 {} \;
 
-	unset TEXMFCNF ; export TEXMFCNF
-	KPATHSEA_WARNING=0 ; export KPATHSEA_WARNING
+  # Fix some paths
+  sed -i 's|TEXMFROOT = .*|TEXMFROOT = $SELFAUTODIR/share|g' texk/kpathsea/texmf.cnf
+  sed -i 's|TEXMFLOCAL = .*|TEXMFLOCAL = $TEXMFROOT/texmf-local|g' texk/kpathsea/texmf.cnf
 
-	mkdir build
-	cd build
+  export TEXMFCNF=""
+  export KPATHSEA_WARNING=0
 
-	../configure \
-		--prefix=/usr \
-		--mandir=/usr/man \
-		--with-banner-add="$(crux)" \
-		--disable-native-texlive-build \
-		--enable-largefile \
-		--disable-missing \
-		--with-xdvi-x-toolkit=xaw \
-		--enable-shared \
-		--disable-static \
-		--with-x \
-		--without-etex \
-		--disable-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
+  mkdir build
+  cd build
 
-	make
-	make DESTDIR=$PKG install
-	cd ..
+  ../configure \
+    --prefix=/usr \
+    --mandir=/usr/man \
+    --with-banner-add=" $(crux)" \
+    --disable-native-texlive-build \
+    --enable-largefile \
+    --disable-missing \
+    --with-xdvi-x-toolkit=xaw \
+    --enable-shared \
+    --disable-static \
+    --with-x \
+    --without-etex \
+    --disable-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
 
-	# Create symlinks
-	PATH="$PATH:$PKG/usr/bin" LD_LIBRARY_PATH+=$PKG/usr/lib \
-		texlinks -f $PKG/usr/share/texmf/web2c/fmtutil.cnf $PKG/usr/bin
+  make
+  make DESTDIR=$PKG install
+  cd ..
 
-	# Install the docs while we're still here
-	mkdir -p $PKG/usr/doc/texlive-$version
-	cp -a ChangeLog README* $PKG/usr/doc/texlive-$version
+  # Create symlinks
+  PATH="$PKG/usr/bin:$PATH" LD_LIBRARY_PATH+=$PKG/usr/lib \
+    texlinks -f $PKG/usr/share/texmf-dist/web2c/fmtutil.cnf $PKG/usr/bin
 
-	# and now we'll install the texmf stuff
-	cd $SRC/$name-$version-texmf
+  cd $SRC/$name-$version-texmf
 
-	# Fix up some paths
-	patch -p 1 -i $SRC/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff
+  # Fix some paths
+  sed -i 's|TEXMFROOT = .*|TEXMFROOT = $SELFAUTODIR/share|g'  texmf-dist/web2c/texmf.cnf
+  sed -i 's|TEXMFLOCAL = .*|TEXMFLOCAL = $TEXMFROOT/texmf-local|g'  texmf-dist/web2c/texmf.cnf
 
-	mkdir -p $PKG/usr/share
-	cp -a texmf texmf-dist $PKG/usr/share
 
-	# Now let's add texi2hmtl - http://www.nongnu.org/texi2html/
-	cd $SRC/texi2html-*
+  install -d $PKG/usr/share
 
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/man
+  mv $PKG/usr/share/texmf-dist $PKG/usr/share/texmf-dist.tmp
+  mv texmf-dist $PKG/usr/share
 
-	make
-	make install DESTDIR=$PKG
+  # sub-optimal but better than copying texmf-dist!
+  cp -a $PKG/usr/share/texmf-dist.tmp/* $PKG/usr/share/texmf-dist
+  rm -r $PKG/usr/share/texmf-dist.tmp
 
-	rm -r $PKG/usr/share/{info,locale}
+  cd $SRC/texi2html-*
+
+  ./configure \
+    --prefix=/usr \
+    --mandir=/usr/man
+
+  make
+  make install DESTDIR=$PKG
+
+  rm -r $PKG/usr/share/{info,locale}
+  rm -r $PKG/usr/share/texmf-dist/doc
+  find  $PKG/usr/share/texmf-dist \
+    -regex '.*/\(COPYING\|README\|AUTHORS\|INSTALL\|ChangeLog\|NEWS\|TODO\).*' \
+    -delete
 }

texlive/post-install

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+umask 0022
 /usr/bin/mktexlsr
 /usr/bin/updmap-sys --nohash --syncwithtrees
 /usr/bin/mktexlsr

texlive/source-fixup_texmf-local_tree_in_texmf_cnf.diff

@@ -1,20 +0,0 @@
---- 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.
--TEXMFLOCAL = $TEXMFROOT/../texmf-local
-+TEXMFLOCAL = $TEXMFROOT/texmf-local
- 
- % TEXMFSYSVAR, where *-sys store cached runtime data.
- TEXMFSYSVAR = $TEXMFROOT/texmf-var

texlive/texmf-fixup_texmf-local_tree_in_texmf_cnf.diff

@@ -1,20 +0,0 @@
---- 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.
--TEXMFLOCAL = $TEXMFROOT/../texmf-local
-+TEXMFLOCAL = $TEXMFROOT/texmf-local
- 
- % TEXMFSYSVAR, where *-sys store cached runtime data.
- TEXMFSYSVAR = $TEXMFROOT/texmf-var