diff --git a/mail/pine/Makefile b/mail/pine/Makefile index 54419d1c8e2..422e2dbcd96 100644 --- a/mail/pine/Makefile +++ b/mail/pine/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.64 2005/11/22 04:23:20 jakob Exp $ +# $OpenBSD: Makefile,v 1.65 2005/11/23 13:44:25 jakob Exp $ COMMENT= "program for Internet E-mail and News" COMMENT-pico= "small text editor" @@ -11,7 +11,7 @@ PICO_VERSION= 4.10 PILOT_VERSION= 2.0 DISTNAME= pine${VERSION} -PKGNAME= pine-${VERSION}p0 +PKGNAME= pine-${VERSION}p1 PKGNAME-pico= pico-${PICO_VERSION} PKGNAME-pilot= pilot-${PILOT_VERSION} diff --git a/mail/pine/patches/patch-doc_tech-notes_txt b/mail/pine/patches/patch-doc_tech-notes_txt index 0b9f7d2a298..c6e76a59a1e 100644 --- a/mail/pine/patches/patch-doc_tech-notes_txt +++ b/mail/pine/patches/patch-doc_tech-notes_txt @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_tech-notes_txt,v 1.5 2005/04/29 19:51:35 jakob Exp $ ---- doc/tech-notes.txt.orig Thu Apr 28 20:29:46 2005 -+++ doc/tech-notes.txt Fri Apr 29 19:49:47 2005 +$OpenBSD: patch-doc_tech-notes_txt,v 1.6 2005/11/23 13:44:25 jakob Exp $ +--- doc/tech-notes.txt.orig Thu Sep 15 23:03:43 2005 ++++ doc/tech-notes.txt Wed Nov 23 14:26:30 2005 @@ -333,14 +333,14 @@ SMTP and Sendmail sendmail-path, smtp-server, and compile-time options. The first MTA specified in the following list is used: @@ -154,7 +154,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.5 2005/04/29 19:51:35 jakob Exp $ the definitions for SYSTEM_PINERC and SYSTEM_PINERC_FIXED in pine/osdep/os-xxx.h are set to.) The location of the pine.conf file can be changed with the -P command line argument. Both _Pine_ and -@@ -3757,7 +3758,7 @@ General Configuration Variables +@@ -3761,7 +3762,7 @@ General Configuration Variables spell checker. If your Unix system has _ispell_ it is probably reasonable to make it the default speller by configuring it as the default in the system configuration file, @@ -163,7 +163,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.5 2005/04/29 19:51:35 jakob Exp $ If this option is not set, then the system's _spell_ command is used. The spell command does not work the same as the alternate speller. It produces a list of misspelled words on its standard -@@ -4153,11 +4154,11 @@ General Configuration Variables +@@ -4157,11 +4158,11 @@ General Configuration Variables Now for an example: url-viewers=_TEST("test -n '${DISPLAY}'")_ /usr/local/bin/netscape, @@ -177,7 +177,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.5 2005/04/29 19:51:35 jakob Exp $ exist. If it doesn't, then the final path and file must exist. Note that the last entry is a DOS/Windows path. This is one way to support _Pine_ running on more than one architecture with -@@ -10084,10 +10085,10 @@ Configuration Inheritance +@@ -10121,10 +10122,10 @@ Configuration Inheritance 5. the system-wide _fixed_ configuration file (Unix _Pine_ only) The fixed configuration file is normally @@ -190,7 +190,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.5 2005/04/29 19:51:35 jakob Exp $ _PC-Pine_. For _PC-Pine_, if the environment variable _$PINECONF_ is set, that is used for the system-wide configuration. This location can be set or changed on the command line with the -P flag. The -@@ -10347,17 +10348,16 @@ SMTP Servers +@@ -10384,17 +10385,16 @@ SMTP Servers * A program that implements the SMTP or ESMTP protocol via stdio. * An entry in /etc/services for the alternate service. * An entry in /etc/inetd.conf for the alternate service. @@ -212,7 +212,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.5 2005/04/29 19:51:35 jakob Exp $ In DOS and OS/2, _Pine_ looks in the same directory as the PINERC file and the same dir as PINE.EXE. This is similar to the UNIX situation -@@ -11532,7 +11532,7 @@ Printers and Printing +@@ -11569,7 +11569,7 @@ Printers and Printing The second selection is the standard UNIX print command. The default is _lpr_, but it can be changed on a system basis to anything so @@ -221,7 +221,7 @@ $OpenBSD: patch-doc_tech-notes_txt,v 1.5 2005/04/29 19:51:35 jakob Exp $ The third selection is the user's personal choice for a UNIX print command. The text to be printed is piped into the command. _Enscript_ -@@ -11986,9 +11986,9 @@ Test Checklist +@@ -12023,9 +12023,9 @@ Test Checklist Error messages for incorrect terminal types (try "foo" and "vt52") ___ diff --git a/mail/pine/patches/patch-imap_src_osdep_unix_Makefile b/mail/pine/patches/patch-imap_src_osdep_unix_Makefile index 93e3118512f..8d043bbaaf8 100644 --- a/mail/pine/patches/patch-imap_src_osdep_unix_Makefile +++ b/mail/pine/patches/patch-imap_src_osdep_unix_Makefile @@ -1,6 +1,15 @@ -$OpenBSD: patch-imap_src_osdep_unix_Makefile,v 1.3 2005/04/29 19:51:35 jakob Exp $ ---- imap/src/osdep/unix/Makefile.orig Thu Apr 21 02:49:08 2005 -+++ imap/src/osdep/unix/Makefile Fri Apr 29 19:51:02 2005 +$OpenBSD: patch-imap_src_osdep_unix_Makefile,v 1.4 2005/11/23 13:44:25 jakob Exp $ +--- imap/src/osdep/unix/Makefile.orig Sat Apr 30 22:51:13 2005 ++++ imap/src/osdep/unix/Makefile Wed Nov 23 14:27:16 2005 +@@ -24,7 +24,7 @@ EXTRAAUTHENTICATORS= + EXTRADRIVERS=mbox + PASSWDTYPE=std + SSLTYPE=nopwd +-IP=4 ++IP=6 + + + # The optimization level here for GCC ports is set here for a reason. It's @@ -36,13 +36,13 @@ IP=4 # -O3 seems to be safe, but empirical observation from our local expert # indicates that in some (many?) cases -O3 code runs slower than -O2. diff --git a/mail/pine/patches/patch-imap_src_osdep_unix_env_unix_h b/mail/pine/patches/patch-imap_src_osdep_unix_env_unix_h new file mode 100644 index 00000000000..a9c260be183 --- /dev/null +++ b/mail/pine/patches/patch-imap_src_osdep_unix_env_unix_h @@ -0,0 +1,12 @@ +$OpenBSD: patch-imap_src_osdep_unix_env_unix_h,v 1.1 2005/11/23 13:44:25 jakob Exp $ +--- imap/src/osdep/unix/env_unix.h.orig Sat Feb 23 05:03:45 2002 ++++ imap/src/osdep/unix/env_unix.h Wed Nov 23 14:26:30 2005 +@@ -56,7 +56,7 @@ typedef struct dotlock_base { + * for they are subtle and quick to anger. + */ + +-#define MANDATORYLOCKPROT 0666 /* don't change this */ ++#define MANDATORYLOCKPROT 0600 /* don't change this */ + + /* Function prototypes */ + diff --git a/mail/pine/patches/patch-pine_mailview_c b/mail/pine/patches/patch-pine_mailview_c index 866ed9f628a..846562e4c4c 100644 --- a/mail/pine/patches/patch-pine_mailview_c +++ b/mail/pine/patches/patch-pine_mailview_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-pine_mailview_c,v 1.3 2005/04/29 19:51:35 jakob Exp $ ---- pine/mailview.c.orig Wed Apr 27 20:55:02 2005 -+++ pine/mailview.c Fri Apr 29 19:49:47 2005 -@@ -4391,6 +4391,9 @@ url_hilite(linenum, line, ins, local) +$OpenBSD: patch-pine_mailview_c,v 1.4 2005/11/23 13:44:25 jakob Exp $ +--- pine/mailview.c.orig Tue Sep 20 20:26:20 2005 ++++ pine/mailview.c Wed Nov 23 14:26:30 2005 +@@ -4392,6 +4392,9 @@ url_hilite(linenum, line, ins, local) char buf[256], color[256]; HANDLE_S *h; @@ -11,7 +11,7 @@ $OpenBSD: patch-pine_mailview_c,v 1.3 2005/04/29 19:51:35 jakob Exp $ for(lp = line; ; lp = up + n){ /* scan for all of them so we can choose the first */ if(F_ON(F_VIEW_SEL_URL,ps_global)) -@@ -4466,6 +4469,9 @@ url_hilite_hdr(linenum, line, ins, local +@@ -4467,6 +4470,9 @@ url_hilite_hdr(linenum, line, ins, local static int check_for_urls = 0; register char *lp; @@ -21,7 +21,7 @@ $OpenBSD: patch-pine_mailview_c,v 1.3 2005/04/29 19:51:35 jakob Exp $ if(isspace((unsigned char)*line)) /* continuation, check or not depending on last line */ lp = line; -@@ -4509,7 +4515,7 @@ url_hilite_abook(linenum, line, ins, loc +@@ -4510,7 +4516,7 @@ url_hilite_abook(linenum, line, ins, loc { register char *lp; diff --git a/mail/pine/patches/patch-pine_pine_hlp b/mail/pine/patches/patch-pine_pine_hlp index e63efd67b0f..1373980f7ac 100644 --- a/mail/pine/patches/patch-pine_pine_hlp +++ b/mail/pine/patches/patch-pine_pine_hlp @@ -1,7 +1,7 @@ -$OpenBSD: patch-pine_pine_hlp,v 1.7 2005/04/29 19:51:35 jakob Exp $ ---- pine/pine.hlp.orig Thu Apr 28 19:22:02 2005 -+++ pine/pine.hlp Fri Apr 29 19:49:47 2005 -@@ -975,8 +975,7 @@ Unix Pine: +$OpenBSD: patch-pine_pine_hlp,v 1.8 2005/11/23 13:44:25 jakob Exp $ +--- pine/pine.hlp.orig Wed Sep 28 19:56:29 2005 ++++ pine/pine.hlp Wed Nov 23 14:26:30 2005 +@@ -1010,8 +1010,7 @@ Unix Pine: postponed# ~/mail/postponed-msgs sentmail# ~/mail/sent-mail mailcap# ~/.mailcap + /etc/mailcap @@ -11,7 +11,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.7 2005/04/29 19:51:35 jakob Exp $ news-spool varies across Unix flavors, e.g. /var/spool/news or /usr/spool/news active-news varies across Unix flavors, e.g. /usr/lib/news/active -@@ -19258,7 +19257,7 @@ a semi-colon (;) under Windows; for exam +@@ -19356,7 +19355,7 @@ a semi-colon (;) under Windows; for exam a colon (:) under UNIX; for example:
@@ -20,7 +20,7 @@ $OpenBSD: patch-pine_pine_hlp,v 1.7 2005/04/29 19:51:35 jakob Exp $