Date: Wed, 18 Jul 2012 20:10:43 GMT From: clutton <mbsd@isgroup.com.ua> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/169983: adding git+svn to ports/Makefile Message-ID: <201207182010.q6IKAhbJ022815@red.freebsd.org> Resent-Message-ID: <201207182020.q6IKK1Lw096030@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207182010.q6IKAhbJ022815>