<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/55abeeb5d7263af995316b338bb7506b789c61e5">https://github.com/macports/macports-ports/commit/55abeeb5d7263af995316b338bb7506b789c61e5</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 55abeeb5d72 old_openssl PortGroup: add options
</span>55abeeb5d72 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 55abeeb5d7263af995316b338bb7506b789c61e5
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Fri Oct 1 23:26:31 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> old_openssl PortGroup: add options
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add an option to more easily spec the installed
</span><span style='display:block; white-space:pre;color:#404040;'> directory when openssl is installed all in one dir
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> add a method to use both pkgconfig and modify the build
</span><span style='display:block; white-space:pre;color:#404040;'> flags. This fixes some builds when the other two methods
</span><span style='display:block; white-space:pre;color:#404040;'> individually do not
</span>---
_resources/port1.0/group/old_openssl-1.0.tcl | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/old_openssl-1.0.tcl b/_resources/port1.0/group/old_openssl-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index cd1cad521ce..80737f589de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/old_openssl-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/old_openssl-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,12 +8,16 @@
</span> #
# options:
# openssl.branch: the OpenSSL branch to use (e.g. 1.0 for the latest OpenSSL on the 1.0.x branch).
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Currently only 1.0 is available.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Currently 1.0 and 1.1 are available.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options openssl.branch openssl.includedir openssl.libdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options openssl.branch openssl.includedir openssl.libdir openssl.dir
</span> default openssl.branch 1.0
default openssl.includedir {${prefix}/include/openssl-${openssl.branch}}
default openssl.libdir {${prefix}/lib/openssl-${openssl.branch}}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use for ports that expect to find openssl includes and libs in one directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default openssl.dir {${prefix}/libexec/openssl-${openssl.branch}}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> option_proc openssl.branch openssl_set_branch
proc openssl_set_branch {option action args} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +46,18 @@ proc openssl.configure {method} {
</span> configure.cppflags-prepend -I${openssl.includedir}
configure.ldflags-prepend -L${openssl.libdir}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # this option can be used to allow pkgconfig to spec all the libraries but
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # also prepend the openssl include and lib directories. This option fixes some
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # builds when the other two options individually do not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkgconfig_and_build_flags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-prepend ${prefix}/lib/openssl-${openssl.branch}/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-prepend -I${openssl.includedir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend -L${openssl.libdir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> default {
return -code error "invalid method \"${method}\" for openssl.configure"
}
</pre><pre style='margin:0'>
</pre>