<!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>[115907] trunk/dports/graphics/openjpeg15</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/115907">115907</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-01-13 20:20:35 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>openjpeg15: check only for unversioned (current) libpng, not old libpng versions (#42060)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsopenjpeg15Portfile">trunk/dports/graphics/openjpeg15/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsopenjpeg15filespatchconfigureacdiff">trunk/dports/graphics/openjpeg15/files/patch-configure.ac.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsopenjpeg15Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/openjpeg15/Portfile (115906 => 115907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/openjpeg15/Portfile 2014-01-14 04:03:50 UTC (rev 115906)
+++ trunk/dports/graphics/openjpeg15/Portfile 2014-01-14 04:20:35 UTC (rev 115907)
</span><span class="lines">@@ -27,7 +27,8 @@
</span><span class="cx"> checksums rmd160 ffa85dbb0a3ba1545bc6974f4950f466789c04ef \
</span><span class="cx"> sha256 c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace
</span><span class="cx">
</span><del>-patchfiles patch-remove-t1_generate_luts.c-causing-main-symbol.diff
</del><ins>+patchfiles patch-configure.ac.diff \
+ patch-remove-t1_generate_luts.c-causing-main-symbol.diff
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx">
</span><span class="lines">@@ -37,6 +38,8 @@
</span><span class="cx"> port:zlib \
</span><span class="cx"> port:jbigkit
</span><span class="cx">
</span><ins>+use_autoconf yes
+
</ins><span class="cx"> pre-activate {
</span><span class="cx"> # openjpeg < 1.5.0 accidentally installed items directly into
</span><span class="cx"> # ${prefix}/share/man bypassing ${destroot}; remove them if found.
</span></span></pre></div>
<a id="trunkdportsgraphicsopenjpeg15filespatchconfigureacdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/openjpeg15/files/patch-configure.ac.diff (0 => 115907)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/openjpeg15/files/patch-configure.ac.diff (rev 0)
+++ trunk/dports/graphics/openjpeg15/files/patch-configure.ac.diff 2014-01-14 04:20:35 UTC (rev 115907)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+--- configure.ac.orig 2012-02-07 04:49:55.000000000 -0600
++++ configure.ac 2014-01-13 22:16:05.000000000 -0600
+@@ -197,21 +197,9 @@
+
+ if test "x${want_png}" = "xyes" ; then
+
+- PKG_CHECK_MODULES([PNG], [libpng15 zlib],
+- [have_libpng="yes"],
+- [
+- PKG_CHECK_MODULES([PNG], [libpng14 zlib],
+- [have_libpng="yes"],
+- [
+- PKG_CHECK_MODULES([PNG], [libpng12 zlib],
+- [have_libpng="yes"],
+- [
+ PKG_CHECK_MODULES([PNG], [libpng zlib],
+ [have_libpng="yes"],
+ [have_libpng="no"])
+- ])
+- ])
+- ])
+
+ if ! test "x${have_libpng}" = "xyes" ; then
+
</ins></span></pre>
</div>
</div>
</body>
</html>