diff options
author | gjb <gjb@FreeBSD.org> | 2013-01-22 01:18:49 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2013-01-22 01:18:49 +0000 |
commit | f4d9afcbc56a97c55323013b0e65b378a1ab927f (patch) | |
tree | 2029c21406e9de76a6e56be2c176f692df007f67 /Makefile.inc1 | |
parent | 588ded67ca262aa5e0cac24a99b2bebc4b4086b2 (diff) | |
download | FreeBSD-src-f4d9afcbc56a97c55323013b0e65b378a1ab927f.zip FreeBSD-src-f4d9afcbc56a97c55323013b0e65b378a1ab927f.tar.gz |
Chase r245756 of make.conf(5):
- If update method is SUP_UPDATE or CVS, warn that those
update methods are deprecated.
- While here, remove bogus NO_WWWUPDATE.
MFC after: 3 days
X-MFC-with: r245756
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index c13117a..7584935 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -12,7 +12,6 @@ # -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_DOCUPDATE do not update doc in ${MAKE} update -# -DNO_WWWUPDATE do not update www in ${MAKE} update # -DDB_FROM_SRC use the user/group databases in src/etc instead of # the system database when installing. # -DNO_CTF do not run the DTrace CTF conversion tools on built objects @@ -968,6 +967,13 @@ update: @echo "--------------------------------------------------------------" @echo ">>> Running ${SUP}" @echo "--------------------------------------------------------------" + @echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" + @echo "!! Update methods with ${SUP} are deprecated." + @echo "!! Please see http://www.freebsd.org/handbook/svn.html" + @echo "!! and convert your update method to SVN_UPDATE or" + @echo "!! freebsd-update(8)." + @echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" + @sleep 5 .if defined(SUPFILE) @${SUP} ${SUPFLAGS} ${SUPFILE} .endif @@ -983,9 +989,6 @@ update: .if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE) @${SUP} ${SUPFLAGS} ${DOCSUPFILE} .endif -.if defined(WWWSUPFILE) && !defined(NO_WWWUPDATE) - @${SUP} ${SUPFLAGS} ${WWWSUPFILE} -.endif .endif .if defined(CVS_UPDATE) @cd ${.CURDIR} ; \ @@ -993,6 +996,13 @@ update: echo "--------------------------------------------------------------" ; \ echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \ echo "--------------------------------------------------------------" ; \ + echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \ + echo "!! Update methods with ${SUP} are deprecated." ; \ + echo "!! Please see http://www.freebsd.org/handbook/svn.html" ; \ + echo "!! and convert your update method to SVN_UPDATE or" ; \ + echo "!! freebsd-update(8)." ; \ + echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \ + sleep 5 ; \ echo ${CVS} -R -q update ${CVSFLAGS} ; \ ${CVS} -R -q update ${CVSFLAGS} ; \ fi |