From owner-svn-ports-head@freebsd.org  Tue Jan 10 15:15:03 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 5B53BCA997F;
 Tue, 10 Jan 2017 15:15:03 +0000 (UTC) (envelope-from adamw@adamw.org)
Received: from anoxia.adamw.org (anoxia.adamw.org [104.225.8.149])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "anoxia.adamw.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id D0DF1115B;
 Tue, 10 Jan 2017 15:15:02 +0000 (UTC) (envelope-from adamw@adamw.org)
Received: by anoxia.adamw.org (OpenSMTPD) with ESMTPSA id 54668db6
 TLS version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO;
 Tue, 10 Jan 2017 08:14:55 -0700 (MST)
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 10.2 \(3259\))
Subject: Re: svn commit: r431051 - in head/security/gnupg20: . files
From: Adam Weinberger <adamw@adamw.org>
In-Reply-To: <20170110115913.3acb4642@kalimero.tijl.coosemans.org>
Date: Tue, 10 Jan 2017 08:14:53 -0700
Cc: Adam Weinberger <adamw@FreeBSD.org>, ports-committers@freebsd.org,
 svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <95A8F085-783E-4EA7-B0F3-B47B0DCE7423@adamw.org>
References: <201701100234.v0A2YXP8023349@repo.freebsd.org>
 <20170110115913.3acb4642@kalimero.tijl.coosemans.org>
To: Tijl Coosemans <tijl@freebsd.org>
X-Mailer: Apple Mail (2.3259)
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jan 2017 15:15:03 -0000

> On 10 Jan, 2017, at 3:59, Tijl Coosemans <tijl@freebsd.org> wrote:
>=20
> 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
>=20
> 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.
>=20
>> +@postunexec [ "$(readlink %D/bin/gpg)" =3D "gpg2" ] && rm -f =
%D/bin/gpg || true
>=20
> 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.
>=20
> @postunexec [ -e %D/bin/gpg ] || rm -f %D/bin/gpg

Thanks, Tijl. Please, feel free to make the changes you recommend to all =
3 gnupg ports!

# Adam


--=20
Adam Weinberger
adamw@adamw.org
https://www.adamw.org