Date: Thu, 30 Jun 2016 06:33:21 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417812 - head/x11/nvidia-driver Message-ID: <201606300633.u5U6XLKj005356@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Thu Jun 30 06:33:21 2016 New Revision: 417812 URL: https://svnweb.freebsd.org/changeset/ports/417812 Log: Simplify custom `update-distinfo' convenience target and make it more robust: previous join(1)-based implementation depended on how the file is sorted and often failed to work properly. While here, do not suppress default `.bak' suffix when editing files in-place to make debugging easier, shall it be needed. Modified: head/x11/nvidia-driver/Makefile Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Thu Jun 30 06:26:31 2016 (r417811) +++ head/x11/nvidia-driver/Makefile Thu Jun 30 06:33:21 2016 (r417812) @@ -312,16 +312,13 @@ post-install: .SILENT # update distinfo (i.e., keeping other driver version entries intact) .if ${.TARGETS:Mupdate-distinfo} DISTINFO_FILE= ${MASTERDIR}/distinfo.new -JOIN?= /usr/bin/join .endif update-distinfo: makesum .SILENT - ${REINPLACE_CMD} -i '' -e '/${ARCH_SUFX}-${NVVERSION:R}/s/^/~/' \ - ${MASTERDIR}/distinfo ${DISTINFO_FILE} - ${SED} -e '/^~/s/(.*//' ${MASTERDIR}/distinfo | ${JOIN} -a 1 \ - - ${DISTINFO_FILE} | ${SED} -e 's/^~//' \ - > ${MASTERDIR}/distinfo.tmp - ${MV} ${MASTERDIR}/distinfo.tmp ${MASTERDIR}/distinfo - ${RM} ${DISTINFO_FILE} + ${REINPLACE_CMD} -e '/${ARCH_SUFX}-${NVVERSION:R}/s/^/~/' \ + ${MASTERDIR}/distinfo + ${REINPLACE_CMD} -e '/^~SHA256/r ${DISTINFO_FILE}' -e '/^~/d' \ + ${MASTERDIR}/distinfo + ${RM} ${DISTINFO_FILE} ${MASTERDIR}/distinfo.bak .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606300633.u5U6XLKj005356>