* Install info files into ${EMACS_INFOPREFIX}, which is the correct

  location for both emacs and xemacs.

* List the info files directly in the PLIST.

* Use EMACS_MODULES to deal with a possible xemacs-packages dependency.

4 files changed, 30 insertions, 36 deletions

diff --git a/chat/navi2ch/Makefile b/chat/navi2ch/Makefile
index 60f8cc7f985..9c02e457423 100644
--- a/chat/navi2ch/Makefile
+++ b/chat/navi2ch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2006/02/05 23:08:25 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2006/03/30 03:31:13 jlam Exp $
 
 DISTNAME=	navi2ch-1.7.5
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=navi2ch/}
 
@@ -10,29 +10,20 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://navi2ch.sourceforge.net/
 COMMENT=	2ch BBS browser for Emacs
 
-.include "../../mk/emacs.mk"
-
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
-.if ${EMACS_FLAVOR} == "emacs"
-CONFIGURE_ARGS+=--with-emacs
-CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX}/navi2ch
-.else
-CONFIGURE_ARGS+=--with-xemacs
-CONFIGURE_ARGS+=--with-packagedir=${EMACS_LISPPREFIX:C|/lisp$||}
-.endif
-CONFIGURE_ARGS+=--with-icondir=${PREFIX}/share/navi2ch/icons
+INFO_FILES=	# PLIST
+EMACS_MODULES=	base
 
-# XXX	Don't overwrite infodir when XEmacs is used.  In this case infodir
-#	must be set by --with-infodir (or --infodir?).  This should be
-#	fixed in the original distribution.
-SUBST_CLASSES+=		infodir
-SUBST_STAGE.infodir=	post-patch
-SUBST_MESSAGE.infodir=	Avoid default infodir is overwritten when XEmacs is used
-SUBST_FILES.infodir=	configure configure.in
-SUBST_SED.infodir=	-e '/infodir=.*packagedir/d'
-CONFIGURE_ARGS+=--with-infodir=${PREFIX}/info
+.include "../../mk/emacs.mk"
 
-INFO_FILES=	navi2ch.info
+.if ${EMACS_FLAVOR} == "emacs"
+CONFIGURE_ARGS+=	--with-emacs
+CONFIGURE_ARGS+=	--with-lispdir=${EMACS_LISPPREFIX}/navi2ch
+.elif ${EMACS_FLAVOR} == "xemacs"
+CONFIGURE_ARGS+=	--with-xemacs
+CONFIGURE_ARGS+=	--with-packagedir=${EMACS_LISPPREFIX:C|/lisp$||}
+.endif
+CONFIGURE_ARGS+=	--with-icondir=${PREFIX}/share/navi2ch/icons
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/navi2ch/PLIST b/chat/navi2ch/PLIST
index e3f7b353986..450634d7af5 100644
--- a/chat/navi2ch/PLIST
+++ b/chat/navi2ch/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2004/01/12 11:58:24 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/30 03:31:13 jlam Exp $
+${EMACS_INFOPREFIX}/navi2ch.info
 ${EMACS_LISPPREFIX}/navi2ch/navi2ch-article.el
 ${EMACS_LISPPREFIX}/navi2ch/navi2ch-article.elc
 ${EMACS_LISPPREFIX}/navi2ch/navi2ch-articles.el
diff --git a/chat/riece/Makefile b/chat/riece/Makefile
index 43722ee92fd..5c8b04d141f 100644
--- a/chat/riece/Makefile
+++ b/chat/riece/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/02/16 18:08:06 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/03/30 03:31:13 jlam Exp $
 #
 
 DISTNAME=	riece-2.0.2
@@ -14,21 +14,21 @@ COMMENT=	IRC client for Emacs
 EMACS_VERSIONS_ACCEPTED= \
 		emacs21 emacs21nox xemacs214
 
-.include "../../mk/emacs.mk"
-
 WRKSRC=		${WRKDIR}/${DISTNAME:C|[^0-9]$||}
 
 GNU_CONFIGURE=	YES
+INFO_FILES=	# PLIST
+EMACS_MODULES=	base
+
+.include "../../mk/emacs.mk"
+
 .if ${EMACS_FLAVOR} == "emacs"
-CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN:Q}
-.elif ${EMACS_FLAVOR} == "xemacs"
-CONFIGURE_ARGS+=--with-xemacs=${EMACS_BIN:Q}
-CONFIGURE_ARGS+=--with-packagedir=${EMACS_LISPPREFIX:C|/lisp\$||}
+CONFIGURE_ARGS+=	--with-emacs=${EMACS_BIN:Q}
 .elif ${EMACS_FLAVOR} == "xemacs"
+CONFIGURE_ARGS+=	--with-xemacs=${EMACS_BIN:Q}
+CONFIGURE_ARGS+=	--with-packagedir=${EMACS_LISPPREFIX:C|/lisp\$||}
 .endif
 # Riece digs sub directory.
-CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX:Q}
-
-INFO_FILES=	riece-en.info riece-ja.info
+CONFIGURE_ARGS+=	--with-lispdir=${EMACS_LISPPREFIX:Q}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/riece/PLIST b/chat/riece/PLIST
index 64ef735554d..b070787f9c0 100644
--- a/chat/riece/PLIST
+++ b/chat/riece/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2005/12/08 06:51:22 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/30 03:31:13 jlam Exp $
+${EMACS_INFOPREFIX}/riece-en.info
+${EMACS_INFOPREFIX}/riece-ja.info
 ${EMACS_LISPPREFIX}/riece/aproxy.rb
 ${EMACS_LISPPREFIX}/riece/riece-000.el
 ${EMACS_LISPPREFIX}/riece/riece-000.elc
@@ -46,8 +48,8 @@ ${EMACS_LISPPREFIX}/riece/riece-display.el
 ${EMACS_LISPPREFIX}/riece/riece-display.elc
 ${EMACS_LISPPREFIX}/riece/riece-doctor.el
 ${EMACS_LISPPREFIX}/riece/riece-doctor.elc
-${EMACS_LISPPREFIX}/riece/riece-emacs.el
-${EMACS_LISPPREFIX}/riece/riece-emacs.elc
+${EMACS_LISPPREFIX}/riece/riece-${EMACS_FLAVOR}.el
+${EMACS_LISPPREFIX}/riece/riece-${EMACS_FLAVOR}.elc
 ${EMACS_LISPPREFIX}/riece/riece-eval-ruby.el
 ${EMACS_LISPPREFIX}/riece/riece-eval-ruby.elc
 ${EMACS_LISPPREFIX}/riece/riece-eval.el