Index: Mk/Scripts/create-manifest.sh =================================================================== --- Mk/Scripts/create-manifest.sh +++ Mk/Scripts/create-manifest.sh @@ -112,14 +112,25 @@ exec >${dp_METADIR}/+DISPLAY +echo '[' for message in ${dp_PKGMESSAGES}; do - [ -f "${message}" ] && cat "${message}" + if [ -f "${message}" ]; then + #if if starts with [ then it is ucl and we do drop last and first line + if head -1 "${message}" | grep -q '^\['; then + sed '1d;$d' "${message}" + else + echo '{message=< NOTICE: The ${dp_PKGBASE} port currently does not have a maintainer. As a result, it is @@ -131,18 +142,23 @@ More information about port maintainership is available at: https://www.freebsd.org/doc/en/articles/contributing/ports-contributing.html#maintain-port + EOD + }, EOT fi if [ -n "${dp_DEPRECATED}" ]; then if [ -f "${dp_METADIR}/+DISPLAY" ]; then echo; fi cat <<-EOT + { message=< NOTICE: This port is deprecated; you may wish to reconsider installing it: ${dp_DEPRECATED}. + EOD + }, EOT if [ -n "${dp_EXPIRATION_DATE}" ]; then @@ -152,6 +168,7 @@ EOT fi fi +echo ']' if [ ! -s ${dp_METADIR}/+DISPLAY ]; then rm -f ${dp_METADIR}/+DISPLAY