X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpkg%2Ftexlive;h=b5cbd59ba76d6de7570fadb629cd869cee68de7d;hb=4e78d26dd7f5e46a21cdc916e031f1b4a68578c0;hp=9a7fd8dbb7cbb4aab126680bf0ebb4f1f0ce1fe4;hpb=714168b14820404e9fda34c422f858c688ff358a;p=hvlinux.git

diff --git a/stage5/pkg/texlive b/stage5/pkg/texlive
index 9a7fd8d..b5cbd59 100644
--- a/stage5/pkg/texlive
+++ b/stage5/pkg/texlive
@@ -15,18 +15,27 @@ hvconfig_pre()
 
     sed -i -e 's|PARENT/\.\./texmf-local|PARENT/texmf-local|' \
         -e 's|\$TEXMFVAR/fonts|/var/lib/livetex/fonts|'    \
-        ${LFS_TMP}/${PACKAGE}/texk/kpathsea/texmf.cnf
+        ${SRC_DIR}/texk/kpathsea/texmf.cnf
 
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
+    CONFIGURE_OPTS+=" \
         --disable-native-texlive-build \
-        --enable-shared                \
+        --enable-build-in-source-tree  \
         --without-luatex               \
+        --enable-shared                \
         --enable-mktextex-default"
+
+    # This TexLive version overwrites /usr/bin/man. Save Man-DB version
+    # if it was not previously saved by this script.
+    if [ -f /usr/bin/man ]; then
+        mv -v /usr/bin/man{,.man-db}
+    fi
 }
 
 hvbuild_post()
 {
+    cp -a ${SRC_DIR}/utils/biber/TeXLive \
+        /usr/lib/perl5/site_perl/$(get_pkg_ver ${PERL})
+
     rm -v /usr/texmf{,-dist}
     install -v -m1777 -d /var/lib/livetex/fonts
     install -v -m755  -d /usr/share/texmf-{config,var,local}
@@ -41,6 +50,10 @@ hvbuild_post()
     done
     unset FN
 
+    # This TexLive version overwrites /usr/bin/man. Restore original Man-DB version.
+    rm -v /usr/bin/man
+    mv -v /usr/bin/man{.man-db,}
+
     # Fix bug with $SELFAUTOPARENT variable being empty...
     sed -i -e 's!\$SELFAUTOPARENT!/usr/share!' /usr/share/texmf/web2c/texmf.cnf
 
@@ -72,4 +85,15 @@ hvbuild_post()
         /usr/share/texmf-var    \
         /usr/share/texmf-local  \
         /var/lib/livetex/fonts
+
+    # Add xdvi desktop file
+    if [ ! -f /usr/share/applications/xdvi.desktop ]; then
+        cat > /usr/share/applications/xdvi.desktop << EOF
+[Desktop Entry]
+Type=Application
+Name=Xdvi
+Exec=xdvi
+MimeType=application/x-dvi;
+EOF
+    fi
 }