<!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>[145263] trunk/dports/science/libemos</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/145263">145263</a></dd>
<dt>Author</dt> <dd>takeshi@macports.org</dd>
<dt>Date</dt> <dd>2016-01-29 22:25:48 -0800 (Fri, 29 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>emos: update to 4.3.3. add lib dependencies. move bin to lib/libemos/bin</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencelibemosPortfile">trunk/dports/science/libemos/Portfile</a></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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencelibemosfilespatchcmakecontribFindFFTWcmakediff">trunk/dports/science/libemos/files/patch-cmake-contrib-FindFFTW.cmake.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencelibemosPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/libemos/Portfile (145262 => 145263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/libemos/Portfile 2016-01-30 02:10:53 UTC (rev 145262)
+++ trunk/dports/science/libemos/Portfile 2016-01-30 06:25:48 UTC (rev 145263)
</span><span class="lines">@@ -6,8 +6,7 @@
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="cx">
</span><span class="cx"> name libemos
</span><del>-version 4.0.6
-revision 3
</del><ins>+version 4.3.3
</ins><span class="cx"> platforms darwin
</span><span class="cx"> maintainers takeshi
</span><span class="cx"> license Apache-2
</span><span class="lines">@@ -16,8 +15,9 @@
</span><span class="cx"> homepage https://software.ecmwf.int/wiki/display/EMOS
</span><span class="cx"> master_sites https://software.ecmwf.int/wiki/download/attachments/3473472
</span><span class="cx"> distname ${name}-${version}-Source
</span><del>-checksums sha1 515761fbcdbefd0340028f0ce0ae1862a3917359 \
- rmd160 764ed42453b55b8cfa028612fb9e243b2370f3e6
</del><ins>+checksums rmd160 4db38498e95f46c382f6efc32463b4e52d97e3b9 \
+ sha256 5b14bae3b13091a19702bdecea97e1be99c4dbad6ca8d5ea4b1d3b62259f5ed1
+
</ins><span class="cx"> long_description \
</span><span class="cx"> The Interpolation library (EMOSLIB) includes Interpolation software \
</span><span class="cx"> and BUFR & CREX encoding/decoding routines.
</span><span class="lines">@@ -27,20 +27,35 @@
</span><span class="cx"> cmake.out_of_source yes
</span><span class="cx">
</span><span class="cx"> patchfiles patch-libemos-dp-CMakeLists.txt.diff \
</span><del>- patch-libemos-sp-CMakeLists.txt.diff
</del><ins>+ patch-libemos-sp-CMakeLists.txt.diff \
+ patch-cmake-contrib-FindFFTW.cmake.diff
</ins><span class="cx">
</span><del>-depends_build-append \
- port:grib_api
</del><ins>+depends_lib port:fftw-3 \
+ port:grib_api \
+ port:jasper \
+ port:libpng \
+ port:openjpeg \
+ port:zlib
</ins><span class="cx">
</span><ins>+compilers.enforce_fortran \
+ port:fftw-3
+
</ins><span class="cx"> if {![fortran_variant_isset]} {
</span><span class="cx"> default_variants +gcc5
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+configure.args-append \
+ -DFFTW_ROOT=${prefix}
+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> ln -s ${prefix}/lib/libemos.a ${destroot}${prefix}/lib/libemos.R32.D64.I32.a
</span><span class="cx"> ln -s ${prefix}/lib/libemosR64.a ${destroot}${prefix}/lib/libemos.D64.D64.I32.a
</span><ins>+ file mkdir ${destroot}${prefix}/lib/${name}
+ file rename ${destroot}${prefix}/bin ${destroot}${prefix}/lib/${name}/
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+notes "Executables are installed in ${prefix}/lib/${name}/bin."
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${homepage}
</span><span class="cx"> livecheck.regex {libemos-([0-9]\.[0-9]\.[0-9])-Source.tar.gz}
</span></span></pre></div>
<a id="trunkdportssciencelibemosfilespatchcmakecontribFindFFTWcmakediff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/libemos/files/patch-cmake-contrib-FindFFTW.cmake.diff (0 => 145263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/libemos/files/patch-cmake-contrib-FindFFTW.cmake.diff (rev 0)
+++ trunk/dports/science/libemos/files/patch-cmake-contrib-FindFFTW.cmake.diff 2016-01-30 06:25:48 UTC (rev 145263)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+--- cmake/contrib/FindFFTW.cmake.orig 2015-03-28 03:54:15.000000000 +0900
++++ cmake/contrib/FindFFTW.cmake 2016-01-30 15:07:01.000000000 +0900
+@@ -83,21 +83,21 @@
+ NO_DEFAULT_PATH
+ )
+
+- find_library(
+- FFTWF_LIB
+- NAMES "fftw3f"
+- PATHS ${FFTW_ROOT}
+- PATH_SUFFIXES "lib" "lib64"
+- NO_DEFAULT_PATH
+- )
+-
+- find_library(
+- FFTWL_LIB
+- NAMES "fftw3l"
+- PATHS ${FFTW_ROOT}
+- PATH_SUFFIXES "lib" "lib64"
+- NO_DEFAULT_PATH
+- )
++# find_library(
++# FFTWF_LIB
++# NAMES "fftw3f"
++# PATHS ${FFTW_ROOT}
++# PATH_SUFFIXES "lib" "lib64"
++# NO_DEFAULT_PATH
++# )
++
++# find_library(
++# FFTWL_LIB
++# NAMES "fftw3l"
++# PATHS ${FFTW_ROOT}
++# PATH_SUFFIXES "lib" "lib64"
++# NO_DEFAULT_PATH
++# )
+
+ #find includes
+ find_path(
+@@ -116,18 +116,18 @@
+ PATHS ${PKG_FFTW_LIBRARY_DIRS} ${LIB_INSTALL_DIR}
+ )
+
+- find_library(
+- FFTWF_LIB
+- NAMES "fftw3f"
+- PATHS ${PKG_FFTW_LIBRARY_DIRS} ${LIB_INSTALL_DIR}
+- )
++# find_library(
++# FFTWF_LIB
++# NAMES "fftw3f"
++# PATHS ${PKG_FFTW_LIBRARY_DIRS} ${LIB_INSTALL_DIR}
++# )
+
+
+- find_library(
+- FFTWL_LIB
+- NAMES "fftw3l"
+- PATHS ${PKG_FFTW_LIBRARY_DIRS} ${LIB_INSTALL_DIR}
+- )
++# find_library(
++# FFTWL_LIB
++# NAMES "fftw3l"
++# PATHS ${PKG_FFTW_LIBRARY_DIRS} ${LIB_INSTALL_DIR}
++# )
+
+ find_path(
+ FFTW_INCLUDES
+@@ -137,11 +137,12 @@
+
+ endif( FFTW_ROOT )
+
+-set(FFTW_LIBRARIES ${FFTW_LIB} ${FFTWF_LIB})
++#set(FFTW_LIBRARIES ${FFTW_LIB} ${FFTWF_LIB})
++set(FFTW_LIBRARIES ${FFTW_LIB})
+
+-if(FFTWL_LIB)
+- set(FFTW_LIBRARIES ${FFTW_LIBRARIES} ${FFTWL_LIB})
+-endif()
++#if(FFTWL_LIB)
++# set(FFTW_LIBRARIES ${FFTW_LIBRARIES} ${FFTWL_LIB})
++#endif()
+
+ set( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SAV} )
+
+@@ -149,4 +150,5 @@
+ find_package_handle_standard_args(FFTW DEFAULT_MSG
+ FFTW_INCLUDES FFTW_LIBRARIES)
+
+-mark_as_advanced(FFTW_INCLUDES FFTW_LIBRARIES FFTW_LIB FFTWF_LIB FFTWL_LIB)
+\ No newline at end of file
++#mark_as_advanced(FFTW_INCLUDES FFTW_LIBRARIES FFTW_LIB FFTWF_LIB FFTWL_LIB)
++mark_as_advanced(FFTW_INCLUDES FFTW_LIBRARIES FFTW_LIB)
</ins></span></pre></div>
<a id="trunkdportssciencelibemosfilespatchlibemosdpCMakeListstxtdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff (145262 => 145263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff 2016-01-30 02:10:53 UTC (rev 145262)
+++ trunk/dports/science/libemos/files/patch-libemos-dp-CMakeLists.txt.diff 2016-01-30 06:25:48 UTC (rev 145263)
</span><span class="lines">@@ -1,11 +1,12 @@
</span><del>---- 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)" )
</del><ins>+--- libemos-dp/CMakeLists.txt.orig 2015-10-27 23:05:24.000000000 +0900
++++ libemos-dp/CMakeLists.txt 2016-01-30 12:49:59.000000000 +0900
+@@ -39,7 +39,7 @@
+ # install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+ # libemosR64.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R64.D64.I32.so)" )
</ins><span class="cx"> #else()
</span><del>--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)" )
</del><ins>+- 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)" )
</ins><span class="cx"> #endif()
</span><ins>+
</ins></span></pre></div>
<a id="trunkdportssciencelibemosfilespatchlibemosspCMakeListstxtdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/libemos/files/patch-libemos-sp-CMakeLists.txt.diff (145262 => 145263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/libemos/files/patch-libemos-sp-CMakeLists.txt.diff 2016-01-30 02:10:53 UTC (rev 145262)
+++ trunk/dports/science/libemos/files/patch-libemos-sp-CMakeLists.txt.diff 2016-01-30 06:25:48 UTC (rev 145263)
</span><span class="lines">@@ -1,11 +1,12 @@
</span><del>---- 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)" )
</del><ins>+--- libemos-sp/CMakeLists.txt.orig 2015-10-27 23:03:03.000000000 +0900
++++ libemos-sp/CMakeLists.txt 2016-01-30 12:49:48.000000000 +0900
+@@ -44,7 +44,7 @@
+ # install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink
+ # libemos.so ${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}/libemos.R32.D64.I32.so)" )
</ins><span class="cx"> #else()
</span><del>--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)" )
</del><ins>+- 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)" )
</ins><span class="cx"> #endif()
</span><ins>+
</ins></span></pre>
</div>
</div>
</body>
</html>