diff options
| author | markd <markd@pkgsrc.org> | 2006-02-20 12:16:24 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2006-02-20 12:16:24 +0000 |
| commit | 306b2c07a210ce6ab5aa578861462c2499df39d3 (patch) | |
| tree | 8daf1656a0d373e224931a4e160dc71beb738576 /editors | |
| parent | 4da021ef433801ccdff181fe4daaa5bf1374f4ea (diff) | |
| download | pkgsrc-306b2c07a210ce6ab5aa578861462c2499df39d3.tar.gz | |
Add motif option from Juha-Matti Liukkonen in PR 32703, changed somewhat
by me. Also fixes PR 20883.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs/Makefile | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index f6dd8008113..ab51c57487d 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.90 2006/02/05 23:08:55 joerg Exp $ +# $NetBSD: Makefile,v 1.91 2006/02/20 12:16:24 markd Exp $ DISTNAME= emacs-${EMACSVERSION}a PKGREVISION= 2 @@ -10,7 +10,6 @@ COMMENT= GNU editing macros (editor) CONFLICTS+= emacs-nox11-[0-9]* CONFIGURE_ARGS+= --with-x -CONFIGURE_ARGS+= --with-x-toolkit=athena CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q} .include "../../graphics/xpm/buildlink3.mk" @@ -27,11 +26,18 @@ CONFIGURE_ARGS+= --with-gif CONFIGURE_ARGS+= --with-png PKG_OPTIONS_VAR= PKG_OPTIONS.emacs -PKG_SUPPORTED_OPTIONS= emacs-xaw3d +PKG_OPTIONS_OPTIONAL_GROUPS= toolkit +PKG_OPTIONS_GROUP.toolkit= emacs-xaw3d motif .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Memacs-xaw3d) +.if !empty(PKG_OPTIONS:Mmotif) +.include "../../mk/motif.buildlink3.mk" +CONFIGURE_ARGS+= --with-x-toolkit=motif +.elif !empty(PKG_OPTIONS:Memacs-xaw3d) .include "../../x11/Xaw3d/buildlink3.mk" +CONFIGURE_ARGS+= --with-x-toolkit=athena +.else +CONFIGURE_ARGS+= --with-x-toolkit=athena .endif .include "../../mk/bsd.pkg.mk" |