[arch-commits] Commit in texlive-science/trunk (PKGBUILD texlive.install)

[Rémy Oudompheng]

    Date: Sunday, November 14, 2010 @ 20:57:08
  Author: remy
Revision: 99528

Update with upstream packages (fixes siunitx).
Remove leading slashes from install script.

Updated packages : bytefield, chemstyle, computational-complexity, sfg, siunitx.

Modified:
  texlive-science/trunk/PKGBUILD
  texlive-science/trunk/texlive.install

-----------------+
 PKGBUILD        |    6 +++---
 texlive.install |   23 ++++++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-14 22:37:20 UTC (rev 99527)
+++ PKGBUILD	2010-11-15 01:57:08 UTC (rev 99528)
@@ -1,7 +1,7 @@
-# Maintainer: Firmicus <firmicus āt gmx dōt net>
+# Maintainer: Rémy <remy at archlinux.org>
 
 pkgname=texlive-science
-pkgver=2010.19845
+pkgver=2010.20348
 pkgrel=1
 pkgdesc="TeX Live - Typesetting for natural and computer sciences"
 license=('GPL')
@@ -13,7 +13,7 @@
 options=('!emptydirs')
 options=(!strip)
 install=texlive.install
-md5sums=('1b91002914b14898643dde93da8b8cce'
+md5sums=('f351623a58cf1c0dc94aa8b836f366a7'
          '72206bb981d3d491df018e0e13334be5')
 
 build() {

Modified: texlive.install
===================================================================
--- texlive.install	2010-11-14 22:37:20 UTC (rev 99527)
+++ texlive.install	2010-11-15 01:57:08 UTC (rev 99528)
@@ -1,5 +1,5 @@
 PKGNAME="texlive-science"
-UPDMAP="/etc/texmf/web2c/updmap.cfg"
+UPDMAP="etc/texmf/web2c/updmap.cfg"
 SYNCWITHTREES=''
 NEWMAPS=`mktemp`
 cat <<EOF > $NEWMAPS
@@ -12,15 +12,25 @@
 
 post_install() {
 	echo    ">>> texlive: updating the filename database..."
-	/usr/bin/mktexlsr
+	usr/bin/mktexlsr
 	echo    ">>> texlive: updating the fontmap files with updmap..."
-	/usr/bin/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"
+    echo "Info: copying previous updmap.cfg from /usr/share/texmf-config/web2c/"
+    echo "      to /etc/texmf/web2c/ (and keeping new one as updmap.cfg.pacnew)"
+    mv etc/texmf/web2c/updmap.cfg etc/texmf/web2c/updmap.cfg.pacnew 
+    cp usr/share/texmf-config/web2c/updmap.cfg.pacsave etc/texmf/web2c/updmap.cfg
+  else
+    # $2 >= 2010
+    OLDMAPS="var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
+  fi
+
   if [ -f $OLDMAPS ] ; then
     MAPSDIFF=`mktemp`
     TOADD=`mktemp`
@@ -37,7 +47,6 @@
     fi
   else
     echo "Warning: file $OLDMAPS not found" 
-    echo "(ignore the above if updating from TL2008 or from TL2009 in testing)"
     SYNCWITHTREES="--syncwithtrees"
   fi
 }
@@ -45,9 +54,9 @@
 
 post_upgrade() {
 	echo    ">>> texlive: updating the filename database..."
-	/usr/bin/mktexlsr
+	usr/bin/mktexlsr
 	echo    ">>> texlive: updating the fontmap files with updmap..."
-	/usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
+	usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
 	echo    " done." 
 }