It seems built both with X11_TYPE=modular and native.
(1) Add following file (left out at previous commit)
  patches/patch-apps_CMakeLists.txt
       .. actually rename from
  patches/patch-apps_CMakeList.txt (not committed)
(2) Adjust CMakeLists.text (but it is hidden due to above)
(3) Eliminate SUBST_CLASSES swaprpath and lastcolon
(4) Some cleanup for SUBST_CLASSES rpath{app,src}