diff options
| -rw-r--r-- | mail/pine/MESSAGE | 8 | ||||
| -rw-r--r-- | mail/pine/Makefile | 8 | ||||
| -rw-r--r-- | mail/pine/PLIST | 6 | ||||
| -rw-r--r-- | mail/pine/files/dot.pinerc.pgp.sample | 18 | ||||
| -rw-r--r-- | mail/pine/files/pgpdecode | 17 | ||||
| -rw-r--r-- | mail/pine/files/pgpencrypt | 7 | ||||
| -rw-r--r-- | mail/pine/files/pgpsign | 7 |
7 files changed, 7 insertions, 64 deletions
diff --git a/mail/pine/MESSAGE b/mail/pine/MESSAGE index a7155455767..2a845f8e8fe 100644 --- a/mail/pine/MESSAGE +++ b/mail/pine/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2003/06/28 18:16:02 jschauma Exp $ +$NetBSD: MESSAGE,v 1.2 2004/05/07 20:00:53 reed Exp $ If you want to use the spell checking feature of pine, set the environment variable SPELL to "${PREFIX}/bin/ispell -l". @@ -8,7 +8,7 @@ The optional configuration file "${PKG_SYSCONFDIR}/pine.conf" can be used to set system wide defaults. The format of this file is identical to the .pinerc file that is auto-generated by pine in your home directory. -Also included in ${PREFIX}/share/examples/pine/dot.pinerc.pgp.sample are -example entries needed to add to your .pinerc to activate the pgp add on -scripts pgpdecode, pgpencode, and pgpsign. +If you need PGP (or GPG) features, consider installing the +security/pinepgp package. + =========================================================================== diff --git a/mail/pine/Makefile b/mail/pine/Makefile index 138a182f835..ac75699e839 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.86 2004/05/02 00:22:20 snj Exp $ +# $NetBSD: Makefile,v 1.87 2004/05/07 20:00:53 reed Exp $ DISTNAME= pine4.58 PKGNAME= pine-4.58 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= mail news MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \ ftp://ftp.fu-berlin.de/unix/mail/pine/ @@ -66,11 +66,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/bin/rpdump ${PREFIX}/bin/ ${INSTALL_PROGRAM} ${WRKSRC}/bin/rpload ${PREFIX}/bin/ - ${INSTALL_SCRIPT} ${FILESDIR}/pgpencrypt ${PREFIX}/bin/ - ${INSTALL_SCRIPT} ${FILESDIR}/pgpdecode ${PREFIX}/bin/ - ${INSTALL_SCRIPT} ${FILESDIR}/pgpsign ${PREFIX}/bin/ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pine - ${INSTALL_DATA} ${FILESDIR}/dot.pinerc.pgp.sample ${PREFIX}/share/examples/pine/dot.pinerc.pgp ${INSTALL_MAN} ${WRKSRC}/doc/pine.1 ${PREFIX}/man/man1/pine.1 ( ${ECHO} '# (This file is not part of the pine distribution! - HF)' ; \ ${PREFIX}/bin/pine -conf ) | ${SED} \ diff --git a/mail/pine/PLIST b/mail/pine/PLIST index 3bf76b83095..51a3b3cb9bf 100644 --- a/mail/pine/PLIST +++ b/mail/pine/PLIST @@ -1,7 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2003/09/18 18:36:26 wiz Exp $ -bin/pgpdecode -bin/pgpencrypt -bin/pgpsign +@comment $NetBSD: PLIST,v 1.5 2004/05/07 20:00:53 reed Exp $ bin/pine bin/rpdump bin/rpload @@ -16,7 +13,6 @@ share/pine/contrib/utils/pwd2pine share/pine/contrib/utils/sendit.sh share/pine/contrib/utils/sendtoall share/pine/contrib/utils/txtcc.sh -share/examples/pine/dot.pinerc.pgp share/examples/pine/pine.conf share/examples/pine/pine.conf.fixed @dirrm share/pine/contrib/utils diff --git a/mail/pine/files/dot.pinerc.pgp.sample b/mail/pine/files/dot.pinerc.pgp.sample deleted file mode 100644 index ee3a8d78592..00000000000 --- a/mail/pine/files/dot.pinerc.pgp.sample +++ /dev/null @@ -1,18 +0,0 @@ -# $NetBSD: dot.pinerc.pgp.sample,v 1.2 1998/08/07 11:09:46 agc Exp $ -# -# List of features; see Pine's Setup/options menu for the current set. -# e.g. feature-list= select-without-confirm, signature-at-bottom -# Default condition for all of the features is no-. -feature-list=compose-send-offers-first-filter - -# This variable takes a list of programs that message text is piped into -# after MIME decoding, prior to display. -display-filters="-----BEGIN PGP" /usr/local/bin/pgpdecode - -# This defines a program that message text is piped into before MIME -# encoding, prior to sending -sending-filters=/usr/local/bin/pgpsign, - /usr/local/bin/pgpencrypt _RECIPIENTS_ - -# hook, to get rid of the sucking 'quoted printable' ;-)) -# enable-8bit-esmtp-negotiation diff --git a/mail/pine/files/pgpdecode b/mail/pine/files/pgpdecode deleted file mode 100644 index 0236aec9092..00000000000 --- a/mail/pine/files/pgpdecode +++ /dev/null @@ -1,17 +0,0 @@ -#! /bin/sh -# -# $NetBSD: pgpdecode,v 1.2 1998/08/07 11:09:46 agc Exp $ -# -# ---------- pgpdecode --------- -# 21.03.96 Roland Rosenfeld <roland@spinnaker.rhein.de> -# -# Sun Mar 24 12:01:21 MET 1996 Andreas Klemm <andreas@knobel.gun.de> -# The tmp files in the original version were world readable for -# the short time of unpacking, setting suitable umask prevents this -# -umask 077 -trap "rm -f /tmp/pgpdecode.???.$$; exit" 0 1 2 15 -(pgp -f > /tmp/pgpdecode.txt.$$) 2>&1 | tee /tmp/pgpdecode.pgp.$$ 1>&2 -sed -e 's/^/| /' /tmp/pgpdecode.pgp.$$ -echo " " -cat /tmp/pgpdecode.txt.$$ diff --git a/mail/pine/files/pgpencrypt b/mail/pine/files/pgpencrypt deleted file mode 100644 index a5a680aef43..00000000000 --- a/mail/pine/files/pgpencrypt +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# -# $NetBSD: pgpencrypt,v 1.2 1998/08/07 11:09:46 agc Exp $ -# -# ---------- pgpencrypt --------- -# 21.03.96 Roland Rosenfeld <roland@spinnaker.rhein.de> -pgp -feast $* diff --git a/mail/pine/files/pgpsign b/mail/pine/files/pgpsign deleted file mode 100644 index 0e8afbbb5df..00000000000 --- a/mail/pine/files/pgpsign +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# -# $NetBSD: pgpsign,v 1.2 1998/08/07 11:09:46 agc Exp $ -# -# ---------- pgpsign --------- -# 21.03.96 Roland Rosenfeld <roland@spinnaker.rhein.de> -pgp -fast |