MFC: revision 1.894 and 1.895

- Request boot floppy after loading mfsroot floppy.
 - Add EXTPORTSDIR.

release/Makefile

@@ -35,6 +35,10 @@ BUILDNAME?=${BASE}-${DATE}-SNAP
 # be copied; cvs update will be used instead.
 #EXTSRCDIR=/usr/src
 #
+# To use a checked-out ports collection directory instead of
+# checking out from a local CVS repository, set this option.
+#EXTPORTSDIR=/usr/ports
+#
 # To add other options to the CVS subcommands (co,up), set
 #CVSCMDARGS="-D '01/01/2002 00:00:00 UTC'"
 #
@@ -385,9 +389,15 @@ release rerelease:
 .endif
 	rm -rf ${CHROOTDIR}/usr/ports
 .if !defined(NOPORTSATALL)
+.if defined(EXTPORTSDIR)
+	cd ${CHROOTDIR}/usr && cp -R -H ${EXTPORTSDIR} ports
+	# If there are distfiles downloaded removing them
+	rm -rf ports/distfiles/*
+.else
 	cd ${CHROOTDIR}/usr && ${CVSPREFIX} cvs -R ${CVSARGS} -d ${CVSROOT} \
 	    co ${CVSCMDARGS} ${CVS_PORTSARGS} ${RELEASEPORTSMODULE}
 .endif
+.endif
 .if !defined(NODOC)
 	rm -rf ${CHROOTDIR}/usr/doc
 .if defined(EXTDOCDIR)
@@ -416,7 +426,7 @@ release rerelease:
 	    update ${CVSCMDARGS} -P -d -r ${RELEASETAG}
 .endif
 	rm -f ${CHROOTDIR}/tmp/.world_done 
-.if !defined(NOPORTS)
+.if !defined(NOPORTS) && !defined(EXTPORTSDIR)
 	cd ${CHROOTDIR}/usr/ports && ${CVSPREFIX} cvs -R ${CVSARGS} -q \
 	    update ${CVSCMDARGS} -P -d
 	rm -f ${CHROOTDIR}/tmp/.skip_ports_index
@@ -1248,6 +1258,9 @@ buildBootFloppy:
 .if !exists(${ACPI_KO})
 	@echo 'mfsroot_before="read -p \"Insert boot floppy and press Enter\""' >> ${IMAGEDIR}/boot/loader.conf
 .endif
+.if defined(SPLIT_MFSROOT)
+	@echo 'mfsroot_after="read -p \"Insert boot floppy and press Enter\""' >> ${IMAGEDIR}/boot/loader.conf
+.endif
 .if ${TARGET_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT}
 	@echo "-P" >> ${IMAGEDIR}/boot.config
 .endif