Expand and refine a few sections for future reference

1 files changed, 11 insertions, 5 deletions

diff --git a/contrib/bind9/FREEBSD-Upgrade b/contrib/bind9/FREEBSD-Upgrade
index 7214046..04d1de1 100644
--- a/contrib/bind9/FREEBSD-Upgrade
+++ b/contrib/bind9/FREEBSD-Upgrade
@@ -6,7 +6,8 @@
 1) Obtain the latest source distribution from the ISC's FTP server
    (ftp://ftp.isc.org/isc/bind9/)
 
-2) Unpack the tarball in a suitable directory.
+2) Unpack the tarball in a suitable directory, and cd into the new
+   source directory.
 
 3) Remove unwanted files and directories:
 
@@ -18,15 +19,16 @@
    way to do this is to run a test import and see if any new files
    show up:
 
-	$ cvs -n import src/contrib/bind9 ISC x | grep \^N
+	$ cvs -q -n import src/contrib/bind9 ISC x | grep \^N
 
 4) Import the sources:
 
-	$ cvs import src/contrib/bind9 ISC BIND_9_X_Y
+	$ cvs import -m "Vendor import of BIND 9.X.Y" \
+		src/contrib/bind9 ISC BIND_9_X_Y
 
 5) Resolve conflicts.
 
-   As of 2004-09-27, we have no local patches against BIND 9; thus
+   As of 17 March 2005, we have no local patches against BIND 9; thus
    there are no conflicts to merge.  This may change at a later date.
 
 6) Remove any references to the {bin,lib}/tests and docutil
@@ -57,7 +59,10 @@
    commit it.  Do not commit any other file that was modified or
    created in steps 6) or 7).
 
-9) The following directories contain Makefiles for bits and pieces of
+9) cd src/lib/bind/dns && make -DMAINTAINER_MODE generate && rm gen
+   Commit the new versions of the files generated.
+
+   The following directories contain Makefiles for bits and pieces of
    BIND 9:
 
 	FreeBSD directory		ISC directory
@@ -95,5 +100,6 @@ B) Lather, rinse, repeat.
 C) Commit when everything builds cleanly and works properly.
 
 					-- des@FreeBSD.org
+					-- dougb@FreeBSD.org
 
 $FreeBSD$