Author: gjb (doc,ports committer)
Date: Tue Jan 22 01:18:49 2013
New Revision: 245757
URL: http://svnweb.freebsd.org/changeset/base/245757
Log:
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
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Tue Jan 22 01:10:47 2013 (r245756)
+++ head/Makefile.inc1 Tue Jan 22 01:18:49 2013 (r245757)
@@ -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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
