From owner-svn-ports-all@freebsd.org  Mon Jan 18 10:24:14 2021
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@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 9052F4E7817;
 Mon, 18 Jan 2021 10:24:14 +0000 (UTC)
 (envelope-from antoine@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)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DK7Dt0sD9z3kd6;
 Mon, 18 Jan 2021 10:24:13 +0000 (UTC)
 (envelope-from antoine@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 9A44712774;
 Mon, 18 Jan 2021 10:24:13 +0000 (UTC)
 (envelope-from antoine@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10IAODxl006065;
 Mon, 18 Jan 2021 10:24:13 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10IAODo4006064;
 Mon, 18 Jan 2021 10:24:13 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <202101181024.10IAODo4006064@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Mon, 18 Jan 2021 10:24:13 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r561907 - head/Tools/scripts
X-SVN-Group: ports-head
X-SVN-Commit-Author: antoine
X-SVN-Commit-Paths: head/Tools/scripts
X-SVN-Commit-Revision: 561907
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jan 2021 10:24:14 -0000

Author: antoine
Date: Mon Jan 18 10:24:13 2021
New Revision: 561907
URL: https://svnweb.freebsd.org/changeset/ports/561907

Log:
  tindex: reduce diff with what is used on portsindexbuild
  Use git to update src.13

Modified:
  head/Tools/scripts/tindex

Modified: head/Tools/scripts/tindex
==============================================================================
--- head/Tools/scripts/tindex	Mon Jan 18 10:19:27 2021	(r561906)
+++ head/Tools/scripts/tindex	Mon Jan 18 10:24:13 2021	(r561907)
@@ -15,6 +15,7 @@
 # --------------------------------------------------------
 # Change these!
 
+GIT=/usr/local/bin/git
 SVN=/usr/local/bin/svn
 
 # Address for success/failure reports
@@ -34,6 +35,7 @@ export OUTDIR=${BASEDIR}/out
 # Target architecture if not set in the environment
 if [ "${ARCH}" = "" ]; then
 	export ARCH=i386
+	export MACHINE_ARCH=i386
 fi
 
 # --------------------------------------------------------
@@ -120,9 +122,8 @@ OSVERSION11=$(awk '/^#define[[:blank:]]__FreeBSD_versi
 ${SVN} -q up ${SRCDIR12}/sys/sys
 OSVERSION12=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR12}/sys/sys/param.h)
 
-${SVN} -q up ${SRCDIR13}/sys/sys
-OSVERSION13=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR12}/sys/sys/param.h)
-
+${GIT} -C ${SRCDIR13} pull --rebase -q
+OSVERSION13=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR13}/sys/sys/param.h)
 
 cd ${PORTSDIR}
 rm -f INDEX-11 INDEX-11.bz2 INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2