[pkgsrc/trunk]: pkgsrc/editors/emacs Add motif option from Juha-Matti Liukkon...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8bdd5e791d9c
branches:  trunk
changeset: 508496:8bdd5e791d9c
user:      markd <markd%pkgsrc.org@localhost>
date:      Mon Feb 20 12:16:24 2006 +0000

description:
Add motif option from Juha-Matti Liukkonen in PR 32703, changed somewhat
by me.  Also fixes PR 20883.

diffstat:

 editors/emacs/Makefile |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r 932f09a433e8 -r 8bdd5e791d9c editors/emacs/Makefile
--- a/editors/emacs/Makefile    Mon Feb 20 12:11:00 2006 +0000
+++ b/editors/emacs/Makefile    Mon Feb 20 12:16:24 2006 +0000
@@ -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 @@
 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-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"