<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/97e6f83df9f741e320c497dccdbf0c8ab800667b">https://github.com/macports/macports-ports/commit/97e6f83df9f741e320c497dccdbf0c8ab800667b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 97e6f83df9f741e320c497dccdbf0c8ab800667b
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Sep 17 10:33:13 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> opensc: cleanup
</span>---
security/opensc/Portfile | 66 +++++++++++++++++++++++++++---------------------
1 file changed, 37 insertions(+), 29 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/opensc/Portfile b/security/opensc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 928f4f77427..82023438708 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/opensc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/opensc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span> PortGroup github 1.0
PortGroup openssl 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span>
name opensc
github.setup OpenSC OpenSC 0.23.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,22 +38,23 @@ if {![variant_isset openssl3]} {
</span> openssl.branch 1.1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:docbook-xsl-nons \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gengetopt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:help2man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libxslt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +readline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-winscard.diff patch-pgp-and-tools.diff
</span> patch.pre_args -p1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-winscard.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-pgp-and-tools.diff
</span>
# https://trac.macports.org/ticket/65709
compiler.blacklist-append *gcc-4.* {clang < 421} *clang-3.*
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:docbook-xsl-nons \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gengetopt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:help2man \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxslt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_autoreconf yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --disable-openpace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-openpace \
</span> --disable-readline \
--disable-silent-rules \
--disable-static \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,24 +65,8 @@ configure.args-append --disable-openpace \
</span>
if {[string match *gcc* ${configure.compiler}]} {
# error: pointer may be used after 'realloc' [-Werror=use-after-free]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-strict
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant eac description {Enable Extended Access Control (EAC) v2 support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:openpace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-openpace --enable-openpace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant openssl3 description {Build against OpenSSL 3 (experimental)} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openssl.branch 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # There will be warnings due to use of deprecated methods so they must not be fatal:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-strict
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant p11kit description {Use p11-kit as default PKCS#11 module} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run port:p11-kit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant readline description {Enable readline support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:readline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-readline --enable-readline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-strict
</span> }
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,6 +80,7 @@ pre-configure {
</span> }
configure.args-append --with-pkcs11-provider=${prefix}/lib/${pkcs11_provider}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
system "${worksrcpath}/MacOSX/libtool-bundle ${destroot}${prefix}/lib/opensc-pkcs11.so ${destroot}${prefix}/lib"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,5 +90,27 @@ post-destroot {
</span> xinstall -m 644 ${filespath}/p11kit-opensc.module ${destroot}${p11_module_configs}/opensc.module
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant eac description {Enable Extended Access Control (EAC) v2 support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openpace
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-openpace --enable-openpace
</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;'>+variant openssl3 description {Build against OpenSSL 3 (experimental)} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl.branch 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # There will be warnings due to use of deprecated methods so they must not be fatal:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-strict
</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;'>+variant p11kit description {Use p11-kit as default PKCS#11 module} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:p11-kit
</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;'>+variant readline description {Enable readline support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:readline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-readline --enable-readline
</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;'>+default_variants +readline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Skip -rc and other pre-release tags
github.livecheck.regex {([\d.]+)}
</pre><pre style='margin:0'>
</pre>