Attachment #2641 for bug #7879

View | Details | Raw Unified | Return to bug 7879
Collapse All | Expand All




# New ports collection makefile for:	pine
# http://www.washington.edu/pine/
# Version required:     4.03
# Date created:		09 July 1998
# Whom:			Adrian Penisoara <ady@freebsd.ady.ro>
#
# $Id: Makefile,v 1.26 1998/08/13 06:49:09 jkoshy Exp $
#

DISTNAME=       pine4.03
PKGNAME=        pine-4.03
CATEGORIES=     mail news
MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/

PATCH_SITES=	${MASTER_SITES}
PATCHFILES=	${DISTNAME}A.patch
PATCH_DIST_STRIP= -p1

MAINTAINER=	pine@freebsd.ady.ro

NO_LATEST_LINK= yes

MAN1= 		pine.1 pico.1 pilot.1

PLIST_SUB=	PKGNAME=${PKGNAME}

do-build:
	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build bsf)

do-install:
	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
		${WRKSRC}/pico/libpico.a ${PREFIX}/lib/libpico.a
	${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin/pico
	${INSTALL_PROGRAM} ${WRKSRC}/bin/pilot ${PREFIX}/bin/pilot
	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/pine


post-install:
	${LDCONFIG} -m ${PREFIX}/lib/
	${PREFIX}/bin/pine -conf > ${WRKSRC}/pine.conf
	${INSTALL_DATA} ${WRKSRC}/pine.conf ${PREFIX}/etc/pine.conf.${PKGNAME}
.if !exists(/usr/local/etc/pine.conf)
	${CP} ${PREFIX}/etc/pine.conf.${PKGNAME} ${PREFIX}/etc/pine.conf
.else
	@${ECHO} ''
	@${ECHO} "A ${PREFIX}/etc/pine.conf file exists from a previous installation."
	@${ECHO} "You should compare it with ${PREFIX}/etc/pine.conf.${PKGNAME} to see"
	@${ECHO} "if there are any important changes in the new version."
	@${ECHO} ''
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)pine4/files/md5 (-2 / +1 lines)
1	MD5 (pine4.02.tar.gz) = 688979b5649473169bdbf22ea1c82fe7	1	MD5 (pine4.03.tar.gz) = be35532537241176e3d01ce99d66780f
2	MD5 (pine4.02A.patch) = 96271a2a00293186941cad0c0175bd69




*** pico/makefile.bsf.orig	Tue Jun 30 01:23:13 1998
--- pico/makefile.bsf	Wed Aug 12 20:18:52 1998
***************
*** 62,68 ****
  # dependencies for the Unix versions of pico and libpico.a
  #
  all:		pico pilot
! pico pilot:	libpico.so.1.3
  
  pico:		main.o
  		$(CC) $(CFLAGS) main.o -L. -lpico $(LIBS) -o pico
--- 62,68 ----
  # dependencies for the Unix versions of pico and libpico.a
  #
  all:		pico pilot
! pico pilot:	libpico.so.2.0
  
  pico:		main.o
  		$(CC) $(CFLAGS) main.o -L. -lpico $(LIBS) -o pico
***************
*** 78,88 ****
  		$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
  		$(RANLIB) libpico.a
  
! libpico.so.1.3:	$(SOFILES)
! 		ld -Bshareable -x -o libpico.so.1.3 $(SOFILES)
  
  clean:
! 		rm -f *.a *.so.1.3 *.o *.so *~ pico_os.c os.h pico pilot
  		cd osdep; $(MAKE) clean; cd ..
  
  os.h:		osdep/os-bsf.h
--- 78,88 ----
  		$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
  		$(RANLIB) libpico.a
  
! libpico.so.2.0:	$(SOFILES)
! 		ld -Bshareable -x -o libpico.so.2.0 $(SOFILES)
  
  clean:
! 		rm -f *.a *.so.2.0 *.o *.so *~ pico_os.c os.h pico pilot
  		cd osdep; $(MAKE) clean; cd ..
  
  os.h:		osdep/os-bsf.h




*** pine/osdep/os-bsf.h.orig	Tue Aug 11 14:50:27 1998
--- pine/osdep/os-bsf.h	Wed Sep  9 19:40:17 1998
***************
*** 74,80 ****
     default-composer-hdrs or customized-hdrs to get at it. Instead of

           file is included in the os-*.ic file for your system.
   ----*/
! #define BACKGROUND_POST     /* comment out to disable posting from child */
  
  
  
***************
*** 160,167 ****
  
  
  /*----- System-wide config file ----------------------------------------*/
! #define SYSTEM_PINERC             "/usr/local/lib/pine.conf"
! #define SYSTEM_PINERC_FIXED       "/usr/local/lib/pine.conf.fixed"
  
  
  
--- 160,167 ----
  
  
  /*----- System-wide config file ----------------------------------------*/
! #define SYSTEM_PINERC             "/usr/local/etc/pine.conf"
! #define SYSTEM_PINERC_FIXED       "/usr/local/etc/pine.conf.fixed"
  
  
  




*** build.orig	Thu Aug 27 09:43:22 1998
--- build	Wed Sep  9 19:31:14 1998
***************
*** 80,87 ****
   pine   The Pine mailer. Once compiled this should work just fine on
          your system with no other files than this binary, and no
          modifications to your system. Optionally you may create two
!         configuration files, /usr/local/lib/pine.conf and 
!         /usr/local/lib/pine.info. See the documentation for details.
   
   pico   The standalone editor similar to the Pine message composer.
          This is a very simple straight forward text editor.
--- 80,87 ----
   pine   The Pine mailer. Once compiled this should work just fine on
          your system with no other files than this binary, and no
          modifications to your system. Optionally you may create two
!         configuration files, /usr/local/etc/pine.conf and 
!         /usr/local/etc/pine.info. See the documentation for details.
   
   pico   The standalone editor similar to the Pine message composer.
          This is a very simple straight forward text editor.
***************
*** 272,282 ****
  
          if [ -s c-client ] ; then rm -f c-client ; fi
          ln -s imap/c-client c-client

          eval echo make "$makeargs" "$K1" "$K2" $ccltarg
          cd $PHOME/imap
          eval make "$makeargs" "$K1" "$K2" $ccltarg
--- 272,282 ----
  
          if [ -s c-client ] ; then rm -f c-client ; fi
          ln -s imap/c-client c-client

          cd $PHOME/imap
          eval make "$makeargs" "$K1" "$K2" $ccltarg
***************
*** 297,310 ****
          cd $PHOME/bin
          rm -f pine mtest imapd pico pilot
          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi

          echo "Done"
          ;;
  
--- 297,310 ----
          cd $PHOME/bin
          rm -f pine mtest imapd pico pilot
          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi

! #       if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
          if [ -s ../pico/pico ] ;      then ln ../pico/pico pico ; fi
          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
+         if [ -s ../pico/libpico.so.2.0 ] ;
+               then ln ../pico/libpico.so.2.0 libpico.so.2.0 ; fi
          cd $PHOME
          echo ''
          echo "Links to executables are in bin directory:"
!         size bin/pine bin/pico bin/pilot
          echo "Done"
          ;;
  
***************
*** 315,324 ****
  	make clean
          echo "Cleaning Pine"
          cd $PHOME/pine

          echo "Done"
          cd $PHOME
          ;;
--- 315,324 ----
  	make clean
          echo "Cleaning Pine"
          cd $PHOME/pine




*** imap/src/osdep/unix/unix.c.orig	Wed Sep  9 16:47:48 1998
--- imap/src/osdep/unix/unix.c	Wed Sep  9 16:52:48 1998
***************
*** 1010,1016 ****
        case EACCES:		/* protection failure */
  	if (stat (hitch,&sb)) {	/* try again if file exists(?) */
  				/* punt silently if paranoid site */
! 	  if (mail_parameters (NIL,GET_LOCKEACCESERROR,NIL))
  	    mm_log ("Mailbox vulnerable - directory must have 1777 protection",
  		    WARN);
  	  *lock = '\0';		/* give up on lock file */
--- 1010,1020 ----
        case EACCES:		/* protection failure */
  	if (stat (hitch,&sb)) {	/* try again if file exists(?) */
  				/* punt silently if paranoid site */
! 	  if (
! #ifdef __FreeBSD__
!            strncmp(lock,"/var/mail/",10) &&  /* /var/mail/... isn't lockable */
! #endif
!             mail_parameters (NIL,GET_LOCKEACCESERROR,NIL))
  	    mm_log ("Mailbox vulnerable - directory must have 1777 protection",
  		    WARN);
  	  *lock = '\0';		/* give up on lock file */
***************
*** 1055,1061 ****
        case EACCES:		/* protection fail, ignore if non-ex or old */
  	if (stat (lock,&sb)) {	/* try again if file exists(?) */
  				/* punt silently if paranoid site */
! 	  if (mail_parameters (NIL,GET_LOCKEACCESERROR,NIL))
  	    mm_log ("Mailbox vulnerable - directory must have 1777 protection",
  		    WARN);
  	  *lock = '\0';		/* give up on lock file */
--- 1059,1069 ----
        case EACCES:		/* protection fail, ignore if non-ex or old */
  	if (stat (lock,&sb)) {	/* try again if file exists(?) */
  				/* punt silently if paranoid site */
! 	  if (
! #ifdef __FreeBSD__
!              strncmp(lock,"/var/mail/",10) &&  /* /var/mail/... isn't lockable */
! #endif
!             mail_parameters (NIL,GET_LOCKEACCESERROR,NIL))
  	    mm_log ("Mailbox vulnerable - directory must have 1777 protection",
  		    WARN);
  	  *lock = '\0';		/* give up on lock file */




*** pine/init.c.orig	Thu Jul 16 21:22:22 1998
--- pine/init.c	Tue Jul 21 15:36:43 1998
***************
*** 579,584 ****
--- 579,587 ----
      GLO_SMTP_SERVER		= parse_list(DF_SMTP_SERVER, 1, NULL);
  #endif
  
+     F_TURN_ON(F_TCAP_WINS,ps);
+     F_TURN_ON(F_QUELL_INTERNAL_MSG,ps);
+ 
      /* Set the default mail directory */
      build_path(buf, GLO_MAIL_DIRECTORY, "[]");
      GLO_FOLDER_SPEC		= parse_list(buf, 1, NULL);
*** pine/other.c.orig	Thu Jul 16 04:09:27 1998
--- pine/other.c	Tue Jul 21 15:03:18 1998
***************




*** pine/pine.hlp.orig	Tue Sep  1 19:24:44 1998
--- pine/pine.hlp	Wed Sep  9 20:55:47 1998
***************
*** 790,798 ****
  
   executable     &lt;Unix search path&gt;/pine
   persnl cfg     ~/.pinerc

  
   interrupted    ~/.pine-interrupted-mail
   debug          ~/.pine-debugN
--- 790,798 ----
  
   executable     &lt;Unix search path&gt;/pine
   persnl cfg     ~/.pinerc

   interrupted    ~/.pine-interrupted-mail
   debug          ~/.pine-debugN
***************
*** 805,811 ****
   sentmail#      ~/mail/sent-mail
   mailcap#       ~/.mailcap + /etc/mailcap
                             + /usr/etc/mailcap + /usr/local/etc/mailcap
!  mimetypes#     ~/.mime.types + /etc/mime.types + /usr/local/lib/mime.types
  
   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
--- 805,811 ----
   sentmail#      ~/mail/sent-mail
   mailcap#       ~/.mailcap + /etc/mailcap
                             + /usr/etc/mailcap + /usr/local/etc/mailcap
!  mimetypes#     ~/.mime.types + /etc/mime.types + /usr/local/etc/mime.types
  
   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
***************
*** 1346,1354 ****
  this link now to send a message to it:<BR>
  <A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
  <!--chtml endif-->

  <HR WIDTH="75%">
  <!--chtml endif-->
  <P> 
--- 1346,1354 ----
  this link now to send a message to it:<BR>
  <A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
  <!--chtml endif-->

  <!--chtml endif-->
  <P> 
***************
*** 1435,1441 ****
  <OL>
    <LI> <A HREF="#intro">Introduction</A>
    <LI> <A HREF="#pine_help">Pine Help</A>

    <LI> <A HREF="#local_support">Local Support Contacts</A>
  <!--chtml endif-->
    <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
--- 1435,1441 ----
  <OL>
    <LI> <A HREF="#intro">Introduction</A>
    <LI> <A HREF="#pine_help">Pine Help</A>

  <!--chtml endif-->
    <LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
***************
*** 1542,1550 ****
  at your site.)
  
  

  <!--chtml endif-->
  
  <H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
--- 1542,1550 ----
  at your site.)
  
  




*** doc/pine.1.orig	Wed Sep  2 11:31:57 1998
--- doc/pine.1	Wed Sep  9 20:40:41 1998
***************
*** 271,281 ****
  .br
  /etc/mime.types	System-wide file ext. to MIME type mapping
  .br

  .br
  /tmp/.\\usr\\spool\\mail\\xxxx	Per-folder mailbox lock files.
  .br
--- 271,283 ----
  .br
  /etc/mime.types	System-wide file ext. to MIME type mapping
  .br
! /usr/local/etc/mime.types Optional system-wide file ext. to MIME type mapping
  .br
! /usr/local/etc/pine.info	Local pointer to system administrator.
  .br
! /usr/local/etc/pine.conf	System-wide configuration file.
! .br
! /usr/local/etc/pine.conf.fixed	 Non-overridable configuration file.
  .br
  /tmp/.\\usr\\spool\\mail\\xxxx	Per-folder mailbox lock files.




--- doc/tech-notes.txt.orig	Wed Sep  9 19:46:43 1998
+++ doc/tech-notes.txt	Wed Sep  9 20:44:31 1998
@@ -321,14 +321,14 @@
           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 /usr/local/etc/pine.conf.fixed
+         2. smtp-server in /usr/local/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 /usr/local/etc/pine.conf
+         8. smtp-server in /usr/local/etc/pine.conf
          9. DF_SENDMAIL_PATH defined at compile time.
         10. SENDMAIL and SENDMAILFLAGS defined at compile time.
             
@@ -616,14 +616,14 @@
    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.
+   /usr/local/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.
+   /usr/local/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
@@ -734,8 +734,8 @@
    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
+   /usr/local/etc/pine.conf, and
+   /usr/local/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
@@ -864,11 +864,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.
-   /usr/local/lib/pine.conf
+   /usr/local/etc/pine.conf
           Pine's global configuration file.
-   /usr/local/lib/pine.conf.fixed
+   /usr/local/etc/pine.conf.fixed
           Non-overridable global configuration file.
-   /usr/local/lib/pine.info
+   /usr/local/etc/pine.info
           Local pointer to system administrator.
    ~/.pinerc
           Personal configuration file for each user.
@@ -1017,11 +1017,11 @@
           screen or standard output. To generate an initial system
           configuration file, execute
 
-                pine -conf > /usr/local/lib/pine.conf
+                pine -conf > /usr/local/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 > /usr/local/etc/pine.conf
    -create_lu addrbook sort-order
           Create auxiliary index (LookUp) file for addrbook and sort
           addrbook in sort-order, which may be dont-sort, nickname,
@@ -1089,7 +1089,7 @@
           uses.
    -P file
           Uses the named file as the system wide configuration file
-          instead of /usr/local/lib/pine.conf. UNIX Pine only.
+          instead of /usr/local/etc/pine.conf. UNIX Pine only.
    -pinerc file
           Output fresh pinerc configuration to file, preserving the
           settings of variables that the user has made. Use file set to
@@ -1239,8 +1239,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
-   variables in the system configuration files, /usr/local/lib/pine.conf
-   or /usr/local/lib/pine.conf.fixed. Both Pine and PC-Pine also use
+   variables in the system configuration files, /usr/local/etc/pine.conf
+   or /usr/local/etc/pine.conf.fixed. Both Pine and PC-Pine also use
    personal (user-based) configuration files. On UNIX machines, the
    personal configuration file is the file ~/.pinerc. For PC-Pine
    systems, the personal configuration file is in $PINERC or
@@ -3323,8 +3323,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.
-     * An entry in /usr/local/lib/pine.conf,
-       /usr/local/lib/pine.conf.fixed or ~/.pinerc.
+     * An entry in /usr/local/etc/pine.conf,
+       /usr/local/etc/pine.conf.fixed or ~/.pinerc.
        
      _________________________________________________________________
                                       
@@ -3333,7 +3333,7 @@
    Pine's MIME-TYPE support is based on code contributed by Hans Drexler
    &LT;drexler@mpi.nl&GT;. 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
+   /usr/local/etc/mime.types and /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
@@ -4368,7 +4368,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 desired
-   in /usr/local/lib/pine.conf.
+   in /usr/local/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 or
@@ -4828,9 +4828,9 @@
           Error messages for incorrect terminal types (try "foo" and
           "vt52")
    ___
-          Reading of /usr/local/lib/pine.conf
+          Reading of /usr/local/etc/pine.conf
    ___
-          Fixing variables and features in /usr/local/lib/pine.conf.fixed
+          Fixing variables and features in /usr/local/etc/pine.conf.fixed
    ___
           Flag command (check message status changed in mail folder)
    ___

Line 0 Link Here

(-)pine4/patches/patch-aw (+11 lines)
	1	--- doc/tech-notes/low-level.html.orig Wed Sep 9 19:52:02 1998
	2	+++ doc/tech-notes/low-level.html Wed Sep 9 19:52:40 1998
	3	@@ -1040,7 +1040,7 @@
	4
	5	The second selection is the standard UNIX print command. The default is
	6	<EM>lpr</EM>, but it can be changed on a system basis to anything so
	7	-desired in <CODE>/usr/local/lib/pine.conf</CODE>. <P>
	8	+desired in <CODE>/usr/local/etc/pine.conf</CODE>. <P>
	9
	10	The third selection is
	11	the user's personal choice for a UNIX print command. The text to be




--- doc/tech-notes/cmd-line.html.orig	Wed Sep  9 19:53:26 1998
+++ doc/tech-notes/cmd-line.html	Wed Sep  9 19:54:32 1998
@@ -41,7 +41,7 @@
 file, execute
 
 <PRE><CODE>
-		pine -conf > /usr/local/lib/pine.conf
+		pine -conf > /usr/local/etc/pine.conf
 </CODE></PRE>
 <P>
 
@@ -49,7 +49,7 @@
 system configuration file, execute
 
 <PRE><CODE>
-		pine -P old-pine.conf -conf > /usr/local/lib/pine.conf
+		pine -P old-pine.conf -conf > /usr/local/etc/pine.conf
 </CODE></PRE>
 <P>
 
@@ -145,7 +145,7 @@
 <DT> -P <EM>file</EM>
 
 <DD> Uses the named file as the system wide configuration file instead of
-<EM>/usr/local/lib/pine.conf</EM>.  <I>UNIX Pine only.</I>  <P>
+<EM>/usr/local/etc/pine.conf</EM>.  <I>UNIX Pine only.</I>  <P>
 
 <DT> -pinerc <EM>file</EM>
 




*** doc/tech-notes/config.html.orig	Wed Sep  9 19:59:10 1998
--- doc/tech-notes/config.html	Wed Sep  9 19:57:58 1998
***************
*** 7,14 ****
  configuration. In most cases, the compiled-in preferences will suit users
  and administrators just fine. When running <EM>Pine</EM> on a UNIX system, the
  default built-in configuration can be changed by setting variables in the
! system configuration files, <CODE>/usr/local/lib/pine.conf</CODE>
! or <CODE>/usr/local/lib/pine.conf.fixed</CODE>. Both <EM>Pine</EM>
  and <EM>PC-Pine</EM> also use personal (user-based) configuration files.  On UNIX
  machines, the personal configuration file is the file <CODE>~/.pinerc</CODE>. 
  For <EM>PC-Pine</EM> systems, the personal configuration file is in
--- 7,14 ----
  configuration. In most cases, the compiled-in preferences will suit users
  and administrators just fine. When running <EM>Pine</EM> on a UNIX system, the
  default built-in configuration can be changed by setting variables in the
! system configuration files, <CODE>/usr/local/etc/pine.conf</CODE>
! or <CODE>/usr/local/etc/pine.conf.fixed</CODE>. Both <EM>Pine</EM>
  and <EM>PC-Pine</EM> also use personal (user-based) configuration files.  On UNIX
  machines, the personal configuration file is the file <CODE>~/.pinerc</CODE>. 
  For <EM>PC-Pine</EM> systems, the personal configuration file is in




*** pine/init.c.orig	Wed Sep  2 10:39:42 1998
--- pine/init.c	Wed Sep  9 19:33:06 1998
***************
*** 319,325 ****
  
  /*----------------------------------------------------------------------
  These are the variables that control a number of pine functions.  They
! come out of the .pinerc and the /usr/local/lib/pine.conf files.  Some can
  be set by the user while in Pine.  Eventually all the local ones should
  be so and maybe the global ones too.
  
--- 319,325 ----
  
  /*----------------------------------------------------------------------
  These are the variables that control a number of pine functions.  They
! come out of the .pinerc and the /usr/local/etc/pine.conf files.  Some can
  be set by the user while in Pine.  Eventually all the local ones should
  be so and maybe the global ones too.
  
***************
*** 578,583 ****
--- 578,586 ----
  #ifdef	DF_SMTP_SERVER
      GLO_SMTP_SERVER		= parse_list(DF_SMTP_SERVER, 1, NULL);
  #endif
+ 
+     F_TURN_ON(F_TCAP_WINS,ps);
+     F_TURN_ON(F_QUELL_INTERNAL_MSG,ps);
  
      /* Set the default mail directory */
      build_path(buf, GLO_MAIL_DIRECTORY, "[]");




--- doc/tech-notes/installation.html.orig	Wed Sep  9 20:10:13 1998
+++ doc/tech-notes/installation.html	Wed Sep  9 20:12:32 1998
@@ -147,7 +147,7 @@
 <DD> The name of the file which holds <EM>Pine</EM>
 configuration information for
 all users on the system.  Default on UNIX systems is
-<CODE>/usr/local/lib/pine.conf</CODE>.
+<CODE>/usr/local/etc/pine.conf</CODE>.
 
 <DT> SYSTEM_PINERC_FIXED
 
@@ -155,7 +155,7 @@
 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
-<CODE>/usr/local/lib/pine.conf.fixed</CODE>.
+<CODE>/usr/local/etc/pine.conf.fixed</CODE>.
 
 </DL> <P>
 
@@ -305,9 +305,9 @@
 are no <STRONG>required</STRONG> auxiliary files.  <P>
 
 There are, however, three optional auxiliary files: 
-<CODE>/usr/local/lib/pine.info</CODE>,
-<CODE>/usr/local/lib/pine.conf</CODE>, and
-<CODE>/usr/local/lib/pine.conf.fixed</CODE>.  The file
+<CODE>/usr/local/etc/pine.info</CODE>,
+<CODE>/usr/local/etc/pine.conf</CODE>, and
+<CODE>/usr/local/etc/pine.conf.fixed</CODE>.  The file
 <CODE>pine.info</CODE> 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
@@ -471,15 +471,15 @@
 
 <DL COMPACT>
 
-<DT> /usr/local/lib/pine.conf
+<DT> /usr/local/etc/pine.conf
 
 <DD> Pine's global configuration file. 
 
-<DT> /usr/local/lib/pine.conf.fixed
+<DT> /usr/local/etc/pine.conf.fixed
 
 <DD> Non-overridable global configuration file. 
 
-<DT> /usr/local/lib/pine.info
+<DT> /usr/local/etc/pine.info
 
 <DD> Local pointer to system administrator. 
 




*** doc/tech-notes/background.html.orig	Wed Sep  9 20:15:13 1998
--- doc/tech-notes/background.html	Wed Sep  9 20:16:57 1998
***************
*** 174,182 ****
  <OL>
  
  <LI><EM>sendmail-path</EM> in
! <CODE>/usr/local/lib/pine.conf.fixed</CODE>
  
! <LI><EM>smtp-server</EM> in <CODE>/usr/local/pine.conf.fixed</CODE>
  
  <LI><EM>sendmail-path</EM> specified on the command line. 
  
--- 174,182 ----
  <OL>
  
  <LI><EM>sendmail-path</EM> in
! <CODE>/usr/local/etc/pine.conf.fixed</CODE>
  
! <LI><EM>smtp-server</EM> in <CODE>/usr/local/etc/pine.conf.fixed</CODE>
  
  <LI><EM>sendmail-path</EM> specified on the command line. 
  
***************
*** 186,194 ****
  
  <LI><EM>smtp-server</EM> in the user's <CODE>.pinerc</CODE> file. 
  
! <LI><EM>sendmail-path</EM> in <CODE>/usr/local/lib/pine.conf</CODE>
  
! <LI><EM>smtp-server</EM> in <CODE>/usr/local/pine.conf</CODE>
  
  <LI><CODE>DF_SENDMAIL_PATH</CODE> defined at compile time.
  
--- 186,194 ----
  
  <LI><EM>smtp-server</EM> in the user's <CODE>.pinerc</CODE> file. 
  
! <LI><EM>sendmail-path</EM> in <CODE>/usr/local/etc/pine.conf</CODE>
  
! <LI><EM>smtp-server</EM> in <CODE>/usr/local/etc/pine.conf</CODE>
  
  <LI><CODE>DF_SENDMAIL_PATH</CODE> defined at compile time.
  




--- doc/tech-notes/porting.html.orig	Wed Sep  9 20:18:28 1998
+++ doc/tech-notes/porting.html	Wed Sep  9 20:19:11 1998
@@ -307,11 +307,11 @@
 <DT>
  ___
 <DD>
-Reading of <CODE>/usr/local/lib/pine.conf</CODE> 
+Reading of <CODE>/usr/local/etc/pine.conf</CODE> 
 <DT>
  ___
 <DD>
-Fixing variables and features in <CODE>/usr/local/lib/pine.conf.fixed</CODE> 
+Fixing variables and features in <CODE>/usr/local/etc/pine.conf.fixed</CODE> 
 <DT>
  ___
 <DD>




--- doc/tech-notes/config-notes.html.orig	Wed Sep  9 20:20:18 1998
+++ doc/tech-notes/config-notes.html	Wed Sep  9 20:52:40 1998
@@ -437,8 +437,8 @@
 
 <LI> An entry in <CODE>/etc/inetd.conf</CODE> for the alternate service.
 
-<LI> An entry in <CODE>/usr/local/lib/pine.conf</CODE>,
-<CODE>/usr/local/lib/pine.conf.fixed</CODE> or <CODE>~/.pinerc</CODE>. 
+<LI> An entry in <CODE>/usr/local/etc/pine.conf</CODE>,
+<CODE>/usr/local/etc/pine.conf.fixed</CODE> or <CODE>~/.pinerc</CODE>. 
 
 </UL>
 
@@ -449,7 +449,7 @@
 <EM>Pine</EM>'s MIME-TYPE support is based on code contributed by Hans Drexler
 &LT;drexler@mpi.nl&GT;.  <EM>Pine</EM> assigns MIME Content-Types according
 to file name extensions found in the system-wide files
-<CODE>/usr/local/lib/mime.types</CODE> and <CODE>/etc/mime.types</CODE>,
+<CODE>/usr/local/etc/mime.types</CODE> and <CODE>/etc/mime.types</CODE>,
 and a user specific <CODE>~/.mime.types</CODE> file.  <P>
 
 In DOS and OS/2,




--- pine/mailcap.c.orig	Wed Sep  9 20:26:17 1998
+++ pine/mailcap.c	Wed Sep  9 20:26:53 1998
@@ -61,7 +61,7 @@
 
    Mime types makes mime assign attachment types according
    to file name extensions found in a system wide file
-   ``/usr/local/lib/mime.types'' and a user specific file
+   ``/usr/local/etc/mime.types'' and a user specific file
    ``~/.mime.types'' . These files specify file extensions
    that will be connected to a mime type.
    ******************************************************* 
@@ -100,7 +100,7 @@
 #define MT_PATH_SEPARATOR ':'
 #define	MT_USER_FILE	  NULL
 #define MT_STDPATH         \
-		".mime.types:/etc/mime.types:/usr/local/lib/mime.types"
+		".mime.types:/etc/mime.types:/usr/local/etc/mime.types"
 #endif /* !DOS */
 
 #ifdef	_WINDOWS

Line 0 Link Here

(-)pine4/patches/patch-bf (+11 lines)
	1	--- doc/mime.types.orig Wed Sep 9 20:36:30 1998
	2	+++ doc/mime.types Wed Sep 9 20:37:23 1998
	3	@@ -5,7 +5,7 @@
	4	# to the file name extension of attachments it sends.
	5	# Pine first looks for "~/.mime.types", then adds
	6	# any unbound MIME types found in "/etc/mime.types"
	7	-# and "/usr/local/lib/mime.types".
	8	+# and "/usr/local/etc/mime.types".
	9
	10	application/postscript ai eps ps
	11	application/rtf rtf




bin/pico
bin/pilot
bin/pine
lib/libpico.a
@exec /sbin/ldconfig -m %B
@unexec /sbin/ldconfig -R
bin/pgpencrypt
bin/pgpdecode
bin/pgpsign
etc/dot.pinerc.pgp.sample
etc/pine.conf.%%PKGNAME%%
share/doc/pine/brochure.txt
share/doc/pine/tech-notes.txt
share/doc/pine/tech-notes/background.html

Return to bug 7879

Lines 1-33 Link Here

(-)pine4/Makefile (-8 / +17 lines)
1	# New ports collection makefile for: pine	1	# New ports collection makefile for: pine
2	# http://www.washington.edu/pine/	2	# http://www.washington.edu/pine/
3	# Version required: 4.02A	3	# Version required: 4.03
4	# Date created: 09 July 1998	4	# Date created: 09 July 1998
5	# Whom: Adrian Penisoara <ady@freebsd.ady.ro>	5	# Whom: Adrian Penisoara <ady@freebsd.ady.ro>
6	#	6	#
7	# $Id: Makefile,v 1.26 1998/08/13 06:49:09 jkoshy Exp $	7	# $Id: Makefile,v 1.26 1998/08/13 06:49:09 jkoshy Exp $
8	#	8	#
9		9
10	DISTNAME= pine4.02	10	DISTNAME= pine4.03
11	PKGNAME= pine-4.02a	11	PKGNAME= pine-4.03
12	CATEGORIES= mail news	12	CATEGORIES= mail news
13	MASTER_SITES= ftp://ftp.cac.washington.edu/pine/	13	MASTER_SITES= ftp://ftp.cac.washington.edu/pine/
14		14
15	PATCH_SITES= ${MASTER_SITES}
16	PATCHFILES= ${DISTNAME}A.patch
17	PATCH_DIST_STRIP= -p1
18
19	MAINTAINER= pine@freebsd.ady.ro	15	MAINTAINER= pine@freebsd.ady.ro
20		16
21	NO_LATEST_LINK= yes	17	NO_LATEST_LINK= yes
22		18
23	MAN1= pine.1 pico.1 pilot.1	19	MAN1= pine.1 pico.1 pilot.1
24		20
		21	PLIST_SUB= PKGNAME=${PKGNAME}
		22
25	do-build:	23	do-build:
26	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build bsf)	24	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build bsf)
27		25
28	do-install:	26	do-install:
29	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \	27	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
30	${WRKSRC}/bin/libpico.so.2.0 ${PREFIX}/lib/libpico.so.2.0	28	${WRKSRC}/pico/libpico.a ${PREFIX}/lib/libpico.a
31	${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin/pico	29	${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin/pico
32	${INSTALL_PROGRAM} ${WRKSRC}/bin/pilot ${PREFIX}/bin/pilot	30	${INSTALL_PROGRAM} ${WRKSRC}/bin/pilot ${PREFIX}/bin/pilot
33	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/pine	31	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/pine
Lines 51-55 Link Here
51		49
52	post-install:	50	post-install:
53	${LDCONFIG} -m ${PREFIX}/lib/	51	${LDCONFIG} -m ${PREFIX}/lib/
		52	${PREFIX}/bin/pine -conf > ${WRKSRC}/pine.conf
		53	${INSTALL_DATA} ${WRKSRC}/pine.conf ${PREFIX}/etc/pine.conf.${PKGNAME}
		54	.if !exists(/usr/local/etc/pine.conf)
		55	${CP} ${PREFIX}/etc/pine.conf.${PKGNAME} ${PREFIX}/etc/pine.conf
		56	.else
		57	@${ECHO} ''
		58	@${ECHO} "A ${PREFIX}/etc/pine.conf file exists from a previous installation."
		59	@${ECHO} "You should compare it with ${PREFIX}/etc/pine.conf.${PKGNAME} to see"
		60	@${ECHO} "if there are any important changes in the new version."
		61	@${ECHO} ''
		62	.endif
54		63
55	.include <bsd.port.mk>	64	.include <bsd.port.mk>

Lines 1-44 Link Here

(-)pine4/patches/patch-aa (-44 lines)
1	*** pico/makefile.bsf.orig Tue Jun 30 01:23:13 1998
2	--- pico/makefile.bsf Wed Aug 12 20:18:52 1998
3	***************
4	* 62,68 **
5	# dependencies for the Unix versions of pico and libpico.a
6	#
7	all: pico pilot
8	! pico pilot: libpico.so.1.3
9
10	pico: main.o
11	$(CC) $(CFLAGS) main.o -L. -lpico $(LIBS) -o pico
12	--- 62,68 ----
13	# dependencies for the Unix versions of pico and libpico.a
14	#
15	all: pico pilot
16	! pico pilot: libpico.so.2.0
17
18	pico: main.o
19	$(CC) $(CFLAGS) main.o -L. -lpico $(LIBS) -o pico
20	***************
21	* 78,88 **
22	$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
23	$(RANLIB) libpico.a
24
25	! libpico.so.1.3: $(SOFILES)
26	! ld -Bshareable -x -o libpico.so.1.3 $(SOFILES)
27
28	clean:
29	! rm -f .a .so.1.3 .o .so *~ pico_os.c os.h pico pilot
30	cd osdep; $(MAKE) clean; cd ..
31
32	os.h: osdep/os-bsf.h
33	--- 78,88 ----
34	$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
35	$(RANLIB) libpico.a
36
37	! libpico.so.2.0: $(SOFILES)
38	! ld -Bshareable -x -o libpico.so.2.0 $(SOFILES)
39
40	clean:
41	! rm -f .a .so.2.0 .o .so *~ pico_os.c os.h pico pilot
42	cd osdep; $(MAKE) clean; cd ..
43
44	os.h: osdep/os-bsf.h

Lines 1-5 Link Here

(-)pine4/patches/patch-ac (-2 / +21 lines)
1	*** pine/osdep/os-bsf.h.orig Fri Jun 26 09:19:54 1998	1	*** pine/osdep/os-bsf.h.orig Tue Aug 11 14:50:27 1998
2	--- pine/osdep/os-bsf.h Wed Aug 12 22:22:02 1998	2	--- pine/osdep/os-bsf.h Wed Sep 9 19:40:17 1998
3	***************	3	***************
4	* 74,80 **	4	* 74,80 **
5	default-composer-hdrs or customized-hdrs to get at it. Instead of	5	default-composer-hdrs or customized-hdrs to get at it. Instead of
Lines 31-36 Link Here
31	file is included in the os-*.ic file for your system.	31	file is included in the os-*.ic file for your system.
32	----*/	32	----*/
33	! #define BACKGROUND_POST /* comment out to disable posting from child */	33	! #define BACKGROUND_POST /* comment out to disable posting from child */
		34
		35
		36
		37	***************
		38	* 160,167 **
		39
		40
		41	/----- System-wide config file ----------------------------------------/
		42	! #define SYSTEM_PINERC "/usr/local/lib/pine.conf"
		43	! #define SYSTEM_PINERC_FIXED "/usr/local/lib/pine.conf.fixed"
		44
		45
		46
		47	--- 160,167 ----
		48
		49
		50	/----- System-wide config file ----------------------------------------/
		51	! #define SYSTEM_PINERC "/usr/local/etc/pine.conf"
		52	! #define SYSTEM_PINERC_FIXED "/usr/local/etc/pine.conf.fixed"
34		53
35		54
36		55

Lines 1-7 Link Here

(-)pine4/patches/patch-al (-11 / +28 lines)
1	*** build.orig Mon Jun 15 20:35:10 1998	1	*** build.orig Thu Aug 27 09:43:22 1998
2	--- build Wed Aug 12 20:21:46 1998	2	--- build Wed Sep 9 19:31:14 1998
3	***************	3	***************
4	* 256,266 **	4	* 80,87 **
		5	pine The Pine mailer. Once compiled this should work just fine on
		6	your system with no other files than this binary, and no
		7	modifications to your system. Optionally you may create two
		8	! configuration files, /usr/local/lib/pine.conf and
		9	! /usr/local/lib/pine.info. See the documentation for details.
		10
		11	pico The standalone editor similar to the Pine message composer.
		12	This is a very simple straight forward text editor.
		13	--- 80,87 ----
		14	pine The Pine mailer. Once compiled this should work just fine on
		15	your system with no other files than this binary, and no
		16	modifications to your system. Optionally you may create two
		17	! configuration files, /usr/local/etc/pine.conf and
		18	! /usr/local/etc/pine.info. See the documentation for details.
		19
		20	pico The standalone editor similar to the Pine message composer.
		21	This is a very simple straight forward text editor.
		22	***************
		23	* 272,282 **
5		24
6	if [ -s c-client ] ; then rm -f c-client ; fi	25	if [ -s c-client ] ; then rm -f c-client ; fi
7	ln -s imap/c-client c-client	26	ln -s imap/c-client c-client
Lines 13-19 Link Here
13	eval echo make "$makeargs" "$K1" "$K2" $ccltarg	32	eval echo make "$makeargs" "$K1" "$K2" $ccltarg
14	cd $PHOME/imap	33	cd $PHOME/imap
15	eval make "$makeargs" "$K1" "$K2" $ccltarg	34	eval make "$makeargs" "$K1" "$K2" $ccltarg
16	--- 256,266 ----	35	--- 272,282 ----
17		36
18	if [ -s c-client ] ; then rm -f c-client ; fi	37	if [ -s c-client ] ; then rm -f c-client ; fi
19	ln -s imap/c-client c-client	38	ln -s imap/c-client c-client
Lines 26-32 Link Here
26	cd $PHOME/imap	45	cd $PHOME/imap
27	eval make "$makeargs" "$K1" "$K2" $ccltarg	46	eval make "$makeargs" "$K1" "$K2" $ccltarg
28	***************	47	***************
29	* 281,294 **	48	* 297,310 **
30	cd $PHOME/bin	49	cd $PHOME/bin
31	rm -f pine mtest imapd pico pilot	50	rm -f pine mtest imapd pico pilot
32	if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi	51	if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi
Lines 41-47 Link Here
41	echo "Done"	60	echo "Done"
42	;;	61	;;
43		62
44	--- 281,296 ----	63	--- 297,310 ----
45	cd $PHOME/bin	64	cd $PHOME/bin
46	rm -f pine mtest imapd pico pilot	65	rm -f pine mtest imapd pico pilot
47	if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi	66	if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi
Lines 49-65 Link Here
49	! # if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi	68	! # if [ -s ../imapd/imapd ] ; then ln ../imapd/imapd imapd ; fi
50	if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi	69	if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi
51	if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi	70	if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi
52	+ if [ -s ../pico/libpico.so.2.0 ] ;
53	+ then ln ../pico/libpico.so.2.0 libpico.so.2.0 ; fi
54	cd $PHOME	71	cd $PHOME
55	echo ''	72	echo ''
56	echo "Links to executables are in bin directory:"	73	echo "Links to executables are in bin directory:"
57	! size bin/pine bin/pico bin/pilot bin/libpico.so.2.0	74	! size bin/pine bin/pico bin/pilot
58	echo "Done"	75	echo "Done"
59	;;	76	;;
60		77
61	***************	78	***************
62	* 299,308 **	79	* 315,324 **
63	make clean	80	make clean
64	echo "Cleaning Pine"	81	echo "Cleaning Pine"
65	cd $PHOME/pine	82	cd $PHOME/pine
Lines 70-76 Link Here
70	echo "Done"	87	echo "Done"
71	cd $PHOME	88	cd $PHOME
72	;;	89	;;
73	--- 301,310 ----	90	--- 315,324 ----
74	make clean	91	make clean
75	echo "Cleaning Pine"	92	echo "Cleaning Pine"
76	cd $PHOME/pine	93	cd $PHOME/pine

Lines 1-23 Link Here

(-)pine4/patches/patch-ar (-17 / +38 lines)
1	*** imap/src/osdep/unix/unix.c.orig Thu Jul 16 04:52:38 1998	1	*** imap/src/osdep/unix/unix.c.orig Wed Sep 9 16:47:48 1998
2	--- imap/src/osdep/unix/unix.c Tue Jul 21 14:59:03 1998	2	--- imap/src/osdep/unix/unix.c Wed Sep 9 16:52:48 1998
3	***************	3	***************
4	* 1008,1014 **	4	* 1010,1016 **
5	/* try again if file exists(?) */	5	case EACCES: /* protection failure */
6	if (!stat (hitch,&sb)) break;	6	if (stat (hitch,&sb)) { /* try again if file exists(?) */
7	/* punt silently if paranoid site */	7	/* punt silently if paranoid site */
8	! if (mail_parameters (NIL,GET_LOCKEACCESERROR,NIL))	8	! if (mail_parameters (NIL,GET_LOCKEACCESERROR,NIL))
9	default: /* some other error */	9	mm_log ("Mailbox vulnerable - directory must have 1777 protection",
10	mm_log (tmp,WARN); /* this is probably not good */	10	WARN);
11	lock = '\0'; / give up on lock file */	11	lock = '\0'; / give up on lock file */
12	--- 1008,1018 ----	12	--- 1010,1020 ----
13	/* try again if file exists(?) */	13	case EACCES: /* protection failure */
14	if (!stat (hitch,&sb)) break;	14	if (stat (hitch,&sb)) { /* try again if file exists(?) */
15	/* punt silently if paranoid site */	15	/* punt silently if paranoid site */
16	! if (	16	! if (
17	! #ifdef __FreeBSD__	17	! #ifdef __FreeBSD__
18	! strncmp(lock,"/var/mail/",10) && /* /var/mail/... isn't lockable */	18	! strncmp(lock,"/var/mail/",10) && /* /var/mail/... isn't lockable */
19	! #endif	19	! #endif
20	! mail_parameters (NIL,GET_LOCKEACCESERROR,NIL))	20	! mail_parameters (NIL,GET_LOCKEACCESERROR,NIL))
21	default: /* some other error */	21	mm_log ("Mailbox vulnerable - directory must have 1777 protection",
22	mm_log (tmp,WARN); /* this is probably not good */	22	WARN);
23	lock = '\0'; / give up on lock file */	23	lock = '\0'; / give up on lock file */
		24	***************
		25	* 1055,1061 **
		26	case EACCES: /* protection fail, ignore if non-ex or old */
		27	if (stat (lock,&sb)) { /* try again if file exists(?) */
		28	/* punt silently if paranoid site */
		29	! if (mail_parameters (NIL,GET_LOCKEACCESERROR,NIL))
		30	mm_log ("Mailbox vulnerable - directory must have 1777 protection",
		31	WARN);
		32	lock = '\0'; / give up on lock file */
		33	--- 1059,1069 ----
		34	case EACCES: /* protection fail, ignore if non-ex or old */
		35	if (stat (lock,&sb)) { /* try again if file exists(?) */
		36	/* punt silently if paranoid site */
		37	! if (
		38	! #ifdef __FreeBSD__
		39	! strncmp(lock,"/var/mail/",10) && /* /var/mail/... isn't lockable */
		40	! #endif
		41	! mail_parameters (NIL,GET_LOCKEACCESERROR,NIL))
		42	mm_log ("Mailbox vulnerable - directory must have 1777 protection",
		43	WARN);
		44	lock = '\0'; / give up on lock file */

Lines 1-17 Link Here

(-)pine4/patches/patch-as (-14 lines)
1	*** pine/init.c.orig Thu Jul 16 21:22:22 1998
2	--- pine/init.c Tue Jul 21 15:36:43 1998
3	***************
4	* 579,584 **
5	--- 579,587 ----
6	GLO_SMTP_SERVER = parse_list(DF_SMTP_SERVER, 1, NULL);
7	#endif
8
9	+ F_TURN_ON(F_TCAP_WINS,ps);
10	+ F_TURN_ON(F_QUELL_INTERNAL_MSG,ps);
11	+
12	/* Set the default mail directory */
13	build_path(buf, GLO_MAIL_DIRECTORY, "[]");
14	GLO_FOLDER_SPEC = parse_list(buf, 1, NULL);
15	*** pine/other.c.orig Thu Jul 16 04:09:27 1998	1	*** pine/other.c.orig Thu Jul 16 04:09:27 1998
16	--- pine/other.c Tue Jul 21 15:03:18 1998	2	--- pine/other.c Tue Jul 21 15:03:18 1998
17	***************	3	***************

Lines 1-7 Link Here

(-)pine4/patches/patch-at (-10 / +27 lines)
1	*** pine/pine.hlp.orig Wed Jul 22 01:04:04 1998	1	*** pine/pine.hlp.orig Tue Sep 1 19:24:44 1998
2	--- pine/pine.hlp Wed Aug 12 22:17:10 1998	2	--- pine/pine.hlp Wed Sep 9 20:55:47 1998
3	***************	3	***************
4	* 750,758 **	4	* 790,798 **
5		5
6	executable <Unix search path>/pine	6	executable <Unix search path>/pine
7	persnl cfg ~/.pinerc	7	persnl cfg ~/.pinerc
Lines 11-17 Link Here
11		11
12	interrupted ~/.pine-interrupted-mail	12	interrupted ~/.pine-interrupted-mail
13	debug ~/.pine-debugN	13	debug ~/.pine-debugN
14	--- 750,758 ----	14	--- 790,798 ----
15		15
16	executable <Unix search path>/pine	16	executable <Unix search path>/pine
17	persnl cfg ~/.pinerc	17	persnl cfg ~/.pinerc
Lines 22-28 Link Here
22	interrupted ~/.pine-interrupted-mail	22	interrupted ~/.pine-interrupted-mail
23	debug ~/.pine-debugN	23	debug ~/.pine-debugN
24	***************	24	***************
25	* 1137,1145 **	25	* 805,811 **
		26	sentmail# ~/mail/sent-mail
		27	mailcap# ~/.mailcap + /etc/mailcap
		28	+ /usr/etc/mailcap + /usr/local/etc/mailcap
		29	! mimetypes# ~/.mime.types + /etc/mime.types + /usr/local/lib/mime.types
		30
		31	news-spool varies across Unix flavors, e.g. /usr/spool/news or /var/news
		32	active-news varies across Unix flavors, e.g. /usr/lib/news/active
		33	--- 805,811 ----
		34	sentmail# ~/mail/sent-mail
		35	mailcap# ~/.mailcap + /etc/mailcap
		36	+ /usr/etc/mailcap + /usr/local/etc/mailcap
		37	! mimetypes# ~/.mime.types + /etc/mime.types + /usr/local/etc/mime.types
		38
		39	news-spool varies across Unix flavors, e.g. /usr/spool/news or /var/news
		40	active-news varies across Unix flavors, e.g. /usr/lib/news/active
		41	***************
		42	* 1346,1354 **
26	this link now to send a message to it:<BR>	43	this link now to send a message to it:<BR>
27	<A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>	44	<A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
28	<!--chtml endif-->	45	<!--chtml endif-->
Lines 32-38 Link Here
32	<HR WIDTH="75%">	49	<HR WIDTH="75%">
33	<!--chtml endif-->	50	<!--chtml endif-->
34	<P>	51	<P>
35	--- 1137,1145 ----	52	--- 1346,1354 ----
36	this link now to send a message to it:<BR>	53	this link now to send a message to it:<BR>
37	<A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>	54	<A HREF="X-Pine-Gripe:_LOCAL_ADDRESS_?local"><!--#echo var="_LOCAL_FULLNAME_"--></A><P>
38	<!--chtml endif-->	55	<!--chtml endif-->
Lines 43-49 Link Here
43	<!--chtml endif-->	60	<!--chtml endif-->
44	<P>	61	<P>
45	***************	62	***************
46	* 1226,1232 **	63	* 1435,1441 **
47	<OL>	64	<OL>
48	<LI> <A HREF="#intro">Introduction</A>	65	<LI> <A HREF="#intro">Introduction</A>
49	<LI> <A HREF="#pine_help">Pine Help</A>	66	<LI> <A HREF="#pine_help">Pine Help</A>
Lines 51-57 Link Here
51	<LI> <A HREF="#local_support">Local Support Contacts</A>	68	<LI> <A HREF="#local_support">Local Support Contacts</A>
52	<!--chtml endif-->	69	<!--chtml endif-->
53	<LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>	70	<LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
54	--- 1226,1232 ----	71	--- 1435,1441 ----
55	<OL>	72	<OL>
56	<LI> <A HREF="#intro">Introduction</A>	73	<LI> <A HREF="#intro">Introduction</A>
57	<LI> <A HREF="#pine_help">Pine Help</A>	74	<LI> <A HREF="#pine_help">Pine Help</A>
Lines 60-66 Link Here
60	<!--chtml endif-->	77	<!--chtml endif-->
61	<LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>	78	<LI> <A HREF="#giving_cmds">Giving Commands in Pine</A>
62	***************	79	***************
63	* 1333,1341 **	80	* 1542,1550 **
64	at your site.)	81	at your site.)
65		82
66		83
Lines 70-76 Link Here
70	<!--chtml endif-->	87	<!--chtml endif-->
71		88
72	<H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>	89	<H2><A NAME="giving_cmds">Giving Commands in Pine</A></H2>
73	--- 1333,1341 ----	90	--- 1542,1550 ----
74	at your site.)	91	at your site.)
75		92
76		93

Lines 1-7 Link Here

(-)pine4/patches/patch-au (-5 / +7 lines)
1	*** doc/pine.1.orig Tue Jul 21 22:48:42 1998	1	*** doc/pine.1.orig Wed Sep 2 11:31:57 1998
2	--- doc/pine.1 Wed Aug 12 22:03:31 1998	2	--- doc/pine.1 Wed Sep 9 20:40:41 1998
3	***************	3	***************
4	* 256,266 **	4	* 271,281 **
5	.br	5	.br
6	/etc/mime.types System-wide file ext. to MIME type mapping	6	/etc/mime.types System-wide file ext. to MIME type mapping
7	.br	7	.br
Lines 13-26 Link Here
13	.br	13	.br
14	/tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files.	14	/tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files.
15	.br	15	.br
16	--- 256,266 ----	16	--- 271,283 ----
17	.br	17	.br
18	/etc/mime.types System-wide file ext. to MIME type mapping	18	/etc/mime.types System-wide file ext. to MIME type mapping
19	.br	19	.br
		20	! /usr/local/etc/mime.types Optional system-wide file ext. to MIME type mapping
		21	.br
20	! /usr/local/etc/pine.info Local pointer to system administrator.	22	! /usr/local/etc/pine.info Local pointer to system administrator.
21	.br	23	.br
22	! /usr/local/etc/pine.conf System-wide configuration file.	24	! /usr/local/etc/pine.conf System-wide configuration file.
23	.br	25	! .br
24	! /usr/local/etc/pine.conf.fixed Non-overridable configuration file.	26	! /usr/local/etc/pine.conf.fixed Non-overridable configuration file.
25	.br	27	.br
26	/tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files.	28	/tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files.

Line 0 Link Here

(-)pine4/patches/patch-av (+139 lines)
		1	--- doc/tech-notes.txt.orig Wed Sep 9 19:46:43 1998
		2	+++ doc/tech-notes.txt Wed Sep 9 20:44:31 1998
		3	@@ -321,14 +321,14 @@
		4	sendmail-path, smtp-server, and compile-time options. The first
		5	MTA specified in the following list is used:
		6
		7	- 1. sendmail-path in /usr/local/lib/pine.conf.fixed
		8	- 2. smtp-server in /usr/local/pine.conf.fixed
		9	+ 1. sendmail-path in /usr/local/etc/pine.conf.fixed
		10	+ 2. smtp-server in /usr/local/etc/pine.conf.fixed
		11	3. sendmail-path specified on the command line.
		12	4. smtp-server specified on the command line.
		13	5. sendmail-path in the user's .pinerc file.
		14	6. smtp-server in the user's .pinerc file.
		15	- 7. sendmail-path in /usr/local/lib/pine.conf
		16	- 8. smtp-server in /usr/local/pine.conf
		17	+ 7. sendmail-path in /usr/local/etc/pine.conf
		18	+ 8. smtp-server in /usr/local/etc/pine.conf
		19	9. DF_SENDMAIL_PATH defined at compile time.
		20	10. SENDMAIL and SENDMAILFLAGS defined at compile time.
		21
		22	@@ -616,14 +616,14 @@
		23	SYSTEM_PINERC
		24	The name of the file which holds Pine configuration information for
		25	all users on the system. Default on UNIX systems is
		26	- /usr/local/lib/pine.conf.
		27	+ /usr/local/etc/pine.conf.
		28
		29	SYSTEM_PINERC_FIXED
		30	The name of the file which holds the same type of information as for
		31	SYSTEM_PINERC, but only for variables that the administrator wants to
		32	keep fixed. That is, users are not allowed to change variables that
		33	are specified in the FIXED file. Default on UNIX systems is
		34	- /usr/local/lib/pine.conf.fixed.
		35	+ /usr/local/etc/pine.conf.fixed.
		36
		37	There are a couple of more obscure options which are in the source
		38	code because a few people have asked for them or because we changed
		39	@@ -734,8 +734,8 @@
		40	files.
		41
		42	There are, however, three optional auxiliary files:
		43	- /usr/local/lib/pine.info, /usr/local/lib/pine.conf, and
		44	- /usr/local/lib/pine.conf.fixed. The file pine.info contains text on
		45	+ /usr/local/etc/pine.conf, and
		46	+ /usr/local/etc/pine.conf.fixed. The file pine.info contains text on
		47	how to get further help on the local system. It is part of the help
		48	text for the main menu and should probably refer to the local help
		49	desk or the system administrator. If this file doesn't exist a generic
		50	@@ -864,11 +864,11 @@
		51	This section lists the various files which Pine uses which are not
		52	email folders. All of these are the default names of files, they may
		53	vary based on Pine's configuration.
		54	- /usr/local/lib/pine.conf
		55	+ /usr/local/etc/pine.conf
		56	Pine's global configuration file.
		57	- /usr/local/lib/pine.conf.fixed
		58	+ /usr/local/etc/pine.conf.fixed
		59	Non-overridable global configuration file.
		60	- /usr/local/lib/pine.info
		61	+ /usr/local/etc/pine.info
		62	Local pointer to system administrator.
		63	~/.pinerc
		64	Personal configuration file for each user.
65	@@ -1017,11 +1017,11 @@
66	screen or standard output. To generate an initial system
67	configuration file, execute
68
69	- pine -conf > /usr/local/lib/pine.conf
70	+ pine -conf > /usr/local/etc/pine.conf
71	To generate a system configuration file using settings from an
72	old system configuration file, execute
73
74	- pine -P old-pine.conf -conf > /usr/local/lib/pine.conf
75	+ pine -P old-pine.conf -conf > /usr/local/etc/pine.conf
76	-create_lu addrbook sort-order
77	Create auxiliary index (LookUp) file for addrbook and sort
78	addrbook in sort-order, which may be dont-sort, nickname,
79	@@ -1089,7 +1089,7 @@
80	uses.
81	-P file
82	Uses the named file as the system wide configuration file
83	- instead of /usr/local/lib/pine.conf. UNIX Pine only.
84	+ instead of /usr/local/etc/pine.conf. UNIX Pine only.
85	-pinerc file
86	Output fresh pinerc configuration to file, preserving the
87	settings of variables that the user has made. Use file set to
88	@@ -1239,8 +1239,8 @@
89	configuration. In most cases, the compiled-in preferences will suit
90	users and administrators just fine. When running Pine on a UNIX
91	system, the default built-in configuration can be changed by setting
92	- variables in the system configuration files, /usr/local/lib/pine.conf
93	- or /usr/local/lib/pine.conf.fixed. Both Pine and PC-Pine also use
94	+ variables in the system configuration files, /usr/local/etc/pine.conf
95	+ or /usr/local/etc/pine.conf.fixed. Both Pine and PC-Pine also use
96	personal (user-based) configuration files. On UNIX machines, the
97	personal configuration file is the file ~/.pinerc. For PC-Pine
98	systems, the personal configuration file is in $PINERC or
99	@@ -3323,8 +3323,8 @@
100	* A program that implements the SMTP or ESMTP protocol via stdio.
101	* An entry in /etc/services for the alternate service.
102	* An entry in /etc/inetd.conf for the alternate service.
103	- * An entry in /usr/local/lib/pine.conf,
104	- /usr/local/lib/pine.conf.fixed or ~/.pinerc.
105	+ * An entry in /usr/local/etc/pine.conf,
106	+ /usr/local/etc/pine.conf.fixed or ~/.pinerc.
107
108	_________________________________________________________________
109
110	@@ -3333,7 +3333,7 @@
111	Pine's MIME-TYPE support is based on code contributed by Hans Drexler
112	&LT;drexler@mpi.nl&GT;. Pine assigns MIME Content-Types according to
113	file name extensions found in the system-wide files
114	- /usr/local/lib/mime.types and /etc/mime.types, and a user specific
115	+ /usr/local/etc/mime.types and /etc/mime.types, and a user specific
116	~/.mime.types file.
117
118	In DOS and OS/2, Pine looks in the same directory as the PINERC file
119	@@ -4368,7 +4368,7 @@
120
121	The second selection is the standard UNIX print command. The default
122	is lpr, but it can be changed on a system basis to anything so desired
123	- in /usr/local/lib/pine.conf.
124	+ in /usr/local/etc/pine.conf.
125
126	The third selection is the user's personal choice for a UNIX print
127	command. The text to be printed is piped into the command. Enscript or
128	@@ -4828,9 +4828,9 @@
129	Error messages for incorrect terminal types (try "foo" and
130	"vt52")
131	___
132	- Reading of /usr/local/lib/pine.conf
133	+ Reading of /usr/local/etc/pine.conf
134	___
135	- Fixing variables and features in /usr/local/lib/pine.conf.fixed
136	+ Fixing variables and features in /usr/local/etc/pine.conf.fixed
137	___
138	Flag command (check message status changed in mail folder)
139	___

Line 0 Link Here

(-)pine4/patches/patch-ax (+29 lines)
	1	--- doc/tech-notes/cmd-line.html.orig Wed Sep 9 19:53:26 1998
	2	+++ doc/tech-notes/cmd-line.html Wed Sep 9 19:54:32 1998
	3	@@ -41,7 +41,7 @@
	4	file, execute
	5
	6	<PRE><CODE>
	7	- pine -conf > /usr/local/lib/pine.conf
	8	+ pine -conf > /usr/local/etc/pine.conf
	9	</CODE></PRE>
	10	<P>
	11
	12	@@ -49,7 +49,7 @@
	13	system configuration file, execute
	14
	15	<PRE><CODE>
	16	- pine -P old-pine.conf -conf > /usr/local/lib/pine.conf
	17	+ pine -P old-pine.conf -conf > /usr/local/etc/pine.conf
	18	</CODE></PRE>
	19	<P>
	20
	21	@@ -145,7 +145,7 @@
	22	<DT> -P <EM>file</EM>
	23
	24	<DD> Uses the named file as the system wide configuration file instead of
	25	-<EM>/usr/local/lib/pine.conf</EM>. <I>UNIX Pine only.</I> <P>
	26	+<EM>/usr/local/etc/pine.conf</EM>. <I>UNIX Pine only.</I> <P>
	27
	28	<DT> -pinerc <EM>file</EM>
	29

Line 0 Link Here

(-)pine4/patches/patch-ay (+21 lines)
	1	*** doc/tech-notes/config.html.orig Wed Sep 9 19:59:10 1998
	2	--- doc/tech-notes/config.html Wed Sep 9 19:57:58 1998
	3	***************
	4	* 7,14 **
	5	configuration. In most cases, the compiled-in preferences will suit users
	6	and administrators just fine. When running <EM>Pine</EM> on a UNIX system, the
	7	default built-in configuration can be changed by setting variables in the
	8	! system configuration files, <CODE>/usr/local/lib/pine.conf</CODE>
	9	! or <CODE>/usr/local/lib/pine.conf.fixed</CODE>. Both <EM>Pine</EM>
	10	and <EM>PC-Pine</EM> also use personal (user-based) configuration files. On UNIX
	11	machines, the personal configuration file is the file <CODE>~/.pinerc</CODE>.
	12	For <EM>PC-Pine</EM> systems, the personal configuration file is in
	13	--- 7,14 ----
	14	configuration. In most cases, the compiled-in preferences will suit users
	15	and administrators just fine. When running <EM>Pine</EM> on a UNIX system, the
	16	default built-in configuration can be changed by setting variables in the
	17	! system configuration files, <CODE>/usr/local/etc/pine.conf</CODE>
	18	! or <CODE>/usr/local/etc/pine.conf.fixed</CODE>. Both <EM>Pine</EM>
	19	and <EM>PC-Pine</EM> also use personal (user-based) configuration files. On UNIX
	20	machines, the personal configuration file is the file <CODE>~/.pinerc</CODE>.
	21	For <EM>PC-Pine</EM> systems, the personal configuration file is in

Line 0 Link Here

(-)pine4/patches/patch-az (+31 lines)
	1	*** pine/init.c.orig Wed Sep 2 10:39:42 1998
	2	--- pine/init.c Wed Sep 9 19:33:06 1998
	3	***************
	4	* 319,325 **
	5
	6	/*----------------------------------------------------------------------
	7	These are the variables that control a number of pine functions. They
	8	! come out of the .pinerc and the /usr/local/lib/pine.conf files. Some can
	9	be set by the user while in Pine. Eventually all the local ones should
	10	be so and maybe the global ones too.
	11
	12	--- 319,325 ----
	13
	14	/*----------------------------------------------------------------------
	15	These are the variables that control a number of pine functions. They
	16	! come out of the .pinerc and the /usr/local/etc/pine.conf files. Some can
	17	be set by the user while in Pine. Eventually all the local ones should
	18	be so and maybe the global ones too.
	19
	20	***************
	21	* 578,583 **
	22	--- 578,586 ----
	23	#ifdef DF_SMTP_SERVER
	24	GLO_SMTP_SERVER = parse_list(DF_SMTP_SERVER, 1, NULL);
	25	#endif
	26	+
	27	+ F_TURN_ON(F_TCAP_WINS,ps);
	28	+ F_TURN_ON(F_QUELL_INTERNAL_MSG,ps);
	29
	30	/* Set the default mail directory */
	31	build_path(buf, GLO_MAIL_DIRECTORY, "[]");

Line 0 Link Here

(-)pine4/patches/patch-ba (+52 lines)
	1	--- doc/tech-notes/installation.html.orig Wed Sep 9 20:10:13 1998
	2	+++ doc/tech-notes/installation.html Wed Sep 9 20:12:32 1998
	3	@@ -147,7 +147,7 @@
	4	<DD> The name of the file which holds <EM>Pine</EM>
	5	configuration information for
	6	all users on the system. Default on UNIX systems is
	7	-<CODE>/usr/local/lib/pine.conf</CODE>.
	8	+<CODE>/usr/local/etc/pine.conf</CODE>.
	9
	10	<DT> SYSTEM_PINERC_FIXED
	11
	12	@@ -155,7 +155,7 @@
	13	SYSTEM_PINERC, but only for variables that the administrator wants to keep
	14	fixed. That is, users are not allowed to change variables that are
	15	specified in the FIXED file. Default on UNIX systems is
	16	-<CODE>/usr/local/lib/pine.conf.fixed</CODE>.
	17	+<CODE>/usr/local/etc/pine.conf.fixed</CODE>.
	18
	19	</DL> <P>
	20
	21	@@ -305,9 +305,9 @@
	22	are no <STRONG>required</STRONG> auxiliary files. <P>
	23
	24	There are, however, three optional auxiliary files:
	25	-<CODE>/usr/local/lib/pine.info</CODE>,
	26	-<CODE>/usr/local/lib/pine.conf</CODE>, and
	27	-<CODE>/usr/local/lib/pine.conf.fixed</CODE>. The file
	28	+<CODE>/usr/local/etc/pine.info</CODE>,
	29	+<CODE>/usr/local/etc/pine.conf</CODE>, and
	30	+<CODE>/usr/local/etc/pine.conf.fixed</CODE>. The file
	31	<CODE>pine.info</CODE> contains text on how to get further help on the
	32	local system. It is part of the help text for the
	33	main menu and should probably refer to the local help desk or the system
	34	@@ -471,15 +471,15 @@
	35
	36	<DL COMPACT>
	37
	38	-<DT> /usr/local/lib/pine.conf
	39	+<DT> /usr/local/etc/pine.conf
	40
	41	<DD> Pine's global configuration file.
	42
	43	-<DT> /usr/local/lib/pine.conf.fixed
	44	+<DT> /usr/local/etc/pine.conf.fixed
	45
	46	<DD> Non-overridable global configuration file.
	47
	48	-<DT> /usr/local/lib/pine.info
	49	+<DT> /usr/local/etc/pine.info
	50
	51	<DD> Local pointer to system administrator.
	52

Line 0 Link Here

(-)pine4/patches/patch-bb (+44 lines)
	1	*** doc/tech-notes/background.html.orig Wed Sep 9 20:15:13 1998
	2	--- doc/tech-notes/background.html Wed Sep 9 20:16:57 1998
	3	***************
	4	* 174,182 **
	5	<OL>
	6
	7	<LI><EM>sendmail-path</EM> in
	8	! <CODE>/usr/local/lib/pine.conf.fixed</CODE>
	9
	10	! <LI><EM>smtp-server</EM> in <CODE>/usr/local/pine.conf.fixed</CODE>
	11
	12	<LI><EM>sendmail-path</EM> specified on the command line.
	13
	14	--- 174,182 ----
	15	<OL>
	16
	17	<LI><EM>sendmail-path</EM> in
	18	! <CODE>/usr/local/etc/pine.conf.fixed</CODE>
	19
	20	! <LI><EM>smtp-server</EM> in <CODE>/usr/local/etc/pine.conf.fixed</CODE>
	21
	22	<LI><EM>sendmail-path</EM> specified on the command line.
	23
	24	***************
	25	* 186,194 **
	26
	27	<LI><EM>smtp-server</EM> in the user's <CODE>.pinerc</CODE> file.
	28
	29	! <LI><EM>sendmail-path</EM> in <CODE>/usr/local/lib/pine.conf</CODE>
	30
	31	! <LI><EM>smtp-server</EM> in <CODE>/usr/local/pine.conf</CODE>
	32
	33	<LI><CODE>DF_SENDMAIL_PATH</CODE> defined at compile time.
	34
	35	--- 186,194 ----
	36
	37	<LI><EM>smtp-server</EM> in the user's <CODE>.pinerc</CODE> file.
	38
	39	! <LI><EM>sendmail-path</EM> in <CODE>/usr/local/etc/pine.conf</CODE>
	40
	41	! <LI><EM>smtp-server</EM> in <CODE>/usr/local/etc/pine.conf</CODE>
	42
	43	<LI><CODE>DF_SENDMAIL_PATH</CODE> defined at compile time.
	44

Line 0 Link Here

(-)pine4/patches/patch-bc (+16 lines)
	1	--- doc/tech-notes/porting.html.orig Wed Sep 9 20:18:28 1998
	2	+++ doc/tech-notes/porting.html Wed Sep 9 20:19:11 1998
	3	@@ -307,11 +307,11 @@
	4	<DT>
	5	___
	6	<DD>
	7	-Reading of <CODE>/usr/local/lib/pine.conf</CODE>
	8	+Reading of <CODE>/usr/local/etc/pine.conf</CODE>
	9	<DT>
	10	___
	11	<DD>
	12	-Fixing variables and features in <CODE>/usr/local/lib/pine.conf.fixed</CODE>
	13	+Fixing variables and features in <CODE>/usr/local/etc/pine.conf.fixed</CODE>
	14	<DT>
	15	___
	16	<DD>

Line 0 Link Here

(-)pine4/patches/patch-bd (+22 lines)
	1	--- doc/tech-notes/config-notes.html.orig Wed Sep 9 20:20:18 1998
	2	+++ doc/tech-notes/config-notes.html Wed Sep 9 20:52:40 1998
	3	@@ -437,8 +437,8 @@
	4
	5	<LI> An entry in <CODE>/etc/inetd.conf</CODE> for the alternate service.
	6
	7	-<LI> An entry in <CODE>/usr/local/lib/pine.conf</CODE>,
	8	-<CODE>/usr/local/lib/pine.conf.fixed</CODE> or <CODE>~/.pinerc</CODE>.
	9	+<LI> An entry in <CODE>/usr/local/etc/pine.conf</CODE>,
	10	+<CODE>/usr/local/etc/pine.conf.fixed</CODE> or <CODE>~/.pinerc</CODE>.
	11
	12	</UL>
	13
	14	@@ -449,7 +449,7 @@
	15	<EM>Pine</EM>'s MIME-TYPE support is based on code contributed by Hans Drexler
	16	&LT;drexler@mpi.nl&GT;. <EM>Pine</EM> assigns MIME Content-Types according
	17	to file name extensions found in the system-wide files
	18	-<CODE>/usr/local/lib/mime.types</CODE> and <CODE>/etc/mime.types</CODE>,
	19	+<CODE>/usr/local/etc/mime.types</CODE> and <CODE>/etc/mime.types</CODE>,
	20	and a user specific <CODE>~/.mime.types</CODE> file. <P>
	21
	22	In DOS and OS/2,

Line 0 Link Here

(-)pine4/patches/patch-be (+20 lines)
	1	--- pine/mailcap.c.orig Wed Sep 9 20:26:17 1998
	2	+++ pine/mailcap.c Wed Sep 9 20:26:53 1998
	3	@@ -61,7 +61,7 @@
	4
	5	Mime types makes mime assign attachment types according
	6	to file name extensions found in a system wide file
	7	- ``/usr/local/lib/mime.types'' and a user specific file
	8	+ ``/usr/local/etc/mime.types'' and a user specific file
	9	``~/.mime.types'' . These files specify file extensions
	10	that will be connected to a mime type.
	11	*******************************************************
	12	@@ -100,7 +100,7 @@
	13	#define MT_PATH_SEPARATOR ':'
	14	#define MT_USER_FILE NULL
	15	#define MT_STDPATH \
	16	- ".mime.types:/etc/mime.types:/usr/local/lib/mime.types"
	17	+ ".mime.types:/etc/mime.types:/usr/local/etc/mime.types"
	18	#endif /* !DOS */
	19
	20	#ifdef _WINDOWS

Lines 1-13 Link Here

(-)pine4/pkg/PLIST (-1 / +2 lines)
1	bin/pico	1	bin/pico
2	bin/pilot	2	bin/pilot
3	bin/pine	3	bin/pine
4	lib/libpico.so.2.0	4	lib/libpico.a
5	@exec /sbin/ldconfig -m %B	5	@exec /sbin/ldconfig -m %B
6	@unexec /sbin/ldconfig -R	6	@unexec /sbin/ldconfig -R
7	bin/pgpencrypt	7	bin/pgpencrypt
8	bin/pgpdecode	8	bin/pgpdecode
9	bin/pgpsign	9	bin/pgpsign
10	etc/dot.pinerc.pgp.sample	10	etc/dot.pinerc.pgp.sample
		11	etc/pine.conf.%%PKGNAME%%
11	share/doc/pine/brochure.txt	12	share/doc/pine/brochure.txt
12	share/doc/pine/tech-notes.txt	13	share/doc/pine/tech-notes.txt
13	share/doc/pine/tech-notes/background.html	14	share/doc/pine/tech-notes/background.html