<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4839d3c3266b4acfea7755d8bc3d131bd7b52c55">https://github.com/macports/macports-ports/commit/4839d3c3266b4acfea7755d8bc3d131bd7b52c55</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 4839d3c wallet*: add perl variants, default +perl5_28
</span>4839d3c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4839d3c3266b4acfea7755d8bc3d131bd7b52c55
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Fri May 29 15:03:36 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> wallet*: add perl variants, default +perl5_28
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * use perl5.bin as simplification where appropriate
</span><span style='display:block; white-space:pre;color:#404040;'> * remove unnecessary perl5.major conditionals
</span><span style='display:block; white-space:pre;color:#404040;'> * perl5.major is always set in this context
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/58361
</span>---
net/wallet/Portfile | 39 ++++++++++++++++++++++-----------------
1 file changed, 22 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wallet/Portfile b/net/wallet/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c8582fe..bc6f016 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wallet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wallet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,11 +2,16 @@
</span>
PortSystem 1.0
PortGroup perl5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.branches 5.26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.require_variant yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.conflict_variants yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.26 5.28 5.30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.default_branch 5.28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.create_variants ${perl5.branches}
</span>
name wallet
version 1.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories net security
license MIT
maintainers kornel.us:karl openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +40,11 @@ depends_lib-append port:kerberos5 \
</span> port:remctl
# Add a dependency on Module::Build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${perl5.major} != ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:p${perl5.major}-module-build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Used during build only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# remove unnecessary conditional
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# perl5.major is always set in this context
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-module-build
</span>
# wallet 1.3 does not support Perl paths other than /usr/bin/perl, nor does it
# support perl binaries not named "perl". The perl/Build.PL script is also
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +68,7 @@ use_autoreconf yes
</span> configure.args --enable-reduced-depends \
--with-remctl=${prefix} \
PATH_KRB5_CONFIG=${prefix}/bin/krb5-config \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PERL=${prefix}/bin/perl${perl5.major}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PERL=${perl5.bin}
</span>
# Our top-level port installs the Wallet client.
# The Wallet client is just a couple of binaries, plus man pages and docs.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,16 +107,14 @@ subport wallet-server {
</span> objects, and responds to requests from the \
wallet client.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${perl5.major} != ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:p${perl5.major}-datetime \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-dbi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-dbix-class \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-digest-md5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-sql-translator \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-timedate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:p${perl5.major}-crypt-generatepassword \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-datetime-format-sqlite
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:p${perl5.major}-datetime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-dbi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-dbix-class \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-digest-md5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-sql-translator \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-timedate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:p${perl5.major}-crypt-generatepassword \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:p${perl5.major}-datetime-format-sqlite
</span>
# TODO: Tests have a Stanford-specific part, and a NetDB-verifier part,
# which need to be disabled.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,7 +168,7 @@ subport wallet-server {
</span> # PERL_INSTALL_ROOT is used to set the destroot path; we don't
# set a prefix because that is already configured into MacPorts
# Perl, and so Module::Build uses it automatically.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "env 'PERL_INSTALL_ROOT=${destroot}' '${prefix}/bin/perl${perl5.major}' '${worksrcpath}/perl/Build' 'install'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "env 'PERL_INSTALL_ROOT=${destroot}' '${perl5.bin}' '${worksrcpath}/perl/Build' 'install'"
</span> }
# We have some post-activation setup that the user needs to do.
</pre><pre style='margin:0'>
</pre>