Update to recent upstream snapshot as of 2016-09-12

While on it:

• Add missing USE_XORG=xext for X11 OPTION
• Import patch by bar@ to deal with certain other ports e.g. x11/slim