Drop EMACS_USE_POP, EMACS_USE_X and EMACS_USE_X_TOOLKIT from the

default variable settings.  These are now handled directly by the
editors/emacs20 package via the options framework.

1 files changed, 1 insertions, 21 deletions

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index d4f9320e988..610ffd41bb4 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.157 2007/08/01 16:14:17 joerg Exp $
+# $NetBSD: mk.conf,v 1.158 2007/08/14 19:04:56 jlam Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -820,26 +820,6 @@ EMACS_TYPE?=	emacs21
 # Possible: emacs21, emacs21nox, emacs20, xemacs214, xemacs215
 # Default: emacs21
 
-EMACS_USE_POP?= yes
-# Used by emacs package to determine whether pop support is enabled or not.
-# Possible: yes, no
-# Default: yes
-
-#EMACS_USE_X=
-# Used by emacs package to determine whether X support is enabled or not.
-# If defined, the value is directly passed as argument of --with-x.
-# If not defined, the configure script will configure automatically.
-# Possible: yes, no, not defined
-# Default: not defined
-
-#EMACS_USE_X_TOOLKIT=
-# Used by emacs package to determine what kind of toolkit support is enabled.
-# If defined, the value is directly passed as argument of --with-x-toolkit.
-# If not defined or defined to yes, the configure script will pick up an
-# appropriate one.  E.g, if X11R5 or later is found, lucid will be used.
-# Possible: yes, no, not defined, athena, lucid, motif
-# Default: not defined
-
 EXIM_GROUP?=	mail
 # Used in the exim package to specify the server group.
 # Possible: any group name