diff options
author | uebayasi <uebayasi@pkgsrc.org> | 2005-08-28 04:25:28 +0000 |
---|---|---|
committer | uebayasi <uebayasi@pkgsrc.org> | 2005-08-28 04:25:28 +0000 |
commit | 3caf74032ccaa2d39be32511e89bdf59cbb23385 (patch) | |
tree | ccca2342ed9e54797d6faec6027bbd0e5c89cd07 /lang | |
parent | 036033d84cb8537774e9437bd2b64152b1147fd5 (diff) | |
download | pkgsrc-3caf74032ccaa2d39be32511e89bdf59cbb23385.tar.gz |
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.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/eieio/Makefile | 8 | ||||
-rw-r--r-- | lang/twelf/Makefile | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile index 9c2293db89b..64dcc57435d 100644 --- a/lang/eieio/Makefile +++ b/lang/eieio/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2005/06/16 06:58:00 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/08/28 04:25:30 uebayasi Exp $ # DISTNAME= eieio-0.17 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= lang editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cedet/} @@ -11,9 +12,8 @@ COMMENT= Enhanced Integration of Emacs Interpreted Objects .include "../../mk/emacs.mk" -.if ${EMACS_FLAVOR} == "emacs" -.elif ${EMACS_FLAVOR} == "xemacs" -DEPENDS+= xemacs-packages:../../editors/xemacs-packages +.if ${EMACS_FLAVOR} == "xemacs" +DEPENDS+= xemacs-packages-[0-9]*:../../editors/xemacs-packages .endif MAKEFLAGS+= EMACS=${EMACS_BIN} diff --git a/lang/twelf/Makefile b/lang/twelf/Makefile index cadcee1c7f4..f7836226ee4 100644 --- a/lang/twelf/Makefile +++ b/lang/twelf/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2005/06/16 06:58:01 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:30 uebayasi Exp $ # DISTNAME= twelf-1-4 -PKGNAME= twelf-1.4 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.cs.cmu.edu/~twelf/dist/ |