Fix make.conf.example rejects. (trunk r7383)

svn path=/main/branches/2.1.2/; revision=7384

diff --git a/cnf/make.conf.sparc-fbsd.diff b/cnf/make.conf.sparc-fbsd.diff
index b3413da9ee6effbc05f2319bf171b446f4aaaea8..d71178abbaca6e9a8473dfb3319fbbc253ea7db9 100644 (file)
--- a/cnf/make.conf.sparc-fbsd.diff
+++ b/cnf/make.conf.sparc-fbsd.diff
@@ -23,13 +23,13 @@
  
  # Portage Directories
  # ===================
-@@ -287,7 +294,8 @@
+@@ -279,7 +286,8 @@
  #  'notitles'    disables xterm titlebar updates (which contain status info). 
  #  'parallel-fetch'
  #                do fetching in parallel to compilation
 -#  'sandbox'     enables sandboxing when running emerge and ebuild.
 +#  'sandbox'     enables sandboxing when running emerge and ebuild. Doesn't
 +#                work on *BSD-based systems.
- #  'strict'      causes portage to react strongly to conditions that are
- #                potentially dangerous, like missing/incorrect Manifest files.
- #  'userfetch'   when portage is run as root, drop privileges to
+ #  'splitdebug'  Prior to stripping ELF etdyn and etexec files, the debugging
+ #                info is stored for later use by various debuggers.  This
+ #                feature is disabled by 'nostrip'.  For installation of source

diff --git a/cnf/make.conf.x86-fbsd.diff b/cnf/make.conf.x86-fbsd.diff
index 6ce2c8090448143f049c3d337aff47727d5b9020..787bc35268fe5e162d52c9d722399cd7dba9010b 100644 (file)
--- a/cnf/make.conf.x86-fbsd.diff
+++ b/cnf/make.conf.x86-fbsd.diff
@@ -17,14 +17,15 @@
  # Host and optimization settings 
  # ==============================
  #
-@@ -33,10 +42,34 @@
+@@ -33,10 +43,34 @@
  # package (and in some cases the libraries it uses) at default optimizations
  # before reporting errors to developers.
  #
 -# Please refer to the GCC manual for a list of possible values.
 +# -mtune=<cpu-type> means optimize code for the particular type of CPU without
 +# breaking compatibility with other CPUs.
-+#
+ #
+-#CFLAGS="-O2 -pipe"
 +# -march=<cpu-type> means to take full advantage of the ABI and instructions
 +# for the particular CPU; this will break compatibility with older CPUs (for
 +# example, -march=athlon-xp code will not run on a regular Athlon, and
@@ -45,16 +46,15 @@
 +# Pentium-M CPU's should not enable sse2 until at least gcc-3.4. Bug 50616. #
 +# ************************************************************************* #
  #
--#CFLAGS="-O2 -pipe"
 +# Decent examples:
- #
++#
 +#CFLAGS="-mtune=athlon-xp -O3 -pipe"
 +#CFLAGS="-march=pentium3 -O3 -pipe"
 +
  # If you set a CFLAGS above, then this line will set your default C++ flags to
  # the same settings.
  #CXXFLAGS="${CFLAGS}"
-@@ -61,7 +80,7 @@
+@@ -61,7 +95,7 @@
  # DO NOT PUT ANYTHING BUT YOUR SPECIFIC ~ARCHITECTURE IN THE LIST.
  # IF YOU ARE UNSURE OF YOUR ARCH, OR THE IMPLICATIONS, DO NOT MODIFY THIS.
  #
@@ -63,12 +63,13 @@
  
  # Portage Directories
  # ===================
-@@ -268,7 +289,8 @@
+@@ -279,7 +313,8 @@
  #  'notitles'    disables xterm titlebar updates (which contain status info). 
  #  'parallel-fetch'
  #                do fetching in parallel to compilation
 -#  'sandbox'     enables sandboxing when running emerge and ebuild.
 +#  'sandbox'     enables sandboxing when running emerge and ebuild. Doesn't 
 +#                work on *BSD-based systems.
- #  'strict'      causes portage to react strongly to conditions that are
- #                potentially dangerous, like missing/incorrect Manifest files.
+ #  'splitdebug'  Prior to stripping ELF etdyn and etexec files, the debugging
+ #                info is stored for later use by various debuggers.  This
+ #                feature is disabled by 'nostrip'.  For installation of source