Date: Wed, 3 Aug 2016 12:45:30 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419513 - in head/Mk: . Scripts Message-ID: <201608031245.u73CjUAN071782@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Aug 3 12:45:30 2016 New Revision: 419513 URL: https://svnweb.freebsd.org/changeset/ports/419513 Log: Add a PKGMESSAGES variable that allows the framework to have more than one PKGMESSAGE file. This allows the framework to add messages to ports, without touching their PKGMESSAGE file. Sponsored by: Absolight Modified: head/Mk/Scripts/create-manifest.sh (contents, props changed) head/Mk/bsd.port.mk (contents, props changed) Modified: head/Mk/Scripts/create-manifest.sh ============================================================================== --- head/Mk/Scripts/create-manifest.sh Wed Aug 3 12:44:08 2016 (r419512) +++ head/Mk/Scripts/create-manifest.sh Wed Aug 3 12:45:30 2016 (r419513) @@ -10,7 +10,7 @@ set -e validate_env dp_ACTUAL_PACKAGE_DEPENDS dp_CATEGORIES dp_COMMENT \ dp_COMPLETE_OPTIONS_LIST dp_DEPRECATED dp_DESCR dp_EXPIRATION_DATE \ dp_GROUPS dp_LICENSE dp_LICENSE_COMB dp_MAINTAINER dp_METADIR \ - dp_NO_ARCH dp_PKGBASE dp_PKGDEINSTALL dp_PKGINSTALL dp_PKGMESSAGE \ + dp_NO_ARCH dp_PKGBASE dp_PKGDEINSTALL dp_PKGINSTALL dp_PKGMESSAGES \ dp_PKGORIGIN dp_PKGPOSTDEINSTALL dp_PKGPOSTINSTALL dp_PKGPOSTUPGRADE \ dp_PKGPREDEINSTALL dp_PKGPREINSTALL dp_PKGPREUPGRADE dp_PKGUPGRADE \ dp_PKGVERSION dp_PKG_BIN dp_PKG_IGNORE_DEPENDS dp_PKG_NOTES \ @@ -104,7 +104,9 @@ done exec >${dp_METADIR}/+DISPLAY -[ -f ${dp_PKGMESSAGE} ] && cat ${dp_PKGMESSAGE} +for message in ${dp_PKGMESSAGES}; do + [ -f "${message}" ] && cat "${message}" +done # Try and keep these messages in sync with check-deprecated if [ ${dp_MAINTAINER} = "ports@FreeBSD.org" ]; then Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Aug 3 12:44:08 2016 (r419512) +++ head/Mk/bsd.port.mk Wed Aug 3 12:45:30 2016 (r419513) @@ -2167,6 +2167,7 @@ PKGINSTALL?= ${PKGDIR}/pkg-install PKGDEINSTALL?= ${PKGDIR}/pkg-deinstall PKGREQ?= ${PKGDIR}/pkg-req PKGMESSAGE?= ${PKGDIR}/pkg-message +PKGMESSAGES+= ${PKGMESSAGE} TMPPLIST?= ${WRKDIR}/.PLIST.mktmp TMPPLIST_SORT?= ${WRKDIR}/.PLIST.mktmp.sorted @@ -4251,7 +4252,7 @@ create-manifest: dp_PKGBASE='${PKGBASE}' \ dp_PKGDEINSTALL='${PKGDEINSTALL}' \ dp_PKGINSTALL='${PKGINSTALL}' \ - dp_PKGMESSAGE='${PKGMESSAGE}' \ + dp_PKGMESSAGES='${PKGMESSAGES}' \ dp_PKGORIGIN='${PKGORIGIN}' \ dp_PKGPOSTDEINSTALL='${PKGPOSTDEINSTALL}' \ dp_PKGPOSTINSTALL='${PKGPOSTINSTALL}' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608031245.u73CjUAN071782>