<!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>[146564] trunk/dports/graphics/poppler/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/146564">146564</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-03-11 23:55:26 -0800 (Fri, 11 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>poppler: contributed patch, adds new subport poppler-qt5, installs in parallel with poppler and poppler-qt4-mac (#47025).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicspopplerPortfile">trunk/dports/graphics/poppler/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicspopplerPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/poppler/Portfile (146563 => 146564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/poppler/Portfile 2016-03-12 07:12:05 UTC (rev 146563)
+++ trunk/dports/graphics/poppler/Portfile 2016-03-12 07:55:26 UTC (rev 146564)
</span><span class="lines">@@ -65,15 +65,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # TODO:
</span><del>-# add subport poppler-qt4-x11 when qt4-x11 builds and port group qt4 allows
-# add subport poppler-qt5-mac when various qt5 build issues are resolved (#47025)
</del><ins>+# add subport for poppler-qt4-x11 when qt4-x11 builds and port group qt4 allows
</ins><span class="cx">
</span><span class="cx"> subport poppler-qt4-mac {
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx">
</span><ins>+ configure.env-append MOCQT4=${qt_bins_dir}/moc
</ins><span class="cx"> configure.args-delete --disable-poppler-qt4
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+subport poppler-qt5 {
+ PortGroup qt5 1.0
+
+ configure.env-append MOCQT5=${qt_bins_dir}/moc
+ configure.args-delete --disable-poppler-qt5
+}
+
</ins><span class="cx"> if {${subport} ne ${name}} {
</span><span class="cx"> depends_extract-append port:git
</span><span class="cx">
</span><span class="lines">@@ -82,14 +89,14 @@
</span><span class="cx"> post-extract {
</span><span class="cx"> system -W ${workpath} "${prefix}/bin/git clone --depth=1 http://anongit.freedesktop.org/git/poppler/test"
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> configure.args-append --disable-cairo-output \
</span><span class="cx"> --disable-poppler-glib \
</span><span class="cx"> --disable-poppler-cpp \
</span><span class="cx"> --disable-utils
</span><span class="cx">
</span><span class="cx"> # currently poppler only provides unit tests for the Qt wrappers
</span><del>-
</del><ins>+
</ins><span class="cx"> test.run yes
</span><span class="cx"> test.target check
</span><span class="cx">
</span><span class="lines">@@ -97,13 +104,12 @@
</span><span class="cx"> foreach dot_h [glob -nocomplain -directory ${destroot}${prefix}/include/poppler *.h] {
</span><span class="cx"> delete $dot_h
</span><span class="cx"> }
</span><ins>+ foreach libpoppler [glob -nocomplain ${destroot}${prefix}/lib/libpoppler.*] {
+ delete ${libpoppler}
+ }
</ins><span class="cx"> delete ${destroot}${prefix}/include/poppler/fofi \
</span><span class="cx"> ${destroot}${prefix}/include/poppler/goo \
</span><span class="cx"> ${destroot}${prefix}/include/poppler/splash \
</span><del>- ${destroot}${prefix}/lib/libpoppler.58.dylib \
- ${destroot}${prefix}/lib/libpoppler.a \
- ${destroot}${prefix}/lib/libpoppler.dylib \
- ${destroot}${prefix}/lib/libpoppler.la \
</del><span class="cx"> ${destroot}${prefix}/lib/pkgconfig/poppler-splash.pc \
</span><span class="cx"> ${destroot}${prefix}/lib/pkgconfig/poppler.pc
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>