Update mail/pine-pgp-filters and fix a DESTDIR issue.

Three pkgsrc patches integrated, plus changes since 1.1:

----- November 2007 - Version 1.6 released -----

1. Check for gpg2 first, and prefer it if available.

----- November 2007 - Version 1.5 released -----

3. Add a --- Status --- line for the beginning and end of the PGP
   stuff which includes a timestamp to help avoid a socially engineered
   message that includes the "good signature" output in the same format
   as what we print.

2. Make sure that all --- Status --- messages are 76 characters long.

1. When displaying MIME messages after verification, substitute a space
   for the MIME'ified =20 character at the end of a line, and substitute
   an = sign for the MIME'ified =3D. This greatly improves readability
   of the verified message.

----- July - October 2007 - Version 1.4 developed, not released -----

NB: Support for older versions of pgp, and PGP from PGP Inc. has
been dropped in this version. GnuPG is now a requirement. This is
in line with the requirements for other PGP addons such as enigmail
for Thunderbird.

Benjamin R. Haskell, pine-pgp ~ benizi.com was instrumental in helping
to suggest methods for and test the results of changes 1-5 in this
version. Thanks!

6. Fix error handling in ppf_mime_decrypt, and make use of the $cfile
   variable instead of guessing which file has the message.

5. Look for gpg in PREFIX/bin, /usr/bin, and /bin in that order.

4. Move "build" of the scripts to an all target in the Makefile.

3. Change to using csplit since command line options for both
   GNU and BSD versions are compatible, unlike split.

2. Improve portability for users of GNU make and mktemp.

1. Add error handling for failed TDIR creation in ppf_decrypt,
   ppf_verify, and ppf_mime*.

----- October 2006 - Version 1.3 released -----

6. Include more mail headers in the grep'ed output of the MIME scripts,
   and try to strip more MIME headers from the message.

5. Use local for function variables.

4. Remove commented out code for really old versions of pgp.

3. Do a better job of finding the crucial bits of a MIME message, and
   fail more gracefully if we do not.

2. Fix bug that prevented ppf_mime* from working with messages sent by
   Evolution, KMail, and any other MIME client that interprets RFC 3156
   the same way. (Thanks to Bjoern A. Zeeb <bzeeb@zabbadoz.not> for the tip!)

1. Update e-mail and web addresses.

----- April 2005 - Version 1.2 released -----

7. Update copyright for this year, and use my full given name.

6. For sign and encrypt, scan the headers to determine the right user.
   This requires adding _INCLUDEALLHDRS_ to the filter line.

5. Add a message to tell users why their password is needed for ppf_decrypt.

4. Create symlinks in PREFIX/bin for the ppf_mime* scripts.

3. Add User-Agent to the list of headers to display in mime filters.

2. Add a first pass at a ppf_mime_decrypt script. More work is
   needed here, see BUGS.

1. In some past version of Pine, the display of filter output changed,
   so adjust the line length of some of the messages to accommodate.

7 files changed, 38 insertions, 101 deletions

diff --git a/mail/pine-pgp-filters/Makefile b/mail/pine-pgp-filters/Makefile
index 76b555692e7..7f1aec3f5d9 100644
--- a/mail/pine-pgp-filters/Makefile
+++ b/mail/pine-pgp-filters/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:35 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/12 21:46:44 abs Exp $
 #
 
-DISTNAME=		pine-pgp-filters-1.1
-PKGREVISION=		3
+DISTNAME=		pine-pgp-filters-1.6
 CATEGORIES=		security mail
-MASTER_SITES=		http://dougbarton.us/PGP/scripts/ppf/Old/
+MASTER_SITES=		http://dougbarton.us/PGP/scripts/ppf/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://dougbarton.us/PGP/scripts/ppf/
@@ -20,13 +19,16 @@ DOCFILES=		BUGS CHANGES INSTALL LICENSE README
 
 INSTALLATION_DIRS=	${DOCDIR}
 
-do-build:
+post-build:
 .for f in ${DOCFILES}
 	${SED} 's:/usr/local:${PREFIX}:g' ${WRKSRC}/${f} > ${WRKSRC}/${f}.gen
 .endfor
 
+pre-install:
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/libexec
+
 post-install:
-	${RM} ${DESTDIR}${PREFIX}/libexec/ppf_*.orig
 .for f in ${DOCFILES}
 	${INSTALL_DATA} ${WRKSRC}/${f}.gen ${DESTDIR}${DOCDIR}/${f}
 .endfor
diff --git a/mail/pine-pgp-filters/PLIST b/mail/pine-pgp-filters/PLIST
index 39ad77c9d0c..e391eb3c77f 100644
--- a/mail/pine-pgp-filters/PLIST
+++ b/mail/pine-pgp-filters/PLIST
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/19 00:55:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/06/12 21:46:44 abs Exp $
+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
 share/doc/pine-pgp-filters/BUGS
diff --git a/mail/pine-pgp-filters/distinfo b/mail/pine-pgp-filters/distinfo
index 321e43efaf7..52cd93f5657 100644
--- a/mail/pine-pgp-filters/distinfo
+++ b/mail/pine-pgp-filters/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.4 2008/06/12 02:14:35 joerg Exp $
+$NetBSD: distinfo,v 1.5 2008/06/12 21:46:44 abs Exp $
 
-SHA1 (pine-pgp-filters-1.1.tar.gz) = e81d5ff8c3632d423728aeaed32236093a62a6db
-RMD160 (pine-pgp-filters-1.1.tar.gz) = cf97953b4bcee6cbecde3ee380c6c3d0e08df05c
-Size (pine-pgp-filters-1.1.tar.gz) = 6859 bytes
-SHA1 (patch-aa) = 0059bdd731355b7f94e1333c5c476774cffd3ca2
-SHA1 (patch-ab) = 271a81ba0bcc224040e663bf8961c81d136e6edd
-SHA1 (patch-ac) = 4e7ba38d8b4f1d393264fe207ab4ef8e312fcc40
-SHA1 (patch-ad) = 833fa184d041fd4c6983628ea807110e4fa18e4f
+SHA1 (pine-pgp-filters-1.6.tar.gz) = 5d1a4d679a477736ff55fc05802bc2ad752ab4e4
+RMD160 (pine-pgp-filters-1.6.tar.gz) = b1a76358761958e07c184d84e3942fe8071a5135
+Size (pine-pgp-filters-1.6.tar.gz) = 10034 bytes
+SHA1 (patch-ad) = ebb5c15ef4aeceb7c3c6bb01375e7ef0cea8d79b
diff --git a/mail/pine-pgp-filters/patches/patch-aa b/mail/pine-pgp-filters/patches/patch-aa
deleted file mode 100644
index 6544399e59f..00000000000
--- a/mail/pine-pgp-filters/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/02/07 15:54:04 abs Exp $
-
---- scripts/ppf_decrypt.orig	2003-09-06 23:25:42.000000000 +0100
-+++ scripts/ppf_decrypt
-@@ -11,11 +11,11 @@ trap "rm -f ${TDIR}/* ; rmdir ${TDIR} ; 
- pgp_failed () {
- 	message_file="${1}"
- 
--	echo '------------------------------------------------------------------------------' >${TDIR}/error
-+	echo '----------------------------------------------------------------------------' >${TDIR}/error
- 	echo "$0: ${2:-pgp command failed}" >>${TDIR}/error
- 	echo '' >>${TDIR}/error
- 	cat ${TDIR}/stderr >>${TDIR}/error
--	echo '------------------------------------------------------------------------------' >>${TDIR}/error
-+	echo '----------------------------------------------------------------------------' >>${TDIR}/error
- 	echo '' >>${TDIR}/error
- 	cp ${message_file} ${TDIR}/message
- 	cat ${TDIR}/error ${TDIR}/message > ${message_file}
-@@ -38,9 +38,9 @@ else
- 	pgp_failed ${1} "Can't find pgp on this system"
- fi
- 
--echo '----------------------------- PGP Command Output -----------------------------' >${1}
-+echo '--------------------------- PGP Command Output -----------------------------' >${1}
- grep -v '^$' ${TDIR}/stderr >>${1}
--echo '------------------------------- End PGP Output -------------------------------' >>${1}
-+echo '----------------------------- End PGP Output -------------------------------' >>${1}
- echo '' >>${1}
- cat ${TDIR}/message >>${1}
- 
diff --git a/mail/pine-pgp-filters/patches/patch-ab b/mail/pine-pgp-filters/patches/patch-ab
deleted file mode 100644
index 597499f4bdf..00000000000
--- a/mail/pine-pgp-filters/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/02/07 15:54:04 abs Exp $
-
---- scripts/ppf_mime.orig	2003-09-05 11:23:43.000000000 +0100
-+++ scripts/ppf_mime
-@@ -41,9 +41,9 @@ fi
- egrep -hi '^(From|Resent-From|To|Resent-To|Cc|Resent-cc|Bcc|Newsgroups|Followup-To|Date|Resent-Date|Organization|Subject|Resent-Subject|Reply-To):' ${TDIR}/fa[ab]
- echo ''
- 
--echo '----------------------------- PGP Command Output -----------------------------'
-+echo '--------------------------- PGP Command Output -----------------------------'
- grep -v '^$' ${TDIR}/stderr
--echo '------------------------------- End PGP Output -------------------------------'
-+echo '----------------------------- End PGP Output -------------------------------'
- 
- # Remove the MIME headers from the message
- sed -e '1,2d' -e '3s/^Content-.*//' ${TDIR}/message
diff --git a/mail/pine-pgp-filters/patches/patch-ac b/mail/pine-pgp-filters/patches/patch-ac
deleted file mode 100644
index 2581112fd46..00000000000
--- a/mail/pine-pgp-filters/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/02/07 15:54:05 abs Exp $
-
---- scripts/ppf_verify.orig	2003-09-06 23:26:42.000000000 +0100
-+++ scripts/ppf_verify
-@@ -11,11 +11,11 @@ trap "rm -f ${TDIR}/* ; rmdir ${TDIR} ; 
- pgp_failed () {
- 	message_file="${1}"
- 
--	echo '------------------------------------------------------------------------------' >${TDIR}/error
-+	echo '----------------------------------------------------------------------------' >${TDIR}/error
- 	echo "$0: ${2:-pgp command failed}" >>${TDIR}/error
- 	echo '' >>${TDIR}/error
- 	cat ${TDIR}/stderr >>${TDIR}/error
--	echo '------------------------------------------------------------------------------' >>${TDIR}/error
-+	echo '----------------------------------------------------------------------------' >>${TDIR}/error
- 	echo '' >>${TDIR}/error
- 	cp ${message_file} ${TDIR}/message
- 	cat ${TDIR}/error ${TDIR}/message > ${message_file}
-@@ -36,9 +36,9 @@ else
- 	pgp_failed ${1} "Can't find pgp on this system"
- fi
- 
--echo '----------------------------- PGP Command Output -----------------------------' >${1}
-+echo '--------------------------- PGP Command Output -----------------------------' >${1}
- egrep -v '^$|pattern is:' ${TDIR}/stderr >>${1}
--echo '------------------------------- End PGP Output -------------------------------' >>${1}
-+echo '----------------------------- End PGP Output -------------------------------' >>${1}
- echo '' >>${1}
- cat ${TDIR}/message >>${1}
- 
diff --git a/mail/pine-pgp-filters/patches/patch-ad b/mail/pine-pgp-filters/patches/patch-ad
index 2d9f388766a..978d5723a53 100644
--- a/mail/pine-pgp-filters/patches/patch-ad
+++ b/mail/pine-pgp-filters/patches/patch-ad
@@ -1,16 +1,27 @@
-$NetBSD: patch-ad,v 1.1 2008/06/12 02:14:35 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2008/06/12 21:46:44 abs Exp $
 
---- Makefile.in.orig	2008-06-11 08:57:56.000000000 +0000
+--- Makefile.in.orig	2007-07-30 20:58:43.000000000 +0100
 +++ Makefile.in
-@@ -1,9 +1,9 @@
+@@ -10,17 +10,17 @@ all:
  
  install:
- .if !exists(@@PREFIX@@/libexec)
--	install -d -m 755 @@PREFIX@@/libexec
-+	install -d -m 755 ${DESTDIR}@@PREFIX@@/libexec
- .endif
--	install -m 555 ${.CURDIR}/obj/ppf_* @@PREFIX@@/libexec
-+	install -m 555 ${.CURDIR}/obj/ppf_* ${DESTDIR}@@PREFIX@@/libexec
+ 	@if [ ! -d @@PREFIX@@/libexec ]; then \
+-		install -d -m 755 @@PREFIX@@/libexec; \
++		install -d -m 755 ${DESTDIR}/@@PREFIX@@/libexec; \
+ 	fi
+ 
+-	install -m 555 $$PWD/out/ppf_* @@PREFIX@@/libexec
++	install -m 555 $$PWD/out/ppf_* ${DESTDIR}/@@PREFIX@@/libexec
+ 
+ 	@if [ ! -d @@PREFIX@@/bin ]; then \
+-		install -d -m 755 @@PREFIX@@/bin; \
++		install -d -m 755 ${DESTDIR}/@@PREFIX@@/bin; \
+ 	fi
+ 
+-	ln -sf @@PREFIX@@/libexec/ppf_mime @@PREFIX@@/bin/ppf_mime
+-	ln -sf @@PREFIX@@/libexec/ppf_mime_decrypt @@PREFIX@@/bin/ppf_mime_decrypt
++	ln -sf @@PREFIX@@/libexec/ppf_mime ${DESTDIR}/@@PREFIX@@/bin/ppf_mime
++	ln -sf @@PREFIX@@/libexec/ppf_mime_decrypt ${DESTDIR}/@@PREFIX@@/bin/ppf_mime_decrypt
  
  clean:
- 	rm -f ${.CURDIR}/obj/*
+ 	@if [ -d "$$PWD/out" ]; then \