[61631] trunk/dports/math/gnudatalanguage/Portfile

[takeshi at macports.org]

Revision: 61631
          http://trac.macports.org/changeset/61631
Author:   takeshi at macports.org
Date:     2009-12-16 22:05:48 -0800 (Wed, 16 Dec 2009)
Log Message:
-----------
gnudatalanguage: updated to 0.9rc3. added dependencies to xorg-libX11, udunits2, fftw-3

Modified Paths:
--------------
    trunk/dports/math/gnudatalanguage/Portfile

Modified: trunk/dports/math/gnudatalanguage/Portfile
===================================================================
--- trunk/dports/math/gnudatalanguage/Portfile	2009-12-17 06:03:55 UTC (rev 61630)
+++ trunk/dports/math/gnudatalanguage/Portfile	2009-12-17 06:05:48 UTC (rev 61631)
@@ -4,10 +4,10 @@
 PortSystem                  1.0
 
 name                        gnudatalanguage
-version                     0.9rc2
-revision                    3
+version                     0.9rc3
 categories                  math science
 maintainers                 takeshi
+license                     GPLv2
 platforms                   darwin
 description                 a free IDL combatible incremental compiler
 long_description \
@@ -17,9 +17,9 @@
 master_sites                sourceforge
 distname                    gdl-${version}
 
-checksums                   md5    4ae52c19cdd6f4684b8e0b6ce8a9902c         \
-                            sha1   f2c87e0a6cecc9dab1e98232cf154d0c78771aa9 \
-                            rmd160 79a92daa6167ed45bedc06668dd86682ee2758cb
+checksums                   md5     94a29e13ec5d71e664659b32e421b02e \
+                            sha1    bce9b091b17ede0675f347a3aef1a46c9b0abec9 \
+                            rmd160  d5e47420462a200853fc6b33447181e477218368
 
 depends_build               port:pkgconfig
 depends_lib                 port:bzip2 \
@@ -38,13 +38,12 @@
                             port:readline \
                             port:plplot \
                             port:python25 \
-                            port:py25-numarray
+                            port:py25-numarray \
+                            port:xorg-libX11 \
+                            port:udunits2 \
+                            port:fftw-3
 
 patch {
-   set imflag [lsearch [exec pkg-config --libs-only-l ImageMagick] -lMagickCore]
-   if {${imflag}>=0} {
-      configure.cppflags-append "-I${prefix}/include/ImageMagick"
-   }
    foreach f {configure.in configure} {
        reinplace "s|-L\$with_hdf5/lib/hdf -L\$with_hdf5/lib/hdf5||" \
            ${worksrcpath}/${f}
@@ -53,13 +52,7 @@
        reinplace "s|-lproj4|-lproj|g" ${worksrcpath}/${f}
    }
    reinplace "s|AC_CHECK_LIB(proj4|AC_CHECK_LIB(proj|" ${worksrcpath}/configure.in
-   if {${imflag}>=0} {
-      reinplace "s|AC_CHECK_LIB(Magick|AC_CHECK_LIB(MagickCore|" ${worksrcpath}/configure.in
-      reinplace "s|-lMagick\\.|-lMagickCore.|" ${worksrcpath}/configure
-      reinplace "s|-lMagick\"|-lMagickCore\"|" ${worksrcpath}/configure
-      reinplace "s|LIBS=\"-lMagick  \$LIBS\"|LIBS=\"-lMagickCore  \$LIBS\"|" ${worksrcpath}/configure
-   }
-   reinplace "s|-L/usr/X11R6/lib64||" ${worksrcpath}/src/Makefile.am
+   reinplace "s|-L/usr/X11R6/lib64 -L/usr/X11R6/lib|-L${prefix}/lib|" ${worksrcpath}/src/Makefile.am
    reinplace "s|lib_proj.h|projects.h|" ${worksrcpath}/src/math_utl.hpp
    foreach d {src src/antlr} {
        reinplace "s|libantlr|libantlr_gdl|g" ${worksrcpath}/${d}/Makefile.am
@@ -88,7 +81,11 @@
                             --with-python=${prefix}/Library/Frameworks/Python.framework/Versions/2.5 \
                             --enable-python_version=2.5 \
                             --with-Magick=${prefix} \
-                            --disable-dependency-tracking
+                            --disable-dependency-tracking \
+                            --x-includes=${prefix}/include \
+                            --x-libraries=${prefix}/lib \
+                            --with-udunits=${prefix} \
+                            --with-fftw=${prefix}
 
 destroot.destdir            prefix=${destroot}${prefix}
 destroot.target             install-strip
@@ -114,7 +111,7 @@
 
 variant proj description {build with proj} {
     depends_lib-append port:proj
-    configure.cxx           "g++ -DPJ_LIB__"
+    configure.cxxflags-append -DPJ_LIB__
     configure.args-append   --with-libproj4=${prefix}
 }
 
@@ -123,7 +120,7 @@
 }
 variant gcc43 conflicts g95 description {Build using gcc43} {
     depends_build-append    port:gcc43
-    configure.f77           ${prefix}/bin/gfortran-mp-4.3
+    configure.compiler      macports-gcc-4.3
 }
 variant g95 conflicts gcc43 description {Build using g95} {
     depends_build-append    port:g95
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091216/7cbad74b/attachment-0001.html>