svn commit: r431097 - in head/security: gnupg gnupg20

[Tijl Coosemans]

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
- at postexec [ -e %D/bin/gpg ] || ln -s gpg2 %D/bin/gpg
- at postunexec [ "$(readlink %D/bin/gpg)" = "gpg2" ] && rm -f %D/bin/gpg || true
+ at postexec [ -e %D/bin/gpg ] || ln -sf gpg2 %D/bin/gpg
+ at 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
- at postexec [ -e %D/bin/gpg ] || ln -s gpg2 %D/bin/gpg
- at postunexec [ "$(readlink %D/bin/gpg)" = "gpg2" ] && rm -f %D/bin/gpg || true
+ at postexec [ -e %D/bin/gpg ] || ln -sf gpg2 %D/bin/gpg
+ at postunexec [ -e %D/bin/gpg ] || rm -f %D/bin/gpg