[137869] trunk/dports/science

takeshi at macports.org takeshi at macports.org
Mon Jun 22 05:59:24 PDT 2015


Revision: 137869
          https://trac.macports.org/changeset/137869
Author:   takeshi at macports.org
Date:     2015-06-22 05:59:24 -0700 (Mon, 22 Jun 2015)
Log Message:
-----------
emos, libemos, magicspp: deprecate emos and add libemos 4.0.7 and update magicspp to 2.24.7

Modified Paths:
--------------
    trunk/dports/science/emos/Portfile
    trunk/dports/science/libemos/Portfile
    trunk/dports/science/magicspp/Portfile

Added Paths:
-----------
    trunk/dports/science/libemos/
    trunk/dports/science/libemos/files/
    trunk/dports/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff
    trunk/dports/science/libemos/files/patch-libemos-sp-CMakeLists.txt.diff

Modified: trunk/dports/science/emos/Portfile
===================================================================
--- trunk/dports/science/emos/Portfile	2015-06-22 12:48:47 UTC (rev 137868)
+++ trunk/dports/science/emos/Portfile	2015-06-22 12:59:24 UTC (rev 137869)
@@ -3,6 +3,10 @@
 
 PortSystem          1.0
 
+# This port can be removed on 14 June 2016
+replaced_by         libemos
+PortGroup           obsolete 1.0
+
 name                emos
 version             000392
 revision            1
@@ -12,159 +16,6 @@
 categories          science
 description         Interpolation library
 homepage            https://software.ecmwf.int/emoslib
-master_sites        https://software.ecmwf.int/wiki/download/attachments/3473472
-distname            ${name}_${version}
-checksums           md5     165b9d7918fd67fd849c59287fc54bb6 \
-                    sha1    a8eecd6fa48a38e503373e6735e5bac861a10405 \
-                    rmd160  270308f45c8d1d5b47da7018cba98a96d00f8139
 long_description \
     The Interpolation library (EMOSLIB) includes Interpolation software \
     and GRIB, BUFR, CREX encoding/decoding routines.
-
-depends_build       port:grib_api
-
-post-patch {
-    reinplace "s:^void \\*memcpy://void *memcpy:" ${worksrcpath}/gribex/gdecode.h
-    reinplace "s: | O_LARGEFILE::" ${worksrcpath}/interpolation/sharedlib.c
-    reinplace "s:`cat .list/bufrtables`:bufrtables/*.TXT:" ${worksrcpath}/install
-    reinplace "s:xf:xpf:" ${worksrcpath}/install
-}
-
-if {${os.endian}=="little"} {
-    set fendian -DLITTLE_ENDIAN
-} else {
-    set fendian ""
-}
-configure {
-    set f [open ${worksrcpath}/config/config.site w]
-    puts $f "#
-AR      = ar
-ARFLAGS = rv
-CC      = ${configure.cc}
-CFLAGS  = ${configure.cflags} ${fendian} ${configure.cc_archflags}
-FCASTFLAGS = \$(CFLAGS)
-FC      = ${configure.fc}
-FFLAGS  = ${configure.fflags} ${fendian}
-VECTFFLAGS =\$(FFLAGS)
-RANLIB  = /usr/bin/ranlib"
-    close $f
-    file copy -force ${worksrcpath}/Makefile.in ${worksrcpath}/Makefile
-    reinplace "s:reals:R64:" ${worksrcpath}/Makefile
-    reinplace "s:glue:grib_api_merging:" ${worksrcpath}/Makefile
-    foreach d {gribex pbio bufrdc bufrtables crexdc interpolation fft grib_api_merging} {
-        file copy -force ${worksrcpath}/${d}/Makefile.in ${worksrcpath}/${d}/Makefile
-        reinplace "s:reals:R64:" ${worksrcpath}/${d}/Makefile
-        reinplace "s:arch:linux:" ${worksrcpath}/${d}/Makefile
-        reinplace "s:depl:${name}:" ${worksrcpath}/${d}/Makefile
-        reinplace "s:\$(ARCH)\$(CNAME)\$(R64)\$(A64):site:" ${worksrcpath}/${d}/Makefile
-    }
-    reinplace "s:I\$(GRIB_API_PATH):I${prefix}:" ${worksrcpath}/grib_api_merging/Makefile
-    reinplace "s:`cat -s .r64`:R64:" ${worksrcpath}/install
-    reinplace "s:`cat -s .emos`:${destroot}${prefix}/lib/${name}:" ${worksrcpath}/install
-}
-
-post-build {
-    reinplace "s:R64 = R64:R64 =:" ${worksrcpath}/Makefile
-    foreach d {gribex pbio bufrdc bufrtables crexdc interpolation fft} {
-        reinplace "s:R64 = R64:R64 =:" ${worksrcpath}/${d}/Makefile
-    }
-    if {[variant_isset gcc43] || [variant_isset gcc44] || [variant_isset gcc45]} {
-        reinplace "s:-fdefault-real-8 -fdefault-double-8 ::" ${worksrcpath}/config/config.site
-    } else {
-        reinplace "s:-r8 ::" ${worksrcpath}/config/config.site
-    }
-    system "cd ${worksrcpath}; make clean; make"
-}
-
-destroot {
-    xinstall -m 755 -d ${destroot}${prefix}/lib/${name}
-    xinstall -m 755 -d ${destroot}${prefix}/lib/${name}/bin
-    system "cd ${worksrcpath}; ./install"
-    xinstall -m 644 ${worksrcpath}/lib${name}.a ${destroot}${prefix}/lib/${name}
-    foreach f {bufr2txt_tables bufr_split_tables txt2bufr_tables} {
-      xinstall -m 755 ${worksrcpath}/bufrtables/${f} ${destroot}${prefix}/lib/${name}/bin
-    }
-    system "ln -s ${name}/lib${name}R64.a ${destroot}${prefix}/lib/lib${name}R64.a"
-    system "ln -s ${name}/lib${name}.a ${destroot}${prefix}/lib/lib${name}.a"
-    system "cd ${destroot}${prefix}/lib/${name}; \
-        for d in bufrtables crextables gribtables gribtemplates land_sea_mask; do \
-            chmod 755 \$d; \
-            find \$d -type f -print | xargs chmod 644; \
-        done; \
-        find gribtables -type d -print | xargs chmod 755"
-}
-
-use_parallel_build  no
-universal_variant   no
-
-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set default_fortran_variant +gcc48
-set g95_conflicts {}
-
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} "."] ""]
-
-    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
-
-    foreach over ${gcc_versions} {
-        if {${ver} == ${over}} {
-            continue
-        }
-
-        set over_no_dot [join [split ${over} "."] ""]
-        append variant_line " conflicts gcc${over_no_dot}"
-    }
-    append variant_line { {}}
-
-    eval $variant_line
-
-    append g95_conflicts " conflicts gcc${ver_no_dot}"
-
-    if {[variant_isset gcc${ver_no_dot}]} {
-        if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
-            set default_fortran_variant ""
-        }
-    }
-}
-
-eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
-
-if {[variant_isset g95]} {
-    if {${default_fortran_variant} != "+g95"} {
-        set default_fortran_variant ""
-    }
-}
-
-if {${default_fortran_variant} != ""} {
-    default_variants-append "${default_fortran_variant}"
-}
-
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} "."] ""]
-
-    if {[variant_isset gcc${ver_no_dot}]} {
-        depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-        depends_build-append port:gcc${ver_no_dot}
-
-        configure.fc  ${prefix}/bin/gfortran-mp-${ver}
-        configure.f77 ${prefix}/bin/gfortran-mp-${ver}
-        configure.f90 ${prefix}/bin/gfortran-mp-${ver}
-        configure.fflags-append -fdefault-real-8 -fdefault-double-8 -fcray-pointer -fno-second-underscore -DPOINTER_64 -DINTEGER_IS_INT -Dlinux -Dgfortran
-        configure.cflags-append -DPOINTER_64 -DINTEGER_IS_INT
-    }
-}
-
-if {[variant_isset g95]} {
-    depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-    depends_build-append port:g95
-
-    configure.fc ${prefix}/bin/g95
-    configure.f77 ${prefix}/bin/g95
-    configure.f90 ${prefix}/bin/g95
-    configure.fflags-append -r8 -fsloppy-char -fno-second-underscore -DUSE_NO_POINTERS -DINTEGER_IS_INT -Dlinux
-    configure.cflags-append -DPOINTER_64 -DINTEGER_IS_INT
-}
-
-livecheck.type      regex
-livecheck.url       ${homepage}
-livecheck.regex     {emos_([0-9][0-9][0-9][0-9][0-9][0-9])}

Modified: trunk/dports/science/libemos/Portfile
===================================================================
--- trunk/dports/science/emos/Portfile	2015-06-14 07:30:59 UTC (rev 137546)
+++ trunk/dports/science/libemos/Portfile	2015-06-22 12:59:24 UTC (rev 137869)
@@ -2,169 +2,44 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup compilers 1.0
+PortGroup cmake     1.0
 
-name                emos
-version             000392
-revision            1
+name                libemos
+version             4.0.6
 platforms           darwin
 maintainers         takeshi
-license             LGPL
+license             Apache-2
 categories          science
 description         Interpolation library
-homepage            https://software.ecmwf.int/emoslib
+homepage            https://software.ecmwf.int/wiki/display/EMOS
 master_sites        https://software.ecmwf.int/wiki/download/attachments/3473472
-distname            ${name}_${version}
-checksums           md5     165b9d7918fd67fd849c59287fc54bb6 \
-                    sha1    a8eecd6fa48a38e503373e6735e5bac861a10405 \
-                    rmd160  270308f45c8d1d5b47da7018cba98a96d00f8139
+distname            ${name}-${version}-Source
+checksums           md5     868f5b034d79d3c6566ee91282a9dd61 \
+                    sha1    515761fbcdbefd0340028f0ce0ae1862a3917359 \
+                    rmd160  764ed42453b55b8cfa028612fb9e243b2370f3e6
 long_description \
     The Interpolation library (EMOSLIB) includes Interpolation software \
-    and GRIB, BUFR, CREX encoding/decoding routines.
+    and BUFR & CREX encoding/decoding routines.
 
-depends_build       port:grib_api
+compilers.choose    fc f77 f90 
+compilers.setup     -clang -dragonegg -g95 -gfortran -llvm
+cmake.out_of_source yes
 
-post-patch {
-    reinplace "s:^void \\*memcpy://void *memcpy:" ${worksrcpath}/gribex/gdecode.h
-    reinplace "s: | O_LARGEFILE::" ${worksrcpath}/interpolation/sharedlib.c
-    reinplace "s:`cat .list/bufrtables`:bufrtables/*.TXT:" ${worksrcpath}/install
-    reinplace "s:xf:xpf:" ${worksrcpath}/install
-}
+patchfiles          patch-libemos-dp-CMakeLists.txt.diff \
+                    patch-libemos-sp-CMakeLists.txt.diff
 
-if {${os.endian}=="little"} {
-    set fendian -DLITTLE_ENDIAN
-} else {
-    set fendian ""
-}
-configure {
-    set f [open ${worksrcpath}/config/config.site w]
-    puts $f "#
-AR      = ar
-ARFLAGS = rv
-CC      = ${configure.cc}
-CFLAGS  = ${configure.cflags} ${fendian} ${configure.cc_archflags}
-FCASTFLAGS = \$(CFLAGS)
-FC      = ${configure.fc}
-FFLAGS  = ${configure.fflags} ${fendian}
-VECTFFLAGS =\$(FFLAGS)
-RANLIB  = /usr/bin/ranlib"
-    close $f
-    file copy -force ${worksrcpath}/Makefile.in ${worksrcpath}/Makefile
-    reinplace "s:reals:R64:" ${worksrcpath}/Makefile
-    reinplace "s:glue:grib_api_merging:" ${worksrcpath}/Makefile
-    foreach d {gribex pbio bufrdc bufrtables crexdc interpolation fft grib_api_merging} {
-        file copy -force ${worksrcpath}/${d}/Makefile.in ${worksrcpath}/${d}/Makefile
-        reinplace "s:reals:R64:" ${worksrcpath}/${d}/Makefile
-        reinplace "s:arch:linux:" ${worksrcpath}/${d}/Makefile
-        reinplace "s:depl:${name}:" ${worksrcpath}/${d}/Makefile
-        reinplace "s:\$(ARCH)\$(CNAME)\$(R64)\$(A64):site:" ${worksrcpath}/${d}/Makefile
-    }
-    reinplace "s:I\$(GRIB_API_PATH):I${prefix}:" ${worksrcpath}/grib_api_merging/Makefile
-    reinplace "s:`cat -s .r64`:R64:" ${worksrcpath}/install
-    reinplace "s:`cat -s .emos`:${destroot}${prefix}/lib/${name}:" ${worksrcpath}/install
-}
+depends_build       port:grib_api
 
-post-build {
-    reinplace "s:R64 = R64:R64 =:" ${worksrcpath}/Makefile
-    foreach d {gribex pbio bufrdc bufrtables crexdc interpolation fft} {
-        reinplace "s:R64 = R64:R64 =:" ${worksrcpath}/${d}/Makefile
-    }
-    if {[variant_isset gcc43] || [variant_isset gcc44] || [variant_isset gcc45]} {
-        reinplace "s:-fdefault-real-8 -fdefault-double-8 ::" ${worksrcpath}/config/config.site
-    } else {
-        reinplace "s:-r8 ::" ${worksrcpath}/config/config.site
-    }
-    system "cd ${worksrcpath}; make clean; make"
+if {![fortran_variant_isset]} {
+    default_variants    +gcc49
 }
 
-destroot {
-    xinstall -m 755 -d ${destroot}${prefix}/lib/${name}
-    xinstall -m 755 -d ${destroot}${prefix}/lib/${name}/bin
-    system "cd ${worksrcpath}; ./install"
-    xinstall -m 644 ${worksrcpath}/lib${name}.a ${destroot}${prefix}/lib/${name}
-    foreach f {bufr2txt_tables bufr_split_tables txt2bufr_tables} {
-      xinstall -m 755 ${worksrcpath}/bufrtables/${f} ${destroot}${prefix}/lib/${name}/bin
-    }
-    system "ln -s ${name}/lib${name}R64.a ${destroot}${prefix}/lib/lib${name}R64.a"
-    system "ln -s ${name}/lib${name}.a ${destroot}${prefix}/lib/lib${name}.a"
-    system "cd ${destroot}${prefix}/lib/${name}; \
-        for d in bufrtables crextables gribtables gribtemplates land_sea_mask; do \
-            chmod 755 \$d; \
-            find \$d -type f -print | xargs chmod 644; \
-        done; \
-        find gribtables -type d -print | xargs chmod 755"
+post-destroot {
+    ln -s ${prefix}/lib/libemos.a ${destroot}${prefix}/lib/libemos.R32.D64.I32.a
+    ln -s ${prefix}/lib/libemosR64.a ${destroot}${prefix}/lib/libemos.D64.D64.I32.a
 }
 
-use_parallel_build  no
-universal_variant   no
-
-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set default_fortran_variant +gcc48
-set g95_conflicts {}
-
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} "."] ""]
-
-    set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
-
-    foreach over ${gcc_versions} {
-        if {${ver} == ${over}} {
-            continue
-        }
-
-        set over_no_dot [join [split ${over} "."] ""]
-        append variant_line " conflicts gcc${over_no_dot}"
-    }
-    append variant_line { {}}
-
-    eval $variant_line
-
-    append g95_conflicts " conflicts gcc${ver_no_dot}"
-
-    if {[variant_isset gcc${ver_no_dot}]} {
-        if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
-            set default_fortran_variant ""
-        }
-    }
-}
-
-eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
-
-if {[variant_isset g95]} {
-    if {${default_fortran_variant} != "+g95"} {
-        set default_fortran_variant ""
-    }
-}
-
-if {${default_fortran_variant} != ""} {
-    default_variants-append "${default_fortran_variant}"
-}
-
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} "."] ""]
-
-    if {[variant_isset gcc${ver_no_dot}]} {
-        depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-        depends_build-append port:gcc${ver_no_dot}
-
-        configure.fc  ${prefix}/bin/gfortran-mp-${ver}
-        configure.f77 ${prefix}/bin/gfortran-mp-${ver}
-        configure.f90 ${prefix}/bin/gfortran-mp-${ver}
-        configure.fflags-append -fdefault-real-8 -fdefault-double-8 -fcray-pointer -fno-second-underscore -DPOINTER_64 -DINTEGER_IS_INT -Dlinux -Dgfortran
-        configure.cflags-append -DPOINTER_64 -DINTEGER_IS_INT
-    }
-}
-
-if {[variant_isset g95]} {
-    depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
-    depends_build-append port:g95
-
-    configure.fc ${prefix}/bin/g95
-    configure.f77 ${prefix}/bin/g95
-    configure.f90 ${prefix}/bin/g95
-    configure.fflags-append -r8 -fsloppy-char -fno-second-underscore -DUSE_NO_POINTERS -DINTEGER_IS_INT -Dlinux
-    configure.cflags-append -DPOINTER_64 -DINTEGER_IS_INT
-}
-
 livecheck.type      regex
 livecheck.url       ${homepage}
-livecheck.regex     {emos_([0-9][0-9][0-9][0-9][0-9][0-9])}
+livecheck.regex     {libemos-([0-9]\.[0-9]\.[0-9])-Source.tar.gz}

Added: trunk/dports/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff	2015-06-22 12:59:24 UTC (rev 137869)
@@ -0,0 +1,11 @@
+--- libemos-dp/CMakeLists.txt.orig	2015-05-11 19:31:46.000000000 +0900
++++ libemos-dp/CMakeLists.txt	2015-06-21 14:08:22.000000000 +0900
+@@ -24,6 +24,6 @@
+ #install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+ #              libemosR64.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.so)" )
+ #else()
+-install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+-              libemosR64.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
++#install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
++#              libemosR64.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.a)" )
+ #endif()

Added: trunk/dports/science/libemos/files/patch-libemos-sp-CMakeLists.txt.diff
===================================================================
--- trunk/dports/science/libemos/files/patch-libemos-sp-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/science/libemos/files/patch-libemos-sp-CMakeLists.txt.diff	2015-06-22 12:59:24 UTC (rev 137869)
@@ -0,0 +1,11 @@
+--- libemos-sp/CMakeLists.txt.orig	2015-05-11 19:31:46.000000000 +0900
++++ libemos-sp/CMakeLists.txt	2015-06-21 14:08:11.000000000 +0900
+@@ -29,6 +29,6 @@
+ #install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+ #             libemos.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.so)" )
+ #else()
+-install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+-             libemos.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
++#install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
++#             libemos.a ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.a)" )
+ #endif()

Modified: trunk/dports/science/magicspp/Portfile
===================================================================
--- trunk/dports/science/magicspp/Portfile	2015-06-22 12:48:47 UTC (rev 137868)
+++ trunk/dports/science/magicspp/Portfile	2015-06-22 12:59:24 UTC (rev 137869)
@@ -9,8 +9,7 @@
 perl5.branches      5.8 5.10 5.12 5.16
 
 name                magicspp
-version             2.22.6
-revision            5
+version             2.24.7
 platforms           darwin
 maintainers         takeshi
 license             Apache-2
@@ -19,9 +18,9 @@
 homepage            http://software.ecmwf.int/wiki/display/MAGP/Magics
 master_sites        https://software.ecmwf.int/wiki/download/attachments/3473464/
 distname            Magics-${version}-Source
-checksums           md5     99ac8a9b50861f4632ca3b96099dc14b \
-                    sha1    c61311413c396f74f04eecda3b51293cdfd9df48 \
-                    rmd160  847e8a16fcf17c83410e82bdfe99dafc62d85c08
+checksums           md5     66d43522d39c9fc3faa716ae7b36c1ad \
+                    sha1    4e6c0523b2c038a830ecac08507f9d994c67f9eb \
+                    rmd160  98461d18f6a504077628b264e28267c7d2d0e251
 long_description \
     Magics++ is the latest generation of the ECMWF's Meteorological plotting \
     software MAGICS (Meteorological Applications Graphics Integrated Colour System) \
@@ -39,7 +38,8 @@
 
 depends_build       port:cmake \
                     port:flex
-depends_lib         port:emos \
+depends_lib         port:libemos \
+                    port:libgeotiff \
                     port:grib_api \
                     port:netcdf-cxx \
                     port:mesa \
@@ -67,57 +67,33 @@
                         -DENABLE_BUFR=ON \
                         -DENABLE_CAIRO=ON \
                         -DENABLE_FORTRAN=OFF \
+                        -DENABLE_GEOTIFF=ON \
                         -DENABLE_GRIB=ON \
                         -DENABLE_LARGE_FILE_SUPPORT=ON \
                         -DENABLE_NETCDF=ON \
                         -DENABLE_PYTHON=ON \
                         -DEXPAT_INCLUDE_DIR=${prefix}/include \
                         -DEXPAT_LIBRARY=${prefix}/lib/libexpat.dylib \
-                        -DFLEX_EXECUTABLE=${prefix}/bin/flex \
-                        -DFLEX_INCLUDE_DIR=${prefix}/include \
-                        -DFL_LIBRARY=${prefix}/lib/libfl.a \
-                        -DGRIB_API_PATH=${prefix} \
-                        -DGRIB_API_INCLUDE_DIR=${prefix}/include \
-                        -DGRIB_API_INFO=${prefix}/bin/grib_info \
-                        -DGRIB_API_JPG=ON \
-                        -DGRIB_API_LIBRARY=${prefix}/lib/libgrib_api.dylib \
-                        -DGRIB_API_PNG=ON \
-                        -DGS_LIBRARIES=${prefix}/lib/libgs.dylib \
-                        -DHDF5_CXX_COMPILER_EXECUTABLE=${prefix}/bin/h5c++ \
-                        -DHDF5_CXX_INCLUDE_DIR=${prefix}/include \
+                        -Dgrib_api_DIR=${prefix} \
                         -DHDF5_C_COMPILER_EXECUTABLE=${prefix}/bin/h5cc \
                         -DHDF5_C_INCLUDE_DIR=${prefix}/include \
                         -DHDF5_DIFF_EXECUTABLE=${prefix}/bin/h5diff \
-                        -DHDF5_hdf5_cpp_LIBRARY_RELEASE=${prefix}/lib/libhdf5.dylib \
-                        -DHDF5_hdf5_hl_LIBRARY_RELEASE=${prefix}/lib/libhdf5_hl.dylib \
-                        -DJASPER_INCLUDE_DIR=${prefix}/include \
-                        -DJASPER_LIBRARY_RELEASE=${prefix}/lib/libjasper.dylib \
-                        -DJPEG_INCLUDE_DIR=${prefix}/include \
-                        -DJPEG_LIBRARY=${prefix}/lib/libjpeg.dylib \
                         -DNETCDF_CONFIG_EXECUTABLE=${prefix}/bin/nc-config \
                         -DNETCDF_netcdf.h_INCLUDE_DIR=${prefix}/include \
                         -DNETCDF_netcdf_LIBRARY_RELEASE=${prefix}/lib/libnetcdf.dylib \
                         -DNETCDF_netcdf_c++_LIBRARY_RELEASE=${prefix}/lib/libnetcdf_c++.dylib \
                         -DNETCDF_netcdfcpp.h_INCLUDE_DIR=${prefix}/include \
-                        -DOPENJPEG_INCLUDE_DIR=${prefix}/include \
-                        -DOPENJPEG_LIBRARY=${prefix}/lib/libopenjpeg.dylib \
                         -DPERL_EXECUTABLE=${perl5.bin} \
                         -DPKG_CONFIG_EXECUTABLE=${prefix}/bin/pkg-config \
-                        -DPNG_LIBRARY_RELEASE=${prefix}/lib/libpng.dylib \
-                        -DPNG_PNG_INCLUDE_DIR=${prefix}/include \
                         -DPROJ4_INCLUDE_DIR=${prefix}/include \
                         -DPROJ4_LIBRARY=${prefix}/lib/libproj.dylib \
-                        -DSWIG_EXECUTABLE=${prefix}/bin/swig \
-                        -DZLIB_INCLUDE_DIR=${prefix}/include \
-                        -DZLIB_LIBRARY=${prefix}/lib/libz.dylib
-configure.post_args     ../${distname}
+                        -DSWIG_EXECUTABLE=${prefix}/bin/swig
 post-configure {
-    reinplace "s|Magics-${version}-Source/python/Magics/Magics.i$|build/python/Magics/Magics.i|g" ${workpath}/build/python/Magics/CMakeFiles/_Magics.dir/build.make
-    reinplace "s|-lcairo|-lcairo -lX11|" ${workpath}/build/src/CMakeFiles/MagPlusShared.dir/link.txt
+    reinplace "s|-lcairo|-lcairo -lX11 -ltiff|" ${workpath}/build/src/CMakeFiles/MagPlusShared.dir/link.txt
     foreach d {bufr grib} {
         reinplace "s|${configure.fc}|${configure.cxx}|" ${workpath}/build/test/CMakeFiles/${d}_fortran.dir/link.txt
-    reinplace "s|-I/opt/local/include||g" ${workpath}/build/src/magics.pc
     }
+    reinplace "s|-I${prefix}/include ||g" ${workpath}/build/src/magics.pc
 }
 
 cmake.out_of_source     yes
@@ -154,3 +130,7 @@
 variant python27 description {Add support for python27} {
     depends_lib-append      port:py27-numpy
 }
+
+livecheck.type          regex
+livecheck.url           ${homepage}
+livecheck.regex         {Magics-([0-9]+\.[0-9]+\.[0-9]+)-Source.tar.gz}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150622/02f78611/attachment-0001.html>


More information about the macports-changes mailing list