--- chapter.sgml 2011-12-17 13:00:07.687792023 +0000
+++ /tmp/cutting-edge-new 2011-12-17 12:38:30.000000000 +0000
@@ -1967,6 +1967,16 @@
+ make delete-old
+
+ This target deletes old (obsolete) files. This is important
+ because sometimes they cause problems if left on the disk, for
+ example the presence of the old utmp.h causes
+ problems in some ports when the new
+ utmpx.h is installed.
+
+
+
mergemaster
Now you can update the remaining configuration files, since
@@ -1979,6 +1989,14 @@
A full machine reboot is needed now to load the new kernel
and new world with new configuration files.
+
+
+ make delete-old-libs
+
+ Remove any obsolete libraries to avoid conflicts with newer
+ ones. Make sure that all ports have been rebuilt to use the new
+ libraries before you delete the old ones.
+
Note that if you're upgrading from one release of the same &os;
@@ -2035,8 +2053,10 @@
&prompt.root; mergemaster -p
&prompt.root; cd /usr/src
&prompt.root; make installworld
+&prompt.root; make delete-old
&prompt.root; mergemaster
-&prompt.root; reboot
+&prompt.root; reboot
+&prompt.root; make delete-old-libs
Read Further Explanations
@@ -2482,9 +2502,11 @@
- Deleting obsolete files, directories and libraries
+
+ Deleting obsolete files and directories
+
- Deleting obsolete files, directories and libraries
+ Deleting obsolete files and directories
As a part of the &os; development lifecycle, it happens from time
@@ -2503,14 +2525,13 @@
instructions will help you removing these obsolete files during the
system upgrade process.
- We assume you are following the steps outlined in . After the make
+ After the make
installworld and the subsequent
mergemaster commands have finished successfully, you
should check for obsolete files and libraries as follows:
&prompt.root; cd /usr/src
- &prompt.root; make check-old
+&prompt.root; make check-old
If any obsolete files are found, they can be deleted using the
following commands:
@@ -2789,8 +2810,8 @@
Rebooting
- You are now done. After you have verified that everything appears
- to be in the right place you can reboot the system. A simple
+ You are now almost done. After you have verified that everything
+ appears to be in the right place you can reboot the system. A simple
&man.shutdown.8; should do it:
&prompt.root; shutdown -r now
@@ -2806,11 +2827,11 @@
depend on those obsolete files. This is especially true for old
libraries. In most cases, you need to recompile the programs, ports,
or libraries that used the old library before make
- delete-old-libs is executed.
+ delete-old-libs is executed.
- Utilities for checking shared library dependencies are available from
- the Ports Collection in Utilities for checking shared library dependencies are available
+ from the Ports Collection in sysutils/libchk or sysutils/bsdadminscripts.
@@ -2818,7 +2839,7 @@
causing messages like these:
/usr/bin/ld: warning: libz.so.4, needed by /usr/local/lib/libtiff.so, may conflict with libz.so.5
- /usr/bin/ld: warning: librpcsvc.so.4, needed by /usr/local/lib/libXext.so, may conflict with librpcsvc.so.5
+/usr/bin/ld: warning: librpcsvc.so.4, needed by /usr/local/lib/libXext.so, may conflict with librpcsvc.so.5
To solve these problems, determine which port installed the
library:
@@ -2830,9 +2851,10 @@
Then deinstall, rebuild and reinstall the port. The ports-mgmt/portmaster and ports-mgmt/portupgrade utilities can be used to
- automate this process. After you've made sure that all ports are rebuilt
- and do not use the old libraries anymore, you can delete them using the
+ role="package">ports-mgmt/portupgrade utilities can be used
+ to automate this process. After you've made sure that all ports are
+ rebuilt and do not use the old libraries anymore, you can delete them
+ using the
following command:
&prompt.root; make delete-old-libs