<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/05293bae829ce9d0956eb03aaaf04b04236d3ec9">https://github.com/macports/macports-ports/commit/05293bae829ce9d0956eb03aaaf04b04236d3ec9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 05293ba botan: minor changes and revbump for botan2 and simplification/cleanup
</span>05293ba is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 05293bae829ce9d0956eb03aaaf04b04236d3ec9
</span>Author: René Bertin <rjvbertin@gmail.com>
AuthorDate: Wed Jun 12 10:46:05 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> botan: minor changes and revbump for botan2 and simplification/cleanup
</span>---
devel/qca/Portfile | 61 +++++++++++++++++++++++-------------------------------
1 file changed, 26 insertions(+), 35 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qca/Portfile b/devel/qca/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3632145..f5721bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qca/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qca/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,15 +12,13 @@ subport ${name}-qt5 {}
</span> if {[string match "${name}-qt5*" ${subport}]} {
PortGroup qt5 1.0
set Qt_Major 5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${qt5.version} 5.7]>=0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> } else {
PortGroup qt4 1.0
set Qt_Major 4
}
# best included after the required Qt PG
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span>
categories devel crypto security
maintainers {gmail.com:rjvbertin @RJVB} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,10 +37,6 @@ checksums rmd160 dddc3cf240dc5424b9df13fc1bf41c8e04f3b814 \
</span> sha256 d716d2d8e3ed8d95bbdb061f03081d7d032206f746a30a4d29d72196f50e7b02 \
size 691676
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:botan \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgcrypt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:nss
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patch.pre_args -Np1
patchfiles-append patch-qca-ossl.diff \
patch-installname.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,8 +56,11 @@ configure.args -DCMAKE_INSTALL_PREFIX:PATH=${qt_dir} \
</span> -DQCA_DOC_INSTALL_DIR:PATH=${qt_docs_dir} \
-DQCA_MAN_INSTALL_DIR:PATH=${prefix}/share/man \
-DPKGCONFIG_INSTALL_PREFIX:PATH=${qt_pkg_config_dir} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DOSX_FRAMEWORK:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_PLUGINS:STRING="botan\;gcrypt\;logger\;nss\;softstore"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOSX_FRAMEWORK:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# botan requires C++11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -std=c++11
</span>
if {${Qt_Major} eq "4"} {
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,58 +103,52 @@ variant examples description {Include examples in install} {
</span> ### Plugin subports:
### The ossl, cyrus-sasl and gnupg plugins used to be standalone ports
### are now implemented as subports. The other plugins are built together with
<span style='display:block; white-space:pre;background:#ffe0e0;'>-### the main port; I don't see a reason to introduce new subports for components
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-### that used to be built along with the main ports, only to impose new dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-### on the ports that require qca.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-###
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+### the main ports.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+###
</span> # Qt4 receives no suffix:
set qt.versions {"" "-qt5"}
foreach qv ${qt.versions} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # the main ports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq "${name}${qv}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # revbump for botan2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:botan \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgcrypt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nss
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DBUILD_PLUGINS:STRING="botan\;gcrypt\;logger\;nss\;softstore"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # plugins depend on the corresponding main port and the libraries of which they expose the Functionality
</span> subport ${name}${qv}-ossl {
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}${qv} port:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DBUILD_PLUGINS:STRING="botan\;gcrypt\;logger\;nss\;softstore"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:${name}${qv} port:openssl
</span> configure.args-append -DBUILD_PLUGINS:STRING="ossl"
build.dir ${workpath}/build/plugins/qca-ossl
}
subport ${name}${qv}-cyrus-sasl {
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}${qv} port:cyrus-sasl2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DBUILD_PLUGINS:STRING="botan\;gcrypt\;logger\;nss\;softstore"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:${name}${qv} port:cyrus-sasl2
</span> configure.args-append -DBUILD_PLUGINS:STRING="cyrus-sasl"
build.dir ${workpath}/build/plugins/qca-cyrus-sasl
}
subport ${name}${qv}-gnupg {
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}${qv}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DBUILD_PLUGINS:STRING="botan\;gcrypt\;logger\;nss\;softstore"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:${name}${qv}
</span> configure.args-append -DBUILD_PLUGINS:STRING="gnupg"
build.dir ${workpath}/build/plugins/qca-gnupg
}
subport ${name}${qv}-pkcs11 {
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}${qv} port:openssl port:pkcs11-helper
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DBUILD_PLUGINS:STRING="botan\;gcrypt\;logger\;nss\;softstore"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib port:${name}${qv} port:openssl port:nss port:pkcs11-helper
</span> configure.args-append -DBUILD_PLUGINS:STRING="pkcs11"
build.dir ${workpath}/build/plugins/qca-pkcs11
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-### Provide stub subports for those plugins that have been available through
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-### a subport for a while.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach virtual {"botan" "gcrypt" "logger" "nss" "softstore"} {
subport ${name}-${virtual} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_sites
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib port:${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set stubdir ${destroot}${prefix}/share/doc/${subport}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 755 ${stubdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "touch ${stubdir}/.this.is.a.stubport"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by qca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span> }
}
</pre><pre style='margin:0'>
</pre>