misc/88840: Enable use of CVSROOT variable into src Makefile (for update target)

[Luca Morettoni]

>Number:         88840
>Category:       misc
>Synopsis:       Enable use of CVSROOT variable into src Makefile (for update target)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 11 12:40:14 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Luca Morettoni
>Release:        5.4-STABLE
>Organization:
>Environment:
FreeBSD home.morettoni.local 5.4-STABLE FreeBSD 5.4-STABLE #162: Tue Oct 11 01:01:40 CEST 2005     luca at home.morettoni.local:/usr/obj/usr/src/sys/HOME  i386
>Description:
              If you set CVS_UPDATE in make.conf you can update system source files by CVS system. If you want to change the CVS server you can set the CVSROOT, but the code in Makefile.inc1 did not take that parameter.
>How-To-Repeat:
              cd /usr/src; make -DCVS_UPDATE -DCVSROOT=xxx
the new XXX server is ignored.
>Fix:
              Apply this little patch and now (if you define CVSROOT var) cvs use new server address, otherwise it update from the default server!

--- Makefile.inc1.original      Fri Nov 11 13:14:40 2005
+++ Makefile.inc1       Fri Nov 11 13:17:42 2005
@@ -765,7 +765,11 @@
        @echo "--------------------------------------------------------------"
        @echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT}
        @echo "--------------------------------------------------------------"
+.if defined(CVSROOT)
+       cd ${.CURDIR}; ${CVS} -R -q -d ${CVSROOT} update ${CVSFLAGS}
+.else
        cd ${.CURDIR}; ${CVS} -R -q update ${CVSFLAGS}
+.endif
 .endif
 
 #

>Release-Note:
>Audit-Trail:
>Unformatted: