--- src/etc/defaults/make.conf	2005/09/05 15:36:34	1.14
+++ src/etc/defaults/make.conf	2005/09/06 18:55:18	1.15
@@ -14,7 +14,6 @@
 # You have to find the things you can put here in the Makefiles and 
 # documentation of the source tree.
 #
-#
 # The CPUTYPE variable controls which processor should be targeted for
 # generated code.  This controls processor-specific optimizations in
 # certain code (currently only OpenSSL) as well as modifying the value
@@ -42,16 +41,12 @@
 # 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.
 #
-# CCVER?=gcc34	# (use GCC 3.4, default)
-# CCVER?=gcc40	# (use GCC 4.0, experimental, only available
-#               #               if WANT_GCC40 set)
-#
+#CCVER?=gcc34	# (use GCC 3.4, default)
+#CCVER?=gcc40	# (use GCC 4.0, experimental, must define WANT_GCC40)
 #
 # Build gcc40 with world.  This won't make gcc40 the default compiler
-#
 #WANT_GCC40=yes
 # 
-#
 # CFLAGS controls the compiler settings used when compiling C code.
 # Note that optimization settings above -O (-O2, ...) are not recommended
 # or supported for compiling the world or the kernel - please revert any
@@ -78,7 +73,6 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wba
 		-Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings
 #
 # WARNS_WERROR causes -Werror to be added when WARNS is in effect.
-#
 #WARNS_WERROR=	yes
 #
 # To compile just the kernel with special optimizations, you should use
@@ -95,9 +89,6 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wba
 # Compare before install
 #INSTALL=install -C
 #
-# To enable installing suidperl with the setuid bit turned on
-#ENABLE_SUIDPERL=	true
-#
 # To build ppp with normal permissions
 #PPP_NOSUID=	true
 #
@@ -105,11 +96,14 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wba
 #ENABLE_SUID_SSH=	true
 #
 # To avoid building various parts of the base system:
-#NO_CVS=	true	# do not build CVS
 #NO_BIND=	true	# do not build BIND
+#NO_CRYPT=	true	# do not build crypto code
+#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_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)
 #NO_LPR=	true	# do not build lpr and related programs
 #NO_MAILWRAPPER=true	# do not build the mailwrapper(8) MTA selector
 #NO_MODULES=	true	# do not build modules with the kernel
@@ -118,13 +112,13 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wba
 #NO_OPENSSL=	true	# do not build OpenSSL (implies NO_OPENSSH)
 #NO_PKGTOOLS=	true	# do not build included package tools (for pkgsrc)
 #NO_SENDMAIL=	true	# do not build sendmail and related programs
+#NO_SHARE=	true	# do not enter the share subdirectory
 #NO_SHAREDOCS=	true	# do not build the 4.4BSD legacy docs
 #NO_X=		true	# do not compile in XWindows support (e.g. doscmd)
-#NOCRYPT=	true	# do not build any crypto code
-#NOGAMES=	true	# do not build games (games/ subdir)
 #NOINFO=	true	# do not make or install info files
-#NOLIBC_R=	true	# do not build libc_r (re-entrant version of libc)
+#NOINFOCOMPRESS=true	# do not compress info files
 #NOMAN=		true	# do not build manual pages
+#NOMANCOMPRESS=	true	# do not compress man pages
 #NOPROFILE=	true	# Avoid compiling profiled libraries
 #NOSHARE=	true	# do not go into the share subdir
 #
@@ -134,6 +128,9 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wba
 # The list of modules to build instead of all of them.
 #MODULES_OVERRIDE=	emulation/linux net/ipfw
 #
+# To avoid running MAKEDEV all on /dev during install:
+#NO_MAKEDEV=	true
+#
 # The following controls building optional IDEA code in libcrypto and
 # certain ports.  Patents are involved - you must not use this unless
 # you either have a license or fall within patent 'fair use'
@@ -143,40 +140,13 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wba
 #
 # IDEA is patented in the USA and many European countries - thought to
 # be OK to use for any non-commercial use.  This is optional.
-#MAKE_IDEA=	YES	# IDEA (128 bit symmetric encryption)
-#
-# To avoid running MAKEDEV all on /dev during install:
-#NO_MAKEDEV=	true
-#
-# If you do not want unformatted manual pages to be compressed
-# when they are installed:
-#
-#NOMANCOMPRESS=	true
-#
-#
-# If you want the "compat" shared libraries installed as part of your normal
-# builds, uncomment these:
-#
-#COMPAT1X=	yes
-#COMPAT20=	yes
-#COMPAT21=	yes
-#COMPAT22=	yes
-#COMPAT3X=	yes
-#COMPAT4X=	yes
-#
-#
-# If you do not want additional documentation (some of which are
-# a few hundred KB's) for ports to be installed:
-#
-#NOPORTDOCS=	true
-#
+#WANT_IDEA=	YES	# IDEA (128 bit symmetric encryption)
 #
 # Default format for system documentation, depends on your printer.
 # Set this to "ascii" for simple printers or screen
 #
 #PRINTERDEVICE=	ps
 #
-#
 # How long to wait for a console keypress before booting the default kernel.
 # This value is approximately in milliseconds. Keypresses are accepted by the
 # BIOS before booting from disk, making it possible to give custom boot
@@ -208,45 +178,6 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wba
 #
 #LOADER_TFTP_SUPPORT= YES
 #
-# By default, the ports collection attempts to use XFree86 4.X.  If
-# you are running XFree86 3.3.X, uncomment this line.
-#
-#XFREE86_VERSION=	3
-#
-# By default, this points to /usr/X11R6 for XFree86 releases 3.0 or earlier.
-# If you have a XFree86 from before 3.0 that has the X distribution in
-# /usr/X386, you want to uncomment this.
-#
-#X11BASE=	/usr/X386
-#
-#
-# If you have Motif on your system, uncomment this.
-#
-#HAVE_MOTIF=	yes
-#MOTIF_STATIC=  yes
-#
-# If the default location of the Motif library (specified below) is NOT
-# appropriate for you, uncomment this and change it to the correct value.
-# If your motif is in ${X11BASE}/lib, you don't need to touch this line.
-#
-#MOTIFLIB=	-L${X11BASE}/lib -lXm
-#
-#
-# If you're resident in the USA, this will help various ports to determine
-# whether or not they should attempt to comply with the various U.S.
-# export regulations on certain types of software which do not apply to
-# anyone else in the world.
-#
-#USA_RESIDENT=		YES
-#
-#
-# Override "don't install a port that's already installed" behavior.
-# One might wish to do this for ports debugging or to unconditionally
-# reinstall a set of suspect/broken ports.
-#
-#FORCE_PKG_REGISTER=    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.
@@ -254,99 +185,22 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wba
 #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
 #
-# Port master sites.
-#
-# If you want your port fetches to go somewhere else than the default
-# (specified below) in case the distfile/patchfile was not found,
-# uncomment this and change it to a location nearest you.  (Don't
-# remove the "/${DIST_SUBDIR}/" part.)
-#
-#MASTER_SITE_BACKUP?=	\
-#	ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/${DIST_SUBDIR}/
-#
-# If you want your port fetches to check the above site first (before
-# the MASTER_SITES specified in the port Makefiles), uncomment the
-# line below.  You can also change the right side to point to wherever 
-# you want.
-#
-#MASTER_SITE_OVERRIDE?=	${MASTER_SITE_BACKUP}
-#
-# Some ports use a special variable to point to a collection of
-# mirrors of well-known software archives.  If you have a mirror close
-# to you, uncomment any of the following lines and change it to that
-# address.  (Don't remove the "/%SUBDIR%/" part.)
-#
-# Note: the right hand sides of the following lines are only for your
-# information.  For a full list of default sites, take a look at
-# bsd.sites.mk.
-#
-#MASTER_SITE_AFTERSTEP=	ftp://ftp.afterstep.org/%SUBDIR%/
-#MASTER_SITE_COMP_SOURCES=	ftp://gatekeeper.dec.com/pub/usenet/comp.sources.%SUBDIR%/
-#MASTER_SITE_FREEBSD_ORG=      ftp://ftp.FreeBSD.org/pub/FreeBSD/%SUBDIR%/
-#MASTER_SITE_GNOME=	ftp://ftp.gnome.org/pub/GNOME/%SUBDIR%/
-#MASTER_SITE_GNU=	ftp://ftp.gnu.org/gnu/%SUBDIR%/
-#MASTER_SITE_KDE=	ftp://ftp.kde.org/pub/kde/%SUBDIR%/
-#MASTER_SITE_LOCAL=	ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/%SUBDIR%/
-#MASTER_SITE_MOZILLA=	ftp://ftp.mozilla.org/pub/%SUBDIR%/
-#MASTER_SITE_NETBSD=	ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/%SUBDIR%/
-#MASTER_SITE_PERL_CPAN=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/%SUBDIR%/
-#MASTER_SITE_PORTS_JP=	ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/%SUBDIR%/
-#MASTER_SITE_RINGSERVER=	ftp://ftp.dnsbalance.ring.gr.jp/pub/%SUBDIR%/
-#MASTER_SITE_RUBY=     ftp://ftp.ruby-lang.org/pub/ruby/%SUBDIR%/
-#MASTER_SITE_SOURCEFORGE=	ftp://ftp2.sourceforge.net/pub/sourceforge/%SUBDIR%/
-#MASTER_SITE_SOURCEWARE=	ftp://ftp.freesoftware.com/pub/sourceware/%SUBDIR%/
-#MASTER_SITE_SUNSITE=	ftp://metalab.unc.edu/pub/Linux/%SUBDIR%/
-#MASTER_SITE_TCLTK=	ftp://ftp.scriptics.com/pub/tcl/%SUBDIR%/
-#MASTER_SITE_TEX_CTAN=	ftp://ftp.tex.ac.uk/tex-archive/%SUBDIR%/
-#MASTER_SITE_THEMES=	ftp://ftp.themes.org/pub/themes/%SUBDIR%/
-#MASTER_SITE_WINDOWMAKER=	ftp://ftp.windowmaker.org/pub/%SUBDIR%/
-#MASTER_SITE_XCONTRIB=	ftp://ftp.x.org/contrib/%SUBDIR%/
-#MASTER_SITE_XEMACS=	ftp://ftp.xemacs.org/pub/xemacs/%SUBDIR%/
-#MASTER_SITE_XFREE=	ftp://ftp.xfree86.org/pub/XFree86/%SUBDIR%/source/
-#
-# Also it is highly recommended that you configure MASTER_SORT_REGEX
-# to choose better mirror sites for you.  List awk(1)-style regular
-# expressions separated by space so MASTER_SITES will be sorted in
-# that order.  The following example is for Japanese users; change
-# "jp" part to your ccTLD ("de", "ru", "uk", etc.) or the domain names
-# of your nearest/upstream networks to meet your needs.
-#
-#MASTER_SORT_REGEX?=	://[^/]*\.jp[/.]
-#
-# Ports can place their working directories somewhere other than under 
-# /usr/ports.  
-#WRKDIRPREFIX=	/var/tmp
-#
-# Kerberos 5
-# If you want Kerberos 5 (KTH Heimdal), define this:
-#
-#MAKE_KERBEROS5=	yes
-#
-# Kerberos 5 su (k5su)
 # If you want to use the k5su utility, define this to have it installed
 # set-user-ID.
 #ENABLE_SUID_K5SU=	yes
 #
-#
-# Kerberos5
-# If you want to install MIT Kerberos5 port somewhere other than /usr/local,
-# define this (this is also used to tell ssh1 that kerberos is needed):
-#
-#KRB5_HOME=		/usr/local
-#
-#
 # CVSup update flags.  Edit SUPFILE settings to reflect whichever distribution
 # 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.
 #
 #SUP_UPDATE=     yes
-#
 #SUP=            /usr/local/bin/cvsup
 #SUPFLAGS=       -g -L 2
-#SUPHOST=        cvsup.uk.FreeBSD.org
-#SUPFILE=        /usr/share/examples/cvsup/stable-supfile
-#PORTSSUPFILE=   /usr/share/examples/cvsup/ports-supfile
+#SUPHOST=        cvsup.dragonflybsd.org
+#SUPFILE=        /usr/share/examples/cvsup/DragonFly-src-supfile
 #DOCSUPFILE=     /usr/share/examples/cvsup/doc-supfile
 #
 # top(1) uses a hash table for the user names.  The size of this hash
@@ -362,7 +216,6 @@ BDECFLAGS=	-W -Wall -ansi -pedantic -Wba
 #
 #DOC_LANG=	en_US.ISO8859-1 ru_RU.KOI8-R
 #
-#
 # sendmail
 #
 # The following sets the default m4 configuration file to use at