[arch-commits] Commit in texlive-langextra/repos (4 files)

[François Charette]

    Date: Thursday, September 3, 2009 @ 14:45:34
  Author: francois
Revision: 50931

Merged revisions 49980,50925 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/texlive-langextra/trunk

........
  r49980 | francois | 2009-08-18 10:57:43 +0200 (Tue, 18 Aug 2009) | 1 line
  
  better handling of mapfiles during install
........
  r50925 | francois | 2009-09-03 20:36:55 +0200 (Thu, 03 Sep 2009) | 1 line
  
  add missing map files!
........

Added:
  texlive-langextra/repos/extra-any/texlive-langextra.maps
    (from rev 50925, texlive-langextra/trunk/texlive-langextra.maps)
Modified:
  texlive-langextra/repos/extra-any/	(properties)
  texlive-langextra/repos/extra-any/PKGBUILD
  texlive-langextra/repos/extra-any/texlive.install

------------------------+
 PKGBUILD               |    8 +++--
 texlive-langextra.maps |   20 +++++++++++++
 texlive.install        |   68 ++++++++++++++++++++++++++---------------------
 3 files changed, 63 insertions(+), 33 deletions(-)


Property changes on: texlive-langextra/repos/extra-any
___________________________________________________________________
Modified: svnmerge-integrated
   - /texlive-langextra/trunk:1-47592
   + /texlive-langextra/trunk:1-50930

Modified: extra-any/PKGBUILD
===================================================================
--- extra-any/PKGBUILD	2009-09-03 18:44:48 UTC (rev 50930)
+++ extra-any/PKGBUILD	2009-09-03 18:45:34 UTC (rev 50931)
@@ -2,7 +2,7 @@
 
 pkgname=texlive-langextra
 pkgver=2009.14322
-pkgrel=1
+pkgrel=2
 pkgdesc="TeX Live - Bundle of all extra language support"
 license=('GPL')
 arch=(any)
@@ -11,10 +11,11 @@
 depends=('texlive-latexextra')
 groups=('texlive-lang')
 url='http://tug.org/texlive/'
-source=("ftp://ftp.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip")
+source=("ftp://ftp.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip" "$pkgname.maps")
 options=('!emptydirs')
 install=texlive.install
-md5sums=('27ec2da579944512073dbdeae2ac7c2c')
+md5sums=('f5033bf615cf1d8155cec928845aea38'
+         '19385050c1b5d3af3643cd765f32d32f')
 
 build() {
    cd $srcdir
@@ -22,6 +23,7 @@
    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 
 	   bsdtar -xf $p || return 1
    done

Copied: texlive-langextra/repos/extra-any/texlive-langextra.maps (from rev 50925, texlive-langextra/trunk/texlive-langextra.maps)
===================================================================
--- extra-any/texlive-langextra.maps	                        (rev 0)
+++ extra-any/texlive-langextra.maps	2009-09-03 18:45:34 UTC (rev 50931)
@@ -0,0 +1,20 @@
+Map arabi.map
+Map arevvn.map
+Map burmese.map
+Map chartervn.map
+Map cjhebrew.map
+Map cmbrightvn.map
+Map comicvn.map
+Map concretevn.map
+Map grotesqvn.map
+Map mscorevn.map
+Map skt.map
+Map txttvn.map
+Map urwvn.map
+Map vntopia.map
+MixedMap arabtex.map
+MixedMap dvng.map
+MixedMap ethiop.map
+MixedMap mongolian.map
+MixedMap vnrother.map
+MixedMap vnrtext.map

Modified: extra-any/texlive.install
===================================================================
--- extra-any/texlive.install	2009-09-03 18:44:48 UTC (rev 50930)
+++ extra-any/texlive.install	2009-09-03 18:45:34 UTC (rev 50931)
@@ -1,5 +1,8 @@
-pre_install() {
-        cat >> /usr/share/texmf-config/web2c/updmap.cfg <<EOF
+PKGNAME="texlive-langextra"
+UPDMAP="/usr/share/texmf-config/web2c/updmap.cfg"
+SYNCWITHTREES=''
+NEWMAPS=`mktemp`
+cat <<EOF > $NEWMAPS
 Map arabi.map
 Map arevvn.map
 Map burmese.map
@@ -21,6 +24,9 @@
 MixedMap vnrother.map
 MixedMap vnrtext.map
 EOF
+
+pre_install() {
+	cat $NEWMAPS >> $UPDMAP
 }
 
 post_install() {
@@ -31,43 +37,45 @@
 	echo    " done." 
 }
 
+
+pre_upgrade() {
+  OLDMAPS="/usr/share/texmf-var/arch/installedpkgs/$PKGNAME.maps"
+  if [ -f $OLDMAPS ] ; then
+    MAPSDIFF=`mktemp`
+    TOADD=`mktemp`
+    diff -B $OLDMAPS $NEWMAPS | sed 's/\s\+/ /g' > $MAPSDIFF
+    TOREMOVE=`cat $MAPSDIFF | egrep '^<' | cut -d' ' -f3`
+    cat $MAPSDIFF | egrep '^>' | sed 's/^> //' > $TOADD
+    if [ "x$TOREMOVE" != "x" ]; then
+      for map in $TOREMOVE; do
+        sed -i "/\s$map/d" $UPDMAP
+      done
+    fi
+    if [ -s $TOADD ]; then
+       cat $TOADD >> $UPDMAP
+    fi
+  else
+    echo "Warning: file $PKGNAME.maps not found" 
+    echo "(ignore the above if updating from TL2008 or from TL2009 in testing)"
+    SYNCWITHTREES="--syncwithtrees"
+  fi
+}
+
+
 post_upgrade() {
 	echo    ">>> texlive: updating the filename database..."
 	texconfig-sys rehash
 	echo    ">>> texlive: updating the fontmap files with updmap..."
-	updmap-sys --quiet --nohash
+	updmap-sys --quiet --nohash $SYNCWITHTREES
 	echo    " done." 
 }
 
 pre_remove() {
-MAPS="arabi.map
-arevvn.map
-burmese.map
-chartervn.map
-cjhebrew.map
-cmbrightvn.map
-comicvn.map
-concretevn.map
-grotesqvn.map
-mscorevn.map
-skt.map
-txttvn.map
-urwvn.map
-vntopia.map
-arabtex.map
-dvng.map
-ethiop.map
-mongolian.map
-vnrother.map
-vnrtext.map"
-	for m in $MAPS; do sed -i "/^M.\+$m/d" /usr/share/texmf-config/web2c/updmap.cfg ; done
+for m in `cut -d' ' -f2 $NEWMAPS`; do 
+  sed -i "/\s$m/d" $UPDMAP ; 
+done
 }
 
 post_remove() {
-	echo    ">>> texlive: updating the filename database..."
-	texconfig-sys rehash
-	echo    ">>> texlive: updating the fontmap files with updmap..."
-	updmap-sys --quiet --nohash
-	echo    " done." 
+  post_install
 }
-