Attachment 26666 Details for Bug 45470 – file.diff

[patch] file.diff

file.diff (text/plain), 7.29 KB, created by Carl Schmidt on 2002-11-19 08:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carl Schmidt

Created: 2002-11-19 08:50:01 UTC

Size: 7.29 KB

patch

obsolete

>--- share/examples/etc/make.conf.old	Mon Nov 18 20:24:03 2002
>+++ share/examples/etc/make.conf	Tue Nov 19 02:24:57 2002
>@@ -31,7 +31,6 @@
> #   Intel ia64 architecture: itanium
> #
> # (?= allows to buildworld for a different CPUTYPE.)
>-#
> #CPUTYPE?=i686
> #NO_CPU_CFLAGS=	true	# Don't add -march=<cpu> to CFLAGS automatically
> #NO_CPU_COPTFLAGS=true	# Don't add -march=<cpu> to COPTFLAGS automatically
>@@ -43,28 +42,24 @@
> # to the developers.
> # Note also that at this time the -O2 setting is known to produce BROKEN
> # CODE on the Alpha platform.
>-#
> #CFLAGS= -O -pipe
> #
> # CXXFLAGS controls the compiler settings used when compiling C++ code.
> # Note that CXXFLAGS is initially set to the value of CFLAGS.  If you wish
> # to add to CXXFLAGS value, "+=" must be used rather than "=".  Using "="
> # alone will remove the often needed contents of CFLAGS from CXXFLAGS.
>-#
> #CXXFLAGS+= -fmemoize-lookups -fsave-memoized
> #
> # MAKE_SHELL controls the shell used internally by make(1) to process the
> # command scripts in makefiles.  Three shells are supported, sh, ksh, and
> # csh.  Using sh is most common, and advised.  Using ksh *may* work, but is
> # not guaranteed to.  Using csh is absurd.  The default is to use sh.
>-#
> #MAKE_SHELL?=sh
> #
> # BDECFLAGS are a set of gcc warning settings that Bruce Evans has suggested
> # for use in developing FreeBSD and testing changes.  They can be used by
> # putting "CFLAGS+=${BDECFLAGS}" in /etc/make.conf.  -Wconversion is not
> # included here due to compiler bugs, e.g., mkdir()'s mode_t argument.
>-#
> #BDECFLAGS=	-W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \
> #		-Wcast-qual -Wchar-subscripts -Winline \
> #		-Wmissing-prototypes -Wnested-externs -Wpointer-arith \
>@@ -74,7 +69,6 @@
> # this instead of CFLAGS (which is not applicable to kernel builds anyway).
> # There is very little to gain by using higher optimization levels, and doing
> # so can cause problems.
>-#
> #COPTFLAGS= -O -pipe
> #
> # To build the system compiler such that it forces high optimization levels to
>@@ -99,6 +93,13 @@
> # Without the setuid bit, newgrp cannot change users' groups.
> #ENABLE_SUID_NEWGRP=	true
> #
>+# To disable cleaning during ``make buildworld''.  This should not be set
>+# unless you know what you are doing.
>+#NOCLEAN=		true
>+#
>+# To run ``${MAKE} clean'' instead of ``${MAKE} cleandir''.
>+#NOCLEANDIR=		true
>+#
> # To avoid building various parts of the base system:
> #NO_CVS=	true	# do not build CVS
> #NO_CXX=	true	# do not build C++ and friends
>@@ -130,7 +131,6 @@
> # built by default because they clobber a number of system manpages with
> # manpages describing parts of the OpenSSL toolkit, including passwd(1),
> # err(3), md5(3), and others.
>-#
> #WANT_OPENSSL_MANPAGES=	true
> #
> # To build sys/modules when building the world (our old way of doing things)
>@@ -157,13 +157,10 @@
> #
> # 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
>@@ -171,18 +168,14 @@
> #COMPAT3X=	yes
> #COMPAT4X=	yes
> #
>-#
> # 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
> # parameters even when this is set to 0.
>-#
> #BOOTWAIT=0
> #BOOTWAIT=30000
> #
>@@ -194,31 +187,24 @@
> # a serial port as our console at all.  Alter as necessary.
> #
> #   COM1: = 0x3F8, COM2: = 0x2F8, COM3: = 0x3E8, COM4: = 0x2E8
>-#
> #BOOT_COMCONSOLE_PORT=	0x3F8
> #
> # The default serial console speed is 9600.  Set the speed to a larger value
> # for better interactive response.
>-#
> #BOOT_COMCONSOLE_SPEED=	115200
> #
> # By default the 'pxeboot' loader retrieves the kernel via NFS.  Defining
> # this and recompiling /usr/src/sys/boot will cause it to retrieve the kernel
> # via TFTP.  This allows pxeboot to load a custom BOOTP diskless kernel yet
> # still mount the server's '/' (i.e. rather than load the server's kernel).
>-#
> #LOADER_TFTP_SUPPORT= YES
> #
>-#
> # Kerberos IV
> # If you want KerberosIV (KTH eBones), define this:
>-#
> #MAKE_KERBEROS4=	yes
> #
>-#
> # Kerberos 5
> # If you want Kerberos 5 (KTH Heimdal), define this:
>-#
> #MAKE_KERBEROS5=	yes
> #
> # Kerberos 5 su (k5su)
>@@ -230,34 +216,31 @@
> # 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/standard-supfile
> #PORTSSUPFILE=   /usr/share/examples/cvsup/ports-supfile
> #DOCSUPFILE=     /usr/share/examples/cvsup/doc-supfile
>+#SUPFILE1=       /usr/share/examples/cvsup/cvs-supfile
>+#SUPFILE2=       /usr/share/examples/cvsup/gnats-supfile
> #
> # top(1) uses a hash table for the user names.  The size of this hash
> # can be tuned to match the number of local users.  The table size should
> # be a prime number approximately twice as large as the number of lines in
> # /etc/passwd.  The default number is 20011.
>-#
> #TOP_TABLE_SIZE= 101
> #
> # Documentation
> #
> # The list of languages and encodings to build and install
>-#
> #DOC_LANG=	en_US.ISO8859-1 ru_RU.KOI8-R
> #
> #
>@@ -270,7 +253,6 @@
> # Avoid using a value of /etc/mail/sendmail.mc as a buildworld will
> # create /etc/mail/sendmail.cf before installworld installs an
> # updated sendmail binary.
>-#
> #SENDMAIL_MC=/etc/mail/myconfig.mc
> #
> # The following sets the default m4 configuration file for mail
>@@ -280,7 +262,6 @@
> # Avoid using a value of /etc/mail/submit.mc as a buildworld will
> # create /etc/mail/submit.cf before installworld installs an
> # updated sendmail binary.
>-#
> #SENDMAIL_SUBMIT_MC=/etc/mail/mysubmit.mc
> #
> # If you need to build additional .cf files during a make buildworld,
>@@ -288,13 +269,11 @@
> # Avoid using a value of /etc/mail/sendmail.mc as a buildworld will
> # create /etc/mail/sendmail.cf before installworld installs an
> # updated sendmail binary.
>-#
> #SENDMAIL_ADDITIONAL_MC=/etc/mail/foo.mc /etc/mail/bar.mc
> #
> # Setting the following variable modifies the flags passed to m4 when
> # building a .cf file from a .mc file.  It can be used to enable
> # features disabled by default.
>-#
> #SENDMAIL_M4_FLAGS=
> #
> # Setting the following variables modifies the build environment for
>@@ -316,7 +295,6 @@
> #	sendmail.mc file:
> #
> #	define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLDBFile')
>-#
> #SENDMAIL_CFLAGS=
> #SENDMAIL_LDFLAGS=
> #SENDMAIL_LDADD=
>@@ -327,10 +305,8 @@
> # prevent the installation of /etc/mail/submit.cf.
> # This is a deprecated mode of operation.  See etc/mail/README for more
> # information.
>-#
> #SENDMAIL_SET_USER_ID=
> #
> # The permissions to use on alias and map databases generated using
> # /etc/mail/Makefile.  Defaults to 0640.
>-#
> #SENDMAIL_MAP_PERMS=
>--- make.conf.diff ends here ---

Actions: View | Diff

Attachments on bug 45470: 26665 | 26666