Use mk/emacs.mk.

2 files changed, 24 insertions, 29 deletions

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