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

François Charette francois at archlinux.org
Thu Sep 3 18:46:20 UTC 2009


    Date: Thursday, September 3, 2009 @ 14:46:20
  Author: francois
Revision: 50932

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

........
  r49979 | francois | 2009-08-18 10:56:42 +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-langgreek/repos/extra-any/texlive-langgreek.maps
    (from rev 50925, texlive-langgreek/trunk/texlive-langgreek.maps)
Modified:
  texlive-langgreek/repos/extra-any/	(properties)
  texlive-langgreek/repos/extra-any/PKGBUILD
  texlive-langgreek/repos/extra-any/texlive.install

------------------------+
 PKGBUILD               |    8 +++---
 texlive-langgreek.maps |    6 ++++
 texlive.install        |   59 ++++++++++++++++++++++++++++++++---------------
 3 files changed, 52 insertions(+), 21 deletions(-)


Property changes on: texlive-langgreek/repos/extra-any
___________________________________________________________________
Modified: svnmerge-integrated
   - /texlive-langgreek/trunk:1-47912
   + /texlive-langgreek/trunk:1-50931

Modified: extra-any/PKGBUILD
===================================================================
--- extra-any/PKGBUILD	2009-09-03 18:45:34 UTC (rev 50931)
+++ extra-any/PKGBUILD	2009-09-03 18:46:20 UTC (rev 50932)
@@ -2,17 +2,18 @@
 
 pkgname=texlive-langgreek
 pkgver=2009.14450
-pkgrel=1
+pkgrel=2
 pkgdesc="TeX Live - Fonts and support for typesetting Greek"
 license=('GPL')
 arch=(any)
 depends=('texlive-core')
 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=('ad1e0556e77d75c56b2137fff8506059')
+md5sums=('2f205e554254446fc7c403fba07a5214'
+         'a1c515e7bbe93c905e20db580aa5a234')
 
 build() {
    cd $srcdir
@@ -20,6 +21,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-langgreek/repos/extra-any/texlive-langgreek.maps (from rev 50925, texlive-langgreek/trunk/texlive-langgreek.maps)
===================================================================
--- extra-any/texlive-langgreek.maps	                        (rev 0)
+++ extra-any/texlive-langgreek.maps	2009-09-03 18:46:20 UTC (rev 50932)
@@ -0,0 +1,6 @@
+Map gfsbaskerville.map
+Map gfsporson.map
+Map grverb.map
+Map kerkis.map
+MixedMap cbgreek-full.map
+MixedMap iby.map

Modified: extra-any/texlive.install
===================================================================
--- extra-any/texlive.install	2009-09-03 18:45:34 UTC (rev 50931)
+++ extra-any/texlive.install	2009-09-03 18:46:20 UTC (rev 50932)
@@ -1,12 +1,18 @@
-pre_install() {
-        cat >> /usr/share/texmf-config/web2c/updmap.cfg <<EOF
-MixedMap cbgreek-full.map
+PKGNAME="texlive-langgreek"
+UPDMAP="/usr/share/texmf-config/web2c/updmap.cfg"
+SYNCWITHTREES=''
+NEWMAPS=`mktemp`
+cat <<EOF > $NEWMAPS
+Map gfsbaskerville.map
 Map gfsporson.map
-Map gfsbaskerville.map
 Map grverb.map
+Map kerkis.map
+MixedMap cbgreek-full.map
 MixedMap iby.map
-Map kerkis.map
 EOF
+
+pre_install() {
+	cat $NEWMAPS >> $UPDMAP
 }
 
 post_install() {
@@ -17,28 +23,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="cbgreek-full.map
-gfsporson.map
-gfsbaskerville.map
-grverb.map
-iby.map
-kerkis.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
 }




More information about the arch-commits mailing list