diff --git a/mail/pine/Makefile b/mail/pine/Makefile index ab697756318..c8057b787d8 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.56 2003/10/05 21:42:29 jakob Exp $ +# $OpenBSD: Makefile,v 1.57 2004/05/11 22:29:23 jakob Exp $ COMMENT= "program for Internet E-mail and News" COMMENT-pico= "small text editor" @@ -6,8 +6,8 @@ COMMENT-pilot= "file system browser" CATEGORIES= mail news -VERSION= 4.58 -PICO_VERSION= 4.6 +VERSION= 4.60 +PICO_VERSION= 4.7 PILOT_VERSION= 2.0 DISTNAME= pine${VERSION} @@ -28,6 +28,7 @@ PERMIT_DISTFILES_CDROM= No PERMIT_DISTFILES_FTP= Yes NO_REGRESS= Yes +VMEM_WARNING= Yes FLAVORS= kerberos ldap FLAVOR?= @@ -65,10 +66,8 @@ do-build: do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pine ${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${PREFIX}/share/doc/pine - ${INSTALL_DATA} ${FILESDIR}/dot.pinerc.pgp.sample ${PREFIX}/share/doc/pine cd ${WRKSRC}/bin; ${INSTALL_PROGRAM} pico pilot pine rpdump rpload \ ${PREFIX}/bin - cd ${FILESDIR}; ${INSTALL_SCRIPT} pgpencrypt pgpdecode pgpsign ${PREFIX}/bin cd ${WRKSRC}/doc; ${INSTALL_MAN} pico.1 pilot.1 pine.1 rpdump.1 rpload.1 \ ${PREFIX}/man/man1 diff --git a/mail/pine/distinfo b/mail/pine/distinfo index 7e9eb7e1b74..2a4d4e12eff 100644 --- a/mail/pine/distinfo +++ b/mail/pine/distinfo @@ -1,3 +1,3 @@ -MD5 (pine4.58.tar.gz) = 9fff1ca5fa2363f5684c144a9da4c7ef -RMD160 (pine4.58.tar.gz) = 20573d54b99cad0bf57abeba322520de596902df -SHA1 (pine4.58.tar.gz) = 1ebffc19fd4d58c0383c8d63bfa529559ab7c7d7 +MD5 (pine4.60.tar.gz) = 4d9e42e00d7a1bef3d55355e022f0d91 +RMD160 (pine4.60.tar.gz) = ff323f9ca90dda61354dafc42ae4859f1bc53ae4 +SHA1 (pine4.60.tar.gz) = fb77b9139855292b053aab730ec8a6e07668cffa diff --git a/mail/pine/files/dot.pinerc.pgp.sample b/mail/pine/files/dot.pinerc.pgp.sample deleted file mode 100644 index 1f7df9e4fe2..00000000000 --- a/mail/pine/files/dot.pinerc.pgp.sample +++ /dev/null @@ -1,16 +0,0 @@ -# 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 86d5a97daa0..00000000000 --- a/mail/pine/files/pgpdecode +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh -# ---------- pgpdecode --------- -# 21.03.96 Roland Rosenfeld -# -# Sun Mar 24 12:01:21 MET 1996 Andreas Klemm -# 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 b727b669315..00000000000 --- a/mail/pine/files/pgpencrypt +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# ---------- pgpencrypt --------- -# 21.03.96 Roland Rosenfeld -pgp -feast $* diff --git a/mail/pine/files/pgpsign b/mail/pine/files/pgpsign deleted file mode 100644 index e56326cb1bf..00000000000 --- a/mail/pine/files/pgpsign +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# ---------- pgpsign --------- -# 21.03.96 Roland Rosenfeld -pgp -fast diff --git a/mail/pine/patches/patch-pico_pico_c b/mail/pine/patches/patch-pico_pico_c deleted file mode 100644 index 20c32334496..00000000000 --- a/mail/pine/patches/patch-pico_pico_c +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-pico_pico_c,v 1.2 2003/10/05 21:42:29 jakob Exp $ ---- pico/pico.c.orig Tue Feb 11 21:58:26 2003 -+++ pico/pico.c Sat Sep 20 00:08:13 2003 -@@ -219,7 +219,9 @@ PICO *pm; - switch(pico_all_done){ /* prepare for/handle final events */ - case COMP_EXIT : /* already confirmed */ - packheader(); -+#if 0 - stripwhitespace(); -+#endif - c |= COMP_EXIT; - break; - diff --git a/mail/pine/patches/patch-pine_pine_hlp b/mail/pine/patches/patch-pine_pine_hlp index 8643b09160e..8f3b08a0aa8 100644 --- a/mail/pine/patches/patch-pine_pine_hlp +++ b/mail/pine/patches/patch-pine_pine_hlp @@ -1,20 +1,7 @@ -$OpenBSD: patch-pine_pine_hlp,v 1.4 2003/10/05 21:42:29 jakob Exp $ +$OpenBSD: patch-pine_pine_hlp,v 1.5 2004/05/11 22:29:23 jakob Exp $ --- pine/pine.hlp.orig Tue Sep 9 23:19:06 2003 +++ pine/pine.hlp Sat Sep 20 00:08:13 2003 -@@ -1012,9 +1012,9 @@ Unix Pine: - executable <Unix search path>/pine - persnl cfg ~/.pinerc - except cfg ~/.pinercex -- global cfg /usr/local/lib/pine.conf -- fixed cfg /usr/local/lib/pine.conf.fixed -- local help /usr/local/lib/pine.info -+ global cfg /etc/pine.conf -+ fixed cfg /etc/pine.conf.fixed -+ local help /etc/pine.info - - interrupted ~/.pine-interrupted-mail - debug ~/.pine-debugN -@@ -1026,8 +1026,7 @@ Unix Pine: +@@ -809,8 +809,7 @@ postponed# ~/mail/postponed-msgs sentmail# ~/mail/sent-mail mailcap# ~/.mailcap + /etc/mailcap @@ -22,82 +9,9 @@ $OpenBSD: patch-pine_pine_hlp,v 1.4 2003/10/05 21:42:29 jakob Exp $ - mimetypes# ~/.mime.types + /etc/mime.types + /usr/local/lib/mime.types + mimetypes# ~/.mime.types + /etc/mime.types - news-spool varies across Unix flavors, e.g. /usr/spool/news or /var/news + news-spool varies across Unix flavors, e.g. /var/spool/news or /usr/spool/news active-news varies across Unix flavors, e.g. /usr/lib/news/active -@@ -1452,9 +1451,9 @@ contact email address may have been set - this link now to send a message to it:
-

- -- -+ -

Local Support Contacts:

-- -+ -

- -

-@@ -1542,7 +1541,7 @@ To Exit this screen and continue your Pi -

    -
  1. Introduction -
  2. Pine Help -- -+ -
  3. Local Support Contacts - -
  4. Giving Commands in Pine -@@ -1654,9 +1653,9 @@ copy of Pine you are using has been prop - at your site.) - - -- -+ -

    Local Support Contacts

    -- -+ - - -

    Giving Commands in Pine

    -@@ -2342,7 +2341,7 @@ screen or standard output. To generate a - file, execute - - 
    
--		pine -conf > /usr/local/lib/pine.conf
-+		pine -conf > /etc/pine.conf
-
    -

    - -@@ -2350,7 +2349,7 @@ To generate a system configuration file - system configuration file, execute - - 

    
--		pine -P old-pine.conf -conf > /usr/local/lib/pine.conf
-+		pine -P old-pine.conf -conf > /etc/pine.conf
-
    -

    - A system configuration file is not required. -@@ -2519,7 +2518,7 @@ Pinerc may be either a local file or a r -

    -P pinerc - -
    Uses the named file as the system wide configuration file instead of --/usr/local/lib/pine.conf on UNIX, or nothing on PC-Pine. -+/etc/pine.conf on UNIX, or nothing on PC-Pine. - Pinerc may be either a local file or a remote configuration folder. -

    - -@@ -3247,10 +3246,10 @@ In increasing order of precedence they a -

-

- The fixed configuration file is normally --/usr/local/lib/pine.conf.fixed. -+/etc/pine.conf.fixed. -

- The system-wide configuration file is normally --/usr/local/lib/pine.conf for Unix Pine and is normally not -+/etc/pine.conf for Unix Pine and is normally not - set for PC-Pine. - For PC-Pine, if the environment variable $PINECONF is set, that - is used for the system-wide configuration. -@@ -16269,7 +16268,7 @@ a semi-colon (;) under Windows; for exam +@@ -17782,7 +17781,7 @@ a colon (:) under UNIX; for example:

@@ -106,8 +20,8 @@ $OpenBSD: patch-pine_pine_hlp,v 1.4 2003/10/05 21:42:29 jakob Exp $

    -@@ -19068,7 +19067,7 @@ the fourth is for the connection method -

    OPTION: ssh-path

    +@@ -20847,7 +20846,7 @@ +

    OPTION: Ssh-Path

    Sets the name of the command used to open a UNIX secure shell -connection. The default is typically /usr/local/bin/ssh. @@ -115,16 +29,16 @@ $OpenBSD: patch-pine_pine_hlp,v 1.4 2003/10/05 21:42:29 jakob Exp $

    • Finding more information and requesting help -@@ -20451,7 +20450,7 @@ argument (see the "lynx" examp +@@ -22632,7 +22631,7 @@ So, here are some example entries: 
      - url-viewers = _TEST("test -n '${DISPLAY}'")_  /usr/local/bin/netscape
+ URL-Viewers = _TEST("test -n '${DISPLAY}'")_  /usr/local/bin/netscape
 -              "/usr/local/bin/lynx _URL_"
 +              "/usr/bin/lynx _URL_"
                C:\BIN\NETSCAPE.BAT

      -@@ -20459,7 +20458,7 @@ This example shows that for the first vi +@@ -22640,7 +22639,7 @@ the environment variable "DISPLAY" must be defined. If it is, then the path and file "/usr/local/bin/netscape" must exist. If neither condition is met, @@ -133,8 +47,8 @@ $OpenBSD: patch-pine_pine_hlp,v 1.4 2003/10/05 21:42:29 jakob Exp $ If it does, then the "_URL_" token is replaced by the selected URL. If the path to "lynx" is invalid, then the final path and file C:\BIN\NETSCAPE.BAT must exist. -@@ -20555,7 +20554,7 @@ because of its length, but should all ap - url-viewers = _TEST("test -L /myhomedir/.netscape/lock")_ "/usr/local/bin/netscape -remote 'openURL(_URL_, new-window)' &"
      +@@ -22736,7 +22735,7 @@ + URL-Viewers = _TEST("test -L /myhomedir/.netscape/lock")_ "/usr/local/bin/netscape -remote 'openURL(_URL_, new-window)' &"
      _TEST("test -n '${DISPLAY}'")_ "/usr/local/bin/netscape &"
      - "/usr/local/bin/lynx '_URL_'" diff --git a/mail/pine/pkg/DESCR b/mail/pine/pkg/DESCR index 5dc45ff7d14..c53e9264d5e 100644 --- a/mail/pine/pkg/DESCR +++ b/mail/pine/pkg/DESCR @@ -12,10 +12,6 @@ An optional configuration file "pine.conf" can be put into /etc 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 dot.pinerc.pgp.sample are example entries needed to add -to your .pinerc to activate the pgp add on scripts pgpdecode, pgpencode, -and pgpsign. - Flavors: ldap build with support for LDAP diff --git a/mail/pine/pkg/PLIST b/mail/pine/pkg/PLIST index ef5d749a4c8..9c4da2de76b 100644 --- a/mail/pine/pkg/PLIST +++ b/mail/pine/pkg/PLIST @@ -1,13 +1,9 @@ -@comment $OpenBSD: PLIST,v 1.11 2002/12/01 20:57:10 jakob Exp $ +@comment $OpenBSD: PLIST,v 1.12 2004/05/11 22:29:23 jakob Exp $ bin/pine -bin/pgpencrypt -bin/pgpdecode -bin/pgpsign bin/rpdump bin/rpload man/man1/pine.1 man/man1/rpdump.1 man/man1/rpload.1 share/doc/pine/tech-notes.txt -share/doc/pine/dot.pinerc.pgp.sample @dirrm share/doc/pine