From aa8e85bcfdcd55a551512b16afecdd5b35d952eb Mon Sep 17 00:00:00 2001 From: uebayasi Date: Sun, 28 Aug 2005 04:25:28 +0000 Subject: Rework emacs.mk: 1) Simplify the way how an emacs version is picked when no emacs is installed, but a user try to install an Emacs Lisp package. Just pick up the version set as EMACS_TYPE than searching for versions already installed etc. If the EMACS_TYPE version is not supported by the Emacs Lisp Package, just fail. EMACS_TYPE be default to GNU Emacs 21. (In other words, users should set EMACS_TYPE as they want. Otherwise GNU Emacs 21 is used.) 2) All Emacs Lisp Packages *must* prepend EMACS_PKGNAME_PREFIX to a) the PKGNAME itself, and b) PKGNAME in its dependency lines. EMACS_PKGNAME_PREFIX is expanded to "xemacs-" when XEmacs is used. This keeps dependency graph of Emacs-Lisp-packages- installed-for-XEmacs consistent. 3) Document EMACS_* variables as much as possible. 4) Provide more cookies for PLIST. Maybe utilized later. Note that the 2) change doesn't affect the default, GNU Emacs 21 behaviour. So no version / revision bumps in this commit. --- cad/dinotrace-mode/Makefile | 6 +++--- cad/verilog-mode/Makefile | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'cad') diff --git a/cad/dinotrace-mode/Makefile b/cad/dinotrace-mode/Makefile index 1bb64e3e1b1..cdbbfb952ad 100644 --- a/cad/dinotrace-mode/Makefile +++ b/cad/dinotrace-mode/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2003/07/17 21:24:48 grant Exp $ +# $NetBSD: Makefile,v 1.3 2005/08/28 04:25:28 uebayasi Exp $ # DISTNAME= dinotrace-9.1i -PKGNAME= dinotrace-mode-9.1i +PKGNAME= ${EMACS_PKGNAME_PREFIX}dinotrace-mode-9.1i CATEGORIES= cad editors MASTER_SITES= http://www.veripool.com/ftp/ @@ -10,7 +10,7 @@ MAINTAINER= dmcmahill@NetBSD.org HOMEPAGE= http://www.veripool.com/dinotrace/ COMMENT= Emacs major mode for dinotrace -DEPENDS+= verilog-mode>=3.13:../../cad/verilog-mode +DEPENDS+= ${EMACS_PKGNAME_PREFIX}verilog-mode>=3.13:../../cad/verilog-mode .include "../../mk/bsd.prefs.mk" diff --git a/cad/verilog-mode/Makefile b/cad/verilog-mode/Makefile index be1588d93f6..5ab0daaf4ea 100644 --- a/cad/verilog-mode/Makefile +++ b/cad/verilog-mode/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2004/01/20 12:09:10 agc Exp $ +# $NetBSD: Makefile,v 1.6 2005/08/28 04:25:28 uebayasi Exp $ # DISTNAME= verilog-mode-3.60 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= cad editors MASTER_SITES= ${MASTER_SITE_LOCAL} # The latest can be fetched interactively from -- cgit v1.2.3