Update to version 1.7, which has the following changes:

1. Use a more reliable method to find the signature and message parts
   in the ppf_mime script.

2. Add support for the OpenPGP header in ppf_sign and ppf_encrypt, and
   use the same method to sanitize the key ID as was already done for
   the other headers.

For the port:
1. Update the URL to the web site
2. Switch to PLIST_FILES and PORTDOCS macros

4 files changed, 17 insertions, 26 deletions

diff --git a/mail/pine-pgp-filters/Makefile b/mail/pine-pgp-filters/Makefile
index ea1e3ee4a33f..023c1edb9bd1 100644
--- a/mail/pine-pgp-filters/Makefile
+++ b/mail/pine-pgp-filters/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	pine-pgp-filters
-PORTVERSION=	1.6
-PORTREVISION=	1
+PORTVERSION=	1.7
 CATEGORIES=	mail security
-MASTER_SITES=	http://dougbarton.us/PGP/scripts/ppf/ \
+MASTER_SITES=	http://dougbarton.us/PGP/ppf/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	dougb
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
@@ -18,6 +17,10 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	DougB@FreeBSD.org
 COMMENT=	Simple /bin/sh-based filters to use GnuPG with Alpine
 
+PLIST_FILES=	bin/ppf_mime bin/ppf_mime_decrypt \
+		libexec/ppf_decrypt libexec/ppf_encrypt libexec/ppf_mime \
+		libexec/ppf_mime_decrypt libexec/ppf_sign libexec/ppf_verify
+
 .include <bsd.port.pre.mk>
 
 RUN_DEPENDS=	alpine:${PORTSDIR}/mail/alpine
@@ -38,10 +41,12 @@ verify:	checksum
 do-configure:
 	@(cd ${WRKSRC} && ./configure --prefix=${PREFIX})
 
+PORTDOCS=	BUGS CHANGES INSTALL LICENSE README
+
 post-install:
 .if !defined(NOPORTDOCS)
-	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${DOCSDIR}
-.for file in BUGS CHANGES INSTALL LICENSE README
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
diff --git a/mail/pine-pgp-filters/distinfo b/mail/pine-pgp-filters/distinfo
index 642e01815362..ce5665e582bc 100644
--- a/mail/pine-pgp-filters/distinfo
+++ b/mail/pine-pgp-filters/distinfo
@@ -1,6 +1,6 @@
-MD5 (pine-pgp-filters-1.6.tar.gz) = d1aff26af1fdfb2269ae8a5064df2e82
-SHA256 (pine-pgp-filters-1.6.tar.gz) = 563f6a480c2177b216c1aa88c27fbd095b37b515b83748ae600c7d1e649c216d
-SIZE (pine-pgp-filters-1.6.tar.gz) = 10034
-MD5 (pine-pgp-filters-1.6.tar.gz.asc) = 7cec8bdb9bf68a6973aa7232b3d7156e
-SHA256 (pine-pgp-filters-1.6.tar.gz.asc) = dd6c5740fa68191d6a69de802887bc76df90c21830c58aa1c961998d95693ef3
-SIZE (pine-pgp-filters-1.6.tar.gz.asc) = 187
+MD5 (pine-pgp-filters-1.7.tar.gz) = 92db2ad37f888c1ec591500757f6fed8
+SHA256 (pine-pgp-filters-1.7.tar.gz) = 67dc5a877e9233c74e738ba90049bdc8ae3e635aed1637840853cd6804acaab1
+SIZE (pine-pgp-filters-1.7.tar.gz) = 10120
+MD5 (pine-pgp-filters-1.7.tar.gz.asc) = f26ba72786c8acb6a4ddce57b6e42d6a
+SHA256 (pine-pgp-filters-1.7.tar.gz.asc) = f1ba004cf29954f36d9006b46eec6168e6cef54d4bf4f4e93271e4c337010b6a
+SIZE (pine-pgp-filters-1.7.tar.gz.asc) = 488
diff --git a/mail/pine-pgp-filters/pkg-descr b/mail/pine-pgp-filters/pkg-descr
index 4c159dfa3d58..caad1b460c8d 100644
--- a/mail/pine-pgp-filters/pkg-descr
+++ b/mail/pine-pgp-filters/pkg-descr
@@ -6,7 +6,7 @@ that were sent using MIME encoding.
 
 See the INSTALL file for instructions on how to configure these filters.
 
-WWW: http://dougbarton.us/PGP/scripts/ppf/
+WWW: http://dougbarton.us/PGP/ppf/
 
 - Doug Barton
 DougB@FreeBSD.org
diff --git a/mail/pine-pgp-filters/pkg-plist b/mail/pine-pgp-filters/pkg-plist
deleted file mode 100644
index 5d26b6b46a65..000000000000
--- a/mail/pine-pgp-filters/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/ppf_mime
-bin/ppf_mime_decrypt
-libexec/ppf_decrypt
-libexec/ppf_encrypt
-libexec/ppf_mime
-libexec/ppf_mime_decrypt
-libexec/ppf_sign
-libexec/ppf_verify
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%