[Lunar-commits] <moonbase> ghostscript: fixing several issues ...

[Paul Bredbury]

commit f70454e6abaa570ebeeed74cfcb9ba42ce0bc04b
Author: Christian Krause <kizkizzbangbang at googlemail.com>
Date:   Sun Feb 13 13:32:29 2011 +0700

    ghostscript: fixing several issues ...
    
    I took a look at ghostscript since the last two new versions didn't
    compile on my box.
    
    First, what I usually like to do :), is fixing DEPENDS:
    - there is no more cairo option
    - I added missing deps and used options explicitly
    
    Then BUILD:
    - I figured in_depends is a better solution than module_installed with
      the new DEPENDS
    - ghostscript having much local dependencies in its tarball is rather
      annoying with a shared lib system like lunar, longer configure/compile
      times as well as not really shared libs ... so for most deps I included
      a rm -rf DEP to use system libs if available
    - I discovered the ./autogen.sh and in lvu compile ghostscript I have seen
      that autogen.sh runs configure automatically and one can use OPTS
      directly with autogen.sh. So I moved ./autogen.sh to the bottom of BUILD
      and switched from default_build to default_make because there is no need
      to run configure twice.
    
    Thats about it -- all compiles and runs fine on my box, but please test it
    thoroughly considering the big patch :)
---
 printer/ghostscript/BUILD   |   43 +++++++++++++++++++++-----
 printer/ghostscript/DEPENDS |   70 +++++++++++++++++++++++++++++++++++-------
 2 files changed, 92 insertions(+), 21 deletions(-)

diff --git a/printer/ghostscript/BUILD b/printer/ghostscript/BUILD
index 685f328..091540e 100644
--- a/printer/ghostscript/BUILD
+++ b/printer/ghostscript/BUILD
@@ -1,18 +1,43 @@
 (
 
-  ./autogen.sh  &&
+  # remove local libs so we'll always use system libs
+  # and don't waste configure / compile time on them
+  verbose_msg "removing unneeded local libpng"     &&
+  rm -rf libpng                                    &&
+  verbose_msg "removing unneeded local jpeg"       &&
+  rm -rf jpeg*                                     &&
+  verbose_msg "removing unneeded local lcms"       &&
+  rm -rf lcms                                      &&
 
-  if module_installed libpaper ; then
-     sedit "s:lpaper:llibpaper:g" configure
-  fi  &&
+  if in_depends ghostscript freetype2 ; then
+     verbose_msg "removing unneeded local freetype"
+     rm -rf freetype
+  fi &&
+
+  if in_depends ghostscript tiff ; then
+     verbose_msg "removing unneeded local tiff"
+     rm -rf tiff
+  fi &&
+
+  if in_depends ghostscript jasper ; then
+     verbose_msg "removing unneeded local jasper"
+     rm -rf jasper
+  fi &&
 
-  if module_installed jasper ; then
-     rm -fr jasper
-  fi  &&
+  if in_depends ghostscript jbig2dec ; then
+     verbose_msg "removing unneeded local jbig2dec"
+     rm -rf jbig2dec
+  fi &&
 
-  export CFLAGS="$CFLAGS -fPIC"  &&
+  CFLAGS+=" -fPIC" &&
+
+  ./autogen.sh $OPTS &&
+
+  if in_depends ghostscript libpaper ; then
+     sedit "s:lpaper:llibpaper:g" configure
+  fi &&
 
-  default_build  &&
+  default_make &&
 
   make install-so
 
diff --git a/printer/ghostscript/DEPENDS b/printer/ghostscript/DEPENDS
index 4881330..35a3782 100644
--- a/printer/ghostscript/DEPENDS
+++ b/printer/ghostscript/DEPENDS
@@ -1,12 +1,58 @@
-depends %JPEG
-depends libpng
-
-optional_depends "%X"      "--with-x"   "--without-x"      "For an X frontend"
-optional_depends "ijs"     "--with-ijs" "--without-ijs"    "For ijs driver support"
-optional_depends "cups"    ""           "--disable-cups"   "To build the CUPS backends (recommended)"
-optional_depends "gtk+-2"  ""           "--disable-gtk"    "For GTK support"
-optional_depends "cairo"   ""           "--disable-cairo"  "For cairo graphics support"
-optional_depends "jasper"  ""           "--without-jasper" "For JPEG 2000 support"
-
-optional_depends "libpaper" "--with-libpaper"       "--without-libpaper" \
-                                      "for additonal paper size support"
+depends  %JPEG
+depends  libpng
+depends  lcms
+
+optional_depends "tiff"                                \
+                 "--with-system-libtiff"               \
+                 "--without-system-libtiff"            \
+                 "force system tiff"
+
+optional_depends "jasper"                              \
+                 "--with-jasper"                       \
+                 "--without-jasper"                    \
+                 "for JPEG 2000 support"
+
+optional_depends "jbig2dec"                            \
+		 "--with-jbig2dec"                     \
+                 "--without-jbig2dec"                  \
+                 "for JPEG 2000 support"
+
+optional_depends "freetype2"                           \
+                 "--enable-freetype"                   \
+                 "--disable-freetype"                  \
+                 "for freetype font rasterization"
+
+optional_depends "fontconfig"                          \
+                 "--enable-fontconfig"                 \
+                 "--disable-fontconfig"                \
+                 "for fontconfig font support"
+
+optional_depends "libidn"                              \
+                 "--with-libidn"                       \
+                 "--without-libidn"                    \
+                 "for libidn unicode password support"
+
+optional_depends "gtk+-2"                              \
+                 "--enable-gtk"                        \
+                 "--disable-gtk"                       \
+                 "for GTK support"
+
+optional_depends "%X"                                  \
+                 "--with-x"                            \
+                 "--without-x"                         \
+                 "for X support"
+
+optional_depends "ijs"                                 \
+                 "--with-ijs"                          \
+                 "--without-ijs"                       \
+                 "for ijs driver support"
+
+optional_depends "cups"                                \
+                 "--enable-cups"                       \
+                 "--disable-cups"                      \
+                 "for the CUPS backends (recommended)"
+
+optional_depends "libpaper"                            \
+                 "--with-libpaper"                     \
+                 "--without-libpaper"                  \
+                 "for additional paper size support"