diff options
| author | dougb <dougb@FreeBSD.org> | 2012-07-24 19:08:12 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2012-07-24 19:08:12 +0000 |
| commit | 2fc770e93b383b38f673e86fce7b3fc5d75d63c0 (patch) | |
| tree | 9484b37230b3481f309ddd3d76bc5f8d586930b6 | |
| parent | bf4ca397d7b9fc67cd4254cd07e7ce9b42b22250 (diff) | |
| download | FreeBSD-src-2fc770e93b383b38f673e86fce7b3fc5d75d63c0.zip FreeBSD-src-2fc770e93b383b38f673e86fce7b3fc5d75d63c0.tar.gz | |
Update to reflect new svn realities
| -rw-r--r-- | FREEBSD-Upgrade | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/FREEBSD-Upgrade b/FREEBSD-Upgrade index 2106309..799b72a 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' |
