<!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>[140025] trunk/dports/science/plplot</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/140025">140025</a></dd>
<dt>Author</dt> <dd>takeshi@macports.org</dd>
<dt>Date</dt> <dd>2015-09-07 01:34:07 -0700 (Mon, 07 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>plplot: update to 5.11.0, closing #47958</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceplplotPortfile">trunk/dports/science/plplot/Portfile</a></li>
<li><a href="#trunkdportsscienceplplotfilespatchcmakemodulespkgconfigcmakediff">trunk/dports/science/plplot/files/patch-cmake-modules-pkg-config.cmake.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsscienceplplotfilespatchCMakeListstxtdiff">trunk/dports/science/plplot/files/patch-CMakeLists.txt.diff</a></li>
<li><a href="#trunkdportsscienceplplotfilespatchplConfighindiff">trunk/dports/science/plplot/files/patch-plConfig.h.in.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceplplotPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/plplot/Portfile (140024 => 140025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/plplot/Portfile 2015-09-07 08:21:34 UTC (rev 140024)
+++ trunk/dports/science/plplot/Portfile 2015-09-07 08:34:07 UTC (rev 140025)
</span><span class="lines">@@ -6,16 +6,15 @@
</span><span class="cx"> PortGroup wxWidgets 1.0
</span><span class="cx">
</span><span class="cx"> name plplot
</span><del>-version 5.10.0
-revision 3
</del><ins>+version 5.11.1
</ins><span class="cx"> platforms darwin
</span><span class="cx"> maintainers takeshi openmaintainer
</span><span class="cx"> categories science
</span><span class="cx"> license LGPL
</span><span class="cx"> description Scientific plotting package, double precision version
</span><span class="cx"> master_sites sourceforge
</span><del>-checksums rmd160 16e353cf410232da700d5f2edd1533006f2dc4c4 \
- sha256 d4e930b8b9d43cd1663408986218d61f166de7cbc9ef5bed111b0bdea934f9d5
</del><ins>+checksums rmd160 13d7b1ca7c532691e12f59c86e9a7a689e9e9c2f \
+ sha256 289dff828c440121e57b70538b3f0fb4056dc47159bc1819ea444321f2ff1c4c
</ins><span class="cx"> homepage http://plplot.sourceforge.net/
</span><span class="cx"> set description_base "PLplot is a cross-platform software package for \
</span><span class="cx"> creating scientific plots. To help accomplish that task it is organized as a \
</span><span class="lines">@@ -34,13 +33,13 @@
</span><span class="cx"> port:fontconfig \
</span><span class="cx"> port:freefont-ttf \
</span><span class="cx"> port:freetype \
</span><ins>+ port:libtool \
</ins><span class="cx"> port:libLASi \
</span><span class="cx"> port:swig-tcl \
</span><span class="cx"> port:tcl
</span><span class="cx">
</span><del>-patchfiles patch-CMakeLists.txt.diff \
- patch-plConfig.h.in.diff \
- patch-cmake-modules-pkg-config.cmake.diff
</del><ins>+patchfiles patch-cmake-modules-pkg-config.cmake.diff
+
</ins><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|-ObjC|-ObjC -framework AquaTerm|" ${worksrcpath}/cmake/modules/aqt.cmake
</span><span class="cx"> reinplace "s|-framework AquaTerm|-F${frameworks_dir} -framework AquaTerm|" ${worksrcpath}/cmake/modules/aqt.cmake
</span><span class="lines">@@ -76,11 +75,14 @@
</span><span class="cx"> -DCMAKE_LIBRARY_PATH=${prefix}/lib \
</span><span class="cx"> -DTCL_INCLUDE_PATH=${prefix}/include \
</span><span class="cx"> -DTCL_LIBRARY=${prefix}/lib/libtcl.dylib \
</span><del>- -DFREETYPE_INCLUDE_DIR=${prefix}/include/freetype2 \
- -DFREETYPE_LIBRARY=${prefix}/lib/libfreetype.dylib \
</del><ins>+ -DFREETYPE_INCLUDE_DIR_ft2build=${prefix}/include/freetype2 \
+ -DFREETYPE_LIBRARIES=${prefix}/lib/libfreetype.dylib \
</ins><span class="cx"> -DPL_FREETYPE_FONT_PATH=${prefix}/share/fonts/freefont-ttf \
</span><ins>+ -DLTDL_INCLUDE_DIR=${prefix}/include \
+ -DLTDL_LIBRARY_DIR=${prefix}/lib \
</ins><span class="cx"> -DWITH_FREETYPE=ON \
</span><span class="cx"> -DQHULL_INCLUDE_DIR=${prefix}/include \
</span><ins>+ -DQHULL_LIBRARIES=${prefix}/lib/libqhull.dylib \
</ins><span class="cx"> -DPLD_aqt=OFF \
</span><span class="cx"> -DPLD_extcairo=ON \
</span><span class="cx"> -DPLD_memcairo=ON \
</span><span class="lines">@@ -127,8 +129,7 @@
</span><span class="cx"> -DENABLE_wxwidgets=OFF \
</span><span class="cx"> -DBUILD_TEST=OFF \
</span><span class="cx"> -DHAVE_AGG=OFF \
</span><del>- -DSWIG_DIR=${prefix}/bin \
- -DPLPLOT_HAVE_CONFIG_H=ON
</del><ins>+ -DSWIG_DIR=${prefix}/bin
</ins><span class="cx"> configure.post_args ../${distname}
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span></span></pre></div>
<a id="trunkdportsscienceplplotfilespatchCMakeListstxtdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/plplot/files/patch-CMakeLists.txt.diff (140024 => 140025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/plplot/files/patch-CMakeLists.txt.diff 2015-09-07 08:21:34 UTC (rev 140024)
+++ trunk/dports/science/plplot/files/patch-CMakeLists.txt.diff 2015-09-07 08:34:07 UTC (rev 140025)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- CMakeLists.txt.orig 2013-12-30 05:11:07.000000000 +0900
-+++ CMakeLists.txt 2014-06-11 08:53:10.000000000 +0900
-@@ -125,7 +125,7 @@
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_config.h
- )
- # Allow access to the generated plplot_config.h for this build.
--add_definitions("-DHAVE_CONFIG_H")
-+add_definitions("-DPLPLOT_HAVE_CONFIG_H")
- # Install top-level files
-
- # Enable testing framework for examples
</del></span></pre></div>
<a id="trunkdportsscienceplplotfilespatchcmakemodulespkgconfigcmakediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/plplot/files/patch-cmake-modules-pkg-config.cmake.diff (140024 => 140025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/plplot/files/patch-cmake-modules-pkg-config.cmake.diff 2015-09-07 08:21:34 UTC (rev 140024)
+++ trunk/dports/science/plplot/files/patch-cmake-modules-pkg-config.cmake.diff 2015-09-07 08:34:07 UTC (rev 140025)
</span><span class="lines">@@ -1,16 +1,11 @@
</span><del>---- cmake/modules/pkg-config.cmake.orig 2014-02-06 14:06:07.000000000 +0900
-+++ cmake/modules/pkg-config.cmake 2015-03-01 22:14:10.000000000 +0900
-@@ -94,7 +94,12 @@
- set(_xprefix ${_prefix})
- endif(FORCE_EXTERNAL_STATIC)
-
-- _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-+ if(CMAKE_VERSION VERSION_LESS "3.1")
-+ _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-+ else(CMAKE_VERSION VERSION_LESS "3.1")
-+ _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
-+ endif(CMAKE_VERSION VERSION_LESS "3.1")
-+
- if(${_prefix}_FOUND)
- cmake_link_flags(${_link_FLAGS} "${${_xprefix}_LDFLAGS}")
- # If libraries cannot be not found, then that is equivalent to whole
</del><ins>+--- cmake/modules/pkg-config.cmake.orig 2015-08-13 02:35:27.000000000 +0900
++++ cmake/modules/pkg-config.cmake 2015-09-07 16:02:00.000000000 +0900
+@@ -228,7 +228,7 @@
+ "/System/Library/Frameworks/([^ ]*)\\.framework"
+ "-framework \\1"
+ link_flags
+- ${link_flags}
++ "${link_flags}"
+ )
+ #message("(frameworks) link_flags = ${link_flags}")
+ endif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
</ins></span></pre></div>
<a id="trunkdportsscienceplplotfilespatchplConfighindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/plplot/files/patch-plConfig.h.in.diff (140024 => 140025)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/plplot/files/patch-plConfig.h.in.diff 2015-09-07 08:21:34 UTC (rev 140024)
+++ trunk/dports/science/plplot/files/patch-plConfig.h.in.diff 2015-09-07 08:34:07 UTC (rev 140025)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- include/plConfig.h.in.orig 2013-12-30 05:11:07.000000000 +0900
-+++ include/plConfig.h.in 2014-06-09 21:59:26.000000000 +0900
-@@ -44,7 +44,7 @@
- #ifndef __PLCONFIG_H__
- #define __PLCONFIG_H__
-
--#ifdef HAVE_CONFIG_H
-+#ifdef PLPLOT_HAVE_CONFIG_H
- # include <plplot_config.h>
- #endif
-
</del></span></pre>
</div>
</div>
</body>
</html>