From owner-svn-ports-head@freebsd.org  Thu Jun 30 06:33:22 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 65580B87B9C;
 Thu, 30 Jun 2016 06:33:22 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 355EC2E87;
 Thu, 30 Jun 2016 06:33:22 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5U6XLfk005357;
 Thu, 30 Jun 2016 06:33:21 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5U6XLKj005356;
 Thu, 30 Jun 2016 06:33:21 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201606300633.u5U6XLKj005356@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Thu, 30 Jun 2016 06:33:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r417812 - head/x11/nvidia-driver
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Jun 2016 06:33:22 -0000

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>