<!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>[129594] trunk/dports/graphics/qiv</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/129594">129594</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-12-16 11:19:38 -0800 (Tue, 16 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>qiv: update to 2.3.1; fix build failure with clang (#43951); use get_canonical_archflags</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicsqivPortfile">trunk/dports/graphics/qiv/Portfile</a></li>
<li><a href="#trunkdportsgraphicsqivfilespatchMakefilediff">trunk/dports/graphics/qiv/files/patch-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicsqivPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/qiv/Portfile (129593 => 129594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/qiv/Portfile 2014-12-16 18:42:36 UTC (rev 129593)
+++ trunk/dports/graphics/qiv/Portfile 2014-12-16 19:19:38 UTC (rev 129594)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name qiv
</span><del>-version 2.2.3
-revision 2
</del><ins>+version 2.3.1
</ins><span class="cx"> categories graphics
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers hilaiel.com:lloyd
</span><span class="lines">@@ -19,8 +18,8 @@
</span><span class="cx"> master_sites ${homepage}download/
</span><span class="cx"> extract.suffix .tgz
</span><span class="cx">
</span><del>-checksums sha1 0bf8cc9a7d8bdad6bbe9e6ba970890da902a27c8 \
- rmd160 b52168e67e6b8c65c924b4642944aa592f0bb4a0
</del><ins>+checksums rmd160 04a128a3eb96f68c2465e457ab661e0d2d1be8c0 \
+ sha256 675396b539e6511135fe73c867f9fdd6d912c24c7562797cb047c27d0c2c8ee6
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx"> depends_lib port:imlib2 port:file port:gtk2
</span><span class="lines">@@ -34,13 +33,8 @@
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><span class="cx"> variant universal {}
</span><del>-if {[variant_isset universal]} {
- set archflags ${configure.universal_cflags}
-} else {
- set archflags ${configure.cc_archflags}
-}
</del><span class="cx">
</span><del>-build.args CC="${configure.cc} ${archflags}"
</del><ins>+build.args CC="${configure.cc} [get_canonical_archflags cc]"
</ins><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url [lindex ${master_sites} 0]
</span></span></pre></div>
<a id="trunkdportsgraphicsqivfilespatchMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/qiv/files/patch-Makefile.diff (129593 => 129594)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/qiv/files/patch-Makefile.diff 2014-12-16 18:42:36 UTC (rev 129593)
+++ trunk/dports/graphics/qiv/files/patch-Makefile.diff 2014-12-16 19:19:38 UTC (rev 129594)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- Makefile.orig 2010-01-10 15:39:08.000000000 -0600
-+++ Makefile 2011-03-29 02:30:01.000000000 -0500
</del><ins>+--- Makefile.orig 2013-12-19 18:50:37.000000000 -0600
++++ Makefile 2014-12-16 13:07:24.000000000 -0600
</ins><span class="cx"> @@ -4,7 +4,7 @@
</span><span class="cx"> #######################################################################
</span><span class="cx">
</span><span class="lines">@@ -8,18 +8,44 @@
</span><span class="cx"> +PREFIX = $(DESTDIR)@PREFIX@
</span><span class="cx">
</span><span class="cx"> # Font to use for statusbar in fullscreen mode
</span><del>- STATUSBAR_FONT = "fixed"
-@@ -127,9 +127,11 @@
-
- install: $(PROGRAM)
- @echo "Installing QIV..."
-+ mkdir -p $(PREFIX)/bin
</del><ins>+ STATUSBAR_FONT = "Monospace 9"
+@@ -52,8 +52,7 @@
+ CC = gcc
+ #CFLAGS = -O0 -g -Wall
+ CFLAGS = -O2 -Wall \
+- -fcaller-saves -ffast-math -fno-strength-reduce \
+- -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
++ -ffast-math -fno-strength-reduce
+ #CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \
+ # -fcaller-saves -ffast-math -fno-strength-reduce \
+ # -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
+@@ -143,12 +142,12 @@
+ echo install -d -m 0755 $(PREFIX)/bin; \
+ fi
</ins><span class="cx"> install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
</span><ins>+- @if [ ! -e $(PREFIX)/man/man1 ]; then \
+- echo install -d -m 0755 $(PREFIX)/man/man1; \
+- install -d -m 0755 $(PREFIX)/man/man1; \
++ @if [ ! -e $(PREFIX)/share/man/man1 ]; then \
++ echo install -d -m 0755 $(PREFIX)/share/man/man1; \
++ install -d -m 0755 $(PREFIX)/share/man/man1; \
+ fi
</ins><span class="cx"> - install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
</span><span class="cx"> - $(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
</span><del>-+ mkdir -p $(PREFIX)/share/man/man1
</del><span class="cx"> + install -m 0644 $(PROGRAM).1 $(PREFIX)/share/man/man1
</span><span class="cx"> + $(COMPRESS_PROG) $(PREFIX)/share/man/man1/$(PROGRAM).1
</span><del>- @if ./qiv -f ./intro.jpg ; \
- then echo "-- Test Passed --" ; \
- else echo "-- Test Failed --" ; \
</del><ins>+ @if [ ! -e $(PREFIX)/share/pixmaps ]; then \
+ echo install -d -m 0755 $(PREFIX)/share/pixmaps; \
+ install -d -m 0755 $(PREFIX)/share/pixmaps; \
+@@ -159,10 +158,7 @@
+ install -d -m 0755 $(PREFIX)/share/applications; \
+ fi
+ install -m 0644 qiv.desktop $(PREFIX)/share/applications/qiv.desktop
+- @if ./qiv -f ./intro.jpg ; \
+- then echo "-- Test Passed --" ; \
+- else echo "-- Test Failed --" ; \
+- fi
++ @echo "-- Test Skipped --"
+ @echo "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example $(PREFIX)/bin/qiv-command\n\n"
+
+ # the end... ;-)
</ins></span></pre>
</div>
</div>
</body>
</html>