Use mk/emacs.mk.

2 files changed, 50 insertions, 44 deletions

diff --git a/chat/zenirc/Makefile b/chat/zenirc/Makefile
index 7c7c2b32ee9..b9ca6fdbf89 100644
--- a/chat/zenirc/Makefile
+++ b/chat/zenirc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/02/18 15:14:03 seb Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/13 10:39:54 uebayasi Exp $
 #
 
 DISTNAME=	zenirc-2.112
+PKGNAME=	${EMACS_PKGPREFIX}${DISTNAME}
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.splode.com/pub/zenirc/
 
@@ -9,10 +10,14 @@ MAINTAINER=	thorpej@netbsd.org
 HOMEPAGE=	http://www.splode.com/~friedman/software/emacs-lisp/zenirc/
 COMMENT=	IRC client for Emacs
 
-# XXX Someone who cares can make this work with Xemacs.
-DEPENDS+=	emacs-[0-9]*:../../editors/emacs
-
 GNU_CONFIGURE=	YES
 
+.include "../../mk/emacs.mk"
+
+.if ${EMACS_FLAVOR} == "xemacs"
+MAKE_FLAGS+=	EMACS=xemacs
+.endif
+MAKE_FLAGS+=	elispdir=${EMACS_LISPPREFIX}/zenirc
+
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/zenirc/PLIST b/chat/zenirc/PLIST
index 138bc49a39b..d1cdda53c92 100644
--- a/chat/zenirc/PLIST
+++ b/chat/zenirc/PLIST
@@ -1,43 +1,44 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:03 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/09/13 10:39:54 uebayasi Exp $
 @comment @unexec ${INSTALL_INFO} --delete %D/info/zenirc.info %D/info/dir
 @comment info/zenirc.info
 @comment @exec ${INSTALL_INFO} %D/info/zenirc.info %D/info/dir
-share/emacs/site-lisp/zenirc-18.elc
-share/emacs/site-lisp/zenirc-8ball.elc
-share/emacs/site-lisp/zenirc-away.elc
-share/emacs/site-lisp/zenirc-bork.elc
-share/emacs/site-lisp/zenirc-color.elc
-share/emacs/site-lisp/zenirc-command-queue.elc
-share/emacs/site-lisp/zenirc-complete.elc
-share/emacs/site-lisp/zenirc-ctcp-flood.elc
-share/emacs/site-lisp/zenirc-dcc.elc
-share/emacs/site-lisp/zenirc-doto.elc
-share/emacs/site-lisp/zenirc-eval.elc
-share/emacs/site-lisp/zenirc-example.elc
-share/emacs/site-lisp/zenirc-fill.elc
-share/emacs/site-lisp/zenirc-finnish.elc
-share/emacs/site-lisp/zenirc-format.elc
-share/emacs/site-lisp/zenirc-fortran.elc
-share/emacs/site-lisp/zenirc-french.elc
-share/emacs/site-lisp/zenirc-history.elc
-share/emacs/site-lisp/zenirc-ignore.elc
-share/emacs/site-lisp/zenirc-iwantop.elc
-share/emacs/site-lisp/zenirc-klingon.elc
-share/emacs/site-lisp/zenirc-latin.elc
-share/emacs/site-lisp/zenirc-meditate.elc
-share/emacs/site-lisp/zenirc-netsplit.elc
-share/emacs/site-lisp/zenirc-notify.elc
-share/emacs/site-lisp/zenirc-oink.elc
-share/emacs/site-lisp/zenirc-ojnk.elc
-share/emacs/site-lisp/zenirc-pjg.elc
-share/emacs/site-lisp/zenirc-popup.elc
-share/emacs/site-lisp/zenirc-prime-p.elc
-share/emacs/site-lisp/zenirc-random-away.elc
-share/emacs/site-lisp/zenirc-random-nick.elc
-share/emacs/site-lisp/zenirc-signal.elc
-share/emacs/site-lisp/zenirc-stamp.elc
-share/emacs/site-lisp/zenirc-swedish.elc
-share/emacs/site-lisp/zenirc-trigger.elc
-share/emacs/site-lisp/zenirc-yow-filter.elc
-share/emacs/site-lisp/zenirc-yow.elc
-share/emacs/site-lisp/zenirc.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-18.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-8ball.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-away.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-bork.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-color.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-command-queue.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-complete.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-ctcp-flood.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-dcc.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-doto.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-eval.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-example.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-fill.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-finnish.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-format.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-fortran.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-french.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-history.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-ignore.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-iwantop.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-klingon.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-latin.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-meditate.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-netsplit.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-notify.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-oink.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-ojnk.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-pjg.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-popup.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-prime-p.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-random-away.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-random-nick.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-signal.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-stamp.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-swedish.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-trigger.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-yow-filter.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc-yow.elc
+${EMACS_LISPPREFIX}/zenirc/zenirc.elc
+@dirrm ${EMACS_LISPPREFIX}/zenirc