Update to reflect new svn realities

This commit is contained in:
Doug Barton 2012-07-24 19:08:12 +00:00
parent edbc2a977c
commit c55bb3d31a

View File

@ -7,7 +7,8 @@
2) Check out the head of the subversion "vendor branch"
svn co $REPO/vendor/bind9/dist
REPO=svn+ssh://svn.freebsd.org/
svn co $REPO/base/vendor/bind9/dist
3) Unpack the tarball in a suitable directory:
@ -32,7 +33,7 @@
7) Commit the update to the vendor files:
cd dist ; svn ci -m "Vendor import of BIND 9.X.Y"
svn cp $REPO/vendor/bind9/dist $REPO/vendor/bind9/${version}
svn cp $REPO/base/vendor/bind9/dist $REPO/base/vendor/bind9/${version}
(this is a server-side operation, you dont have to check it out)
8) Update the files in src/contrib/bind9:
@ -42,7 +43,7 @@
Make sure you are up to date:
svn update ; svn status
svn merge $REPO/vendor/bind9/dist .
svn merge $REPO/base/vendor/bind9/dist .
Resolve conflicts (if any)
Carefully check the output of 'svn status' and 'svn diff'