[pkgsrc/trunk]: pkgsrc Rename options emacs-xaw3d to simply xaw3d. Ref:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/948a5f5af68d
branches:  trunk
changeset: 650731:948a5f5af68d
user:      mef <mef%pkgsrc.org@localhost>
date:      Sun Apr 26 05:54:29 2015 +0000

description:
Rename options emacs-xaw3d to simply xaw3d. Ref:
  http://mail-index.netbsd.org/pkgsrc-users/2015/04/24/msg021447.html

diffstat:

 editors/emacs21-nox11/Makefile  |   4 ++--
 editors/emacs21/options.mk      |  10 +++++-----
 mk/defaults/options.description |   2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diffs (65 lines):

diff -r e505ee4013b2 -r 948a5f5af68d editors/emacs21-nox11/Makefile
--- a/editors/emacs21-nox11/Makefile    Sun Apr 26 05:38:26 2015 +0000
+++ b/editors/emacs21-nox11/Makefile    Sun Apr 26 05:54:29 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/02/17 00:22:36 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2015/04/26 05:54:30 mef Exp $
 
 PKGNAME=       emacs21-nox11-${EMACSVERSION}a
 PKGREVISION=   13
@@ -10,7 +10,7 @@
 .include "../../mk/bsd.prefs.mk"
 
 # Forcibly remove any "x11" options.
-PKG_OPTIONS.emacs+=    -x11 -emacs-xaw3d -motif -xaw
+PKG_OPTIONS.emacs+=    -x11 -xaw3d -motif -xaw
 
 .include "../../editors/emacs21/options.mk"
 
diff -r e505ee4013b2 -r 948a5f5af68d editors/emacs21/options.mk
--- a/editors/emacs21/options.mk        Sun Apr 26 05:38:26 2015 +0000
+++ b/editors/emacs21/options.mk        Sun Apr 26 05:54:29 2015 +0000
@@ -1,19 +1,19 @@
-# $NetBSD: options.mk,v 1.4 2014/05/31 15:56:26 wiz Exp $
+# $NetBSD: options.mk,v 1.5 2015/04/26 05:54:30 mef 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_OPTIONS_GROUP.toolkit=     motif xaw xaw3d
 PKG_SUGGESTED_OPTIONS=         x11
 
 .include "../../mk/bsd.options.mk"
 
 ###
-### Treat "emacs-xaw3d" as a special case of "xaw".
+### Treat "xaw3d" as a special case of "xaw".
 ###
-.if !empty(PKG_OPTIONS:Memacs-xaw3d)
+.if !empty(PKG_OPTIONS:Mxaw3d)
 XAW_TYPE=              3d
-PKG_OPTIONS:=          ${PKG_OPTIONS:Nemacs-xaw3d}
+PKG_OPTIONS:=          ${PKG_OPTIONS:Nxaw3d}
 PKG_OPTIONS+=          xaw
 .endif
 
diff -r e505ee4013b2 -r 948a5f5af68d mk/defaults/options.description
--- a/mk/defaults/options.description   Sun Apr 26 05:38:26 2015 +0000
+++ b/mk/defaults/options.description   Sun Apr 26 05:54:29 2015 +0000
@@ -154,7 +154,6 @@
 elinks-html-highlight  Enable HTML highlighting using DOM engine.
 elinks-root-exec       Allow elinks to run as root.
 emacs-w3m              W3m browser extention.
-emacs-xaw3d            Emacs should use Xaw3D for the scrollbar.
 embedded-server                Enable embedded server support for MySQL.
 enchant                        Add spell checking support using enchant.
 enchant-zemberek       Add spell checking support for Turkish.
@@ -778,6 +777,7 @@
 xapian-flint-backend   Enable "Flint" format Xapian database support.
 xapian-quartz-backend  Enable "Quartz" format Xapian database support.
 xaw                    Enable Xaw support.
+xaw3d                  Emacs should use Xaw3D for the scrollbar.
 xblast-mini            Use a 480x392 window instead a 960x784 window in xblast.
 xcb                    Enable XCB (libxcb) support.
 xcursor                        Enable Xcursor support.