From owner-svn-ports-all@FreeBSD.ORG  Thu Aug  2 18:37:45 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 50EC51065673;
	Thu,  2 Aug 2012 18:37:45 +0000 (UTC)
	(envelope-from bf1783@googlemail.com)
Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com
	[209.85.220.182])
	by mx1.freebsd.org (Postfix) with ESMTP id BDE6B8FC0A;
	Thu,  2 Aug 2012 18:37:44 +0000 (UTC)
Received: by vcbgb22 with SMTP id gb22so10407625vcb.13
	for <multiple recipients>; Thu, 02 Aug 2012 11:37:44 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=googlemail.com; s=20120113;
	h=mime-version:reply-to:in-reply-to:references:date:message-id
	:subject:from:to:cc:content-type;
	bh=ixtKj+P8cUZZPjASc37/n01fwaV1OTxUQ9g8a5a/3s8=;
	b=iZUu1QvKkyHNCowkpdHGoSBt50AL5oKjekKXthyZt9GZ8AR8rLOC5RDz3N2QHRVUqG
	thTJKuyoB/uB9wzITbKbb5/2JXZWTku3wqwyeu+uuf3iaHWfmAnFA19tfdPsfiDAmT3M
	wvm7skiYKSFnTSn3+Zfd/MjZUYGP9qCPP507hmuVsJXQ+66gnloSrKUf7SmHDGk1zc4D
	nv9EoMZiH1XgngMxj1HPO8p/X+XkRc8IG2NMxNxYdGnx0Nfsh/YTUNdXWLgqpFJywiKP
	9twX2rE7TwoTImuhxCy7M9lx4OXeGzWCmo2F/CM6WXw2BE0g1jpurHRvdQLU6DAg0Nt1
	+dzA==
MIME-Version: 1.0
Received: by 10.220.149.131 with SMTP id t3mr20788751vcv.1.1343932664256; Thu,
	02 Aug 2012 11:37:44 -0700 (PDT)
Received: by 10.58.238.9 with HTTP; Thu, 2 Aug 2012 11:37:44 -0700 (PDT)
In-Reply-To: <201208021219.q72CJZl0080625@svn.freebsd.org>
References: <201208021219.q72CJZl0080625@svn.freebsd.org>
Date: Thu, 2 Aug 2012 18:37:44 +0000
Message-ID: <CAGFTUwMReZdxYhpJCNDTtDYd7zHSQGaGfZJ5BKGCnDS_QYahJw@mail.gmail.com>
From: "b. f." <bf1783@googlemail.com>
To: Beat Gaetzi <beat@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org,
	ports-committers@freebsd.org
Subject: Re: svn commit: r301859 - head
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bf1783@gmail.com
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Aug 2012 18:37:45 -0000

On 8/2/12, Beat Gaetzi <beat@freebsd.org> wrote:
> Author: beat
> Date: Thu Aug  2 12:19:35 2012
> New Revision: 301859
> URL: http://svn.freebsd.org/changeset/ports/301859
>
> Log:
>   - Sync update target with src/ [1]
>   - Add 'git svn rebase' command to update target [2]
>
>   PR:		ports/169970 [1], ports/169983 [2]
>   Submitted by:	avilla@ [1], clutton <mbsd AT isgroup.com.ua> [2]
>   Tested by:	exp-run on pointyhat
>
> Modified:
>   head/Makefile
>
> Modified: head/Makefile
> ==============================================================================
> --- head/Makefile	Thu Aug  2 09:02:43 2012	(r301858)
> +++ head/Makefile	Thu Aug  2 12:19:35 2012	(r301859)
> @@ -152,6 +152,7 @@ print-index:	${INDEXDIR}/${INDEXFILE}
>  	@awk -F\| '{
> printf("Port:\t%s\nPath:\t%s\nInfo:\t%s\nMaint:\t%s\nIndex:\t%s\nB-deps:\t%s\nR-deps:\t%s\nE-deps:\t%s\nP-deps:\t%s\nF-deps:\t%s\nWWW:\t%s\n\n",
> $$1, $$2, $$4, $$6, $$7, $$8, $$9, $$11, $$12, $$13, $$10); }' <
> ${INDEXDIR}/${INDEXFILE}
>
>  CVS?= cvs
> +GIT?= git
>  SVN?= svn
>  SUP?= csup
>  PORTSNAP?= portsnap
> @@ -168,15 +169,19 @@ update:
>  	@${SUP} ${SUPFLAGS} ${PORTSSUPFILE}
>  .elif defined(CVS_UPDATE)
>  	@echo "--------------------------------------------------------------"
> -	@echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
> +	@echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT}
>  	@echo "--------------------------------------------------------------"
>  	cd ${.CURDIR}; ${CVS} -R -q update -A -P -d -I!
> -.else
> -.if exists(${.CURDIR}/.svn)
> +.elif exists(${.CURDIR}/.svn)
> +	@echo "--------------------------------------------------------------"
> +	@echo ">>> Updating ${.CURDIR} using Subversion"
>  	@echo "--------------------------------------------------------------"
> -	@echo ">>> Updating ${.CURDIR} from svn repository"
> +	cd ${.CURDIR}; ${SVN} update
> +.elif exists(${.CURDIR}/.git)
>  	@echo "--------------------------------------------------------------"
> -	cd ${.CURDIR}; ${SVN} -q update
> +	@echo ">>> Updating ${.CURDIR} from git+svn repository"
> +	@echo "--------------------------------------------------------------"
> +	cd ${.CURDIR}; ${GIT} ${SVN} rebase

It'd be better to simply use "... ${GIT} svn rebase ..." in the line
above, to prevent failures that may arise if the user has set SVN to a
non-default value for some other purpose.

b.