svn commit: r245895 - stable/9

Glen Barber gjb at FreeBSD.org
Fri Jan 25 00:45:47 UTC 2013


Author: gjb (doc,ports committer)
Date: Fri Jan 25 00:45:46 2013
New Revision: 245895
URL: http://svnweb.freebsd.org/changeset/base/245895

Log:
  MFC r245757:
    - If update method is SUP_UPDATE or CVS, warn that those
      update methods are deprecated.
    - While here, remove bogus NO_WWWUPDATE.

Modified:
  stable/9/Makefile.inc1   (contents, props changed)

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Thu Jan 24 23:11:51 2013	(r245894)
+++ stable/9/Makefile.inc1	Fri Jan 25 00:45:46 2013	(r245895)
@@ -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
 #	-DNO_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
 #	TARGET="machine" to crossbuild world for a different machine type
@@ -943,6 +942,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
@@ -958,9 +964,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} ; \
@@ -968,6 +971,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


More information about the svn-src-stable-9 mailing list