<!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>[150671] trunk/dports/graphics/mupdf</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/150671">150671</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-07-26 08:27:14 -0700 (Tue, 26 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>mupdf: maintainer update to version 1.9a (#51912).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsmupdfPortfile">trunk/dports/graphics/mupdf/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/graphics/mupdf/files/</li>
<li><a href="#trunkdportsgraphicsmupdffilespatchMakerulesdiff">trunk/dports/graphics/mupdf/files/patch-Makerules.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsmupdfPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/mupdf/Portfile (150670 => 150671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/mupdf/Portfile 2016-07-26 13:18:42 UTC (rev 150670)
+++ trunk/dports/graphics/mupdf/Portfile 2016-07-26 15:27:14 UTC (rev 150671)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name mupdf
</span><del>-version 1.8
</del><ins>+version 1.9a
</ins><span class="cx"> categories graphics
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers gmail.com:starkhalo openmaintainer
</span><span class="lines">@@ -31,13 +31,13 @@
</span><span class="cx"> master_sites ${homepage}downloads/
</span><span class="cx"> distname ${name}-${version}-source
</span><span class="cx">
</span><del>-checksums rmd160 2708f5650f23101a66cef92b7903aafb716f9c02 \
- sha256 a2a3c64d8b24920f87cf4ea9339a25abf7388496440f13b37482d1403c33c206
</del><ins>+checksums rmd160 0cb0d098c603b16be217e42299052a928d95c3fc \
+ sha256 8015c55f4e6dd892d3c50db4f395c1e46660a10b460e2ecd180a497f55bbc4cc
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="cx"> depends_lib port:freetype \
</span><del>- port:glfw \
</del><ins>+ port:harfbuzz \
</ins><span class="cx"> port:jbig2dec \
</span><span class="cx"> port:jpeg \
</span><span class="cx"> port:mesa \
</span><span class="lines">@@ -47,52 +47,40 @@
</span><span class="cx"> port:xorg-libXrandr \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><ins>+patchfiles patch-Makerules.diff
+
</ins><span class="cx"> use_configure no
</span><span class="cx">
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span><del>-# When not using the bundled copies, we have to tell mupdf's build system where
-# to find the headers
-configure.cflags-append \
- -I${prefix}/include/freetype2
-
</del><span class="cx"> build.args PREFIX=${prefix}
</span><span class="cx"> build.args-append CC=${configure.cc} \
</span><span class="cx"> CXX=${configure.cxx} \
</span><del>- CPP=${configure.cpp}
-
-build.env CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
</del><ins>+ CPP=${configure.cpp} \
+ XCFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+ XLIBS="${configure.ldflags} [get_canonical_archflags ld]" \
</ins><span class="cx"> build=release \
</span><span class="cx"> verbose=yes
</span><span class="cx">
</span><del>-eval destroot.env ${build.env}
-
</del><span class="cx"> destroot.destdir prefix=${destroot}${prefix}
</span><span class="cx">
</span><ins>+variant glfw description {OpenGL viewer} {
+ build.args-append HAVE_GLFW=yes
+}
+
</ins><span class="cx"> post-extract {
</span><ins>+# delete thirdparty software other than mujs and openjpeg
</ins><span class="cx"> delete ${worksrcpath}/thirdparty/curl
</span><span class="cx"> delete ${worksrcpath}/thirdparty/freetype
</span><del>- delete ${worksrcpath}/thirdparty/glfw
</del><ins>+ delete ${worksrcpath}/thirdparty/harfbuzz
</ins><span class="cx"> delete ${worksrcpath}/thirdparty/jbig2dec
</span><span class="cx"> delete ${worksrcpath}/thirdparty/jpeg
</span><del>- # Got compile errors with openjpeg-2.1 and openjpeg-1.5
- #delete ${worksrcpath}/thirdparty/openjpeg
</del><span class="cx"> delete ${worksrcpath}/thirdparty/zlib
</span><ins>+ if {![variant_isset glfw]} {
+ delete ${worksrcpath}/thirdparty/glfw
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-post-destroot {
-# mupdf has its own javascript interpreter which is maintained in a separate
-# repository (git://git.ghostscript.com/mujs.git) but shipped with the source
-# code as a third-party library. Since there hasn't been a versioned release of
-# it yet and `mujs' is developed especially for mupdf it will be installed via
-# post-destroot.
- set libdir ${destroot}${prefix}/lib
- xinstall -m 644 -W ${worksrcpath} \
- build/release/libmujs.a \
- ${libdir}
-}
-
</del><span class="cx"> # https://trac.macports.org/ticket/33240
</span><span class="cx"> # Mac OS X Tiger has an old version of `make`, needs to use GNU make
</span><span class="cx"> platform darwin 8 {
</span></span></pre></div>
<a id="trunkdportsgraphicsmupdffilespatchMakerulesdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/mupdf/files/patch-Makerules.diff (0 => 150671)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/mupdf/files/patch-Makerules.diff (rev 0)
+++ trunk/dports/graphics/mupdf/files/patch-Makerules.diff 2016-07-26 15:27:14 UTC (rev 150671)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+--- Makerules.orig 2016-07-25 12:09:24.000000000 -0500
++++ Makerules 2016-07-25 11:58:29.000000000 -0500
+@@ -65,20 +65,22 @@
+
+ SYS_CURL_DEPS = -lpthread
+
+-SYS_X11_CFLAGS = -I/usr/X11R6/include
+-SYS_X11_LIBS = -L/usr/X11R6/lib -lX11 -lXext
++SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext)
++SYS_X11_LIBS = $(shell pkg-config --libs x11 xext)
+
+-SYS_FREETYPE_CFLAGS = $(shell freetype-config --cflags)
+-SYS_FREETYPE_LIBS = $(shell freetype-config --libs)
++SYS_FREETYPE_CFLAGS = $(shell pkg-config --cflags freetype2)
++SYS_FREETYPE_LIBS = $(shell pkg-config --libs freetype2)
+ SYS_OPENJPEG_LIBS = -lopenjpeg
++SYS_HARFBUZZ_CFLAGS = $(shell pkg-config --cflags harfbuzz)
++SYS_HARFBUZZ_LIBS = $(shell pkg-config --libs harfbuzz)
+ SYS_JBIG2DEC_LIBS = -ljbig2dec
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz
+
+-CC = xcrun cc
+-AR = xcrun ar
+-LD = xcrun ld
+-RANLIB_CMD = xcrun ranlib $@
++CC = cc
++AR = ar
++LD = ld
++RANLIB_CMD = ranlib $@
+
+ # Linux uses pkg-config for system libraries.
+ else ifeq "$(OS)" "Linux"
</ins></span></pre>
</div>
</div>
</body>
</html>