From owner-svn-ports-all@FreeBSD.ORG  Thu Aug  2 12:19:36 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 28C17106564A;
	Thu,  2 Aug 2012 12:19:36 +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 EE5238FC18;
	Thu,  2 Aug 2012 12:19:35 +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 q72CJZKe080627;
	Thu, 2 Aug 2012 12:19:35 GMT (envelope-from beat@svn.freebsd.org)
Received: (from beat@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q72CJZl0080625;
	Thu, 2 Aug 2012 12:19:35 GMT (envelope-from beat@svn.freebsd.org)
Message-Id: <201208021219.q72CJZl0080625@svn.freebsd.org>
From: Beat Gaetzi <beat@FreeBSD.org>
Date: Thu, 2 Aug 2012 12:19:35 +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: r301859 - head
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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 12:19:36 -0000

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
 .else
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Running ${PORTSNAP}"
@@ -193,4 +198,3 @@ update:
 .endif
 .endif
 .endif
-.endif