aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2012-07-24 19:08:12 +0000
committerDoug Barton <dougb@FreeBSD.org>2012-07-24 19:08:12 +0000
commitc55bb3d31a5c057d53c2af6f908485d9720b0e85 (patch)
tree9484b37230b3481f309ddd3d76bc5f8d586930b6
parentedbc2a977c2ac736692a565c17eb98245f34ff59 (diff)
downloadsrc-c55bb3d31a5c057d53c2af6f908485d9720b0e85.tar.gz
src-c55bb3d31a5c057d53c2af6f908485d9720b0e85.zip
Update to reflect new svn realities
Notes
Notes: svn path=/vendor/bind9/dist/; revision=238750
-rw-r--r--FREEBSD-Upgrade7
1 files changed, 4 insertions, 3 deletions
diff --git a/FREEBSD-Upgrade b/FREEBSD-Upgrade
index 2106309457f8..799b72a88435 100644
--- a/FREEBSD-Upgrade
+++ b/FREEBSD-Upgrade
@@ -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'