Author: gjb (doc,ports committer)
Date: Tue May 28 23:43:47 2013
New Revision: 251084
URL: http://svnweb.freebsd.org/changeset/base/251084
Log:
r245757 introduced warning output if update method is set to CVS_UPDATE
or SUP_UPDATE.
CVS exporter for head/ is turned off for nearly one month now.
It is finally time to swing the ax at these update methods.
Reviewed by: eadler
MFC after: 1 month
Modified:
head/Makefile.inc1
head/release/doc/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Tue May 28 23:43:11 2013 (r251083)
+++ head/Makefile.inc1 Tue May 28 23:43:47 2013 (r251084)
@@ -114,15 +114,8 @@ LOCAL_TOOL_DIRS?=
BUILDENV_SHELL?=/bin/sh
-CVS?= cvs
-CVSFLAGS?= -A -P -d -I!
-SVN?= svn
+SVN?= /usr/local/bin/svn
SVNFLAGS?= -r HEAD
-SUP?= /usr/bin/csup
-SUPFLAGS?= -g -L 2
-.if defined(SUPHOST)
-SUPFLAGS+= -h ${SUPHOST}
-.endif
MAKEOBJDIRPREFIX?= /usr/obj
.if !defined(OSRELDATE)
@@ -1080,59 +1073,18 @@ doxygen:
# latest copy.
#
update:
-.if defined(SUP_UPDATE)
+.if (defined(CVS_UPDATE) || defined(SUP_UPDATE)) && !defined(SVN_UPDATE)
@echo "--------------------------------------------------------------"
- @echo ">>> Running ${SUP}"
+ @echo "CVS_UPDATE and SUP_UPDATE are no longer supported."
+ @echo "Please see: https://wiki.freebsd.org/CvsIsDeprecated";
@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
-.if defined(SUPFILE1)
- @${SUP} ${SUPFLAGS} ${SUPFILE1}
-.endif
-.if defined(SUPFILE2)
- @${SUP} ${SUPFLAGS} ${SUPFILE2}
-.endif
-.if defined(PORTSSUPFILE) && !defined(NO_PORTSUPDATE)
- @${SUP} ${SUPFLAGS} ${PORTSSUPFILE}
-.endif
-.if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE)
- @${SUP} ${SUPFLAGS} ${DOCSUPFILE}
-.endif
-.endif
-.if defined(CVS_UPDATE)
- @cd ${.CURDIR} ; \
- if [ -d CVS ] ; then \
- echo
"--------------------------------------------------------------" ; \
- echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ;
\
- echo
"--------------------------------------------------------------" ; \
- echo "!! WARNING WARNING WARNING WARNING WARNING WARNING
WARNING !!" ; \
- echo "!! Update methods with CVS 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
+ @exit 1
.endif
.if defined(SVN_UPDATE)
- @cd ${.CURDIR} ; \
- if [ -d .svn ] ; then \
- echo
"--------------------------------------------------------------" ; \
- echo ">>> Updating ${.CURDIR} using Subversion" ; \
- echo
"--------------------------------------------------------------" ; \
- echo ${SVN} update ${SVNFLAGS} ; \
- ${SVN} update ${SVNFLAGS} ; \
- fi
+ @echo "--------------------------------------------------------------"
+ @echo ">>> Updating ${.CURDIR} using Subversion"
+ @echo "--------------------------------------------------------------"
+ @(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS})
.endif
#
Modified: head/release/doc/Makefile
==============================================================================
--- head/release/doc/Makefile Tue May 28 23:43:11 2013 (r251083)
+++ head/release/doc/Makefile Tue May 28 23:43:47 2013 (r251084)
@@ -12,26 +12,30 @@ SUBDIR+= share/xml
RELN_ROOT?= ${.CURDIR}
-.if defined(SUPHOST)
-SUPFLAGS+= -h ${SUPHOST}
-.endif
+SVN?= /usr/local/bin/svn
+SVNFLAGS?= -r HEAD
+
update:
-.if defined(SUP_UPDATE)
-.if !defined(DOCSUPFILE)
- @echo "Error: Please define DOCSUPFILE before doing make update."
+.if (defined(CVS_UPDATE) || defined(SUP_UPDATE)) && !defined(SVN_UPDATE)
+ @echo "--------------------------------------------------------------"
+ @echo "CVS_UPDATE and SUP_UPDATE are no longer supported."
+ @echo "Please see: https://wiki.freebsd.org/CvsIsDeprecated";
+ @echo "--------------------------------------------------------------"
@exit 1
.endif
+.if defined(SVN_UPDATE)
+. if !exists(${SVN})
@echo "--------------------------------------------------------------"
- @echo ">>> Running ${SUP}"
+ @echo ">>> Updating ${RELN_ROOT} requires ${SVN}."
@echo "--------------------------------------------------------------"
- @${SUP} ${SUPFLAGS} ${DOCSUPFILE}
-.elif defined(CVS_UPDATE)
+ @exit 1
+. endif
@echo "--------------------------------------------------------------"
- @echo ">>> Updating ${.CURDIR} from cvs repository" ${CVSROOT}
+ @echo ">>> Updating ${.CURDIR} using Subversion"
@echo "--------------------------------------------------------------"
- cd ${.CURDIR}; cvs -q update -P -d
+ @(cd ${.CURDIR} && ${SVN} update ${SVNFLAGS})
.else
- @echo "Error: Please define either SUP_UPDATE or CVS_UPDATE first."
+ @echo "Error: Please define SUP_UPDATE first."
.endif
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
