The last import of tcpdump 4.9.0 documentation. In vendor/tcpdump checkout: # tar xzvf tcpdump-4.9.0.tar.gz # mv tcpdump-4.9.0 4.9.0 # svn add 4.9.0/ # svn propdel -R svn:keywords 4.9.0 # svn commit 4.9.0 # cd 4.9.0 # rsync --archive --delete . ../dist/ # cd ../dist/ # svn rm $(svn stat | awk '$1 == "!" { print $2 }') # svn add $(svn stat | awk '$1 == "?" { print $2 }') # svn propdel -R svn:keywords . # svn commit Get revision from the last command. In head checkout: # cd contrib/tcpdump # svn merge -c ${rev} svn+ssh://repo.freebsd.org/base/vendor/tcpdump/dist Resolve conflicts. Our exclusion list is: aclocal.m4 Readme.Win32 tests win32 In head checkout: # cd usr.sbin/tcpdump Update Makefile if needed, and config.h. Compare to config.h generated by configure. Run 'make worlds' to test that everything is compilable. Commit.