<!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>[127111] trunk/dports/devel/kdiff3</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/127111">127111</a></dd>
<dt>Author</dt> <dd>khindenburg@macports.org</dd>
<dt>Date</dt> <dd>2014-10-21 06:36:02 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>kdiff3: update to 0.9.98; add +kde; add maintainer #45420</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelkdiff3Portfile">trunk/dports/devel/kdiff3/Portfile</a></li>
<li><a href="#trunkdportsdevelkdiff3filespatchsrcQT4kdiff3prodiff">trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelkdiff3Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/kdiff3/Portfile (127110 => 127111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/kdiff3/Portfile 2014-10-21 09:49:39 UTC (rev 127110)
+++ trunk/dports/devel/kdiff3/Portfile 2014-10-21 13:36:02 UTC (rev 127111)
</span><span class="lines">@@ -6,10 +6,10 @@
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx">
</span><span class="cx"> name kdiff3
</span><del>-version 0.9.97
</del><ins>+version 0.9.98
</ins><span class="cx"> categories devel
</span><span class="cx"> platforms darwin
</span><del>-maintainers nomaintainer
</del><ins>+maintainers khindenburg openmaintainer
</ins><span class="cx"> license GPL-2
</span><span class="cx"> description kdiff3 is a file comparing and merging tool.
</span><span class="cx"> long_description kdiff3 compares two or three input files and shows the \
</span><span class="lines">@@ -22,37 +22,45 @@
</span><span class="cx"> homepage http://kdiff3.sourceforge.net/
</span><span class="cx"> master_sites sourceforge:project/kdiff3/kdiff3/${version}
</span><span class="cx">
</span><del>-checksums rmd160 cbbac8e0ad39fa3a2403199ceaac6239de94b83e \
- sha256 e3b716bb449c814d8c30817ec1ca23fba0ed9eee5a635e766c1f2b90ddb75a2a
</del><ins>+checksums rmd160 17fc05df3fd8f052e2010834ba8efe2481e4f434 \
+ sha256 802c1ababa02b403a5dca15955c01592997116a24909745016931537210fd668
</ins><span class="cx">
</span><del>-set worksrcpath ${worksrcpath}/src-QT4
</del><span class="cx">
</span><del>-minimum_xcodeversions {9 3.1}
</del><ins>+variant kde description {Build the KDE version} {}
</ins><span class="cx">
</span><del>-patchfiles patch-src-QT4-kdiff3.pro.diff
</del><ins>+if {[variant_isset kde]} {
+ PortGroup kde4 1.1
+ depends_lib-append port:kdelibs4
+ post-destroot {
+ ln -s ${applications_dir}/KDE4/${name}.app/Contents/MacOS/kdiff3 ${destroot}${prefix}/bin
+ }
+} else {
+ set worksrcpath ${worksrcpath}/src-QT4
+ minimum_xcodeversions {9 3.1}
+ patchfiles patch-src-QT4-kdiff3.pro.diff
+ post-patch {
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/kdiff3.pro
+ }
</ins><span class="cx">
</span><del>-post-patch {
- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/kdiff3.pro
-}
</del><ins>+# --disable-dependency-tracking is not recognized.
+ configure.universal_args-delete --disable-dependency-tracking
</ins><span class="cx">
</span><del>-# --disable-dependency-tracking is not recognized.
-configure.universal_args-delete --disable-dependency-tracking
</del><ins>+ pre-configure {
+ configure.args-append CONFIG+=\"${qt_arch_types}\"
+ }
</ins><span class="cx">
</span><del>-pre-configure {
- configure.args-append CONFIG+=\"${qt_arch_types}\"
-}
</del><ins>+ configure.cmd ${qt_qmake_cmd}
+ configure.pre_args
+ configure.post_args
</ins><span class="cx">
</span><del>-configure.cmd ${qt_qmake_cmd}
-configure.pre_args
-configure.post_args
</del><ins>+ variant debug description \
+ {Build both release and debug library} {}
</ins><span class="cx">
</span><del>-variant debug description \
-{Build both release and debug library} {}
-
-if {[variant_isset debug]} {
- configure.args-append CONFIG+=\"debug_and_release build_all\"
-} else {
- configure.args-append CONFIG+=\"release\"
</del><ins>+ if {[variant_isset debug]} {
+ configure.args-append CONFIG+=\"debug_and_release build_all\"
+ } else {
+ configure.args-append CONFIG+=\"release\"
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span></span></pre></div>
<a id="trunkdportsdevelkdiff3filespatchsrcQT4kdiff3prodiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff (127110 => 127111)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff 2014-10-21 09:49:39 UTC (rev 127110)
+++ trunk/dports/devel/kdiff3/files/patch-src-QT4-kdiff3.pro.diff 2014-10-21 13:36:02 UTC (rev 127111)
</span><span class="lines">@@ -1,16 +1,17 @@
</span><del>---- kdiff3.pro.orig 2012-09-27 14:41:55.000000000 -0400
-+++ kdiff3.pro 2012-09-27 14:42:25.000000000 -0400
-@@ -1,7 +1,7 @@
</del><ins>+--- orig.kdiff3.pro 2014-07-03 13:37:37.000000000 +0200
++++ kdiff3.pro 2014-10-17 18:20:22.000000000 +0200
+@@ -1,8 +1,8 @@
</ins><span class="cx"> TEMPLATE = app
</span><span class="cx"> # When unresolved items remain during linking: Try adding "shared" in the CONFIG.
</span><span class="cx"> -CONFIG += qt warn_on thread precompile_header
</span><del>--!os2:PRECOMPILED_HEADER = stable.h
</del><span class="cx"> +CONFIG += qt warn_on thread
</span><ins>+ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
+-#!os2:PRECOMPILED_HEADER = stable.h
</ins><span class="cx"> +
</span><span class="cx"> HEADERS = version.h \
</span><ins>+ common.h \
</ins><span class="cx"> diff.h \
</span><del>- difftextwindow.h \
-@@ -64,11 +64,15 @@
</del><ins>+@@ -66,12 +66,16 @@
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unix {
</span><span class="lines">@@ -24,7 +25,8 @@
</span><span class="cx"> + target.path = @PREFIX@/bin
</span><span class="cx"> INSTALLS += target
</span><span class="cx"> }
</span><del>-+
</del><ins>+
</ins><span class="cx"> +mac {
</span><del>-+ CONFIG -= app_bundle
</del><ins>++ CONFIG -= app_bundle
</ins><span class="cx"> +}
</span><ins>++
</ins></span></pre>
</div>
</div>
</body>
</html>