<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/c5411aec6c647007b016a939bbfdc3dcac2199f7">https://github.com/macports/macports-ports/commit/c5411aec6c647007b016a939bbfdc3dcac2199f7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c5411aec6c647007b016a939bbfdc3dcac2199f7
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Thu Oct 7 16:51:32 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> openssl PG: New PG, replacing old_openssl
</span>---
_resources/port1.0/group/old_openssl-1.0.tcl | 65 ----------------
_resources/port1.0/group/openssl-1.0.tcl | 108 +++++++++++++++++++++++++++
2 files changed, 108 insertions(+), 65 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 80737f589de..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,65 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Usage:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# PortGroup old_openssl 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# This port group is for ports that are incompatible with the latest OpenSSL.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# It's not needed for most ports.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# options:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# openssl.branch: the OpenSSL branch to use (e.g. 1.0 for the latest OpenSSL on the 1.0.x branch).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Currently 1.0 and 1.1 are available.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-options openssl.branch openssl.includedir openssl.libdir openssl.dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default openssl.branch 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default openssl.includedir {${prefix}/include/openssl-${openssl.branch}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default openssl.libdir {${prefix}/lib/openssl-${openssl.branch}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# use for ports that expect to find openssl includes and libs in one directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default openssl.dir {${prefix}/libexec/openssl-${openssl.branch}}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-option_proc openssl.branch openssl_set_branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-proc openssl_set_branch {option action args} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$action ne "set"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return
</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;'>- global openssl.branch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set branch_no_dot [string map {. ""} ${openssl.branch}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>- depends_lib-append port:openssl${branch_no_dot}
</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;'>-proc openssl.configure {method} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- global prefix openssl.branch openssl.includedir openssl.libdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch ${method} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkgconfig {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path-prepend ${prefix}/lib/openssl-${openssl.branch}/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-delete port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build_flags {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-prepend -I${openssl.includedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-prepend -L${openssl.libdir}
</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;'>- # this option can be used to allow pkgconfig to spec all the libraries but
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # also prepend the openssl include and lib directories. This option fixes some
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # builds when the other two options individually do not
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pkgconfig_and_build_flags {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path-prepend ${prefix}/lib/openssl-${openssl.branch}/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-delete port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-prepend -I${openssl.includedir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ldflags-prepend -L${openssl.libdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "invalid method \"${method}\" for openssl.configure"
</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;'>-}
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..274be9694c0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,108 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Usage:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This port group handles setting ports up to build against specific openssl versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+namespace eval openssl { }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options openssl.branch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default openssl.branch {[openssl::default_branch]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options openssl.depends_type
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default openssl.depends_type lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options openssl.configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default openssl.configure {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# cache variables storing current configuration state
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default openssl_cache_branch_nodot ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default openssl_cache_depends ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc openssl::default_branch {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1.1
</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::branch {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [option openssl.branch]
</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::branch_nodot {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [string map {. {}} [openssl::branch]]
</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::install_area {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${prefix}/libexec/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::include_dir {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [openssl::install_area]/include
</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::lib_dir {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [openssl::install_area]/lib
</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::pkgconfig_dir {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [openssl::install_area]/lib/pkgconfig
</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::bin_dir {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [openssl::install_area]/bin
</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::depends_portname {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global openssl_cache_branch_nodot openssl_cache_depends
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug "Configure Types '[option openssl.configure]'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # If no configure method(s) given do nothing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [option openssl.configure] ne "" } {
</span><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;'>+ foreach meth [option openssl.configure] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch ${meth} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pkgconfig {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug " -> Setting openssl pkgconfig configuration"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-prepend [openssl::pkgconfig_dir]
</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;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build_flags {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_debug " -> Setting openssl build flags configuration"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-prepend -I[openssl::include_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cflags-prepend -I[openssl::include_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-prepend -L[openssl::lib_dir]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "invalid method \"${meth}\" for openssl.configure"
</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;'>+ }
</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;'>+
</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_proc {option action args} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$action ne "set"} return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl::configure_build
</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;'>+option_proc openssl.configure openssl::configure_proc
</span></pre><pre style='margin:0'>
</pre>