<!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>[120197] 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/120197">120197</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-05-18 21:32:45 -0700 (Sun, 18 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mupdf: fix build on Tiger again (#43614); re-enable verbose building</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsmupdfPortfile">trunk/dports/graphics/mupdf/Portfile</a></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 (120196 => 120197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/mupdf/Portfile 2014-05-19 03:27:20 UTC (rev 120196)
+++ trunk/dports/graphics/mupdf/Portfile 2014-05-19 04:32:45 UTC (rev 120197)
</span><span class="lines">@@ -34,8 +34,6 @@
</span><span class="cx"> checksums rmd160 368140a0f825483268faaf778328bc6c3f4d461f \
</span><span class="cx"> sha256 018bab9520b5e93bb33ab07b0472fdf9f768c5801769f95b9a696941b633ec22
</span><span class="cx">
</span><del>-use_configure no
-
</del><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="cx"> depends_lib port:freetype \
</span><span class="lines">@@ -45,16 +43,33 @@
</span><span class="cx"> port:xorg-libXext \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><ins>+patchfiles patch-Makerules.diff
+
+use_configure no
+
+variant universal {}
+
</ins><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><span class="cx"> CPP=${configure.cpp}
</span><del>-build.env build=release \
- HAVE_CURL=no \
- verbose=1
</del><span class="cx">
</span><ins>+build.env CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" \
+ build=release \
+ verbose=yes
+
+eval destroot.env ${build.env}
+
</ins><span class="cx"> destroot.destdir prefix=${destroot}${prefix}
</span><span class="cx">
</span><ins>+# https://trac.macports.org/ticket/33240
+# Mac OS X Tiger has an old version of `make`, needs to use GNU make
+platform darwin 8 {
+ depends_build-append port:gmake
+ build.cmd ${prefix}/bin/gmake
+}
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${master_sites}
</span><span class="cx"> livecheck.regex ${name}-(\\d\\.\\d)-source
</span></span></pre></div>
<a id="trunkdportsgraphicsmupdffilespatchMakerulesdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/mupdf/files/patch-Makerules.diff (120196 => 120197)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/mupdf/files/patch-Makerules.diff 2014-05-19 03:27:20 UTC (rev 120196)
+++ trunk/dports/graphics/mupdf/files/patch-Makerules.diff 2014-05-19 04:32:45 UTC (rev 120197)
</span><span class="lines">@@ -1,28 +1,25 @@
</span><del>---- Makerules 2014-05-07 14:06:40.000000000 -0500
-+++ /Users/harciga/dev/ports/graphics/mupdf/work/mupdf-1.4-source/Makerules 2014-04-11 10:10:41.000000000 -0500
-@@ -14,7 +14,6 @@
</del><ins>+--- /opt/local/var/macports/build/_Users_harciga_dev_ports_graphics_mupdf/mupdf/work/mupdf-1.4-source/Makerules 2014-04-11 10:10:41.000000000 -0500
++++ Makerules 2014-05-12 13:10:56.000000000 -0500
+@@ -14,6 +14,7 @@
</ins><span class="cx"> LDFLAGS += -pg
</span><span class="cx"> else ifeq "$(build)" "release"
</span><span class="cx"> CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
</span><del>--LDFLAGS += -fPIC
</del><ins>++LDFLAGS += -fPIC -fno-common
</ins><span class="cx"> else ifeq "$(build)" "coverage"
</span><span class="cx"> CFLAGS += -pipe -g -DDEBUG -pg -fprofile-arcs -ftest-coverage
</span><span class="cx"> LIBS += -lgcov
</span><del>-@@ -30,7 +29,7 @@
- ifeq "$(OS)" "MINGW"
</del><ins>+@@ -48,10 +49,10 @@
+ SYS_JPEG_LIBS = -ljpeg
+ SYS_ZLIB_LIBS = -lz
</ins><span class="cx">
</span><del>- # Mac OS X doesn't have pkg-config so we hard code paths.
--else ifeq "$(OS)" "SKIP"
-+else ifeq "$(OS)" "MACOS"
</del><ins>+-CC = xcrun cc
+-AR = xcrun ar
+-LD = xcrun ld
+-RANLIB_CMD = xcrun ranlib $@
++CC = cc
++AR = ar
++LD = ld
++RANLIB_CMD = ranlib $@
</ins><span class="cx">
</span><del>- HAVE_X11 ?= yes
-
-@@ -55,7 +54,7 @@
- RANLIB_CMD = xcrun ranlib $@
-
</del><span class="cx"> # Linux uses pkg-config for system libraries.
</span><del>--else ifeq (,$(filter $(OS), "Linux MACOS"))
-+else ifeq "$(OS)" "Linux"
-
- HAVE_X11 ?= yes
-
</del><ins>+ else ifeq "$(OS)" "Linux"
</ins></span></pre>
</div>
</div>
</body>
</html>