diff options
| author | jlam <jlam@pkgsrc.org> | 2007-08-13 12:40:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-08-13 12:40:57 +0000 |
| commit | d2c1168fbb33c62ba2c6951260591d6645ec3f0f (patch) | |
| tree | 8552a79498067dda4b7f3f68a15003858bc3d074 /editors/emacs20/Makefile | |
| parent | fde3ce040605d5b3726bfafe7fc0dd2178190dfa (diff) | |
| download | pkgsrc-d2c1168fbb33c62ba2c6951260591d6645ec3f0f.tar.gz | |
Fix up the use of package options in the Emacs packages:
(1) Get rid of "nox11" -- the concept of "no" in package options is
expressed by negating an option; use "-x11" instead.
(2) Teach editors/emacs20 to use package options instead of EMACS_USE_POP,
EMACS_USE_X, EMACS_USE_X_TOOLKIT and USE_INET6. We now use similar
options as the other emacs packages, i.e. "x11", "motif", "xaw",
as well as "pop" and "inet6".
(3) Make the emacs*-nox11 packages simply remove all X11 options by
setting PKG_OPTIONS.emacs appropriately and include the corresponding
emacs Makefile. This allows for modifications to the emacs "X11"
versions to be automatically picked up by the "non-X11" versions.
The two corresponding versions of emacs now share the same version
numbering, including PKGREVISIONs.
Bump the PKGREVISIONs on all Emacs editor packages.
Diffstat (limited to 'editors/emacs20/Makefile')
| -rw-r--r-- | editors/emacs20/Makefile | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 4aa415fb370..8812f304a3d 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.31 2007/06/30 01:01:12 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2007/08/13 12:40:58 jlam Exp $ DISTNAME= emacs-20.7 -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GNU:=emacs/} \ ${MASTER_SITE_LOCAL} @@ -28,8 +28,6 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake GNU_ARCH.mipsbe= mips -BUILD_DEFS+= USE_INET6 EMACS_USE_POP - # build PATH in the dumped emacs is not a problem CHECK_WRKREF_SKIP+= bin/emacs CHECK_WRKREF_SKIP+= bin/emacs-20.7 @@ -54,33 +52,8 @@ LDFLAGS+= -Wl,-z,nocombreloc CPPFLAGS+= -DDFLY_PRE_17_CRT .endif -EMACS_USE_POP?= yes -.if (defined(EMACS_USE_POP) && \ - (${EMACS_USE_POP} == yes || ${EMACS_USE_POP} == YES)) -CONFIGURE_ARGS+=--with-pop -.endif +.include "options.mk" -.if defined(EMACS_USE_X) -.include "../../mk/x11.buildlink3.mk" -BUILD_DEFS+= EMACS_USE_X EMACS_USE_X_TOOLKIT -CONFIGURE_ARGS+= --with-x=yes -.if defined(EMACS_USE_X_TOOLKIT) -CONFIGURE_ARGS+= --with-x-toolkit=${EMACS_USE_X_TOOLKIT:Q} -.if ${EMACS_USE_X_TOOLKIT} == "lucid" || ${EMACS_USE_X_TOOLKIT} == "athena" -.include "../../mk/xaw.buildlink3.mk" -.elif ${EMACS_USE_X_TOOLKIT} == "motif" -.include "../../mk/motif.buildlink3.mk" -.endif -.endif -.else -CONFIGURE_ARGS+= --with-x=no -.endif # EMACS_USE_X - -.if defined(USE_INET6) && ${USE_INET6} == YES -CONFIGURE_ARGS+=--with-ipv6 -.else -CONFIGURE_ARGS+=--without-ipv6 -.endif MAKE_ENV+= INSTALL_STRIP=${_STRIPFLAG_INSTALL:Q} .include "../../mk/compiler.mk" |