[arch-commits] Commit in texlive-bin/trunk (PKGBUILD)

[Jan de Groot]

    Date: Tuesday, June 22, 2010 @ 15:37:03
  Author: jgc
Revision: 83754

upgpkg: texlive-bin 2009.5-5
Rebuild for poppler

Modified:
  texlive-bin/trunk/PKGBUILD

----------+
 PKGBUILD |   42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-22 19:18:19 UTC (rev 83753)
+++ PKGBUILD	2010-06-22 19:37:03 UTC (rev 83754)
@@ -3,11 +3,11 @@
 
 pkgname=texlive-bin
 pkgver=2009.5
-pkgrel=4
+pkgrel=5
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('t1lib' 'gd' 'libsigsegv' 'poppler')
+depends=('t1lib' 'gd' 'libsigsegv' 'poppler>=0.14.0')
 makedepends=('clisp' 'ffcall')
 options=('!makeflags' '!libtool')
 url='http://tug.org/texlive/'
@@ -44,19 +44,19 @@
 
    cd $srcdir
 
-   patch -p0 < libpng14.patch || return 1
+   patch -p0 < libpng14.patch
 
-   install -m755 -d $pkgdir/usr/share || return 1
-   cp -r texmf $pkgdir/usr/share/ || return 1
+   install -m755 -d $pkgdir/usr/share
+   cp -r texmf $pkgdir/usr/share/
 
    ### provisory: we configure and build luatex 0.50 separately, because 
    # it is needed for latest ConTeXT in texlive-core, but it fails to build
    # when integrated in the texlive build tree
-   cd luatex-beta-0.50.0 || return 1
-   patch -p0 -i ../fix-fontforge-encoding.patch || return 1
-   patch -p1 -i ../luatex-0.50-poppler.patch || return 1
-   mkdir build || return 1
-   cd build || return 1
+   cd luatex-beta-0.50.0
+   patch -p0 -i ../fix-fontforge-encoding.patch
+   patch -p1 -i ../luatex-0.50-poppler.patch
+   mkdir build
+   cd build
    ../source/configure --prefix=/usr \
     --enable-cxx-runtime-hack \
     --disable-afm2pl \
@@ -123,14 +123,14 @@
     --disable-largefile \
     --disable-ipc \
     --without-mf-x-toolkit \
-    --without-x  || return 1
-   make || return 1
+    --without-x
+   make
 
    ## install luatex binary
-   install -d -m755 $pkgdir/usr/bin || return 1
-   install -m755 texk/web2c/luatex $pkgdir/usr/bin/ || return 1
+   install -d -m755 $pkgdir/usr/bin
+   install -m755 texk/web2c/luatex $pkgdir/usr/bin/
    cd $pkgdir/usr/bin
-   /bin/ln -s luatex texlua || return 1
+   /bin/ln -s luatex texlua
    cd $srcdir
    ##################################
    # TODO don't forget to remove --disable-luatex below 
@@ -167,20 +167,20 @@
     --disable-aleph \
     --disable-luatex \
     --without-graphite \
-    --enable-xindy || return 1
+    --enable-xindy
    #############################################################
    #############################################################
    echo "-------------------------------------------------------"
    echo "--> Building the whole beast ..."
-   make || return 1
+   make
    #############################################################
 
    ### fixes for xindy
-   find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $pkgname/usr|" -e "s|^mandir =.\+$|mandir = \${prefix}/share/man|" -e "s|^datadir =.\+$|datadir = \${datarootdir}/texmf|" -e "s|^docdir =.\+$|docdir = \${datadir}/doc/xindy|" '{}' \; || return 1
+   find utils/xindy -name Makefile -exec sed -i -e "s|^prefix =.\+$|prefix = $pkgname/usr|" -e "s|^mandir =.\+$|mandir = \${prefix}/share/man|" -e "s|^datadir =.\+$|datadir = \${datarootdir}/texmf|" -e "s|^docdir =.\+$|docdir = \${datadir}/doc/xindy|" '{}' \;
    echo "-------------------------------------------------------"
    echo "--> Proceeding with make install ..."
    install -d -m755 $pkgdir/usr/share/man/man5
-   make prefix=$pkgdir/usr texmf=$pkgdir/usr/share/texmf install || return 1
+   make prefix=$pkgdir/usr texmf=$pkgdir/usr/share/texmf install
    echo "-------------------------------------------------------"
    echo "--> Fixing symlinks for scripts ..."
    for f in $pkgdir/usr/bin/* ; do
@@ -197,7 +197,7 @@
 
    ## 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/ || return 1
+   PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/
    #############################################################
    
    ## CLEAN UP... 
@@ -259,7 +259,7 @@
    rm -f $pkgdir/usr/share/texmf/web2c/texmf.cnf
    install -m644 $srcdir/texmf.cnf $pkgdir/usr/share/texmf/web2c/texmf.cnf
    ## remove aleph from fmtutil.cnf
-   sed -i -e '/aleph/d' $pkgdir/usr/share/texmf/web2c/fmtutil.cnf || return 1
+   sed -i -e '/aleph/d' $pkgdir/usr/share/texmf/web2c/fmtutil.cnf
    ###################################################################
    # copy config files to texmf-config tree
    install -d -m755 $pkgdir/usr/share/texmf-config/web2c