Update to r40541:

Remove the 'CVSup Method' of updating the Ports Collection.
Update two package names from cvsup to colordiff.
While here, change 'pkg remove' command to 'pkg delete' for consistency
with the manual, although 'pkg remove' works as well.