<!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>[141016] trunk/dports/security/KeePassX/Portfile</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/141016">141016</a></dd>
<dt>Author</dt> <dd>eborisch@macports.org</dd>
<dt>Date</dt> <dd>2015-10-07 16:29:28 -0700 (Wed, 07 Oct 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>KeePassX: Update to 2.0-beta2. Use github and cmake (with out_of_source) groups. WITH_CXX11 switched to default ON; change config options.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssecurityKeePassXPortfile">trunk/dports/security/KeePassX/Portfile</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssecurityKeePassXPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/security/KeePassX/Portfile (141015 => 141016)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/security/KeePassX/Portfile        2015-10-07 23:17:32 UTC (rev 141015)
+++ trunk/dports/security/KeePassX/Portfile        2015-10-07 23:29:28 UTC (rev 141016)
</span><span class="lines">@@ -3,9 +3,11 @@
</span><span class="cx"> 
</span><span class="cx"> PortSystem              1.0
</span><span class="cx"> PortGroup               qt4 1.0
</span><ins>+PortGroup               github 1.0
+PortGroup               cmake 1.0
+github.setup            keepassx keepassx 2.0-beta2
</ins><span class="cx"> 
</span><span class="cx"> name                    KeePassX
</span><del>-version                 2.0-beta1
</del><span class="cx"> revision                0
</span><span class="cx"> categories              security aqua
</span><span class="cx"> maintainers             nomaintainer
</span><span class="lines">@@ -27,56 +29,37 @@
</span><span class="cx"> &quot;
</span><span class="cx"> 
</span><span class="cx"> homepage                https://www.keepassx.org/
</span><del>-master_sites            https://www.keepassx.org/dev/attachments/download/100
-distname                keepassx-${version}
</del><span class="cx"> 
</span><span class="cx"> checksums \
</span><del>-    rmd160  d464465eeceaf94d5bedf0e124702dea2ca13324 \
-    sha256  bce1933c48fd33ef8043dd526d769fd9c454d1b63464c82a35e1f7a8689acbf2
</del><ins>+    rmd160  542eda22b8393f1de6798d7c3072d229da3103d1 \
+    sha256  a81239227905fcace9efd007b53a98b84c7711a3600bf2ded0d6743e8ddfce66
</ins><span class="cx"> 
</span><span class="cx"> depends_lib-append      port:libgcrypt \
</span><span class="cx">                         port:zlib
</span><span class="cx"> 
</span><span class="cx"> depends_build-append    port:cmake
</span><span class="cx"> 
</span><del>-worksrcdir              build
</del><ins>+cmake.out_of_source     yes
</ins><span class="cx"> 
</span><del>-post-extract {
-    file mkdir ${worksrcpath}
-    reinplace &quot;s|zlib.h|${prefix}/include/zlib.h|&quot; ../${distname}/CMakeLists.txt
-    platform darwin {
-        if {${os.major} &gt;= 13} {
-            reinplace &quot;s|-stack-protector-buffer-size=4||g&quot; \
-                      ../${distname}/CMakeLists.txt
-            reinplace &quot;s|-mllvm||g&quot; \
-                      ../${distname}/CMakeLists.txt
-        }
-    }
-}
-
-configure.cmd           cmake
-configure.pre_args      -DCMAKE_INSTALL_PREFIX=${applications_dir} \
-                        -DZLIB_ROOT=${prefix}
-configure.args          ${qt_cmake_defines} ../${distname}
-
</del><span class="cx"> platform darwin {
</span><span class="cx">     if {${os.major} &lt; 13} {
</span><span class="cx">         # Build fails with clang: unsupported -stack-protector-buffer-size=4
</span><span class="cx">         # (even though clang -help lists option)
</span><del>-        compiler.blacklist          clang
-    } else {
-        configure.pre_args-append   -DWITH_CXX11=On
</del><ins>+        # Disabling blacklist; option no longer set in source CMakeLists.txt
+        # compiler.blacklist          clang
+        configure.pre_args-append   -DWITH_CXX11=OFF
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> # Don't make copies of all the QT4 libraries etc... (MUCH smaller install)
</span><span class="cx"> post-configure {
</span><del>-    reinplace &quot;s/FIXUP_QT4_EXECUTABLE.*//&quot; src/cmake_install.cmake
</del><ins>+    reinplace &quot;s/FIXUP_QT4_EXECUTABLE.*//&quot; \
+        ${cmake.build_dir}/src/cmake_install.cmake
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> post-destroot {
</span><span class="cx">     xinstall -d ${destroot}${prefix}/share/doc/${name}
</span><del>-    xinstall -W ${workpath}/${distname} COPYING LICENSE.BSD LICENSE.CC0 \
</del><ins>+    xinstall -W ${worksrcpath} COPYING LICENSE.BSD LICENSE.CC0 \
</ins><span class="cx">              LICENSE.GPL-2 LICENSE.LGPL-2.1 LICENSE.LGPL-3 \
</span><span class="cx">              LICENSE.NOKIA-LGPL-EXCEPTION \
</span><span class="cx">              ${destroot}${prefix}/share/doc/${name}
</span></span></pre>
</div>
</div>

</body>
</html>