From 8a3f3aff46d4065ab9601287b6d7839ed280af03 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Thu, 30 Mar 2006 03:31:13 +0000
Subject: * 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.
---
 chat/riece/Makefile | 20 ++++++++++----------
 chat/riece/PLIST    |  8 +++++---
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'chat/riece')

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
-- 
cgit v1.2.3