From 92b6b501f6a0fc22e618c8e09764cbdc3ba219af Mon Sep 17 00:00:00 2001 From: brad Date: Thu, 18 Jan 2001 18:51:36 +0000 Subject: [PATCH] upgrade to Pine 4.32 --- mail/pine/Makefile | 4 ++-- mail/pine/files/md5 | 6 ++--- mail/pine/patches/patch-build | 10 ++++----- mail/pine/patches/patch-doc_tech-notes.txt | 26 +++++++++++----------- mail/pine/patches/patch-pine_pine.hlp | 20 ++++++++--------- 5 files changed, 33 insertions(+), 33 deletions(-) diff --git a/mail/pine/Makefile b/mail/pine/Makefile index a3b83943f95..36ee8c164da 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.23 2000/12/31 04:49:37 brad Exp $ +# $OpenBSD: Makefile,v 1.24 2001/01/18 18:51:36 brad Exp $ -VERSION= 4.31 +VERSION= 4.32 DISTNAME= pine${VERSION} NEED_VERSION= 1.336 MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \ diff --git a/mail/pine/files/md5 b/mail/pine/files/md5 index 2db2f217154..77ffaee26e9 100644 --- a/mail/pine/files/md5 +++ b/mail/pine/files/md5 @@ -1,3 +1,3 @@ -MD5 (pine4.31.tar.gz) = a0a99a399a9667268ad1a62afdfa164e -RMD160 (pine4.31.tar.gz) = 77f03b507c9a0954dcfd840ba3750691feba3f9a -SHA1 (pine4.31.tar.gz) = ce3787f0d391945fcc647930eef865a8e9a27ac3 +MD5 (pine4.32.tar.gz) = f9031683c5a69873535694f49edbbc15 +RMD160 (pine4.32.tar.gz) = 64e5290f963e0cd8c9d9b79d16ebdda3732b7168 +SHA1 (pine4.32.tar.gz) = 4aaaf7be8039bf15827660f461412b89fcd223fa diff --git a/mail/pine/patches/patch-build b/mail/pine/patches/patch-build index d78f8b41cf3..4297c710cdf 100644 --- a/mail/pine/patches/patch-build +++ b/mail/pine/patches/patch-build @@ -1,6 +1,6 @@ ---- build.orig Fri Dec 8 12:21:34 2000 -+++ build Fri Dec 8 12:23:39 2000 -@@ -304,18 +304,6 @@ +--- build.orig Thu Jan 4 13:13:11 2001 ++++ build Thu Jan 18 10:30:01 2001 +@@ -309,18 +309,6 @@ echo "Including SSL functionality" fi @@ -19,7 +19,7 @@ echo "Making Pico and Pilot" cd $PHOME/pico eval echo make "$makeargs" -f makefile.$picotarg -@@ -331,14 +319,12 @@ +@@ -336,14 +324,12 @@ cd $PHOME/bin rm -f pine mtest imapd pico pilot if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi @@ -35,7 +35,7 @@ case $maketarg in mnt) echo "Fixing stacksizes ..." fixstk 64K bin/pine bin/pico bin/imapd bin/mtest bin/pilot -@@ -348,15 +334,12 @@ +@@ -353,15 +339,12 @@ clean) # This only sort of works diff --git a/mail/pine/patches/patch-doc_tech-notes.txt b/mail/pine/patches/patch-doc_tech-notes.txt index ed635babeba..18492f10743 100644 --- a/mail/pine/patches/patch-doc_tech-notes.txt +++ b/mail/pine/patches/patch-doc_tech-notes.txt @@ -1,6 +1,6 @@ ---- doc/tech-notes.txt.orig Sun Dec 10 12:50:19 2000 -+++ doc/tech-notes.txt Sun Dec 10 12:50:23 2000 -@@ -216,14 +216,14 @@ +--- doc/tech-notes.txt.orig Fri Jan 5 18:58:37 2001 ++++ doc/tech-notes.txt Thu Jan 18 10:30:55 2001 +@@ -327,14 +327,14 @@ sendmail-path, smtp-server, and compile-time options. The first MTA specified in the following list is used: @@ -19,7 +19,7 @@ 9. DF_SENDMAIL_PATH defined at compile time. 10. SENDMAIL and SENDMAILFLAGS defined at compile time. -@@ -540,20 +540,20 @@ +@@ -651,20 +651,20 @@ SENDMAIL SENDMAILFLAGS Sets the name and flags for the local program that will be @@ -43,7 +43,7 @@ There are a couple of more obscure options which are in the source code because a few people have asked for them or because we changed -@@ -684,24 +684,24 @@ +@@ -795,24 +795,24 @@ Installing _Pine_ and _Pico_ is remarkably simple. You take the program files which you have just transferred or built and you move them to the correct directory on your system. Most often the binaries @@ -83,7 +83,7 @@ _________________________________________________________________ Installing PC-Pine -@@ -776,13 +776,14 @@ +@@ -887,13 +887,14 @@ When the _Pine_ distribution is built on a UNIX system, the IMAP server binary, imapd, is compiled. Installing imapd requires placing @@ -101,7 +101,7 @@ The /etc/inetd.conf file entry may vary on different versions of UNIX. Some have a slightly different set of fields. Also the pathname in -@@ -811,11 +812,11 @@ +@@ -922,11 +923,11 @@ This section lists the various files which _Pine_ uses which are not email folders. All of these are the default names of files, they may vary based on _Pine_'s configuration. @@ -116,7 +116,7 @@ Local pointer to system administrator. ~/.pinerc Personal configuration file for each user. -@@ -1028,10 +1029,10 @@ +@@ -1143,10 +1144,10 @@ Configuration: Prints a sample system configuration file to the screen or standard output. To generate an initial system configuration file, execute @@ -129,7 +129,7 @@ A system configuration file is not required. -copy_abook _ _ Copy an address book file to a remote address book folder. If -@@ -1131,9 +1132,9 @@ +@@ -1246,9 +1247,9 @@ configuration folder. -P _pinerc_ Uses the named file as the system wide configuration file @@ -142,7 +142,7 @@ -pinerc _file_ Output fresh pinerc configuration to _file_, preserving the settings of variables that the user has made. Use _file_ set to -@@ -1313,8 +1314,8 @@ +@@ -1428,8 +1429,8 @@ configuration. In most cases, the compiled-in preferences will suit users and administrators just fine. When running _Pine_ on a UNIX system, the default built-in configuration can be changed by setting @@ -153,7 +153,7 @@ the definitions for SYSTEM_PINERC and SYSTEM_PINERC_FIXED in pine/osdep/os-xxx.h are set to.) The location of the pine.conf file can be changed with the -P command line argument. Both _Pine_ and -@@ -6371,8 +6372,8 @@ +@@ -6505,8 +6506,8 @@ * A program that implements the SMTP or ESMTP protocol via stdio. * An entry in /etc/services for the alternate service. * An entry in /etc/inetd.conf for the alternate service. @@ -164,7 +164,7 @@ _________________________________________________________________ MIME.Types file -@@ -7561,7 +7562,7 @@ +@@ -7698,7 +7699,7 @@ The second selection is the standard UNIX print command. The default is _lpr_, but it can be changed on a system basis to anything so @@ -173,7 +173,7 @@ The third selection is the user's personal choice for a UNIX print command. The text to be printed is piped into the command. _Enscript_ -@@ -8015,9 +8016,9 @@ +@@ -8152,9 +8153,9 @@ Error messages for incorrect terminal types (try "foo" and "vt52") ___ diff --git a/mail/pine/patches/patch-pine_pine.hlp b/mail/pine/patches/patch-pine_pine.hlp index 17e04f4cf49..8bc7c43850b 100644 --- a/mail/pine/patches/patch-pine_pine.hlp +++ b/mail/pine/patches/patch-pine_pine.hlp @@ -1,6 +1,6 @@ ---- pine/pine.hlp.orig Fri Dec 1 19:12:53 2000 -+++ pine/pine.hlp Sun Dec 10 13:07:28 2000 -@@ -580,9 +580,9 @@ +--- pine/pine.hlp.orig Thu Jan 11 14:08:06 2001 ++++ pine/pine.hlp Thu Jan 18 10:43:52 2001 +@@ -596,9 +596,9 @@ executable <Unix search path>/pine persnl cfg ~/.pinerc except cfg ~/.pinercex @@ -13,7 +13,7 @@ interrupted ~/.pine-interrupted-mail debug ~/.pine-debugN -@@ -1052,9 +1052,9 @@ +@@ -1069,9 +1069,9 @@ this link now to send a message to it:

@@ -25,7 +25,7 @@

-@@ -1142,7 +1142,7 @@ +@@ -1159,7 +1159,7 @@

  1. Introduction
  2. Pine Help @@ -34,7 +34,7 @@
  3. Local Support Contacts
  4. Giving Commands in Pine -@@ -1251,9 +1251,9 @@ +@@ -1268,9 +1268,9 @@ at your site.) @@ -46,7 +46,7 @@

    Giving Commands in Pine

    -@@ -1907,7 +1907,7 @@ +@@ -1924,7 +1924,7 @@ file, execute 
    
@@ -55,7 +55,7 @@

    -@@ -1915,7 +1915,7 @@ +@@ -1932,7 +1932,7 @@ system configuration file, execute 

    
@@ -64,7 +64,7 @@

    A system configuration file is not required. -@@ -2066,7 +2066,7 @@ +@@ -2083,7 +2083,7 @@

    -P pinerc
    Uses the named file as the system wide configuration file instead of @@ -73,7 +73,7 @@ Pinerc may be either a local file or a remote configuration folder.

    -@@ -2767,10 +2767,10 @@ +@@ -2784,10 +2784,10 @@

The fixed configuration file is normally