From owner-svn-ports-head@freebsd.org Tue Jan 10 15:52:57 2017 Return-Path: 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 DDCC5CA9773; Tue, 10 Jan 2017 15:52:57 +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 959881AA0; Tue, 10 Jan 2017 15:52:57 +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 v0AFquNv051175; Tue, 10 Jan 2017 15:52:56 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0AFquWO051171; Tue, 10 Jan 2017 15:52:56 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201701101552.v0AFquWO051171@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Tue, 10 Jan 2017 15:52:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431097 - in head/security: gnupg gnupg20 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jan 2017 15:52:58 -0000 Author: tijl Date: Tue Jan 10 15:52:56 2017 New Revision: 431097 URL: https://svnweb.freebsd.org/changeset/ports/431097 Log: Use the -f flag when creating the gpg -> gpg2 link because test -e returns false for dead links and ln should be allowed to replace them. Simplify removal of the link on uninstall. Approved by: adamw (maintainer) Modified: head/security/gnupg/Makefile head/security/gnupg/pkg-plist head/security/gnupg20/Makefile head/security/gnupg20/pkg-plist Modified: head/security/gnupg/Makefile ============================================================================== --- head/security/gnupg/Makefile Tue Jan 10 15:42:11 2017 (r431096) +++ head/security/gnupg/Makefile Tue Jan 10 15:52:56 2017 (r431097) @@ -2,7 +2,7 @@ PORTNAME= gnupg PORTVERSION= 2.1.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= GNUPG Modified: head/security/gnupg/pkg-plist ============================================================================== --- head/security/gnupg/pkg-plist Tue Jan 10 15:42:11 2017 (r431096) +++ head/security/gnupg/pkg-plist Tue Jan 10 15:52:56 2017 (r431097) @@ -117,5 +117,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 -@postexec [ -e %D/bin/gpg ] || ln -s gpg2 %D/bin/gpg -@postunexec [ "$(readlink %D/bin/gpg)" = "gpg2" ] && rm -f %D/bin/gpg || true +@postexec [ -e %D/bin/gpg ] || ln -sf gpg2 %D/bin/gpg +@postunexec [ -e %D/bin/gpg ] || rm -f %D/bin/gpg Modified: head/security/gnupg20/Makefile ============================================================================== --- head/security/gnupg20/Makefile Tue Jan 10 15:42:11 2017 (r431096) +++ head/security/gnupg20/Makefile Tue Jan 10 15:52:56 2017 (r431097) @@ -2,7 +2,7 @@ PORTNAME= gnupg PORTVERSION= 2.0.29 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= GNUPG PKGNAMESUFFIX= 20 Modified: head/security/gnupg20/pkg-plist ============================================================================== --- head/security/gnupg20/pkg-plist Tue Jan 10 15:42:11 2017 (r431096) +++ head/security/gnupg20/pkg-plist Tue Jan 10 15:52:56 2017 (r431097) @@ -111,5 +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 -@postexec [ -e %D/bin/gpg ] || ln -s gpg2 %D/bin/gpg -@postunexec [ "$(readlink %D/bin/gpg)" = "gpg2" ] && rm -f %D/bin/gpg || true +@postexec [ -e %D/bin/gpg ] || ln -sf gpg2 %D/bin/gpg +@postunexec [ -e %D/bin/gpg ] || rm -f %D/bin/gpg