10 files changed, 238 insertions, 166 deletions

diff --git a/mail/mew2/files/message.sh b/mail/mew2/files/message.sh
index a709991a5b4f..c4941cbfed1b 100644
--- a/mail/mew2/files/message.sh
+++ b/mail/mew2/files/message.sh
@@ -1,26 +1,37 @@
 #!/bin/sh
  
-if [ -z "${EMACS_SETUPEL}" ]; then
-    cat <<EOF > ${WRKTMPDIR}/pkg-message
+case ${EMACS_PORT_NAME} in
+    emacs20)
+	cat <<EOF > ${WRKTMPDIR}/pkg-message
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
 *       (autoload 'mew "mew" nil t)                                     *
 *       (autoload 'mew-send "mew" nil t)                                *
-*       (setq mew-mail-domain-list '("Name_Server_Domain_Name"))        *
+*       (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-prog-pgpkey      "fetch")         ;; for PGP use      *
+*       (setq mew-prog-pgpkey-arg  '("-q" "-o" "-"));; for PGP use      *
 *                                                                       *
 *************************************************************************
 EOF
-else
-    cat <<EOF > ${WRKTMPDIR}/pkg-message
+	;;
+    xemacs21*)
+	cat <<EOF > ${WRKTMPDIR}/pkg-message
 *************************************************************************
 * You must set at least following elisps to your own dot.emacs file:    *
 *                                                                       *
-*       (require '`basename ${EMACS_SETUPEL} .el`)                                  *
 *       (autoload 'mew "mew" nil t)                                     *
 *       (autoload 'mew-send "mew" nil t)                                *
-*       (setq mew-mail-domain-list '("Name_Server_Domain_Name"))        *
+*       (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      *
 *                                                                       *
 *************************************************************************
 EOF
-fi    
+	;;
+esac
diff --git a/mail/mew2/files/mew-setup.el.in b/mail/mew2/files/mew-setup.el.in
deleted file mode 100644
index e408ef6eb6e7..000000000000
--- a/mail/mew2/files/mew-setup.el.in
+++ /dev/null
@@ -1,4 +0,0 @@
-(setq load-path (append '(
-	"%%LOCALBASE%%/%%EMACS_LIBDIR%%/site-lisp/mew"
- ) load-path))
-(provide '%%EMACS_SETUPEL%%)
diff --git a/mail/mew2/files/mew-xemacs-setup.el.in b/mail/mew2/files/mew-xemacs-setup.el.in
deleted file mode 100644
index feb0d538d7d5..000000000000
--- a/mail/mew2/files/mew-xemacs-setup.el.in
+++ /dev/null
@@ -1,5 +0,0 @@
-(setq load-path (append '(
-	"%%LOCALBASE%%/%%EMACS_LIBDIR%%/site-lisp/mew"
- ) load-path))
-(setq mew-icon-directory "%%LOCALBASE%%/%%EMACS_LIBDIR%%/etc/mew")
-(provide '%%EMACS_SETUPEL%%)
diff --git a/mail/mew2/files/patch-aa b/mail/mew2/files/patch-aa
index 07d51807b839..ba398cffa9ea 100644
--- a/mail/mew2/files/patch-aa
+++ b/mail/mew2/files/patch-aa
@@ -1,61 +1,54 @@
---- Makefile.orig	Wed Oct 20 20:20:51 1999
-+++ Makefile	Tue Jul 10 23:35:24 2001
-@@ -19,8 +19,8 @@
+--- Makefile.orig	Wed Jul 18 08:20:40 2001
++++ Makefile	Fri Aug  3 22:18:35 2001
+@@ -19,14 +19,14 @@
  ## EDIT THE FOLLOWINGS
  ##
  
--PREFIX = /usr/local
--INFODIR = $(PREFIX)/info
-+PREFIX?= /usr/local
-+INFODIR= $(PREFIX)/info
+-prefix=/usr/local
++prefix=${PREFIX}
+ infodir=$(prefix)/info
  
  ##
  ## Compile engines
-@@ -30,10 +30,10 @@
- CFLAGS = -O
+ ##
  
- #EMACS = emacs
--EMACS = xemacs
-+EMACS=	${EMACS_CMD}
+-EMACS = emacs
++EMACS = ${EMACS_CMD}
+ #EMACS = xemacs
  #EMACS = mule
  
--PERL=`which perl`
-+PERL?=`which perl`
- #PERL=/usr/local/bin/perl
- 
- ##
-@@ -46,7 +46,7 @@
+@@ -34,7 +34,7 @@
  ## A directory where mew*.el[c] will be installed.
  ##
  
--ELISPDIR  = $(PREFIX)/lib/$(EMACS)/site-lisp
-+ELISPDIR= ${PREFIX}/${EMACS_LIBDIR}/site-lisp/mew
- #ELISPDIR = $(PREFIX)/share/emacs/site-lisp
- #ELISPDIR = $(PREFIX)/lib/emacs
+-elispdir = $(prefix)/share/emacs/site-lisp/mew
++elispdir = $(prefix)/${EMACS_LIBDIR}/site-lisp/mew${MEW_MAJOR_VER}
+ #elispdir  = $(prefix)/lib/$(EMACS)/site-lisp
+ #elispdir = $(prefix)/lib/emacs
  
-@@ -54,7 +54,10 @@
+@@ -42,7 +42,10 @@
  ## A directory where etc file will be installed.
  ##
  
--ETCDIR = $(PREFIX)/lib/$(EMACS)/etc/Mew
-+ETCDIR=	${PREFIX}/${EMACS_LIBDIR}/etc/mew
+-etcdir = $(prefix)/lib/$(EMACS)/etc/Mew
++etcdir = $(prefix)/${EMACS_LIBDIR}/etc/mew${MEW_MAJOR_VER}
 +
 +# For XEmacs packages
-+XPKGDIR=	${PREFIX}/${EMACS_PACKAGESDIR}
++XPKGDIR=	$(prefix)/${EMACS_PACKAGESDIR}
  
  ################################################################
  ##
-@@ -72,6 +75,8 @@
- 	mew-virtual.elc  mew-highlight.elc mew-vars.elc  \
- 	mew-addrbook.elc mew.elc
+@@ -67,6 +70,8 @@
+ 	mew-key.elc     mew-thread.elc  mew-smime.elc	\
+ 	mew-theme.elc	mew.elc
  
 +OBJS_PKG=	 auto-autoloads.elc custom-load.elc
 +
- SRCS =  mew-attach.el   mew-bq.el      mew-cache.el   \
- 	mew-complete.el mew-decode.el  mew-demo.el    \
- 	mew-draft.el    mew-encode.el  mew-env.el     \
-@@ -88,6 +93,8 @@
- 	mew-temacs.el   mew-xemacs.el  mew-addrbook.el \
+ SRCS =	mew-addrbook.el	mew-attach.el	mew-blvs.el	\
+ 	mew-bq.el	mew-cache.el	mew-complete.el	\
+ 	mew-config.el	mew-const.el	mew-decode.el	\
+@@ -87,6 +92,8 @@
+ 	mew-thread.el	mew-smime.el	mew-theme.el	\
  	mew.el
  
 +SRCS_PKG=	auto-autoloads.el custom-load.el
@@ -63,70 +56,69 @@
  TEMPFILE = temp.el
  
  CP = cp
-@@ -96,14 +103,14 @@
- BIN = bin
+@@ -103,7 +110,9 @@
  
- all: $(OBJS)
+ ################################################################
+ 
+-el: $(TEMPFILE) mew.el
++el: $(OBJS)
 +
 +$(OBJS): $(TEMPFILE) mew.el
  	@echo 'Compiling EL files of Mew ... '
  	@echo 'PLEASE IGNORE WARNINGS IF DISPLAYED. TAKE IT EASY!'
  	$(EMACS) -batch -q -no-site-file -l ./$(TEMPFILE) -f mew-compile
- 	cd $(BIN); $(MAKE) CFLAGS="$(CFLAGS)" CC="$(CC)" PERL="$(PERL)"
- 	@echo 'Compiling EL files of Mew ... done'
- 
--$(OBJS): $(TEMPFILE) mew.el
--
- $(TEMPFILE):
- 	@echo '(setq load-path (cons "." load-path))' > $(TEMPFILE)
- 	@echo '(defun mew-compile () (mapcar (function (lambda (x) (byte-compile-file x))) (list ' >> $(TEMPFILE)
-@@ -111,11 +118,11 @@
+@@ -116,11 +125,11 @@
  	@echo ')))' >> $(TEMPFILE)
  
- install: $(OBJS)
--	-@if [ ! -d $(ELISPDIR) ]; then \
-+	if [ ! -d $(ELISPDIR) ]; then \
- 		$(MKDIR) $(ELISPDIR); \
--	fi; \
--	$(CP) $(SRCS) $(ELISPDIR)
--	$(CP) $(OBJS) $(ELISPDIR)
-+	fi
-+	${BSD_INSTALL_DATA} $(SRCS) $(ELISPDIR)
-+	${BSD_INSTALL_DATA} $(OBJS) $(ELISPDIR)
- 	cd $(BIN); $(MAKE) install CFLAGS="$(CFLAGS)" CC="$(CC)" BINDIR="$(BINDIR)"
+ install-el: $(OBJS)
+-	-@if [ ! -d $(elispdir) ]; then \
++	if [ ! -d $(elispdir) ]; then \
+ 		$(MKDIR) $(elispdir); \
+ 	fi
+-	$(CP) $(SRCS) $(elispdir)
+-	$(CP) $(OBJS) $(elispdir)
++	${BSD_INSTALL_DATA} $(SRCS) $(elispdir)
++	${BSD_INSTALL_DATA} $(OBJS) $(elispdir)
  
- clean:
-@@ -126,19 +133,69 @@
+ ################################################################
+ 
+@@ -136,7 +145,9 @@
  	cd info; $(MAKE) info EMACS=$(EMACS)
  
  install-info:
--	cd info; $(MAKE) install-info INFODIR=$(INFODIR)
-+	${MKDIR} ${INFODIR}
-+	cd info; $(MAKE) install-info INFODIR=$(INFODIR) \
+-	cd info; $(MAKE) install-info infodir=$(infodir)
++	${MKDIR} $(infodir)
++	cd info; $(MAKE) install-info infodir=$(infodir) \
 +		XEMACS_VER_OVER20="${XEMACS_VER_OVER20}"
  
- jinfo::
+ ################################################################
+ 
+@@ -144,15 +155,72 @@
  	cd info; $(MAKE) jinfo EMACS=$(EMACS)
  
  install-jinfo:
--	cd info; $(MAKE) install-jinfo INFODIR=$(INFODIR)
-+	${MKDIR} ${INFODIR}
-+	cd info; $(MAKE) install-jinfo INFODIR=$(INFODIR) \
+-	cd info; $(MAKE) install-jinfo infodir=$(infodir)
++	${MKDIR} $(infodir)
++	cd info; $(MAKE) install-jinfo infodir=$(infodir) \
 +		XEMACS_VER_OVER20="${XEMACS_VER_OVER20}"
 +
 +install-man:
 +	${MKDIR} ${MANDIR}
 +	cd info; $(MAKE) install-man MANDIR=$(MANDIR)
  
+ ################################################################
+ 
  install-etc:
--	-@if [ ! -d $(ETCDIR) ]; then \
-+	if [ ! -d $(ETCDIR) ]; then \
- 		$(MKDIR) $(ETCDIR); \
- 	fi; \
--	cd etc; $(CP) -r * $(ETCDIR)/
-+	cd etc; $(CP) -R * $(ETCDIR)/
+-	-@if [ ! -d $(etcdir) ]; then \
++	if [ ! -d $(etcdir) ]; then \
+ 		$(MKDIR) $(etcdir); \
+ 	fi
+-	cd etc; $(CP) -r * $(etcdir)/
++	cd etc; $(CP) -R * $(etcdir)/
++
++################################################################
 +
-+package: ${OBJS} ${OBJS_PKG}
++package: ${OBJS} ${OBJS_PKG} bin
 +
 +${OBJS_PKG}: ${SRCS_PKG}
 +	${EMACS} -vanilla -batch -eval "(push \"./\" load-path)" -l bytecomp \
@@ -151,22 +143,29 @@
 +	@echo "		 :version $(XEMACS_PKGVER)"	>> _pkg.el
 +	@echo "		 :type 'regular)" 		>> _pkg.el
 +
++install-mule-package: install-package
++	${MAKE} infodir=${XPKGDIR}/info XEMACS_VER_OVER20="yes" install-jinfo
++	${MAKE} manifest
++
 +install-package:
 +	${MKDIR} ${XPKGDIR}/pkginfo
-+	${MAKE} ELISPDIR=${XPKGDIR}/lisp/mew  	install
-+	${BSD_INSTALL_DATA} _pkg.el ${OBJS_PKG} ${SRCS_PKG} ${XPKGDIR}/lisp/mew
-+	${MAKE} INFODIR=${XPKGDIR}/info XEMACS_VER_OVER20="yes" \
++	${MAKE} install-bin
++	${MAKE} elispdir=${XPKGDIR}/lisp/mew${MEW_MAJOR_VER} install-el
++	${BSD_INSTALL_DATA} _pkg.el ${OBJS_PKG} ${SRCS_PKG} \
++		${XPKGDIR}/lisp/mew${MEW_MAJOR_VER}
++	${MAKE} infodir=${XPKGDIR}/info XEMACS_VER_OVER20="yes" \
 +						install-info
-+	${MAKE} MANDIR=${XPKGDIR}/man/mew    	install-man
-+	${MAKE} ETCDIR=${XPKGDIR}/etc/mew    	install-etc
-+	(cd ${XPKGDIR}; \
-+		ls -d1 lisp/mew/* info/mew.* man/mew/* etc/mew/* \
-+			> ${XPKGDIR}/pkginfo/MANIFEST.mew)
-+	${ECHO} "pkginfo/MANIFEST.mew" >> ${XPKGDIR}/pkginfo/MANIFEST.mew
++	${MAKE} MANDIR=${XPKGDIR}/man/mew${MEW_MAJOR_VER} install-man
++	${MAKE} etcdir=${XPKGDIR}/etc/mew${MEW_MAJOR_VER} install-etc
++	${MAKE} manifest
 +
-+install-mule-package: install-package
-+	${MAKE} INFODIR=${XPKGDIR}/info XEMACS_VER_OVER20="yes" \
-+						install-jinfo
++manifest:
++	(cd ${XPKGDIR}; \
++		ls -d1 lisp/mew${MEW_MAJOR_VER}/* info/mew${MEW_MAJOR_VER}.* \
++			man/mew${MEW_MAJOR_VER}/* etc/mew${MEW_MAJOR_VER}/* \
++			> ${XPKGDIR}/pkginfo/MANIFEST.mew${MEW_MAJOR_VER})
++	${ECHO} "pkginfo/MANIFEST.mew${MEW_MAJOR_VER}" \
++		>> ${XPKGDIR}/pkginfo/MANIFEST.mew${MEW_MAJOR_VER}
+ 
+ ################################################################
  
- ##
- ## End of Makefile
diff --git a/mail/mew2/files/patch-ab b/mail/mew2/files/patch-ab
index 2dac86223770..2fb11a359a49 100644
--- a/mail/mew2/files/patch-ab
+++ b/mail/mew2/files/patch-ab
@@ -1,25 +1,28 @@
---- bin/Makefile~	Wed Oct 27 08:55:11 1999
-+++ bin/Makefile	Tue Jul 10 01:06:02 2001
-@@ -22,7 +22,7 @@
- 	$(CC) -o $@ $(OBJS)
+--- bin/Makefile.in~	Fri May 25 12:58:39 2001
++++ bin/Makefile.in	Thu Aug  2 19:11:38 2001
+@@ -65,7 +65,7 @@
+ 	$(CC) $(COFLAG) $(OBJ1) $(LIBS)
  	$(RM) $(ALT)
  	for f in $(ALT); do \
--	  ln $(PRG) $${f}; done
-+	  ln -sf $(PRG) $${f}; done
+-	  $(LN) $(PRG1) $${f}; done
++	  $(LN) -sf $(PRG1) $${f}; done
  
- uumerge: uumerge.in
- 	sed -e "s|@PERL@|${PERL}|" < uumerge.in > uumerge
-@@ -32,10 +32,10 @@
- 	-@if [ ! -d $(BINDIR) ]; then \
- 		$(MKDIR) $(BINDIR); \
- 	fi; \
--	cp $(PRG) $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} $(PRG) $(BINDIR)
+ $(PRG2): $(OBJ2)
+ 	$(CC) $(COFLAG) $(CFLAGS) $(OBJ2)
+@@ -88,14 +88,14 @@
+ 	fi
+ 	$(INSTALL) $(PRG1) $(bindir)
  	for f in $(ALT); do \
--	  $(RM) $(BINDIR)/$${f}; ln $(BINDIR)/$(PRG) $(BINDIR)/$${f}; done
--	cp $(OTH) $(BINDIR)
-+	  $(RM) $(BINDIR)/$${f}; ln -sf $(BINDIR)/$(PRG) $(BINDIR)/$${f}; done
-+	${BSD_INSTALL_SCRIPT} $(OTH) $(BINDIR)
+-	  $(RM) $(bindir)/$${f}; $(LN) $(bindir)/$(PRG1) $(bindir)/$${f}; done
++	  $(RM) $(bindir)/$${f}; $(LN) -sf $(bindir)/$(PRG1) $(bindir)/$${f}; done
+ 	$(INSTALL) $(PRG2) $(bindir)
+ 	-@if [ ! -d $(mandir) ]; then \
+ 		$(MKDIR) $(mandir); \
+ 	fi
+ 	$(INSTALL) $(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
+ 	$(INSTALL) $(MAN2) $(mandir)
  
- clean:
- 	$(RM) $(OBJS) $(PRG) $(ALT) $(OTH)
+ ##
diff --git a/mail/mew2/files/patch-ac b/mail/mew2/files/patch-ac
index 3efb03c40dd8..b30fd65baa8d 100644
--- a/mail/mew2/files/patch-ac
+++ b/mail/mew2/files/patch-ac
@@ -1,45 +1,88 @@
---- info/Makefile~	Wed Oct 27 08:55:12 1999
-+++ info/Makefile	Tue Jul 10 01:25:05 2001
-@@ -33,6 +33,7 @@
+--- info/Makefile.orig	Wed Jul 18 08:20:40 2001
++++ info/Makefile	Fri Aug  3 22:19:55 2001
+@@ -28,9 +28,9 @@
+ #INSTALLINFO_OPTIONS = --section Emacs Emacs
+ #INSTALLINFO_JOPTIONS =
+ #infodir = 
+-INSTALLINFO_ARGS  = mew.info $(infodir)/dir
++INSTALLINFO_ARGS  = mew${MEW_MAJOR_VER}.info $(infodir)/dir
+ #INSTALLINFO_ARGS  = mew.info 
+-INSTALLINFO_JARGS = mew.jis.info $(infodir)/dir
++INSTALLINFO_JARGS = mew${MEW_MAJOR_VER}.jis.info $(infodir)/dir
  
- INFO  = mew.info mew.info-1 mew.info-2 mew.info-3
- JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2
+ 
+ RM = rm -f
+@@ -44,50 +44,60 @@
+ ## DO NOT EDIT THE FOLLOWINGS
+ ##
+ 
+-INFO  = mew.info mew.info-1 mew.info-2 mew.info-3
+-JINFO = mew.jis.info mew.jis.info-1 mew.jis.info-2
++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
 +MANUALS= 00readme mew.texi
  
- info::
- 	sed -e 's/@setfilename mew.jis.info/@setfilename mew.info/' \
-@@ -57,22 +58,32 @@
- 		$(MKDIR) $(INFODIR); \
+ all: info
+ info:
+-	sed -e 's/@setfilename mew.jis.info/@setfilename mew.info/' \
++	sed -e "s/@setfilename mew${MEW_MAJOR_VER}\.jis\.info/@setfilename mew${MEW_MAJOR_VER}\.info/" \
+ 	    -e 's/@set jp/@set us/' mew.texi > tmp.texi
+ 	mv tmp.texi mew.texi
+-	$(RM) mew.info*
+-	$(TOUCH) mew.info
++	$(RM) mew${MEW_MAJOR_VER}.info*
++	$(TOUCH) mew${MEW_MAJOR_VER}.info
+ 	$(EMACS) -batch -q -no-site-file -l texinfmt \
+ 		-f batch-texinfo-format mew.texi
+ 
+ jinfo:
+-	sed -e 's/@setfilename mew.info/@setfilename mew.jis.info/' \
++	sed -e "s/@setfilename mew${MEW_MAJOR_VER}\.info/@setfilename mew${MEW_MAJOR_VER}\.jis.info/" \
+ 	    -e 's/@set us/@set jp/' mew.texi > tmp.texi
+ 	mv tmp.texi mew.texi
+-	$(RM) mew.jis.info*
+-	$(TOUCH) mew.jis.info
++	$(RM) mew${MEW_MAJOR_VER}.jis.info*
++	$(TOUCH) mew${MEW_MAJOR_VER}.jis.info
+ 	$(EMACS) -batch -q -no-site-file -l texinfmt \
+ 		-f batch-texinfo-format mew.texi
+ 
+ install: install-info
+ install-info:
+-	-@if [ ! -d $(infodir) ]; then \
++	-if [ ! -d $(infodir) ]; then \
+ 		$(MKDIR) $(infodir); \
  	fi; \
- 	cp $(INFO) $(INFODIR)
+-	cp $(INFO) $(infodir)
 -	-@if [ -x "$(INSTALLINFO)" ]; then \
--		$(INSTALLINFO) mew.info $(INFODIR)/dir; \
+-		$(INSTALLINFO) $(INSTALLINFO_OPTIONS) $(INSTALLINFO_ARGS); \
 -	else \
--		echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
-+	${BSD_INSTALL_DATA} $(INFO) $(INFODIR)
-+	-@if [ -z "${XEMACS_VER_OVER20}" ]; then \
+-		echo "Don't forget to edit $(infodir)/dir for Mew."; \
++	${BSD_INSTALL_DATA} $(INFO) $(infodir)/
++	-if [ -z "${XEMACS_VER_OVER20}" ]; then \
 +		if [ -x "$(INSTALLINFO)" ]; then \
-+			$(INSTALLINFO) mew.info $(INFODIR)/dir; \
++			$(INSTALLINFO) $(INSTALLINFO_OPTIONS) $(INSTALLINFO_ARGS); \
 +		else \
-+			echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
++			echo "Don't forget to edit $(infodir)/dir for Mew."; \
 +		fi; \
  	fi
  
  install-jinfo:
- 	-@if [ ! -d $(INFODIR) ]; then \
- 		$(MKDIR) $(INFODIR); \
+-	-@if [ ! -d $(infodir) ]; then \
++	-if [ ! -d $(infodir) ]; then \
+ 		$(MKDIR) $(infodir); \
  	fi; \
--	cp $(JINFO) $(INFODIR)
+-	cp $(JINFO) $(infodir)
 -	-@if [ -x "$(INSTALLINFO)" ]; then \
--		$(INSTALLINFO) mew.jis.info $(INFODIR)/dir; \
+-		$(INSTALLINFO) $(INSTALLINFO_JOPTIONS) $(INSTALLINFO_JARGS); \
 -	else \
--		echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
-+	${BSD_INSTALL_DATA} $(JINFO) $(INFODIR)
-+	-@if [ -z "${XEMACS_VER_OVER20}" ]; then \
+-		echo "Don't forget to edit $(infodir)/dir for Mew."; \
++	${BSD_INSTALL_DATA} $(JINFO) $(infodir)/
++	-if [ -z "${XEMACS_VER_OVER20}" ]; then \
 +		if [ -x "$(INSTALLINFO)" ]; then \
-+			$(INSTALLINFO) mew.jis.info $(INFODIR)/dir; \
++			$(INSTALLINFO) $(INSTALLINFO_JOPTIONS) $(INSTALLINFO_JARGS); \
 +		else \
-+			echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
++			echo "Don't forget to edit $(infodir)/dir for Mew."; \
 +		fi; \
  	fi
 +
diff --git a/mail/mew2/files/patch-ad b/mail/mew2/files/patch-ad
index 4a2dedb620c4..933ef45d9e73 100644
--- a/mail/mew2/files/patch-ad
+++ b/mail/mew2/files/patch-ad
@@ -1,13 +1,27 @@
---- mew-xemacs.el~	Mon Aug 30 12:43:16 1999
-+++ mew-xemacs.el	Mon Aug 30 20:58:26 1999
-@@ -30,8 +30,8 @@
-   (defvar mew-summary-toolbar nil)
-   (defvar mew-draft-toolbar nil))
-  (t
--  (defvar mew-icon-directory nil)
--
-+  (defvar mew-icon-directory (if (fboundp 'locate-data-directory)
-+				 (locate-data-directory "mew")))
-   (defvar mew-icon-separate
-     (toolbar-make-button-list
-      (expand-file-name "mew-sep.xpm" mew-icon-directory)))
+--- info/mew.texi~	Thu Aug  2 22:31:28 2001
++++ info/mew.texi	Fri Aug  3 11:01:40 2001
+@@ -1,6 +1,6 @@
+ \input texinfo  @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename mew.jis.info
++@setfilename mew%%MEW_MAJOR_VER%%.jis.info
+ @settitle Mew (Messaging in the Emacs World)
+ @c %**end of header
+ 
+@@ -41,14 +41,14 @@
+ @ifset jp
+ @dircategory Message User Agent
+ @direntry
+-* Mew-J: (mew.jis.info).     Messaging in the Emacs World.
++* Mew-J: (mew%%MEW_MAJOR_VER%%.jis.info).     Messaging in the Emacs World.
+ @end direntry
+ @end ifset
+ 
+ @ifset us
+ @dircategory Message User Agent
+ @direntry
+-* Mew: (mew.info).           Messaging in the Emacs World.
++* Mew: (mew%%MEW_MAJOR_VER%%.info).           Messaging in the Emacs World.
+ @end direntry
+ @end ifset
+ 
diff --git a/mail/mew2/files/patch-ae b/mail/mew2/files/patch-ae
new file mode 100644
index 000000000000..d1647a30fb9c
--- /dev/null
+++ b/mail/mew2/files/patch-ae
@@ -0,0 +1,11 @@
+--- mew-key.el~	Wed Jul 18 08:19:11 2001
++++ mew-key.el	Fri Aug  3 11:30:10 2001
+@@ -507,7 +507,7 @@
+ ;;;
+ 
+ (defvar mew-icon-directory (if (fboundp 'locate-data-directory)
+-			       (locate-data-directory "mew") nil))
++			       (locate-data-directory "mew%%MEW_MAJOR_VER%%") nil))
+ 
+ (defvar mew-icon-separate nil)
+ (defvar mew-icon-blank nil)
diff --git a/mail/mew2/files/pkg-descr.tmpl b/mail/mew2/files/pkg-descr.tmpl
index 72644327fddb..60fa7d3f4f6e 100644
--- a/mail/mew2/files/pkg-descr.tmpl
+++ b/mail/mew2/files/pkg-descr.tmpl
@@ -1,7 +1,6 @@
 Mew is a "Message interface to Emacs Window" to integrate
 
    - Email
-   - NetNews
    - MIME(Multipurpose Internet Mail Extensions)
    - PGP(Pretty Good Privacy)
 
@@ -9,12 +8,12 @@ and to make it easy to view and compose them. With Mew you can send a
 picture of a birthday cake with the song "Happy Birthday to you" to your
 friend, which is encrypted by strong cryptograph.
 
-This port is the Mew for %%EMACS_CMD%%(%%EMACS_PORTSDIR%%). 
-The Mew port and corresponding Emacs port are listed bellow and elisp
+This port is the Mew%%MEW_MAJOR_VER%%(Mew with version %%MEW_MAJOR_VER%%) for %%EMACS_CMD%%(%%EMACS_PORTSDIR%%). 
+The Mew%%MEW_MAJOR_VER%% port and corresponding Emacs port are listed bellow and elisp
 `site-lisp' directory(elisp load path), info path and etc directory(only
 effective for xemacs ports) are shown as well. 
 
-mail/%%PORTNAME%%-%%EMACS_PORT_NAME%%(%%PKGNAME%%) ===> %%EMACS_PORTSDIR%%(%%EMACS_CMD%%) 
+mail/%%PORTNAME%%%%MEW_MAJOR_VER%%-%%EMACS_PORT_NAME%%(%%PKGNAME%%) ===> %%EMACS_PORTSDIR%%(%%EMACS_CMD%%) 
 	Lisp directory : %%ELISPDIR%%
 	Info directory : %%INFODIR%%
 	ETC directory  : %%ETCDIR%%
diff --git a/mail/mew2/files/tmpl2file.sh b/mail/mew2/files/tmpl2file.sh
index ca169ce248c2..d8e1a662ca53 100644
--- a/mail/mew2/files/tmpl2file.sh
+++ b/mail/mew2/files/tmpl2file.sh
@@ -6,6 +6,7 @@ for f in ${TMPL_FILES}; do
 		-e "s,%%EMACS_PORTSDIR%%,${EMACS_PORTSDIR},g" \
 		-e "s,%%PKGNAME%%,${PKGNAME},g" \
 		-e "s,%%EMACS_PORT_NAME%%,${EMACS_PORT_NAME},g" \
+		-e "s,%%MEW_MAJOR_VER%%,${MEW_MAJOR_VER},g" \
 		-e "s,%%PORTNAME%%,${PORTNAME},g" \
 		-e "s,%%ELISPDIR%%,${ELISPDIR},g" \
 		-e "s,%%INFODIR%%,${INFODIR},g" \