Date: Thu, 8 Feb 2018 05:52:06 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461196 - head/Mk Message-ID: <201802080552.w185q6Lq090562@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Feb 8 05:52:06 2018 New Revision: 461196 URL: https://svnweb.freebsd.org/changeset/ports/461196 Log: Fix editors/vim-tiny hanging on reading stdin during generate-plist. test -f "" is true so we need to only test if $PLIST is not empty. Approved by: portmgr (implicit) Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Feb 8 01:13:21 2018 (r461195) +++ head/Mk/bsd.port.mk Thu Feb 8 05:52:06 2018 (r461196) @@ -4471,9 +4471,11 @@ generate-plist: ${WRKDIR} @for file in ${PLIST_FILES}; do \ ${ECHO_CMD} $${file} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} >> ${TMPPLIST}; \ done +.if !empty(PLIST) @if [ -f ${PLIST} ]; then \ ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}; \ fi +.endif .for dir in ${PLIST_DIRS} @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} -e 's,^,@dir ,' >> ${TMPPLIST}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802080552.w185q6Lq090562>