<!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>[149230] trunk/dports/science/paraview</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/149230">149230</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2016-06-06 12:06:09 -0700 (Mon, 06 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>paraview: Update to 5.0.1. Added patches to handle rpath mistake in build system and allow gfortran 6 and 7. zlib seems no longer required. gcc cannot be used for C and C++ in this version due to some system headers files that get included. Added livecheck.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceparaviewPortfile">trunk/dports/science/paraview/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/science/paraview/files/</li>
<li><a href="#trunkdportsscienceparaviewfilespatchThirdPartyIceTvtkicetCMakeListstxtdiff">trunk/dports/science/paraview/files/patch-ThirdParty-IceT-vtkicet-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsscienceparaviewfilespatchVTKCmakeGenerateExportHeadercmake">trunk/dports/science/paraview/files/patch-VTK-Cmake-GenerateExportHeader.cmake</a></li>
<li><a href="#trunkdportsscienceparaviewfilespatchVTKCmakevtkCompilerExtrascmake">trunk/dports/science/paraview/files/patch-VTK-Cmake-vtkCompilerExtras.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceparaviewPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/paraview/Portfile (149229 => 149230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/paraview/Portfile 2016-06-06 18:21:43 UTC (rev 149229)
+++ trunk/dports/science/paraview/Portfile 2016-06-06 19:06:09 UTC (rev 149230)
</span><span class="lines">@@ -8,12 +8,11 @@
</span><span class="cx"> PortGroup mpi 1.0
</span><span class="cx">
</span><span class="cx"> name paraview
</span><del>-version 4.2.0
</del><ins>+version 5.0.1
</ins><span class="cx"> # versions 4.3.1 and 4.4.0 have some issues; see Notes section of https://github.com/OpenFOAM/ThirdParty-dev/
</span><span class="cx"> # so just patch them?
</span><del>-revision 1
</del><ins>+revision 0
</ins><span class="cx">
</span><del>-# should "graphics" be the primary group?
</del><span class="cx"> categories science graphics
</span><span class="cx"> platforms darwin
</span><span class="cx"> license BSD
</span><span class="lines">@@ -36,13 +35,18 @@
</span><span class="cx">
</span><span class="cx"> distname ParaView-v${version}-source
</span><span class="cx">
</span><del>-checksums sha256 ac26cc5fe5ce82d27531727a01242353d40984826eaa580edea0791887a07b6b \
- rmd160 c326c70e15c2555ddf0700020b8f62c5f69b7a92
</del><ins>+checksums sha256 caddec83ec284162a2cbc46877b0e5a9d2cca59fb4ab0ea35b0948d2492950bb \
+ rmd160 769780717d7a2a6be69c8345fcd589349aa7209e
</ins><span class="cx">
</span><ins>+#:info:build ld: file not found: @rpath/libIceTMPI.dylib for architecture x86_64
+# https://github.com/OpenFOAM/ThirdParty-dev/
+patchfiles patch-ThirdParty-IceT-vtkicet-CMakeLists.txt.diff \
+ patch-VTK-Cmake-GenerateExportHeader.cmake \
+ patch-VTK-Cmake-vtkCompilerExtras.cmake
+
</ins><span class="cx"> depends_build-append port:readline \
</span><span class="cx"> port:netcdf \
</span><del>- port:qt4-mac-sqlite3-plugin \
- port:zlib
</del><ins>+ port:qt4-mac-sqlite3-plugin
</ins><span class="cx">
</span><span class="cx"> cmake.out_of_source yes
</span><span class="cx">
</span><span class="lines">@@ -59,7 +63,6 @@
</span><span class="cx"> configure.args-append \
</span><span class="cx"> -DBUILD_TESTING:BOOL=ON \
</span><span class="cx"> -DMACOSX_APP_INSTALL_PREFIX=${destroot}${applications_dir} \
</span><del>- -DZLIB_LIBRARY_RELEASE=${prefix}/lib/libz.dylib \
</del><span class="cx"> -DBUILD_SHARED_LIBS:BOOL=ON
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span><span class="lines">@@ -79,9 +82,25 @@
</span><span class="cx"> # DPARAVIEW_DO_UNIX_STYLE_INSTALLS:BOOL=ON
</span><span class="cx"> #configure.cxxflags-append -DUSE_INTERP_ERRORLINE
</span><span class="cx">
</span><del>-compilers.choose cxx cc fc
</del><ins>+compilers.choose fc
</ins><span class="cx"> mpi.setup default
</span><span class="cx">
</span><ins>+# no compilers.choose cc cxx because:
+# gcc6,7 C compiler fails with:
+#:info:build In file included from /usr/include/dispatch/dispatch.h:51:0,
+#:info:build from /System/Library/Frameworks/CoreFoundation.framework/Headers/CFStream.h:15,
+#:info:build from /System/Library/Frameworks/CoreFoundation.framework/Headers/CFPropertyList.h:13,
+#:info:build from /System/Library/Frameworks/CoreFoundation.framework/Headers/CoreFoundation.h:55,
+#:info:build from /System/Library/Frameworks/CoreServices.framework/Headers/CoreServices.h:19,
+#:info:build from /opt/local/var/macports/build/_Users_dstrubbe_Software_MacPorts_macports-trunk_dports_science_paraview/paraview/work/ParaView-v5.0.1-source/VTK/ThirdParty/freetype/vtkfreetype/src/base/ftmac.c:100,
+#:info:build from /opt/local/var/macports/build/_Users_dstrubbe_Software_MacPorts_macports-trunk_dports_science_paraview/paraview/work/ParaView-v5.0.1-source/VTK/ThirdParty/freetype/vtkfreetype/src/base/ftbase.c:38:
+#:info:build /usr/include/dispatch/object.h:143:15: error: expected identifier or '(' before '^' token
+#:info:build typedef void (^dispatch_block_t)(void);
+#:info:build ^
+#:info:build /usr/include/dispatch/object.h:362:3: error: unknown type name 'dispatch_block_t'
+#:info:build dispatch_block_t notification_block);
+#:info:build ^~~~~~~~~~~~~~~~
+
</ins><span class="cx"> # I do not understand why, but the default "destroot" makes a mess of things;
</span><span class="cx"> # even setting full path of MACOSX_APP_INSTALL_PREFIX above and an empty
</span><span class="cx"> # DESTDIR does not work; JJS 12/21/15
</span><span class="lines">@@ -117,6 +136,8 @@
</span><span class="cx"> default_variants-append +python27
</span><span class="cx"> #+ffmpeg
</span><span class="cx">
</span><del>-livecheck.type none
</del><ins>+livecheck.type regex
+livecheck.url ${homepage}
+livecheck.regex ParaView (\[0-9.\]+)
</ins><span class="cx">
</span><span class="cx"> test.run yes
</span></span></pre></div>
<a id="trunkdportsscienceparaviewfilespatchThirdPartyIceTvtkicetCMakeListstxtdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/paraview/files/patch-ThirdParty-IceT-vtkicet-CMakeLists.txt.diff (0 => 149230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/paraview/files/patch-ThirdParty-IceT-vtkicet-CMakeLists.txt.diff (rev 0)
+++ trunk/dports/science/paraview/files/patch-ThirdParty-IceT-vtkicet-CMakeLists.txt.diff 2016-06-06 19:06:09 UTC (rev 149230)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- ThirdParty/IceT/vtkicet/CMakeLists.txt.orig 2016-06-01 20:06:22.000000000 -0400
++++ ThirdParty/IceT/vtkicet/CMakeLists.txt 2016-06-01 20:06:30.000000000 -0400
+@@ -26,7 +26,7 @@
+ # build and install targets to point to dependent libraries that are not
+ # dependent on DYLD_LIBRARY_PATH. This variable turns that behavior on by
+ # default and also suppresses CMake policy warning 0042.
+-SET(CMAKE_MACOSX_RPATH ON)
++#SET(CMAKE_MACOSX_RPATH ON)
+
+ # Set output paths.
+ SET(LIBRARY_OUTPUT_PATH ${ICET_BINARY_DIR}/lib CACHE PATH
</ins></span></pre></div>
<a id="trunkdportsscienceparaviewfilespatchVTKCmakeGenerateExportHeadercmake"></a>
<div class="addfile"><h4>Added: trunk/dports/science/paraview/files/patch-VTK-Cmake-GenerateExportHeader.cmake (0 => 149230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/paraview/files/patch-VTK-Cmake-GenerateExportHeader.cmake (rev 0)
+++ trunk/dports/science/paraview/files/patch-VTK-Cmake-GenerateExportHeader.cmake 2016-06-06 19:06:09 UTC (rev 149230)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+--- VTK/CMake/GenerateExportHeader.cmake.orig 2016-06-01 13:33:49.000000000 -0400
++++ VTK/CMake/GenerateExportHeader.cmake 2016-06-01 13:34:26.000000000 -0400
+@@ -166,12 +166,12 @@
+ execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version
+ OUTPUT_VARIABLE _gcc_version_info
+ ERROR_VARIABLE _gcc_version_info)
+- string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
++ string(REGEX MATCH "[3-7]\\.[0-9]\\.[0-9]*"
+ _gcc_version "${_gcc_version_info}")
+ # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+ # patch level, handle this here:
+ if(NOT _gcc_version)
+- string(REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"
++ string(REGEX REPLACE ".*\\(GCC\\).*([3-7]\\.[0-9]).*" "\\1.0"
+ _gcc_version "${_gcc_version_info}")
+ endif()
+
</ins></span></pre></div>
<a id="trunkdportsscienceparaviewfilespatchVTKCmakevtkCompilerExtrascmake"></a>
<div class="addfile"><h4>Added: trunk/dports/science/paraview/files/patch-VTK-Cmake-vtkCompilerExtras.cmake (0 => 149230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/paraview/files/patch-VTK-Cmake-vtkCompilerExtras.cmake (rev 0)
+++ trunk/dports/science/paraview/files/patch-VTK-Cmake-vtkCompilerExtras.cmake 2016-06-06 19:06:09 UTC (rev 149230)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- VTK/CMake/vtkCompilerExtras.cmake.orig 2016-06-01 13:32:16.000000000 -0400
++++ VTK/CMake/vtkCompilerExtras.cmake 2016-06-01 13:35:31.000000000 -0400
+@@ -32,10 +32,10 @@
+ OUTPUT_VARIABLE _gcc_version_info
+ ERROR_VARIABLE _gcc_version_info)
+
+- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
++ string (REGEX MATCH "[3-7]\\.[0-9]\\.[0-9]*"
+ _gcc_version "${_gcc_version_info}")
+ if(NOT _gcc_version)
+- string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"
++ string (REGEX REPLACE ".*\\(GCC\\).*([3-7]\\.[0-9]).*" "\\1.0"
+ _gcc_version "${_gcc_version_info}")
+ endif()
+
</ins></span></pre>
</div>
</div>
</body>
</html>