diff options
| author | uebayasi <uebayasi> | 2005-08-28 04:25:28 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi> | 2005-08-28 04:25:28 +0000 |
| commit | 94e4fa69d6357e1a5cae535af27c4c9c24bdfe3c (patch) | |
| tree | ccca2342ed9e54797d6faec6027bbd0e5c89cd07 /www | |
| parent | b7a1a03542680610d58269bfcd522517b8693a08 (diff) | |
| download | pkgsrc-94e4fa69d6357e1a5cae535af27c4c9c24bdfe3c.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 'www')
| -rw-r--r-- | www/emacs-w3m/Makefile | 14 | ||||
| -rw-r--r-- | www/w3/Makefile | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index 3366cde33ab..357c98b5a7f 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2005/03/02 20:43:19 minskim Exp $ +# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:31 uebayasi Exp $ DISTNAME= emacs-w3m-1.3.3 +PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} CATEGORIES= www MASTER_SITES= ${HOMEPAGE} @@ -8,8 +9,8 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://emacs-w3m.namazu.org/ COMMENT= Simple w3m interface for Emacs -EMACS_DEPENDS+= {w3m,w3m-img}>=0.3.1:../../www/w3m -BUILD_DEPENDS+= ${PKGNAME_PREFIX}semi-*:../../devel/semi +DEPENDS+= {w3m,w3m-img}>=0.3.1:../../www/w3m +BUILD_DEPENDS+= ${EMACS_PKGNAME_PREFIX}semi-[0-9]*:../../devel/semi # Not tested with xemacs... EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215 @@ -17,15 +18,12 @@ EMACS_VERSIONS_ACCEPTED= emacs21 emacs21nox emacs20 xemacs214 xemacs215 .include "../../mk/emacs.mk" .if ${EMACS_FLAVOR} == "xemacs" -EMACS_DEPENDS+= apel>=10.3:../../devel/apel -BUILD_DEPENDS+= mew-xemacs-*:../../mail/mew-xemacs -.else -BUILD_DEPENDS+= mew-*:../../mail/mew +DEPENDS+= ${EMACS_PKGNAME_PREFIX}apel>=10.3:../../devel/apel .endif EMACS_MAJOR_VERSION= ${EMACS_VERSION:C/\..*//} .if ${EMACS_FLAVOR} == "emacs" && ${EMACS_MAJOR_VERSION} == 21 -BUILD_DEPENDS+= Mule-UCS>=0.84:../../editors/mule-ucs +BUILD_DEPENDS+= ${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.84:../../editors/mule-ucs .endif HAS_CONFIGURE= # defined diff --git a/www/w3/Makefile b/www/w3/Makefile index a292e8442e6..62ab39bf31c 100644 --- a/www/w3/Makefile +++ b/www/w3/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.16 2003/08/18 13:23:13 minoura Exp $ +# $NetBSD: Makefile,v 1.17 2005/08/28 04:25:31 uebayasi Exp $ DISTNAME= w3-4.0pre.47 -PKGNAME= w3-4.0b47 +PKGNAME= ${EMACS_PKGNAME_PREFIX}w3-4.0b47 CATEGORIES= www MASTER_SITES= ftp://ftp.xemacs.org/pub/xemacs/emacs-w3/ \ ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/ftp.xemacs.org/xemacs/emacs-w3/ \ |