15 files changed, 86 insertions, 825 deletions

diff --git a/mail/mew/files/Addrbook b/mail/mew/files/Addrbook
deleted file mode 100644
index 45ad31e9223c..000000000000
--- a/mail/mew/files/Addrbook
+++ /dev/null
@@ -1,25 +0,0 @@
-; See comments at end of this file
-; This file is almost empty as MH now supports personal aliases.
-
-;everyone: *
-
-; Blank lines and lines beginning with a ; are ignored.
-; < file	-> read more aliases from "file"
-; foo: fum      -> simple replacement
-; foo: fum, fie -> list replacement
-; foo: < file   -> list replacement from "file"
-; foo: = group  -> list replacement from UNIX group
-; foo: + group  -> list replacement by ALL users in /etc/passwd
-;		      with gid == group
-; foo: *        -> list replacement by ALL users in /etc/passwd
-;                     with uid >= 200
-; foo*: fum     -> matches foo<string> (including the empty string)
-;
-; using a ';' instead of a ':' indicates that the alias should be displayed
-; along with the addresses used (normally, the addresses replace the alias
-; completely)
-ML-FreeBSD: FreeBSD-users-jp@jp.freebsd.org
-ML-fvwm:    fvwm-users-jp@skylark.ics.es.osaka-u.ac.jp
-ML-SKK:     skk@sato.kuis.kyoto-u.ac.jp
-ML-infotalk:infotalk-request@square.brl.ntt.jp
-ML-skkfep:  skkfep@chanchan.suri.co.jp
diff --git a/mail/mew/files/dot.emacs.el.in b/mail/mew/files/dot.emacs.el.in
deleted file mode 100644
index 8cfe348595fa..000000000000
--- a/mail/mew/files/dot.emacs.el.in
+++ /dev/null
@@ -1,95 +0,0 @@
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Mew ;;;;;;;;;
-;;;       Mew (Ver.%%version%%)                                             ;;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;;
-;;; Site configuration
-;;;
-%%REQUIRE%%
-(autoload 'mew "mew" nil t)
-(autoload 'mew-send "mew" nil t)
-(setq mew-mail-domain-list '("%%nameserver%%"))
-(setq mew-icon-directory "%%emacsdir%%/etc/mew")
-;;;
-;;; Window tips
-;;;
-;; If you use XEmacs and your video chip provides only limited
-;; color map(e.g. 256), put the following line to avoid exhaustion
-;; of colors.
-;(setq mew-demo-picture nil)
-(cond
- ((string-match "XEmacs" emacs-version)
-;  (setq url-be-asynchronous t)
-;  (setq-default buffer-file-coding-system 'iso-2022-jp)
-;  (setq keyboard-coding-system    'iso-2022-jp)
-;  (setq terminal-coding-system    'iso-2022-jp)
-  (add-menu-item '("Apps") "Read Mail (Mew)" 'mew t "Read Mail (VM)...")
-  (add-menu-item '("Apps") "Send Mail (Mew)" 'mew-send t "Read Mail (VM)...")
-;  (delete-menu-item '("Apps" "Read Mail (VM)..."))
-;  (delete-menu-item '("Apps" "Read Mail (MH)..."))
-;  (delete-menu-item '("Apps" "Send mail..."))
-  (setq toolbar-mail-reader 'Mew)
-  (setq toolbar-mail-commands-alist
-	(cons '(Mew . mew) toolbar-mail-commands-alist))
-  )
- ((string< "20" emacs-version)
-;  (setq standard-fontset-spec14
-;	"-*-fixed-medium-r-normal-*-14-*-*-*-*-*-fontset-standard")
-;  (create-fontset-from-fontset-spec standard-fontset-spec14 nil 'noerror)
-;  (set-default-font standard-fontset-spec14)
-  (setup-japanese-environment)
-  )
- (t ;; Mule 2.3 or Emacs 19
-  )
- )
-;;;
-;;; Citation tip
-;;;
-(setq mew-cite-fields '("From:" "Subject:" "Date:" "Message-ID:"))
-(setq mew-cite-format "From: %s\nSubject: %s\nDate: %s\nMessage-ID: %s\n\n")
-(setq mew-cite-prefix-function 'mew-cite-prefix-username)
-;(setq mew-cite-fields '("Message-ID:" "From:"))
-;(setq mew-cite-format "Message-ID: %s の記事にて\n%s さんは書かれました :\n\n")
-;; Change citation according to the message body language.
-;(setq mew-cite-fields '("Message-ID:" "From:"))
-;(defadvice mew-draft-cite (before my-add activate)
-;  (save-excursion
-;    (set-buffer (or mew-message-citation-buffer (mew-buffer-message)))
-;    (if (string= (mew-charset-guess-region (point-min) (point-max))
-;                 "us-ascii" )
-;        ;; us-ascii
-;        (setq mew-cite-format "In Message-ID: %s\n%s wrote  :\n\n")
-;      ;; others
-;      (setq mew-cite-format "Message-ID: %s の記事にて\n%s さんは書かれました :\n\n") )))
-;;;
-;;; Signature tip
-;;;
-;; Change signature according to the message body language.
-;(setq mew-signature-file "~/.signature")
-;(make-local-variable 'mew-signature-file)
-;(defadvice mew-draft-insert-signature (before my-add activate)
-;  ;; 本文が英語なら mew-signature-file に ~/.signature.eng を代入する。
-;  ;; 本文が英語以外なら mew-signature-file に ~/.signature を代入する。
-;  ;; ~/.signature.eng に英語用の署名を書いておくこと。
-;  (save-match-data
-;    (let ((eng (string-match "\\.eng$" mew-signature-file)))
-;      (if (string= (mew-charset-guess-region (point-min) (point-max))
-;                   "us-ascii" )
-;          (if (not eng)
-;              (setq mew-signature-file (concat mew-signature-file ".eng")) )
-;        (if eng
-;            (setq mew-signature-file (substring mew-signature-file 0 -4)) )))))
-;
-(setq mew-signature-insert-last t)
-(add-hook 'mew-send-hook 'mew-draft-insert-signature)
-;;;
-;;; Thread tip
-;;;
-;; Now threading is insufficient,but partially makes enough by comment out following line.
-;(setq mew-prog-imls-arg-list '("--thread=yes" "--indent=2"))
-;;;
-;;; Miscellaneous
-;;;
-(setq mew-underline-lines-use t)
-(setq mew-use-highlight-body t)
-;; If you use Wnn4/6,sj3 or Canna, comment out following line.
-;(setq mew-use-overlay-keymap nil)
diff --git a/mail/mew/files/message.sh b/mail/mew/files/message.sh
deleted file mode 100644
index a709991a5b4f..000000000000
--- a/mail/mew/files/message.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
- 
-if [ -z "${EMACS_SETUPEL}" ]; then
-    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"))        *
-*                                                                       *
-*************************************************************************
-EOF
-else
-    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"))        *
-*                                                                       *
-*************************************************************************
-EOF
-fi    
diff --git a/mail/mew/files/mew-setup.el.in b/mail/mew/files/mew-setup.el.in
deleted file mode 100644
index e408ef6eb6e7..000000000000
--- a/mail/mew/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/mew/files/mew-xemacs-setup.el.in b/mail/mew/files/mew-xemacs-setup.el.in
deleted file mode 100644
index feb0d538d7d5..000000000000
--- a/mail/mew/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/mew/files/patch-Makefile.in b/mail/mew/files/patch-Makefile.in
new file mode 100644
index 000000000000..ccd237fe7b97
--- /dev/null
+++ b/mail/mew/files/patch-Makefile.in
@@ -0,0 +1,32 @@
+--- 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-aa b/mail/mew/files/patch-aa
deleted file mode 100644
index 07d51807b839..000000000000
--- a/mail/mew/files/patch-aa
+++ /dev/null
@@ -1,172 +0,0 @@
---- Makefile.orig	Wed Oct 20 20:20:51 1999
-+++ Makefile	Tue Jul 10 23:35:24 2001
-@@ -19,8 +19,8 @@
- ## EDIT THE FOLLOWINGS
- ##
- 
--PREFIX = /usr/local
--INFODIR = $(PREFIX)/info
-+PREFIX?= /usr/local
-+INFODIR= $(PREFIX)/info
- 
- ##
- ## Compile engines
-@@ -30,10 +30,10 @@
- CFLAGS = -O
- 
- #EMACS = emacs
--EMACS = xemacs
-+EMACS=	${EMACS_CMD}
- #EMACS = mule
- 
--PERL=`which perl`
-+PERL?=`which perl`
- #PERL=/usr/local/bin/perl
- 
- ##
-@@ -46,7 +46,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
- 
-@@ -54,7 +54,10 @@
- ## A directory where etc file will be installed.
- ##
- 
--ETCDIR = $(PREFIX)/lib/$(EMACS)/etc/Mew
-+ETCDIR=	${PREFIX}/${EMACS_LIBDIR}/etc/mew
-+
-+# For XEmacs packages
-+XPKGDIR=	${PREFIX}/${EMACS_PACKAGESDIR}
- 
- ################################################################
- ##
-@@ -72,6 +75,8 @@
- 	mew-virtual.elc  mew-highlight.elc mew-vars.elc  \
- 	mew-addrbook.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 \
- 	mew.el
- 
-+SRCS_PKG=	auto-autoloads.el custom-load.el
-+
- TEMPFILE = temp.el
- 
- CP = cp
-@@ -96,14 +103,14 @@
- BIN = bin
- 
- all: $(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 @@
- 	@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)"
- 
- clean:
-@@ -126,19 +133,69 @@
- 	cd info; $(MAKE) info EMACS=$(EMACS)
- 
- install-info:
--	cd info; $(MAKE) install-info INFODIR=$(INFODIR)
-+	${MKDIR} ${INFODIR}
-+	cd info; $(MAKE) install-info INFODIR=$(INFODIR) \
-+		XEMACS_VER_OVER20="${XEMACS_VER_OVER20}"
- 
- jinfo::
- 	cd info; $(MAKE) jinfo EMACS=$(EMACS)
- 
- install-jinfo:
--	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)/
-+
-+package: ${OBJS} ${OBJS_PKG}
-+
-+${OBJS_PKG}: ${SRCS_PKG}
-+	${EMACS} -vanilla -batch -eval "(push \"./\" load-path)" -l bytecomp \
-+		-f batch-byte-compile ${.ALLSRC}
-+
-+auto-autoloads.el : ${OBJS} _pkg.el
-+	${EMACS} -vanilla -batch \
-+		-eval "(setq autoload-package-name \"${XEMACS_PKGNAME}\")" \
-+		-l autoload -f batch-update-directory .
-+	${RM} -f auto-autoloads.el~
-+
-+custom-load.el : ${OBJS}
-+	${EMACS} -vanilla -batch -l cus-dep -f Custom-make-dependencies .
-+	if [ ! -f ${.TARGET} ]; then \
-+		touch ${.TARGET}; \
-+	fi
-+
-+_pkg.el:
-+	@echo Creating _pkg.el
-+	@echo ";;;###autoload" 				>  _pkg.el
-+	@echo "(package-provide '${XEMACS_PKGNAME}" 	>> _pkg.el
-+	@echo "		 :version $(XEMACS_PKGVER)"	>> _pkg.el
-+	@echo "		 :type 'regular)" 		>> _pkg.el
-+
-+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" \
-+						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
-+
-+install-mule-package: install-package
-+	${MAKE} INFODIR=${XPKGDIR}/info XEMACS_VER_OVER20="yes" \
-+						install-jinfo
- 
- ##
- ## End of Makefile
diff --git a/mail/mew/files/patch-ab b/mail/mew/files/patch-ab
deleted file mode 100644
index 2dac86223770..000000000000
--- a/mail/mew/files/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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)
- 	$(RM) $(ALT)
- 	for f in $(ALT); do \
--	  ln $(PRG) $${f}; done
-+	  ln -sf $(PRG) $${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)
- 	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)
- 
- clean:
- 	$(RM) $(OBJS) $(PRG) $(ALT) $(OTH)
diff --git a/mail/mew/files/patch-ac b/mail/mew/files/patch-ac
deleted file mode 100644
index 3efb03c40dd8..000000000000
--- a/mail/mew/files/patch-ac
+++ /dev/null
@@ -1,52 +0,0 @@
---- info/Makefile~	Wed Oct 27 08:55:12 1999
-+++ info/Makefile	Tue Jul 10 01:25:05 2001
-@@ -33,6 +33,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
-+MANUALS= 00readme mew.texi
- 
- info::
- 	sed -e 's/@setfilename mew.jis.info/@setfilename mew.info/' \
-@@ -57,22 +58,32 @@
- 		$(MKDIR) $(INFODIR); \
- 	fi; \
- 	cp $(INFO) $(INFODIR)
--	-@if [ -x "$(INSTALLINFO)" ]; then \
--		$(INSTALLINFO) mew.info $(INFODIR)/dir; \
--	else \
--		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; \
-+		else \
-+			echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
-+		fi; \
- 	fi
- 
- install-jinfo:
- 	-@if [ ! -d $(INFODIR) ]; then \
- 		$(MKDIR) $(INFODIR); \
- 	fi; \
--	cp $(JINFO) $(INFODIR)
--	-@if [ -x "$(INSTALLINFO)" ]; then \
--		$(INSTALLINFO) mew.jis.info $(INFODIR)/dir; \
--	else \
--		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; \
-+		else \
-+			echo "Don't forget to edit $(INFODIR)/dir for Mew."; \
-+		fi; \
- 	fi
-+
-+install-man:
-+	${MKDIR} ${MANDIR}
-+	${BSD_INSTALL_DATA} ${MANUALS} ${MANDIR}
-+
- ##
- ## End of Makefile
- ##
diff --git a/mail/mew/files/patch-ad b/mail/mew/files/patch-ad
deleted file mode 100644
index 4a2dedb620c4..000000000000
--- a/mail/mew/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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)))
diff --git a/mail/mew/files/patch-bin_Makefile.in b/mail/mew/files/patch-bin_Makefile.in
new file mode 100644
index 000000000000..d096de781295
--- /dev/null
+++ b/mail/mew/files/patch-bin_Makefile.in
@@ -0,0 +1,37 @@
+--- 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 @@
+ LIBS = @LIBS@
+ 
+ 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); \
+ 	fi
+-	$(INSTALL) -m 555 $(PRG1) $(bindir)
++	${INSTALL_PROGRAM} $(PRG1) $(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); \
+ 	fi
+-	$(INSTALL) -m 444 $(MAN1) $(mandir)
++	${INSTALL_DATA} $(MAN1) $(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)
+ 
+ ##
+ ## End of Makefile
diff --git a/mail/mew/files/patch-info_Makefile b/mail/mew/files/patch-info_Makefile
new file mode 100644
index 000000000000..1d4cf7c11eff
--- /dev/null
+++ b/mail/mew/files/patch-info_Makefile
@@ -0,0 +1,17 @@
+--- info/Makefile.orig	Mon Dec 27 13:00:04 2004
++++ info/Makefile	Tue Jan 31 23:32:37 2006
+@@ -15,12 +15,10 @@
+ ## EDIT THE FOLLOWINGS
+ ##
+ 
+-prefix=/usr/local
++prefix=${PREFIX}
+ infodir=$(prefix)/info
+ 
+-EMACS=emacs
+-#EMACS = xemacs
+-#EMACS = mule
++EMACS=${EMACS_CMD}
+ 
+ INSTALLINFO = `which install-info`
+ #INSTALLINFO = /usr/local/bin/install-info
diff --git a/mail/mew/files/pkg-descr.tmpl b/mail/mew/files/pkg-descr.tmpl
deleted file mode 100644
index 72644327fddb..000000000000
--- a/mail/mew/files/pkg-descr.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-Mew is a "Message interface to Emacs Window" to integrate
-
-   - Email
-   - NetNews
-   - MIME(Multipurpose Internet Mail Extensions)
-   - PGP(Pretty Good Privacy)
-
-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
-`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%%) 
-	Lisp directory : %%ELISPDIR%%
-	Info directory : %%INFODIR%%
-	ETC directory  : %%ETCDIR%%
diff --git a/mail/mew/files/tmpl2file.sh b/mail/mew/files/tmpl2file.sh
deleted file mode 100644
index ca169ce248c2..000000000000
--- a/mail/mew/files/tmpl2file.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-for f in ${TMPL_FILES}; do
-	sed \
-		-e "s,%%EMACS_CMD%%,${EMACS_CMD},g" \
-		-e "s,%%EMACS_PORTSDIR%%,${EMACS_PORTSDIR},g" \
-		-e "s,%%PKGNAME%%,${PKGNAME},g" \
-		-e "s,%%EMACS_PORT_NAME%%,${EMACS_PORT_NAME},g" \
-		-e "s,%%PORTNAME%%,${PORTNAME},g" \
-		-e "s,%%ELISPDIR%%,${ELISPDIR},g" \
-		-e "s,%%INFODIR%%,${INFODIR},g" \
-		-e "s,%%ETCDIR%%,${ETCDIR},g" \
-		< ${FILESDIR}/${f}.tmpl > ${WRKTMPDIR}/${f}
-done
diff --git a/mail/mew/files/user-install.in b/mail/mew/files/user-install.in
deleted file mode 100644
index ee1a7ad4d9f4..000000000000
--- a/mail/mew/files/user-install.in
+++ /dev/null
@@ -1,374 +0,0 @@
-#!/bin/sh
-
-PREFIX=%%PREFIX%%
-EMACSDIR=%%EMACSDIR%%
-ELISPDIR=%%ELISPDIR%%
-SAMPLEDIR=%%SAMPLEDIR%%
-
-AWK=%%AWK%%
-CAT=%%CAT%%
-CP=%%CP%%
-ECHO=%%ECHO%%
-MKDIR="%%MKDIR%%"
-RM=%%RM%%
-SED=%%SED%%
-TOUCH=%%TOUCH%%
-DIALOG=/usr/bin/dialog
-
-select()
-{
-	local Language key
-	Language="\
-Choose a language when you write mails.\n\
-    (Now is \"${language}\" selected.)"
-	${DIALOG} --title "Choose the Language" \
-	--hline "Select Items and Quit when finished" \
-	--menu "${Language}" -1 -1 2 \
-	English		"English" \
-	Japanese	"japanese" \
-		2>	/tmp/menu.$$
-	retval=$?
-	key=`${CAT} /tmp/menu.$$|${SED} -e 's/\"//g'`
-	${RM} -f /tmp/menu.$$
-	case $retval in
-		0) if [ -z ${key} ]; then return; fi ;;
-		1) return ;;
-		255) return ;;
-	esac
-	language=${key}
-#	echo citation:key=${key},dot_emacs=${dot_emacs}>>/tmp/temp
-}
-
-input_data()
-# argument No.1 ($1) : Key words (string)
-# argument No.2 ($2) : Variable for the Key words (string)
-# argument No.3 ($3) : unit for the variable (string)
-{
-	local key
-#	echo '$1='$1
-#	echo '$2='$2
-#	echo '$3='$3
-#	exit 1
-#	echo '${nameserver}='${mail_address}
-#	eval echo '${'$2'}'
-	eval key='${'$2'}'
-#	echo key=${key}
-#	exit 1
-	if [ ! -z ${key} ]; then
-		${DIALOG} --title "Confirm $1" \
-		--hline "Press Yes/No" \
-		--yesno "$1 $3 has set \"${key}\". Is this OK?" -1 -1
-		retval=$?
-		if [ X"${retval}" = "X0" -o X"${retval}" = "X255" ]; then  return; fi
-	fi
-	${DIALOG} --title "Set $1 $3" \
-	--hline "Write $1 $3" \
-	--inputbox "Specify $1 $3" -1 -1 \
-		2>  /tmp/input.$$
-	eval $2=`${CAT} /tmp/input.$$`
-	${RM} -f /tmp/input.$$
-}
-
-options()
-{
-	local Options keys del_keys
-	Options="\
-Please select Mew functions that you want to. To select a function, \n\
-use the arrow keys to move to it and press [SPACE]. To de-select it, \n\
-press [SPACE] again.  Select OK or Cancel to leave this menu."
-	del_keys="Highlight Citation Cite_Change Sign_Change"
-	${DIALOG} --title "Select Mew functions" \
-	--hline "" \
-	--checklist "${Options}" -1 -1 4 \
-	Highlight	"highlight body for Mew(Japanese)" ${options_Highlight} \
-	Citation	"Citation with the mail." ${options_Citation} \
-	Cite_Change	"Change citation English <--> Japanese." ${options_Cite_Change} \
-	Sign_Change	"Change signature English <--> Japanese." ${options_Sign_Change} \
-		2> /tmp/checklist.$$
-	retval=$?
-	keys=`${CAT} /tmp/checklist.$$|${SED} -e 's/\"//g'`
-	${RM} -f /tmp/checklist.$$
-	case $retval in
-		1)   return ;;
-		255) return ;;
-	esac
-	dot_emacs=""
-#	echo keys=$keys
-	for k in ${keys}; do
-		del_keys=`${ECHO} ${del_keys}|${SED} -e "s/ *${k}//g"`
-#		echo del_keys=${del_keys}
-#		echo k=$k
-		case ${k} in
-		Highlight)
-			dot_emacs="${dot_emacs} dot.emacs-highlight-body.el"
-			options_Highlight=ON
-			;;
-		Citation)
-			citation
-#			echo options:key=${k},dot_emacs=${dot_emacs}>>/tmp/temp
-			options_Citation=ON
-			;;
-		Cite_Change)
-			dot_emacs="${dot_emacs} dot.emacs-cite-change.el"
-			options_Cite_Change=ON
-			;;
-		Sign_Change)
-			dot_emacs="${dot_emacs} dot.emacs-signature-change.el"
-			options_Sign_Change=ON
-			;;
-		esac
-	done
-#	exit 1
-	for k in ${del_keys}; do
-#		echo k=$k
-		case ${k} in
-		Highlight)
-			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-highlight-body\.el//"`
-			options_Highlight=OFF
-			;;
-		Citation)
-			options_Citation=OFF
-			;;
-		Cite_Change)
-			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-cite-change\.el//"`
-			options_Cite_Change=OFF
-			;;
-		Sign_Change)
-			dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-signature-change\.el//"`
-			options_Sign_Change=OFF
-			;;
-		esac
-	done
-#	echo dot_emacs=${dot_emacs}
-#	echo del_keys=${del_keys}
-#	exit 1
-}
-
-citation()
-{
-	dot_emacs=`${ECHO} ${dot_emacs}|${SED} -e "s/ *dot\.emacs-cite.[a-z]*//g"`
-	case ${language} in
-	English)
-		dot_emacs="${dot_emacs} dot.emacs-cite.el"
-		;;
-	Japanese)
-		dot_emacs="${dot_emacs} dot.emacs-cite.ja.el"
-		;;
-	esac
-#	echo citation:key=${key},dot_emacs=${dot_emacs}>>/tmp/temp
-}
-
-case ${TERM} in
-emacs)
-	${ECHO} "Here is \"Emacs\" shell. Try on other terminal."
-	exit 1
-	;;
-esac
-
-version="%%VERSION%%"
-#version="1.92"
-
-SEDCMD='${SED}
-	-e "s,%%prefix%%,${PREFIX},g"
-	-e "s,%%emacsdir%%,${EMACSDIR},g"
-	-e "s,%%elispdir%%,${ELISPDIR},g"
-	-e "s,%%version%%,${version},g"
-	-e "s,%%nameserver%%,${nameserver},g"
-	-e "s,%%mail_address%%,${mail_address},g"
-	-e "s,%%domain_name%%,${domain_name},g"
-	-e "s,%%default_domain_name%%,${default_domain_name},g"
-	-e "s,%%signature%%,${signature},g"'
-
-###
-# Check ~/.backup directory exist.
-#
-${MKDIR} ${HOME}/.backup
-
-###
-# Backup all files.
-#
-${CP} ${HOME}/${dot_emacs_file} ${HOME}/.backup/${dot_emacs_file}.$$
-${CP} ${HOME}/.im/Config ${HOME}/.backup/Config.$$
-
-###
-# Check ~/.im/Config file exist.
-#
-if [ ! -f ${HOME}/.im/Config ]; then
-	${ECHO} "${HOME}/.im/Config: Not found. Do imsetup first."
-	exit 1
-else
-	mail_address=`${AWK} '/^Address=/{sub(/^Address=/,"");print}' ${HOME}/.im/Config`
-	domain_name=`${AWK} '/^FromDomain=/{sub(/^FromDomain=/,"");print}' ${HOME}/.im/Config`
-	default_domain_name=`${AWK} '/^ToDomain=/{sub(/^ToDomain=/,"");print}' ${HOME}/.im/Config`
-	if [ X"${mail_address}" = "X%%mail_address%%" ]; then
-		mail_address=""
-	else
-		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
-		${SED} -e 's/^\(Address=\).*$/\1%%mail_address%%/' \
-			< ${HOME}/.backup/Config > ${HOME}/.im/Config
-	fi
-	if [ X"${domain_name}" = "X%%domain_name%%" ]; then
-		domain_name=""
-	else
-		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
-		${SED} -e 's/^\(FromDomain=\).*$/\1%%domain_name%%/' \
-			< ${HOME}/.backup/Config > ${HOME}/.im/Config
-	fi
-	if [ X"${default_domain_name}" = "X%%default_domain_name%%" ]; then
-		default_domain_name=""
-	else
-		${CP} ${HOME}/.im/Config ${HOME}/.backup/Config
-		${SED} -e 's/^\(ToDomain=\).*$/\1%%default_domain_name%%/' \
-			< ${HOME}/.backup/Config > ${HOME}/.im/Config
-	fi
-fi
-
-###
-# Copy "aliases" if none
-#
-if [ ! -f ${HOME}/.im/Aliases ]; then	
-	${CP} ${SAMPLEDIR}/Aliases ${HOME}/.im
-fi
-
-###
-# Set user environment : nameserver, signature
-#
-options_Highlight=OFF
-options_Citation=OFF
-options_Cite_Change=OFF
-options_Sign_Change=OFF
-language=English
-dot_emacs_file=.emacs
-
-PreSet="\
-This is the main menu of the Mew configuration pre-settings. Please \n\
-select one of the options below by using the arrow keys or typing the \n\
-first character of the option name you intend to set. Invoke an option \n\
-by pressing [ENTER] or [TAB-ENTER] to exit the settings."
-
-answer=None
-while [ ! X"${answer}" = "XQuit" ]; do
-	${DIALOG} --title "Pre-set Mew configurations" \
-	--hline "To select an item press [Enter] on the item" \
-	--menu "${PreSet}" -1 -1 3 \
-	Language	"Determine language in use on Mew" \
-	DotEmacs	"Choose dot.emacs files being to use" \
-	Quit		"Quit this menu" \
-		2>	/tmp/menu.$$
-	retval=$?
-	answer=`${CAT} /tmp/menu.$$|${SED} -e 's/\"//g'`
-	${RM} -f /tmp/menu.$$
-	case $retval in
-		0) if [ -z ${answer} ]; then ${ECHO} "Nothing selected"; contiue; fi ;;
-		1) break ;;
-		255) break ;;
-	esac
-	case ${answer} in
-		Language)
-			select
-			;;
-		DotEmacs)
-			input_data "Emacs dot.emacs file name" "dot_emacs_file" ""
-			;;
-		Quit)
-			answer=Quit
-			;;
-	esac
-done
-
-#echo language=${language}
-#echo dot_emacs_file=${dot_emacs_file}
-#exit 1
-
-MainMenu="\
-This is the main menu of the Mew configuration settings. Please select \n\
-one of the options below by using the arrow keys or typing the first \n\
-character of the option name you intend to set. Invoke an option by \n\
-pressing [ENTER] or [TAB-ENTER] to exit the settings."
-
-answer=None
-while [ ! X"${answer}" = "XQuit" ]; do
-	${DIALOG} --title "Set Mew configurations" \
-	--hline "Select Items and Quit when finished" \
-	--menu "${MainMenu}" -1 -1 6 \
-	NameServer	"Name server Domain name" \
-	MailAddress	"Your mail address (with FQDN)" \
-	DomainName	"Your domain name" \
-	DefaultDomain	"Default domain name in abbrivation" \
-	Options		"Various options on using Mew" \
-	Quit		"Quit this menu" \
-		2>	/tmp/menu.$$
-	retval=$?
-	answer=`${CAT} /tmp/menu.$$`
-	${RM} -f /tmp/menu.$$
-	case $retval in
-		0)	if [ -z ${answer} ]; then
-				${ECHO} "Nothing selected"
-				exit 1
-			fi
-			;;
-		1)	${ECHO} "Cancel pressed."
-			exit 1
-			;;
-		255)	${ECHO} "ESC pressed."
-			exit 1
-			;;
-	esac
-	case ${answer} in
-		NameServer)
-			input_data "Name Server" "nameserver" ""
-			;;
-		MailAddress)
-			input_data "Mail Address" "mail_address" ""
-			;;
-		DomainName)
-			input_data "Domain Name" "domain_name" ""
-			;;
-		DefaultDomain)
-			input_data "Default Domain Name" "default_domain_name" ""
-			;;
-		Options)
-#			options
-			;;
-		Quit)
-			answer=Quit
-			;;
-	esac
-done
-
-#echo 'nameserver='${nameserver}
-#echo 'mail_address='${mail_address}
-#echo 'domain_name='${domain_name}
-#echo 'defaut_domain_name='${default_domain_name}
-
-#exit 1
-
-###
-# Custumize startup files with selected options.
-#
-dot_emacs="dot.emacs.el ${dot_emacs}"
-eval ${SEDCMD} < ${HOME}/.im/Config > ${HOME}/.backup/Config
-
-###
-# Add Mew startup setting to ~/.emacs
-#
-if [ -f ${dot_emacs_file} ]; then
-    ${SED} -e '/^;;;* Mew ;*$/,/^;;; *Mew end$/d' < ${HOME}/${dot_emacs_file} \
-	> ${HOME}/.backup/${dot_emacs_file}
-else
-    ${ECHO} "Create new \"dot.emacs\" file: ${dot_emacs_file}"
-fi
-
-#echo 'dot_emacs='${dot_emacs}
-for f in ${dot_emacs}; do
-	${CAT} ${SAMPLEDIR}/dot.emacs/${f} |\
-		eval ${SEDCMD} >> ${HOME}/.backup/${dot_emacs_file}
-done
-${ECHO} ";;;                                                       Mew end" \
-	>> ${HOME}/.backup/${dot_emacs_file}
-${CP} ${HOME}/.backup/${dot_emacs_file} ${HOME}/${dot_emacs_file}
-
-###
-# Copy im Config file  to ~/.im
-#
-${CP} ${HOME}/.backup/Config ${HOME}/.im/Config