Use mk/emacs.mk.

7 files changed, 153 insertions, 75 deletions

diff --git a/chat/irchat/Makefile b/chat/irchat/Makefile
index 4bba5109809..616ba647146 100644
--- a/chat/irchat/Makefile
+++ b/chat/irchat/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2001/02/16 13:51:26 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/13 10:37:53 uebayasi Exp $
 
 DISTNAME=	irchat-pj-2.4.24.20
+PKGNAME=	${EMACS_PKGPREFIX}${DISTNAME}
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.madoka.org/pub/irchat-pj/
 
@@ -8,6 +9,17 @@ MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 HOMEPAGE=	http://www.fan.gr.jp/~simm/irchat/
 COMMENT=	Emacs lisp interface to Internet Relay Chat
 
-DEPENDS+=	emacs-20.*:../../editors/emacs
+.include "../../mk/emacs.mk"
+
+.if ${EMACS_FLAVOR} == "emacs"
+INSTALL_TARGET=	install
+PLIST_SRC=	${PKGDIR}/PLIST.emacs
+.elif ${EMACS_FLAVOR} == "xemacs"
+ALL_TARGET=	package
+INSTALL_TARGET=	install-package
+PLIST_SRC=	${PKGDIR}/PLIST.xemacs
+.else
+IGNORE+=	"Unknown Emacs flavor"
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/irchat/PLIST.emacs b/chat/irchat/PLIST.emacs
new file mode 100644
index 00000000000..f29c64b31b0
--- /dev/null
+++ b/chat/irchat/PLIST.emacs
@@ -0,0 +1,19 @@
+@comment $NetBSD: PLIST.emacs,v 1.1 2002/09/13 10:37:53 uebayasi Exp $
+bin/dcc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-commands.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-copyright.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-dcc.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-filter.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-globals.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-handle.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-inlines.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-action.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-coding-system.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-jisx0201.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-mode-line-format.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-sound.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-specific-emacs20.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-pj-version-string.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat-vars.elc
+${EMACS_LISPPREFIX}/irchat-pj/irchat.elc
+@comment dirrm ${EMACS_LISPPREFIX}/irchat-pj
diff --git a/chat/irchat/PLIST.xemacs b/chat/irchat/PLIST.xemacs
new file mode 100644
index 00000000000..016e03e30a9
--- /dev/null
+++ b/chat/irchat/PLIST.xemacs
@@ -0,0 +1,46 @@
+@comment $NetBSD: PLIST.xemacs,v 1.1 2002/09/13 10:37:53 uebayasi Exp $
+lib/xemacs/xemacs-packages/etc/irchat-pj/CHANGELOG
+lib/xemacs/xemacs-packages/etc/irchat-pj/FAQ-about-jp24.txt
+lib/xemacs/xemacs-packages/etc/irchat-pj/FAQ-irchat-PJ.txt
+lib/xemacs/xemacs-packages/etc/irchat-pj/GPL
+lib/xemacs/xemacs-packages/etc/irchat-pj/INSTALL.irchat-pj
+lib/xemacs/xemacs-packages/etc/irchat-pj/README.browse-url-plus
+lib/xemacs/xemacs-packages/etc/irchat-pj/README.irchat-pj
+lib/xemacs/xemacs-packages/etc/irchat-pj/browse-url-plus-init.el
+lib/xemacs/xemacs-packages/etc/irchat-pj/dcc
+lib/xemacs/xemacs-packages/etc/irchat-pj/dot.irchat_vars.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-commands.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-commands.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-copyright.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-copyright.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-dcc.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-dcc.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-filter.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-filter.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-globals.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-globals.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-handle.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-handle.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-inlines.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-inlines.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-action.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-action.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-coding-system.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-coding-system.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-jisx0201.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-jisx0201.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-mode-line-format.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-mode-line-format.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-sound.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-sound.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-specific-xmas.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-specific-xmas.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-version-string.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-pj-version-string.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-vars.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat-vars.elc
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat.el
+lib/xemacs/xemacs-packages/lisp/irchat-pj/irchat.elc
+lib/xemacs/xemacs-packages/pkginfo/MANIFEST.irchat-pj
+@dirrm lib/xemacs/xemacs-packages/lisp/irchat-pj
+@dirrm lib/xemacs/xemacs-packages/etc/irchat-pj
diff --git a/chat/zenicb/Makefile b/chat/zenicb/Makefile
index b1fed252215..0fbb2b2cb22 100644
--- a/chat/zenicb/Makefile
+++ b/chat/zenicb/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/04/26 09:36:57 tron Exp $
+# $NetBSD: Makefile,v 1.6 2002/09/13 10:40:39 uebayasi Exp $
 
 DISTNAME=		zenicb-19981202
+PKGNAME=		${EMACS_PKGPREFIX}${DISTNAME}
 CATEGORIES=		chat
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
@@ -9,22 +10,17 @@ COMMENT=		ICB client for Emacs
 
 NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 
-# XXX YUCK!  I really don't like this, but what else are we going to do?
 .include "../../mk/bsd.prefs.mk"
+
+.include "../../mk/emacs.mk"
+
 .if defined(USE_XEMACS)
-EMACS=			xemacs
-DEPENDS+=		xemacs-[1-9]*:../../editors/xemacs
 MAKEFLAGS+=		USE_XEMACS=${USE_XEMACS}
-ELISPDIR=		lib/xemacs/xemacs-packages/lisp
-
 .include "../../editors/xemacs/Makefile.pkg"
 .else
-EMACS=			emacs
-DEPENDS+=		emacs-[0-9]*:../../editors/emacs
-ELISPDIR=		share/emacs/site-lisp
 .endif
 
-PLIST_SUBST+=		ELISPDIR=${ELISPDIR}
+#PLIST_SUBST+=		ELISPDIR=${ELISPDIR}
 
 pre-configure:
 .if defined(USE_XEMACS)
@@ -36,11 +32,9 @@ pre-configure:
 do-build:
 
 do-install:
-.if defined(USE_XEMACS)
-	@${INSTALL_DATA_DIR} ${PREFIX}/${ELISPDIR}
-.endif
+	@${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/zenicb
 	@for file in ${WRKSRC}/src/*.el; do \
-		j="${INSTALL_DATA} $$file ${PREFIX}/${ELISPDIR}/"; \
+		j="${INSTALL_DATA} $$file ${EMACS_LISPPREFIX}/zenicb"; \
 		${ECHO} $$j; $$j; \
 	done
 
diff --git a/chat/zenicb/PLIST b/chat/zenicb/PLIST
index e977fa84cb7..561939ace3a 100644
--- a/chat/zenicb/PLIST
+++ b/chat/zenicb/PLIST
@@ -1,15 +1,16 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:06:48 zuntum Exp $
-${ELISPDIR}/zenicb-8ball.el
-${ELISPDIR}/zenicb-add.el
-${ELISPDIR}/zenicb-away.el
-${ELISPDIR}/zenicb-example.el
-${ELISPDIR}/zenicb-fortran.el
-${ELISPDIR}/zenicb-history.el
-${ELISPDIR}/zenicb-meditate.el
-${ELISPDIR}/zenicb-nologout.el
-${ELISPDIR}/zenicb-signal.el
-${ELISPDIR}/zenicb-stamp.el
-${ELISPDIR}/zenicb-trigger.el
-${ELISPDIR}/zenicb-whereis.el
-${ELISPDIR}/zenicb-yow.el
-${ELISPDIR}/zenicb.el
+@comment $NetBSD: PLIST,v 1.2 2002/09/13 10:40:39 uebayasi Exp $
+${EMACS_LISPPREFIX}/zenicb/zenicb-8ball.el
+${EMACS_LISPPREFIX}/zenicb/zenicb-add.el
+${EMACS_LISPPREFIX}/zenicb/zenicb-away.el
+${EMACS_LISPPREFIX}/zenicb/zenicb-example.el
+${EMACS_LISPPREFIX}/zenicb/zenicb-fortran.el
+${EMACS_LISPPREFIX}/zenicb/zenicb-history.el
+${EMACS_LISPPREFIX}/zenicb/zenicb-meditate.el
+${EMACS_LISPPREFIX}/zenicb/zenicb-nologout.el
+${EMACS_LISPPREFIX}/zenicb/zenicb-signal.el
+${EMACS_LISPPREFIX}/zenicb/zenicb-stamp.el
+${EMACS_LISPPREFIX}/zenicb/zenicb-trigger.el
+${EMACS_LISPPREFIX}/zenicb/zenicb-whereis.el
+${EMACS_LISPPREFIX}/zenicb/zenicb-yow.el
+${EMACS_LISPPREFIX}/zenicb/zenicb.el
+@dirrm ${EMACS_LISPPREFIX}/zenicb
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