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 | 81867fe6ef7fe46dc373c35df23a5ed9cb0e55a5 (patch) | |
| tree | 8552a79498067dda4b7f3f68a15003858bc3d074 /editors/emacs21/options.mk | |
| parent | d630f7f510973cac23195da6d1d277d776921899 (diff) | |
| download | pkgsrc-81867fe6ef7fe46dc373c35df23a5ed9cb0e55a5.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/emacs21/options.mk')
| -rw-r--r-- | editors/emacs21/options.mk | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/editors/emacs21/options.mk b/editors/emacs21/options.mk new file mode 100644 index 00000000000..9a6ca2fd16d --- /dev/null +++ b/editors/emacs21/options.mk @@ -0,0 +1,80 @@ +# $NetBSD: options.mk,v 1.1 2007/08/13 12:40:58 jlam Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.emacs +PKG_SUPPORTED_OPTIONS= x11 +PKG_OPTIONS_OPTIONAL_GROUPS= toolkit +PKG_OPTIONS_GROUP.toolkit= emacs-xaw3d motif xaw +PKG_SUGGESTED_OPTIONS= x11 + +.include "../../mk/bsd.options.mk" + +### +### Treat "emacs-xaw3d" as a special case of "xaw". +### +.if !empty(PKG_OPTIONS:Memacs-xaw3d) +XAW_TYPE= 3d +PKG_OPTIONS:= ${PKG_OPTIONS:Nemacs-xaw3d} +PKG_OPTIONS+= xaw +.endif + +### +### Any of the "toolkit" options implies "x11". +### +.if !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxaw) +. if empty(PKG_OPTIONS:Mx11) +PKG_OPTIONS+= x11 +. endif +.endif + +### +### Default to using the Xaw X11 toolkit if none is specified. +### +.if !empty(PKG_OPTIONS:Mx11) +. if empty(PKG_OPTIONS:Mmotif) && empty(PKG_OPTIONS:Mxaw) +PKG_OPTIONS+= xaw +. endif +.endif + +### +### Support drawing pretty X11 widgets. +### +.if !empty(PKG_OPTIONS:Mx11) +. include "../../graphics/jpeg/buildlink3.mk" +. include "../../graphics/tiff/buildlink3.mk" +. include "../../graphics/png/buildlink3.mk" +. include "../../x11/libXpm/buildlink3.mk" + +# Need libungif>=4.1.0b1 (a bug in 4.1.0 can crash Emacs) +BUILDLINK_API_DEPENDS.libungif+= libungif>=4.1.0.1 +. include "../../graphics/libungif/buildlink3.mk" + +CONFIGURE_ARGS+= --with-gif +CONFIGURE_ARGS+= --with-jpeg +CONFIGURE_ARGS+= --with-png +CONFIGURE_ARGS+= --with-tiff +CONFIGURE_ARGS+= --with-x +CONFIGURE_ARGS+= --with-xpm +.else +CONFIGURE_ARGS+= --without-gif +CONFIGURE_ARGS+= --without-jpeg +CONFIGURE_ARGS+= --without-png +CONFIGURE_ARGS+= --without-tiff +CONFIGURE_ARGS+= --without-x +CONFIGURE_ARGS+= --without-xpm +.endif + +### +### Support using Motif X11 widgets. +### +.if !empty(PKG_OPTIONS:Mmotif) +. include "../../mk/motif.buildlink3.mk" +CONFIGURE_ARGS+= --with-x-toolkit=motif +.endif + +### +### Support using Xaw (Lucid) X11 widgets. +### +.if !empty(PKG_OPTIONS:Mxaw) +. include "../../mk/xaw.buildlink3.mk" +CONFIGURE_ARGS+= --with-x-toolkit=athena +.endif |