From owner-svn-ports-all@freebsd.org Fri Sep 13 12:47:04 2019 Return-Path: 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 58C90F0B8A; Fri, 13 Sep 2019 12:47:04 +0000 (UTC) (envelope-from bapt@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 46VFlD1lFtz4bDR; Fri, 13 Sep 2019 12:47:04 +0000 (UTC) (envelope-from bapt@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 1ACC7754B; Fri, 13 Sep 2019 12:47:04 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8DCl3Mu053866; Fri, 13 Sep 2019 12:47:03 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8DCl3WV053865; Fri, 13 Sep 2019 12:47:03 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201909131247.x8DCl3WV053865@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Fri, 13 Sep 2019 12:47:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511955 - head/Tools/scripts X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: head/Tools/scripts X-SVN-Commit-Revision: 511955 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.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2019 12:47:04 -0000 Author: bapt Date: Fri Sep 13 12:47:03 2019 New Revision: 511955 URL: https://svnweb.freebsd.org/changeset/ports/511955 Log: Update supported version of FreeBSD Modified: head/Tools/scripts/tindex Modified: head/Tools/scripts/tindex ============================================================================== --- head/Tools/scripts/tindex Fri Sep 13 12:44:02 2019 (r511954) +++ head/Tools/scripts/tindex Fri Sep 13 12:47:03 2019 (r511955) @@ -26,10 +26,9 @@ ERROR_ADDRESS=root@localhost # Location of ports tree and source trees export BASEDIR=/a/tindex export PORTSDIR=${BASEDIR}/ports -export SRCDIR9=${BASEDIR}/src.9 -export SRCDIR10=${BASEDIR}/src.10 export SRCDIR11=${BASEDIR}/src.11 export SRCDIR12=${BASEDIR}/src.12 +export SRCDIR13=${BASEDIR}/src.13 export OUTDIR=${BASEDIR}/out # Target architecture if not set in the environment @@ -115,20 +114,18 @@ export INDEX_JOBS=3 export INDEX_QUIET=1 # First update the source trees to get current OSVERSION -${SVN} -q up ${SRCDIR9}/sys/sys -OSVERSION9=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR9}/sys/sys/param.h) - -${SVN} -q up ${SRCDIR10}/sys/sys -OSVERSION10=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR10}/sys/sys/param.h) - ${SVN} -q up ${SRCDIR11}/sys/sys OSVERSION11=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR11}/sys/sys/param.h) ${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) + + cd ${PORTSDIR} -rm -f INDEX-9 INDEX-9.bz2 INDEX-10 INDEX-10.bz2 INDEX-11 INDEX-11.bz2 INDEX-12 INDEX-12.bz2 +rm -f INDEX-11 INDEX-11.bz2 INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2 (${SVN} up 2>1 ) > svn.log if grep -q ^C svn.log ; then (echo "svn update failed with conflicts:"; @@ -136,7 +133,7 @@ if grep -q ^C svn.log ; then exit 1 fi -for branch in 9.x 10.x 11.x 12.x; do +for branch in 11.x 12.x 13.x; do release=$(echo $branch | sed -e 's,.x,,') eval _osver=\$OSVERSION${release} @@ -144,14 +141,9 @@ for branch in 9.x 10.x 11.x 12.x; do export OSVERSION=${_osver} export UNAME_r=${_uname_r} - if [ "${release}" = "9" ]; then - MAKE_CMD=fmake - else - MAKE_CMD=make - fi echo "Building INDEX for ${branch} with OSVERSION=${OSVERSION}" cd ${PORTSDIR} - ((${MAKE_CMD} index 2> index.err) > index.out) || indexfail ${branch} + ((make index 2> index.err) > index.out) || indexfail ${branch} if [ -s index.err ]; then indexfail ${branch} fi