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

(-)b/Makefile (+7 lines)
Lines 176-185 update: Link Here
176
	@echo "--------------------------------------------------------------"
176
	@echo "--------------------------------------------------------------"
177
	cd ${.CURDIR}; ${SVN} update
177
	cd ${.CURDIR}; ${SVN} update
178
.elif exists(${.CURDIR}/.git)
178
.elif exists(${.CURDIR}/.git)
179
.if exists(${.CURDIR}/.git/svn)
179
	@echo "--------------------------------------------------------------"
180
	@echo "--------------------------------------------------------------"
180
	@echo ">>> Updating ${.CURDIR} from git+svn repository"
181
	@echo ">>> Updating ${.CURDIR} from git+svn repository"
181
	@echo "--------------------------------------------------------------"
182
	@echo "--------------------------------------------------------------"
182
	cd ${.CURDIR}; ${GIT} svn rebase
183
	cd ${.CURDIR}; ${GIT} svn rebase
184
.else
185
	@echo "--------------------------------------------------------------"
186
	@echo ">>> Updating ${.CURDIR} from git repository"
187
	@echo "--------------------------------------------------------------"
188
	cd ${.CURDIR}; ${GIT} pull
189
.endif
183
.elif defined(RSYNC_UPDATE) && defined(PORTS_RSYNC_SOURCE)
190
.elif defined(RSYNC_UPDATE) && defined(PORTS_RSYNC_SOURCE)
184
	@echo "--------------------------------------------------------------"
191
	@echo "--------------------------------------------------------------"
185
	@echo ">>> Updating with ${RSYNC} from ${PORTS_RSYNC_SOURCE}"
192
	@echo ">>> Updating with ${RSYNC} from ${PORTS_RSYNC_SOURCE}"

Return to bug 195699