svn commit: r301859 - head

[b. f.]

On 8/2/12, Beat Gaetzi <beat at 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.