diff options
| -rw-r--r-- | etc/Makefile | 3 | ||||
| -rw-r--r-- | etc/defaults/make.conf | 280 | ||||
| -rw-r--r-- | games/fortune/datfiles/freebsd-tips | 4 | ||||
| -rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/article.sgml | 2 | ||||
| -rw-r--r-- | release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 2 | ||||
| -rw-r--r-- | share/examples/etc/README.examples | 2 | ||||
| -rw-r--r-- | share/examples/etc/make.conf | 20 | ||||
| -rw-r--r-- | share/man/man5/make.conf.5 | 8 | ||||
| -rw-r--r-- | share/man/man7/build.7 | 4 | ||||
| -rw-r--r-- | share/mk/sys.mk | 3 |
10 files changed, 24 insertions, 304 deletions
diff --git a/etc/Makefile b/etc/Makefile index c94460f..4dc612f 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -68,7 +68,6 @@ distribution: ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${BIN1} ${DESTDIR}/etc; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 ${BIN2} ${DESTDIR}/etc; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 defaults/rc.conf ${DESTDIR}/etc/defaults/; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 defaults/make.conf ${DESTDIR}/etc/defaults/; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 defaults/pccard.conf ${DESTDIR}/etc/defaults/; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 defaults/periodic.conf ${DESTDIR}/etc/defaults/; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \ @@ -203,8 +202,6 @@ etc-examples: opieaccess ${DESTDIR}/usr/share/examples/etc; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 defaults/rc.conf \ ${DESTDIR}/usr/share/examples/etc/defaults; \ - ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 defaults/make.conf \ - ${DESTDIR}/usr/share/examples/etc/defaults; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 defaults/pccard.conf \ ${DESTDIR}/usr/share/examples/etc/defaults; \ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 defaults/periodic.conf \ diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf deleted file mode 100644 index 69bd12d..0000000 --- a/etc/defaults/make.conf +++ /dev/null @@ -1,280 +0,0 @@ -# $FreeBSD$ -# -# NOTE: Please would any committer updating this file also update the -# make.conf(5) manual page, if necessary, which is located in -# src/share/man/man5/make.conf.5. -# -# This file, if present, will be read by make (see /usr/share/mk/sys.mk). -# It allows you to override macro definitions to make without changing -# your source tree, or anything the source tree installs. -# -# This file must be in valid Makefile syntax. -# -# 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 targetted for -# generated code. This controls processor-specific optimizations in -# certain code (currently only OpenSSL) as well as modifying the value -# of CFLAGS to contain the appropriate optimization directive to gcc. -# The automatic setting of CFLAGS may be overridden using the -# NO_CPU_CFLAGS variable below. -# Currently the following CPU types are recognised: -# Intel x86 architecture: -# (AMD CPUs) k7 k6-2 k6 k5 -# (Intel CPUs) p4 p3 p2 i686 i586/mmx i586 i486 i386 -# Alpha/AXP architecture: ev6 pca56 ev56 ev5 ev45 ev4 -# Intel ia64 architecture: itanium -# -#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 -# -# 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 -# nonstandard optimization settings to "-O" before submitting bug reports -# 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 -# -# 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, eg: 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 \ - -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings -# -# To compile just the kernel with special optimizations, you should use -# 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 -# a lower one. GCC -O2+ is known to trigger known optimizer bugs at various -# times -- this is worse on the Alpha platform. The value assigned here will -# be the highest optimization value used. -#WANT_FORCE_OPTIMIZATION_DOWNGRADE=1 -# -# Compare before install -#INSTALL=install -C -# -# Mtree will follow symlinks -#MTREE_FOLLOWS_SYMLINKS= -L -# -# To enable installing suidperl with the setuid bit turned on -#ENABLE_SUIDPERL= true -# -# To build ppp with normal permissions -#PPP_NOSUID= true -# -# To enable installing ssh(1) with the setuid bit turned on -#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_FORTRAN= true # do not build g77 and related libraries -#NO_I4B= true # do not build isdn4bsd package -#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 -#NO_OBJC= true # do not build Objective C support -#NO_OPENSSH= true # do not build OpenSSH -#NO_OPENSSL= true # do not build OpenSSL (implies NO_OPENSSH) -#NO_SENDMAIL= true # do not build sendmail and related programs -#NO_SHAREDOCS= true # do not build the 4.4BSD legacy docs -#NO_TCSH= true # do not build and install /bin/csh (which is tcsh) -#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) -#NOPERL= true # do not build perl. Disables OpenSSL optimizations -#NOPROFILE= true # Avoid compiling profiled libraries -#NOSECURE= true # do not build crypto code in secure/ subdir -#NOSHARE= true # do not go into the share subdir -#NOUUCP= true # do not build uucp related programs -# -# To build the OpenSSL manpages, uncomment the following. These are not -# 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) -#MODULES_WITH_WORLD=true # do not build modules when building kernel -# -# -# 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' -# provisions. -# -# *** It is YOUR RESPONSIBILITY to determine if you can use this! *** -# -# 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 set NO_MAKEDEV_RUN. -# If you don't want to install MAKEDEV set NO_MAKEDEV_INSTALL, this implies -# NO_MAKEDEV_RUN. -#NO_MAKEDEV_INSTALL= true -#NO_MAKEDEV_RUN= 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 -# -# -# 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 -# -# By default, the system will always use the keyboard/video card as system -# console. However, the boot blocks may be dynamically configured to use a -# serial port in addition to or instead of the keyboard/video console. -# -# By default we use COM1 as our serial console port *if* we're going to use -# 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 then 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 -# -# -# 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 -# -# 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 -# -# -# sendmail -# -# The following sets the default m4 configuration file to use at -# install time. Use with caution as a make install will overwrite -# any existing /etc/mail/sendmail.cf. Note that SENDMAIL_CF is now -# deprecated. The value should be a fully qualified path name. -# -#SENDMAIL_MC=/etc/mail/myconfig.mc -# -# If you need to build additional .cf files during a make buildworld, -# include the full paths to the .mc files in SENDMAIL_ADDITIONAL_MC. -# -#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 -# sendmail and its related utilities. For example, SASL support can be -# added with settings such as: -# -# SENDMAIL_CFLAGS=-I/usr/local/include/sasl -DSASL -# SENDMAIL_LDFLAGS=-L/usr/local/lib -# SENDMAIL_LDADD=-lsasl -# -# Note: If you are using Cyrus SASL with other applications which require -# access to the sasldb file, you should add '-D_FFR_UNSAFE_SASL' to -# SENDMAIL_CFLAGS. Also, add the following to your sendmail.mc file: -# -# define(`confDONT_BLAME_SENDMAIL',`GroupReadableSASLFile') -# -#SENDMAIL_CFLAGS= -#SENDMAIL_LDFLAGS= -#SENDMAIL_LDADD= -#SENDMAIL_DPADD= diff --git a/games/fortune/datfiles/freebsd-tips b/games/fortune/datfiles/freebsd-tips index 391fb50..3e16e34 100644 --- a/games/fortune/datfiles/freebsd-tips +++ b/games/fortune/datfiles/freebsd-tips @@ -85,8 +85,8 @@ To change an environment variable in /bin/sh use: $ export VARIABLE -- Giorgos Keramidas <keramida@ceid.upatras.gr> % -/etc/make.conf contains overrides to /etc/defaults/make.conf, which -controls the options used to compile software on this system. +You can use /etc/make.conf to control the options used to compile software +on this system. Example entries are in /usr/share/examples/etc/make.conf. % To do a fast search for a file, try diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml index c9c7f7b..59de202 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml @@ -2057,7 +2057,7 @@ <para>New <filename>make.conf</filename> options: <varname>SENDMAIL_MC</varname> and <varname>SENDMAIL_ADDITIONAL_MC</varname>. See - <filename>/etc/defaults/make.conf</filename> for more + <filename>/usr/share/examples/etc/make.conf</filename> for more information. &merged;</para> <para><filename>/etc/mail/Makefile</filename> now supports: the diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml index c9c7f7b..59de202 100644 --- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml +++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml @@ -2057,7 +2057,7 @@ <para>New <filename>make.conf</filename> options: <varname>SENDMAIL_MC</varname> and <varname>SENDMAIL_ADDITIONAL_MC</varname>. See - <filename>/etc/defaults/make.conf</filename> for more + <filename>/usr/share/examples/etc/make.conf</filename> for more information. &merged;</para> <para><filename>/etc/mail/Makefile</filename> now supports: the diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples index 4b27f66..b902723 100644 --- a/share/examples/etc/README.examples +++ b/share/examples/etc/README.examples @@ -28,7 +28,7 @@ locate.rc - confiuration file for locate(1) login.access - configuration file for login(8) (see login.access(5)) login.conf - login class capabilities database (see login.conf(5)) mail.rc - systemwide initialization files for mail(1) -make.conf - defines configuration variables for system builds +make.conf - example configuration variables for system builds manpath.config - configuration file for man(1) modems - modem configuration database (see modems(5)) motd - sample Message of the Day diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 69bd12d..959979f 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -4,14 +4,16 @@ # make.conf(5) manual page, if necessary, which is located in # src/share/man/man5/make.conf.5. # -# This file, if present, will be read by make (see /usr/share/mk/sys.mk). -# It allows you to override macro definitions to make without changing -# your source tree, or anything the source tree installs. +# /etc/make.conf, if present, will be read by make (see +# /usr/share/mk/sys.mk). It allows you to override macro definitions +# to make without changing your source tree, or anything the source +# tree installs. # # This file must be in valid Makefile syntax. # -# You have to find the things you can put here in the Makefiles and -# documentation of the source tree. +# There are additional things you can put into /etc/make.conf. +# You have to find those in the Makefiles and documentation of +# the source tree. # # # The CPUTYPE variable controls which processor should be targetted for @@ -53,10 +55,10 @@ # putting "CFLAGS+=${BDECFLAGS}" in /etc/make.conf. -Wconversion is not # included here due to compiler bugs, eg: 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 \ - -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings +#BDECFLAGS= -W -Wall -ansi -pedantic -Wbad-function-cast -Wcast-align \ +# -Wcast-qual -Wchar-subscripts -Winline \ +# -Wmissing-prototypes -Wnested-externs -Wpointer-arith \ +# -Wredundant-decls -Wshadow -Wstrict-prototypes -Wwrite-strings # # To compile just the kernel with special optimizations, you should use # this instead of CFLAGS (which is not applicable to kernel builds anyway). diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 7375a3c..77eb1dd 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -106,7 +106,7 @@ is provided as a set of settings suggested by .An "Bruce Evans" Aq bde@FreeBSD.org for developing and testing changes. -They can be used by: +They can be used, if set, by: .Pp .Bd -literal -offset indent CXFLAGS+=${BDECFLAGS} @@ -575,9 +575,9 @@ for postscript or graphics printers with a ghostscript filter. .El .Sh FILES -.Bl -tag -width /etc/defaults/make.conf -compact -.It Pa /etc/defaults/make.conf +.Bl -tag -width /usr/share/examples/etc/make.conf -compact .It Pa /etc/make.conf +.It Pa /usr/share/examples/etc/make.conf .It Pa /usr/doc/Makefile .It Pa /usr/src/Makefile .It Pa /usr/src/Makefile.inc1 @@ -603,5 +603,5 @@ This manual page may occasionally be out of date with respect to the options currently available for use in .Nm . Please check the -.Pa /etc/defaults/make.conf +.Pa /usr/share/examples/etc/make.conf file for the latest options which are available. diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 811d1d8..6c5971d 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -108,9 +108,9 @@ library sub-directory. For more information about the ports build process, see .Xr ports 7 . .Sh FILES -.Bl -tag -width /etc/defaults/make.conf -compact -.It Pa /etc/defaults/make.conf +.Bl -tag -width /usr/share/examples/etc/make.conf -compact .It Pa /etc/make.conf +.It Pa /usr/share/examples/etc//make.conf .It Pa /usr/doc/Makefile .It Pa /usr/doc/share/mk/doc.project.mk .It Pa /usr/src/Makefile diff --git a/share/mk/sys.mk b/share/mk/sys.mk index fa7a680..dec766c 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -245,6 +245,7 @@ HTAGSFLAGS= .endif .if exists(/etc/defaults/make.conf) +.error Error, /etc/defaults/make.conf has been moved to /usr/share/examples/etc/make.conf and is not included any more. .include </etc/defaults/make.conf> .endif @@ -255,7 +256,7 @@ HTAGSFLAGS= .include <bsd.cpu.mk> .if exists(/etc/make.conf.local) -.error Error, original /etc/make.conf should be moved to the /etc/defaults/ directory and /etc/make.conf.local should be renamed to /etc/make.conf. +.error Error, /etc/make.conf.local should be renamed to /etc/make.conf. .include </etc/make.conf.local> .endif |
