4 files changed, 27 insertions, 48 deletions

diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 096ece053b52..fa72f2a8577a 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -7,10 +7,9 @@
 #
 
 PORTNAME=	mew
-PORTVERSION=	6.3
-PORTREVISION=	2
+PORTVERSION=	6.4
 CATEGORIES=	mail elisp
-MASTER_SITES=	http://www.Mew.org/Release/
+MASTER_SITES=	http://www.mew.org/Release/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	hiroto.kagotani@gmail.com
@@ -47,17 +46,15 @@ INSTALL_TARGET+=install-jinfo
 MAN1=		cmew.1 mew-pinentry.1 mewcat.1 mewdecode.1 mewencode.1 mewest.1 mewl.1 smew.1 incm.1
 INFO=		mew
 .if !defined(NOPORTDOCS)
-INFO+=		mew.jis
+INFO+=		mew.ja
 .endif
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	(cd ${WRKSRC} ; \
-		${INSTALL_DATA} 00* mew.dot.* ${DOCSDIR}/ ; \
-		for dir in contrib; do \
-			${CP} -R $${dir} ${DOCSDIR}/ ; \
-		done)
+		${INSTALL_DATA} 00* dot.* ${DOCSDIR}/ ; \
+		)
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
diff --git a/mail/mew/distinfo b/mail/mew/distinfo
index 3abe7d1834a0..79c50ac09dd6 100644
--- a/mail/mew/distinfo
+++ b/mail/mew/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mew-6.3.tar.gz) = 9c4ea66bb04a2c11809c6a1d77fc560e8823749c7a0855fdcb890945f95a57d4
-SIZE (mew-6.3.tar.gz) = 976352
+SHA256 (mew-6.4.tar.gz) = 9d0de3eb0cebfac51fa136d134e2f887d5f76d18bf09a607b1b30b481b419e34
+SIZE (mew-6.4.tar.gz) = 1025983
diff --git a/mail/mew/files/patch-info__Makefile b/mail/mew/files/patch-info__Makefile
index ae5d11437e81..ba9dae34e941 100644
--- a/mail/mew/files/patch-info__Makefile
+++ b/mail/mew/files/patch-info__Makefile
@@ -1,6 +1,6 @@
---- ./info/Makefile.orig	2009-08-12 16:51:05.000000000 +0900
-+++ ./info/Makefile	2010-01-04 12:06:23.000000000 +0900
-@@ -15,10 +15,10 @@
+--- ./info/Makefile.orig	2011-10-19 17:46:38.000000000 +0900
++++ ./info/Makefile	2011-11-21 19:26:11.000000000 +0900
+@@ -15,7 +15,7 @@
  ## EDIT THE FOLLOWINGS
  ##
  
@@ -8,15 +8,11 @@
 +prefix=${PREFIX}
  infodir=$(prefix)/info
  
--EMACS=emacs
-+EMACS=${EMACS_CMD}
- 
- INSTALLINFO = `which install-info`
- #INSTALLINFO = /usr/local/bin/install-info
+ EMACS=emacs
 @@ -48,20 +48,20 @@
  info:
- 	sed -e 's/@setfilename mew.jis.info/@setfilename mew.info/' \
- 	    -e 's/@set jp/@set us/' mew.texi > tmp.texi
+ 	sed -e 's/@setfilename mew.ja.info/@setfilename mew.info/' \
+ 	    -e 's/@set ja/@set en/' mew.texi > tmp.texi
 -	mv tmp.texi mew.texi
  	$(RM) mew.info*
  	$(TOUCH) mew.info
@@ -26,16 +22,17 @@
 +	$(RM) tmp.texi
  
  jinfo:
- 	sed -e 's/@setfilename mew.info/@setfilename mew.jis.info/' \
--	    -e 's/@set us/@set jp/' mew.texi > tmp.texi
+ 	sed -e 's/@setfilename mew.info/@setfilename mew.ja.info/' \
+-	    -e 's/@set en/@set ja/' mew.texi > tmp.texi
 -	mv tmp.texi mew.texi
-+	    -e 's/@set us/@set jp/' mew.texi > tmp.jis.texi
- 	$(RM) mew.jis.info*
- 	$(TOUCH) mew.jis.info
- 	$(EMACS) -batch -q -no-site-file -l texinfmt \
++	    -e 's/@set en/@set ja/' mew.texi > tmp.ja.texi
+ 	$(RM) mew.ja.info*
+ 	$(TOUCH) mew.ja.info
+-	$(EMACS) -batch -q -no-site-file -l texinfmt \
 -		-f batch-texinfo-format mew.texi
-+		-f batch-texinfo-format tmp.jis.texi
-+	$(RM) tmp.jis.texi
++	LC_ALL=C $(EMACS) -batch -q -no-site-file -l texinfmt \
++		-f batch-texinfo-format tmp.ja.texi
++	$(RM) tmp.ja.texi
  
  install: install-info
  install-info:
diff --git a/mail/mew/pkg-plist b/mail/mew/pkg-plist
index 738c8066924d..41b81cc30263 100644
--- a/mail/mew/pkg-plist
+++ b/mail/mew/pkg-plist
@@ -20,31 +20,18 @@ bin/smew
 %%PORTDOCS%%%%DOCSDIR%%/00changes.5.2
 %%PORTDOCS%%%%DOCSDIR%%/00changes.6.1
 %%PORTDOCS%%%%DOCSDIR%%/00changes.6.2
+%%PORTDOCS%%%%DOCSDIR%%/00changes.6.3
 %%PORTDOCS%%%%DOCSDIR%%/00copyright
-%%PORTDOCS%%%%DOCSDIR%%/00copyright.jis
+%%PORTDOCS%%%%DOCSDIR%%/00copyright.ja
 %%PORTDOCS%%%%DOCSDIR%%/00diff
 %%PORTDOCS%%%%DOCSDIR%%/00readme
-%%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
-%%PORTDOCS%%%%DOCSDIR%%/contrib/mew-edebug.el
-%%PORTDOCS%%%%DOCSDIR%%/contrib/mew-fancy-summary.el
-%%PORTDOCS%%%%DOCSDIR%%/contrib/mew-nmz-fixer.el
-%%PORTDOCS%%%%DOCSDIR%%/contrib/mew-refile-view.el
-%%PORTDOCS%%%%DOCSDIR%%/contrib/mew-toolbar-frame.el
+%%PORTDOCS%%%%DOCSDIR%%/dot.emacs
+%%PORTDOCS%%%%DOCSDIR%%/dot.mew
+%%PORTDOCS%%%%DOCSDIR%%/dot.theme
 %%EMACS_SITE_LISPDIR%%/mew/etc/Mew.img
 %%EMACS_SITE_LISPDIR%%/mew/etc/Mew.png
 %%EMACS_SITE_LISPDIR%%/mew/etc/Mew.xbm
 %%EMACS_SITE_LISPDIR%%/mew/etc/Mew.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/etc/COLOR
-%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-Plain.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-curr.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-folder.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-inc2.xpm
-%%EMACS_SITE_LISPDIR%%/mew/etc/etc/mew-kill.xpm
 %%EMACS_SITE_LISPDIR%%/mew/etc/mew-Audio.xpm
 %%EMACS_SITE_LISPDIR%%/mew/etc/mew-Blank.xpm
 %%EMACS_SITE_LISPDIR%%/mew/etc/mew-External.xpm
@@ -204,9 +191,7 @@ bin/smew
 %%EMACS_SITE_LISPDIR%%/mew/mew-win32.elc
 %%EMACS_SITE_LISPDIR%%/mew/mew.el
 %%EMACS_SITE_LISPDIR%%/mew/mew.elc
-@dirrm %%EMACS_SITE_LISPDIR%%/mew/etc/etc
 @dirrm %%EMACS_SITE_LISPDIR%%/mew/etc
 @dirrm %%EMACS_SITE_LISPDIR%%/mew
 @dirrmtry %%EMACS_SITE_LISPDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/contrib
 %%PORTDOCS%%@dirrm %%DOCSDIR%%