<!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>[115965] 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/115965">115965</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-01-15 08:31:13 -0800 (Wed, 15 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>poppler: general overhaul.
* update to version 0.24.5, ABI compatible with previous version
* update dependencies, configuration
* remove variant +doc which has absolutely no effect on installed content
* remove variant +quartz, poppler is quartz/x11 agnostic
* remove theoretical support for broken qt4-x11
* replace variant +qt4 with new subport poppler-qt4-mac which depends on
poppler and adds the additional poppler bindings for qt4-mac (#38350).
* framework in place to support bindings for qt4-x11, qt5 as additional subports
if and when those ports become availabe.</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 (115964 => 115965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/poppler/Portfile 2014-01-15 15:44:52 UTC (rev 115964)
+++ trunk/dports/graphics/poppler/Portfile 2014-01-15 16:31:13 UTC (rev 115965)
</span><span class="lines">@@ -7,8 +7,7 @@
</span><span class="cx">
</span><span class="cx"> name poppler
</span><span class="cx"> conflicts pdf2json xpdf-tools
</span><del>-version 0.24.4
-revision 1
</del><ins>+version 0.24.5
</ins><span class="cx"> license GPL-2+
</span><span class="cx"> maintainers devans openmaintainer
</span><span class="cx"> categories graphics
</span><span class="lines">@@ -23,8 +22,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 2a71b7da5562e1ac655c9591812551f3fbfe6fe9 \
- sha256 c8a3509a17e6f0bbb07eeb1b58276b485974a8bff3f5eef1bc8e150ccd7c01e2
</del><ins>+checksums rmd160 34a017f79e624091a62845beb26b3f81fb971645 \
+ sha256 a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -34,6 +33,7 @@
</span><span class="cx"> port:fontconfig \
</span><span class="cx"> port:freetype \
</span><span class="cx"> port:gobject-introspection \
</span><ins>+ port:jpeg \
</ins><span class="cx"> path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span class="cx"> path:lib/pkgconfig/cairo.pc:cairo \
</span><span class="cx"> port:lcms2 \
</span><span class="lines">@@ -43,13 +43,6 @@
</span><span class="cx"> port:tiff \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><del>-post-patch {
- reinplace "s|\$includedir|${prefix}/include|g" \
- ${worksrcpath}/configure
- reinplace "s|tests||" \
- ${worksrcpath}/qt4/Makefile.in
-}
-
</del><span class="cx"> # Generate newer libtool that passes -stdlib when linking dylibs.
</span><span class="cx"> use_autoreconf yes
</span><span class="cx"> autoreconf.args -fvi
</span><span class="lines">@@ -57,12 +50,12 @@
</span><span class="cx"> compiler.blacklist {gcc-4.0 < 5493}
</span><span class="cx">
</span><span class="cx"> configure.args --disable-poppler-qt4 \
</span><ins>+ --disable-poppler-qt5 \
</ins><span class="cx"> --disable-gtk-test \
</span><span class="cx"> --disable-silent-rules \
</span><span class="cx"> --enable-xpdf-headers \
</span><span class="cx"> --enable-zlib \
</span><span class="cx"> --enable-libcurl \
</span><del>- --enable-poppler-glib \
</del><span class="cx"> --enable-introspection=yes
</span><span class="cx">
</span><span class="cx"> # gobject-introspection uses g-ir-scanner, which uses $CC from env
</span><span class="lines">@@ -75,35 +68,33 @@
</span><span class="cx"> build.args-append CC="${configure.cc} ${configure.cc_archflags}"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant quartz {
- configure.args-append --without-x
-}
</del><ins>+# TODO:
+# add subport for poppler-qt4-x11 when qt4-x11 builds and port group qt4 allows
+# add subport(s) for poppler-qt5-* when a qt5 port is available
</ins><span class="cx">
</span><del>-if {![variant_isset quartz]} {
- if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
- configure.args-append --x-includes=${prefix}/include \
- --x-libraries=${prefix}/lib
- }
-}
-
-variant qt4 description { Support for the QT4 toolkit } {
</del><ins>+subport poppler-qt4-mac {
+ PortGroup qt4 1.0
+ depends_lib-append port:poppler
</ins><span class="cx"> configure.args-delete --disable-poppler-qt4
</span><del>- if ([variant_isset quartz]) {
- PortGroup qt4 1.0
- } else {
- depends_lib-append port:qt4-x11
- set qt_dir ${prefix}/libexec/qt4-x11
- configure.env-append QTDIR=${qt_dir}
- set env(PATH) "${qt_dir}/bin:$env(PATH)"
- configure.pkg_config_path ${qt_dir}/lib/pkgconfig
</del><ins>+ configure.args-append --disable-splash-output \
+ --disable-cairo-output \
+ --disable-poppler-glib \
+ --disable-poppler-cpp \
+ --disable-utils
+ post-destroot {
+ foreach dot_h [glob -nocomplain -directory ${destroot}${prefix}/include/poppler *.h] {
+ delete $dot_h
+ }
+ delete ${destroot}${prefix}/include/poppler/fofi \
+ ${destroot}${prefix}/include/poppler/goo \
+ ${destroot}${prefix}/lib/libpoppler.44.dylib \
+ ${destroot}${prefix}/lib/libpoppler.a \
+ ${destroot}${prefix}/lib/libpoppler.dylib \
+ ${destroot}${prefix}/lib/libpoppler.la \
+ ${destroot}${prefix}/lib/pkgconfig/poppler.pc
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant docs conflicts universal description {Build gtk-doc documentation} {
- depends_build-append port:gtk-doc
- configure.args-append --enable-gtk-doc
-}
-
</del><span class="cx"> platform darwin 8 {
</span><span class="cx"> # The rules enabled by gobject-introspection require GNU make 3.81+ (#39144)
</span><span class="cx"> depends_build-append port:gmake
</span></span></pre>
</div>
</div>
</body>
</html>