diff options
Diffstat (limited to 'editors/emacs')
| -rw-r--r-- | editors/emacs/Makefile | 5 | ||||
| -rw-r--r-- | editors/emacs/options.mk | 107 |
2 files changed, 77 insertions, 35 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 8a866244f9a..ebd37e1b595 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.104 2007/06/11 13:57:15 markd Exp $ +# $NetBSD: Makefile,v 1.105 2007/08/13 12:40:57 jlam Exp $ DISTNAME= emacs-${EMACSVERSION} +PKGREVISION= 1 CATEGORIES= editors -COMMENT= GNU editing macros (editor) +COMMENT= GNU editing macros (editor)${COMMENT_EXTRA} .include "../../editors/emacs/Makefile.common" diff --git a/editors/emacs/options.mk b/editors/emacs/options.mk index 57dbf6b1580..eb79aeb0c18 100644 --- a/editors/emacs/options.mk +++ b/editors/emacs/options.mk @@ -1,48 +1,89 @@ -# $NetBSD: options.mk,v 1.1 2007/06/11 13:57:16 markd Exp $ +# $NetBSD: options.mk,v 1.2 2007/08/13 12:40:57 jlam Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.emacs -PKG_OPTIONS_REQUIRED_GROUPS= toolkit -PKG_OPTIONS_GROUP.toolkit= gtk motif xaw nox11 -PKG_SUGGESTED_OPTIONS= xaw +PKG_OPTIONS_VAR= PKG_OPTIONS.emacs +PKG_SUPPORTED_OPTIONS= x11 +PKG_SUPPORTED_OPTIONS+= nox11 # OBSOLETE; remove after pkgsrc-2007Q4 +PKG_OPTIONS_OPTIONAL_GROUPS= toolkit +PKG_OPTIONS_GROUP.toolkit= gtk motif xaw +PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mxaw) +### +### OBSOLETE section. Should be removed after pkgsrc-2007Q4. +### The "nox11" option implies removing all of the "x11"-related options. +### +.if !empty(PKG_OPTIONS:Mnox11) +PKG_OPTIONS:= ${PKG_OPTIONS:Nx11:Ngtk:Nmotif:Nxaw} +PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated option nox11 used, use option -x11 instead." +.endif + +### +### Any of the "toolkit" options implies "x11". +### +.if !empty(PKG_OPTIONS:Mgtk) || !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:Mgtk) && 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-x -CONFIGURE_ARGS+= --with-xpm -CONFIGURE_ARGS+= --with-jpeg -CONFIGURE_ARGS+= --with-tiff 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 -.include "../../graphics/jpeg/buildlink3.mk" -.include "../../graphics/tiff/buildlink3.mk" -.include "../../graphics/libungif/buildlink3.mk" -.include "../../graphics/png/buildlink3.mk" -.include "../../x11/libXpm/buildlink3.mk" - +### +### Support using Motif X11 widgets. +### .if !empty(PKG_OPTIONS:Mgtk) -.include "../../x11/gtk2/buildlink3.mk" +. include "../../x11/gtk2/buildlink3.mk CONFIGURE_ARGS+= --with-x-toolkit=gtk -.elif !empty(PKG_OPTIONS:Mmotif) -.include "../../mk/motif.buildlink3.mk" -CONFIGURE_ARGS+= --with-x-toolkit=motif -USE_TOOLS+= pkg-config -.elif !empty(PKG_OPTIONS:Mxaw) -.include "../../mk/xaw.buildlink3.mk" -CONFIGURE_ARGS+= --with-x-toolkit=athena .endif -# need 4.1.0b1 or higher (a bug in 4.1.0 can crash Emacs) -BUILDLINK_API_DEPENDS.libungif+= libungif>=4.1.0.1 +### +### Support using Motif X11 widgets. +### +.if !empty(PKG_OPTIONS:Mmotif) +. include "../../mk/motif.buildlink3.mk" +CONFIGURE_ARGS+= --with-x-toolkit=motif .endif -.if !empty(PKG_OPTIONS:Mnox11) -CONFIGURE_ARGS+= --without-x -CONFIGURE_ARGS+= --without-xpm -CONFIGURE_ARGS+= --without-jpeg -CONFIGURE_ARGS+= --without-tiff -CONFIGURE_ARGS+= --without-gif -CONFIGURE_ARGS+= --without-png +### +### Support using Xaw (Lucid) X11 widgets. +### +.if !empty(PKG_OPTIONS:Mxaw) +. include "../../mk/xaw.buildlink3.mk" +CONFIGURE_ARGS+= --with-x-toolkit=athena .endif |