From owner-freebsd-ports Thu Sep 10 00:10:04 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id AAA14721 for freebsd-ports-outgoing; Thu, 10 Sep 1998 00:10:04 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id AAA14666 for ; Thu, 10 Sep 1998 00:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id AAA25015; Thu, 10 Sep 1998 00:10:00 -0700 (PDT) Received: from dt053nb4.san.rr.com (dt053nb4.san.rr.com [204.210.34.180]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id AAA14561 for ; Thu, 10 Sep 1998 00:09:42 -0700 (PDT) (envelope-from dougdougdougdoug@dt053nb4.san.rr.com) Received: (from root@localhost) by dt053nb4.san.rr.com (8.8.8/8.8.8) id AAA18325; Thu, 10 Sep 1998 00:09:34 -0700 (PDT) (envelope-from dougdougdougdoug) Message-Id: <199809100709.AAA18325@dt053nb4.san.rr.com> Date: Thu, 10 Sep 1998 00:09:34 -0700 (PDT) From: Studded@dal.net Reply-To: Studded@dal.net To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/7879: Update pine4 port to 4.03, and other items Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 7879 >Category: ports >Synopsis: Update pine4 port to 4.03, and other items >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Sep 10 00:10:00 PDT 1998 >Last-Modified: >Originator: Doug >Organization: AAAG >Release: FreeBSD 2.2.7-STABLE-0905 i386 >Environment: DNA >Description: Update of pine4 port. >How-To-Repeat: DNA >Fix: Apply the following patch. There are several important changes to this port. First, it updates the version to 4.03. Second, it changes pine/osdep/os-bsf.h so that it actually looks in /usr/local/etc/ for the system wide pine.conf file. Currently it looks in /usr/local/lib. Also, patch-aa is deleted because it is no longer needed. There are other changes here as well. Most notably all references in the program and documentation to /usr/local[/lib]/pine.conf and /usr/local/lib/mime.types are changed to /usr/local/etc. Also, I've added a sample installation of /usr/local/etc/pine.conf to the makefile. Some of the patches are regenerated due to the changes I've made, the other patches I've left alone except for the ones (like patch-aa) which did not apply cleanly. patch-as and patch-aq need to be split because they affect more than one file, but I didn't want to deal with that in case there was a reason for it. The new changes for pine/init.c that were in patch-as I moved to patch-az. I don't understand what a lot of the existing patches do, so I left them alone. :) I hope this is of use, Doug diff -urN pine4-old/Makefile pine4/Makefile --- pine4-old/Makefile Wed Aug 12 23:49:09 1998 +++ pine4/Makefile Wed Sep 9 23:26:11 1998 @@ -1,33 +1,31 @@ # New ports collection makefile for: pine # http://www.washington.edu/pine/ -# Version required: 4.02A +# Version required: 4.03 # Date created: 09 July 1998 # Whom: Adrian Penisoara # # $Id: Makefile,v 1.26 1998/08/13 06:49:09 jkoshy Exp $ # -DISTNAME= pine4.02 -PKGNAME= pine-4.02a +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}/bin/libpico.so.2.0 ${PREFIX}/lib/libpico.so.2.0 + ${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 @@ -51,5 +49,16 @@ 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 diff -urN pine4-old/files/md5 pine4/files/md5 --- pine4-old/files/md5 Wed Aug 12 23:49:16 1998 +++ pine4/files/md5 Wed Sep 9 16:30:31 1998 @@ -1,2 +1 @@ -MD5 (pine4.02.tar.gz) = 688979b5649473169bdbf22ea1c82fe7 -MD5 (pine4.02A.patch) = 96271a2a00293186941cad0c0175bd69 +MD5 (pine4.03.tar.gz) = be35532537241176e3d01ce99d66780f diff -urN pine4-old/patches/patch-aa pine4/patches/patch-aa --- pine4-old/patches/patch-aa Wed Aug 12 23:49:33 1998 +++ pine4/patches/patch-aa Wed Dec 31 16:00:00 1969 @@ -1,44 +0,0 @@ -*** 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 diff -urN pine4-old/patches/patch-ac pine4/patches/patch-ac --- pine4-old/patches/patch-ac Wed Aug 12 23:49:33 1998 +++ pine4/patches/patch-ac Wed Sep 9 19:42:23 1998 @@ -1,5 +1,5 @@ -*** pine/osdep/os-bsf.h.orig Fri Jun 26 09:19:54 1998 ---- pine/osdep/os-bsf.h Wed Aug 12 22:22:02 1998 +*** 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 @@ -31,6 +31,25 @@ 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" diff -urN pine4-old/patches/patch-al pine4/patches/patch-al --- pine4-old/patches/patch-al Wed Aug 12 23:49:33 1998 +++ pine4/patches/patch-al Wed Sep 9 19:31:21 1998 @@ -1,7 +1,26 @@ -*** build.orig Mon Jun 15 20:35:10 1998 ---- build Wed Aug 12 20:21:46 1998 +*** build.orig Thu Aug 27 09:43:22 1998 +--- build Wed Sep 9 19:31:14 1998 *************** -*** 256,266 **** +*** 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 @@ -13,7 +32,7 @@ eval echo make "$makeargs" "$K1" "$K2" $ccltarg cd $PHOME/imap eval make "$makeargs" "$K1" "$K2" $ccltarg ---- 256,266 ---- +--- 272,282 ---- if [ -s c-client ] ; then rm -f c-client ; fi ln -s imap/c-client c-client @@ -26,7 +45,7 @@ cd $PHOME/imap eval make "$makeargs" "$K1" "$K2" $ccltarg *************** -*** 281,294 **** +*** 297,310 **** cd $PHOME/bin rm -f pine mtest imapd pico pilot if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi @@ -41,7 +60,7 @@ echo "Done" ;; ---- 281,296 ---- +--- 297,310 ---- cd $PHOME/bin rm -f pine mtest imapd pico pilot if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi @@ -49,17 +68,15 @@ ! # 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 bin/libpico.so.2.0 +! size bin/pine bin/pico bin/pilot echo "Done" ;; *************** -*** 299,308 **** +*** 315,324 **** make clean echo "Cleaning Pine" cd $PHOME/pine @@ -70,7 +87,7 @@ echo "Done" cd $PHOME ;; ---- 301,310 ---- +--- 315,324 ---- make clean echo "Cleaning Pine" cd $PHOME/pine diff -urN pine4-old/patches/patch-ar pine4/patches/patch-ar --- pine4-old/patches/patch-ar Tue Jul 21 06:46:03 1998 +++ pine4/patches/patch-ar Wed Sep 9 16:58:41 1998 @@ -1,23 +1,44 @@ -*** imap/src/osdep/unix/unix.c.orig Thu Jul 16 04:52:38 1998 ---- imap/src/osdep/unix/unix.c Tue Jul 21 14:59:03 1998 +*** 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 *************** -*** 1008,1014 **** - /* try again if file exists(?) */ - if (!stat (hitch,&sb)) break; +*** 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)) - default: /* some other error */ - mm_log (tmp,WARN); /* this is probably not good */ - *lock = '\0'; /* give up on lock file */ ---- 1008,1018 ---- - /* try again if file exists(?) */ - if (!stat (hitch,&sb)) break; +! 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 ( +! if ( ! #ifdef __FreeBSD__ -! strncmp(lock,"/var/mail/",10) && /* /var/mail/... isn't lockable */ +! strncmp(lock,"/var/mail/",10) && /* /var/mail/... isn't lockable */ ! #endif ! mail_parameters (NIL,GET_LOCKEACCESERROR,NIL)) - default: /* some other error */ - mm_log (tmp,WARN); /* this is probably not good */ - *lock = '\0'; /* give up on lock file */ + 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 */ diff -urN pine4-old/patches/patch-as pine4/patches/patch-as --- pine4-old/patches/patch-as Wed Aug 12 23:49:33 1998 +++ pine4/patches/patch-as Wed Sep 9 20:06:58 1998 @@ -1,17 +1,3 @@ -*** 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 *************** diff -urN pine4-old/patches/patch-at pine4/patches/patch-at --- pine4-old/patches/patch-at Wed Aug 12 23:49:33 1998 +++ pine4/patches/patch-at Wed Sep 9 20:57:02 1998 @@ -1,7 +1,7 @@ -*** pine/pine.hlp.orig Wed Jul 22 01:04:04 1998 ---- pine/pine.hlp Wed Aug 12 22:17:10 1998 +*** pine/pine.hlp.orig Tue Sep 1 19:24:44 1998 +--- pine/pine.hlp Wed Sep 9 20:55:47 1998 *************** -*** 750,758 **** +*** 790,798 **** executable <Unix search path>/pine persnl cfg ~/.pinerc @@ -11,7 +11,7 @@ interrupted ~/.pine-interrupted-mail debug ~/.pine-debugN ---- 750,758 ---- +--- 790,798 ---- executable <Unix search path>/pine persnl cfg ~/.pinerc @@ -22,7 +22,24 @@ interrupted ~/.pine-interrupted-mail debug ~/.pine-debugN *************** -*** 1137,1145 **** +*** 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:

@@ -32,7 +49,7 @@

---- 1137,1145 ---- +--- 1346,1354 ---- this link now to send a message to it:

@@ -43,7 +60,7 @@

*************** -*** 1226,1232 **** +*** 1435,1441 ****

  1. Introduction
  2. Pine Help @@ -51,7 +68,7 @@
  3. Local Support Contacts
  4. Giving Commands in Pine ---- 1226,1232 ---- +--- 1435,1441 ----
    1. Introduction
    2. Pine Help @@ -60,7 +77,7 @@
    3. Giving Commands in Pine *************** -*** 1333,1341 **** +*** 1542,1550 **** at your site.) @@ -70,7 +87,7 @@

      Giving Commands in Pine

      ---- 1333,1341 ---- +--- 1542,1550 ---- at your site.) diff -urN pine4-old/patches/patch-au pine4/patches/patch-au --- pine4-old/patches/patch-au Wed Aug 12 23:49:33 1998 +++ pine4/patches/patch-au Wed Sep 9 20:42:26 1998 @@ -1,7 +1,7 @@ -*** doc/pine.1.orig Tue Jul 21 22:48:42 1998 ---- doc/pine.1 Wed Aug 12 22:03:31 1998 +*** doc/pine.1.orig Wed Sep 2 11:31:57 1998 +--- doc/pine.1 Wed Sep 9 20:40:41 1998 *************** -*** 256,266 **** +*** 271,281 **** .br /etc/mime.types System-wide file ext. to MIME type mapping .br @@ -13,14 +13,16 @@ .br /tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files. .br ---- 256,266 ---- +--- 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 +! .br ! /usr/local/etc/pine.conf.fixed Non-overridable configuration file. .br /tmp/.\\usr\\spool\\mail\\xxxx Per-folder mailbox lock files. diff -urN pine4-old/patches/patch-av pine4/patches/patch-av --- pine4-old/patches/patch-av Wed Dec 31 16:00:00 1969 +++ pine4/patches/patch-av Wed Sep 9 20:51:17 1998 @@ -0,0 +1,139 @@ +--- 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 + <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 ++ /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) + ___ diff -urN pine4-old/patches/patch-aw pine4/patches/patch-aw --- pine4-old/patches/patch-aw Wed Dec 31 16:00:00 1969 +++ pine4/patches/patch-aw Wed Sep 9 19:56:51 1998 @@ -0,0 +1,11 @@ +--- doc/tech-notes/low-level.html.orig Wed Sep 9 19:52:02 1998 ++++ doc/tech-notes/low-level.html Wed Sep 9 19:52:40 1998 +@@ -1040,7 +1040,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.

      ++desired in /usr/local/etc/pine.conf.

      + + The third selection is + the user's personal choice for a UNIX print command. The text to be diff -urN pine4-old/patches/patch-ax pine4/patches/patch-ax --- pine4-old/patches/patch-ax Wed Dec 31 16:00:00 1969 +++ pine4/patches/patch-ax Wed Sep 9 19:55:41 1998 @@ -0,0 +1,29 @@ +--- 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 + + 

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

      + +@@ -49,7 +49,7 @@ + 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
+
      +

      + +@@ -145,7 +145,7 @@ +

      -P file + +
      Uses the named file as the system wide configuration file instead of +-/usr/local/lib/pine.conf. UNIX Pine only.

      ++/usr/local/etc/pine.conf. UNIX Pine only.

      + +

      -pinerc file + diff -urN pine4-old/patches/patch-ay pine4/patches/patch-ay --- pine4-old/patches/patch-ay Wed Dec 31 16:00:00 1969 +++ pine4/patches/patch-ay Wed Sep 9 19:59:56 1998 @@ -0,0 +1,21 @@ +*** 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 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 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 +--- 7,14 ---- + 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/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 diff -urN pine4-old/patches/patch-az pine4/patches/patch-az --- pine4-old/patches/patch-az Wed Dec 31 16:00:00 1969 +++ pine4/patches/patch-az Wed Sep 9 21:06:41 1998 @@ -0,0 +1,31 @@ +*** 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, "[]"); diff -urN pine4-old/patches/patch-ba pine4/patches/patch-ba --- pine4-old/patches/patch-ba Wed Dec 31 16:00:00 1969 +++ pine4/patches/patch-ba Wed Sep 9 20:14:38 1998 @@ -0,0 +1,52 @@ +--- 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 @@ +
      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 + +@@ -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 +-/usr/local/lib/pine.conf.fixed. ++/usr/local/etc/pine.conf.fixed. + +

      + +@@ -305,9 +305,9 @@ + 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 ++/usr/local/etc/pine.info, ++/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 +@@ -471,15 +471,15 @@ + +

      + +-
      /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. + diff -urN pine4-old/patches/patch-bb pine4/patches/patch-bb --- pine4-old/patches/patch-bb Wed Dec 31 16:00:00 1969 +++ pine4/patches/patch-bb Wed Sep 9 20:18:02 1998 @@ -0,0 +1,44 @@ +*** 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 **** +
        + +
      1. sendmail-path in +! /usr/local/lib/pine.conf.fixed + +!
      2. smtp-server in /usr/local/pine.conf.fixed + +
      3. sendmail-path specified on the command line. + +--- 174,182 ---- +
          + +
        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. + +*************** +*** 186,194 **** + +
        4. smtp-server in the user's .pinerc file. + +!
        5. sendmail-path in /usr/local/lib/pine.conf + +!
        6. smtp-server in /usr/local/pine.conf + +
        7. DF_SENDMAIL_PATH defined at compile time. + +--- 186,194 ---- + +
        8. smtp-server in the user's .pinerc file. + +!
        9. sendmail-path in /usr/local/etc/pine.conf + +!
        10. smtp-server in /usr/local/etc/pine.conf + +
        11. DF_SENDMAIL_PATH defined at compile time. + diff -urN pine4-old/patches/patch-bc pine4/patches/patch-bc --- pine4-old/patches/patch-bc Wed Dec 31 16:00:00 1969 +++ pine4/patches/patch-bc Wed Sep 9 20:19:52 1998 @@ -0,0 +1,16 @@ +--- 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 @@ +
          + ___ +
          +-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 +
          + ___ +
          diff -urN pine4-old/patches/patch-bd pine4/patches/patch-bd --- pine4-old/patches/patch-bd Wed Dec 31 16:00:00 1969 +++ pine4/patches/patch-bd Wed Sep 9 20:53:54 1998 @@ -0,0 +1,22 @@ +--- 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 @@ + +
        12. An entry in /etc/inetd.conf for the alternate service. + +-
        13. An entry in /usr/local/lib/pine.conf, +-/usr/local/lib/pine.conf.fixed or ~/.pinerc. ++
        14. An entry in /usr/local/etc/pine.conf, ++/usr/local/etc/pine.conf.fixed or ~/.pinerc. + + + +@@ -449,7 +449,7 @@ + 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, ++/usr/local/etc/mime.types and /etc/mime.types, + and a user specific ~/.mime.types file.

          + + In DOS and OS/2, diff -urN pine4-old/patches/patch-be pine4/patches/patch-be --- pine4-old/patches/patch-be Wed Dec 31 16:00:00 1969 +++ pine4/patches/patch-be Wed Sep 9 20:27:59 1998 @@ -0,0 +1,20 @@ +--- 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 diff -urN pine4-old/patches/patch-bf pine4/patches/patch-bf --- pine4-old/patches/patch-bf Wed Dec 31 16:00:00 1969 +++ pine4/patches/patch-bf Wed Sep 9 20:37:50 1998 @@ -0,0 +1,11 @@ +--- doc/mime.types.orig Wed Sep 9 20:36:30 1998 ++++ doc/mime.types Wed Sep 9 20:37:23 1998 +@@ -5,7 +5,7 @@ + # to the file name extension of attachments it sends. + # Pine first looks for "~/.mime.types", then adds + # any unbound MIME types found in "/etc/mime.types" +-# and "/usr/local/lib/mime.types". ++# and "/usr/local/etc/mime.types". + + application/postscript ai eps ps + application/rtf rtf diff -urN pine4-old/pkg/PLIST pine4/pkg/PLIST --- pine4-old/pkg/PLIST Sun Aug 16 22:19:32 1998 +++ pine4/pkg/PLIST Wed Sep 9 23:22:18 1998 @@ -1,13 +1,14 @@ bin/pico bin/pilot bin/pine -lib/libpico.so.2.0 +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 >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message