[Lunar-commits] <moonbase> netpbm: build update

[Duncan Gibson]

commit eacf21194158cee035ce5782db1184e4d30cc435
Author: Christian Krause <kizkizzbangbang at googlemail.com>
Date:   Fri Jan 28 21:55:07 2011 +0100

    netpbm: build update
    
    I fixed the compilation errors I encountered during build.
    those were due to the interactive configure script:
    apparently they changed if you type none at an opt dep there will be
    no need for a default after it.
    
    I also removed CONFIGURE. Since you can take the options out of
    DEPENDS. I used OPTS for that to create the interactive options IACT.
    I revised the whole creation of the IACT string, very verbose so it'll
    be easier to change it in the future.
    
    I also left libpng and added jbigkit as well as jasper, which are all
    in Makefile.config.in but not in the interactive configure script,
    but I haven't written any sedit Makefile changes.
---
 graphics/netpbm/BUILD     |  106 ++++++++++++++++++++++++++++++--------------
 graphics/netpbm/CONFIGURE |    2 -
 graphics/netpbm/DEPENDS   |   13 +++--
 3 files changed, 80 insertions(+), 41 deletions(-)

diff --git a/graphics/netpbm/BUILD b/graphics/netpbm/BUILD
index ebd9a12..126979f 100644
--- a/graphics/netpbm/BUILD
+++ b/graphics/netpbm/BUILD
@@ -2,42 +2,80 @@
 
   sedit "s:/tmp/netpbm:$(pwd -P)/BUILD:g" Makefile.config.in buildtools/installnetpbm.pl doc/README.DJGPP  &&
 
-  if [ $USE_X11 == "y" ] ; then
-    X11="/usr/X11R6/lib/libX11.so"
-   else
-    X11="none"
-  fi &&
-
-  if [ $USE_SVGALIB == "n" ] ; then
-    SVGALIB="none"
-   else
-    SVGALIB="libvga.so"
-  fi &&
-
-  echo  -e  "
-gnu
-regular
-shared
-y
-
-libjpeg.so
-default
-libtiff.so
-default
-libz.so
-default
-$X11
-default
-$SVGALIB
-default
-
-" | ./configure    &&
+  # first ENTER to begin
+  IACT="\n"                                             &&
+
+  # platform
+  IACT="${IACT}gnu\n"                                   &&
+
+  # build type (regular or merge)
+  IACT="${IACT}regular\n"                               &&
+
+  # shared linked
+  IACT="${IACT}shared\n"                                &&
+
+  # build static libs, too
+  IACT="${IACT}y\n"                                     &&
+
+  # just ENTER on inttypes.h
+  IACT="${IACT}\n"                                      &&
+
+  # optional dependency %JPEG
+  if [[ $OPTS = *USE_JPEG* ]]; then
+    IACT="${IACT}libjpeg.so\n"
+    IACT="${IACT}default\n"
+  else
+    IACT="${IACT}none\n"
+  fi                                                    &&
+
+  # optional dependency tiff
+  if [[ $OPTS = *USE_TIFF* ]]; then
+    IACT="${IACT}libtiff.so\n"
+    IACT="${IACT}default\n"
+  else
+    IACT="${IACT}none\n"
+  fi                                                    &&
+
+  # optional dependency zlib
+  if [[ $OPTS = *USE_ZLIB* ]]; then
+    IACT="${IACT}libz.so\n"
+    IACT="${IACT}default\n"
+  else
+    IACT="${IACT}none\n"
+  fi                                                    &&
+
+  # optional dependency libX11
+  if [[ $OPTS = *USE_X11* ]]; then
+    IACT="${IACT}/usr/X11R6/lib/libX11.so\n"
+    IACT="${IACT}default\n"
+  else
+    IACT="${IACT}none\n"
+  fi                                                    &&
+
+  # optional dependency svgalib
+  if [[ $var = *pattern1* ]]; then
+    IACT="${IACT}libvga.so\n"
+    IACT="${IACT}default\n"
+  else
+    IACT="${IACT}none\n"
+  fi                                                    &&
+
+  # last newline for accepting default doc URL
+  IACT="{$IACT}\n"                                      &&
+
+
+  # FINALLY pipe the interactive string to configure
+  echo  -e  "${IACT}"  |  ./configure                   &&
+
+#exit 5;
+
   sedit "s/^CFLAGS =/CFLAGS = -fPIC /" Makefile.config  &&
-  make             &&
-  make package     &&
-  prepare_install  &&
 
-    echo -e "$(pwd -P)/BUILD
+  make                                                  &&
+  make package                                          &&
+  prepare_install                                       &&
+
+  echo -e "$(pwd -P)/BUILD
 /usr
 /usr/bin
 /usr/lib
diff --git a/graphics/netpbm/CONFIGURE b/graphics/netpbm/CONFIGURE
deleted file mode 100644
index d6353a0..0000000
--- a/graphics/netpbm/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
-mquery USE_X11 "Use libX11?" y
-mquery USE_SVGALIB "Use svgalib?" n
diff --git a/graphics/netpbm/DEPENDS b/graphics/netpbm/DEPENDS
index cb978e4..08f5567 100644
--- a/graphics/netpbm/DEPENDS
+++ b/graphics/netpbm/DEPENDS
@@ -1,6 +1,9 @@
-depends  tiff
-depends  %JPEG
-depends  libpng
+optional_depends "zlib"    "USE_ZLIB" "" "for zlib support"
+optional_depends "%JPEG"   "USE_JPEG" "" "for jpeg support"
+optional_depends "tiff"    "USE_TIFF" "" "for tiff support"
+optional_depends "libX11"  "USE_X11"  "" "for X11 support"
+optional_depends "svgalib" "USE_SVGA" "" "for svgalib support"
 
-optional_depends libX11  "" "" "for X11 support"
-optional_depends svgalib "" "" "for svgalib support"
+optional_depends "libpng"  "" "" "for png support"
+optional_depends "jasper"  "" "" "for jpeg 2000 support"
+optional_depends "jbigkit" "" "" "for jbig support"