Commit patch from ru which groups the ppp(8) options together and

kills my sorting.

Submitted by:	ru
Discussed with:	imp

1 files changed, 20 insertions, 20 deletions

diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index a5adf45..ad74d37 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -97,9 +97,6 @@
 # Mtree will follow symlinks
 #MTREE_FOLLOWS_SYMLINKS= -L
 #
-# To build ppp with normal permissions
-#PPP_NOSUID=
-#
 # To enable installing ssh(1) with the setuid bit turned on
 #ENABLE_SUID_SSH=
 #
@@ -108,49 +105,52 @@
 #ENABLE_SUID_NEWGRP=
 #
 # To avoid building various parts of the base system:
-#NOALIAS= 		# do not build ppp(8) with NAT support (see make.conf(5))
-#NOATM=			# do not build ATM related programs and libraries
-#NOCRYPT=		# do not build any crypto code
-#NOGAMES=		# do not build games (games/ subdir)
-#NOINET6=		# do not build IPv6 related programs and libraries
-#NOINFO=		# do not make or install info files
-#NOIPSEC= 		# do not build traceroute(8) with IPSEC support
-#NOLIBC_R=		# do not build libc_r (re-entrant version of libc)
-#NOLIBPTHREAD=		# do not build libpthread (M:N threading library)
-#NOLIBTHR=		# do not build libthr (1:1 threading library)
-#NOMAN=			# do not build manual pages
-#NONAT= 		# do not build ppp(8) with NAT support (see make.conf(5))
-#NONETGRAPH= 		# do not build ppp(8) with NETGRAPH support
-#NOPROFILE=		# Avoid compiling profiled libraries
-#NORADUIS= 		# do not build ppp(8) with RADUIS support
-#NOSHARE=		# do not go into the share subdir
-#NOSHARED= 		# build /bin and /sbin dynamically linked (bad idea
 #NO_ACPI=		# do not build acpiconf(8) and related programs
+#NOATM=			# do not build ATM related programs and libraries
 #NO_AUTHPF=		# do not build and install authpf (setuid/gid)
 #NO_BLUETOOTH=		# do not build Bluetooth related stuff
 #NO_BOOT=		# do not build boot blocks and loader
+#NOCRYPT=		# do not build any crypto code
 #NO_CVS=		# do not build CVS
 #NO_CXX=		# do not build C++ and friends
 #NO_DYNAMICROOT=	# do not link /bin and /sbin dynamically
 #NO_FORTRAN=		# do not build g77 and related libraries
+#NOGAMES=		# do not build games (games/ subdir)
 #NO_GDB=		# do not build GDB
 #NO_I4B=		# do not build isdn4bsd package
+#NOINET6=		# do not build IPv6 related programs and libraries
+#NOINFO=		# do not make or install info files
 #NO_IPFILTER=		# do not build IP Filter package
+#NOIPSEC= 		# do not build traceroute(8) with IPSEC support
 #NO_KERBEROS=		# do not build and install Kerberos 5 (KTH Heimdal)
+#NOLIBC_R=		# do not build libc_r (re-entrant version of libc)
+#NOLIBPTHREAD=		# do not build libpthread (M:N threading library)
+#NOLIBTHR=		# do not build libthr (1:1 threading library)
 #NO_LPR=		# do not build lpr and related programs
 #NO_MAILWRAPPER=	# do not build the mailwrapper(8) MTA selector
+#NOMAN=			# do not build manual pages
 #NO_MODULES=		# do not build modules with the kernel
 #NO_NIS=		# do not build NIS support and related programs
 #NO_OBJC=		# do not build Objective C support
 #NO_OPENSSH=		# do not build OpenSSH
 #NO_OPENSSL=		# do not build OpenSSL (implies NO_KERBEROS/NO_OPENSSH)
 #NO_PF=			# do not build PF firewall package
+#NOPROFILE=		# Avoid compiling profiled libraries
 #NO_SENDMAIL=		# do not build sendmail and related programs
+#NOSHARE=		# do not go into the share subdir
+#NOSHARED= 		# build /bin and /sbin dynamically linked (bad idea
 #NO_SHAREDOCS=		# do not build the 4.4BSD legacy docs
 #NO_TCSH=		# do not build and install /bin/csh (which is tcsh)
 #NO_TOOLCHAIN=		# do not build programs for program development
 #NO_USB=		# do not build usbd(8) and related programs
 #
+# Variables that control how ppp(8) is built.
+#NOALIAS= 		# do not build with NAT support (see make.conf(5))
+#NONAT= 		# do not build with NAT support (see make.conf(5))
+#NONETGRAPH= 		# do not build with NETGRAPH support
+#NORADUIS= 		# do not build with RADUIS support
+#PPP_NOSUID=		# build with normal permissions
+#
 # Variables to control whether parts of the base BIND are built.
 # Defining NO_BIND makes all of the following BIND variables obsolete.
 # Please see the more detailed descriptions in make.conf(5).