[arch-commits] Commit in texlive-core/trunk (3 files)
François Charette
francois at archlinux.org
Sat Jun 26 14:42:05 UTC 2010
Date: Saturday, June 26, 2010 @ 10:42:04
Author: francois
Revision: 84099
prerelease of texlive 2010
Modified:
texlive-core/trunk/PKGBUILD
texlive-core/trunk/texlive-core.maps
texlive-core/trunk/texlive.install
-------------------+
PKGBUILD | 31 ++++++++++++++--------------
texlive-core.maps | 8 ++++++-
texlive.install | 57 ++++++++++++++++++++++++++++++----------------------
3 files changed, 56 insertions(+), 40 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-06-26 14:41:59 UTC (rev 84098)
+++ PKGBUILD 2010-06-26 14:42:04 UTC (rev 84099)
@@ -1,8 +1,7 @@
-# $Id$
# Maintainer: Firmicus <firmicus ατ gmx δοτ net>
pkgname=texlive-core
-pkgver=2009.16776
+pkgver=2010.19146
pkgrel=1
pkgdesc="TeX Live core distribution"
license=('GPL')
@@ -15,26 +14,28 @@
replaces=('tetex')
url='http://tug.org/texlive/'
source=("ftp://ftp.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip" "$pkgname.maps")
+options=(!strip)
install=texlive.install
-backup=(usr/share/texmf-config/tex/context/config/cont-usr.tex)
-md5sums=('773fe1335f8559bc48c36f86c9f51f5f'
- '990101eb3ab2097df74d28c32fa50833')
+backup=(etc/texmf/tex/context/config/cont-usr.tex)
+md5sums=('cd2e3304beb7b48e8e7acf1246628f3c'
+ 'f27c9370a4fe7c9fe7d746da7fbc37c0')
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
echo -n " --> extracting all packages... "
for p in *.tar.xz; do
bsdtar -xf $p || return 1
done
echo "done"
- rm -rf {tlpkg,doc,source,omega}
+ rm -rf {tlpkg,doc,source,omega} || 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
@@ -46,9 +47,9 @@
fi
# copy config file to texmf-config
- mkdir -p $pkgdir/usr/share/texmf-config/tex/context/config
+ mkdir -p $pkgdir/etc/texmf/tex/context/config
cp -a $pkgdir/usr/share/texmf-dist/tex/context/config/cont-usr.tex \
- $pkgdir/usr/share/texmf-config/tex/context/config/cont-usr.tex
+ $pkgdir/etc/texmf/tex/context/config/cont-usr.tex
# remove obsolete stuff (we don't provide the omega and aleph binaries anyway)
#rm -rf $pkgdir/usr/share/texmf-dist/omega
Modified: texlive-core.maps
===================================================================
--- texlive-core.maps 2010-06-26 14:41:59 UTC (rev 84098)
+++ texlive-core.maps 2010-06-26 14:42:04 UTC (rev 84099)
@@ -1,4 +1,4 @@
-Map euler.map
+Map euler.map
Map charter.map
Map fpls.map
Map l7x-urwvn.map
@@ -19,6 +19,12 @@
Map utopia.map
Map zpeu.map
MixedMap ccpl.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 cm.map
MixedMap cmextra.map
MixedMap cmtext-bsr-interpolated.map
Modified: texlive.install
===================================================================
--- texlive.install 2010-06-26 14:41:59 UTC (rev 84098)
+++ texlive.install 2010-06-26 14:42:04 UTC (rev 84099)
@@ -1,5 +1,5 @@
PKGNAME="texlive-core"
-UPDMAP="/usr/share/texmf-config/web2c/updmap.cfg"
+UPDMAP="/etc/texmf/web2c/updmap.cfg"
SYNCWITHTREES=''
NEWMAPS=`mktemp`
cat <<EOF > $NEWMAPS
@@ -24,6 +24,12 @@
Map utopia.map
Map zpeu.map
MixedMap ccpl.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 cm.map
MixedMap cmextra.map
MixedMap cmtext-bsr-interpolated.map
@@ -49,19 +55,26 @@
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."
echo -n "creating all formats..."
- fmtutil-sys --all 1>/dev/null
+ /usr/bin/fmtutil-sys --all 1>/dev/null
echo " done."
- echo " (logs are under /usr/share/texmf-var/web2c/<engine>/<formatname>.log)"
+ echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
}
-
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`
@@ -77,31 +90,27 @@
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)"
+ echo "Warning: file $OLDMAPS not found"
SYNCWITHTREES="--syncwithtrees"
fi
}
-
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."
- echo -n "recreating all formats..."
- fmtutil-sys --all 1>/dev/null
+ echo ">>> texlive: recreating all formats..."
+ /usr/bin/fmtutil-sys --all 1>/dev/null
echo " done."
- echo " (logs are under /usr/share/texmf-var/web2c/<engine>/<formatname>.log)"
+ echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
+ if [[ "$2" == 200* ]]; then
+ echo "Important note. Some directories have moved:"
+ echo " \$TEXMFSYSVAR is now /var/lib/texmf (previously /usr/share/texmf-var)"
+ echo " \$TEXMFSYSCONFIG is now /etc/texmf (previously /usr/share/texmf-config)"
+ echo "Please move and update the config files you had modified and delete the rest."
+ echo "(Note however that updmap.cfg has been automatically copied and updated.)"
+ fi
}
-pre_remove() {
-for m in `cut -d' ' -f2 $NEWMAPS`; do
- sed -i "/\s$m/d" $UPDMAP ;
-done
-}
-
-post_remove() {
- post_install
-}
More information about the arch-commits
mailing list