[Lunar-commits] <moonbase> texlive: using only system libs/utils now ...

[Duncan Gibson]

commit 9d98067adc27e509d18e2389f8aec4515de48be1
Author: Christian Krause <kizkizzbangbang at googlemail.com>
Date:   Sat Apr 23 15:47:07 2011 +0200

    texlive: using only system libs/utils now ...
    
    texlive uses either system or internal libs/utils, so if one does not
    have/enable an optional dependency texlive would build its own version
    of it, which is kinda not what we want.
    
    This patch explicitly sets all dependencies to required, that would be
    built by texlive and explicitly turns the internal building of them of,
    see the huge OPTS+= in BUILD.
    
    The only libs missing, i.e. not in moonbase and built by texlive, are:
    - kpathsea
    - ptexenc
---
 doc-tools/texlive/BUILD   |    2 +-
 doc-tools/texlive/DEPENDS |   20 +++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/doc-tools/texlive/BUILD b/doc-tools/texlive/BUILD
index 8f1ad26..6c74527 100644
--- a/doc-tools/texlive/BUILD
+++ b/doc-tools/texlive/BUILD
@@ -37,7 +37,7 @@
   # and http://repos.archlinux.org/wsvn/packages/texlive-bin/trunk/
   # xindy should be in its own module, because its compilation needs latex to be *already* installed.
   # luatex and psutils are individual modules.
-  OPTS+=" --datadir=/usr/share --disable-multiplatform --disable-native-texlive-build --with-system-zlib --with-system-freetype2 --with-system-libpng --with-gs=gs --disable-xindy --enable-etex --disable-luatex --disable-psutils --enable-xetex --enable-ipc --enable-shared --enable-static=no"  &&
+  OPTS+=" --datadir=/usr/share --disable-multiplatform --disable-native-texlive-build --with-gs=gs --disable-xindy --enable-etex --disable-luatex --disable-psutils --enable-xetex --enable-ipc --enable-shared --disable-static --with-system-zlib --with-system-zziplib --with-system-libpng --with-system-gd --with-system-t1lib --with-system-teckit --with-teckit-includes=/usr/include/teckit --with-system-icu --with-system-freetype2 --disable-t1utils --disable-lcdf-typetools" &&
 
   default_build  &&
 
diff --git a/doc-tools/texlive/DEPENDS b/doc-tools/texlive/DEPENDS
index 2344726..a6124cd 100644
--- a/doc-tools/texlive/DEPENDS
+++ b/doc-tools/texlive/DEPENDS
@@ -2,21 +2,15 @@ depends  ed
 depends  w3c-libwww
 depends  texlive-texmf
 depends  gd
-depends  fontconfig
 depends  psutils
+depends  zziplib
+depends  t1lib
+depends  TECkit
+depends  icu4c
+depends  t1utils
+depends  lcdf-typetools
 
 # Needed to run fmtutil-sys in POST_INSTALL
 depends  luatex
 
-optional_depends "t1lib" "--with-system-t1lib" "--without-system-t1lib" "use system t1lib (if n, will use bundled lib)"
-optional_depends "icu4c" "--with-system-icu"   "--without-system-icu"   "use system icu4c (if n, will use bundled lib)"
-optional_depends "zziplib" "--with-system-zziplib" "--without-system-zziplib" "use system zziplib (if n, will use bundled lib)"
-
-# This will look like the wrong way around. It means whether to install texlive's own version of lcdf-typetools, or use the lcdf-typetools module from moonbase.
-optional_depends "lcdf-typetools" "--disable-lcdf-typetools" "--enable-lcdf-typetools" "for Postscript support (if n, TeX Live's own version will be installed)"
-
-optional_depends "t1utils" "--disable-t1utils" "--enable-t1utils" "for Postscript font utils (if n, TeX Live's own version will be installed)"
-
-optional_depends "TECkit" "--with-system-teckit" "" "for text encoding conversion (if n, TeX Live's own version will be installed)"
-
-optional_depends "libX11" "" "--without-x" "for XOrg support (say n for e.g. framebuffer)"
+optional_depends "libX11" "--with-x" "--without-x" "for X applications like xpdf"