--- src/Makefile.inc1.orig 2021-04-13 01:34:25.652193000 +0000 +++ src/Makefile.inc1 2021-04-13 01:45:25.704010000 +0000 @@ -328,6 +328,11 @@ BUILDENV_SHELL?=${SHELL} BUILDENV_SHELL?=/bin/sh .endif +.if !defined(GITUP) || empty(GITUP) +GITUP= gitup +.endif +GITUP_FLAGS= -v2 + .if !defined(SVN) || empty(SVN) . for _P in /usr/bin /usr/local/bin . for _S in svn svnlite @@ -1646,7 +1651,17 @@ doxygen: .PHONY # latest copy. # update: .PHONY -.if defined(SVN_UPDATE) +.if exists(${.CURDIR}/.git) + @echo "--------------------------------------------------------------" + @echo ">>> Updating ${.CURDIR} from git repository" + @echo "--------------------------------------------------------------" + @(cd ${.CURDIR}; ${GIT} pull) +.elif exists(${.CURDIR}/.gituprevision) + @echo "--------------------------------------------------------------" + @echo ">>> Updating ${.CURDIR} from gitup repository" + @echo "--------------------------------------------------------------" + @${GITUP} ${GITUP_FLAGS} release +.elif defined(SVN_UPDATE) @echo "--------------------------------------------------------------" @echo ">>> Updating ${.CURDIR} using Subversion" @echo "--------------------------------------------------------------" --- ports/Makefile.orig 2021-04-09 10:50:35.098307000 +0000 +++ ports/Makefile 2021-04-13 01:46:44.510119000 +0000 @@ -172,6 +172,8 @@ SVN= ${_P}/${_S} RSYNC?= rsync PORTSNAP?= portsnap PORTSNAP_FLAGS?= -p ${.CURDIR} +GITUP?= gitup +GITUP_FLAGS?= -v2 .if !target(update) update: .if exists(${.CURDIR}/.svn) @@ -191,6 +193,11 @@ update: @echo "--------------------------------------------------------------" cd ${.CURDIR}; ${GIT} pull . endif +.elif exists(${.CURDIR}/.gituprevision) + @echo "--------------------------------------------------------------" + @echo ">>> Updating ${.CURDIR} from gitup repository" + @echo "--------------------------------------------------------------" + @${GITUP} ${GITUP_FLAGS} ports .elif defined(RSYNC_UPDATE) && defined(PORTS_RSYNC_SOURCE) @echo "--------------------------------------------------------------" @echo ">>> Updating with ${RSYNC} from ${PORTS_RSYNC_SOURCE}"