Feature merge from development version.

• Introduce WATCH_BUILD environment variable which, if set, causes build output to be shown in real-time (as opposed to just directed into a logfile).
• Ensure xorg X is updated as well as XFree86 X.
• Fix a logic bug that caused the script's version number to be passed to portupgrade a ridiculous number of times.