==== //depot/releng/5_dp1/src/release/Makefile#2 - /usr/p4/5DP1/src/release/Makefile ====
@@ -243,8 +243,11 @@
 .endif
 
 rerelease release:
-.if !defined(CHROOTDIR) || !defined(BUILDNAME) || !defined(CVSROOT)
-	@echo "To make a release you must set CHROOTDIR, BUILDNAME and CVSROOT" && false
+.if !defined(CHROOTDIR) || !defined(BUILDNAME)
+	@echo "To make a release you must set CHROOTDIR, and BUILDNAME" && false
+.endif
+.if !defined(CVSROOT) || !defined(P4CONFIG)
+	@echo "To make a release you must set CVSROOT or P4CONFIG" && false
 .endif
 .if defined(NOPORTSATALL) && !defined(NODOC)
 	@echo "Ports are required for building the docs.  Either set NODOC or"
@@ -271,6 +274,10 @@
 	for i in ${BOOTSTRAPUTILS} ; do \
 		cp -p ${CHROOTDIR}$$i ${CHROOTDIR}/${BOOTSTRAPDIR} ; \
 	done
+.if defined(P4CONFIG)
+	cd ${CHROOTDIR}/usr && rm -rf src && \
+		p4 sync
+.else
 .if !defined(RELEASETAG)
 	cd ${CHROOTDIR}/usr && rm -rf src && \
 		cvs -R -d ${CVSROOT} co -P ${RELEASESRCMODULE}
@@ -278,6 +285,7 @@
 	cd ${CHROOTDIR}/usr && rm -rf src && \
 		cvs -R -d ${CVSROOT} co -P -r ${RELEASETAG} ${RELEASESRCMODULE}
 .endif
+.endif
 .if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES})
 	cd ${CHROOTDIR}/usr/src && patch ${PATCH_FLAGS} < ${LOCAL_PATCHES}
 .endif
@@ -298,6 +306,8 @@
 .endif
 .endif
 .if !defined(NODOC)
+.if !defined(P4CONFIG)
+## XXX We checked out src and doc above with p4 sync
 .if defined(DOCRELEASETAG)
 	cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co -P -r ${DOCRELEASETAG} ${RELEASEDOCMODULE}
 .else
@@ -310,6 +320,7 @@
 	fi
 .endif
 .endif
+.endif
 .if make(rerelease)
 .if !defined(RELEASENOUPDATE)
 .if !defined(RELEASETAG)