<!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>[121585] users/mojca/ports/math/gnuplot/Portfile</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/121585">121585</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-07-01 10:09:12 -0700 (Tue, 01 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mojca/gnuplot: add support for qt5 + some minor changes</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersmojcaportsmathgnuplotPortfile">users/mojca/ports/math/gnuplot/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersmojcaportsmathgnuplotPortfile"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/math/gnuplot/Portfile (121584 => 121585)</h4>
<pre class="diff"><span>
<span class="info">--- users/mojca/ports/math/gnuplot/Portfile 2014-07-01 17:06:28 UTC (rev 121584)
+++ users/mojca/ports/math/gnuplot/Portfile 2014-07-01 17:09:12 UTC (rev 121585)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> port:gd2 \
</span><span class="cx"> port:jpeg \
</span><span class="cx"> port:libcaca \
</span><ins>+ port:libcerf \
</ins><span class="cx"> port:libiconv \
</span><span class="cx"> port:libpng \
</span><span class="cx"> port:ncurses \
</span><span class="lines">@@ -50,8 +51,8 @@
</span><span class="cx"> minimum_xcodeversions {9 3.1}
</span><span class="cx">
</span><span class="cx"> configure.args --with-readline=${prefix} \
</span><ins>+ --with-caca=${prefix} \
</ins><span class="cx"> --with-gd=${prefix} \
</span><del>- --with-caca=${prefix} \
</del><span class="cx"> --without-aquaterm \
</span><span class="cx"> --without-x \
</span><span class="cx"> --infodir='\${prefix}/share/info' \
</span><span class="lines">@@ -97,7 +98,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant pangocairo description "Enable cairo-based terminals" {
</span><del>- depends_lib-append path:lib/pkgconfig/pango.pc:pango
</del><span class="cx"> configure.args-delete --without-cairo
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> variant wxwidgets description "Enable wxt terminal" {
</span><span class="cx"> wxWidgets.use wxWidgets-3.0
</span><del>- depends_lib-append port:${wxWidgets.port} path:lib/pkgconfig/pango.pc:pango
</del><ins>+ depends_lib-append port:${wxWidgets.port}
</ins><span class="cx"> configure.args-delete --disable-wxwidgets
</span><span class="cx"> configure.args-append --with-wx=${wxWidgets.wxdir}
</span><span class="cx"> }
</span><span class="lines">@@ -117,11 +117,25 @@
</span><span class="cx"> variant wxwidgets30 description "Legacy compatibility variant" {}
</span><span class="cx"> variant wxwidgets_devel description "Legacy compatibility variant" {}
</span><span class="cx">
</span><del>-variant qt description "Enable qt terminal" {
</del><ins>+variant qt conflicts qt5 description "Enable qt terminal with Qt 4" {
</ins><span class="cx"> depends_lib-append port:qt4-mac
</span><span class="cx"> configure.args-replace --without-qt --with-qt=qt4
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant qt5 conflicts qt description "Enable qt terminal with Qt 5" {
+ depends_lib-append port:qt5-mac
+ # TODO: this is a workaround for a bug, either in gnuplot or in qt5 packaging on Mac
+ configure.ldflags-append "-F${frameworks_dir}"
+ configure.cxxflags-append "-F${frameworks_dir}" \
+ "-I${frameworks_dir}/QtCore.framework/Versions/5/Headers" \
+ "-I${frameworks_dir}/QtGui.framework/Versions/5/Headers" \
+ "-I${frameworks_dir}/QtNetwork.framework/Versions/5/Headers" \
+ "-I${frameworks_dir}/QtSvg.framework/Versions/5/Headers" \
+ "-I${frameworks_dir}/QtWidgets.framework/Versions/5/Headers"
+
+ configure.args-replace --without-qt --with-qt=qt5
+}
+
</ins><span class="cx"> # Ideally one would enable just PMB by default, but '--with-bitmap-terminals'
</span><span class="cx"> # enables lots of other obsolete terminals which clutter the output of 'set term'.
</span><span class="cx"> variant old_bitmap_terminals description "Enable PBM (Portable Bit Map) and other older bitmap terminals" {
</span><span class="lines">@@ -135,6 +149,10 @@
</span><span class="cx"> default_variants-append +wxwidgets
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if {[variant_isset pangocairo] || [variant_isset wxwidgets]} {
+ depends_lib-append path:lib/pkgconfig/pango.pc:pango
+}
+
</ins><span class="cx"> # Building and installing TeX macro files for TikZ could/should be done by gnuplot's Makefile,
</span><span class="cx"> # but without a patch that would require a dependency on texlive.
</span><span class="cx"> # Apart from that the files would fly to the wrong place in TDS,
</span><span class="lines">@@ -142,14 +160,14 @@
</span><span class="cx"> # So we 'manually' generate and copy the necessary files.
</span><span class="cx"> post-build {
</span><span class="cx"> if {[variant_isset luaterm]} {
</span><del>- system -W ${workpath}/${distname}/share/LaTeX "${prefix}/bin/lua ../../term/lua/gnuplot-tikz.lua style"
</del><ins>+ system -W ${worksrcpath}/share/LaTeX "${prefix}/bin/lua ../../term/lua/gnuplot-tikz.lua style"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> if {[variant_isset luaterm]} {
</span><span class="cx"> set texmf ${destroot}${texlive_texmfports}
</span><del>- set luadir ${workpath}/${distname}/share/LaTeX
</del><ins>+ set luadir ${worksrcpath}/share/LaTeX
</ins><span class="cx"> xinstall -d -m 0755 ${texmf}/tex/context/third/gnuplot-lua-tikz
</span><span class="cx"> xinstall -d -m 0755 ${texmf}/tex/generic/gnuplot-lua-tikz
</span><span class="cx"> xinstall -d -m 0755 ${texmf}/tex/latex/gnuplot-lua-tikz
</span><span class="lines">@@ -163,10 +181,10 @@
</span><span class="cx">
</span><span class="cx"> set destdocdir ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> xinstall -d -m 0755 ${destdocdir}
</span><del>- xinstall -m 0644 ${workpath}/${distname}/docs/${name}.pdf ${destdocdir}
</del><ins>+ xinstall -m 0644 ${worksrcpath}/docs/${name}.pdf ${destdocdir}
</ins><span class="cx">
</span><span class="cx"> # copy demo files
</span><del>- file copy ${workpath}/${distname}/demo ${destdocdir}
</del><ins>+ file copy ${worksrcpath}/demo ${destdocdir}
</ins><span class="cx"> foreach {makefile} {Makefile Makefile.in Makefile.am Makefile.am.in} {
</span><span class="cx"> delete ${destdocdir}/demo/${makefile}
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>