Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv2879

Modified Files:
        gdl.info 
Added Files:
        gdl.patch 
Log Message:
Use new version of imagemagick


Index: gdl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gdl.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gdl.info    5 Dec 2007 17:25:45 -0000       1.16
+++ gdl.info    13 May 2008 21:42:24 -0000      1.17
@@ -1,13 +1,13 @@
 Package: gdl
 Version: 0.9pre6
-Revision: 1000
+Revision: 1001
 Distribution: 10.4, 10.5
 Description: GNU Data Language
 License: GPL
 Maintainer: Sebastien Maret <[EMAIL PROTECTED]>
 Depends: <<
   bzip2-shlibs, fftw3-shlibs (>= 3.1.1-5), freetype219-shlibs, gsl-shlibs,
-  hdf5-shlibs (>= 1.6.5-1010), imagemagick10-shlibs, lcms-shlibs,
+  hdf5-shlibs (>= 1.6.5-1010), imagemagick1-shlibs, lcms-shlibs,
   libiconv, libjpeg-shlibs, libncurses5-shlibs (>= 5.4-20041023-1006),
   libpng3-shlibs, libtiff-shlibs, libtool14-shlibs, libxml2-shlibs,
   ncurses (>= 5.4-20041023-1006), matplotlib-py25, numarray-py25,
@@ -15,15 +15,21 @@
   python25-shlibs, readline5-shlibs (>= 5.0-1004), szip-shlibs, x11-shlibs
 <<
 BuildDepends: <<
-  bzip2-dev, fftw3 (>= 3.1.1-5), freetype219, gsl, hdf5 (>= 1.6.5-1010),
-  imagemagick10-dev, lcms, libiconv-dev, libjpeg, 
+  autoconf, bzip2-dev, fftw3 (>= 3.1.1-5), freetype219, gsl,
+  hdf5 (>= 1.6.5-1010), imagemagick1-dev, lcms, libiconv-dev, libjpeg,
   libncurses5 (>= 5.4-20041023-1006), libpng3, libtiff, libtool14,
   libxml2, plplot-dev (>= 5.6.1-1008), qhull, readline5 (>= 5.0-1004),
   szip, x11-dev
 <<
 Source: mirror:sourceforge:gnudatalanguage/gdl-%v.tar.gz
 Source-MD5: 5830539e7301f049f27f2a112467fab3
-ConfigureParams: --with-plplotdir=%p --with-ncursesdir=%p 
--with-readlinedir=%p --with-gsldir=%p --without-netcdf --without-hdf 
--with-hdf5=%p --with-python=%p --enable-python_version=2.5 --with-Magick=%p 
--with-fftw=%p
+Patch: %n.patch
+ConfigureParams: --with-plplotdir=%p --with-ncursesdir=%p 
--with-readlinedir=%p --with-gsldir=%p --without-netcdf --without-hdf 
--with-hdf5=%p --with-python=%p --enable-python_version=2.5 --with-Magick=%p 
--with-fftw=%p CPPFLAGS=-I%p/include/ImageMagick
+CompileScript: <<
+  autoreconf
+  ./configure %c
+  make prefix=%p
+<<
 InstallScript: <<
   make install prefix=%i
   mkdir -p %i/share/%n
@@ -43,12 +49,14 @@
 Homepage: http://gnudatalanguage.sf.net/
 DescPackaging: <<
 Fails to compile with netcdf, so disabling it. See:
-
 
http://sourceforge.net/tracker/index.php?func=detail&aid=1839638&group_id=97659&atid=618683
-
 I think that hdf contains netcdf, so it might be enough to enable hdf
 only. However, hdf is not present in 10.5, so we disabling it for now.
 
+The configure script fails to detect recent versions of imagemagick,
+so we patch configure.in and recreate the configure script. See:
+http://sourceforge.net/tracker/index.php?func=detail&aid=1963366&group_id=97659&atid=618683
+
 Originally packaged by Jeffrey Whitaker.
 <<
 

--- NEW FILE: gdl.patch ---
diff -ruN --exclude='*~' gdl-0.9pre6/configure.in 
gdl-0.9pre6.patched/configure.in
--- gdl-0.9pre6/configure.in    2007-10-30 00:10:49.000000000 +0100
+++ gdl-0.9pre6.patched/configure.in    2008-05-13 23:18:55.000000000 +0200
@@ -272,7 +272,7 @@
     INCLUDES="$INCLUDES -I/usr/include/magick"
   fi
 
-  AC_CHECK_LIB(Magick, GetMagickVersion, [AC_DEFINE([USE_MAGICK], [1], [Define 
if you want to use ImageMagick])], [
+  AC_CHECK_LIB(MagickCore, GetMagickVersion, [AC_DEFINE([USE_MAGICK], [1], 
[Define if you want to use ImageMagick])], [
     echo ""
     echo "Error! ImageMagick version 5.5.7 or later is required but was not 
found"
     echo "       Use --with-Magick=DIR to specify the ImageMagick directory 
tree"


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft 
Defy all challenges. Microsoft(R) Visual Studio 2008. 
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to