From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 21 04:42:34 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 9A178893;
 Wed, 21 Nov 2012 04:42:34 +0000 (UTC)
 (envelope-from linimon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 800E18FC12;
 Wed, 21 Nov 2012 04:42:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAL4gYV1071107;
 Wed, 21 Nov 2012 04:42:34 GMT (envelope-from linimon@svn.freebsd.org)
Received: (from linimon@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAL4gYgV071106;
 Wed, 21 Nov 2012 04:42:34 GMT (envelope-from linimon@svn.freebsd.org)
Message-Id: <201211210442.qAL4gYgV071106@svn.freebsd.org>
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 21 Nov 2012 04:42:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r243363 - projects/portbuild/scripts
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Nov 2012 04:42:34 -0000

Author: linimon (doc,ports committer)
Date: Wed Nov 21 04:42:34 2012
New Revision: 243363
URL: http://svnweb.freebsd.org/changeset/base/243363

Log:
  Attempt to fix two more cvs-specfic cases.  Untested.

Modified:
  projects/portbuild/scripts/dopackages

Modified: projects/portbuild/scripts/dopackages
==============================================================================
--- projects/portbuild/scripts/dopackages	Wed Nov 21 02:33:49 2012	(r243362)
+++ projects/portbuild/scripts/dopackages	Wed Nov 21 04:42:34 2012	(r243363)
@@ -482,8 +482,8 @@ if [ "$skipstart" = 0 ]; then
 	    cd ${PORTSDIR}
 	    updated=$(date '+%Y/%m/%d %H:%M')
 	    echo ${updated} > ${builddir}/ports/.updated
-	    # XXX MCL 20121117 this is not right!
-	    ${VCS} ${VCS_UPDATE_DATE} "${updated}"
+	    # XXX MCL 20121120 not yet tested.
+	    ${VCS_UPDATE_COMMAND} ${builddir}/ports || mailexit 1
 	    # XXX Check for conflicts
 	else
 	    # echo "XXX at build portsupdate portsupdate ${arch} ${branch} ${buildid} $@ "
@@ -517,7 +517,8 @@ if [ "$skipstart" = 0 ]; then
 		# with the ports update
 		updated=$(date)
 	    fi
-	    ${VCS} ${VCS_UPDATE_ARGS} "${updated}"
+	    # XXX MCL 20121120 not yet tested.
+	    ${VCS_UPDATE_COMMAND} ${SRC_BASE} || mailexit 1
 	    # XXX Check for conflicts
 	else
 	    build srcupdate ${arch} ${branch} ${buildid} $@