Update mew to 6.2. This fixes PR 40808 and PR 41853.

Major changes:
    * Configuration in ".mew.el", especially of mew-config-alist is
      simplified. See the config2 node in info.
    * Virtual mode is categorized to Selection and Thread. You can create
      Selection by keyword, dialog, sorting, and so on. You can make
      Thread even of Selection as well as of Summary.
    * "S" is now virtual sort creating Selection. Physical sort is
      assigned to "M-s".
    * Punycode is supported. Mew now can display internationalized domain
      names.
    * "Z" collects a folder list according to the current world.
      No numeric argument is necessary any more.
    * "_" toggles a long line: normal, long, wrapped.
    * You can use gmail with IMAP.

5 files changed, 78 insertions, 87 deletions

diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 813d3fc6410..2478adc231e 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.76 2009/08/06 01:44:53 minskim Exp $
+# $NetBSD: Makefile,v 1.77 2009/08/09 12:01:18 minskim Exp $
 
-DISTNAME=	mew-5.2
-PKGREVISION=	2
+DISTNAME=	mew-6.2
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mew.org/Release/
@@ -17,9 +16,9 @@ CONFLICTS+=	mew-xemacs-[0-9]* incm-[0-9]*
 
 INFO_FILES=	yes
 
-HAS_CONFIGURE=	yes
+GNU_CONFIGURE=	yes
 
-EMACS_VERSIONS_ACCEPTED=	emacs22 emacs22nox emacs21 emacs21nox emacs20 xemacs214 xemacs215
+EMACS_VERSIONS_ACCEPTED=	emacs23 emacs23nox emacs22 emacs22nox emacs21 emacs21nox
 EMACS_MODULES+=			base
 
 MEW_CONTRIB_DIR=${EMACS_LISPPREFIX}/mew/contrib
diff --git a/mail/mew/PLIST b/mail/mew/PLIST
index 2194ef9b244..7b88069ecce 100644
--- a/mail/mew/PLIST
+++ b/mail/mew/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.16 2009/06/14 18:04:37 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2009/08/09 12:01:18 minskim Exp $
+bin/cmew
 bin/incm
 bin/mew-pinentry
 bin/mewcat
@@ -6,6 +7,9 @@ bin/mewdecode
 bin/mewencode
 bin/mewest
 bin/mewl
+bin/smew
+info/mew.info
+man/man1/cmew.1
 man/man1/incm.1
 man/man1/mew-pinentry.1
 man/man1/mewcat.1
@@ -13,46 +17,7 @@ man/man1/mewdecode.1
 man/man1/mewencode.1
 man/man1/mewest.1
 man/man1/mewl.1
-share/mew/Mew.img
-share/mew/Mew.png
-share/mew/Mew.xbm
-share/mew/Mew.xpm
-share/mew/etc/COLOR
-share/mew/etc/mew-Plain.xpm
-share/mew/etc/mew-curr.xpm
-share/mew/etc/mew-folder.xpm
-share/mew/etc/mew-inc2.xpm
-share/mew/etc/mew-kill.xpm
-share/mew/mew-Audio.xpm
-share/mew/mew-Blank.xpm
-share/mew/mew-External.xpm
-share/mew/mew-Folder.xpm
-share/mew/mew-Image.xpm
-share/mew/mew-Octet-Stream.xpm
-share/mew/mew-Postscript.xpm
-share/mew/mew-Rfc822.xpm
-share/mew/mew-Text.xpm
-share/mew/mew-Unknown.xpm
-share/mew/mew-Video.xpm
-share/mew/mew-attach.xpm
-share/mew/mew-cite.xpm
-share/mew/mew-forward.xpm
-share/mew/mew-inc.xpm
-share/mew/mew-lock.xpm
-share/mew/mew-next.xpm
-share/mew/mew-pgp-enc.xpm
-share/mew/mew-pgp-sigenc.xpm
-share/mew/mew-pgp-sign.xpm
-share/mew/mew-prev.xpm
-share/mew/mew-queue.xpm
-share/mew/mew-refile.xpm
-share/mew/mew-reply.xpm
-share/mew/mew-send.xpm
-share/mew/mew-sep.xpm
-share/mew/mew-show.xpm
-share/mew/mew-write.xpm
-share/mew/mew-yank.xpm
-${EMACS_INFOPREFIX}/mew.info
+man/man1/smew.1
 ${EMACS_LISPPREFIX}/mew/contrib/00readme
 ${EMACS_LISPPREFIX}/mew/contrib/mew-browse.el
 ${EMACS_LISPPREFIX}/mew/contrib/mew-caesar.el
@@ -80,6 +45,7 @@ ${EMACS_LISPPREFIX}/mew/mew-config.elc
 ${EMACS_LISPPREFIX}/mew/mew-const.el
 ${EMACS_LISPPREFIX}/mew/mew-const.elc
 ${EMACS_LISPPREFIX}/mew/mew-darwin.el
+${EMACS_LISPPREFIX}/mew/mew-darwin.elc
 ${EMACS_LISPPREFIX}/mew/mew-decode.el
 ${EMACS_LISPPREFIX}/mew/mew-decode.elc
 ${EMACS_LISPPREFIX}/mew/mew-demo.el
@@ -101,6 +67,7 @@ ${EMACS_LISPPREFIX}/mew/mew-fib.elc
 ${EMACS_LISPPREFIX}/mew/mew-func.el
 ${EMACS_LISPPREFIX}/mew/mew-func.elc
 ${EMACS_LISPPREFIX}/mew/mew-gemacs.el
+${EMACS_LISPPREFIX}/mew/mew-gemacs.elc
 ${EMACS_LISPPREFIX}/mew/mew-header.el
 ${EMACS_LISPPREFIX}/mew/mew-header.elc
 ${EMACS_LISPPREFIX}/mew/mew-highlight.el
@@ -112,14 +79,15 @@ ${EMACS_LISPPREFIX}/mew/mew-imap2.elc
 ${EMACS_LISPPREFIX}/mew/mew-key.el
 ${EMACS_LISPPREFIX}/mew/mew-key.elc
 ${EMACS_LISPPREFIX}/mew/mew-lang-jp.el
+${EMACS_LISPPREFIX}/mew/mew-lang-jp.elc
 ${EMACS_LISPPREFIX}/mew/mew-lang-kr.el
+${EMACS_LISPPREFIX}/mew/mew-lang-kr.elc
 ${EMACS_LISPPREFIX}/mew/mew-lang-latin.el
+${EMACS_LISPPREFIX}/mew/mew-lang-latin.elc
 ${EMACS_LISPPREFIX}/mew/mew-local.el
 ${EMACS_LISPPREFIX}/mew/mew-local.elc
 ${EMACS_LISPPREFIX}/mew/mew-mark.el
 ${EMACS_LISPPREFIX}/mew/mew-mark.elc
-${EMACS_LISPPREFIX}/mew/mew-md5.el
-${EMACS_LISPPREFIX}/mew/mew-md5.elc
 ${EMACS_LISPPREFIX}/mew/mew-message.el
 ${EMACS_LISPPREFIX}/mew/mew-message.elc
 ${EMACS_LISPPREFIX}/mew/mew-mime.el
@@ -127,16 +95,17 @@ ${EMACS_LISPPREFIX}/mew/mew-mime.elc
 ${EMACS_LISPPREFIX}/mew/mew-minibuf.el
 ${EMACS_LISPPREFIX}/mew/mew-minibuf.elc
 ${EMACS_LISPPREFIX}/mew/mew-mule.el
-${EMACS_LISPPREFIX}/mew/mew-mule0.el
+${EMACS_LISPPREFIX}/mew/mew-mule.elc
 ${EMACS_LISPPREFIX}/mew/mew-mule3.el
+${EMACS_LISPPREFIX}/mew/mew-mule3.elc
 ${EMACS_LISPPREFIX}/mew/mew-net.el
 ${EMACS_LISPPREFIX}/mew/mew-net.elc
-${EMACS_LISPPREFIX}/mew/mew-nmz.el
-${EMACS_LISPPREFIX}/mew/mew-nmz.elc
 ${EMACS_LISPPREFIX}/mew/mew-nntp.el
 ${EMACS_LISPPREFIX}/mew/mew-nntp.elc
 ${EMACS_LISPPREFIX}/mew/mew-nntp2.el
 ${EMACS_LISPPREFIX}/mew/mew-nntp2.elc
+${EMACS_LISPPREFIX}/mew/mew-passwd.el
+${EMACS_LISPPREFIX}/mew/mew-passwd.elc
 ${EMACS_LISPPREFIX}/mew/mew-pgp.el
 ${EMACS_LISPPREFIX}/mew/mew-pgp.elc
 ${EMACS_LISPPREFIX}/mew/mew-pick.el
@@ -147,6 +116,8 @@ ${EMACS_LISPPREFIX}/mew/mew-refile.el
 ${EMACS_LISPPREFIX}/mew/mew-refile.elc
 ${EMACS_LISPPREFIX}/mew/mew-scan.el
 ${EMACS_LISPPREFIX}/mew/mew-scan.elc
+${EMACS_LISPPREFIX}/mew/mew-search.el
+${EMACS_LISPPREFIX}/mew/mew-search.elc
 ${EMACS_LISPPREFIX}/mew/mew-smime.el
 ${EMACS_LISPPREFIX}/mew/mew-smime.elc
 ${EMACS_LISPPREFIX}/mew/mew-smtp.el
@@ -167,39 +138,60 @@ ${EMACS_LISPPREFIX}/mew/mew-summary4.el
 ${EMACS_LISPPREFIX}/mew/mew-summary4.elc
 ${EMACS_LISPPREFIX}/mew/mew-syntax.el
 ${EMACS_LISPPREFIX}/mew/mew-syntax.elc
-${EMACS_LISPPREFIX}/mew/mew-temacs.el
-@comment ${EMACS_LISPPREFIX}/mew/mew-theme.el
-@comment ${EMACS_LISPPREFIX}/mew/mew-theme.elc
 ${EMACS_LISPPREFIX}/mew/mew-thread.el
 ${EMACS_LISPPREFIX}/mew/mew-thread.elc
 ${EMACS_LISPPREFIX}/mew/mew-unix.el
+${EMACS_LISPPREFIX}/mew/mew-unix.elc
 ${EMACS_LISPPREFIX}/mew/mew-vars.el
 ${EMACS_LISPPREFIX}/mew/mew-vars.elc
 ${EMACS_LISPPREFIX}/mew/mew-vars2.el
 ${EMACS_LISPPREFIX}/mew/mew-vars2.elc
-${EMACS_LISPPREFIX}/mew/mew-virtual.el
-${EMACS_LISPPREFIX}/mew/mew-virtual.elc
-${EMACS_LISPPREFIX}/mew/mew-win32.el
-${EMACS_LISPPREFIX}/mew/mew-xemacs.el
-${EMACS_LISPPREFIX}/mew/mew.el
-${EMACS_LISPPREFIX}/mew/mew.elc
-${EMACS_LISPPREFIX}/mew/mew-passwd.el
-${EMACS_LISPPREFIX}/mew/mew-passwd.elc
-${EMACS_LISPPREFIX}/mew/mew-search.el
-${EMACS_LISPPREFIX}/mew/mew-search.elc
 ${EMACS_LISPPREFIX}/mew/mew-vars3.el
 ${EMACS_LISPPREFIX}/mew/mew-vars3.elc
 ${EMACS_LISPPREFIX}/mew/mew-varsx.el
 ${EMACS_LISPPREFIX}/mew/mew-varsx.elc
-${EMACS_LISPPREFIX}/mew/mew-darwin.elc
-${EMACS_LISPPREFIX}/mew/mew-gemacs.elc
-${EMACS_LISPPREFIX}/mew/mew-lang-jp.elc
-${EMACS_LISPPREFIX}/mew/mew-lang-kr.elc
-${EMACS_LISPPREFIX}/mew/mew-lang-latin.elc
-${EMACS_LISPPREFIX}/mew/mew-mule.elc
-${EMACS_LISPPREFIX}/mew/mew-mule0.elc
-${EMACS_LISPPREFIX}/mew/mew-mule3.elc
-${EMACS_LISPPREFIX}/mew/mew-temacs.elc
-${EMACS_LISPPREFIX}/mew/mew-unix.elc
+${EMACS_LISPPREFIX}/mew/mew-virtual.el
+${EMACS_LISPPREFIX}/mew/mew-virtual.elc
+${EMACS_LISPPREFIX}/mew/mew-win32.el
 ${EMACS_LISPPREFIX}/mew/mew-win32.elc
-${EMACS_LISPPREFIX}/mew/mew-xemacs.elc
+${EMACS_LISPPREFIX}/mew/mew.el
+${EMACS_LISPPREFIX}/mew/mew.elc
+share/mew/Mew.img
+share/mew/Mew.png
+share/mew/Mew.xbm
+share/mew/Mew.xpm
+share/mew/etc/COLOR
+share/mew/etc/mew-Plain.xpm
+share/mew/etc/mew-curr.xpm
+share/mew/etc/mew-folder.xpm
+share/mew/etc/mew-inc2.xpm
+share/mew/etc/mew-kill.xpm
+share/mew/mew-Audio.xpm
+share/mew/mew-Blank.xpm
+share/mew/mew-External.xpm
+share/mew/mew-Folder.xpm
+share/mew/mew-Image.xpm
+share/mew/mew-Octet-Stream.xpm
+share/mew/mew-Postscript.xpm
+share/mew/mew-Rfc822.xpm
+share/mew/mew-Text.xpm
+share/mew/mew-Unknown.xpm
+share/mew/mew-Video.xpm
+share/mew/mew-attach.xpm
+share/mew/mew-cite.xpm
+share/mew/mew-forward.xpm
+share/mew/mew-inc.xpm
+share/mew/mew-lock.xpm
+share/mew/mew-next.xpm
+share/mew/mew-pgp-enc.xpm
+share/mew/mew-pgp-sigenc.xpm
+share/mew/mew-pgp-sign.xpm
+share/mew/mew-prev.xpm
+share/mew/mew-queue.xpm
+share/mew/mew-refile.xpm
+share/mew/mew-reply.xpm
+share/mew/mew-send.xpm
+share/mew/mew-sep.xpm
+share/mew/mew-show.xpm
+share/mew/mew-write.xpm
+share/mew/mew-yank.xpm
diff --git a/mail/mew/buildlink3.mk b/mail/mew/buildlink3.mk
index 4f4a85d1404..a68eec5c9a8 100644
--- a/mail/mew/buildlink3.mk
+++ b/mail/mew/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:56 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2009/08/09 12:01:18 minskim Exp $
 #
 
 BUILDLINK_TREE+=	mew
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	mew
 .if !defined(MEW_BUILDLINK3_MK)
 MEW_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mew+=	${EMACS_PKGNAME_PREFIX}mew>=5
+BUILDLINK_API_DEPENDS.mew+=	${EMACS_PKGNAME_PREFIX}mew>=6
 BUILDLINK_PKGSRCDIR.mew?=	../../mail/mew
 
 BUILDLINK_CONTENTS_FILTER.mew=	${EGREP} '.*\.el$$|.*\.elc$$'
diff --git a/mail/mew/distinfo b/mail/mew/distinfo
index ad74d6033f2..a63a63830df 100644
--- a/mail/mew/distinfo
+++ b/mail/mew/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.34 2007/12/30 16:24:54 cjep Exp $
+$NetBSD: distinfo,v 1.35 2009/08/09 12:01:18 minskim Exp $
 
-SHA1 (mew-5.2.tar.gz) = dc9127bc1039e8d1d6840ff81755152c953d6bd0
-RMD160 (mew-5.2.tar.gz) = 83ef3aa726b9e6763624c26d7f774598d134f274
-Size (mew-5.2.tar.gz) = 969584 bytes
-SHA1 (patch-aa) = 485a4ab13e9ed5befc8fc0bac8ae7226450a520d
+SHA1 (mew-6.2.tar.gz) = 8380cf0072e0615f27b39144481eb9b410c57e45
+RMD160 (mew-6.2.tar.gz) = fbda38606c228e2c7cb873a348821d2ec10138b9
+Size (mew-6.2.tar.gz) = 972731 bytes
+SHA1 (patch-aa) = 85e20cda02fa5b7551776b11b80a911e0338afbc
diff --git a/mail/mew/patches/patch-aa b/mail/mew/patches/patch-aa
index 76d50c9c19a..bf94427490d 100644
--- a/mail/mew/patches/patch-aa
+++ b/mail/mew/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.5 2007/12/30 16:24:54 cjep Exp $
+$NetBSD: patch-aa,v 1.6 2009/08/09 12:01:18 minskim Exp $
 
---- mew-key.el.orig	2007-01-04 06:49:11.000000000 +0000
+--- mew-key.el.orig	2008-12-09 23:48:20.000000000 -0800
 +++ mew-key.el
-@@ -618,7 +618,7 @@
- 	    (throw 'loop (expand-file-name "etc" (car path)))
- 	  (setq path (cdr path)))))))
+@@ -619,7 +619,7 @@
+ 	(if (file-exists-p (expand-file-name file path))
+ 	    (throw 'loop (expand-file-name "etc" path)))))))
  
 -(defvar mew-icon-directory (mew-which-mew-etc))
 +(defvar mew-icon-directory "@ICONDIR@")