* Make mew and mew3 build with xemacs by noting they need the "base"

  set of emacs modules.

* List the info files directly in the PLIST.

* Honor PKGINFODIR and PKGMANDIR.

* Sort the PLIST.

4 files changed, 19 insertions, 12 deletions

diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index b8fa0dece6b..82967a6b382 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2006/02/05 23:09:56 joerg Exp $
+# $NetBSD: Makefile,v 1.68 2006/04/05 15:14:10 jlam Exp $
 
 DISTNAME=	mew-4.2
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,11 +12,12 @@ COMMENT=	Messaging in the Emacs World
 
 CONFLICTS=+	mew-xemacs-[0-9]* incm-[0-9]*
 
-INFO_FILES=	mew.info
+INFO_FILES=	# PLIST
 
 HAS_CONFIGURE=	yes
 
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214 xemacs215
+EMACS_MODULES+=			base
 
 MEW_CONTRIB_DIR=${EMACS_LISPPREFIX}/mew/contrib
 
@@ -24,6 +25,8 @@ MAKE_FLAGS+=	prefix=${PREFIX:Q}
 MAKE_FLAGS+=	EMACS=${EMACS_BIN:Q}
 MAKE_FLAGS+=	elispdir=${EMACS_LISPPREFIX}/mew
 MAKE_FLAGS+=	etcdir=${PREFIX}/share/mew
+MAKE_FLAGS+=	infodir=${EMACS_INFOPREFIX}
+MAKE_FLAGS+=	mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1
 
 SUBST_CLASSES+=		local
 SUBST_STAGE.local=	post-configure
diff --git a/mail/mew/PLIST b/mail/mew/PLIST
index c90c02d3302..25c5f1f523e 100644
--- a/mail/mew/PLIST
+++ b/mail/mew/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2005/03/04 15:32:35 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/04/05 15:14:10 jlam Exp $
 bin/incm
 bin/mewcat
 bin/mewdecode
@@ -48,6 +48,7 @@ man/man1/mewcat.1
 man/man1/mewdecode.1
 man/man1/mewencode.1
 man/man1/mewl.1
+${EMACS_INFOPREFIX}/mew.info
 ${EMACS_LISPPREFIX}/mew/contrib/00readme
 ${EMACS_LISPPREFIX}/mew/contrib/mew-browse.el
 ${EMACS_LISPPREFIX}/mew/contrib/mew-caesar.el
diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile
index 6dbe4c0dd71..0329b9293f2 100644
--- a/mail/mew3/Makefile
+++ b/mail/mew3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/02/05 23:09:56 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/04/05 15:14:10 jlam Exp $
 
 DISTNAME=	mew-3.3
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
@@ -12,10 +12,10 @@ COMMENT=	Messaging in the Emacs World
 
 CONFLICTS=+	mew-xemacs-[0-9]* incm-[0-9]*
 
-INFO_FILES=	mew.info
-
+INFO_FILES=	# PLIST
 
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214 xemacs215
+EMACS_MODULES+=			base
 
 MEW_CONTRIB_DIR=${EMACS_LISPPREFIX}/mew/contrib
 
@@ -23,6 +23,8 @@ MAKE_FLAGS+=	prefix=${PREFIX:Q}
 MAKE_FLAGS+=	EMACS=${EMACS_BIN:Q}
 MAKE_FLAGS+=	elispdir=${EMACS_LISPPREFIX}/mew
 MAKE_FLAGS+=	etcdir=${PREFIX}/share/mew
+MAKE_FLAGS+=	infodir=${EMACS_INFOPREFIX}
+MAKE_FLAGS+=	mandir=${PREFIX:Q}/${PKGMANDIR:Q}/man1
 
 SUBST_CLASSES+=		local
 SUBST_STAGE.local=	post-configure
diff --git a/mail/mew3/PLIST b/mail/mew3/PLIST
index 2463aea91ce..c36ec461669 100644
--- a/mail/mew3/PLIST
+++ b/mail/mew3/PLIST
@@ -1,9 +1,14 @@
-@comment $NetBSD: PLIST,v 1.6 2004/11/30 02:44:56 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/04/05 15:14:10 jlam Exp $
 bin/incm
 bin/mewcat
 bin/mewdecode
 bin/mewencode
 bin/mewls
+man/man1/incm.1
+man/man1/mewcat.1
+man/man1/mewdecode.1
+man/man1/mewencode.1
+man/man1/mewls.1
 share/mew/Mew.img
 share/mew/Mew.png
 share/mew/Mew.xbm
@@ -44,11 +49,7 @@ share/mew/mew-sep.xpm
 share/mew/mew-show.xpm
 share/mew/mew-write.xpm
 share/mew/mew-yank.xpm
-man/man1/incm.1
-man/man1/mewcat.1
-man/man1/mewdecode.1
-man/man1/mewencode.1
-man/man1/mewls.1
+${EMACS_INFOPREFIX}/mew.info
 ${EMACS_LISPPREFIX}/mew/contrib/00readme
 ${EMACS_LISPPREFIX}/mew/contrib/00readme-namazu.jis
 ${EMACS_LISPPREFIX}/mew/contrib/mew-browse.el