[arch-commits] Commit in texlive-fontsextra/repos (4 files)
François Charette
francois at archlinux.org
Thu Sep 3 18:42:34 UTC 2009
Date: Thursday, September 3, 2009 @ 14:42:34
Author: francois
Revision: 50927
Merged revisions 49975,50925 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/texlive-fontsextra/trunk
........
r49975 | francois | 2009-08-18 10:53:36 +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-fontsextra/repos/extra-any/texlive-fontsextra.maps
(from rev 50925, texlive-fontsextra/trunk/texlive-fontsextra.maps)
Modified:
texlive-fontsextra/repos/extra-any/ (properties)
texlive-fontsextra/repos/extra-any/PKGBUILD
texlive-fontsextra/repos/extra-any/texlive.install
-------------------------+
PKGBUILD | 10 ++-
texlive-fontsextra.maps | 89 ++++++++++++++++++++++++++++++
texlive.install | 136 ++++++++++++----------------------------------
3 files changed, 133 insertions(+), 102 deletions(-)
Property changes on: texlive-fontsextra/repos/extra-any
___________________________________________________________________
Modified: svnmerge-integrated
- /texlive-fontsextra/trunk:1-47920
+ /texlive-fontsextra/trunk:1-50926
Modified: extra-any/PKGBUILD
===================================================================
--- extra-any/PKGBUILD 2009-09-03 18:41:47 UTC (rev 50926)
+++ extra-any/PKGBUILD 2009-09-03 18:42:34 UTC (rev 50927)
@@ -2,17 +2,18 @@
pkgname=texlive-fontsextra
pkgver=2009.14419
-pkgrel=1
+pkgrel=2
pkgdesc="TeX Live - all sorts of extra fonts"
license=('GPL')
arch=(any)
depends=('texlive-core')
groups=('texlive-most')
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=('36e8206b94f5e515c166d5b73727b010')
+md5sums=('b55a4774366e9b79fa14768a5a20a04a'
+ '0ddd05a2e3722be5881c9a95f3b37ff8')
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
@@ -38,7 +40,7 @@
find $pkgdir/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \;
fi
- # remove stuff depending on omega
+ # remove stuff depending on omega/aleph
rm -rf $pkgdir/usr/share/texmf-dist/omega
find $pkgdir/ -wholename '*ocherokee*' -delete
find $pkgdir/ -wholename '*oinuit*' -delete
Copied: texlive-fontsextra/repos/extra-any/texlive-fontsextra.maps (from rev 50925, texlive-fontsextra/trunk/texlive-fontsextra.maps)
===================================================================
--- extra-any/texlive-fontsextra.maps (rev 0)
+++ extra-any/texlive-fontsextra.maps 2009-09-03 18:42:34 UTC (rev 50927)
@@ -0,0 +1,89 @@
+Map Acorn.map
+Map AnnSton.map
+Map ArtNouv.map
+Map ArtNouvc.map
+Map Carrickc.map
+Map Eichenla.map
+Map Eileen.map
+Map EileenBl.map
+Map Elzevier.map
+Map GotIn.map
+Map GoudyIn.map
+Map Kinigcap.map
+Map Konanur.map
+Map Kramer.map
+Map MnSymbol.map
+Map MorrisIn.map
+Map Nouveaud.map
+Map Romantik.map
+Map Rothdn.map
+Map RoyalIn.map
+Map Sanremo.map
+Map Starburst.map
+Map Typocaps.map
+Map Zallman.map
+Map antp.map
+Map antt.map
+Map archaicprw.map
+Map arev.map
+Map ascii.map
+Map augie.map
+Map auncial.map
+Map aurical.map
+Map belleek.map
+Map bera.map
+Map cm-lgc.map
+Map cmin.map
+Map cyklop.map
+Map dictsym.map
+Map dstroke.map
+Map epigrafica.map
+Map esvect.map
+Map fge.map
+Map fi4.map
+Map foekfont.map
+Map fonetika.map
+Map fourier-utopia-expert.map
+Map fourier.map
+Map gfsartemisia.map
+Map gfsbodoni.map
+Map gfscomplutum.map
+Map gfsdidot.map
+Map gfsneohellenic.map
+Map gfssolomos.map
+Map icelandic.map
+Map iwona.map
+Map kpfonts.map
+Map kurier.map
+Map libertine.map
+Map linearA.map
+Map mdbch.map
+Map mdput.map
+Map mdugm.map
+Map pbsi.map
+Map phaistos.map
+Map recycle.map
+Map slantcm.map
+Map troff-updmap.map
+Map uaq.map
+Map ugq.map
+Map yfrak.map
+Map yly.map
+Map yv1.map
+Map yv2.map
+Map yv3.map
+Map yvo.map
+Map yvt.map
+MixedMap allrunes.map
+MixedMap cm-super-t1.map
+MixedMap cm-super-t2a.map
+MixedMap cm-super-t2b.map
+MixedMap cm-super-t2c.map
+MixedMap cm-super-ts1.map
+MixedMap cm-super-x2.map
+MixedMap cmll.map
+MixedMap hfbright.map
+MixedMap lxfonts.map
+MixedMap pigpen.map
+MixedMap semaf.map
+MixedMap trajan.map
Modified: extra-any/texlive.install
===================================================================
--- extra-any/texlive.install 2009-09-03 18:41:47 UTC (rev 50926)
+++ extra-any/texlive.install 2009-09-03 18:42:34 UTC (rev 50927)
@@ -1,5 +1,8 @@
-pre_install() {
- cat >> /usr/share/texmf-config/web2c/updmap.cfg <<EOF
+PKGNAME="texlive-fontsextra"
+UPDMAP="/usr/share/texmf-config/web2c/updmap.cfg"
+SYNCWITHTREES=''
+NEWMAPS=`mktemp`
+cat <<EOF > $NEWMAPS
Map Acorn.map
Map AnnSton.map
Map ArtNouv.map
@@ -90,6 +93,9 @@
MixedMap semaf.map
MixedMap trajan.map
EOF
+
+pre_install() {
+ cat $NEWMAPS >> $UPDMAP
}
post_install() {
@@ -100,111 +106,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="Acorn.map
-AnnSton.map
-ArtNouv.map
-ArtNouvc.map
-Carrickc.map
-Eichenla.map
-Eileen.map
-EileenBl.map
-Elzevier.map
-GotIn.map
-GoudyIn.map
-Kinigcap.map
-Konanur.map
-Kramer.map
-MnSymbol.map
-MorrisIn.map
-Nouveaud.map
-Romantik.map
-Rothdn.map
-RoyalIn.map
-Sanremo.map
-Starburst.map
-Typocaps.map
-Zallman.map
-antp.map
-antt.map
-archaicprw.map
-arev.map
-ascii.map
-augie.map
-auncial.map
-aurical.map
-belleek.map
-bera.map
-cm-lgc.map
-cmin.map
-cyklop.map
-dictsym.map
-dstroke.map
-epigrafica.map
-esvect.map
-fge.map
-fi4.map
-foekfont.map
-fonetika.map
-fourier-utopia-expert.map
-fourier.map
-gfsartemisia.map
-gfsbodoni.map
-gfscomplutum.map
-gfsdidot.map
-gfsneohellenic.map
-gfssolomos.map
-icelandic.map
-iwona.map
-kpfonts.map
-kurier.map
-libertine.map
-linearA.map
-mdbch.map
-mdput.map
-mdugm.map
-pbsi.map
-phaistos.map
-recycle.map
-slantcm.map
-troff-updmap.map
-uaq.map
-ugq.map
-yfrak.map
-yly.map
-yv1.map
-yv2.map
-yv3.map
-yvo.map
-yvt.map
-allrunes.map
-cm-super-t1.map
-cm-super-t2a.map
-cm-super-t2b.map
-cm-super-t2c.map
-cm-super-ts1.map
-cm-super-x2.map
-cmll.map
-hfbright.map
-lxfonts.map
-pigpen.map
-semaf.map
-trajan.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