From owner-svn-ports-head@FreeBSD.ORG  Sun Aug  5 17:06:50 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2C4AD106564A;
	Sun,  5 Aug 2012 17:06:50 +0000 (UTC)
	(envelope-from beat@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1704A8FC15;
	Sun,  5 Aug 2012 17:06:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q75H6nZI005683;
	Sun, 5 Aug 2012 17:06:49 GMT (envelope-from beat@svn.freebsd.org)
Received: (from beat@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q75H6nwC005681;
	Sun, 5 Aug 2012 17:06:49 GMT (envelope-from beat@svn.freebsd.org)
Message-Id: <201208051706.q75H6nwC005681@svn.freebsd.org>
From: Beat Gaetzi <beat@FreeBSD.org>
Date: Sun, 5 Aug 2012 17:06:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r302115 - head
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Aug 2012 17:06:50 -0000

Author: beat
Date: Sun Aug  5 17:06:49 2012
New Revision: 302115
URL: http://svn.freebsd.org/changeset/ports/302115

Log:
  - Don't use SVN variable in 'git svn rebase' as setting the SVN variable to
    a non-default value will break git.
  
  Submitted by:	bf@, melifaro@

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Sun Aug  5 16:58:59 2012	(r302114)
+++ head/Makefile	Sun Aug  5 17:06:49 2012	(r302115)
@@ -181,7 +181,7 @@ update:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Updating ${.CURDIR} from git+svn repository"
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; ${GIT} ${SVN} rebase
+	cd ${.CURDIR}; ${GIT} svn rebase
 .else
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Running ${PORTSNAP}"