<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ce3044a66aedbe344e92d20136c1d71175f94bb1">https://github.com/macports/macports-ports/commit/ce3044a66aedbe344e92d20136c1d71175f94bb1</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 ce3044a gpgme: Add +gnupg20 and +gnupg21 variants
</span>ce3044a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ce3044a66aedbe344e92d20136c1d71175f94bb1
</span>Author: Leonardo Brondani Schenkel <leonardo@schenkel.net>
AuthorDate: Mon Sep 4 22:19:04 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> gpgme: Add +gnupg20 and +gnupg21 variants
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> GnuPG 2.1.x (port gnupg21) now installs as ${prefix}/bin/gpg instead of
</span><span style='display:block; white-space:pre;color:#404040;'> ${prefix}/bin/gpg2, which makes it conflict with this port due to the
</span><span style='display:block; white-space:pre;color:#404040;'> dependency on path:bin/gnupg2 -- this forces the installation of gnupg2
</span><span style='display:block; white-space:pre;color:#404040;'> but that is not satisfiable (gnupg2 conflicts with gnupg21).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This commit addresses this issue by adding two variants, gnupg20 and
</span><span style='display:block; white-space:pre;color:#404040;'> gnupg21, which allow the specific version that this port will depend on.
</span><span style='display:block; white-space:pre;color:#404040;'> If none is explicitly chosen, gnupg20 is selected to preserve the old
</span><span style='display:block; white-space:pre;color:#404040;'> behaviour.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54749
</span>---
devel/gpgme/Portfile | 33 ++++++++++++++++++++++++---------
1 file changed, 24 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gpgme/Portfile b/devel/gpgme/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 45e5845..5b5ba70 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gpgme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gpgme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,24 +25,39 @@ use_bzip2 yes
</span> checksums rmd160 55719b4a7263ae8d0ef79205e26409ff5693ea27 \
sha256 1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# either gnupg2 (the default) or gnupg21 is needed for running the unit tests
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and at runtime but does not link directly with gpgme
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/gpg2:gnupg2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span>
depends_lib port:pth \
port:libgpg-error \
port:libassuan
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run path:bin/gpg2:gnupg2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles patch-configure.ac.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fixup-GpgmeppConfig.cmake.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-tests-gpg-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fixup-GpgmeppConfig.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gnupg20 conflicts gnupg21 description {Use GnuPG 2.0.x} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:gnupg2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:gnupg2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-tests-gpg-Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@GPG@|${prefix}/bin/gpg2|" ${worksrcpath}/src/gpgme-config.in
</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;'>+variant gnupg21 conflicts gnupg20 description {Use GnuPG 2.1.x} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:gnupg21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_run port:gnupg21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@GPG@|${prefix}/bin/gpg|" ${worksrcpath}/src/gpgme-config.in
</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;'>+# default to gnupg20 for now for backwards compatibility
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset gnupg20] && ![variant_isset gnupg21]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant_set gnupg20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
post-patch {
reinplace "s|thread_modules=\"\"|thread_modules=\"pthread\"|" ${worksrcpath}/src/gpgme-config.in
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@GPG@|${prefix}/bin/gpg2|" ${worksrcpath}/src/gpgme-config.in
</span> reinplace "s|@GPGSM@|${prefix}/bin/gpgsm|" ${worksrcpath}/src/gpgme-config.in
}
</pre><pre style='margin:0'>
</pre>