openbsd-ports/mail/pine/patches/patch-doc_tech-notes_txt

$OpenBSD: patch-doc_tech-notes_txt,v 1.5 2005/04/29 19:51:35 jakob Exp $
--- doc/tech-notes.txt.orig	Thu Apr 28 20:29:46 2005
+++ doc/tech-notes.txt	Fri Apr 29 19:49:47 2005
@@ -333,14 +333,14 @@ SMTP and Sendmail
           sendmail-path, smtp-server, and compile-time options. The first
           MTA specified in the following list is used:
           
-         1. _sendmail-path_ in /usr/local/lib/pine.conf.fixed
-         2. _smtp-server_ in /usr/local/pine.conf.fixed
+         1. _sendmail-path_ in /etc/pine.conf.fixed
+         2. _smtp-server_ in /etc/pine.conf.fixed
          3. _sendmail-path_ specified on the command line.
          4. _smtp-server_ specified on the command line.
          5. _sendmail-path_ in the user's .pinerc file.
          6. _smtp-server_ in the user's .pinerc file.
-         7. _sendmail-path_ in /usr/local/lib/pine.conf
-         8. _smtp-server_ in /usr/local/pine.conf
+         7. _sendmail-path_ in /etc/pine.conf
+         8. _smtp-server_ in /etc/pine.conf
          9. DF_SENDMAIL_PATH defined at compile time.
         10. SENDMAIL and SENDMAILFLAGS defined at compile time.
             
@@ -664,20 +664,20 @@ Compile-time Options
    SENDMAIL
    SENDMAILFLAGS
           Sets the name and flags for the local program that will be
-          called to handle outgoing email. Default is /usr/lib/sendmail
+          called to handle outgoing email. Default is /usr/sbin/sendmail
           -oi -oem -t. See the SMTP and Sendmail section for more
           details.
    SYSTEM_PINERC
           The name of the file which holds _Pine_ configuration
           information for all users on the system. Default on UNIX
-          systems is /usr/local/lib/pine.conf.
+          systems is /etc/pine.conf.
    SYSTEM_PINERC_FIXED
           The name of the file which holds the same type of information
           as for SYSTEM_PINERC, but only for variables that the
           administrator wants to keep fixed. That is, users are not
           allowed to change variables that are specified in the FIXED
           file. Default on UNIX systems is
-          /usr/local/lib/pine.conf.fixed.
+          /etc/pine.conf.fixed.
           
    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
@@ -871,24 +871,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
-   go in /usr/local/bin though sometimes they are placed in /usr/bin. All
-   the help text is compiled into _Pine_ so there are no _required_
+   go in !!PREFIX!!/bin though sometimes they are placed in /usr/bin.
+   All the help text is compiled into _Pine_ so there are no _required_
    auxiliary files.
    
    There are, however, three optional auxiliary files:
-   /usr/local/lib/pine.info, /usr/local/lib/pine.conf, and
-   /usr/local/lib/pine.conf.fixed. The file pine.info contains text on
-   how to get further help on the local system. It is part of the help
-   text for the main menu and should probably refer to the local help
-   desk or the system administrator. If this file doesn't exist a generic
-   version which suggests ``talking to the computer support staff at your
-   site'' is shown. The file pine.conf is used to set system-wide default
-   configurations for _Pine_. The file pine.conf.fixed is also used to
-   set system-wide default configurations for _Pine_. The difference
-   between these two files is that configuration variables set in the
-   pine.conf.fixed file may not normally be over-ridden by a user. See
-   the section on Pine Configuration later in this document for details
-   about the pine.conf and pine.conf.fixed files.
+   /etc/pine.info, /etc/pine.conf, and /etc/pine.conf.fixed. The file
+   pine.info contains text on how to get further help on the local system.
+   It is part of the help text for the main menu and should probably
+   refer to the local help desk or the system administrator. If this file
+   doesn't exist a generic version which suggests ``talking to the
+   computer support staff at your site'' is shown. The file pine.conf is
+   used to set system-wide default configuration for _Pine_. The file
+   pine.conf.fixed is also used to set system-wide default configurations
+   for _Pine_. The difference between these two files is that
+   configuration variables set in the pine.conf.fixed file may not
+   normally be over-ridden by a user. See the section on Pine
+   Configuration later in this document for details about the pine.conf
+   and pine.conf.fixed files.
      _________________________________________________________________
    
 Installing PC-Pine
@@ -941,13 +941,14 @@ Installing IMAPd
 
    When the _Pine_ distribution is built on a UNIX system, the IMAP
    server binary, imapd, is compiled. Installing imapd requires placing
-   the binary in the appropriate directory, usually /usr/etc, and adding
-   entries to /etc/services and /etc/inetd.conf or their counterparts.
+   the binary in the appropriate directory, usually !!PREFIX!!/bin,
+   and adding entries to /etc/services and /etc/inetd.conf or their
+   counterparts.
    The following line is appropriate for /etc/services:
   imap         143/tcp         # Mail transfer
 
    and the next line is appropriate for /etc/inetd.conf:
-  imap  stream  tcp     nowait  root    /usr/etc/imapd imapd
+  imap  stream  tcp     nowait  root    !!PREFIX!!/bin/imapd imapd
 
    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
@@ -976,11 +977,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.
-   /usr/local/lib/pine.conf
+   /etc/pine.conf
           Pine's global configuration file.
-   /usr/local/lib/pine.conf.fixed
+   /etc/pine.conf.fixed
           Non-overridable global configuration file.
-   /usr/local/lib/pine.info
+   /etc/pine.info
           Local pointer to system administrator.
    ~/.pinerc
           Personal configuration file for each user.
@@ -1200,10 +1201,10 @@ Pine
           Configuration: Prints a sample system configuration file to the
           screen or standard output. To generate an initial system
           configuration file, execute
-                pine -conf > /usr/local/lib/pine.conf
+                pine -conf > /etc/pine.conf
           To generate a system configuration file using settings from an
           old 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.
    -convert_sigs _-p pinerc_
           Convert signatures contained in signature files into literal
@@ -1318,9 +1319,9 @@ Pine
           configuration folder.
    -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_. Pinerc may be either a local file or a remote
-          configuration folder.
+          instead of _/etc/pine.conf_ on UNIX, or nothing on _PC-Pine_.
+          Pinerc may be either a local file or a remote configuration
+          folder.
    -passfile _passfile_
           This tells _Pine_ what file should be used as the password
           file. This should be a fully-qualified filename.
@@ -1526,8 +1527,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
-   variables in the system configuration files, /usr/local/lib/pine.conf
-   or /usr/local/lib/pine.conf.fixed. (Actually, these files are whatever
+   variables in the system configuration files, /etc/pine.conf or
+   /etc/pine.conf.fixed. (Actually, these files are whatever
    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
@@ -3757,7 +3758,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,
-          /usr/local/lib/pine.conf.
+          /etc/pine.conf.
           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
@@ -4153,11 +4154,11 @@ General Configuration Variables
           Now for an example:
           
      url-viewers=_TEST("test -n '${DISPLAY}'")_ /usr/local/bin/netscape,
-     /usr/local/bin/lynx, C:\BIN\NETSCAPE.BAT
+     /usr/bin/lynx, C:\BIN\NETSCAPE.BAT
           This example shows that for the first browser in the list to be
           used the environment variable DISPLAY must be defined. If it
           is, then the file /usr/local/bin/netscape must exist. If either
-          condition is not met, then the file /usr/local/bin/lynx must
+          condition is not met, then the file /usr/bin/lynx must
           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
@@ -10084,10 +10085,10 @@ Configuration Inheritance
     5. the system-wide _fixed_ configuration file (Unix _Pine_ only)
        
    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 set for
+   /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. This location can
    be set or changed on the command line with the -P flag. The
@@ -10347,17 +10348,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.
-     * An entry in /usr/local/lib/pine.conf,
-       /usr/local/lib/pine.conf.fixed or ~/.pinerc.
+     * An entry in /etc/pine.conf,
+       /etc/pine.conf.fixed or ~/.pinerc.
      _________________________________________________________________
    
 MIME.Types file
 
    _Pine_'s MIME-TYPE support is based on code contributed by Hans
    Drexler <drexler@mpi.nl>. _Pine_ assigns MIME Content-Types
-   according to file name extensions found in the system-wide files
-   /usr/local/lib/mime.types and /etc/mime.types, and a user specific
-   ~/.mime.types file.
+   according to file name extensions found in the system-wide file
+   /etc/mime.types, and a user specific ~/.mime.types file.
    
    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
@@ -11532,7 +11532,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
-   desired in /usr/local/lib/pine.conf.
+   desired in /etc/pine.conf.
    
    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_
@@ -11986,9 +11986,9 @@ Test Checklist
           Error messages for incorrect terminal types (try "foo" and
           "vt52")
    ___
-          Reading of /usr/local/lib/pine.conf
+          Reading of /etc/pine.conf
    ___
-          Fixing variables and features in /usr/local/lib/pine.conf.fixed
+          Fixing variables and features in /etc/pine.conf.fixed
    ___
           Flag command (check message status changed in mail folder)
    ___