[arch-commits] Commit in texlive-pictures/trunk (3 files)

[François Charette]

    Date: Saturday, June 26, 2010 @ 10:43:27
  Author: francois
Revision: 84113

prerelease of texlive 2010

Modified:
  texlive-pictures/trunk/PKGBUILD
  texlive-pictures/trunk/texlive-pictures.maps
  texlive-pictures/trunk/texlive.install

-----------------------+
 PKGBUILD              |   35 ++++++++++++++++++++---------------
 texlive-pictures.maps |    1 +
 texlive.install       |   19 ++++++++++++-------
 3 files changed, 33 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-26 14:43:19 UTC (rev 84112)
+++ PKGBUILD	2010-06-26 14:43:27 UTC (rev 84113)
@@ -1,7 +1,7 @@
 # Maintainer: Firmicus <firmicus āt gmx dōt net>
 
 pkgname=texlive-pictures
-pkgver=2009.16576
+pkgver=2010.19142
 pkgrel=1
 pkgdesc="TeX Live - Packages for drawings graphics"
 license=('GPL')
@@ -11,23 +11,25 @@
 url='http://tug.org/texlive/'
 source=("ftp://ftp.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip" "$pkgname.maps")
 options=('!emptydirs')
+options=(!strip)
 install=texlive.install
-md5sums=('948a020b01ded808b93077e75bd81ba5'
-         '7678579f4d465c2acfe9ccb6fe03da35')
+md5sums=('59953f4ed099fb4d612ae9cd43eaee95'
+         '7d08cb8ade87687bd8676f8e8ba20697')
 
 build() {
-   cd $srcdir
-   install -m755 -d $pkgdir/usr/share/texmf-var/arch/installedpkgs || return 1
-   sed -i '/^#/d' CONTENTS || return 1
-   _revnr=`echo $pkgver | sed 's/2009\.//'`
-   install -m644 CONTENTS $pkgdir/usr/share/texmf-var/arch/installedpkgs/${pkgname}_${_revnr}.pkgs || return 1
-   install -m644 $pkgname.maps $pkgdir/usr/share/texmf-var/arch/installedpkgs/ || return 1
-   for p in *.tar.xz; do 
+   for p in *.tar.xz; do
 	   bsdtar -xf $p || return 1
    done
-   rm -rf {tlpkg,doc,source}
+   rm -rf {tlpkg,doc,source} || true
+}
+package() {
+   install -m755 -d $pkgdir/var/lib/texmf/arch/installedpkgs || return 1
+   sed -i '/^#/d' CONTENTS || return 1
+   _revnr=`echo $pkgver | sed 's/2010\.//'`
+   install -m644 CONTENTS $pkgdir/var/lib/texmf/arch/installedpkgs/${pkgname}_${_revnr}.pkgs || return 1
+   install -m644 $pkgname.maps $pkgdir/var/lib/texmf/arch/installedpkgs/ || return 1
    install -m755 -d $pkgdir/usr/share || return 1
-   wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done)
+   wanteddirs=$(for d in *; do test -d $d && [[ $d != texmf* ]] && echo $d; done) || true
    for dir in $wanteddirs; do
      find $dir -type d -exec install -d -m755 $pkgdir/usr/share/texmf-dist/'{}' \; || return 1
      find $dir -type f -exec install -m644 '{}' $pkgdir/usr/share/texmf-dist/'{}' \; || return 1
@@ -40,7 +42,10 @@
      find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
    fi
    install -m755 -d $pkgdir/usr/bin || return 1
-   ln -s /usr/share/texmf-dist/scripts/cachepic/cachepic.tlu $pkgdir/usr/bin/cachepic 
-   ln -s /usr/share/texmf-dist/scripts/epspdf/epspdf $pkgdir/usr/bin/epspdf 
-   ln -s /usr/share/texmf-dist/scripts/epspdf/epspdftk $pkgdir/usr/bin/epspdftk 
+   ln -s /usr/share/texmf-dist/scripts/cachepic/cachepic.tlu $pkgdir/usr/bin/cachepic
+   ln -s /usr/share/texmf-dist/scripts/epspdf/epspdftk $pkgdir/usr/bin/epspdftk
+   ln -s /usr/share/texmf-dist/scripts/epspdf/epspdf $pkgdir/usr/bin/epspdf
+   ln -s /usr/share/texmf-dist/scripts/epstopdf/epstopdf.pl $pkgdir/usr/bin/epstopdf
+   ln -s /usr/share/texmf-dist/scripts/fig4latex/fig4latex $pkgdir/usr/bin/fig4latex
+   ln -s /usr/share/texmf-dist/scripts/mathspic/mathspic.pl $pkgdir/usr/bin/mathspic
 }

Modified: texlive-pictures.maps
===================================================================
--- texlive-pictures.maps	2010-06-26 14:43:19 UTC (rev 84112)
+++ texlive-pictures.maps	2010-06-26 14:43:27 UTC (rev 84113)
@@ -1 +1,2 @@
+Map knitfont.map
 MixedMap xypic.map

Modified: texlive.install
===================================================================
--- texlive.install	2010-06-26 14:43:19 UTC (rev 84112)
+++ texlive.install	2010-06-26 14:43:27 UTC (rev 84113)
@@ -1,8 +1,9 @@
 PKGNAME="texlive-pictures"
-UPDMAP="/usr/share/texmf-config/web2c/updmap.cfg"
+UPDMAP="/etc/texmf/web2c/updmap.cfg"
 SYNCWITHTREES=''
 NEWMAPS=`mktemp`
 cat <<EOF > $NEWMAPS
+Map knitfont.map
 MixedMap xypic.map
 EOF
 
@@ -12,15 +13,19 @@
 
 post_install() {
 	echo    ">>> texlive: updating the filename database..."
-	texconfig-sys rehash
+	/usr/bin/mktexlsr
 	echo    ">>> texlive: updating the fontmap files with updmap..."
-	updmap-sys --quiet --nohash
+	/usr/bin/updmap-sys --quiet --nohash
 	echo    " done." 
 }
 
 
 pre_upgrade() {
-  OLDMAPS="/usr/share/texmf-var/arch/installedpkgs/$PKGNAME.maps"
+  if [[ "$2" == 200* ]]; then
+    OLDMAPS="/usr/share/texmf-var/arch/installedpkgs/$PKGNAME.maps"
+  else # >= 2010
+    OLDMAPS="/var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
+  fi
   if [ -f $OLDMAPS ] ; then
     MAPSDIFF=`mktemp`
     TOADD=`mktemp`
@@ -36,7 +41,7 @@
        cat $TOADD >> $UPDMAP
     fi
   else
-    echo "Warning: file $PKGNAME.maps not found" 
+    echo "Warning: file $OLDMAPS not found" 
     echo "(ignore the above if updating from TL2008 or from TL2009 in testing)"
     SYNCWITHTREES="--syncwithtrees"
   fi
@@ -45,9 +50,9 @@
 
 post_upgrade() {
 	echo    ">>> texlive: updating the filename database..."
-	texconfig-sys rehash
+	/usr/bin/mktexlsr
 	echo    ">>> texlive: updating the fontmap files with updmap..."
-	updmap-sys --quiet --nohash $SYNCWITHTREES
+	/usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
 	echo    " done." 
 }