diff --git a/mail/pine/patches/patch-doc_tech-notes.txt b/mail/pine/patches/patch-doc_tech-notes.txt index 6424d0ffaf6..74d21b7265c 100644 --- a/mail/pine/patches/patch-doc_tech-notes.txt +++ b/mail/pine/patches/patch-doc_tech-notes.txt @@ -1,7 +1,7 @@ -$OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ ---- doc/tech-notes.txt.orig Wed Nov 28 16:21:55 2001 -+++ doc/tech-notes.txt Sat Dec 1 14:46:22 2001 -@@ -323,14 +323,14 @@ SMTP and Sendmail +$OpenBSD: patch-doc_tech-notes.txt,v 1.7 2002/01/13 09:03:25 brad Exp $ +--- doc/tech-notes.txt.orig Tue Jan 8 19:07:54 2002 ++++ doc/tech-notes.txt Sun Jan 13 02:25:47 2002 +@@ -328,14 +328,14 @@ SMTP and Sendmail sendmail-path, smtp-server, and compile-time options. The first MTA specified in the following list is used: @@ -20,7 +20,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ 9. DF_SENDMAIL_PATH defined at compile time. 10. SENDMAIL and SENDMAILFLAGS defined at compile time. -@@ -654,20 +654,20 @@ Compile-time Options +@@ -659,20 +659,20 @@ Compile-time Options SENDMAIL SENDMAILFLAGS Sets the name and flags for the local program that will be @@ -44,7 +44,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ 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 -@@ -861,24 +861,24 @@ Installing Pine and Pico on UNIX Platfor +@@ -866,24 +866,24 @@ Installing Pine and Pico on UNIX Platfor 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 @@ -84,7 +84,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ _________________________________________________________________ Installing PC-Pine -@@ -953,13 +953,14 @@ Installing IMAPd +@@ -958,13 +958,14 @@ Installing IMAPd When the _Pine_ distribution is built on a UNIX system, the IMAP server binary, imapd, is compiled. Installing imapd requires placing @@ -102,7 +102,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ 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 -@@ -988,11 +989,11 @@ Support Files and Environment Variables: +@@ -993,11 +994,11 @@ Support Files and Environment Variables: 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. @@ -117,7 +117,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ Local pointer to system administrator. ~/.pinerc Personal configuration file for each user. -@@ -1208,10 +1209,10 @@ Pine +@@ -1213,10 +1214,10 @@ Pine Configuration: Prints a sample system configuration file to the screen or standard output. To generate an initial system configuration file, execute @@ -130,7 +130,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ A system configuration file is not required. -convert_sigs _-p pinerc_ Convert signatures contained in signature files into literal -@@ -1318,9 +1319,9 @@ Pine +@@ -1323,9 +1324,9 @@ Pine configuration folder. -P _pinerc_ Uses the named file as the system wide configuration file @@ -143,7 +143,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ -passfile _passfile_ _PC-Pine_ only. This tells _PC-Pine_ what file should be used as the password file. This should be a fully-qualified -@@ -1513,8 +1514,8 @@ Pine Configuration +@@ -1518,8 +1519,8 @@ Pine Configuration 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 @@ -154,7 +154,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ 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 -@@ -3027,7 +3028,7 @@ General Configuration Variables +@@ -3032,7 +3033,7 @@ General Configuration Variables spell checker. If your Unix system has _ispell_ it is probably reasonable to make it the default speller by configuring it as the default in the system configuration file, @@ -163,7 +163,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ If this option is not set, then the system's _spell_ command is used. The spell command does not work the same as the alternate speller. It produces a list of misspelled words on its standard -@@ -3049,7 +3050,7 @@ General Configuration Variables +@@ -3054,7 +3055,7 @@ General Configuration Variables set to zero ssh connections will be completely disabled. _ssh-path_ Sets the name of the command used to open a UNIX secure shell @@ -172,7 +172,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ _standard-printer_ System-wide configuration file only. Specifies a list of commands for category 2 of the _Setup/Printer_ screen, the -@@ -3124,11 +3125,11 @@ General Configuration Variables +@@ -3129,11 +3130,11 @@ General Configuration Variables Now for an example: url-viewers=_TEST("test -n '${DISPLAY}'")_ /usr/local/bin/netscape, @@ -186,7 +186,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ exist. If it doesn't, then the final path and file must exist. Note that the last entry is a DOS/Windows path. This is one way to support _Pine_ running on more than one architecture with -@@ -6884,10 +6885,10 @@ Configuration Inheritance +@@ -6889,10 +6890,10 @@ Configuration Inheritance 5. the system-wide _fixed_ configuration file (Unix _Pine_ only) The fixed configuration file is normally @@ -199,7 +199,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ _PC-Pine_. For _PC-Pine_, if the environment variable _$PINECONF_ is set, that is used for the system-wide configuration. This location can be set or changed on the command line with the -P flag. The -@@ -7041,17 +7042,16 @@ SMTP Servers +@@ -7046,17 +7047,16 @@ SMTP Servers * 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. @@ -221,7 +221,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ In DOS and OS/2, _Pine_ looks in the same directory as the PINERC file and the same dir as PINE.EXE. This is similar to the UNIX situation -@@ -8239,7 +8239,7 @@ Printers and Printing +@@ -8244,7 +8244,7 @@ Printers and Printing 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 @@ -230,7 +230,7 @@ $OpenBSD: patch-doc_tech-notes.txt,v 1.6 2001/12/01 23:22:59 brad Exp $ 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_ -@@ -8693,9 +8693,9 @@ Test Checklist +@@ -8698,9 +8698,9 @@ Test Checklist 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 a029f6effa6..6f7b703c81c 100644 --- a/mail/pine/patches/patch-pine_pine.hlp +++ b/mail/pine/patches/patch-pine_pine.hlp @@ -1,7 +1,7 @@ -$OpenBSD: patch-pine_pine.hlp,v 1.8 2001/12/01 23:22:59 brad Exp $ ---- pine/pine.hlp.orig Wed Nov 28 13:07:27 2001 -+++ pine/pine.hlp Sat Dec 1 14:40:03 2001 -@@ -596,9 +596,9 @@ Unix Pine: +$OpenBSD: patch-pine_pine.hlp,v 1.9 2002/01/13 09:03:25 brad Exp $ +--- pine/pine.hlp.orig Tue Jan 8 15:55:03 2002 ++++ pine/pine.hlp Sun Jan 13 02:25:58 2002 +@@ -606,9 +606,9 @@ Unix Pine: executable <Unix search path>/pine persnl cfg ~/.pinerc except cfg ~/.pinercex @@ -14,7 +14,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.8 2001/12/01 23:22:59 brad Exp $ interrupted ~/.pine-interrupted-mail debug ~/.pine-debugN -@@ -610,8 +610,7 @@ Unix Pine: +@@ -620,8 +620,7 @@ Unix Pine: postponed# ~/mail/postponed-msgs sentmail# ~/mail/sent-mail mailcap# ~/.mailcap + /etc/mailcap @@ -24,7 +24,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.8 2001/12/01 23:22:59 brad Exp $ news-spool varies across Unix flavors, e.g. /usr/spool/news or /var/news active-news varies across Unix flavors, e.g. /usr/lib/news/active -@@ -1069,9 +1068,9 @@ contact email address may have been set +@@ -1079,9 +1078,9 @@ contact email address may have been set this link now to send a message to it:

@@ -36,7 +36,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.8 2001/12/01 23:22:59 brad Exp $

-@@ -1159,7 +1158,7 @@ To Exit this screen and continue your Pi +@@ -1169,7 +1168,7 @@ To Exit this screen and continue your Pi

  1. Introduction
  2. Pine Help @@ -45,7 +45,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.8 2001/12/01 23:22:59 brad Exp $
  3. Local Support Contacts
  4. Giving Commands in Pine -@@ -1270,9 +1269,9 @@ copy of Pine you are using has been prop +@@ -1280,9 +1279,9 @@ copy of Pine you are using has been prop at your site.) @@ -57,7 +57,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.8 2001/12/01 23:22:59 brad Exp $

    Giving Commands in Pine

    -@@ -1952,7 +1951,7 @@ screen or standard output. To generate a +@@ -1962,7 +1961,7 @@ screen or standard output. To generate a file, execute 
    
@@ -66,7 +66,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.8 2001/12/01 23:22:59 brad Exp $

    -@@ -1960,7 +1959,7 @@ To generate a system configuration file +@@ -1970,7 +1969,7 @@ To generate a system configuration file system configuration file, execute 

    
@@ -75,7 +75,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.8 2001/12/01 23:22:59 brad Exp $

    A system configuration file is not required. -@@ -2112,7 +2111,7 @@ Pinerc may be either a local file or a r +@@ -2122,7 +2121,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 @@ -84,7 +84,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.8 2001/12/01 23:22:59 brad Exp $ Pinerc may be either a local file or a remote configuration folder.

    -@@ -2820,10 +2819,10 @@ In increasing order of precedence they a +@@ -2830,10 +2829,10 @@ In increasing order of precedence they a

The fixed configuration file is normally @@ -97,7 +97,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.8 2001/12/01 23:22:59 brad Exp $ set for PC-Pine. For PC-Pine, if the environment variable $PINECONF is set, that is used for the system-wide configuration. -@@ -14167,7 +14166,7 @@ a semi-colon (;) under Windows; for exam +@@ -14177,7 +14176,7 @@ a semi-colon (;) under Windows; for exam a colon (:) under UNIX; for example:

@@ -106,7 +106,7 @@ $OpenBSD: patch-pine_pine.hlp,v 1.8 2001/12/01 23:22:59 brad Exp $