cvs commit: src/share/examples/etc make.conf

Wed Dec 15 00:58:50 PST 2004

Hi Tom,

On Wed, Dec 15, 2004 at 10:49:01AM +0200, Ruslan Ermilov wrote:
> On Wed, Dec 15, 2004 at 02:10:50AM +0000, Tom Rhodes wrote:
> > trhodes     2004-12-15 02:10:50 UTC
> > 
> >   FreeBSD src repository
> > 
> >   Modified files:
> >     share/examples/etc   make.conf 
> >   Log:
> >   Add a few options with regards to ppp(8) and traceroute.
> >   Sort the list, please keep this list sorted.
> >   
> >   PR:             48569
> >   
> >   Revision  Changes    Path
> >   1.241     +17 -11    src/share/examples/etc/make.conf
> > 
> You unsorted the list, please fix.  The correct sorting
> order here is in "dictinary order", please see sort(1).
> 
OK, I've saved you a minute and prepared a patch myself.
Here's what it does:

1.  Fix the sorting using the dictionary order (sort -d).
2.  Group ppp(8) related build options together.

NB: The NO* ppp(8) options should be renamed to PPP_NO*.


Cheers,
-- 
Ruslan Ermilov
ru at FreeBSD.org
FreeBSD committer
-------------- next part --------------
Index: make.conf
===================================================================
RCS file: /home/ncvs/src/share/examples/etc/make.conf,v
retrieving revision 1.241
diff -u -r1.241 make.conf

--- make.conf	15 Dec 2004 02:10:50 -0000	1.241
+++ make.conf	15 Dec 2004 08:56:59 -0000
@@ -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).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20041215/14a4d50f/attachment.bin
