Move /etc/defaults/make.conf to /usr/share/examples/etc/make.conf as

discussed on the arch@ mailinglist (after repo-copy).

sys.mk will .error if it finds /etc/defaults/make.conf but include
it anyways (this is the same behaviour as with the make.conf.local
removal).

/usr/share/examples/etc/make.conf has BDEFLAGS commented out now,
since it's only an example file.

Adjust all textes that talk about make.conf or defaults/make.conf to
match the new situation.

5 files changed, 20 insertions, 17 deletions

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