Update 2.1 -> 2.2.

18 files changed, 56 insertions, 166 deletions

diff --git a/mail/mew2-emacs20/pkg-plist b/mail/mew2-emacs20/pkg-plist
index a8e416582261..2e7a38b4494e 100644
--- a/mail/mew2-emacs20/pkg-plist
+++ b/mail/mew2-emacs20/pkg-plist
@@ -1,7 +1,10 @@
+bin/incm
 bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/mewls
+@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
+@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
 info/mew%%MEW_MAJOR_VER%%.info
 info/mew%%MEW_MAJOR_VER%%.info-1
 info/mew%%MEW_MAJOR_VER%%.info-2
@@ -9,6 +12,9 @@ info/mew%%MEW_MAJOR_VER%%.info-3
 info/mew%%MEW_MAJOR_VER%%.jis.info
 info/mew%%MEW_MAJOR_VER%%.jis.info-1
 info/mew%%MEW_MAJOR_VER%%.jis.info-2
+info/mew%%MEW_MAJOR_VER%%.jis.info-3
+@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
+@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
 share/doc/mew%%MEW_MAJOR_VER%%/00api
 share/doc/mew%%MEW_MAJOR_VER%%/00changes
 share/doc/mew%%MEW_MAJOR_VER%%/00copyright
@@ -17,9 +23,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/00diff
 share/doc/mew%%MEW_MAJOR_VER%%/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme-namazu.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/README-mewinc.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incdir
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incmbox
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-browse.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-caesar.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-fancy-summary.el
@@ -29,7 +32,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-refile-view.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-smime-ja.texi
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mewinc
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.img
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.png
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.xbm
diff --git a/mail/mew2-xemacs21-mule/pkg-plist b/mail/mew2-xemacs21-mule/pkg-plist
index 72bf3dd9cef9..d0fb8163dc30 100644
--- a/mail/mew2-xemacs21-mule/pkg-plist
+++ b/mail/mew2-xemacs21-mule/pkg-plist
@@ -1,3 +1,4 @@
+bin/incm
 bin/mewcat
 bin/mewdecode
 bin/mewencode
@@ -48,6 +49,7 @@ bin/mewls
 %%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.jis.info
 %%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.jis.info-1
 %%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.jis.info-2
+%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.jis.info-3
 %%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/auto-autoloads.elc
@@ -161,9 +163,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/00diff
 share/doc/mew%%MEW_MAJOR_VER%%/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme-namazu.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/README-mewinc.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incdir
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incmbox
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-browse.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-caesar.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-fancy-summary.el
@@ -173,7 +172,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-refile-view.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-smime-ja.texi
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mewinc
 @dirrm share/doc/mew%%MEW_MAJOR_VER%%/contrib
 @dirrm share/doc/mew%%MEW_MAJOR_VER%%
 @unexec rmdir %D/%%EMACS_PACKAGESDIR%%/pkginfo 2>/dev/null || true
diff --git a/mail/mew2-xemacs21/pkg-plist b/mail/mew2-xemacs21/pkg-plist
index 7b76213a506a..7e5b2d7b4d2a 100644
--- a/mail/mew2-xemacs21/pkg-plist
+++ b/mail/mew2-xemacs21/pkg-plist
@@ -1,3 +1,4 @@
+bin/incm
 bin/mewcat
 bin/mewdecode
 bin/mewencode
@@ -158,9 +159,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/00diff
 share/doc/mew%%MEW_MAJOR_VER%%/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme-namazu.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/README-mewinc.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incdir
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incmbox
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-browse.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-caesar.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-fancy-summary.el
@@ -170,7 +168,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-refile-view.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-smime-ja.texi
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mewinc
 @dirrm share/doc/mew%%MEW_MAJOR_VER%%/contrib
 @dirrm share/doc/mew%%MEW_MAJOR_VER%%
 @unexec rmdir %D/%%EMACS_PACKAGESDIR%%/pkginfo 2>/dev/null || true
diff --git a/mail/mew2/Makefile b/mail/mew2/Makefile
index 59478f718e58..f7656689ba2d 100644
--- a/mail/mew2/Makefile
+++ b/mail/mew2/Makefile
@@ -19,7 +19,7 @@ MAINTAINER?=	kiri@FreeBSD.org
 MEW_MAJOR_VER?=	2
 
 # distfile version
-MEW_VER=	${MEW_MAJOR_VER}.1
+MEW_VER=	${MEW_MAJOR_VER}.2
 
 # document install directory by install-doc target
 MEW_DOCDIR?=	share/doc/${PORTNAME}${MEW_MAJOR_VER}
@@ -36,7 +36,7 @@ MAKE_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} MEW_MAJOR_VER=${MEW_MAJOR_VER}
 PLIST_SUB+=	MEW_MAJOR_VER=${MEW_MAJOR_VER}
 
 # manuals
-MAN1=		mewcat.1 mewdecode.1 mewencode.1 mewls.1
+MAN1=		mewcat.1 mewdecode.1 mewencode.1 mewls.1 incm.1
 
 post-patch:
 	for f in mew-key.el info/mew.texi; do \
diff --git a/mail/mew2/distinfo b/mail/mew2/distinfo
index 232144109fa2..268e0c1cdc02 100644
--- a/mail/mew2/distinfo
+++ b/mail/mew2/distinfo
@@ -1 +1 @@
-MD5 (mew-2.1.tar.gz) = db70bd87397f31ad10d97d62ecc5f427
+MD5 (mew-2.2.tar.gz) = 2758098d970f253fa5bb8cf86244c0d7
diff --git a/mail/mew2/files/patch-ab b/mail/mew2/files/patch-ab
index cde8b6340a44..c62db0f83d4a 100644
--- a/mail/mew2/files/patch-ab
+++ b/mail/mew2/files/patch-ab
@@ -1,6 +1,6 @@
---- bin/Makefile.in.orig	Mon Sep 24 21:40:37 2001
-+++ bin/Makefile.in	Tue Nov 20 10:10:42 2001
-@@ -65,7 +65,7 @@
+--- bin/Makefile.in.orig	Thu Jan 17 20:26:55 2002
++++ bin/Makefile.in	Sun Feb  3 18:19:20 2002
+@@ -69,7 +69,7 @@
  	$(CC) $(COFLAG) $(OBJ1) $(LIBS)
  	$(RM) $(ALT)
  	for f in $(ALT); do \
@@ -9,20 +9,21 @@
  
  $(PRG2): $(OBJ2)
  	$(CC) $(COFLAG) $(CFLAGS) $(OBJ2)
-@@ -88,14 +88,14 @@
+@@ -95,7 +95,7 @@
  	fi
  	$(INSTALL) -m 555 $(PRG1) $(bindir)
  	for f in $(ALT); do \
 -	  $(RM) $(bindir)/$${f}; $(LN) $(bindir)/$(PRG1) $(bindir)/$${f}; done
-+ 	  $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done
++	  $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done
  	$(INSTALL) -m 555 $(PRG2) $(bindir)
+ 	$(INSTALL) -m 555 $(PRG3) $(bindir)
  	-@if [ ! -d $(mandir) ]; then \
- 		$(MKDIR) $(mandir); \
+@@ -103,7 +103,7 @@
  	fi
  	$(INSTALL) -m 444 $(MAN1) $(mandir)
  	for f in $(MALT); do \
 -	  $(RM) $(mandir)/$${f}; $(LN) $(mandir)/$(MAN1) $(mandir)/$${f}; done
-+ 	  $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done
++	  $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done
  	$(INSTALL) -m 444 $(MAN2) $(mandir)
+ 	$(INSTALL) -m 444 $(MAN3) $(mandir)
  
- ##
diff --git a/mail/mew2/files/patch-ac b/mail/mew2/files/patch-ac
index 1b3351685988..6f0863d8ccd4 100644
--- a/mail/mew2/files/patch-ac
+++ b/mail/mew2/files/patch-ac
@@ -19,7 +19,7 @@
 -INFO  = mew.info mew.info-1 mew.info-2 mew.info-3
 -JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 mew.jis.info-3
 +INFO  = mew${MEW_MAJOR_VER}.info mew${MEW_MAJOR_VER}.info-1 mew${MEW_MAJOR_VER}.info-2 mew${MEW_MAJOR_VER}.info-3
-+JINFO = mew${MEW_MAJOR_VER}.jis.info mew${MEW_MAJOR_VER}.jis.info-1 mew${MEW_MAJOR_VER}.jis.info-2
++JINFO = mew${MEW_MAJOR_VER}.jis.info mew${MEW_MAJOR_VER}.jis.info-1 mew${MEW_MAJOR_VER}.jis.info-2 mew${MEW_MAJOR_VER}.jis.info-3
 +MANUALS= 00readme mew.texi
  
  all: info
diff --git a/mail/mew2/files/patch-af b/mail/mew2/files/patch-af
index 7bb77f4ae56e..e69de29bb2d1 100644
--- a/mail/mew2/files/patch-af
+++ b/mail/mew2/files/patch-af
@@ -1,55 +0,0 @@
---- bin/mewls.c.orig	Sat Sep  8 11:07:12 2001
-+++ bin/mewls.c	Tue Nov 20 10:26:04 2001
-@@ -124,8 +124,8 @@
- private void init_fields(char *);
- private void print_field(char *, int, char *, char *);
- private void init_search(char *, int);
--private char *strcasechr(char *, int);
--private char *strcasestr(char *, char *);
-+private char *mystrcasechr(char *, int);
-+private char *mystrcasestr(char *, char *);
- private int  print_for_scan(FILE *, char *, char *);
- private int  print_for_sort(FILE *, char *, char *);
- private int  print_for_pick(FILE *, char *, char *);
-@@ -473,7 +473,7 @@
- }
- 
- private char *
--strcasechr(char *s, int c)
-+mystrcasechr(char *s, int c)
- {
- 	int lc = tolower(c);
- 	int uc = toupper(c);
-@@ -486,12 +486,12 @@
- }
- 
- private char *
--strcasestr(char *s1, char *s2)
-+mystrcasestr(char *s1, char *s2)
- {
- 	char *p;
- 	unsigned int len = strlen(s2);
- 
--	for (p = s1; (p = strcasechr(p, *s2)) != NULL; p++)
-+	for (p = s1; (p = mystrcasechr(p, *s2)) != NULL; p++)
- 		if (strncasecmp(p, s2, len) == 0)
- 			return p;
- 	return NULL;
-@@ -513,7 +513,7 @@
- 				return TRUE;
- 			}
- 		} else {
--			if (strcasestr(p, value) != NULL) {
-+			if (mystrcasestr(p, value) != NULL) {
- 				*end = tmp;
- 				return TRUE;
- 			}
-@@ -540,7 +540,7 @@
- 					return TRUE;
- 				}
- 			} else {
--				if (strcasestr(beg, value) != NULL) {
-+				if (mystrcasestr(beg, value) != NULL) {
- 					*end = tmp;
- 					return TRUE;
- 				}
diff --git a/mail/mew2/pkg-plist b/mail/mew2/pkg-plist
index a8e416582261..2e7a38b4494e 100644
--- a/mail/mew2/pkg-plist
+++ b/mail/mew2/pkg-plist
@@ -1,7 +1,10 @@
+bin/incm
 bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/mewls
+@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
+@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
 info/mew%%MEW_MAJOR_VER%%.info
 info/mew%%MEW_MAJOR_VER%%.info-1
 info/mew%%MEW_MAJOR_VER%%.info-2
@@ -9,6 +12,9 @@ info/mew%%MEW_MAJOR_VER%%.info-3
 info/mew%%MEW_MAJOR_VER%%.jis.info
 info/mew%%MEW_MAJOR_VER%%.jis.info-1
 info/mew%%MEW_MAJOR_VER%%.jis.info-2
+info/mew%%MEW_MAJOR_VER%%.jis.info-3
+@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
+@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
 share/doc/mew%%MEW_MAJOR_VER%%/00api
 share/doc/mew%%MEW_MAJOR_VER%%/00changes
 share/doc/mew%%MEW_MAJOR_VER%%/00copyright
@@ -17,9 +23,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/00diff
 share/doc/mew%%MEW_MAJOR_VER%%/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme-namazu.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/README-mewinc.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incdir
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incmbox
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-browse.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-caesar.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-fancy-summary.el
@@ -29,7 +32,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-refile-view.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-smime-ja.texi
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mewinc
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.img
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.png
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.xbm
diff --git a/mail/mew3-emacs20/pkg-plist b/mail/mew3-emacs20/pkg-plist
index a8e416582261..2e7a38b4494e 100644
--- a/mail/mew3-emacs20/pkg-plist
+++ b/mail/mew3-emacs20/pkg-plist
@@ -1,7 +1,10 @@
+bin/incm
 bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/mewls
+@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
+@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
 info/mew%%MEW_MAJOR_VER%%.info
 info/mew%%MEW_MAJOR_VER%%.info-1
 info/mew%%MEW_MAJOR_VER%%.info-2
@@ -9,6 +12,9 @@ info/mew%%MEW_MAJOR_VER%%.info-3
 info/mew%%MEW_MAJOR_VER%%.jis.info
 info/mew%%MEW_MAJOR_VER%%.jis.info-1
 info/mew%%MEW_MAJOR_VER%%.jis.info-2
+info/mew%%MEW_MAJOR_VER%%.jis.info-3
+@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
+@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
 share/doc/mew%%MEW_MAJOR_VER%%/00api
 share/doc/mew%%MEW_MAJOR_VER%%/00changes
 share/doc/mew%%MEW_MAJOR_VER%%/00copyright
@@ -17,9 +23,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/00diff
 share/doc/mew%%MEW_MAJOR_VER%%/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme-namazu.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/README-mewinc.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incdir
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incmbox
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-browse.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-caesar.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-fancy-summary.el
@@ -29,7 +32,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-refile-view.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-smime-ja.texi
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mewinc
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.img
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.png
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.xbm
diff --git a/mail/mew3-xemacs21-mule/pkg-plist b/mail/mew3-xemacs21-mule/pkg-plist
index 72bf3dd9cef9..d0fb8163dc30 100644
--- a/mail/mew3-xemacs21-mule/pkg-plist
+++ b/mail/mew3-xemacs21-mule/pkg-plist
@@ -1,3 +1,4 @@
+bin/incm
 bin/mewcat
 bin/mewdecode
 bin/mewencode
@@ -48,6 +49,7 @@ bin/mewls
 %%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.jis.info
 %%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.jis.info-1
 %%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.jis.info-2
+%%EMACS_PACKAGESDIR%%/info/mew%%MEW_MAJOR_VER%%.jis.info-3
 %%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/_pkg.el
 %%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/auto-autoloads.el
 %%EMACS_PACKAGESDIR%%/lisp/mew%%MEW_MAJOR_VER%%/auto-autoloads.elc
@@ -161,9 +163,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/00diff
 share/doc/mew%%MEW_MAJOR_VER%%/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme-namazu.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/README-mewinc.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incdir
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incmbox
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-browse.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-caesar.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-fancy-summary.el
@@ -173,7 +172,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-refile-view.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-smime-ja.texi
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mewinc
 @dirrm share/doc/mew%%MEW_MAJOR_VER%%/contrib
 @dirrm share/doc/mew%%MEW_MAJOR_VER%%
 @unexec rmdir %D/%%EMACS_PACKAGESDIR%%/pkginfo 2>/dev/null || true
diff --git a/mail/mew3-xemacs21/pkg-plist b/mail/mew3-xemacs21/pkg-plist
index 7b76213a506a..7e5b2d7b4d2a 100644
--- a/mail/mew3-xemacs21/pkg-plist
+++ b/mail/mew3-xemacs21/pkg-plist
@@ -1,3 +1,4 @@
+bin/incm
 bin/mewcat
 bin/mewdecode
 bin/mewencode
@@ -158,9 +159,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/00diff
 share/doc/mew%%MEW_MAJOR_VER%%/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme-namazu.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/README-mewinc.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incdir
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incmbox
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-browse.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-caesar.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-fancy-summary.el
@@ -170,7 +168,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-refile-view.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-smime-ja.texi
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mewinc
 @dirrm share/doc/mew%%MEW_MAJOR_VER%%/contrib
 @dirrm share/doc/mew%%MEW_MAJOR_VER%%
 @unexec rmdir %D/%%EMACS_PACKAGESDIR%%/pkginfo 2>/dev/null || true
diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile
index 59478f718e58..f7656689ba2d 100644
--- a/mail/mew3/Makefile
+++ b/mail/mew3/Makefile
@@ -19,7 +19,7 @@ MAINTAINER?=	kiri@FreeBSD.org
 MEW_MAJOR_VER?=	2
 
 # distfile version
-MEW_VER=	${MEW_MAJOR_VER}.1
+MEW_VER=	${MEW_MAJOR_VER}.2
 
 # document install directory by install-doc target
 MEW_DOCDIR?=	share/doc/${PORTNAME}${MEW_MAJOR_VER}
@@ -36,7 +36,7 @@ MAKE_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} MEW_MAJOR_VER=${MEW_MAJOR_VER}
 PLIST_SUB+=	MEW_MAJOR_VER=${MEW_MAJOR_VER}
 
 # manuals
-MAN1=		mewcat.1 mewdecode.1 mewencode.1 mewls.1
+MAN1=		mewcat.1 mewdecode.1 mewencode.1 mewls.1 incm.1
 
 post-patch:
 	for f in mew-key.el info/mew.texi; do \
diff --git a/mail/mew3/distinfo b/mail/mew3/distinfo
index 232144109fa2..268e0c1cdc02 100644
--- a/mail/mew3/distinfo
+++ b/mail/mew3/distinfo
@@ -1 +1 @@
-MD5 (mew-2.1.tar.gz) = db70bd87397f31ad10d97d62ecc5f427
+MD5 (mew-2.2.tar.gz) = 2758098d970f253fa5bb8cf86244c0d7
diff --git a/mail/mew3/files/patch-ab b/mail/mew3/files/patch-ab
index cde8b6340a44..c62db0f83d4a 100644
--- a/mail/mew3/files/patch-ab
+++ b/mail/mew3/files/patch-ab
@@ -1,6 +1,6 @@
---- bin/Makefile.in.orig	Mon Sep 24 21:40:37 2001
-+++ bin/Makefile.in	Tue Nov 20 10:10:42 2001
-@@ -65,7 +65,7 @@
+--- bin/Makefile.in.orig	Thu Jan 17 20:26:55 2002
++++ bin/Makefile.in	Sun Feb  3 18:19:20 2002
+@@ -69,7 +69,7 @@
  	$(CC) $(COFLAG) $(OBJ1) $(LIBS)
  	$(RM) $(ALT)
  	for f in $(ALT); do \
@@ -9,20 +9,21 @@
  
  $(PRG2): $(OBJ2)
  	$(CC) $(COFLAG) $(CFLAGS) $(OBJ2)
-@@ -88,14 +88,14 @@
+@@ -95,7 +95,7 @@
  	fi
  	$(INSTALL) -m 555 $(PRG1) $(bindir)
  	for f in $(ALT); do \
 -	  $(RM) $(bindir)/$${f}; $(LN) $(bindir)/$(PRG1) $(bindir)/$${f}; done
-+ 	  $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done
++	  $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done
  	$(INSTALL) -m 555 $(PRG2) $(bindir)
+ 	$(INSTALL) -m 555 $(PRG3) $(bindir)
  	-@if [ ! -d $(mandir) ]; then \
- 		$(MKDIR) $(mandir); \
+@@ -103,7 +103,7 @@
  	fi
  	$(INSTALL) -m 444 $(MAN1) $(mandir)
  	for f in $(MALT); do \
 -	  $(RM) $(mandir)/$${f}; $(LN) $(mandir)/$(MAN1) $(mandir)/$${f}; done
-+ 	  $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done
++	  $(RM) $(mandir)/$${f}; $(LN) -sf $(mandir)/$(MAN1) $(mandir)/$${f}; done
  	$(INSTALL) -m 444 $(MAN2) $(mandir)
+ 	$(INSTALL) -m 444 $(MAN3) $(mandir)
  
- ##
diff --git a/mail/mew3/files/patch-ac b/mail/mew3/files/patch-ac
index 1b3351685988..6f0863d8ccd4 100644
--- a/mail/mew3/files/patch-ac
+++ b/mail/mew3/files/patch-ac
@@ -19,7 +19,7 @@
 -INFO  = mew.info mew.info-1 mew.info-2 mew.info-3
 -JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2 mew.jis.info-3
 +INFO  = mew${MEW_MAJOR_VER}.info mew${MEW_MAJOR_VER}.info-1 mew${MEW_MAJOR_VER}.info-2 mew${MEW_MAJOR_VER}.info-3
-+JINFO = mew${MEW_MAJOR_VER}.jis.info mew${MEW_MAJOR_VER}.jis.info-1 mew${MEW_MAJOR_VER}.jis.info-2
++JINFO = mew${MEW_MAJOR_VER}.jis.info mew${MEW_MAJOR_VER}.jis.info-1 mew${MEW_MAJOR_VER}.jis.info-2 mew${MEW_MAJOR_VER}.jis.info-3
 +MANUALS= 00readme mew.texi
  
  all: info
diff --git a/mail/mew3/files/patch-af b/mail/mew3/files/patch-af
index 7bb77f4ae56e..e69de29bb2d1 100644
--- a/mail/mew3/files/patch-af
+++ b/mail/mew3/files/patch-af
@@ -1,55 +0,0 @@
---- bin/mewls.c.orig	Sat Sep  8 11:07:12 2001
-+++ bin/mewls.c	Tue Nov 20 10:26:04 2001
-@@ -124,8 +124,8 @@
- private void init_fields(char *);
- private void print_field(char *, int, char *, char *);
- private void init_search(char *, int);
--private char *strcasechr(char *, int);
--private char *strcasestr(char *, char *);
-+private char *mystrcasechr(char *, int);
-+private char *mystrcasestr(char *, char *);
- private int  print_for_scan(FILE *, char *, char *);
- private int  print_for_sort(FILE *, char *, char *);
- private int  print_for_pick(FILE *, char *, char *);
-@@ -473,7 +473,7 @@
- }
- 
- private char *
--strcasechr(char *s, int c)
-+mystrcasechr(char *s, int c)
- {
- 	int lc = tolower(c);
- 	int uc = toupper(c);
-@@ -486,12 +486,12 @@
- }
- 
- private char *
--strcasestr(char *s1, char *s2)
-+mystrcasestr(char *s1, char *s2)
- {
- 	char *p;
- 	unsigned int len = strlen(s2);
- 
--	for (p = s1; (p = strcasechr(p, *s2)) != NULL; p++)
-+	for (p = s1; (p = mystrcasechr(p, *s2)) != NULL; p++)
- 		if (strncasecmp(p, s2, len) == 0)
- 			return p;
- 	return NULL;
-@@ -513,7 +513,7 @@
- 				return TRUE;
- 			}
- 		} else {
--			if (strcasestr(p, value) != NULL) {
-+			if (mystrcasestr(p, value) != NULL) {
- 				*end = tmp;
- 				return TRUE;
- 			}
-@@ -540,7 +540,7 @@
- 					return TRUE;
- 				}
- 			} else {
--				if (strcasestr(beg, value) != NULL) {
-+				if (mystrcasestr(beg, value) != NULL) {
- 					*end = tmp;
- 					return TRUE;
- 				}
diff --git a/mail/mew3/pkg-plist b/mail/mew3/pkg-plist
index a8e416582261..2e7a38b4494e 100644
--- a/mail/mew3/pkg-plist
+++ b/mail/mew3/pkg-plist
@@ -1,7 +1,10 @@
+bin/incm
 bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/mewls
+@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
+@unexec install-info --delete %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
 info/mew%%MEW_MAJOR_VER%%.info
 info/mew%%MEW_MAJOR_VER%%.info-1
 info/mew%%MEW_MAJOR_VER%%.info-2
@@ -9,6 +12,9 @@ info/mew%%MEW_MAJOR_VER%%.info-3
 info/mew%%MEW_MAJOR_VER%%.jis.info
 info/mew%%MEW_MAJOR_VER%%.jis.info-1
 info/mew%%MEW_MAJOR_VER%%.jis.info-2
+info/mew%%MEW_MAJOR_VER%%.jis.info-3
+@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.info %D/info/dir
+@exec install-info %D/info/mew%%MEW_MAJOR_VER%%.jis.info %D/info/dir
 share/doc/mew%%MEW_MAJOR_VER%%/00api
 share/doc/mew%%MEW_MAJOR_VER%%/00changes
 share/doc/mew%%MEW_MAJOR_VER%%/00copyright
@@ -17,9 +23,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/00diff
 share/doc/mew%%MEW_MAJOR_VER%%/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/00readme-namazu.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/README-mewinc.jis
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incdir
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/incmbox
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-browse.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-caesar.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-fancy-summary.el
@@ -29,7 +32,6 @@ share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-nmz.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-refile-view.el
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-smime-ja.texi
 share/doc/mew%%MEW_MAJOR_VER%%/contrib/mew-toolbar-frame.el
-share/doc/mew%%MEW_MAJOR_VER%%/contrib/mewinc
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.img
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.png
 %%EMACS_LIBDIR%%/etc/mew%%MEW_MAJOR_VER%%/Mew.xbm