<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c29ac1128cafe82e15e1293b6c4af1c9579b3a79">https://github.com/macports/macports-ports/commit/c29ac1128cafe82e15e1293b6c4af1c9579b3a79</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 c29ac1128ca gnupg1: end conflict (coexist) with gnupg2
</span>c29ac1128ca is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c29ac1128cafe82e15e1293b6c4af1c9579b3a79
</span>Author: raf <raf@raf.org>
AuthorDate: Sat Aug 5 13:15:11 2023 +1000
<span style='display:block; white-space:pre;color:#404040;'> gnupg1: end conflict (coexist) with gnupg2
</span>---
mail/gnupg1/Portfile | 22 ++++++++++++----------
mail/gnupg2/Portfile | 1 -
mail/lbdb/Portfile | 4 ++--
perl/p5-module-signature/Portfile | 5 ++++-
.../files/patch-ignore-gnupg2.diff | 11 +++++++++++
5 files changed, 29 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/gnupg1/Portfile b/mail/gnupg1/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 61f33e7fea6..843928c98dc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/gnupg1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/gnupg1/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortSystem 1.0
</span> set my_name gnupg
name ${my_name}1
version 1.4.23
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories mail security
license GPL-3+
installs_libs no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,6 @@ homepage https://www.gnupg.org
</span> platforms darwin freebsd sunos
distname ${my_name}-${version}
master_sites ${my_name}:${my_name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts ${my_name}2
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +30,7 @@ checksums rmd160 087c494ff78bd1e85873ac383e0c6e236b6a9869 \
</span> compiler.cxx_standard
configure.args --infodir=${prefix}/share/info \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --docdir=${prefix} \
</span> --disable-asm \
--with-libiconv-prefix=${prefix} \
--with-libintl-prefix=${prefix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,8 @@ configure.args --infodir=${prefix}/share/info \
</span> --with-bzip2=${prefix} \
--with-libusb=${prefix} \
--with-ldap=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-libcurl=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-libcurl=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --program-suffix=1
</span>
depends_build port:gettext
depends_lib port:libiconv \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,13 +76,14 @@ notes {
</span> are supported, but users are highly recommended to switch to\
the modern version of GnuPG, provided by the gnupg2 port.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- This port will be made co-installable with the modern version\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- in mid-October 2018. All binaries will be postfixed with "1"\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and dependents switched over to pull in modern GnuPG,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eventually forcing an upgrade. After this date, this port will\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- still be provided for users that need to work on old data,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- which is not supported by the modern version any longer, but\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- not used within MacPorts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This port can coexist with the modern version.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ All binaries are postfixed with "1", and all dependent\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ports have adapted to the new names.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Note: This means that this revision is NOT BACKWARDS-COMPATIBLE\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ with gnupg1 @1.4.23_2 or earlier. If you have any local scripts that\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require GnuPG 1.4 and reference (e.g.) "gpg" or "gpgv", YOU MUST MODIFY\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ those references to (e.g.) "gpg1" or "gpgv1" instead.
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/gnupg2/Portfile b/mail/gnupg2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b0cdd0fb4a..41173981cd3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/gnupg2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/gnupg2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,6 @@ long_description GnuPG is a complete and free replacement for PGP. Because
</span> without any restrictions. GnuPG is a RFC4880 (OpenPGP) \
compliant application.
homepage https://www.gnupg.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts ${my_name}1
</span> distname ${my_name}-${version}
master_sites ${my_name}:${my_name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/lbdb/Portfile b/mail/lbdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 273772c2e1c..11d9b378630 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/lbdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/lbdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup perl5 1.0
</span>
name lbdb
version 0.48.1
<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 mail
maintainers nomaintainer
platforms darwin freebsd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ post-destroot {
</span>
variant gpg conflicts gpg2 description {Add support for GnuPG version 1} {
depends_lib-append port:gnupg1
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --without-gpg --with-gpg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-gpg --with-gpg=${prefix}/bin/gpg1
</span> }
variant gpg2 conflicts gpg description {Add support for GnuPG version 2} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-module-signature/Portfile b/perl/p5-module-signature/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 03d2ad71b76..1fe7df318f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-module-signature/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-module-signature/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup perl5 1.0
</span>
perl5.branches 5.28 5.30 5.32 5.34
perl5.setup Module-Signature 0.88
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license Permissive
maintainers nomaintainer
description Module signature file manipulation
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +27,9 @@ if {${perl5.major} != ""} {
</span> if {[variant_isset gnupg1]} {
depends_lib-append \
port:gnupg1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-ignore-gnupg2.diff
</span> } else {
depends_lib-append \
path:bin/gpg2:gnupg2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-module-signature/files/patch-ignore-gnupg2.diff b/perl/p5-module-signature/files/patch-ignore-gnupg2.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c379d17d0dc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-module-signature/files/patch-ignore-gnupg2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.PL.orig 2016-11-02 12:38:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.PL 2016-11-02 12:40:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,7 +77,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ print "Looking for GNU Privacy Guard (gpg), a cryptographic signature tool...\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ my ($gpg, $gpg_path);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for my $gpg_bin ('gpg', 'gpg2', 'gnupg', 'gnupg2') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for my $gpg_bin ('gpg1', 'gnupg1') {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $gpg_path = can_run($gpg_bin);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ next unless $gpg_path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ next unless `$gpg_bin --version` =~ /GnuPG/;
</span></pre><pre style='margin:0'>
</pre>