svn commit: r431058 - head/security/gnupg1

[Adam Weinberger]

Author: adamw
Date: Tue Jan 10 02:48:53 2017
New Revision: 431058
URL: https://svnweb.freebsd.org/changeset/ports/431058

Log:
  Standardize the COMMENT and pkg-descr with the other gnupg ports.
  
  Readline for everyone instead of it sometimes showing up and never
  being recorded.
  
  Don't link gpg to gpg2 on uninstallation. This is not a good idea.
  The gnupg{,20} ports handle creating that symlink.
  
  Remove the .sig file from distinfo.
  
  PORTREVISION bump for the dependency and plist changes.

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

Modified: head/security/gnupg1/Makefile
==============================================================================
--- head/security/gnupg1/Makefile	Tue Jan 10 02:46:49 2017	(r431057)
+++ head/security/gnupg1/Makefile	Tue Jan 10 02:48:53 2017	(r431058)
@@ -2,20 +2,20 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	1.4.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 PKGNAMESUFFIX=	1
 
 MAINTAINER=	adamw at FreeBSD.org
-COMMENT=	Minimal version of the PGP-compatible GNU Privacy Guard
+COMMENT=	The GNU Privacy Guard (minimalist "classic" version)
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CPE_VENDOR=	gnupg
 
-USES=		charsetfix compiler cpe gmake tar:bzip2
+USES=		charsetfix compiler cpe gmake readline tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-camellia \
 		--enable-noexecstack
@@ -51,9 +51,6 @@ LDAP_CONFIGURE_WITH=	ldap=${LOCALBASE}
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-SUID_GPG_PLIST_SUB=	GPGMODE=4555
-SUID_GPG_PLIST_SUB_OFF=	GPGMODE=
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "i386" && ${COMPILER_TYPE} == "clang"

Modified: head/security/gnupg1/distinfo
==============================================================================
--- head/security/gnupg1/distinfo	Tue Jan 10 02:46:49 2017	(r431057)
+++ head/security/gnupg1/distinfo	Tue Jan 10 02:48:53 2017	(r431058)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1471478689
+TIMESTAMP = 1484016284
 SHA256 (gnupg-1.4.21.tar.bz2) = 6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276
 SIZE (gnupg-1.4.21.tar.bz2) = 3689305
-SHA256 (gnupg-1.4.21.tar.bz2.sig) = 2836778a868cf45ba5c785221f447d34f841f5bb653fe2edf3a8dd88b486b26e
-SIZE (gnupg-1.4.21.tar.bz2.sig) = 287

Modified: head/security/gnupg1/pkg-descr
==============================================================================
--- head/security/gnupg1/pkg-descr	Tue Jan 10 02:46:49 2017	(r431057)
+++ head/security/gnupg1/pkg-descr	Tue Jan 10 02:48:53 2017	(r431058)
@@ -1,6 +1,10 @@
-GnuPG is a complete and free replacement for PGP. The security/gnupg
-port is the modern 2.x branch with support for newer algorithms, but
-the 1.x branch has few dependencies and is sufficient for most PGP
-operations using common algorithms.
+GnuPG is a complete and free replacement for PGP. This is the "classic"
+version, which doesn't support newer algorithms, but also has very
+few dependencies. Use security/gnupg unless you're sure you want thisone.
+
+GnuPG allows encrypting and signing your data and communication, and
+features a versatile key management system as well as access modules
+for many public key directories. GnuPG, also known as GPG, is a command
+line tool with features for easy integration with other applications.
 
 WWW: https://www.gnupg.org/

Modified: head/security/gnupg1/pkg-plist
==============================================================================
--- head/security/gnupg1/pkg-plist	Tue Jan 10 02:46:49 2017	(r431057)
+++ head/security/gnupg1/pkg-plist	Tue Jan 10 02:48:53 2017	(r431058)
@@ -1,4 +1,5 @@
-@(,,%%GPGMODE%%) bin/gpg
+%%SUID_GPG%%@(,,4555) bin/gpg
+%%NO_SUID_GPG%%bin/gpg
 bin/gpg-zip
 bin/gpgsplit
 bin/gpgv
@@ -41,4 +42,3 @@ 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
- at postunexec [ -r %D/bin/gpg2 ] && ln -s gpg2 %D/bin/gpg || true