Log Message:
Remove redefinition of X11PREFIX and use X11PREFIX for location of forms
and X11BASE as (gasp) location of X11.  This helps installation with
xpkgwedge.  Resolves, along with bsd.pkg.mk update, my own PR pkg/16350.