Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=texlive.git;a=commitdiff;h=84c3082f41484a6a386d77fa0e6ff1eb21e53d09

commit 84c3082f41484a6a386d77fa0e6ff1eb21e53d09
Author: Elentir <[email protected]>
Date:   Fri Sep 3 15:15:39 2010 +0200

texlive-20091107-2-i686

* add a texlive-pkg-nomaps.install in case of a subpkg with no map file
* (so no need to update updmap.cfg in this case)
* use texlinks in .install to create symlinks for tex formats
* change method to update updmap.cfg file in .install
* (enable all maps and then updmap --syncwithtrees)
* no need for a .install script in -docs subpkg

diff --git a/source/xapps-extra/texlive/FrugalBuild 
b/source/xapps-extra/texlive/FrugalBuild
index ce1a7a1..21c3710 100644
--- a/source/xapps-extra/texlive/FrugalBuild
+++ b/source/xapps-extra/texlive/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=texlive
pkgver=20091107
-pkgrel=1
+pkgrel=2
pkgdesc="A complete TeX distribution"
archs=('i686' 'x86_64')
depends=('t1lib' 'gd' 'ncurses' 'poppler')
@@ -16,6 +16,7 @@ 
source=("ftp://tug.org/historic/systems/texlive/2009/$pkgname-$pkgver-source.tar
texlive-libpng14.patch \
texlive.install \
texlive-pkg.install \
+       texlive-pkg-nomaps.install \
texmf.cnf \
xindy-clisp-2.49.patch)
up2date="Flasttar ftp://tug.org/historic/systems/texlive/2009/ | sed 
's/-source//' | sed 's/_texmf//'"
@@ -28,8 +29,9 @@ sha1sums=('3e11287f16595209181dc2e0ae7c23809e2e73ee' \
'1b3097cf822c4d881a736fe0aeaee990ba17c8f3' \
'5301263529702ccfda0adb3706f461888dea22eb' \
'985c574fbf7d9d5cc7fcfa08d5ffeda70f34fbbf' \
-          '630fefa9d4f1042dd21536c3b93f784cb51e04ff' \
-          '3a0a2f807163cfc7dd6baf4dca3a7cb856a1e001' \
+          '799692b26a166ec5fe0f27365df096da6ab333dd' \
+          'd12e33023c02b8009a6114346a3ee12730ad4cac' \
+          '4c13dc71b2ce8796cb02046dd278f67d9b78ae45' \
'98806c7e48db2da9ac9092d1e729b3bf316408df' \
'f4b2f7b063a06d49adae0f19a6a72d0e7def2906')
_F_cd_path="$pkgname-$pkgver-source"
@@ -76,13 +78,18 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 
x86_64' 'i686 x86_64'
'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 
x86_64' \
'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686 
x86_64' \
'i686 x86_64')
-subinstall=("$pkgname-pkg.install" "$pkgname-pkg.install" 
"$pkgname-pkg.install" "$pkgname-pkg.install" "$pkgname-pkg.install" \
-       "$pkgname-pkg.install" "$pkgname-pkg.install" "$pkgname-pkg.install" 
"$pkgname-pkg.install" "$pkgname-pkg.install" \
-       "$pkgname-pkg.install" "$pkgname-pkg.install" "$pkgname-pkg.install" 
"$pkgname-pkg.install" "$pkgname-pkg.install" \
-       "$pkgname-pkg.install" "$pkgname-pkg.install" "$pkgname-pkg.install" 
"$pkgname-pkg.install")
+subinstall=("$pkgname-pkg-nomaps.install" "" "$pkgname-pkg.install" 
"$pkgname-pkg-nomaps.install" "$pkgname-pkg.install" \
+       "$pkgname-pkg-nomaps.install" "$pkgname-pkg-nomaps.install" 
"$pkgname-pkg-nomaps.install" "$pkgname-pkg.install"  \
+       "$pkgname-pkg-nomaps.install" "$pkgname-pkg.install" 
"$pkgname-pkg.install" "$pkgname-pkg.install" \
+       "$pkgname-pkg.install" "$pkgname-pkg.install" "$pkgname-pkg.install" 
"$pkgname-pkg-nomaps.install" "$pkgname-pkg-nomaps.install" \
+       "$pkgname-pkg.install")

build() {
-       [ "$CARCH" == "x86_64" ] && CFLAGS="$CFLAGS -fPIC -DPIC"
+       if [ "${CARCH}" = "x86_64" ]; then
+               export CFLAGS="${CFLAGS} -fPIC"
+               export CXXFLAGS="${CXXFLAGS} -fPIC"
+       fi
+
Fbuild --with-tex-banner="TeX Live 2009 / Frugalware Linux"

# move texmf to share and no need to texmf-dist
@@ -99,9 +106,6 @@ build() {
Fcp $pkgname-$pkgver-texmf/texmf/* usr/share/texmf/
Fcp $pkgname-$pkgver-texmf/texmf-dist/* usr/share/texmf-dist/

-       # install the pdflatex script
-       Finstall 755 $pkgname-$pkgver-source/texk/texlive/pdflatex usr/bin/
-
## install the config file with correct paths for kpathsea
Finstall 644 texmf.cnf usr/share/texmf/web2c/

diff --git a/source/xapps-extra/texlive/texlive-pkg-nomaps.install 
b/source/xapps-extra/texlive/texlive-pkg-nomaps.install
new file mode 100644
index 0000000..0633b1c
--- /dev/null
+++ b/source/xapps-extra/texlive/texlive-pkg-nomaps.install
@@ -0,0 +1,18 @@
+post_install() {
+       echo "updating the filename database..."
+        mktexlsr
+       echo " done."
+}
+
+post_upgrade() {
+       post_install
+}
+
+post_remove() {
+       post_install
+}
+
+op=$1
+shift
+
+$op $*
diff --git a/source/xapps-extra/texlive/texlive-pkg.install 
b/source/xapps-extra/texlive/texlive-pkg.install
index 38f1388..7eeae23 100644
--- a/source/xapps-extra/texlive/texlive-pkg.install
+++ b/source/xapps-extra/texlive/texlive-pkg.install
@@ -1,13 +1,9 @@
post_install() {
echo "updating the filename database..."
-        texconfig-sys rehash
+        mktexlsr
echo " done."
-       ## enable all finding maps
-       listmaps=`find usr/share/texmf-dist/ -name '*.map' -type f | sed 
's#.*/\(.*\)#\1#' `
-       for i in $listmaps ; do
-               sed -i "s/^#! Map $i/Map $i/" 
/usr/share/texmf-config/web2c/updmap.cfg
-               sed -i "s/^#! MixedMap $i/Map $i/" 
/usr/share/texmf-config/web2c/updmap.cfg
-       done
+       ## enable all maps
+       cp -a /usr/share/texmf/web2c/updmap.cfg /usr/share/texmf-config/web2c/
echo "updating the fontmap files with updmap..."
updmap-sys --quiet --nohash --syncwithtrees
echo " done."
@@ -19,7 +15,7 @@ post_upgrade() {

post_remove() {
echo "updating the filename database..."
-        texconfig-sys rehash
+        mktexlsr
echo " done."
echo "updating the fontmap files with updmap..."
updmap-sys --quiet --nohash --syncwithtrees
diff --git a/source/xapps-extra/texlive/texlive.install 
b/source/xapps-extra/texlive/texlive.install
index 8d88c3a..027c10b 100644
--- a/source/xapps-extra/texlive/texlive.install
+++ b/source/xapps-extra/texlive/texlive.install
@@ -7,24 +7,31 @@ pre_install() {

post_install() {
echo "updating the filename database..."
-        texconfig-sys rehash
+       mktexlsr
echo " done."
echo "updating the fontmap files with updmap..."
updmap-sys --quiet --nohash --syncwithtrees
echo " done."
echo "creating all formats..."
fmtutil-sys --all 1>/dev/null
+       texlinks -f /usr/share/texmf/web2c/fmtutil.cnf /usr/bin/
echo " done."
}

+pre_upgrade() {
+       texlinks -u
+}
+
post_upgrade() {
post_install
}

+pre_remove() {
+       texlinks -u
+}
+
post_remove() {
-       rm -rf /usr/share/texmf-var/
-       rm -rf /usr/share/texmf-doc/
-       rm -rf /usr/share/texmf-dist/
+       rm -rf /usr/share/texmf-{var,doc,dist,config}/
rm -rf /usr/share/texmf/
}
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to