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

[François Charette]

    Date: Saturday, June 26, 2010 @ 10:42:46
  Author: francois
Revision: 84106

prerelease of texlive 2010

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

-----------------+
 PKGBUILD        |   24 +++++++++++++-----------
 texlive.install |   18 +++++++++++-------
 2 files changed, 24 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-26 14:42:40 UTC (rev 84105)
+++ PKGBUILD	2010-06-26 14:42:46 UTC (rev 84106)
@@ -1,7 +1,7 @@
 # Maintainer: Firmicus <firmicus āt gmx dōt net>
 
 pkgname=texlive-langcjk
-pkgver=2009.16067
+pkgver=2010.19082
 pkgrel=1
 pkgdesc="TeX Live - CJK (Chinese, Japanese, Korean) macros and fonts"
 license=('GPL')
@@ -11,23 +11,25 @@
 url='http://tug.org/texlive/'
 source=("ftp://ftp.archlinux.org/other/texlive/$pkgname-$pkgver-src.zip" "$pkgname.maps")
 options=('!emptydirs')
+options=(!strip)
 install=texlive.install
-md5sums=('5cfd7251aa9824309dce0b4bb2a0823e'
+md5sums=('2598f1c145fe7dc69a8e6eb2e9e85615'
          'a4c50faea47494bad836b83391eb720e')
 
 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
-   for p in *.tar.xz; do 
+   for p in *.tar.xz; do
 	   bsdtar -xf $p || return 1
    done
-   rm -rf {tlpkg,doc,source}
+   rm -rf {tlpkg,doc,source} || 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

Modified: texlive.install
===================================================================
--- texlive.install	2010-06-26 14:42:40 UTC (rev 84105)
+++ texlive.install	2010-06-26 14:42:46 UTC (rev 84106)
@@ -1,5 +1,5 @@
 PKGNAME="texlive-langcjk"
-UPDMAP="/usr/share/texmf-config/web2c/updmap.cfg"
+UPDMAP="/etc/texmf/web2c/updmap.cfg"
 SYNCWITHTREES=''
 NEWMAPS=`mktemp`
 cat <<EOF > $NEWMAPS
@@ -24,15 +24,19 @@
 
 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." 
 }
 
 
 pre_upgrade() {
-  OLDMAPS="/usr/share/texmf-var/arch/installedpkgs/$PKGNAME.maps"
+  if [[ "$2" == 200* ]]; then
+    OLDMAPS="/usr/share/texmf-var/arch/installedpkgs/$PKGNAME.maps"
+  else # >= 2010
+    OLDMAPS="/var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
+  fi
   if [ -f $OLDMAPS ] ; then
     MAPSDIFF=`mktemp`
     TOADD=`mktemp`
@@ -48,7 +52,7 @@
        cat $TOADD >> $UPDMAP
     fi
   else
-    echo "Warning: file $PKGNAME.maps not found" 
+    echo "Warning: file $OLDMAPS not found" 
     echo "(ignore the above if updating from TL2008 or from TL2009 in testing)"
     SYNCWITHTREES="--syncwithtrees"
   fi
@@ -57,9 +61,9 @@
 
 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." 
 }