<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/82d30bbaff9080154b34c6d1e88e1ec64f5cdd5c">https://github.com/macports/macports-ports/commit/82d30bbaff9080154b34c6d1e88e1ec64f5cdd5c</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 82d30bb gnupg: fix replacement
</span>82d30bb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 82d30bbaff9080154b34c6d1e88e1ec64f5cdd5c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Nov 2 05:21:03 2017 +1100
<span style='display:block; white-space:pre;color:#404040;'> gnupg: fix replacement
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This was only setting replaced_by if the port was already installed. This
</span><span style='display:block; white-space:pre;color:#404040;'> meant that users got an error instead of the replacement happening when
</span><span style='display:block; white-space:pre;color:#404040;'> using the pregerenerated PortIndex.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> It was all rather overcomplicated anyway since a replaced port can't be
</span><span style='display:block; white-space:pre;color:#404040;'> installed.
</span>---
mail/gnupg/Portfile | 42 ++++++++++--------------------------------
1 file changed, 10 insertions(+), 32 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/gnupg/Portfile b/mail/gnupg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a4dff2..9546da5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/gnupg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/gnupg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +1,18 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Remove after 11-10-2018.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![catch {set installed [lindex [registry_active gnupg] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Old gnupg port currently active, replace with gnupg1.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by gnupg1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Old gnupg port NOT active, which means that this can't be an upgrade.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Error out and offer a sane error message.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Do NOT use replaced_by/the obsolete PortGroup here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- supported_archs noarch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage https://www.macports.org/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_sites
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_extract
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_fetch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${subport} has been deprecated. If you absolutely\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- want to stay on the classic version, install the gnupg1\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port. All other users are recommended to install\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gnupg2."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "obsolete port"
</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;'>- livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by gnupg1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# set up custom message before the PortGroup adds its
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "${subport} has been deprecated. If you absolutely\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ want to stay on the classic version, install the gnupg1\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port. All other users are recommended to install\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gnupg2."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "obsolete port"
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span>
name gnupg
version 1.4.22
</pre><pre style='margin:0'>
</pre>