From owner-svn-ports-head@freebsd.org  Tue Jan 10 15:42:13 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 416B9CA933A;
 Tue, 10 Jan 2017 15:42:13 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0FBF01387;
 Tue, 10 Jan 2017 15:42:12 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0AFgC6o046388;
 Tue, 10 Jan 2017 15:42:12 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0AFgCwQ046386;
 Tue, 10 Jan 2017 15:42:12 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201701101542.v0AFgCwQ046386@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 10 Jan 2017 15:42:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r431096 - head/security/gnupg1
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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:42:13 -0000

Author: tijl
Date: Tue Jan 10 15:42:11 2017
New Revision: 431096
URL: https://svnweb.freebsd.org/changeset/ports/431096

Log:
  Restore the link from gpg to gpg2 on uninstallation, removed in r431058.
  
  When gnupg is installed, installing gnupg1 overwrites the link.  Uninstall
  should restore the link so the system is back in the same state.
  
  Approved by:	adamw (maintainer)

Modified:
  head/security/gnupg1/Makefile
  head/security/gnupg1/pkg-plist

Modified: head/security/gnupg1/Makefile
==============================================================================
--- head/security/gnupg1/Makefile	Tue Jan 10 15:37:35 2017	(r431095)
+++ head/security/gnupg1/Makefile	Tue Jan 10 15:42:11 2017	(r431096)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	1.4.21
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 PKGNAMESUFFIX=	1

Modified: head/security/gnupg1/pkg-plist
==============================================================================
--- head/security/gnupg1/pkg-plist	Tue Jan 10 15:37:35 2017	(r431095)
+++ head/security/gnupg1/pkg-plist	Tue Jan 10 15:42:11 2017	(r431096)
@@ -42,3 +42,4 @@ man/man1/gpgv.1.gz
 %%NLS%%share/locale/uk/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gnupg.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gnupg.mo
+@postunexec [ ! -e %D/bin/gpg2 ] || ln -sf gpg2 %D/bin/gpg