<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[137869] trunk/dports/science</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/137869">137869</a></dd>
<dt>Author</dt> <dd>takeshi@macports.org</dd>
<dt>Date</dt> <dd>2015-06-22 05:59:24 -0700 (Mon, 22 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>emos, libemos, magicspp: deprecate emos and add libemos 4.0.7 and update magicspp to 2.24.7</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceemosPortfile">trunk/dports/science/emos/Portfile</a></li>
<li><a href="#trunkdportssciencelibemosPortfile">trunk/dports/science/libemos/Portfile</a></li>
<li><a href="#trunkdportssciencemagicsppPortfile">trunk/dports/science/magicspp/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/science/libemos/</li>
<li>trunk/dports/science/libemos/files/</li>
<li><a href="#trunkdportssciencelibemosfilespatchlibemosdpCMakeListstxtdiff">trunk/dports/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportssciencelibemosfilespatchlibemosspCMakeListstxtdiff">trunk/dports/science/libemos/files/patch-libemos-sp-CMakeLists.txt.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceemosPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/emos/Portfile (137868 => 137869)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3,6 +3,10 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><ins>+# This port can be removed on 14 June 2016
+replaced_by libemos
+PortGroup obsolete 1.0
+
</ins><span class="cx"> name emos
</span><span class="cx"> version 000392
</span><span class="cx"> revision 1
</span><span class="lines">@@ -12,159 +16,6 @@
</span><span class="cx"> categories science
</span><span class="cx"> description Interpolation library
</span><span class="cx"> homepage https://software.ecmwf.int/emoslib
</span><del>-master_sites https://software.ecmwf.int/wiki/download/attachments/3473472
-distname ${name}_${version}
-checksums md5 165b9d7918fd67fd849c59287fc54bb6 \
- sha1 a8eecd6fa48a38e503373e6735e5bac861a10405 \
- rmd160 270308f45c8d1d5b47da7018cba98a96d00f8139
</del><span class="cx"> long_description \
</span><span class="cx"> The Interpolation library (EMOSLIB) includes Interpolation software \
</span><span class="cx"> and GRIB, BUFR, CREX encoding/decoding routines.
</span><del>-
-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])}
</del></span></pre></div>
<a id="trunkdportssciencelibemosPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/libemos/Portfile (137546 => 137869)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2,169 +2,44 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup compilers 1.0
+PortGroup cmake 1.0
</ins><span class="cx">
</span><del>-name emos
-version 000392
-revision 1
</del><ins>+name libemos
+version 4.0.6
</ins><span class="cx"> platforms darwin
</span><span class="cx"> maintainers takeshi
</span><del>-license LGPL
</del><ins>+license Apache-2
</ins><span class="cx"> categories science
</span><span class="cx"> description Interpolation library
</span><del>-homepage https://software.ecmwf.int/emoslib
</del><ins>+homepage https://software.ecmwf.int/wiki/display/EMOS
</ins><span class="cx"> master_sites https://software.ecmwf.int/wiki/download/attachments/3473472
</span><del>-distname ${name}_${version}
-checksums md5 165b9d7918fd67fd849c59287fc54bb6 \
- sha1 a8eecd6fa48a38e503373e6735e5bac861a10405 \
- rmd160 270308f45c8d1d5b47da7018cba98a96d00f8139
</del><ins>+distname ${name}-${version}-Source
+checksums md5 868f5b034d79d3c6566ee91282a9dd61 \
+ sha1 515761fbcdbefd0340028f0ce0ae1862a3917359 \
+ rmd160 764ed42453b55b8cfa028612fb9e243b2370f3e6
</ins><span class="cx"> long_description \
</span><span class="cx"> The Interpolation library (EMOSLIB) includes Interpolation software \
</span><del>- and GRIB, BUFR, CREX encoding/decoding routines.
</del><ins>+ and BUFR & CREX encoding/decoding routines.
</ins><span class="cx">
</span><del>-depends_build port:grib_api
</del><ins>+compilers.choose fc f77 f90
+compilers.setup -clang -dragonegg -g95 -gfortran -llvm
+cmake.out_of_source yes
</ins><span class="cx">
</span><del>-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
-}
</del><ins>+patchfiles patch-libemos-dp-CMakeLists.txt.diff \
+ patch-libemos-sp-CMakeLists.txt.diff
</ins><span class="cx">
</span><del>-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
-}
</del><ins>+depends_build port:grib_api
</ins><span class="cx">
</span><del>-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"
</del><ins>+if {![fortran_variant_isset]} {
+ default_variants +gcc49
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-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"
</del><ins>+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
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-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
-}
-
</del><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${homepage}
</span><del>-livecheck.regex {emos_([0-9][0-9][0-9][0-9][0-9][0-9])}
</del><ins>+livecheck.regex {libemos-([0-9]\.[0-9]\.[0-9])-Source.tar.gz}
</ins></span></pre></div>
<a id="trunkdportssciencelibemosfilespatchlibemosdpCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff (0 => 137869)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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()
</ins></span></pre></div>
<a id="trunkdportssciencelibemosfilespatchlibemosspCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/libemos/files/patch-libemos-sp-CMakeLists.txt.diff (0 => 137869)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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()
</ins></span></pre></div>
<a id="trunkdportssciencemagicsppPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/magicspp/Portfile (137868 => 137869)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -9,8 +9,7 @@
</span><span class="cx"> perl5.branches 5.8 5.10 5.12 5.16
</span><span class="cx">
</span><span class="cx"> name magicspp
</span><del>-version 2.22.6
-revision 5
</del><ins>+version 2.24.7
</ins><span class="cx"> platforms darwin
</span><span class="cx"> maintainers takeshi
</span><span class="cx"> license Apache-2
</span><span class="lines">@@ -19,9 +18,9 @@
</span><span class="cx"> homepage http://software.ecmwf.int/wiki/display/MAGP/Magics
</span><span class="cx"> master_sites https://software.ecmwf.int/wiki/download/attachments/3473464/
</span><span class="cx"> distname Magics-${version}-Source
</span><del>-checksums md5 99ac8a9b50861f4632ca3b96099dc14b \
- sha1 c61311413c396f74f04eecda3b51293cdfd9df48 \
- rmd160 847e8a16fcf17c83410e82bdfe99dafc62d85c08
</del><ins>+checksums md5 66d43522d39c9fc3faa716ae7b36c1ad \
+ sha1 4e6c0523b2c038a830ecac08507f9d994c67f9eb \
+ rmd160 98461d18f6a504077628b264e28267c7d2d0e251
</ins><span class="cx"> long_description \
</span><span class="cx"> Magics++ is the latest generation of the ECMWF's Meteorological plotting \
</span><span class="cx"> software MAGICS (Meteorological Applications Graphics Integrated Colour System) \
</span><span class="lines">@@ -39,7 +38,8 @@
</span><span class="cx">
</span><span class="cx"> depends_build port:cmake \
</span><span class="cx"> port:flex
</span><del>-depends_lib port:emos \
</del><ins>+depends_lib port:libemos \
+ port:libgeotiff \
</ins><span class="cx"> port:grib_api \
</span><span class="cx"> port:netcdf-cxx \
</span><span class="cx"> port:mesa \
</span><span class="lines">@@ -67,57 +67,33 @@
</span><span class="cx"> -DENABLE_BUFR=ON \
</span><span class="cx"> -DENABLE_CAIRO=ON \
</span><span class="cx"> -DENABLE_FORTRAN=OFF \
</span><ins>+ -DENABLE_GEOTIFF=ON \
</ins><span class="cx"> -DENABLE_GRIB=ON \
</span><span class="cx"> -DENABLE_LARGE_FILE_SUPPORT=ON \
</span><span class="cx"> -DENABLE_NETCDF=ON \
</span><span class="cx"> -DENABLE_PYTHON=ON \
</span><span class="cx"> -DEXPAT_INCLUDE_DIR=${prefix}/include \
</span><span class="cx"> -DEXPAT_LIBRARY=${prefix}/lib/libexpat.dylib \
</span><del>- -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 \
</del><ins>+ -Dgrib_api_DIR=${prefix} \
</ins><span class="cx"> -DHDF5_C_COMPILER_EXECUTABLE=${prefix}/bin/h5cc \
</span><span class="cx"> -DHDF5_C_INCLUDE_DIR=${prefix}/include \
</span><span class="cx"> -DHDF5_DIFF_EXECUTABLE=${prefix}/bin/h5diff \
</span><del>- -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 \
</del><span class="cx"> -DNETCDF_CONFIG_EXECUTABLE=${prefix}/bin/nc-config \
</span><span class="cx"> -DNETCDF_netcdf.h_INCLUDE_DIR=${prefix}/include \
</span><span class="cx"> -DNETCDF_netcdf_LIBRARY_RELEASE=${prefix}/lib/libnetcdf.dylib \
</span><span class="cx"> -DNETCDF_netcdf_c++_LIBRARY_RELEASE=${prefix}/lib/libnetcdf_c++.dylib \
</span><span class="cx"> -DNETCDF_netcdfcpp.h_INCLUDE_DIR=${prefix}/include \
</span><del>- -DOPENJPEG_INCLUDE_DIR=${prefix}/include \
- -DOPENJPEG_LIBRARY=${prefix}/lib/libopenjpeg.dylib \
</del><span class="cx"> -DPERL_EXECUTABLE=${perl5.bin} \
</span><span class="cx"> -DPKG_CONFIG_EXECUTABLE=${prefix}/bin/pkg-config \
</span><del>- -DPNG_LIBRARY_RELEASE=${prefix}/lib/libpng.dylib \
- -DPNG_PNG_INCLUDE_DIR=${prefix}/include \
</del><span class="cx"> -DPROJ4_INCLUDE_DIR=${prefix}/include \
</span><span class="cx"> -DPROJ4_LIBRARY=${prefix}/lib/libproj.dylib \
</span><del>- -DSWIG_EXECUTABLE=${prefix}/bin/swig \
- -DZLIB_INCLUDE_DIR=${prefix}/include \
- -DZLIB_LIBRARY=${prefix}/lib/libz.dylib
-configure.post_args ../${distname}
</del><ins>+ -DSWIG_EXECUTABLE=${prefix}/bin/swig
</ins><span class="cx"> post-configure {
</span><del>- 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
</del><ins>+ reinplace "s|-lcairo|-lcairo -lX11 -ltiff|" ${workpath}/build/src/CMakeFiles/MagPlusShared.dir/link.txt
</ins><span class="cx"> foreach d {bufr grib} {
</span><span class="cx"> reinplace "s|${configure.fc}|${configure.cxx}|" ${workpath}/build/test/CMakeFiles/${d}_fortran.dir/link.txt
</span><del>- reinplace "s|-I/opt/local/include||g" ${workpath}/build/src/magics.pc
</del><span class="cx"> }
</span><ins>+ reinplace "s|-I${prefix}/include ||g" ${workpath}/build/src/magics.pc
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> cmake.out_of_source yes
</span><span class="lines">@@ -154,3 +130,7 @@
</span><span class="cx"> variant python27 description {Add support for python27} {
</span><span class="cx"> depends_lib-append port:py27-numpy
</span><span class="cx"> }
</span><ins>+
+livecheck.type regex
+livecheck.url ${homepage}
+livecheck.regex {Magics-([0-9]+\.[0-9]+\.[0-9]+)-Source.tar.gz}
</ins></span></pre>
</div>
</div>
</body>
</html>