[arch-commits] Commit in texlive-core/repos (3 files)

[François Charette]

    Date: Monday, September 15, 2008 @ 14:50:35
  Author: francois
Revision: 12607

Merged revisions 12323-12606 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/texlive-core/trunk

........
  r12500 | francois | 2008-09-14 22:13:16 +0200 (Sun, 14 Sep 2008) | 1 line
  
  fix permissions of scripts, rm some scripts for mswin, and update sources to latest version
........
  r12600 | francois | 2008-09-15 20:44:24 +0200 (Mon, 15 Sep 2008) | 2 lines
  
  upgpkg: texlive-core 2008.10548-2
      re-added missing ruhyphen and ukrhyph; improved install scriptlet
........

Modified:
  texlive-core/repos/extra-x86_64/	(properties)
  texlive-core/repos/extra-x86_64/PKGBUILD
  texlive-core/repos/extra-x86_64/texlive.install

-----------------+
 PKGBUILD        |   14 ++++++++------
 texlive.install |   16 +++++++++-------
 2 files changed, 17 insertions(+), 13 deletions(-)


Property changes on: texlive-core/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /texlive-core/trunk:1-12322
   + /texlive-core/trunk:1-12606

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-09-15 18:49:23 UTC (rev 12606)
+++ extra-x86_64/PKGBUILD	2008-09-15 18:50:35 UTC (rev 12607)
@@ -1,8 +1,8 @@
 # Maintainer: Firmicus <firmicus ατ gmx δοτ net>
 
 pkgname=texlive-core
-pkgver=2008.10429
-pkgrel=1
+pkgver=2008.10548
+pkgrel=2
 pkgdesc="TeX Live core distribution"
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@
 source=("http://dev.archlinux.org/~francois/texlive/src/$pkgname-src.zip")
 install=texlive.install
 backup=(usr/share/texmf-config/tex/context/config/cont-usr.tex)
-md5sums=('94d72faa07b9db5643aab07bd4d7827a')
+md5sums=('265c9b2f3c5a9257e5fc1acb352723dd')
 
 build() {
    cd $startdir/src
@@ -25,9 +25,9 @@
 	   lzma --force -dc $p | tar xf - || return 1
    done
    install -m755 -d $startdir/pkg/usr/share || return 1
-   find texmf-dist -type d -exec install -d -m755 $startdir/pkg/usr/share/'{}' \; || exit 1
-   find texmf-dist -type f -exec install -m644 '{}' $startdir/pkg/usr/share/'{}' \; || exit 1
-
+   find texmf-dist -type d -exec install -d -m755 $startdir/pkg/usr/share/'{}' \; || return 1
+   find texmf-dist -type f -exec install -m644 '{}' $startdir/pkg/usr/share/'{}' \; || return 1
+   find $startdir/pkg/usr/share/texmf-dist/scripts -type f -exec chmod a+x '{}' \; || return 1
    # copy config file to texmf-config
    mkdir -p $startdir/pkg/usr/share/texmf-config/tex/context/config
    cp -a $startdir/pkg/usr/share/texmf-dist/tex/context/config/cont-usr.tex \
@@ -36,4 +36,6 @@
   # remove obsolete stuff (we don't provide the omega and aleph binaries anyway)
   rm -rf $startdir/pkg/usr/share/texmf-dist/omega
   rm -f $startdir/pkg/usr/share/texmf-dist/tex/plain/config/{omega,aleph}.ini
+  # more cleanup
+  rm -rf $startdir/pkg/usr/share/texmf-dist/scripts/context/stubs/mswin/
 }

Modified: extra-x86_64/texlive.install
===================================================================
--- extra-x86_64/texlive.install	2008-09-15 18:49:23 UTC (rev 12606)
+++ extra-x86_64/texlive.install	2008-09-15 18:50:35 UTC (rev 12607)
@@ -60,7 +60,7 @@
 	echo    " texlive: creating all formats ..."
 	fmtutil-sys --all 1>/dev/null
 	echo " done." 
-	echo "  (logs are under /usr/share/texmf-var/<engine>/<formatname>.log)"
+	echo "  (logs are under /usr/share/texmf-var/web2c/<engine>/<formatname>.log)"
 	echo "  ------------------------------------------------------------------"
 	echo "                   Welcome to TeXLive 2008!                        "
 	echo ""
@@ -75,7 +75,7 @@
 	# TODO 
 	updmapfile="/usr/share/texmf-config/web2c/updmap.cfg"
 	if [[ ! -f $updmapfile ]]; then
-		echo " WARNING: Can't find /usr/share/texmf-config/web2c/updmap.cfg !"
+		echo " WARNING: Can't find $updmapfile !"
 	else
 		noofmaps=`grep -c -e ^Map $updmapfile`
 		noofmixedmaps=`grep -c -e ^MixedMap $updmapfile`
@@ -83,7 +83,7 @@
 		if [[ $totalmaps == 0 ]] ; then
 			pre_install 
 		else
-			echo " NB: The file $updmap has not been changed"
+			echo " NB: The file $updmapfile has not been changed"
 		fi
 	fi
 }
@@ -91,10 +91,12 @@
 post_upgrade() {
 	echo    " texlive: updating the filename database..."
 	texconfig-sys rehash
-	echo    " texlive: updating the fontmap files with updmap..."
-	updmap-sys --quiet --nohash
-	echo    " done." 
-	echo    "    (see /usr/share/texmf-var/web2c/updmap.log)"
+	if [[ $totalmaps == 0 ]] ; then
+		echo    " texlive: updating the fontmap files with updmap..."
+		updmap-sys --quiet --nohash
+		echo    " done." 
+		echo    "    (see /usr/share/texmf-var/web2c/updmap.log)"
+	fi
 	nooffmt=`find /usr/share/texmf-var/web2c/ -name '*.fmt' | wc -w`
 	if [[ $nooffmt == 0 ]]; then
 		echo    " texlive: creating all formats ..."