Date: Tuesday, January 24, 2012 @ 17:48:49 Author: eric Revision: 147233
upgpkg: texlive-bin 2011.3-2 Rebuild against libpng 1.5 and libtiff 4.0, Add info pages fix in .install file Modified: texlive-bin/trunk/PKGBUILD texlive-bin/trunk/texlive.install -----------------+ PKGBUILD | 123 +++++++++++++++++++++++++++--------------------------- texlive.install | 19 ++++++++ 2 files changed, 81 insertions(+), 61 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-01-24 22:47:27 UTC (rev 147232) +++ PKGBUILD 2012-01-24 22:48:49 UTC (rev 147233) @@ -1,3 +1,4 @@ +# $Id$ # Maintainer: Rémy Oudompheng <r...@archlinux.org> # Contributor: francois <francois.archlinux.org> @@ -4,7 +5,7 @@ pkgname=texlive-bin pkgver=2011.3 _luatex_ver=0.70.1 -pkgrel=1 +pkgrel=2 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64') @@ -51,7 +52,7 @@ export CXXFLAGS="${CXXFLAGS} -fPIC" fi - cd $srcdir + cd "$srcdir" # Building LuaTeX # cd luatex-beta-${_luatex_ver} cd luatex @@ -145,63 +146,63 @@ } package() { - cd $srcdir + cd "$srcdir" ############################################################# ### install texmf tree echo "-------------------------------------------------------" echo "--> installing the texmf tree" echo "-------------------------------------------------------" - install -m755 -d $pkgdir/usr/share - cp -r texmf $pkgdir/usr/share/ - install -d -m755 $pkgdir/etc/texmf/web2c - install -d -m755 $pkgdir/etc/texmf/chktex - install -d -m755 $pkgdir/etc/texmf/dvips/config - install -d -m755 $pkgdir/etc/texmf/dvipdfm/config - install -d -m755 $pkgdir/etc/texmf/dvipdfmx - install -d -m755 $pkgdir/etc/texmf/tex/generic/config - install -d -m755 $pkgdir/etc/texmf/ttf2pk - install -d -m755 $pkgdir/etc/texmf/xdvi - install -d -m755 $pkgdir/etc/fonts/conf.avail - install -m644 $srcdir/09-texlive-fonts.conf $pkgdir/etc/fonts/conf.avail/ + install -m755 -d "$pkgdir"/usr/share + cp -r texmf "$pkgdir"/usr/share/ + install -d -m755 "$pkgdir"/etc/texmf/web2c + install -d -m755 "$pkgdir"/etc/texmf/chktex + install -d -m755 "$pkgdir"/etc/texmf/dvips/config + install -d -m755 "$pkgdir"/etc/texmf/dvipdfm/config + install -d -m755 "$pkgdir"/etc/texmf/dvipdfmx + install -d -m755 "$pkgdir"/etc/texmf/tex/generic/config + install -d -m755 "$pkgdir"/etc/texmf/ttf2pk + install -d -m755 "$pkgdir"/etc/texmf/xdvi + install -d -m755 "$pkgdir"/etc/fonts/conf.avail + install -m644 "$srcdir"/09-texlive-fonts.conf "$pkgdir"/etc/fonts/conf.avail/ # move man files to /usr/share/man for i in 1 5; do - install -d -m755 $pkgdir/usr/share/man/man$i - mv $pkgdir/usr/share/texmf/doc/man/man$i/*.$i $pkgdir/usr/share/man/man$i/ + install -d -m755 "$pkgdir"/usr/share/man/man$i + mv "$pkgdir"/usr/share/texmf/doc/man/man$i/*.$i "$pkgdir"/usr/share/man/man$i/ done # move info files to /usr/share/info - install -d -m755 $pkgdir/usr/share/info - mv $pkgdir/usr/share/texmf/doc/info/*.info $pkgdir/usr/share/info/ - rm -rf $pkgdir/usr/share/texmf/doc/{man,info} + install -d -m755 "$pkgdir"/usr/share/info + mv "$pkgdir"/usr/share/texmf/doc/info/*.info "$pkgdir"/usr/share/info/ + rm -rf "$pkgdir"/usr/share/texmf/doc/{man,info} # copy config files to $TEXMFCONFIG tree - cp -a $pkgdir/usr/share/texmf/chktex/chktexrc \ - $pkgdir/etc/texmf/chktex/ - cp -a $pkgdir/usr/share/texmf/web2c/mktex.cnf \ - $pkgdir/etc/texmf/web2c/ - cp -a $pkgdir/usr/share/texmf/web2c/updmap.cfg \ - $pkgdir/etc/texmf/web2c/ - cp -a $pkgdir/usr/share/texmf/web2c/fmtutil.cnf \ - $pkgdir/etc/texmf/web2c/ - cp -a $pkgdir/usr/share/texmf/dvips/config/config.ps \ - $pkgdir/etc/texmf/dvips/config/ - cp -a $pkgdir/usr/share/texmf/dvipdfm/config/config \ - $pkgdir/etc/texmf/dvipdfm/config/ - cp -a $pkgdir/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \ - $pkgdir/etc/texmf/dvipdfmx/ - cp -a $pkgdir/usr/share/texmf/tex/generic/config/pdftexconfig.tex \ - $pkgdir/etc/texmf/tex/generic/config/ - cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.dat \ - $pkgdir/etc/texmf/tex/generic/config/ - cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.def \ - $pkgdir/etc/texmf/tex/generic/config/ - cp -a $pkgdir/usr/share/texmf/ttf2pk/ttf2pk.cfg \ - $pkgdir/etc/texmf/ttf2pk/ - cp -a $pkgdir/usr/share/texmf/xdvi/XDvi \ - $pkgdir/etc/texmf/xdvi/ + cp -a "$pkgdir"/usr/share/texmf/chktex/chktexrc \ + "$pkgdir"/etc/texmf/chktex/ + cp -a "$pkgdir"/usr/share/texmf/web2c/mktex.cnf \ + "$pkgdir"/etc/texmf/web2c/ + cp -a "$pkgdir"/usr/share/texmf/web2c/updmap.cfg \ + "$pkgdir"/etc/texmf/web2c/ + cp -a "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf \ + "$pkgdir"/etc/texmf/web2c/ + cp -a "$pkgdir"/usr/share/texmf/dvips/config/config.ps \ + "$pkgdir"/etc/texmf/dvips/config/ + cp -a "$pkgdir"/usr/share/texmf/dvipdfm/config/config \ + "$pkgdir"/etc/texmf/dvipdfm/config/ + cp -a "$pkgdir"/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \ + "$pkgdir"/etc/texmf/dvipdfmx/ + cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/pdftexconfig.tex \ + "$pkgdir"/etc/texmf/tex/generic/config/ + cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.dat \ + "$pkgdir"/etc/texmf/tex/generic/config/ + cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.def \ + "$pkgdir"/etc/texmf/tex/generic/config/ + cp -a "$pkgdir"/usr/share/texmf/ttf2pk/ttf2pk.cfg \ + "$pkgdir"/etc/texmf/ttf2pk/ + cp -a "$pkgdir"/usr/share/texmf/xdvi/XDvi \ + "$pkgdir"/etc/texmf/xdvi/ # remove TL specific warnings in the language.{dat,def} files: - sed -i -e '/DO NOT EDIT/,+3 d' $pkgdir/etc/texmf/tex/generic/config/language.* + sed -i -e '/DO NOT EDIT/,+3 d' "$pkgdir"/etc/texmf/tex/generic/config/language.* # clean updmap.cfg - sed -i '/^\(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg - sed -i '/^#! \(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg + sed -i '/^\(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg + sed -i '/^#! \(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg ############################################################# ### install @@ -213,34 +214,34 @@ echo "--> Proceeding with make install ..." echo "-------------------------------------------------------" cd Work - make DESTDIR=${pkgdir} texmf=$pkgdir/usr/share/texmf install - rm -rf ${pkgdir}/usr/{texmf,share/texmf-dist} + make DESTDIR="${pkgdir}" texmf="$pkgdir"/usr/share/texmf install + rm -rf "${pkgdir}"/usr/{texmf,share/texmf-dist} # replace upstream texmf.cnf with ours - rm -f $pkgdir/usr/share/texmf/web2c/texmf.cnf - install -m644 $srcdir/texmf.cnf $pkgdir/etc/texmf/web2c/texmf.cnf + rm -f "$pkgdir"/usr/share/texmf/web2c/texmf.cnf + install -m644 "$srcdir"/texmf.cnf "$pkgdir"/etc/texmf/web2c/texmf.cnf # since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c # we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter - ln -sf /etc/texmf/web2c/texmf.cnf $pkgdir/usr/share/texmf/web2c/texmf.cnf + ln -sf /etc/texmf/web2c/texmf.cnf "$pkgdir"/usr/share/texmf/web2c/texmf.cnf # fix location of TEXMFCACHE for luatools - sed -i 's#texlive2010#texlive#' $pkgdir/usr/share/texmf/web2c/texmfcnf.lua + sed -i 's#texlive2010#texlive#' "$pkgdir"/usr/share/texmf/web2c/texmfcnf.lua ## remove aleph from fmtutil.cnf - sed -i -e '/aleph/d' $pkgdir/usr/share/texmf/web2c/fmtutil.cnf + sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf ## install luatex binary - #install -m755 $srcdir/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex $pkgdir/usr/bin/ - install -m755 $srcdir/luatex/build/texk/web2c/luatex $pkgdir/usr/bin/ - cd $pkgdir/usr/bin + #install -m755 "$srcdir"/luatex-beta-${_luatex_ver}/build/texk/web2c/luatex "$pkgdir"/usr/bin/ + install -m755 "$srcdir"/luatex/build/texk/web2c/luatex "$pkgdir"/usr/bin/ + cd "$pkgdir"/usr/bin /bin/ln -s luatex texlua /bin/ln -s luatex texluac ## install Perl libraries - mkdir -p $pkgdir/usr/share/tlpkg/TeXLive - install -m644 ${srcdir}/source/utils/biber/TeXLive/*.pm $pkgdir/usr/share/tlpkg/TeXLive + mkdir -p "$pkgdir"/usr/share/tlpkg/TeXLive + install -m644 "${srcdir}"/source/utils/biber/TeXLive/*.pm "$pkgdir"/usr/share/tlpkg/TeXLive # create symlinks for formats echo "--> Create symlinks for TeX formats ..." - PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/ + PATH="$PATH:${pkgdir}/usr/bin" texlinks -f "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf "$pkgdir"/usr/bin/ ############################################################# # remove dangling symlinks _bibtexextra_scripts=" @@ -337,7 +338,7 @@ ${_pstricks_scripts} \ ${_science_scripts} \ tlmgr; do - rm -f $pkgdir/usr/bin/$s + rm -f "$pkgdir"/usr/bin/$s done ################################################################### } Modified: texlive.install =================================================================== --- texlive.install 2012-01-24 22:47:27 UTC (rev 147232) +++ texlive.install 2012-01-24 22:48:49 UTC (rev 147233) @@ -1,3 +1,6 @@ +infodir=usr/share/info +filelist=(dvipng.info dvips.info eplain.info epspdf.info fontname.info kpathsea.info latex2e-es.info latex2e.info latex2man.info mf2pt1.info tds.info texdraw.info web2c.info) + post_install() { echo ">>> texlive: updating the filename database..." usr/bin/mktexlsr @@ -5,6 +8,11 @@ usr/bin/fmtutil-sys --all 1>/dev/null echo " done." echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)" + + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null + done } post_upgrade() { @@ -14,5 +22,16 @@ usr/bin/fmtutil-sys --all 1>/dev/null echo " done." echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)" + + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null + done } +pre_remove() { + [[ -x usr/bin/install-info ]] || return 0 + for file in "${filelist[@]}"; do + install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null + done +}