Some cleanup from ISIHARA Takanori in PR 47928.

1 files changed, 9 insertions, 47 deletions

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index bd8adf6463c..97653f5785c 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.222 2013/05/18 01:58:32 ryoon Exp $
+# $NetBSD: mk.conf,v 1.223 2013/06/14 18:44:35 wiz Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -268,13 +268,13 @@ VARBASE?=	/var
 # Default: native
 # The default is defined in bsd.prefs.mk to allow platform specific overrides.
 
-#X11BASE?=	/usr/X11R6
+#X11BASE?=	/usr/X11R7
 # Where X11 is installed on the system.
 # (and the default install path of X11 pkgs)
 # Possible: any path
-# Default: /usr/X11R6, /usr/openwin for Solaris
+# Default: /usr/X11R7, /usr/openwin for Solaris
 
-#MOTIFBASE?=	/usr/X11R6
+#MOTIFBASE?=	/usr/X11R7
 # Where Motif-2.0-compatible headers and libraries are installed
 # on the system.
 # Possible: any path
@@ -405,7 +405,7 @@ PACKAGES?=	${PKGSRCDIR}/packages
 
 #PASSIVE_FETCH=
 # Use ftp(1) in passive mode, for use behind filtering firewalls.
-# (Set by default in ftp(1) in NetBSD-current)
+# (Set by default in ftp(1).)
 # Possible: defined, not defined
 # Default: not defined
 
@@ -663,7 +663,7 @@ ARLA_CACHE?=	${LOCALBASE}/cache
 BIND_DIR?=		${VARBASE}/chroot/named
 # The directory for BIND system user.
 # Possible: any valid location
-# Default: ${VARBASE}/named
+# Default: ${VARBASE}/chroot/named
 
 BIND_GROUP?=		named
 # System group to run the BIND name server as. Used by the "bind9" package.
@@ -830,7 +830,7 @@ EMACS_TYPE?=	emacs24
 # Possible: emacs24, emacs23, emacs23nox, emacs22, emacs22nox,
 #	emacs21, emacs21nox, emacs20,
 #	xemacs214, xemacs215
-# Default: emacs23
+# Default: emacs24
 
 EXIM_GROUP?=	mail
 # Used in the exim package to specify the server group.
@@ -1359,18 +1359,6 @@ NMH_PAGER?= more
 # Possible: not defined, communicator, navigator, mozilla
 # Default: not defined, which implies communicator
 
-#NS_USE_BSDI=	YES
-# Used to decide if i386 BSDi Netscape binary should be used in preference
-# to linux version.
-# Possible: not defined, YES
-# Default: not defined
-
-#NS_USE_SUNOS=	YES
-# Used to decide if sparc SunOS-4.1 Netscape binary should be used in preference
-# to the Solaris-2.5.1 version.
-# Possible: not defined, YES
-# Default: not defined
-
 OPENSSH_CHROOT?=	${VARBASE}/chroot/sshd
 # The chroot directory for OpenSSH with privilege separation. This directory
 # will be created and MUST be only readable by root.
@@ -1445,14 +1433,6 @@ PILRC_USE_GTK?=	YES
 #       Possible values: jdk kaffe openjdk7 openjdk7-bin
 #               jdk14 sun-jdk6 jdk15
 
-PKG_LANG?=english
-# Used to specify preferred language settings
-# Currently only used by www/netscape7 and misc/openoffice
-# Possible: depends on packages supporting this variable, basically any
-# language.  Should be '<lang>_<lc>' or '<lang>', for example 'english_uk',
-# 'german' or 'portuguese_br'.
-# Default: english
-
 #POPTOP_USE_MPPE=
 # Used in poptop package to specify the use of the mppe-ppp package
 # in preference to the standard ppp
@@ -1573,7 +1553,7 @@ SCREWS_GROUP?=	www
 # Used in the screws package to specify the user under which the server
 # should be run.
 # Possible: any user name
-# Default: screws
+# Default: www
 
 SCREWS_USER?=	screws
 # Used in the screws package to specify the user under which the server
@@ -1603,14 +1583,6 @@ SILC_CLIENT_WITH_PERL?=	YES
 # Possible: sparcv7, sparcv8 or sparcv9.
 # Default: sparcv7
 
-#SQUID_CONFIGURE_ARGS=
-# Used in squid package to set build configuration options.
-# Possible: see "configure --help"
-# Default: --enable-cachemgr-hostname=localhost
-#          --enable-icmp
-#          --enable-ipf-transparent
-#          --enable-snmp
-
 SSH_SUID?= NO
 # Used in ssh to enable setuid installation of "ssh" binary.
 # Possible: YES, or NO.
@@ -1627,11 +1599,6 @@ SSYNC_PAWD?= pwd
 # Possible: 12.1, 10.0
 # Default: depends on operating system version
 
-TEX_DEFAULT?=	teTeX3
-# Specify the user's favorite latex implementation
-# Possible values: teTeX3
-# Default: teTeX3
-
 #TEXMFSITE=
 # Used in TeXfamily package which depends on teTeX package to specify
 # site-local texmf configuration.
@@ -1730,14 +1697,9 @@ WINDOWMAKER_THEMES?= freebsdtheme-0.52 netbsddrinkingteam-0.60.0 netbsd_-0.52
 
 XAW_TYPE?=standard
 # Used in various packages to specify that libXaw is used.
-# Possible: standard, 3d, xpm
+# Possible: standard, 3d, xpm, neXtaw
 # Default: standard
 
-XEN12_USE_COM2?=	NO
-# This option changes Xen's serial console port to com2.
-# Possible: YES, NO
-# Default: NO
-
 #XLOCK_DEFAULT_MODE=
 # Set the default display (screen saver) mode for xlockmore.
 # Possible: ant, apollonian, ball, bat, blank, blot, bomb, bouboule, bounce,