-Amélioré fonctions de download des packages

[hvlinux.git] / stage5 / pkg / tetex

diff --git a/stage5/pkg/tetex b/stage5/pkg/tetex
index bd8ddb3..284d1f0 100644 (file)
--- a/stage5/pkg/tetex
+++ b/stage5/pkg/tetex
@@ -1,63 +1,58 @@
-#!/bin/sh
-set -o errexit
+#!/bin/bash
 
-# First argument of this script is the package name
-
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-# Removing any older directory from earlier attempt...
-rm -rf ${LFS_TMP}/cm-super
-
-install -v -m755 -d /usr/share/texmf
-decompress_package ${TETEX_TEXMF}    /usr/share/texmf
-decompress_package ${TETEX_TEXMFSRC} /usr/share/texmf
-decompress_package ${TETEX_CM_SUPER}
-
-# Applying patches (if any)
-apply_patches ${1}
-
-cd ${LFS_TMP}/${1}-build
-../${1}/configure \
-    --prefix=/usr \
-    --exec-prefix=/usr \
-    --bindir=/usr/bin \
-    --with-x=yes \
-    --without-texinfo \
-    --with-system-ncurses \
-    --with-system-zlib \
-    --with-system-t1lib \
-    --with-system-pnglib \
-    --with-system-gd \
-    --disable-a4
-make all
-make install
-
-texconfig-sys dvips paper letter
-texconfig-sys font rw
-
-install -v -d -m755 /usr/local/share/texmf/tex/latex
-var_add_path "TEXMFLOCAL" /etc/profile "/usr/local/share/texmf"
-var_export   "TEXMFLOCAL" /etc/profile
-
-# To install the optional cm-super fonts:
-FONTDIR=$(kpsewhich --expand-var '$TEXMFMAIN')
-mkdir -v -p ${FONTDIR}/fonts/afm/public/cm-super   \
-    ${FONTDIR}/fonts/type1/public/cm-super \
-    ${FONTDIR}/fonts/enc/dvips/cm-super    \
-    ${FONTDIR}/fonts/map/dvips/cm-super  
-
-cp -v ${LFS_TMP}/cm-super/pfb/*.pfb ${FONTDIR}/fonts/type1/public/cm-super/
-
-gunzip ${LFS_TMP}/cm-super/afm/*
-cp -v ${LFS_TMP}/cm-super/afm/*.afm ${FONTDIR}/fonts/afm/public/cm-super/
-
-cp -v ${LFS_TMP}/cm-super/dvips/*.enc ${FONTDIR}/fonts/enc/dvips/cm-super/
-cp -v ${LFS_TMP}/cm-super/dvips/*.map ${FONTDIR}/fonts/map/dvips/cm-super/
+hvpatch_pre()
+{
+    # Removing any older directory from earlier attempt...
+    rm -rf ${LFS_TMP}/cm-super
 
-cat >> ${FONTDIR}/web2c/updmap.cfg << "EOF"
+    install -v -m755 -d /usr/share/texmf
+
+    decompress_package ${TETEX_TEXMF}    /usr/share/texmf
+    decompress_package ${TETEX_TEXMFSRC} /usr/share/texmf
+    decompress_package ${TETEX_CM_SUPER}
+}
+
+hvconfig_pre()
+{
+    CONFIGURE_OPTS="\
+        ${CONFIGURE_OPTS} \
+        --exec-prefix=/usr \
+        --bindir=/usr/bin \
+        --with-x=yes \
+        --without-texinfo \
+        --with-system-ncurses \
+        --with-system-zlib \
+        --with-system-t1lib \
+        --with-system-pnglib \
+        --with-system-gd \
+        --disable-a4"
+}
+
+hvbuild_post()
+{
+    texconfig-sys dvips paper letter
+    texconfig-sys font rw
+
+    install -v -d -m755 /usr/local/share/texmf/tex/latex
+    var_add_path "TEXMFLOCAL" /etc/profile "/usr/local/share/texmf"
+    var_export   "TEXMFLOCAL" /etc/profile
+
+    # To install the optional cm-super fonts:
+    FONTDIR=$(kpsewhich --expand-var '$TEXMFMAIN')
+    mkdir -v -p ${FONTDIR}/fonts/afm/public/cm-super   \
+        ${FONTDIR}/fonts/type1/public/cm-super \
+        ${FONTDIR}/fonts/enc/dvips/cm-super    \
+        ${FONTDIR}/fonts/map/dvips/cm-super  
+
+    cp -v ${LFS_TMP}/cm-super/pfb/*.pfb ${FONTDIR}/fonts/type1/public/cm-super/
+
+    gunzip ${LFS_TMP}/cm-super/afm/*
+    cp -v ${LFS_TMP}/cm-super/afm/*.afm ${FONTDIR}/fonts/afm/public/cm-super/
+
+    cp -v ${LFS_TMP}/cm-super/dvips/*.enc ${FONTDIR}/fonts/enc/dvips/cm-super/
+    cp -v ${LFS_TMP}/cm-super/dvips/*.map ${FONTDIR}/fonts/map/dvips/cm-super/
+
+    cat >> ${FONTDIR}/web2c/updmap.cfg << "EOF"
 MixedMap cm-super-t1.map
 MixedMap cm-super-t2a.map
 MixedMap cm-super-t2b.map
@@ -66,11 +61,10 @@ MixedMap cm-super-ts1.map
 MixedMap cm-super-x2.map
 EOF
 
-mktexlsr
-updmap-sys
-
-if [ ${?} -eq 0 ]; then
-    rm -rf ${LFS_TMP}/cm-super
-fi
+    mktexlsr
+    updmap-sys
 
-exit $?
+    if [ ${?} -eq 0 ]; then
+        rm -rf ${LFS_TMP}/cm-super
+    fi
+}