summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authormef <mef>2015-04-26 05:54:29 +0000
committermef <mef>2015-04-26 05:54:29 +0000
commitf8ac1f594965b8c6150d4806939cc18139515843 (patch)
tree9347f5767bce1c3ff2862ffea10c3e8c418e1d66 /editors
parent6320bec07766bb9ec8bf75f2aa8bef70095c51c3 (diff)
downloadpkgsrc-f8ac1f594965b8c6150d4806939cc18139515843.tar.gz
Rename options emacs-xaw3d to simply xaw3d. Ref:
http://mail-index.netbsd.org/pkgsrc-users/2015/04/24/msg021447.html
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs21-nox11/Makefile4
-rw-r--r--editors/emacs21/options.mk10
2 files changed, 7 insertions, 7 deletions
diff --git a/editors/emacs21-nox11/Makefile b/editors/emacs21-nox11/Makefile
index af1dd9dade4..cbc9c978a1a 100644
--- a/editors/emacs21-nox11/Makefile
+++ b/editors/emacs21-nox11/Makefile
@@ -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 @@ CONFLICTS+= emacs21-[0-9]*
.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 --git a/editors/emacs21/options.mk b/editors/emacs21/options.mk
index bd6702f0c59..0b6e8e76c98 100644
--- a/editors/emacs21/options.mk
+++ b/editors/emacs21/options.mk
@@ -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