[Lunar-commits] <moonbase> netpbm: compilation fix for jpeg 7

[Paul Bredbury]

commit fe549c65ae322cf99f9e4d0fb8853cd393fc5525
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Fri Aug 28 13:17:55 2009 +0700

    netpbm: compilation fix for jpeg 7
    
    No need to bump UPDATED - apps will be recompiled by "lunar fix", due to the jpeg soname bump.
---
 graphics/netpbm/BUILD   |   12 +++++++++---
 graphics/netpbm/DEPENDS |    4 ++--
 graphics/netpbm/DETAILS |    4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/graphics/netpbm/BUILD b/graphics/netpbm/BUILD
index f84ceef..44c6458 100644
--- a/graphics/netpbm/BUILD
+++ b/graphics/netpbm/BUILD
@@ -1,8 +1,14 @@
 (
 
+  if egrep -q '^#define JPEG_LIB_VERSION.*7[0-9]+' /usr/include/jpeglib.h; then
+    # To compile with jpeg 7, rather than old 6b
+    # From http://repos.archlinux.org/viewvc.cgi/netpbm/repos/extra-i686/
+    sedit "s:* cinfo.min_DCT_scaled_size;:* cinfo.min_DCT_v_scaled_size;:" converter/ppm/ppmtompeg/jpeg.c
+  fi &&
+
   sedit "s/getline/getLine/" converter/ppm/xvminitoppm.c  &&
-  sedit "s:/tmp/netpbm:$(pwd -P)/BUILD:g" Makefile.config.in buildtools/installnetpbm.pl doc/README.DJGPP
-  sedit "s/CC = cc/CC = gcc/" Makefile.config.in &&
+  sedit "s:/tmp/netpbm:$(pwd -P)/BUILD:g" Makefile.config.in buildtools/installnetpbm.pl doc/README.DJGPP  &&
+  sedit "s/CC = cc/CC = gcc/" Makefile.config.in  &&
   echo  -e  "
 gnu
 regular
@@ -21,7 +27,7 @@ default
 
 
 " | ./configure    &&
-  sedit "s/^CFLAGS =/CFLAGS = -fPIC /" Makefile.config &&
+  sedit "s/^CFLAGS =/CFLAGS = -fPIC /" Makefile.config  &&
   make             &&
   make package     &&
   prepare_install  &&
diff --git a/graphics/netpbm/DEPENDS b/graphics/netpbm/DEPENDS
index 9cc5e99..da86373 100644
--- a/graphics/netpbm/DEPENDS
+++ b/graphics/netpbm/DEPENDS
@@ -1,3 +1,3 @@
-depends  tiff  &&
-depends  jpeg  &&
+depends  tiff
+depends  jpeg
 depends  libpng
diff --git a/graphics/netpbm/DETAILS b/graphics/netpbm/DETAILS
index ef68147..d320a0c 100644
--- a/graphics/netpbm/DETAILS
+++ b/graphics/netpbm/DETAILS
@@ -3,11 +3,11 @@
           SOURCE=$MODULE-$VERSION.tgz
       SOURCE_URL=$SFORGE_URL/$MODULE/
       SOURCE_VFY=sha1:81ec2499897809777813f9ec8e6222d8cf988daf
-        WEB_SITE=http://netpbm.sourceforge.net
+        WEB_SITE=http://netpbm.sourceforge.net/
          ENTERED=20010922
          UPDATED=20090825
            PSAFE=no
-           SHORT="netpbm contains 220 programs that convert graphics formats."
+           SHORT="contains 220 programs that convert graphics formats"
 
 cat << EOF
 NetPBM (formerly PBMplus) is a package of over 220 programs that convert