Convert to use emacs.mk.

3 files changed, 28 insertions, 31 deletions

diff --git a/devel/pcl-cvs/MESSAGE b/devel/pcl-cvs/MESSAGE
index 6d099a5b389..9f781a46b86 100644
--- a/devel/pcl-cvs/MESSAGE
+++ b/devel/pcl-cvs/MESSAGE
@@ -1,10 +1,10 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2002/09/12 19:37:08 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2003/01/10 14:39:58 wiz Exp $
 
 To automatically load pcl-cvs when starting emacs, add the following 
 (or similar) to your .emacs.el file.
 
-(add-to-list 'load-path "${PREFIX}/${LISPDIR}")
+(add-to-list 'load-path "${EMACS_LISPPREFIX}/pcl-cvs")
 (load "pcl-cvs-startup")
 
 ===========================================================================
diff --git a/devel/pcl-cvs/Makefile b/devel/pcl-cvs/Makefile
index c2a79d95522..3f588c5f69c 100644
--- a/devel/pcl-cvs/Makefile
+++ b/devel/pcl-cvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/06/08 19:32:15 cjep Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/10 14:39:58 wiz Exp $
 #
 
 DISTNAME=	pcl-cvs-2.9.9
@@ -9,22 +9,19 @@ MAINTAINER=	packages@netbsd.org
 #HOMEPAGE=
 COMMENT=	front-end to CVS for emacs
 
-DEPENDS+= 	emacs-20.*:../../editors/emacs
-DEPENDS+=	elib>=1.0:../../devel/elib
+DEPENDS+=	${PKGNAME_PREFIX}elib>=1.0:../../devel/elib
 
 CONFLICTS=	emacs-21.*
 CONFLICTS+=	emacs21
 
-.include "../../mk/bsd.prefs.mk"
+EMACS_VERSIONS_ACCEPTED=	emacs20
 
-LISPDIR=	share/emacs/site-lisp/pcl-cvs
+.include "../../mk/emacs.mk"
 
 MAKE_ENV+=	PREFIX=${PREFIX}
 ALL_TARGET= 	default
 INFO_FILES=	pcl-cvs.info
-
-PLIST_SUBST+=	LISPDIR=${LISPDIR}
-MESSAGE_SUBST+=	LISPDIR=${LISPDIR}
+MESSAGE_SUBST+=	EMACS_LISPPREFIX=${EMACS_LISPPREFIX:Q}
 
 .include "../../mk/texinfo.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pcl-cvs/PLIST b/devel/pcl-cvs/PLIST
index 01d00631d9c..9cd53fe0ea2 100644
--- a/devel/pcl-cvs/PLIST
+++ b/devel/pcl-cvs/PLIST
@@ -1,26 +1,26 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/08 17:33:18 cjep Exp $
-${LISPDIR}/cvs-compat.el
-${LISPDIR}/cvs-compat.elc
-${LISPDIR}/cvs-edit.el
-${LISPDIR}/cvs-edit.elc
-${LISPDIR}/cvs-log.el
-${LISPDIR}/cvs-log.elc
-${LISPDIR}/cvs-status.el
-${LISPDIR}/cvs-status.elc
-${LISPDIR}/pcl-cvs-defs.el
-${LISPDIR}/pcl-cvs-defs.elc
-${LISPDIR}/pcl-cvs-info.el
-${LISPDIR}/pcl-cvs-info.elc
-${LISPDIR}/pcl-cvs-parse.el
-${LISPDIR}/pcl-cvs-parse.elc
-${LISPDIR}/pcl-cvs-startup.el
-${LISPDIR}/pcl-cvs-util.el
-${LISPDIR}/pcl-cvs-util.elc
-${LISPDIR}/pcl-cvs.el
-${LISPDIR}/pcl-cvs.elc
+@comment $NetBSD: PLIST,v 1.2 2003/01/10 14:39:58 wiz Exp $
+${EMACS_LISPPREFIX}/pcl-cvs/cvs-compat.el
+${EMACS_LISPPREFIX}/pcl-cvs/cvs-compat.elc
+${EMACS_LISPPREFIX}/pcl-cvs/cvs-edit.el
+${EMACS_LISPPREFIX}/pcl-cvs/cvs-edit.elc
+${EMACS_LISPPREFIX}/pcl-cvs/cvs-log.el
+${EMACS_LISPPREFIX}/pcl-cvs/cvs-log.elc
+${EMACS_LISPPREFIX}/pcl-cvs/cvs-status.el
+${EMACS_LISPPREFIX}/pcl-cvs/cvs-status.elc
+${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs-defs.el
+${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs-defs.elc
+${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs-info.el
+${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs-info.elc
+${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs-parse.el
+${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs-parse.elc
+${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs-startup.el
+${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs-util.el
+${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs-util.elc
+${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs.el
+${EMACS_LISPPREFIX}/pcl-cvs/pcl-cvs.elc
 @unexec install-info --delete --info-dir=%D/info %D/info/pcl-cvs.info
 info/pcl-cvs.info
 info/pcl-cvs.info-1
 info/pcl-cvs.info-2
 @exec install-info --info-dir=%D/info %D/info/pcl-cvs.info
-@dirrm ${LISPDIR}
+@dirrm ${EMACS_LISPPREFIX}/pcl-cvs