From owner-svn-ports-all@freebsd.org  Tue Jan 10 11:00:29 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9CC04CA82B0;
 Tue, 10 Jan 2017 11:00:29 +0000 (UTC)
 (envelope-from tijl@freebsd.org)
Received: from mailrelay110.isp.belgacom.be (mailrelay110.isp.belgacom.be
 [195.238.20.137]) (using TLSv1.2 with cipher RC4-SHA (128/128 bits))
 (Client CN "relay.skynet.be",
 Issuer "GlobalSign Organization Validation CA - SHA256 - G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 91C1912B3;
 Tue, 10 Jan 2017 11:00:28 +0000 (UTC)
 (envelope-from tijl@freebsd.org)
X-Belgacom-Dynamic: yes
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2A2CwBavXRY//s+sVtdGwEBAQMBAQEJA?=
 =?us-ascii?q?QEBgzoBAQEBAR9AEA98EI5JkTYmAZcLIoYAAoFyRBABAgEBAQEBAQFjKIRpAQU?=
 =?us-ascii?q?6HCMQCxgJJQ8qHgYTiHSyXoolAQEBAQEBAQMBAQEBASOLJooNHwWbIYZbimp0g?=
 =?us-ascii?q?WGOF5JcNiGBJCkIhmY9NYhmAQEB?=
X-IPAS-Result: =?us-ascii?q?A2A2CwBavXRY//s+sVtdGwEBAQMBAQEJAQEBgzoBAQEBAR9?=
 =?us-ascii?q?AEA98EI5JkTYmAZcLIoYAAoFyRBABAgEBAQEBAQFjKIRpAQU6HCMQCxgJJQ8qH?=
 =?us-ascii?q?gYTiHSyXoolAQEBAQEBAQMBAQEBASOLJooNHwWbIYZbimp0gWGOF5JcNiGBJCk?=
 =?us-ascii?q?IhmY9NYhmAQEB?=
Received: from 251.62-177-91.adsl-dyn.isp.belgacom.be (HELO
 kalimero.tijl.coosemans.org) ([91.177.62.251])
 by relay.skynet.be with ESMTP; 10 Jan 2017 11:59:14 +0100
Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org
 [127.0.0.1])
 by kalimero.tijl.coosemans.org (8.15.2/8.15.2) with ESMTP id v0AAxDH6010234;
 Tue, 10 Jan 2017 11:59:13 +0100 (CET)
 (envelope-from tijl@FreeBSD.org)
Date: Tue, 10 Jan 2017 11:59:13 +0100
From: Tijl Coosemans <tijl@FreeBSD.org>
To: Adam Weinberger <adamw@FreeBSD.org>
Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: Re: svn commit: r431051 - in head/security/gnupg20: . files
Message-ID: <20170110115913.3acb4642@kalimero.tijl.coosemans.org>
In-Reply-To: <201701100234.v0A2YXP8023349@repo.freebsd.org>
References: <201701100234.v0A2YXP8023349@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jan 2017 11:00:29 -0000

On Tue, 10 Jan 2017 02:34:33 +0000 (UTC) Adam Weinberger <adamw@FreeBSD.org> wrote:
> @@ -112,4 +111,5 @@ sbin/applygnupgdefaults
>  %%NLS%%share/locale/uk/LC_MESSAGES/gnupg2.mo
>  %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg2.mo
>  %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg2.mo
> -@unexec [ -L %D/bin/gpg ] && rm -f %D/bin/gpg || true
> +@postexec [ -e %D/bin/gpg ] || ln -s gpg2 %D/bin/gpg

When %D/bin/gpg is a symlink -e will test if the target exists so ln
may be executed with %D/bin/gpg a symlink to a nonexistent file which
means you should use "ln -sf" so ln can replace the dead link.

> +@postunexec [ "$(readlink %D/bin/gpg)" = "gpg2" ] && rm -f %D/bin/gpg || true

You can also use test -e here and also, if there's an error I think it
should be reported to the user instead of being masked with true.

@postunexec [ -e %D/bin/gpg ] || rm -f %D/bin/gpg