branches: 1.2.32;
- define COMMON as "${.CURDIR}/../common", and use appropriately
- remove .PATH: ${.CURDIR}/../common
- update the various MERGED_SRCS lines to reflect reality

branches: 1.1.2;
First attempt at cats notes.

Pull up revision 1.2 (requested by lukem):
- define COMMON as "${.CURDIR}/../common", and use appropriately
- remove .PATH: ${.CURDIR}/../common
- update the various MERGED_SRCS lines to reflect reality

Sync with HEAD.