From owner-svn-ports-head@freebsd.org  Tue Apr 14 12:52:03 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 516732BFED1;
 Tue, 14 Apr 2020 12:52:03 +0000 (UTC)
 (envelope-from dmgk@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 491lkC1SKtz48CG;
 Tue, 14 Apr 2020 12:52:03 +0000 (UTC)
 (envelope-from dmgk@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2D69C5662;
 Tue, 14 Apr 2020 12:52:03 +0000 (UTC)
 (envelope-from dmgk@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03ECq3rx052763;
 Tue, 14 Apr 2020 12:52:03 GMT (envelope-from dmgk@FreeBSD.org)
Received: (from dmgk@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03ECq3OC052762;
 Tue, 14 Apr 2020 12:52:03 GMT (envelope-from dmgk@FreeBSD.org)
Message-Id: <202004141252.03ECq3OC052762@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dmgk set sender to
 dmgk@FreeBSD.org using -f
From: Dmitri Goutnik <dmgk@FreeBSD.org>
Date: Tue, 14 Apr 2020 12:52:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r531678 - head/Mk/Uses
X-SVN-Group: ports-head
X-SVN-Commit-Author: dmgk
X-SVN-Commit-Paths: head/Mk/Uses
X-SVN-Commit-Revision: 531678
X-SVN-Commit-Repository: ports
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.29
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: Tue, 14 Apr 2020 12:52:03 -0000

Author: dmgk
Date: Tue Apr 14 12:52:02 2020
New Revision: 531678
URL: https://svnweb.freebsd.org/changeset/ports/531678

Log:
  Mk/Uses/go.mk: Fix gomod-vendor-diff when there are 3 or fewer items in the GH_TUPLE
  
  'make gomod-vendor-diff' currently doesn't work properly when modules2tuple
  doesn't return the first empty line, when 3 or fewer items are in the GH_TUPLE
  list.
  
  PR:		245617
  Submitted by:	yuri

Modified:
  head/Mk/Uses/go.mk

Modified: head/Mk/Uses/go.mk
==============================================================================
--- head/Mk/Uses/go.mk	Tue Apr 14 12:42:35 2020	(r531677)
+++ head/Mk/Uses/go.mk	Tue Apr 14 12:52:02 2020	(r531678)
@@ -191,7 +191,7 @@ gomod-vendor: gomod-vendor-deps patch
 
 gomod-vendor-diff: gomod-vendor-deps patch
 	@cd ${WRKSRC}; ${SETENV} GOPATH=${WRKDIR}/.gopath GOFLAGS=-modcacherw ${GO_CMD} mod vendor; \
-	[ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt | ${GREP} -v "^GH_TUPLE=" | ${SED} 's| \\$$||' > ${WRKDIR}/GH_TUPLE-new.txt && \
+	[ -r vendor/modules.txt ] && ${_MODULES2TUPLE_CMD} vendor/modules.txt | ${SED} 's|GH_TUPLE=|	|; s| \\$$||' | ${GREP} -v '		\\' > ${WRKDIR}/GH_TUPLE-new.txt && \
 	echo ${GH_TUPLE} | ${TR} -s " " "\n" | ${SED} "s|^|		|" > ${WRKDIR}/GH_TUPLE-old.txt && \
 	${DIFF} ${WRKDIR}/GH_TUPLE-old.txt ${WRKDIR}/GH_TUPLE-new.txt || exit 0
 .endif