From owner-svn-src-projects@FreeBSD.ORG Sun Nov 18 03:02:04 2012 Return-Path: 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 0346F89B; Sun, 18 Nov 2012 03:02:04 +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 C2D2D8FC1A; Sun, 18 Nov 2012 03:02:03 +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 qAI3232r038718; Sun, 18 Nov 2012 03:02:03 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAI3232B038715; Sun, 18 Nov 2012 03:02:03 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201211180302.qAI3232B038715@svn.freebsd.org> From: Mark Linimon Date: Sun, 18 Nov 2012 03:02:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r243204 - 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Nov 2012 03:02:04 -0000 Author: linimon (doc,ports committer) Date: Sun Nov 18 03:02:03 2012 New Revision: 243204 URL: http://svnweb.freebsd.org/changeset/base/243204 Log: Still hunting down some vestiges of CVS assumptions. Modified: projects/portbuild/scripts/dopackages projects/portbuild/scripts/makeworld Modified: projects/portbuild/scripts/dopackages ============================================================================== --- projects/portbuild/scripts/dopackages Sat Nov 17 23:53:12 2012 (r243203) +++ projects/portbuild/scripts/dopackages Sun Nov 18 03:02:03 2012 (r243204) @@ -30,9 +30,9 @@ usage () { echo " -nochecksubdirs : Do not check the SUBDIRS" echo " -norestr : Do not build the restricted.sh file" echo " -nosrc : Do not update the src tree" - echo " -srcvcs : Update the src tree via CVS, don't use a pre-existing snapshot" + echo " -srcvcs : Update the src tree via ${VCS}, don't use a pre-existing snapshot" echo " -noports : Do not update the ports tree" - echo " -portsvcs : Update the ports tree via CVS, don't use a pre-existing snapshot" + echo " -portsvcs : Update the ports tree via ${VCS}, don't use a pre-existing snapshot" echo " -noplistcheck : Don't check the plist during the build" echo " -nodistfiles : Don't collect distfiles" echo " -fetch-original : Fetch from original MASTER_SITE" @@ -482,6 +482,7 @@ if [ "$skipstart" = 0 ]; then cd ${PORTSDIR} updated=$(date '+%Y/%m/%d %H:%M') echo ${updated} > ${builddir}/.updated + # XXX MCL 20121117 this is not right! ${VCS} ${VCS_UPDATE_DATE} "${updated}" # XXX Check for conflicts else Modified: projects/portbuild/scripts/makeworld ============================================================================== --- projects/portbuild/scripts/makeworld Sat Nov 17 23:53:12 2012 (r243203) +++ projects/portbuild/scripts/makeworld Sun Nov 18 03:02:03 2012 (r243204) @@ -95,6 +95,7 @@ cd ${SRC_BASE} || exit $? if [ "$novcs" = "0" ]; then echo "==> Updating source tree" eval tag=\$SRC_BRANCH_${branch}_TAG + # XXX MCL 20121117 this is not right! ${VCS} ${VCS_UPDATE_TAG} ${tag} || exit $? fi