View | Details | Raw Unified | Return to bug 254900
Collapse All | Expand All

(-)src/Makefile.inc1 (-1 / +16 lines)
Lines 328-333 BUILDENV_SHELL?=${SHELL} Link Here
328
BUILDENV_SHELL?=/bin/sh
328
BUILDENV_SHELL?=/bin/sh
329
.endif
329
.endif
330
330
331
.if !defined(GITUP) || empty(GITUP)
332
GITUP=	gitup
333
.endif
334
GITUP_FLAGS=	-v2
335
331
.if !defined(SVN) || empty(SVN)
336
.if !defined(SVN) || empty(SVN)
332
. for _P in /usr/bin /usr/local/bin
337
. for _P in /usr/bin /usr/local/bin
333
.  for _S in svn svnlite
338
.  for _S in svn svnlite
Lines 1646-1652 doxygen: .PHONY Link Here
1646
# latest copy.
1651
# latest copy.
1647
#
1652
#
1648
update: .PHONY
1653
update: .PHONY
1649
.if defined(SVN_UPDATE)
1654
.if exists(${.CURDIR}/.git)
1655
	@echo "--------------------------------------------------------------"
1656
	@echo ">>> Updating ${.CURDIR} from git repository"
1657
	@echo "--------------------------------------------------------------"
1658
	@(cd ${.CURDIR}; ${GIT} pull)
1659
.elif exists(${.CURDIR}/.gituprevision)
1660
	@echo "--------------------------------------------------------------"
1661
	@echo ">>> Updating ${.CURDIR} from gitup repository"
1662
	@echo "--------------------------------------------------------------"
1663
	@${GITUP} ${GITUP_FLAGS} release
1664
.elif defined(SVN_UPDATE)
1650
	@echo "--------------------------------------------------------------"
1665
	@echo "--------------------------------------------------------------"
1651
	@echo ">>> Updating ${.CURDIR} using Subversion"
1666
	@echo ">>> Updating ${.CURDIR} using Subversion"
1652
	@echo "--------------------------------------------------------------"
1667
	@echo "--------------------------------------------------------------"
(-)ports/Makefile (+7 lines)
Lines 172-177 SVN= ${_P}/${_S} Link Here
172
RSYNC?= rsync
172
RSYNC?= rsync
173
PORTSNAP?= portsnap
173
PORTSNAP?= portsnap
174
PORTSNAP_FLAGS?= -p ${.CURDIR}
174
PORTSNAP_FLAGS?= -p ${.CURDIR}
175
GITUP?= gitup
176
GITUP_FLAGS?= -v2
175
.if !target(update)
177
.if !target(update)
176
update:
178
update:
177
.if exists(${.CURDIR}/.svn)
179
.if exists(${.CURDIR}/.svn)
Lines 191-196 update: Link Here
191
	@echo "--------------------------------------------------------------"
193
	@echo "--------------------------------------------------------------"
192
	cd ${.CURDIR}; ${GIT} pull
194
	cd ${.CURDIR}; ${GIT} pull
193
.  endif
195
.  endif
196
.elif exists(${.CURDIR}/.gituprevision)
197
	@echo "--------------------------------------------------------------"
198
	@echo ">>> Updating ${.CURDIR} from gitup repository"
199
	@echo "--------------------------------------------------------------"
200
	@${GITUP} ${GITUP_FLAGS} ports
194
.elif defined(RSYNC_UPDATE) && defined(PORTS_RSYNC_SOURCE)
201
.elif defined(RSYNC_UPDATE) && defined(PORTS_RSYNC_SOURCE)
195
	@echo "--------------------------------------------------------------"
202
	@echo "--------------------------------------------------------------"
196
	@echo ">>> Updating with ${RSYNC} from ${PORTS_RSYNC_SOURCE}"
203
	@echo ">>> Updating with ${RSYNC} from ${PORTS_RSYNC_SOURCE}"

Return to bug 254900