From owner-freebsd-ports-bugs@FreeBSD.ORG  Wed Jul 18 20:20:01 2012
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6EA79106564A
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Wed, 18 Jul 2012 20:20:01 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 295718FC16
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Wed, 18 Jul 2012 20:20:01 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6IKK10s096031
	for <freebsd-ports-bugs@freefall.freebsd.org>;
	Wed, 18 Jul 2012 20:20:01 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q6IKK1Lw096030;
	Wed, 18 Jul 2012 20:20:01 GMT (envelope-from gnats)
Resent-Date: Wed, 18 Jul 2012 20:20:01 GMT
Resent-Message-Id: <201207182020.q6IKK1Lw096030@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-ports-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	clutton <mbsd@isgroup.com.ua>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 03E27106566C
	for <freebsd-gnats-submit@FreeBSD.org>;
	Wed, 18 Jul 2012 20:10:44 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id E31B08FC12
	for <freebsd-gnats-submit@FreeBSD.org>;
	Wed, 18 Jul 2012 20:10:43 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q6IKAh5I022817
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 18 Jul 2012 20:10:43 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q6IKAhbJ022815;
	Wed, 18 Jul 2012 20:10:43 GMT (envelope-from nobody)
Message-Id: <201207182010.q6IKAhbJ022815@red.freebsd.org>
Date: Wed, 18 Jul 2012 20:10:43 GMT
From: clutton <mbsd@isgroup.com.ua>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-3.1
Cc: 
Subject: ports/169983: adding git+svn to ports/Makefile
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jul 2012 20:20:01 -0000


>Number:         169983
>Category:       ports
>Synopsis:       adding git+svn to ports/Makefile
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 18 20:20:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     clutton
>Release:        
>Organization:
isgroup.com.ua
>Environment:
>Description:
This patch add 'git svn rebase' command to 'make update' task.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/Makefile b/Makefile
index 319d65e..6e65c4e 100644
--- a/Makefile
+++ b/Makefile
@@ -153,6 +153,7 @@ print-index:	${INDEXDIR}/${INDEXFILE}
 
 CVS?= cvs
 SVN?= svn
+GIT?= git
 SUP?= csup
 PORTSNAP?= portsnap
 PORTSNAP_FLAGS?= -p ${.CURDIR}
@@ -177,6 +178,11 @@ update:
 	@echo ">>> Updating ${.CURDIR} from svn repository"
 	@echo "--------------------------------------------------------------"
 	cd ${.CURDIR}; ${SVN} -q update
+.elif exists(${.CURDIR}/.git)
+	@echo "--------------------------------------------------------------"
+	@echo ">>> Updating ${.CURDIR} from git+svn repository"
+	@echo "--------------------------------------------------------------"
+	cd ${.CURDIR}; ${GIT} ${SVN} rebase
 .else
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Running ${PORTSNAP}"


>Release-Note:
>Audit-Trail:
>Unformatted: