[Lunar-commits] <moonbase> ghostscript: cleanup

[Paul Bredbury]

commit 5757a5ef0d75bfae4570067c578a1d75a3a817df
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Sun Feb 13 15:04:48 2011 +0700

    ghostscript: cleanup
    
    Bundled libs are evil.
    
    tiff is optional for lcms and ghostscript, so guide the user in the
    right direction.
    
    fPIC is already included.
    
    libpaper has been bumped, so a sedit is unnecessary (and was
    half-broken, looking at the ghostscript compilation).
---
 printer/ghostscript/BUILD   |   41 ++++++++---------------------------------
 printer/ghostscript/DEPENDS |    8 ++------
 2 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/printer/ghostscript/BUILD b/printer/ghostscript/BUILD
index 091540e..7f88436 100644
--- a/printer/ghostscript/BUILD
+++ b/printer/ghostscript/BUILD
@@ -1,43 +1,18 @@
 (
 
-  # 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                                      &&
+  # Remove local libs so we'll always use system libs,
+  # and don't waste configure / compile time on them.
+  verbose_msg "Removing unneeded local libs" &&
+  rm -rf expat freetype jasper jbig2dec jpeg{,xr} lcms libpng tiff zlib &&
 
-  if in_depends ghostscript freetype2 ; then
-     verbose_msg "removing unneeded local freetype"
-     rm -rf freetype
-  fi &&
+  OPTS+=" --disable-compile-inits --enable-dynamic" &&
 
-  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 in_depends ghostscript jbig2dec ; then
-     verbose_msg "removing unneeded local jbig2dec"
-     rm -rf jbig2dec
-  fi &&
-
-  CFLAGS+=" -fPIC" &&
+  # Will run ./configure with Lunar's options, in default_build
+  sedit "s:\$srcdir/configure:echo:" autogen.sh &&
 
   ./autogen.sh $OPTS &&
 
-  if in_depends ghostscript libpaper ; then
-     sedit "s:lpaper:llibpaper:g" configure
-  fi &&
-
-  default_make &&
+  default_build &&
 
   make install-so
 
diff --git a/printer/ghostscript/DEPENDS b/printer/ghostscript/DEPENDS
index 35a3782..b9c9b0d 100644
--- a/printer/ghostscript/DEPENDS
+++ b/printer/ghostscript/DEPENDS
@@ -1,19 +1,15 @@
 depends  %JPEG
 depends  libpng
+depends  tiff
 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"                     \
+                 "--with-jbig2dec"                     \
                  "--without-jbig2dec"                  \
                  "for JPEG 2000 support"