D19310.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D19310.diff
View Options

	Index: head/Mk/Scripts/create-manifest.sh
	===================================================================
	--- head/Mk/Scripts/create-manifest.sh
	+++ head/Mk/Scripts/create-manifest.sh
	@@ -112,14 +112,24 @@

	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=<<EOD'
	+ cat "${message}"
	+ printf 'EOD\n},\n'
	+ fi
	+ fi
	done

	# Try and keep these messages in sync with check-deprecated
	if [ ${dp_MAINTAINER} = "ports@FreeBSD.org" ]; then
	- if [ -f "${dp_METADIR}/+DISPLAY" ]; then echo; fi
	cat <<-EOT
	+ { message=<<EOD
	===> NOTICE:

	The ${dp_PKGBASE} port currently does not have a maintainer. As a result, it is
	@@ -131,12 +141,14 @@
	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=<<EOD
	===> NOTICE:

	This port is deprecated; you may wish to reconsider installing it:
	@@ -151,8 +163,6 @@

	EOT
	fi
	+ printf 'EOD\n},\n'
	fi
	-
	-if [ ! -s ${dp_METADIR}/+DISPLAY ]; then
	- rm -f ${dp_METADIR}/+DISPLAY
	-fi
	+echo ']'