svn commit: r461196 - head/Mk

Bryan Drewery bdrewery at FreeBSD.org
Thu Feb 8 05:52:06 UTC 2018


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,^, at dir ,' >> ${TMPPLIST}


More information about the svn-ports-all mailing list