Fixed inconsistencies in comments.

1 files changed, 28 insertions, 30 deletions

diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf
index 7a66fdc963d..4142458f672 100644
--- a/mk/defaults/mk.conf
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.269 2017/01/01 02:07:53 tron Exp $
+# $NetBSD: mk.conf,v 1.270 2017/01/15 23:55:30 rillig Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -192,12 +192,12 @@ USE_ABI_DEPENDS?=	yes
 PKGSRC_COMPILER?=	gcc
 # Compiler type(s) to use for building packages
 # Possible: (see comments in mk/compiler.mk)
-# Default: "gcc"
+# Default: gcc
 
 PKGSRC_KEEP_BIN_PKGS?=	yes
 # Keep binary packages in ${PACKAGES} after building them
-# Possible: "yes", not "yes"
-# Default: "yes"
+# Possible: yes, not yes
+# Default: yes
 
 PKGSRC_MESSAGE_RECIPIENTS?=
 # login names of recipients of any MESSAGE files which will be mailed
@@ -208,8 +208,8 @@ PKGSRC_SHOW_BUILD_DEFS?=yes
 # Show BUILD_DEFS definitions for a package when it is being built
 # (BUILD_DEFS are extra definitions which govern how some packages are
 # built and behave)
-# Possible: "yes", not "yes"
-# Default: "yes"
+# Possible: yes, not yes
+# Default: yes
 
 PKGSRC_RUN_TEST?=	no
 #
@@ -397,7 +397,7 @@ DISTDIR?=	${PKGSRCDIR}/distfiles
 # Directory where original distribution
 # files are stored.
 # Possible: any path you like
-# Default: /usr/pkgsrc/distfiles
+# Default: ${PKGSRCDIR}/distfiles
 
 #DIST_PATH=	/cdrom/0/distfiles:${HOME}/distfiles
 # Colon-delimited list of directories in which to search for
@@ -464,7 +464,7 @@ RCD_SCRIPTS_DIR?= /etc/rc.d
 PACKAGES?=	${PKGSRCDIR}/packages
 # Stores generated packages
 # Possible: any path you like
-# Default: /usr/pkgsrc/packages
+# Default: ${PKGSRCDIR}/packages
 
 #PASSIVE_FETCH=
 # Use ftp(1) in passive mode, for use behind filtering firewalls.
@@ -477,8 +477,8 @@ PATCH_FUZZ_FACTOR?= -F0
 # using a patch(1) that understands -F.  This should be a "?="
 # setting, since package Makefiles may set this value, before
 # /etc/mk.conf is read.
-# Possible: "-Fn" where n is a number, none
-# Default: "-F0"
+# Possible: -Fn where n is a number, none
+# Default: -F0
 
 #ACCEPTABLE_LICENSES=	fee-based-commercial-use no-commercial-use \
 # 			no-profit limited-redistribution
@@ -674,7 +674,7 @@ AMANDA_USER?=	amandabackup
 # Used in the amanda packages to specify the login user and group
 # responsible for backups.
 # Possible: any user name
-# Default: backup
+# Default: amandabackup
 
 AMANDA_TMP?=	/tmp/amanda
 # Specifies the directory in which amanda puts its debug and temporary
@@ -790,7 +790,7 @@ CONSERVER_DEFAULTPORT?=	782
 CUPS_GROUP?=	lp
 # Used in cups to specify the group to run CUPS commands as.
 # Possible: any group name
-# Default: sys
+# Default: lp
 
 CUPS_USER?=	lp
 # Used in cups to specify the user to run CUPS commands as and to create
@@ -803,9 +803,9 @@ CUPS_SYSTEM_GROUPS?=	${REAL_ROOT_GROUP}
 # Possible: any group names, except that of ${CUPS_GROUP}
 # Default: ${REAL_ROOT_GROUP}
 
-# CYRUS_IDLE
+#CYRUS_IDLE?=
 # use METHOD for IMAP IDLE
-# METHOD is poll, idled or no
+# Possible: poll, idled, no
 # Default: not defined
 
 CYRUS_GROUP?=	mail
@@ -866,7 +866,7 @@ DIALER_GROUP?= dialer
 DT_LAYOUT?= US
 # Used by dt package to specify the keyboard layout.
 # Possible: US, FI, FR, GER, DV
-# Default: FI
+# Default: US
 
 ELK_GUI?=	none
 # Used by elk to determine which GUI API modules are enabled.
@@ -972,14 +972,14 @@ GAMEGRP?=	${GAMES_GROUP}
 # supporting packages that use bsd.*.mk.
 # See also:	GAMES_GROUP, USE_GAMESGROUP
 # Possible:	any group name
-# Default:	GAMES_GROUP
+# Default:	${GAMES_GROUP}
 
 GAMEOWN?=	${GAMES_USER}
 # Legacy form of GAMES_USER; should only be used in the context of
 # supporting packages that use bsd.*.mk.
 # See also:	GAMES_USER
 # Possible:	any user name
-# Default:	GAMES_USER
+# Default:	${GAMES_USER}
 
 #GRUB_NETWORK_CARDS=
 # Compile netboot support for the listed network interface cards into GRUB.
@@ -1024,19 +1024,19 @@ ICECAST_CHROOTDIR?=	  ${VARBASE}/chroot/icecast
 # Possible: Any valid directory
 # Default: ${VARBASE}/chroot/icecast
 
-#ICECAST_CHUNKLEN=512
+#ICECAST_CHUNKLEN?=64
 # If you want a larger backlog for each client, which will allow for
 # worse network congestion or other network errors before kicking the
 # client, increase the ICECAST_CHUNKLEN value.
-# Default: 64
+# Default: (see audio/icecast1/Makefile)
 
-#ICECAST_SOURCE_BUFFSIZE=8192
+#ICECAST_SOURCE_BUFFSIZE?=8192
 # SOURCE_BUFFSIZE sets how many bytes will be read from the source
 # before trying to send this chunk to the clients. If your server will
 # take on a lot of listeners, or stream very high bitrate mpeg data,
 # like video mpeg streams, and if you system supports it, you should
 # increase this value to 65535 or something similar.
-# Default: 8192
+# Default: (see audio/icecast1/Makefile)
 
 IMAP_UW_CCLIENT_MBOX_FMT?=	unix
 # Used in imap-uw to set the default format used by c-client programs for
@@ -1179,7 +1179,7 @@ JAKARTA_HOME?= ${JAVA_HOME}/jakarta
 
 #KNEWS_DOMAIN_NAME=
 # Used in the knews package to set the domain name.
-# Possible:  almost anything really, usually a FQDN.
+# Possible: almost anything really, usually a FQDN.
 # Default: none
 
 #LIBDVDCSS_HOMEPAGE=
@@ -1203,7 +1203,7 @@ JAKARTA_HOME?= ${JAVA_HOME}/jakarta
 #LATEX2HTML_ICONPATH=
 # Used in the latex2html package to set URL prefix for where to
 # find latex2html's icons.
-# Possible:  a URL prefix
+# Possible: a URL prefix
 # Default: none
 
 LEAFNODE_DATA_DIR?= ${VARBASE}/news
@@ -1467,10 +1467,8 @@ PILRC_USE_GTK?=	YES
 # Default: YES
 
 #PKG_JVM_DEFAULT=
-#       The JVM that should be used if nothing particular is specified.
-#
-#       Possible values: jdk kaffe openjdk7
-#               jdk14 sun-jdk6 jdk15
+# The JVM that should be used if nothing particular is specified.
+# Possible: (platform-dependent; see mk/java-vm.mk)
 
 #POPTOP_USE_MPPE=
 # Used in poptop package to specify the use of the mppe-ppp package
@@ -1609,7 +1607,7 @@ SDIST_PAWD?= pwd
 #SERIAL_DEVICES=
 # Used to provide a default setting for all the serial devices for
 # various packages which communicate over the serial port.
-# Possible:  /dev/your_favorite_serial_device0 /dev/your_favorite_serial_device1 ...
+# Possible: /dev/your_favorite_serial_device0 /dev/your_favorite_serial_device1 ...
 # Default: defaults for various machine_archs are set in mk/bsd.prefs.mk
 
 SILC_CLIENT_WITH_PERL?=	YES
@@ -1635,7 +1633,7 @@ SSYNC_PAWD?= pwd
 
 TEX_DEFAULT?=  teTeX3
 # Specify the user's favorite latex implementation
-# Possible values: teTeX3
+# Possible: teTeX3
 # Default: teTeX3
 
 #TEXMFSITE=
@@ -1732,7 +1730,7 @@ WINDOWMAKER_THEMES?= freebsdtheme-0.52 netbsddrinkingteam-0.60.0 netbsd_-0.52
 # The serial device for misc/bottlerocket to use to communicate
 # to the X10 adaptor.
 # Possible:  /dev/your_favorite_serial_device
-# Default: defaults to ${DEFAULT_SERIAL_DEVICE}
+# Default: ${DEFAULT_SERIAL_DEVICE}
 
 XAW_TYPE?=standard
 # Used in various packages to specify that libXaw is used.