Fix rejects.

svn path=/main/trunk/; revision=9326

diff --git a/cnf/make.conf.sparc-fbsd.diff b/cnf/make.conf.sparc-fbsd.diff
index d71178abbaca6e9a8473dfb3319fbbc253ea7db9..4ca3a50cdeb8b2458da18788ed7b8cb2d8690700 100644 (file)
--- a/cnf/make.conf.sparc-fbsd.diff
+++ b/cnf/make.conf.sparc-fbsd.diff
@@ -23,10 +23,10 @@
  
  # Portage Directories
  # ===================
-@@ -279,7 +286,8 @@
- #  'notitles'    disables xterm titlebar updates (which contain status info). 
- #  'parallel-fetch'
- #                do fetching in parallel to compilation
+@@ -272,7 +286,8 @@
+ #  'preserve-libs'
+ #                keep libraries around that would normally removed by an upgrade, 
+ #                but are still needed by other packages
 -#  'sandbox'     enables sandboxing when running emerge and ebuild.
 +#  'sandbox'     enables sandboxing when running emerge and ebuild. Doesn't
 +#                work on *BSD-based systems.

diff --git a/cnf/make.conf.x86-fbsd.diff b/cnf/make.conf.x86-fbsd.diff
index c2cf7cb71945c89ec6ca4574c37912da1fee2256..a71e5403291d71c40ee1c3a599ec6316402b0df4 100644 (file)
--- a/cnf/make.conf.x86-fbsd.diff
+++ b/cnf/make.conf.x86-fbsd.diff
@@ -63,10 +63,10 @@
  
  # Portage Directories
  # ===================
-@@ -279,7 +313,8 @@
- #  'notitles'    disables xterm titlebar updates (which contain status info). 
- #  'parallel-fetch'
- #                do fetching in parallel to compilation
+@@ -272,7 +313,8 @@
+ #  'preserve-libs'
+ #                keep libraries around that would normally removed by an upgrade, 
+ #                but are still needed by other packages
 -#  'sandbox'     enables sandboxing when running emerge and ebuild.
 +#  'sandbox'     enables sandboxing when running emerge and ebuild. Doesn't 
 +#                work on *BSD-based systems.