Add support for ports collection distribution.

2 files changed, 36 insertions, 4 deletions

diff --git a/release/Makefile b/release/Makefile
index bda03ec..72a285c 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.278 1997/03/02 11:59:25 joerg Exp $
+#	$Id: Makefile,v 1.279 1997/03/06 07:51:40 joerg Exp $
 #
 # How to roll a release:
 #
@@ -102,6 +102,9 @@ rerelease release:
 .if defined(LOCAL_PATCHES) && exists(${LOCAL_PATCHES})
 	cd ${CHROOTDIR}/usr/src && patch --silent < ${LOCAL_PATCHES}
 .endif
+.if !defined(NO_PORTS)
+	cd ${CHROOTDIR}/usr && rm -rf ports && cvs -d ${CVSROOT} co -P ports
+.endif
 .endif
 .if make(rerelease)
 .if !defined(RELEASENOUPDATE)
@@ -110,6 +113,9 @@ rerelease release:
 .else
 	cd ${CHROOTDIR}/usr/src && cvs -q update -P -d -r ${RELEASETAG}
 .endif
+.if !defined(NO_PORTS)
+	cd ${CHROOTDIR}/usr/ports && cvs -q update -P -d
+.endif
 .endif
 .endif
 	( cd ${CHROOTDIR}/usr/src/sys/conf && \
@@ -149,7 +155,7 @@ whap:
 	  sed "s/__RELEASE/${BUILDNAME}/" version.h > version.h.new && mv version.h.new version.h )
 
 clean:
-	rm -rf boot_crunch release.[0-9] release.1[0]
+	rm -rf boot_crunch release.[0-9]
 
 # Clean out /R and make the directory structure.
 release.1:
@@ -414,6 +420,9 @@ release.9:
 	sh -e ${.CURDIR}/doFS.sh ${RD} ${MNT} ${FDSIZE} ${RD}/fixitfd \
 		${FIXITINODE} ${FDLABEL}
 	mv fs-image ${RD}/floppies/fixit.flp
+# Do our last minute floppies directory setup in a convenient place.
+	cp ${.CURDIR}/floppies/README.TXT ${RD}/floppies/README.TXT
+	@(cd ${RD}/floppies; md5 * > CHECKSUM.MD5)
 	touch release.9
 
 #
@@ -428,7 +437,6 @@ ftp.1:
 	cp ${.CURDIR}/sysinstall/help/hardware.hlp ${FD}/HARDWARE.TXT
 	cp ${.CURDIR}/sysinstall/help/install.hlp ${FD}/INSTALL.TXT
 	cp ${.CURDIR}/sysinstall/help/relnotes.hlp ${FD}/RELNOTES.TXT
-	cp ${.CURDIR}/floppies/README.TXT ${FD}/floppies/README.TXT
 
 #
 # --==## Setup a suitable cdrom-area ##==--
@@ -456,6 +464,22 @@ cdrom.1:
 	cp ${.CURDIR}/sysinstall/help/hardware.hlp ${CD}/HARDWARE.TXT
 	cp ${.CURDIR}/sysinstall/help/install.hlp ${CD}/INSTALL.TXT
 	cp ${.CURDIR}/sysinstall/help/relnotes.hlp ${CD}/RELNOTES.TXT
+	ln -s ../ports ${CD_DISC2}/usr/ports
+#
+# --==## And finally, create the ports distribution & tarball ##==--
+#
+# NOTE: Both ftp.1 and cdrom.1 must be run before this target or it will die
+#       a quick and gruesome death.  We also expect the release engineer to
+#       manually populate ports/distfiles on the 2nd CDROM.
++
+ports.1:
+	tar -cBf - -C /usr ports | tar xBpf - -C ${CD_DISC2} && \
+		mkdir -p ${CD_DISC1}/ports && tar -czf ${CD_DISC1}/ports/ports.tgz -C /usr ports && \
+		cp ${.CURDIR}/scripts/ports-install.sh ${CD_DISC1}/ports/install
+.sh && \
+		(cd ${CD_DISC1}/ports; md5 * > CHECKSUM.MD5) &&
+		tar -cBf - -C ${CD_DISC1} ports | tar -xBf - -C ${FD}
+
 
 # Various "subroutine" and other supporting targets.
 
@@ -495,7 +519,7 @@ doTARBALL:
 
 doRELEASE:  release.1 release.2 release.3 release.4 release.5 release.6 \
 		release.7 release.8 release.9
-	cd ${.CURDIR} && ${MAKE} cdrom.1 ftp.1
+	cd ${.CURDIR} && ${MAKE} cdrom.1 ftp.1 ports.1
 	@echo "Release done"
 
 floppies:
diff --git a/release/scripts/ports-install.sh b/release/scripts/ports-install.sh
new file mode 100755
index 0000000..22d2246
--- /dev/null
+++ b/release/scripts/ports-install.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+if [ "`id -u`" != "0" ]; then
+	echo "Sorry, this must be done as root."
+	exit 1
+fi
+cat ports.tgz | tar --unlink -xpzf - -C /usr
+exit 0