spelled out (many of which are ${PKGDIR}/MESSAGE -> ${PKGMESSAGE} type fixes that shouldn't have been necessary) and the string "/pkg/" appear.
PR: 20560 Submitted by: Jimmy Olgeni <olgeni@uli.it>