--- src/etc/defaults/make.conf	2006/07/02 16:03:42	1.17
+++ src/etc/defaults/make.conf	2006/09/10 20:53:21	1.18
@@ -22,8 +22,8 @@
 # NO_CPU_CFLAGS variable below.
 # Currently the following CPU types are recognized:
 #   Intel x86 architecture:
-#       (AMD CPUs)	k7 k6-2 k6 k5
-#       (Intel CPUs)	p4 p3 p2 i686 i586/mmx i586 i486 i386
+#       (AMD CPUs)	opteron athlon-fx athlon64 k8 k7 k6-3 k6-2 k6 k5
+#       (Intel CPUs)	p4 p3 p2 i686 i586/mmx i586 i486
 #
 # If you experience any problems after setting this flag, please unset
 # it again before submitting a bug report or attempting to modify code.
@@ -37,9 +37,9 @@
 #
 # The CCVER variable controls which GCC-version to use by default.  It
 # should be set using ?= so as not to interfere with CCVER overrides from
-# userland or the buildworld.  We currently recommend that an override NOT
-# be set in /etc/make.conf and that gcc 3.4 not yet be used to build the boot
-# blocks, boot loader, or the kernel.
+# userland or the buildworld.  Note that building world or the kernel using
+# the experimental compiler might be broken at any time.  We currently
+# recommend that an override NOT be set in /etc/make.conf.
 #
 #CCVER?=gcc34	# (use GCC 3.4, default)
 #CCVER?=gcc40	# (use GCC 4.0, experimental, must define WANT_GCC40)
@@ -104,6 +104,7 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wba
 #NO_CVS=	true	# do not build CVS
 #NO_FORTRAN=	true	# do not build g77 and related libraries
 #NO_GAMES=	true	# do not enter the games subdirectory
+#NO_GDB=	true	# do not build GDB
 #NO_I4B=	true	# do not build isdn4bsd package
 #NO_IPFILTER=	true	# do not build IP Filter package
 #NO_LIBC_R=	true	# do not build libc_r (re-entrant version of libc)
@@ -122,7 +123,6 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wba
 #NOMAN=		true	# do not build manual pages
 #NOMANCOMPRESS=	true	# do not compress man pages
 #NOPROFILE=	true	# Avoid compiling profiled libraries
-#NO_SHARE=	true	# do not go into the share subdir
 #
 # To build sys/modules when building the world (our old way of doing things)
 #MODULES_WITH_WORLD=true	# do not build modules when building kernel
@@ -172,13 +172,6 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wba
 #
 #LOADER_TFTP_SUPPORT= YES
 #
-# If you're behind a firewall and need FTP or HTTP proxy services for
-# ports collection fetching to work, the following examples give the
-# necessary syntax.  See the fetch(3) man page for details.
-#
-#FETCH_ENV=	FTP_PROXY=ftp://10.0.0.1:21
-#FETCH_ENV=	HTTP_PROXY=http://10.0.0.1:80
-#
 # If you want Kerberos 5, define this.
 #WANT_KERBEROS=	yes
 #
@@ -190,6 +183,9 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wba
 # file(s) you use on your site (see /usr/share/examples/cvsup/README for more
 # information on CVSup and these files).  To use, do "make update" in /usr/src.
 #
+# To enable building of lukemftpd, define this.
+#WANT_LUKEMFTPD=	yes
+#
 #SUP_UPDATE=     yes
 #SUP=            /usr/local/bin/cvsup
 #SUPFLAGS=       -g -L 2