1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00

The default method for 'make update' is now portsnap. Previously,

you had to manually select one of 3 methods: SUP_UPDATE, CVS_UPDATE,
or PORTSNAP_UPDATE.  The latter is now obsolete.

This should help some novice administrators just-start their system.

PR:		ports/105835
Submitted by:	erwin
This commit is contained in:
Mark Linimon 2007-05-24 23:58:29 +00:00
parent 7b6781c431
commit 0423d9afcc
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=191666

View File

@ -153,13 +153,7 @@ PORTSNAP_FLAGS?= -p ${.CURDIR}
SUPFLAGS+= -h ${SUPHOST} SUPFLAGS+= -h ${SUPHOST}
.endif .endif
update: update:
.if defined(PORTSNAP_UPDATE) .if defined(SUP_UPDATE) && defined(PORTSSUPFILE)
@echo "--------------------------------------------------------------"
@echo ">>> Running ${PORTSNAP}"
@echo "--------------------------------------------------------------"
@${PORTSNAP} ${PORTSNAP_FLAGS} fetch
@${PORTSNAP} ${PORTSNAP_FLAGS} update
.elif defined(SUP_UPDATE) && defined(PORTSSUPFILE)
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@echo ">>> Running ${SUP}" @echo ">>> Running ${SUP}"
@echo "--------------------------------------------------------------" @echo "--------------------------------------------------------------"
@ -173,5 +167,17 @@ update:
@${ECHO_MSG} "Error: Please define PORTSSUPFILE before doing make update." @${ECHO_MSG} "Error: Please define PORTSSUPFILE before doing make update."
@exit 1 @exit 1
.else .else
@${ECHO_MSG} "Error: Please define either PORTSNAP_UPDATE, SUP_UPDATE, or CVS_UPDATE first." @echo "--------------------------------------------------------------"
@echo ">>> Running ${PORTSNAP}"
@echo "--------------------------------------------------------------"
.if !exists(${PORTSDIR}/.portsnap.INDEX)
@echo "Error: 'make update' uses portsnap(8) by default and"
@echo "needs ${PORTSDIR} to be created by portsnap on its first run."
@echo "Please run 'portsnap fetch extract' first."
@echo "You can also define SUP_UPDATE and PORTSSUPFILE to use csup(1)"
@echo "or CVS_UPDATE to use cvs(1) for updating."
.else
@${PORTSNAP} ${PORTSNAP_FLAGS} fetch
@${PORTSNAP} ${PORTSNAP_FLAGS} update
.endif
.endif .endif