Merged proto package

[Alan Coopersmith]

Keith Packard wrote:
> At this point, I'd like people to nominate subdirectories that should be
> removed;

These seem unnecessary for a modern server build:

- calibrateproto
- lg3dproto
- pmproto
- printproto
- trapproto
- xf86miscproto
- xf86rushproto

evieproto is questionable, since people keep threatening to revive
it since app developers keep asking for that functionality.

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System