[101185] trunk/dports/science/magicspp

takeshi at macports.org takeshi at macports.org
Sat Jan 5 18:04:12 PST 2013


Revision: 101185
          https://trac.macports.org/changeset/101185
Author:   takeshi at macports.org
Date:     2013-01-05 18:04:12 -0800 (Sat, 05 Jan 2013)
Log Message:
-----------
magicspp: revamped for 2.18.7. added gcc46 gcc47 python2x variants

Modified Paths:
--------------
    trunk/dports/science/magicspp/Portfile
    trunk/dports/science/magicspp/files/patch-src-Makefile.in.diff

Added Paths:
-----------
    trunk/dports/science/magicspp/files/patch-configure.diff

Modified: trunk/dports/science/magicspp/Portfile
===================================================================
--- trunk/dports/science/magicspp/Portfile	2013-01-06 01:00:39 UTC (rev 101184)
+++ trunk/dports/science/magicspp/Portfile	2013-01-06 02:04:12 UTC (rev 101185)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                magicspp
-version             2.16.1
-revision            3
+version             2.18.7
 platforms           darwin
 maintainers         takeshi
 license             Apache-2
@@ -14,9 +13,9 @@
 homepage            http://software.ecmwf.int/wiki/display/MAGP/Home
 master_sites        https://software.ecmwf.int/wiki/download/attachments/3473464/
 distname            Magics-${version}
-checksums           md5     dbbf37d9780377b97b467a77faa06b50 \
-                    sha1    7fd34fef36244f6c17cf3b324d457b0e57124eb5 \
-                    rmd160  1e7f268bcaf19c8e6bada8e112128ff0701cd099
+checksums           md5     b796c122aea7c62f85827bae87cf69c7 \
+                    sha1    61b89861007b5cbc906daffc73e7d08367f8ce23 \
+                    rmd160  439b1f46d160cfaadfce977f47019a5c0e009a72
 long_description \
     Magics++ is the latest generation of the ECMWF's Meteorological plotting \
     software MAGICS (Meteorological Applications Graphics Integrated Colour System) \
@@ -41,29 +40,29 @@
                     port:ghostscript \
                     port:boost \
                     port:proj47 \
-                    port:swig \
-                    port:py27-numpy
+                    port:swig
 
 use_parallel_build  no
 universal_variant   no
-if {![variant_isset gcc43] && ![variant_isset gcc44]} {
+if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc46] && ![variant_isset gcc47]} {
     default_variants    +gcc45
 }
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants-append +python27
+}
 
-patchfiles          patch-src-Makefile.in.diff
+patchfiles          patch-src-Makefile.in.diff \
+                    patch-configure.diff
 
 configure.env-append        LIBS=\"-lemosR64"
-
-configure.env-append        PYTHON_VERSION=2.7
 configure.cppflags-append   -I${prefix}/include/freetype2
-configure.ldflags-append    -L${prefix}/lib/proj47/lib
 configure.args-append       --disable-dependency-tracking \
                             --disable-qt \
+                            --with-gd=${prefix} \
                             --enable-cairo \
                             --enable-bufr \
-                            --enable-python \
+                            --disable-python \
                             --enable-proj4 \
-                            --with-gd=${prefix} \
                             --with-proj4=${prefix}/lib/proj47 \
                             --with-grib-api=${prefix} \
                             --with-netcdf=${prefix} \
@@ -72,17 +71,56 @@
                             --with-boost \
                             --with-boost-libdir=${prefix}/lib
 
-variant gcc43 conflicts gcc44 gcc45 description {for emos +gcc43} {
+variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 description {for emos +gcc43} {
     depends_build-append    port:gcc43
     configure.compiler      macports-gcc-4.3
+    configure.args-append   --with-fortran-libraries=${prefix}/lib/gcc43
 }
 
-variant gcc44 conflicts gcc43 gcc45 description {for emos +gcc44} {
+variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 description {for emos +gcc44} {
     depends_build-append    port:gcc44
     configure.compiler      macports-gcc-4.4
+    configure.args-append   --with-fortran-libraries=${prefix}/lib/gcc44
 }
 
-variant gcc45 conflicts gcc43 gcc44 description {for emos +gcc45} {
+variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 description {for emos +gcc45} {
     depends_build-append    port:gcc45
     configure.compiler      macports-gcc-4.5
+    configure.args-append   --with-fortran-libraries=${prefix}/lib/gcc45
 }
+
+variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 description {for emos +gcc46} {
+    depends_build-append    port:gcc46
+    configure.compiler      macports-gcc-4.6
+    configure.args-append   --with-fortran-libraries=${prefix}/lib/gcc46
+}
+
+variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 description {for emos +gcc47} {
+    depends_build-append    port:gcc47
+    configure.compiler      macports-gcc-4.7
+    configure.args-append   --with-fortran-libraries=${prefix}/lib/gcc47
+}
+
+variant python25 description {Add support for python25} {
+    depends_lib-append      port:py25-numpy
+    configure.args-delete   --disable-python
+    configure.args-append   --enable-python
+    configure.env-append    PYTHON=${prefix}/bin/python2.5 \
+                            PYTHON_VERSION=2.5
+}
+
+variant python26 description {Add support for python26} {
+    depends_lib-append      port:py26-numpy
+    configure.args-delete   --disable-python
+    configure.args-append   --enable-python
+    configure.env-append    PYTHON=${prefix}/bin/python2.6 \
+                            PYTHON_VERSION=2.6
+}
+
+variant python27 description {Add support for python27} {
+    depends_lib-append      port:py27-numpy
+    configure.args-delete   --disable-python
+    configure.args-append   --enable-python
+    configure.env-append    PYTHON=${prefix}/bin/python2.7 \
+                            PYTHON_VERSION=2.7
+}

Added: trunk/dports/science/magicspp/files/patch-configure.diff
===================================================================
--- trunk/dports/science/magicspp/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/science/magicspp/files/patch-configure.diff	2013-01-06 02:04:12 UTC (rev 101185)
@@ -0,0 +1,13 @@
+--- configure.orig	2012-12-05 20:12:16.000000000 +0900
++++ configure	2013-01-06 07:49:48.000000000 +0900
+@@ -18194,8 +18194,8 @@
+     *-darwin*)
+         CPPFLAGS="${CPPFLAGS} -DMAGICS_MAC_GCC"
+         LIBS="$LIBS -lpng -lcurl"
+-        LDFLAGS="-L/usr/local/lib -L/opt/local/lib $LDFLAGS -lstdc++"
+-        CPPFLAGS="-I/usr/local/include -I/opt/local/include $CPPFLAGS"
++        LDFLAGS="$LDFLAGS -lstdc++"
++        CPPFLAGS="$CPPFLAGS"
+         SHLIB_EXT=dylib
+         mac=true
+         $as_echo "#define MAGICS_MAC 1" >>confdefs.h

Modified: trunk/dports/science/magicspp/files/patch-src-Makefile.in.diff
===================================================================
--- trunk/dports/science/magicspp/files/patch-src-Makefile.in.diff	2013-01-06 01:00:39 UTC (rev 101184)
+++ trunk/dports/science/magicspp/files/patch-src-Makefile.in.diff	2013-01-06 02:04:12 UTC (rev 101185)
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig	2012-08-14 18:05:29.000000000 +0900
-+++ src/Makefile.in	2012-10-15 06:07:04.000000000 +0900
-@@ -719,7 +719,7 @@
+--- src/Makefile.in.orig	2012-12-05 20:47:06.000000000 +0900
++++ src/Makefile.in	2013-01-05 11:02:23.000000000 +0900
+@@ -718,7 +718,7 @@
  	  rm -f "$${dir}/so_locations"; \
  	done
  libMagPlus.la: $(libMagPlus_la_OBJECTS) $(libMagPlus_la_DEPENDENCIES) 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130105/4c329b4b/attachment-0001.html>


More information about the macports-changes mailing list