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

[source_changes at macosforge.org]

Revision: 26982
          http://trac.macosforge.org/projects/macports/changeset/26982
Author:   sfiera at macports.org
Date:     2007-07-15 05:38:08 -0700 (Sun, 15 Jul 2007)

Log Message:
-----------
Maintainer update gnudatalanguage 0.9pre4 => 0.9pre5
 * Resolves #12297

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

Modified: trunk/dports/math/gnudatalanguage/Portfile
===================================================================
--- trunk/dports/math/gnudatalanguage/Portfile	2007-07-15 12:30:58 UTC (rev 26981)
+++ trunk/dports/math/gnudatalanguage/Portfile	2007-07-15 12:38:08 UTC (rev 26982)
@@ -1,8 +1,7 @@
-# $Id$
+# $Id: Portfile 23185 2007-03-27 03:15:11Z jmpp at macports.org $
 PortSystem 1.0
 name            gnudatalanguage
-version         0.9pre4
-revision        1
+version         0.9pre5
 categories      math science
 maintainers     takeshi at mac.com
 platforms       darwin
@@ -14,11 +13,11 @@
 master_sites    sourceforge
 distname        gdl-${version}
 
-checksums       md5 21f03676b44937b9cc855922618a73d2
+checksums       md5 d2a740ba633ff7ace23f452d34a9c42c
 
+depends_build   port:automake port:libtool
 depends_lib     port:bzip2 \
                 port:freetype \
-                port:g95 \
                 port:gsl \
                 port:hdf5 \
                 port:ImageMagick \
@@ -29,9 +28,19 @@
                 port:python24 \
                 port:py-numarray \
                 port:readline \
-                port:tiff \
-                port:zlib
+                port:tiff 
 
+configure.env       FFLAGS=-O2 CPPFLAGS="-I${prefix}/include/python2.4"
+configure.args      --with-plplotdir=${prefix} \
+                    --with-ncursesdir=${prefix} \
+                    --with-readlinedir=${prefix} \
+                    --with-gsldir=${prefix} \
+                    --with-netcdf=${prefix} \
+                    --without-hdf --with-hdf5=${prefix} \
+                    --with-python=${prefix}/Library/Frameworks/Python.framework/Versions/Current \
+                    --with-Magick=${prefix} \
+                    --disable-dependency-tracking
+ 
 patch {
    foreach f {configure.in configure} {
        reinplace "s|-L\$with_hdf5/lib/hdf -L\$with_hdf5/lib/hdf5||" \
@@ -41,27 +50,17 @@
        reinplace "s|-lproj4|-lproj|g" ${worksrcpath}/${f}
    }
    reinplace "s|AC_CHECK_LIB(proj4|AC_CHECK_LIB(proj|" ${worksrcpath}/configure.in
+   reinplace "s|-L/usr/X11R6/lib64||" ${worksrcpath}/src/Makefile.am
+   reinplace "s|lib_proj.h|projects.h|" ${worksrcpath}/src/math_utl.hpp
    foreach d {src src/antlr} {
-       reinplace "s|libantlr.a|libantlr_gdl.a|g" ${worksrcpath}/${d}/Makefile.in
+       reinplace "s|libantlr|libantlr_gdl|g" ${worksrcpath}/${d}/Makefile.am
    }
-   reinplace "s|-L/usr/X11R6/lib64||" ${worksrcpath}/src/Makefile.in
-   reinplace "s|lib_proj.h|projects.h|" ${worksrcpath}/src/plotting.hpp
 }
 post-patch {
    # Avoid using heimdal's broken fnmatch.h
    reinplace "s|<\\(fnmatch\.h\\)>|\"/usr/include/\\1\"|" ${worksrcpath}/src/file.cpp
 }
 
-configure.env       F77=${prefix}/bin/g95 FFLAGS=-O2
-configure.args      --with-plplotdir=${prefix} \
-                    --with-ncursesdir=${prefix} \
-                    --with-readlinedir=${prefix} \
-                    --with-gsldir=${prefix} \
-                    --with-netcdf=${prefix} \
-                    --without-hdf --with-hdf5=${prefix} \
-                    --with-python=${prefix} --enable-python_version=2.4 \
-                    --with-Magick=${prefix}
- 
 destroot.destdir    prefix=${destroot}${prefix}
 destroot.target     install-strip
 
@@ -72,14 +71,21 @@
     }
 }
 
-# fftw-3-single does not build on i386
-#variant fftw {
-#    depends_lib-append    port:fftw-3 port:fftw-3-single
-#    configure.args-append --with-fftw=${prefix}
-#}
-
 variant proj {
     depends_lib-append port:proj
-    configure.env-append CPPFLAGS=-DPJ_LIB__
+    configure.env-append CXX="g++ -DPJ_LIB__"
     configure.args-append --with-libproj4=${prefix}
 }
+
+if {![variant_isset g95]} {
+    default_variants +gcc42
+}
+variant gcc42 conflicts g95 description {Build using gcc42 (default)} {
+    depends_build-append    port:gcc42
+    configure.env-append    F77=${prefix}/bin/gfortran-mp-4.2
+}
+variant g95 conflicts gcc42 description {Build using g95} {
+    depends_build-append    port:g95
+    configure.env-append    F77=${prefix}/bin/g95
+}
+

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070715/8fc4dc6e/attachment.html