Date: Mon, 3 Aug 2020 13:53:07 +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: r544070 - in head: Mk Mk/Scripts Tools/scripts Message-ID: <202008031353.073Dr7Vi094995@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Aug 3 13:53:06 2020 New Revision: 544070 URL: https://svnweb.freebsd.org/changeset/ports/544070 Log: Move script to a more appropriate location. Added: head/Mk/Scripts/sed_checked.sh - copied unchanged from r544069, head/Tools/scripts/sed_checked.sh Deleted: head/Tools/scripts/sed_checked.sh Modified: head/Mk/bsd.port.mk Copied: head/Mk/Scripts/sed_checked.sh (from r544069, head/Tools/scripts/sed_checked.sh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Scripts/sed_checked.sh Mon Aug 3 13:53:06 2020 (r544070, copy of r544069, head/Tools/scripts/sed_checked.sh) @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e +/usr/bin/sed -i.bak "$@" +for x in "${@}" ; do + if [ -f "${x}" ]; then + if cmp -s "${x}" "${x}".bak ; then + if [ ! -z "${REWARNFILE}" ]; then + echo - - REINPLACE_CMD ran, but did not modify file contents: ${x#${WRKSRC}/} >> ${REWARNFILE} + fi + fi + fi +done Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Aug 3 13:46:11 2020 (r544069) +++ head/Mk/bsd.port.mk Mon Aug 3 13:53:06 2020 (r544070) @@ -2021,7 +2021,7 @@ MAKE_ENV+= LANG=${USE_LOCALE} LC_ALL=${USE_LOCALE} # Macro for doing in-place file editing using regexps REINPLACE_ARGS?= -i.bak .if defined(DEVELOPER) -REINPLACE_CMD?= ${SETENV} WRKSRC=${WRKSRC} REWARNFILE=${REWARNFILE} ${PORTSDIR}/Tools/scripts/sed_checked.sh +REINPLACE_CMD?= ${SETENV} WRKSRC=${WRKSRC} REWARNFILE=${REWARNFILE} ${SCRIPTSDIR}/sed_checked.sh .else REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008031353.073Dr7Vi094995>