Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Jan 2020 11:31:22 +0000 (UTC)
From:      Dave Cottlehuber <dch@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r523922 - head/Mk/Uses
Message-ID:  <202001231131.00NBVMSg096075@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dch
Date: Thu Jan 23 11:31:22 2020
New Revision: 523922
URL: https://svnweb.freebsd.org/changeset/ports/523922

Log:
  uses: suppress grep warnings when updating file paths
  
  USES=erlang:rebar does a global replace on files to correct LOCALBASE.
  This should only be run on files, as dirs cause needless log spam.
  
  Sponsored by:	SkunkWerks, GmbH
  Differential Revision:	https://reviews.freebsd.org/D23293

Modified:
  head/Mk/Uses/erlang.mk

Modified: head/Mk/Uses/erlang.mk
==============================================================================
--- head/Mk/Uses/erlang.mk	Thu Jan 23 11:27:43 2020	(r523921)
+++ head/Mk/Uses/erlang.mk	Thu Jan 23 11:31:22 2020	(r523922)
@@ -77,9 +77,9 @@ post-patch-erlang:
 		${REINPLACE_CMD} -i '' -e 's/{ *vsn,.*}/{vsn, "${PORTVERSION}"}/' \
 			${WRKSRC}/ebin/${ERL_APP_NAME}.app; \
 	fi
-	@${GREP} -l "%%LOCALBASE%%" $$(${FIND} ${WRKSRC}) \
+	@${GREP} -l "%%LOCALBASE%%" $$(${FIND} ${WRKSRC} -type f) \
 		| ${XARGS} ${REINPLACE_CMD} -i '' -e "s@%%LOCALBASE%%@${LOCALBASE}@"
-	@${GREP} -l "%%PORTVERSION%%" $$(${FIND} ${WRKSRC}) \
+	@${GREP} -l "%%PORTVERSION%%" $$(${FIND} ${WRKSRC} -type f) \
 		| ${XARGS} ${REINPLACE_CMD} -i '' -e "s@%%PORTVERSION%%@${PORTVERSION}@"
 # Always try to build with the system version of rebar and rebar3
 	@if [ -f ${WRKSRC}/rebar.config ]; then \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001231131.00NBVMSg096075>