From owner-svn-doc-head@FreeBSD.ORG  Tue Sep  9 12:12:10 2014
Return-Path: <owner-svn-doc-head@FreeBSD.ORG>
Delivered-To: svn-doc-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6BBA9119;
 Tue,  9 Sep 2014 12:12:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 578B9C9;
 Tue,  9 Sep 2014 12:12:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s89CCAIx029223;
 Tue, 9 Sep 2014 12:12:10 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s89CCAbY029222;
 Tue, 9 Sep 2014 12:12:10 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201409091212.s89CCAbY029222@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 9 Sep 2014 12:12:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-all@freebsd.org,
 svn-doc-head@freebsd.org
Subject: svn commit: r45572 - head/share/tools
X-SVN-Group: doc-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the doc tree for head
 <svn-doc-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-head/>
List-Post: <mailto:svn-doc-head@freebsd.org>
List-Help: <mailto:svn-doc-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-head>,
 <mailto:svn-doc-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Sep 2014 12:12:10 -0000

Author: gjb
Date: Tue Sep  9 12:12:09 2014
New Revision: 45572
URL: http://svnweb.freebsd.org/changeset/doc/45572

Log:
  Update the webupdate.wrapper to match the running
  version:
  
   - Don't assume or hard-code PORTSDIR is in /usr.
   - Set PINDEX_OVERRIDE based on the running OSVERSION.
   - Fetch the ports/INDEX file if ENOENT.
   - Group all exported variables together.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/share/tools/webupdate.wrapper

Modified: head/share/tools/webupdate.wrapper
==============================================================================
--- head/share/tools/webupdate.wrapper	Tue Sep  9 11:00:09 2014	(r45571)
+++ head/share/tools/webupdate.wrapper	Tue Sep  9 12:12:09 2014	(r45572)
@@ -12,20 +12,22 @@ SVNROOT=svn://svn.FreeBSD.org
 PUBDIR=/usr/local/www/www.freebsd.org
 DESTDIR="${PUBDIR}-clean"
 RSYNC_FLAGS="-avH"
-PINDEX_OVERRIDE=/usr/ports/INDEX-9
 GEN_INDEX=yes
-export USER=www-data
-export PATH DESTDIR PINDEX_OVERRIDE GEN_INDEX PUBDIR
-
 WEBMAILTO=freebsd-doc@FreeBSD.org
-export WEBMAILTO
-
 FLAGDIR=/usr/local/www/build
-
-# We always build these - they are fast
+: ${PORTSDIR:=/usr/local/www/ports}; export PORTSDIR
+: ${INDEXNUM:=$(make -C ${PORTSDIR} -V OSREL)}
+: ${PINDEX_OVERRIDE:=${PORTSDIR}/INDEX-${INDEXNUM%%.*}}
+export USER=www-data
+export PATH DESTDIR PINDEX_OVERRIDE GEN_INDEX PUBDIR PORTSDIR
+export WEBMAILTO
 export WITH_PORTS_GROWTH=YES
 export WITH_PRSTATS=YES
 
+if [ ! -e "${PINDEX_OVERRIDE}" ]; then
+	make -C ${PORTSDIR} fetchindex
+fi
+
 # Flags are ordered by more extensive to less
 if [ -e $FLAGDIR/fullbuild-clean.flag ]; then
 	export BUILD_RELNOTES=YES