Unable to upgrade my packages

[Patrick Mahan]

System Information:

   Intel I7 @ 3.2 GHz
   Memory: 12 Gbytes
   Disk: 1 TB Seagate Barracuda
         1 Partition of 500G assigned to FreeBSD
   Freebsd 9.3-RELEASE-p21 GENERIC

I'm having an issue after upgrading my binary packages.  Since I have been rather
busy with other issues (e.g. work ;-) ), it has been a while since
I had upgraded my system.  However, with the Thanksgiving holidays upon us
I decided to bring everything up to spec.

I first started by upgrading my binary packages using the following commands:

   # pkg update
   # pkg upgrade

This proceeded to take it's usual 3-4 hours (mostly due to timeouts while
downloading package updates).  Eventually, it finished except for updating
CUPS.  There I got a conflict:

pkg: cups-2.2.1 conflicts with cups-base-2.0.3_3 (installs files into the same
place).  Problematic file: /usr/local/bin/cancel

I then did a 'pkg autoremove' which completed with no errors.

But the conflict still exists.  Is there a way to bypass this as it seems to
prevent the 'pkg upgrade' from completing.  Should I remove CUPS?  Then re-
install it?

Unfortunately, this has caused some serious havoc as I have lost my GUI when
I tried to reboot.  I suspect it has to do with the failed upgrade.

Suggestions?

Thanks,

Patrick