Update to 4.63. Complete changelog is available here:

http://www.washington.edu/pine/changes/4.62-to-4.63.html

Specific notable user-visible changes:

     * When cancelling a message being composed the commands are now "^C"
       followed by "_C_onfirm" instead of "^C" followed by "_Y_es". "^C"
       "Yes" was close to "^X" "Yes", the command used to send a message.
       The change is there to prevent inadvertent cancellations. The old
       behavior may be restored by setting the feature
       Compose-Cancel-Confirm-Uses-Yes.

     * Field for comments added to Rules. Warning: Don't use this field
       until all of the Pines that you run are version 4.63 or higher,
       since it will cause the Rule to be ignored in previous versions.

3 files changed, 11 insertions, 57 deletions

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index b7636b0df86..eae58d5dfb4 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.105 2005/06/16 06:58:03 jlam Exp $
+# $NetBSD: Makefile,v 1.106 2005/08/12 20:23:00 tv Exp $
 
-DISTNAME=	pine4.62
-PKGNAME=	pine-4.62
-PKGREVISION=	2
+DISTNAME=	pine4.63
+PKGNAME=	pine-4.63
 CATEGORIES=	mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
 		ftp://ftp.fu-berlin.de/unix/mail/pine/
@@ -105,9 +104,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/contrib/utils/* ${PREFIX}/share/pine/contrib/utils
 	${CHMOD} +x ${PREFIX}/share/pine/contrib/utils/*.sh
 
+# 2004e contains extensions needed by Pine 4.63
+BUILDLINK_DEPENDS.imap-uw+=	imap-uw>=2004e
+.include "../../mail/imap-uw/buildlink3.mk"
+
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../editors/pico/buildlink3.mk"
-.include "../../mail/imap-uw/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/pine/distinfo b/mail/pine/distinfo
index a7e2ad87ea5..037685a92a3 100644
--- a/mail/pine/distinfo
+++ b/mail/pine/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2005/04/15 16:36:39 tron Exp $
+$NetBSD: distinfo,v 1.29 2005/08/12 20:23:00 tv Exp $
 
-SHA1 (pine4.62.tar.bz2) = 7011a1030fcf3f78d8fb7d5b7bf2cd46037668f7
-RMD160 (pine4.62.tar.bz2) = f906b4db71aa72a1c4f638d0ea046e352a002c34
-Size (pine4.62.tar.bz2) = 3079348 bytes
+SHA1 (pine4.63.tar.bz2) = ad235c1fad7cc8adfff5c69cea8eb267afa648c9
+RMD160 (pine4.63.tar.bz2) = b04a6f5134aeae6b0a5663acbfa4e812c3fc7762
+Size (pine4.63.tar.bz2) = 3083721 bytes
 SHA1 (patch-aa) = 800f84f3c868e6d17798e9f98d8151bb734143b6
 SHA1 (patch-ab) = cfac4d24763dbd4285e03c6c25891469c5ac1953
 SHA1 (patch-ac) = 870d7d414e25b37e47c5f62447210fe7800c733b
diff --git a/mail/pine/patches/patch-ah b/mail/pine/patches/patch-ah
deleted file mode 100644
index 170246490ba..00000000000
--- a/mail/pine/patches/patch-ah
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2005/04/15 16:36:39 tron Exp $
-
---- pine/rpdump.c.orig	2004-05-07 23:55:32.000000000 +0100
-+++ pine/rpdump.c	2005-04-15 17:31:21.000000000 +0100
-@@ -82,6 +82,7 @@
-     char *argv[];
- {
-     MAILSTREAM *stream = NULL;
-+    int        fd;
-     FILE       *fp;
-     int         usage = 0;
-     char        buf[10000];
-@@ -126,6 +127,7 @@
- 	exit(-1);
-     }
- 
-+#ifdef UNSECURE_CODE_WITH_RACE_CONDITION
-     if(access(local, ACCESS_EXISTS) == 0){
- 	if(access(local, WRITE_ACCESS) == 0){
- 
-@@ -141,6 +143,7 @@
- 	    exit(-1);
- 	}
-     }
-+#endif
- 
-     /*
-      * Try opening the remote folder.
-@@ -206,11 +209,18 @@
-     /*
-      * Try opening the local file.
-      */
--    if((fp = fopen(local, "w")) == NULL){
-+    if ((fd = open(local, O_WRONLY|O_CREAT|O_EXCL,
-+                   S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)) < 0){
- 	fprintf(stderr, "Can't open \"%s\": %s\n", local, err_desc(errno));
- 	mail_close(stream);
- 	exit(-1);
-     }
-+    if((fp = fdopen(fd, "w")) == NULL){
-+	fprintf(stderr, "Can't open \"%s\": %s\n", local, err_desc(errno));
-+	mail_close(stream);
-+        close(fd);
-+	exit(-1);
-+    }
- 
-     p = data;
-     for(p = data; p < data+i; p++){