<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/11dde98343c33a7b98193e348cc92bb516b17876">https://github.com/macports/macports-ports/commit/11dde98343c33a7b98193e348cc92bb516b17876</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 11dde98343c33a7b98193e348cc92bb516b17876
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Fri Oct 8 14:59:42 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> openssl: fix port dependency and /etc/openssl conflict
</span>---
_resources/port1.0/group/openssl-1.0.tcl | 27 ++++++++++++++++-----------
devel/openssl/Portfile | 9 +++++++--
2 files changed, 23 insertions(+), 13 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/openssl-1.0.tcl b/_resources/port1.0/group/openssl-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 274be9694c0..da668d1798d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/openssl-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/openssl-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,24 +57,29 @@ proc openssl::depends_portname {} {
</span> return openssl[openssl::branch_nodot]
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-proc openssl::configure_build {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc openssl::set_openssl_dependency {} {
</span> global openssl_cache_branch_nodot openssl_cache_depends
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Just incase, remove this dep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set the requested opensslX dependency
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${openssl_cache_branch_nodot} ne "" && ${openssl_cache_depends} ne "" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_${openssl_cache_depends}-delete port:openssl${openssl_cache_branch_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set openssl_cache_depends [option openssl.depends_type]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set openssl_cache_branch_nodot [openssl::branch_nodot]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_[option openssl.depends_type]-append port:openssl[openssl::branch_nodot]
</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;'>+proc openssl::configure_build {} {
</span>
ui_debug "Configure Types '[option openssl.configure]'"
# If no configure method(s) given do nothing
if { [option openssl.configure] ne "" } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Just incase, remove this dep
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set the requested opensslX dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${openssl_cache_branch_nodot} ne "" && ${openssl_cache_depends} ne "" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_${openssl_cache_depends}-delete port:openssl${openssl_cache_branch_nodot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set openssl_cache_depends [option openssl.depends_type]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set openssl_cache_branch_nodot [openssl::branch_nodot]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_[option openssl.depends_type]-append port:openssl[openssl::branch_nodot]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl::set_openssl_dependency
</span>
foreach meth [option openssl.configure] {
switch ${meth} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/openssl/Portfile b/devel/openssl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b91d5703f67..8568663b1c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/openssl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/openssl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup openssl 1.0
</span>
name openssl
epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version ${openssl.branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version [openssl::default_branch]
</span> revision 0
categories devel security
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,10 +23,15 @@ distfiles
</span> use_configure no
build {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl::set_openssl_dependency
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> destroot {
# Install symlinks from isolated libexec install area to primary ${prefix}
ln -s [openssl::include_dir]/openssl ${destroot}${prefix}/include/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s [openssl::install_area]/etc/openssl ${destroot}${prefix}/etc/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/etc/openssl/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach f [glob [openssl::install_area]/etc/openssl/*] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${f} ${destroot}${prefix}/etc/openssl/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> ln -s [openssl::install_area]/share/doc/openssl ${destroot}${prefix}/share/doc/
foreach man [glob -tails -directory [openssl::install_area]/share/man/ *] {
foreach m [glob -nocomplain [openssl::install_area]/share/man/${man}/*] {
</pre><pre style='margin:0'>
</pre>