6 files changed, 65 insertions, 66 deletions

diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 457098cf5ad2..da0e86342bd3 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	mew
-PORTVERSION=	4.2
+PORTVERSION=	5.1
 CATEGORIES=	mail elisp
 MASTER_SITES=	http://www.Mew.org/Release/ \
 		${MASTER_SITE_PORTS_JP}
@@ -39,7 +39,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/${DOCSDIR}
 	(cd ${WRKSRC} ; \
-		${INSTALL_DATA} 00* ${PREFIX}/${DOCSDIR}/ ; \
+		${INSTALL_DATA} 00* mew.dot.* ${PREFIX}/${DOCSDIR}/ ; \
 		for dir in contrib; do \
 			${CP} -R $${dir} ${PREFIX}/${DOCSDIR}/ ; \
 		done)
diff --git a/mail/mew/distinfo b/mail/mew/distinfo
index 8e0990f62fb7..46c3c0481ad2 100644
--- a/mail/mew/distinfo
+++ b/mail/mew/distinfo
@@ -1,3 +1,3 @@
-MD5 (mew-4.2.tar.gz) = 713e45d6358330309414adbaad3944f5
-SHA256 (mew-4.2.tar.gz) = 0e316e703f0d1754cf4cc1331f72292d454af11f8a13a43edceae418bda127da
-SIZE (mew-4.2.tar.gz) = 925037
+MD5 (mew-5.1.tar.gz) = 0c913a789142f98623180eb111e28b07
+SHA256 (mew-5.1.tar.gz) = bedaabe37ddd52894f7129fd1240939b836f205a6f4d7c5a5072809f6dc1f336
+SIZE (mew-5.1.tar.gz) = 948533
diff --git a/mail/mew/files/patch-Makefile.in b/mail/mew/files/patch-Makefile.in
deleted file mode 100644
index ccd237fe7b97..000000000000
--- a/mail/mew/files/patch-Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- Makefile.in.orig	Wed Dec 22 11:19:14 2004
-+++ Makefile.in	Wed Feb  1 12:46:58 2006
-@@ -26,9 +26,7 @@
- ## Compile engines
- ##
- 
--EMACS = emacs
--#EMACS = xemacs
--#EMACS = mule
-+#EMACS = emacs
- 
- CHECK = xemacs
- 
-@@ -36,16 +34,13 @@
- ## A directory where mew*.el[c] will be installed.
- ##
- 
--elispdir = $(prefix)/share/emacs/site-lisp/mew
--#elispdir  = $(prefix)/lib/$(EMACS)/site-lisp
--#elispdir = $(prefix)/lib/emacs
-+elispdir = $(prefix)/${EMACS_SITE_LISPDIR}/mew
- 
- ##
- ## A directory where etc file will be installed.
- ##
- 
--etcdir = $(prefix)/share/emacs/site-lisp/mew/etc
--#etcdir = $(prefix)/lib/$(EMACS)/etc/Mew
-+etcdir = $(prefix)/${EMACS_SITE_LISPDIR}/mew/etc
- 
- ################################################################
- ##
diff --git a/mail/mew/files/patch-bin_Makefile.in b/mail/mew/files/patch-bin_Makefile.in
index d096de781295..d4a26e194691 100644
--- a/mail/mew/files/patch-bin_Makefile.in
+++ b/mail/mew/files/patch-bin_Makefile.in
@@ -1,37 +1,42 @@
---- bin/Makefile.in.orig	Thu Mar  6 19:42:22 2003
-+++ bin/Makefile.in	Wed Feb  1 12:34:41 2006
-@@ -26,6 +26,8 @@
+--- bin/Makefile.in.orig	Tue Mar 15 16:51:31 2005
++++ bin/Makefile.in	Tue Jul 11 19:41:47 2006
+@@ -25,7 +25,8 @@
+ COFLAG = -o $@ 
  LIBS = @LIBS@
  
- INSTALL = @INSTALL@
+-INSTALL = @INSTALL@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_DATA = @INSTALL_DATA@
  LN = ln
  RM = rm -f
  MKDIR = mkdir -p
-@@ -95,19 +97,19 @@
- 	-@if [ ! -d $(bindir) ]; then \
- 		$(MKDIR) $(bindir); \
+@@ -97,23 +98,23 @@
+ 	-@if [ ! -d $(DESTDIR)$(bindir) ]; then \
+ 		$(MKDIR) $(DESTDIR)$(bindir); \
  	fi
--	$(INSTALL) -m 555 $(PRG1) $(bindir)
-+	${INSTALL_PROGRAM} $(PRG1) $(bindir)
+-	$(INSTALL) -m 555 $(PRG1) $(DESTDIR)$(bindir)
++	${INSTALL_PROGRAM} $(PRG1) $(DESTDIR)$(bindir)
  	for f in $(ALT); do \
- 	  $(RM) $(bindir)/$${f}; $(LN) $(bindir)/$(PRG1) $(bindir)/$${f}; done
--	$(INSTALL) -m 555 $(PRG2) $(bindir)
--	$(INSTALL) -m 555 $(PRG3) $(bindir)
-+	${INSTALL_PROGRAM} $(PRG2) $(bindir)
-+	${INSTALL_PROGRAM} $(PRG3) $(bindir)
- 	-@if [ ! -d $(mandir) ]; then \
- 		$(MKDIR) $(mandir); \
+ 		$(RM) $(DESTDIR)$(bindir)/$${f}; \
+ 		$(LN) $(DESTDIR)$(bindir)/$(PRG1) $(DESTDIR)$(bindir)/$${f}; \
+ 	done
+-	$(INSTALL) -m 555 $(PRG2) $(DESTDIR)$(bindir)
+-	$(INSTALL) -m 555 $(PRG3) $(DESTDIR)$(bindir)
++	${INSTALL_PROGRAM} $(PRG2) $(DESTDIR)$(bindir)
++	${INSTALL_PROGRAM} $(PRG3) $(DESTDIR)$(bindir)
+ 	-@if [ ! -d $(DESTDIR)$(mandir) ]; then \
+ 		$(MKDIR) $(DESTDIR)$(mandir); \
  	fi
--	$(INSTALL) -m 444 $(MAN1) $(mandir)
-+	${INSTALL_DATA} $(MAN1) $(mandir)
+-	$(INSTALL) -m 444 $(MAN1) $(DESTDIR)$(mandir)
++	${INSTALL_DATA} $(MAN1) $(DESTDIR)$(mandir)
  	for f in $(MALT); do \
- 	  $(RM) $(mandir)/$${f}; $(LN) $(mandir)/$(MAN1) $(mandir)/$${f}; done
--	$(INSTALL) -m 444 $(MAN2) $(mandir)
--	$(INSTALL) -m 444 $(MAN3) $(mandir)
-+	${INSTALL_DATA} $(MAN2) $(mandir)
-+	${INSTALL_DATA} $(MAN3) $(mandir)
+ 		$(RM) $(DESTDIR)$(mandir)/$${f}; \
+ 		$(LN) $(DESTDIR)$(mandir)/$(MAN1) $(DESTDIR)$(mandir)/$${f}; \
+ 	done
+-	$(INSTALL) -m 444 $(MAN2) $(DESTDIR)$(mandir)
+-	$(INSTALL) -m 444 $(MAN3) $(DESTDIR)$(mandir)
++	${INSTALL_DATA} $(MAN2) $(DESTDIR)$(mandir)
++	${INSTALL_DATA} $(MAN3) $(DESTDIR)$(mandir)
  
  ##
  ## End of Makefile
diff --git a/mail/mew/pkg-message b/mail/mew/pkg-message
index 575fbc4093d6..d89c7848bfb3 100644
--- a/mail/mew/pkg-message
+++ b/mail/mew/pkg-message
@@ -1,13 +1,17 @@
 *************************************************************************
-* You must set at least following elisps to your own dot.emacs file:    *
+* You may want to add following lines to your .emacs and/or .mew.el.    *
+* Please consult DOCSDIR/mew.dot.{emacs,mew} sample files.              *
+* Also see DOCSDIR/00diff for the changes from 4.2.                     *
 *                                                                       *
 *       (autoload 'mew "mew" nil t)                                     *
 *       (autoload 'mew-send "mew" nil t)                                *
 *       (setq mew-mail-domain "domain of e-mail address")               *
 *       (setq mew-pop-server "your POP server")    ;; if not localhost  *
 *       (setq mew-smtp-server "your SMTP server")  ;; if not localhost  *
-*       (setq mew-icon-directory "icon directory") ;; if using XEmacs   *
-*       (setq mew-prog-pgpkey      "fetch")         ;; for PGP use      *
-*       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"));; for PGP use      *
+*       ;; for XEmacs                                                   *
+*       (setq mew-icon-directory "icon directory")                      *
+*       ;; using fetch for PGP instead of wget                          *
+*       (setq mew-prog-pgpkey      "fetch")                             *
+*       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"))                    *
 *                                                                       *
 *************************************************************************
diff --git a/mail/mew/pkg-plist b/mail/mew/pkg-plist
index 03ee2683191d..1eda8ac8eb39 100644
--- a/mail/mew/pkg-plist
+++ b/mail/mew/pkg-plist
@@ -10,12 +10,16 @@ bin/mewl
 %%PORTDOCS%%%%DOCSDIR%%/00changes.2
 %%PORTDOCS%%%%DOCSDIR%%/00changes.3
 %%PORTDOCS%%%%DOCSDIR%%/00changes.4.1
+%%PORTDOCS%%%%DOCSDIR%%/00changes.4.2
 %%PORTDOCS%%%%DOCSDIR%%/00copyright
 %%PORTDOCS%%%%DOCSDIR%%/00copyright.jis
 %%PORTDOCS%%%%DOCSDIR%%/00diff
 %%PORTDOCS%%%%DOCSDIR%%/00readme
 %%PORTDOCS%%%%DOCSDIR%%/00readme.smime
 %%PORTDOCS%%%%DOCSDIR%%/00roadmap
+%%PORTDOCS%%%%DOCSDIR%%/mew.dot.emacs
+%%PORTDOCS%%%%DOCSDIR%%/mew.dot.mew
+%%PORTDOCS%%%%DOCSDIR%%/mew.dot.theme
 %%PORTDOCS%%%%DOCSDIR%%/contrib/00readme
 %%PORTDOCS%%%%DOCSDIR%%/contrib/mew-browse.el
 %%PORTDOCS%%%%DOCSDIR%%/contrib/mew-caesar.el
@@ -82,6 +86,7 @@ bin/mewl
 %%EMACS_SITE_LISPDIR%%/mew/mew-const.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-const.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-darwin.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-darwin.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-decode.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-decode.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-demo.el
@@ -103,6 +108,7 @@ bin/mewl
 %%EMACS_SITE_LISPDIR%%/mew/mew-func.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-func.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-gemacs.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-gemacs.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-header.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-header.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-highlight.el
@@ -114,8 +120,11 @@ bin/mewl
 %%EMACS_SITE_LISPDIR%%/mew/mew-key.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-key.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-lang-jp.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-lang-jp.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-lang-kr.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-lang-kr.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-lang-latin.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-lang-latin.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-local.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-local.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-mark.el
@@ -129,8 +138,11 @@ bin/mewl
 %%EMACS_SITE_LISPDIR%%/mew/mew-minibuf.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-minibuf.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-mule.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-mule.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-mule0.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-mule0.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-mule3.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-mule3.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-net.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-net.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-nmz.el
@@ -139,6 +151,8 @@ bin/mewl
 %%EMACS_SITE_LISPDIR%%/mew/mew-nntp.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-nntp2.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-nntp2.elc
+%%EMACS_SITE_LISPDIR%%/mew/mew-passwd.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-passwd.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-pgp.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-pgp.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-pick.el
@@ -149,6 +163,8 @@ bin/mewl
 %%EMACS_SITE_LISPDIR%%/mew/mew-refile.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-scan.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-scan.elc
+%%EMACS_SITE_LISPDIR%%/mew/mew-search.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-search.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-smime.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-smime.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-smtp.el
@@ -170,19 +186,25 @@ bin/mewl
 %%EMACS_SITE_LISPDIR%%/mew/mew-syntax.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-syntax.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-temacs.el
-%%EMACS_SITE_LISPDIR%%/mew/mew-theme.el
-%%EMACS_SITE_LISPDIR%%/mew/mew-theme.elc
+%%EMACS_SITE_LISPDIR%%/mew/mew-temacs.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-thread.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-thread.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-unix.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-unix.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-vars.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-vars.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-vars2.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-vars2.elc
+%%EMACS_SITE_LISPDIR%%/mew/mew-vars3.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-vars3.elc
+%%EMACS_SITE_LISPDIR%%/mew/mew-varsx.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-varsx.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-virtual.el
 %%EMACS_SITE_LISPDIR%%/mew/mew-virtual.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-win32.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-win32.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew-xemacs.el
+%%EMACS_SITE_LISPDIR%%/mew/mew-xemacs.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew.el
 %%EMACS_SITE_LISPDIR%%/mew/mew.elc
 @dirrm %%EMACS_SITE_LISPDIR%%/mew/etc/etc