svn commit: r473745 - head/security/teleport

Sean Chittenden seanc at FreeBSD.org
Mon Jul 2 14:55:49 UTC 2018


Author: seanc
Date: Mon Jul  2 14:55:47 2018
New Revision: 473745
URL: https://svnweb.freebsd.org/changeset/ports/473745

Log:
  Optimize teleport build steps by invoking sed(1) and find(1) only once.
  
  Submitted by:	mat (mentor)
  Approved by: 	mat (mentor, implicit)

Modified:
  head/security/teleport/Makefile

Modified: head/security/teleport/Makefile
==============================================================================
--- head/security/teleport/Makefile	Mon Jul  2 14:28:58 2018	(r473744)
+++ head/security/teleport/Makefile	Mon Jul  2 14:55:47 2018	(r473745)
@@ -45,8 +45,9 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e 's|^GITREF=.*|GITREF=${GH_TAG_COMMIT}|' \
 		${WRKDIR}/${GO_TELEPORT_SRC_DIR}/version.mk
-	@${FIND} ${WRKDIR} -type f -exec ${SED} -i '' -e 's|\/var\/lib|/var/db|g' {} \;
-	@${FIND} ${WRKDIR} -type f -exec ${SED} -i '' -e 's|\/usr\/bin\/hostname|/bin/hostname|g' {} \;
+	@${FIND} ${WRKDIR} -type f \
+		-exec ${SED} -i '' -e 's|\/var\/lib|/var/db|g' {} \; \
+		-exec ${SED} -i '' -e 's|\/usr\/bin\/hostname|/bin/hostname|g' {} \;
 
 do-build:
 	@cd ${WRKDIR}/${GO_TELEPORT_SRC_DIR} && \
@@ -56,8 +57,10 @@ do-build:
 
 do-install:
 	${WRKDIR}/${GO_TELEPORT_SRC_DIR}/build/teleport configure > ${STAGEDIR}${PREFIX}/etc/teleport.yaml.sample
-	@${SED} -i '' -e "s|nodename: .*|nodename: |g" ${STAGEDIR}${PREFIX}/etc/teleport.yaml.sample
-	@${SED} -i '' -e "s|cluster-join-token||g" ${STAGEDIR}${PREFIX}/etc/teleport.yaml.sample
+	@${SED} -i '' \
+		-e "s|nodename: .*|nodename: |g" \
+		-e "s|cluster-join-token||g" \
+		${STAGEDIR}${PREFIX}/etc/teleport.yaml.sample
 	${INSTALL_PROGRAM} ${WRKDIR}/${GO_TELEPORT_SRC_DIR}/build/teleport ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKDIR}/${GO_TELEPORT_SRC_DIR}/build/tsh ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKDIR}/${GO_TELEPORT_SRC_DIR}/build/tctl ${STAGEDIR}${PREFIX}/bin


More information about the svn-ports-all mailing list