<!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>[144947] trunk/dports/devel/qca/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/144947">144947</a></dd>
<dt>Author</dt> <dd>vince@macports.org</dd>
<dt>Date</dt> <dd>2016-01-22 02:26:04 -0800 (Fri, 22 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>qca: bump to 2.1, obsoleting qca-ossl</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelqcaPortfile">trunk/dports/devel/qca/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelqcaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/qca/Portfile (144946 => 144947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/qca/Portfile 2016-01-22 09:39:09 UTC (rev 144946)
+++ trunk/dports/devel/qca/Portfile 2016-01-22 10:26:04 UTC (rev 144947)
</span><span class="lines">@@ -2,11 +2,10 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup qt4 1.0
</del><ins>+PortGroup cmake 1.0
</ins><span class="cx">
</span><span class="cx"> name qca
</span><del>-version 2.0.3
-revision 2
</del><ins>+version 2.1.0
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories devel crypto security
</span><span class="cx"> maintainers michaelld openmaintainer
</span><span class="lines">@@ -20,52 +19,38 @@
</span><span class="cx"> platforms darwin
</span><span class="cx">
</span><span class="cx"> homepage http://delta.affinix.com/qca/
</span><del>-master_sites http://delta.affinix.com/download/qca/${branch}/
-use_bzip2 yes
</del><ins>+master_sites http://delta.affinix.com/download/qca/2.0/
</ins><span class="cx">
</span><del>-checksums md5 fc15bd4da22b8096c51fcfe52d2fa309 \
- sha1 9c868b05b81dce172c41b813de4de68554154c60 \
- rmd160 333cfdce91fedfaec09c205528de52d7b569c521
</del><ins>+checksums rmd160 30358bbd182cfeb9eaa696b5b39fa9e6d1f99b4c \
+ sha256 226dcd76138c3738cdc15863607a96b3758a4c3efd3c47295939bcea4e7a9284
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> # (1) correct pkgconfig file for framework install, if selected.
</span><span class="cx"> # (2) allow for 'debug' and 'framework' options at the same time.
</span><span class="cx"> # This change is needed to allow for +debug [+framework] --
</span><span class="cx"> # disallow just debug framework via no variants for it.
</span><span class="cx"> # (3) allow simple replacement for universal arch arguments, if that
</span><span class="cx"> # variant is requested.
</span><del>-patchfiles patch-configure.diff
</del><ins>+patchfiles patch-qca_basic_h.diff \
+ patch_CMakeLists_txt.diff
</ins><span class="cx">
</span><span class="cx"> # fix C++ inheritance for a specific class to make clang happy
</span><del>-patchfiles-append patch-src_botantools_botan_botan_secmem.h.diff
</del><ins>+#patchfiles-append patch-src_botantools_botan_botan_secmem.h.diff
</ins><span class="cx">
</span><span class="cx"> # remove unnecessary Carbon #include, which fails on 10.8
</span><del>-patchfiles-append patch-src_qac_systemstore_mac.cpp.diff
</del><ins>+#patchfiles-append patch-src_qac_systemstore_mac.cpp.diff
+variant qt4 conflicts qt5 description "Build with qt4" {
</ins><span class="cx">
</span><del>-post-patch {
- # set arch type(s)
- reinplace "s|@ARCHES@|${qt_arch_types}|g" \
- ${worksrcpath}/configure
-
- # since Qt now uses the correct install_name for libraries,
- # remove that from QCA's library
- reinplace "/QMAKE_LFLAGS_SONAME/d" \
- ${worksrcpath}/src/src.pro
</del><ins>+ PortGroup qt4 1.0
+ configure.args-append "-DQT4_BUILD=ON"
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-# set QCA to install into the QT4 directory
-configure.pre_args --prefix=${qt_dir}
</del><ins>+variant qt5 conflicts qt4 description "Build with qt5" {
</ins><span class="cx">
</span><del>-# defaults: release only, no-framework, specific build_arch.
-# use variants to change everything except framework
-configure.args --verbose \
- --qtdir=${qt_dir} \
- --release \
- --no-framework
</del><ins>+ PortGroup qt5 1.0
+ configure.args-append "-DQCA_FEATURE_INSTALL_DIR=${prefix}/libexec/qt5/mkspecs"
</ins><span class="cx">
</span><del>-# QCA's configure does not handle this flag,
-# but does not generate an error either.
-configure.universal_args-delete --disable-dependency-tracking
-configure.args-delete --disable-dependency-tracking
</del><ins>+}
</ins><span class="cx">
</span><span class="cx"> # allow ccache, if specified by the user
</span><span class="cx"> pre-build {
</span><span class="lines">@@ -83,13 +68,15 @@
</span><span class="cx"> xinstall -m 644 -W ${worksrcpath} COPYING README TODO \
</span><span class="cx"> ${destroot_qt}/share/doc/${name}
</span><span class="cx">
</span><del>- # install cmake file (taken from port 'kdelibs4'). To use this
- # file, include '-DCMAKE_MODULE_PATH=...' in configure.args during
- # the initial 'configure' stage (which uses CMake), to the full
- # path of where the CMake files are installed.
- xinstall -d -m 755 ${destroot}${qt_cmake_module_dir}
- xinstall -m 644 -W ${filespath} FindQCA2.cmake \
- ${destroot}${qt_cmake_module_dir}
</del><ins>+ if {[variant_isset qt4]} {
+ # install cmake file (taken from port 'kdelibs4'). To use this
+ # file, include '-DCMAKE_MODULE_PATH=...' in configure.args during
+ # the initial 'configure' stage (which uses CMake), to the full
+ # path of where the CMake files are installed.
+ xinstall -d -m 755 ${destroot}${qt_cmake_module_dir}
+ xinstall -m 644 -W ${filespath} FindQCA2.cmake \
+ ${destroot}${qt_cmake_module_dir}
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant debug description \
</span></span></pre>
</div>
</div>
</body>
</html>