Use mk/emacs.mk.

2 files changed, 164 insertions, 161 deletions

diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index 0e3a0f3f827..c0ad8e6998a 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2002/05/07 23:27:47 hubertf Exp $
+# $NetBSD: Makefile,v 1.48 2002/09/15 06:24:21 uebayasi Exp $
 
 DISTNAME=	mew-2.2
 CATEGORIES=	mail
@@ -10,19 +10,23 @@ COMMENT=	Messaging in the Emacs World
 
 CONFLICTS=+	mew-xemacs-2.*
 
-DEPENDS+=	emacs>=20.7:../../editors/emacs
+EMACS_VERSION_ACCEPTED=	emacs21 emacs20
 
-MEW_CONTRIB_DIR=	${PREFIX}/share/emacs/site-lisp/mew/contrib
+MEW_CONTRIB_DIR=	${EMACS_LISPPREFIX}/mew/contrib
 MEW_CONTRIB=	00readme 00readme-namazu.jis \
 	mew-browse.el mew-caesar.el mew-fancy-summary.el mew-gnus.el \
 	mew-nmz-fixer.el mew-nmz.el mew-refile-view.el mew-smime-ja.texi \
 	mew-toolbar-frame.el
 
+MAKE_FLAGS+=	EMACS=${EMACS_BIN}
+MAKE_FLAGS+=	elispdir=${EMACS_LISPPREFIX}/mew
+MAKE_FLAGS+=	etcdir=${PREFIX}/share/mew
+
 pre-configure:
-	for f in `find ${WRKSRC}/contrib -type f -print| \
-		xargs ${GREP} -l '#!/usr/local'`; do \
-		${SED} -e 's:/usr/local:'${PREFIX}':g' < $$f > $$f.pdone \
-		&& ${MV} $$f.pdone $$f; \
+	for f in `${FIND} ${WRKSRC}/contrib -type f -print| \
+		${XARGS} ${GREP} -l '#!/usr/local'`; do \
+		${SED} -e 's:/usr/local:'${PREFIX}':g' < $$f > $${f}.pdone \
+		&& ${MV} $${f}.pdone $$f; \
 	done
 
 post-install:
@@ -31,5 +35,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/contrib/$f ${MEW_CONTRIB_DIR}
 .endfor
 
+.include "../../mk/emacs.mk"
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mew/PLIST b/mail/mew/PLIST
index 87b3f51e1c8..49689e328cc 100644
--- a/mail/mew/PLIST
+++ b/mail/mew/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/02/28 02:41:28 jun Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/09/15 06:24:22 uebayasi Exp $
 bin/mewcat
 bin/mewdecode
 bin/mewencode
@@ -9,160 +9,158 @@ info/mew.info-1
 info/mew.info-2
 info/mew.info-3
 @exec ${INSTALL_INFO} --info-dir=%D/info %D/info/mew.info
-lib/emacs/etc/Mew/Mew.img
-lib/emacs/etc/Mew/Mew.png
-lib/emacs/etc/Mew/Mew.xbm
-lib/emacs/etc/Mew/Mew.xpm
-lib/emacs/etc/Mew/etc/COLOR
-lib/emacs/etc/Mew/etc/mew-Plain.xpm
-lib/emacs/etc/Mew/etc/mew-curr.xpm
-lib/emacs/etc/Mew/etc/mew-folder.xpm
-lib/emacs/etc/Mew/etc/mew-inc2.xpm
-lib/emacs/etc/Mew/etc/mew-kill.xpm
-lib/emacs/etc/Mew/mew-Audio.xpm
-lib/emacs/etc/Mew/mew-Blank.xpm
-lib/emacs/etc/Mew/mew-External.xpm
-lib/emacs/etc/Mew/mew-Folder.xpm
-lib/emacs/etc/Mew/mew-Image.xpm
-lib/emacs/etc/Mew/mew-Octet-Stream.xpm
-lib/emacs/etc/Mew/mew-Postscript.xpm
-lib/emacs/etc/Mew/mew-Rfc822.xpm
-lib/emacs/etc/Mew/mew-Text.xpm
-lib/emacs/etc/Mew/mew-Unknown.xpm
-lib/emacs/etc/Mew/mew-Video.xpm
-lib/emacs/etc/Mew/mew-attach.xpm
-lib/emacs/etc/Mew/mew-cite.xpm
-lib/emacs/etc/Mew/mew-comp.xpm
-lib/emacs/etc/Mew/mew-forward.xpm
-lib/emacs/etc/Mew/mew-inc.xpm
-lib/emacs/etc/Mew/mew-next.xpm
-lib/emacs/etc/Mew/mew-pgp-enc.xpm
-lib/emacs/etc/Mew/mew-pgp-sigenc.xpm
-lib/emacs/etc/Mew/mew-pgp-sign.xpm
-lib/emacs/etc/Mew/mew-prev.xpm
-lib/emacs/etc/Mew/mew-queue.xpm
-lib/emacs/etc/Mew/mew-refile.xpm
-lib/emacs/etc/Mew/mew-reply.xpm
-lib/emacs/etc/Mew/mew-send.xpm
-lib/emacs/etc/Mew/mew-sep.xpm
-lib/emacs/etc/Mew/mew-show.xpm
-lib/emacs/etc/Mew/mew-write.xpm
-lib/emacs/etc/Mew/mew-yank.xpm
+share/mew/Mew.img
+share/mew/Mew.png
+share/mew/Mew.xbm
+share/mew/Mew.xpm
+share/mew/etc/COLOR
+share/mew/etc/mew-Plain.xpm
+share/mew/etc/mew-curr.xpm
+share/mew/etc/mew-folder.xpm
+share/mew/etc/mew-inc2.xpm
+share/mew/etc/mew-kill.xpm
+share/mew/mew-Audio.xpm
+share/mew/mew-Blank.xpm
+share/mew/mew-External.xpm
+share/mew/mew-Folder.xpm
+share/mew/mew-Image.xpm
+share/mew/mew-Octet-Stream.xpm
+share/mew/mew-Postscript.xpm
+share/mew/mew-Rfc822.xpm
+share/mew/mew-Text.xpm
+share/mew/mew-Unknown.xpm
+share/mew/mew-Video.xpm
+share/mew/mew-attach.xpm
+share/mew/mew-cite.xpm
+share/mew/mew-comp.xpm
+share/mew/mew-forward.xpm
+share/mew/mew-inc.xpm
+share/mew/mew-next.xpm
+share/mew/mew-pgp-enc.xpm
+share/mew/mew-pgp-sigenc.xpm
+share/mew/mew-pgp-sign.xpm
+share/mew/mew-prev.xpm
+share/mew/mew-queue.xpm
+share/mew/mew-refile.xpm
+share/mew/mew-reply.xpm
+share/mew/mew-send.xpm
+share/mew/mew-sep.xpm
+share/mew/mew-show.xpm
+share/mew/mew-write.xpm
+share/mew/mew-yank.xpm
 man/man1/mewcat.1
 man/man1/mewdecode.1
 man/man1/mewencode.1
 man/man1/mewls.1
-share/emacs/site-lisp/mew/contrib/00readme
-share/emacs/site-lisp/mew/contrib/00readme-namazu.jis
-share/emacs/site-lisp/mew/contrib/mew-browse.el
-share/emacs/site-lisp/mew/contrib/mew-caesar.el
-share/emacs/site-lisp/mew/contrib/mew-fancy-summary.el
-share/emacs/site-lisp/mew/contrib/mew-gnus.el
-share/emacs/site-lisp/mew/contrib/mew-nmz-fixer.el
-share/emacs/site-lisp/mew/contrib/mew-nmz.el
-share/emacs/site-lisp/mew/contrib/mew-refile-view.el
-share/emacs/site-lisp/mew/contrib/mew-smime-ja.texi
-share/emacs/site-lisp/mew/contrib/mew-toolbar-frame.el
-share/emacs/site-lisp/mew/mew-addrbook.el
-share/emacs/site-lisp/mew/mew-addrbook.elc
-share/emacs/site-lisp/mew/mew-attach.el
-share/emacs/site-lisp/mew/mew-attach.elc
-share/emacs/site-lisp/mew/mew-auth.el
-share/emacs/site-lisp/mew/mew-auth.elc
-share/emacs/site-lisp/mew/mew-blvs.el
-share/emacs/site-lisp/mew/mew-blvs.elc
-share/emacs/site-lisp/mew/mew-bq.el
-share/emacs/site-lisp/mew/mew-bq.elc
-share/emacs/site-lisp/mew/mew-cache.el
-share/emacs/site-lisp/mew/mew-cache.elc
-share/emacs/site-lisp/mew/mew-complete.el
-share/emacs/site-lisp/mew/mew-complete.elc
-share/emacs/site-lisp/mew/mew-config.el
-share/emacs/site-lisp/mew/mew-config.elc
-share/emacs/site-lisp/mew/mew-const.el
-share/emacs/site-lisp/mew/mew-const.elc
-share/emacs/site-lisp/mew/mew-decode.el
-share/emacs/site-lisp/mew/mew-decode.elc
-share/emacs/site-lisp/mew/mew-demo.el
-share/emacs/site-lisp/mew/mew-demo.elc
-share/emacs/site-lisp/mew/mew-draft.el
-share/emacs/site-lisp/mew/mew-draft.elc
-share/emacs/site-lisp/mew/mew-edit.el
-share/emacs/site-lisp/mew/mew-edit.elc
-share/emacs/site-lisp/mew/mew-encode.el
-share/emacs/site-lisp/mew/mew-encode.elc
-share/emacs/site-lisp/mew/mew-env.el
-share/emacs/site-lisp/mew/mew-env.elc
-share/emacs/site-lisp/mew/mew-ext.el
-share/emacs/site-lisp/mew/mew-ext.elc
-share/emacs/site-lisp/mew/mew-fib.el
-share/emacs/site-lisp/mew/mew-fib.elc
-share/emacs/site-lisp/mew/mew-func.el
-share/emacs/site-lisp/mew/mew-func.elc
-share/emacs/site-lisp/mew/mew-gemacs.el
-share/emacs/site-lisp/mew/mew-header.el
-share/emacs/site-lisp/mew/mew-header.elc
-share/emacs/site-lisp/mew/mew-highlight.el
-share/emacs/site-lisp/mew/mew-highlight.elc
-share/emacs/site-lisp/mew/mew-key.el
-share/emacs/site-lisp/mew/mew-key.elc
-share/emacs/site-lisp/mew/mew-lang-jp.el
-share/emacs/site-lisp/mew/mew-mark.el
-share/emacs/site-lisp/mew/mew-mark.elc
-share/emacs/site-lisp/mew/mew-md5.el
-share/emacs/site-lisp/mew/mew-md5.elc
-share/emacs/site-lisp/mew/mew-message.el
-share/emacs/site-lisp/mew/mew-message.elc
-share/emacs/site-lisp/mew/mew-mime.el
-share/emacs/site-lisp/mew/mew-mime.elc
-share/emacs/site-lisp/mew/mew-minibuf.el
-share/emacs/site-lisp/mew/mew-minibuf.elc
-share/emacs/site-lisp/mew/mew-mule.el
-share/emacs/site-lisp/mew/mew-mule0.el
-share/emacs/site-lisp/mew/mew-mule3.el
-share/emacs/site-lisp/mew/mew-nntp.el
-share/emacs/site-lisp/mew/mew-nntp.elc
-share/emacs/site-lisp/mew/mew-pgp.el
-share/emacs/site-lisp/mew/mew-pgp.elc
-share/emacs/site-lisp/mew/mew-pick.el
-share/emacs/site-lisp/mew/mew-pick.elc
-share/emacs/site-lisp/mew/mew-pop.el
-share/emacs/site-lisp/mew/mew-pop.elc
-share/emacs/site-lisp/mew/mew-refile.el
-share/emacs/site-lisp/mew/mew-refile.elc
-share/emacs/site-lisp/mew/mew-scan.el
-share/emacs/site-lisp/mew/mew-scan.elc
-share/emacs/site-lisp/mew/mew-smime.el
-share/emacs/site-lisp/mew/mew-smime.elc
-share/emacs/site-lisp/mew/mew-smtp.el
-share/emacs/site-lisp/mew/mew-smtp.elc
-share/emacs/site-lisp/mew/mew-sort.el
-share/emacs/site-lisp/mew/mew-sort.elc
-share/emacs/site-lisp/mew/mew-ssh.el
-share/emacs/site-lisp/mew/mew-ssh.elc
-share/emacs/site-lisp/mew/mew-summary.el
-share/emacs/site-lisp/mew/mew-summary.elc
-share/emacs/site-lisp/mew/mew-syntax.el
-share/emacs/site-lisp/mew/mew-syntax.elc
-share/emacs/site-lisp/mew/mew-temacs.el
-share/emacs/site-lisp/mew/mew-theme.el
-share/emacs/site-lisp/mew/mew-theme.elc
-share/emacs/site-lisp/mew/mew-thread.el
-share/emacs/site-lisp/mew/mew-thread.elc
-share/emacs/site-lisp/mew/mew-unix.el
-share/emacs/site-lisp/mew/mew-vars.el
-share/emacs/site-lisp/mew/mew-vars.elc
-share/emacs/site-lisp/mew/mew-vars2.el
-share/emacs/site-lisp/mew/mew-vars2.elc
-share/emacs/site-lisp/mew/mew-virtual.el
-share/emacs/site-lisp/mew/mew-virtual.elc
-share/emacs/site-lisp/mew/mew-win32.el
-share/emacs/site-lisp/mew/mew-xemacs.el
-share/emacs/site-lisp/mew/mew.el
-share/emacs/site-lisp/mew/mew.elc
-@dirrm share/emacs/site-lisp/mew/contrib
-@dirrm share/emacs/site-lisp/mew
-@dirrm lib/emacs/etc/Mew/etc
-@dirrm lib/emacs/etc/Mew
-@dirrm lib/emacs/etc
-@dirrm lib/emacs
+${EMACS_LISPPREFIX}/mew/contrib/00readme
+${EMACS_LISPPREFIX}/mew/contrib/00readme-namazu.jis
+${EMACS_LISPPREFIX}/mew/contrib/mew-browse.el
+${EMACS_LISPPREFIX}/mew/contrib/mew-caesar.el
+${EMACS_LISPPREFIX}/mew/contrib/mew-fancy-summary.el
+${EMACS_LISPPREFIX}/mew/contrib/mew-gnus.el
+${EMACS_LISPPREFIX}/mew/contrib/mew-nmz-fixer.el
+${EMACS_LISPPREFIX}/mew/contrib/mew-nmz.el
+${EMACS_LISPPREFIX}/mew/contrib/mew-refile-view.el
+${EMACS_LISPPREFIX}/mew/contrib/mew-smime-ja.texi
+${EMACS_LISPPREFIX}/mew/contrib/mew-toolbar-frame.el
+${EMACS_LISPPREFIX}/mew/mew-addrbook.el
+${EMACS_LISPPREFIX}/mew/mew-addrbook.elc
+${EMACS_LISPPREFIX}/mew/mew-attach.el
+${EMACS_LISPPREFIX}/mew/mew-attach.elc
+${EMACS_LISPPREFIX}/mew/mew-auth.el
+${EMACS_LISPPREFIX}/mew/mew-auth.elc
+${EMACS_LISPPREFIX}/mew/mew-blvs.el
+${EMACS_LISPPREFIX}/mew/mew-blvs.elc
+${EMACS_LISPPREFIX}/mew/mew-bq.el
+${EMACS_LISPPREFIX}/mew/mew-bq.elc
+${EMACS_LISPPREFIX}/mew/mew-cache.el
+${EMACS_LISPPREFIX}/mew/mew-cache.elc
+${EMACS_LISPPREFIX}/mew/mew-complete.el
+${EMACS_LISPPREFIX}/mew/mew-complete.elc
+${EMACS_LISPPREFIX}/mew/mew-config.el
+${EMACS_LISPPREFIX}/mew/mew-config.elc
+${EMACS_LISPPREFIX}/mew/mew-const.el
+${EMACS_LISPPREFIX}/mew/mew-const.elc
+${EMACS_LISPPREFIX}/mew/mew-decode.el
+${EMACS_LISPPREFIX}/mew/mew-decode.elc
+${EMACS_LISPPREFIX}/mew/mew-demo.el
+${EMACS_LISPPREFIX}/mew/mew-demo.elc
+${EMACS_LISPPREFIX}/mew/mew-draft.el
+${EMACS_LISPPREFIX}/mew/mew-draft.elc
+${EMACS_LISPPREFIX}/mew/mew-edit.el
+${EMACS_LISPPREFIX}/mew/mew-edit.elc
+${EMACS_LISPPREFIX}/mew/mew-encode.el
+${EMACS_LISPPREFIX}/mew/mew-encode.elc
+${EMACS_LISPPREFIX}/mew/mew-env.el
+${EMACS_LISPPREFIX}/mew/mew-env.elc
+${EMACS_LISPPREFIX}/mew/mew-ext.el
+${EMACS_LISPPREFIX}/mew/mew-ext.elc
+${EMACS_LISPPREFIX}/mew/mew-fib.el
+${EMACS_LISPPREFIX}/mew/mew-fib.elc
+${EMACS_LISPPREFIX}/mew/mew-func.el
+${EMACS_LISPPREFIX}/mew/mew-func.elc
+${EMACS_LISPPREFIX}/mew/mew-gemacs.el
+${EMACS_LISPPREFIX}/mew/mew-header.el
+${EMACS_LISPPREFIX}/mew/mew-header.elc
+${EMACS_LISPPREFIX}/mew/mew-highlight.el
+${EMACS_LISPPREFIX}/mew/mew-highlight.elc
+${EMACS_LISPPREFIX}/mew/mew-key.el
+${EMACS_LISPPREFIX}/mew/mew-key.elc
+${EMACS_LISPPREFIX}/mew/mew-lang-jp.el
+${EMACS_LISPPREFIX}/mew/mew-mark.el
+${EMACS_LISPPREFIX}/mew/mew-mark.elc
+${EMACS_LISPPREFIX}/mew/mew-md5.el
+${EMACS_LISPPREFIX}/mew/mew-md5.elc
+${EMACS_LISPPREFIX}/mew/mew-message.el
+${EMACS_LISPPREFIX}/mew/mew-message.elc
+${EMACS_LISPPREFIX}/mew/mew-mime.el
+${EMACS_LISPPREFIX}/mew/mew-mime.elc
+${EMACS_LISPPREFIX}/mew/mew-minibuf.el
+${EMACS_LISPPREFIX}/mew/mew-minibuf.elc
+${EMACS_LISPPREFIX}/mew/mew-mule.el
+${EMACS_LISPPREFIX}/mew/mew-mule0.el
+${EMACS_LISPPREFIX}/mew/mew-mule3.el
+${EMACS_LISPPREFIX}/mew/mew-nntp.el
+${EMACS_LISPPREFIX}/mew/mew-nntp.elc
+${EMACS_LISPPREFIX}/mew/mew-pgp.el
+${EMACS_LISPPREFIX}/mew/mew-pgp.elc
+${EMACS_LISPPREFIX}/mew/mew-pick.el
+${EMACS_LISPPREFIX}/mew/mew-pick.elc
+${EMACS_LISPPREFIX}/mew/mew-pop.el
+${EMACS_LISPPREFIX}/mew/mew-pop.elc
+${EMACS_LISPPREFIX}/mew/mew-refile.el
+${EMACS_LISPPREFIX}/mew/mew-refile.elc
+${EMACS_LISPPREFIX}/mew/mew-scan.el
+${EMACS_LISPPREFIX}/mew/mew-scan.elc
+${EMACS_LISPPREFIX}/mew/mew-smime.el
+${EMACS_LISPPREFIX}/mew/mew-smime.elc
+${EMACS_LISPPREFIX}/mew/mew-smtp.el
+${EMACS_LISPPREFIX}/mew/mew-smtp.elc
+${EMACS_LISPPREFIX}/mew/mew-sort.el
+${EMACS_LISPPREFIX}/mew/mew-sort.elc
+${EMACS_LISPPREFIX}/mew/mew-ssh.el
+${EMACS_LISPPREFIX}/mew/mew-ssh.elc
+${EMACS_LISPPREFIX}/mew/mew-summary.el
+${EMACS_LISPPREFIX}/mew/mew-summary.elc
+${EMACS_LISPPREFIX}/mew/mew-syntax.el
+${EMACS_LISPPREFIX}/mew/mew-syntax.elc
+${EMACS_LISPPREFIX}/mew/mew-temacs.el
+${EMACS_LISPPREFIX}/mew/mew-theme.el
+${EMACS_LISPPREFIX}/mew/mew-theme.elc
+${EMACS_LISPPREFIX}/mew/mew-thread.el
+${EMACS_LISPPREFIX}/mew/mew-thread.elc
+${EMACS_LISPPREFIX}/mew/mew-unix.el
+${EMACS_LISPPREFIX}/mew/mew-vars.el
+${EMACS_LISPPREFIX}/mew/mew-vars.elc
+${EMACS_LISPPREFIX}/mew/mew-vars2.el
+${EMACS_LISPPREFIX}/mew/mew-vars2.elc
+${EMACS_LISPPREFIX}/mew/mew-virtual.el
+${EMACS_LISPPREFIX}/mew/mew-virtual.elc
+${EMACS_LISPPREFIX}/mew/mew-win32.el
+${EMACS_LISPPREFIX}/mew/mew-xemacs.el
+${EMACS_LISPPREFIX}/mew/mew.el
+${EMACS_LISPPREFIX}/mew/mew.elc
+@dirrm ${EMACS_LISPPREFIX}/mew/contrib
+@dirrm ${EMACS_LISPPREFIX}/mew
+@dirrm share/mew/etc
+@dirrm share/mew