Upgrade to 1.0 release candidate 2.

9 files changed, 9 insertions, 93 deletions

diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index b29cd03ddba7..8f057ebb2e4b 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -6,8 +6,8 @@
 #
 # $FreeBSD$
 
-DISTNAME=	mutt-1.0pre1i
-PKGNAME=	mutt-1.0b1
+DISTNAME=	mutt-1.0pre2i
+PKGNAME=	mutt-1.0b2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/  \
 		ftp://ftp.uib.no/pub/mutt/  \
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index 999b4c50339d..60b64000076a 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1 +1 @@
-MD5 (mutt/mutt-1.0pre1i.tar.gz) = afbb2942b7af0021043c53a691ff2d75
+MD5 (mutt/mutt-1.0pre2i.tar.gz) = 87cf1ea53adcfa9f6c7c3324120d7fd7
diff --git a/mail/mutt-devel/files/patch-05 b/mail/mutt-devel/files/patch-05
index 01e1c45a2846..0c8e4da8c1aa 100644
--- a/mail/mutt-devel/files/patch-05
+++ b/mail/mutt-devel/files/patch-05
@@ -1,33 +1,5 @@
 --- curs_lib.c.orig	Thu Jan 14 14:29:17 1999
 +++ curs_lib.c	Thu Feb 18 20:58:46 1999
-@@ -132,8 +132,8 @@
- int mutt_yesorno (const char *msg, int def)
- {
-   event_t ch;
--  char *yes = _("yes");
--  char *no = _("no");
-+  unsigned char *yes = _("yes");
-+  unsigned char *no = _("no");
-   
-   CLEARLINE(LINES-1);
-   printw("%s ([%c]/%c): ", msg, def ? *yes : *no,
-@@ -155,6 +155,16 @@
-       def = 0;
-       break;
-     }
-+    else if (tolower(ch.ch) == 'y')
-+    {
-+      def = 1;
-+      break;
-+    }
-+    else if (tolower(ch.ch) == 'n')
-+    {
-+      def = 0;
-+      break;
-+    }
-     else
-     {
-       BEEP();
 @@ -408,8 +418,9 @@
  {
    event_t ch;
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index b29cd03ddba7..8f057ebb2e4b 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -6,8 +6,8 @@
 #
 # $FreeBSD$
 
-DISTNAME=	mutt-1.0pre1i
-PKGNAME=	mutt-1.0b1
+DISTNAME=	mutt-1.0pre2i
+PKGNAME=	mutt-1.0b2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/  \
 		ftp://ftp.uib.no/pub/mutt/  \
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 999b4c50339d..60b64000076a 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1 +1 @@
-MD5 (mutt/mutt-1.0pre1i.tar.gz) = afbb2942b7af0021043c53a691ff2d75
+MD5 (mutt/mutt-1.0pre2i.tar.gz) = 87cf1ea53adcfa9f6c7c3324120d7fd7
diff --git a/mail/mutt/files/patch-05 b/mail/mutt/files/patch-05
index 01e1c45a2846..0c8e4da8c1aa 100644
--- a/mail/mutt/files/patch-05
+++ b/mail/mutt/files/patch-05
@@ -1,33 +1,5 @@
 --- curs_lib.c.orig	Thu Jan 14 14:29:17 1999
 +++ curs_lib.c	Thu Feb 18 20:58:46 1999
-@@ -132,8 +132,8 @@
- int mutt_yesorno (const char *msg, int def)
- {
-   event_t ch;
--  char *yes = _("yes");
--  char *no = _("no");
-+  unsigned char *yes = _("yes");
-+  unsigned char *no = _("no");
-   
-   CLEARLINE(LINES-1);
-   printw("%s ([%c]/%c): ", msg, def ? *yes : *no,
-@@ -155,6 +155,16 @@
-       def = 0;
-       break;
-     }
-+    else if (tolower(ch.ch) == 'y')
-+    {
-+      def = 1;
-+      break;
-+    }
-+    else if (tolower(ch.ch) == 'n')
-+    {
-+      def = 0;
-+      break;
-+    }
-     else
-     {
-       BEEP();
 @@ -408,8 +418,9 @@
  {
    event_t ch;
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index b29cd03ddba7..8f057ebb2e4b 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -6,8 +6,8 @@
 #
 # $FreeBSD$
 
-DISTNAME=	mutt-1.0pre1i
-PKGNAME=	mutt-1.0b1
+DISTNAME=	mutt-1.0pre2i
+PKGNAME=	mutt-1.0b2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/  \
 		ftp://ftp.uib.no/pub/mutt/  \
diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo
index 999b4c50339d..60b64000076a 100644
--- a/mail/mutt14/distinfo
+++ b/mail/mutt14/distinfo
@@ -1 +1 @@
-MD5 (mutt/mutt-1.0pre1i.tar.gz) = afbb2942b7af0021043c53a691ff2d75
+MD5 (mutt/mutt-1.0pre2i.tar.gz) = 87cf1ea53adcfa9f6c7c3324120d7fd7
diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-05
index 01e1c45a2846..0c8e4da8c1aa 100644
--- a/mail/mutt14/files/patch-05
+++ b/mail/mutt14/files/patch-05
@@ -1,33 +1,5 @@
 --- curs_lib.c.orig	Thu Jan 14 14:29:17 1999
 +++ curs_lib.c	Thu Feb 18 20:58:46 1999
-@@ -132,8 +132,8 @@
- int mutt_yesorno (const char *msg, int def)
- {
-   event_t ch;
--  char *yes = _("yes");
--  char *no = _("no");
-+  unsigned char *yes = _("yes");
-+  unsigned char *no = _("no");
-   
-   CLEARLINE(LINES-1);
-   printw("%s ([%c]/%c): ", msg, def ? *yes : *no,
-@@ -155,6 +155,16 @@
-       def = 0;
-       break;
-     }
-+    else if (tolower(ch.ch) == 'y')
-+    {
-+      def = 1;
-+      break;
-+    }
-+    else if (tolower(ch.ch) == 'n')
-+    {
-+      def = 0;
-+      break;
-+    }
-     else
-     {
-       BEEP();
 @@ -408,8 +418,9 @@
  {
    event_t ch;