dont let files patch themselves into existance multiple time, and use

the correct version.

1 files changed, 1 insertions, 210 deletions

diff --git a/distrib/cats/ramdisk/Makefile b/distrib/cats/ramdisk/Makefile
index 26e79d441c5..fb2ea9f6c1e 100644
--- a/distrib/cats/ramdisk/Makefile
+++ b/distrib/cats/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2004/02/01 05:15:48 drahn Exp $
+#	$OpenBSD: Makefile,v 1.2 2004/02/02 21:01:19 drahn Exp $
 
 REV=	${OSrev}
 
@@ -103,212 +103,3 @@ beforeinstall:
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
-#	$OpenBSD: Makefile,v 1.1 2004/02/01 05:15:48 drahn Exp $
-
-REV=	${OSrev}
-
-TOP=		${.CURDIR}/..
-
-BSD_RD=		bsd.rd
-IMAGE=		mr.fs
-CBIN?=		instbin
-CRUNCHCONF?=	${CBIN}.conf
-CRUNCHCONFS?=	${.CURDIR}/../common/crunch.conf
-LISTS=		${.CURDIR}/list
-UTILS?=		${.CURDIR}/../../miniroot
-
-MOUNT_POINT=	/mnt
-MTREE=		${UTILS}/mtree.conf
-
-VND?=		svnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-PID!=		echo $$$$
-
-
-DISKTYPE=       rdrootcats
-NBLKS=          8192
-# minfree, opt, b/i  trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 4096
-
-.ifndef DESTDIR
-all ${IMAGE}:
-	@echo setenv DESTDIR before making a ramdisk!
-	@false
-.else
-
-# mix config is not needed.
-all:	${BSD_RD}
-
-${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
-	cp bsd ${BSD_RD}
-	${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
-
-${IMAGE}: rd_setup do_files rd_teardown
-
-.endif
-
-bsd:
-	cd ${TOP}/../../sys/arch/cats/conf && config RAMDISK
-	cd ${TOP}/../../sys/arch/cats/compile/RAMDISK && \
-	    make clean && make depend && make
-	cp ${TOP}/../../sys/arch/cats/compile/RAMDISK/bsd bsd
-
-rd_setup:
-	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
-	vnconfig -v -c ${VND} ${IMAGE}
-	disklabel -w -r ${VND} ${DISKTYPE}
-	newfs ${NEWFSARGS} ${VND_RDEV}
-	fsck ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
-
-rd_teardown:
-	@df -i ${MOUNT_POINT}
-	-umount ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-
-rdsetroot:	${TOP}/../common/elfrdsetroot.c
-	${HOSTCC} -DDEBUG -o rdsetroot ${TOP}/../common/elfrdsetroot.c
-
-unconfig:
-	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-
-.PRECIOUS:	${IMAGE}
-
-install:
-	cp ${BSD_RD} cd${REV}.iso ${DESTDIR}/snapshot/
-
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-	crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
-	make -f ${CBIN}.mk all
-
-${CRUNCHCONF}: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
-
-do_files:
-	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
-	    sh ${TOP}/../miniroot/runlist.sh ${LISTS}
-	rm ${MOUNT_POINT}/${CBIN}
-
-clean cleandir:
-	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
-	*.o *.lo *.c bsd ${BSD_RD} cd${REV}.iso \
-	rdsetroot
-	rm -f instbin.conf
-	rm -rf cd-dir
-
-beforeinstall:
-	cp ${BSD.RD} cd${REV}.iso ${DESTDIR}/snapshot
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>
-#	$OpenBSD: Makefile,v 1.1 2004/02/01 05:15:48 drahn Exp $
-
-REV=	${OSrev}
-
-TOP=		${.CURDIR}/..
-
-BSD_RD=		bsd.rd
-IMAGE=		mr.fs
-CBIN?=		instbin
-CRUNCHCONF?=	${CBIN}.conf
-CRUNCHCONFS?=	${.CURDIR}/../common/crunch.conf
-LISTS=		${.CURDIR}/list
-UTILS?=		${.CURDIR}/../../miniroot
-
-MOUNT_POINT=	/mnt
-MTREE=		${UTILS}/mtree.conf
-
-VND?=		svnd0
-VND_DEV=	/dev/${VND}a
-VND_RDEV=	/dev/r${VND}a
-VND_CRDEV=	/dev/r${VND}c
-PID!=		echo $$$$
-
-
-DISKTYPE=       rdroot
-NBLKS=          8192
-# minfree, opt, b/i  trks, sects, cpg
-NEWFSARGS= -m 0 -o space -c 16 -i 4096
-
-.ifndef DESTDIR
-all ${IMAGE}:
-	@echo setenv DESTDIR before making a ramdisk!
-	@false
-.else
-
-# mix config is not needed.
-all:	${BSD_RD}
-
-${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot
-	cp bsd ${BSD_RD}
-	${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE}
-
-${IMAGE}: rd_setup do_files rd_teardown
-
-.endif
-
-bsd:
-	cd ${TOP}/../../sys/arch/cats/conf && config RAMDISK
-	cd ${TOP}/../../sys/arch/cats/compile/RAMDISK && \
-	    make clean && make depend && make
-	cp ${TOP}/../../sys/arch/cats/compile/RAMDISK/bsd bsd
-
-rd_setup:
-	dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS}
-	vnconfig -v -c ${VND} ${IMAGE}
-	disklabel -w -r ${VND} ${DISKTYPE}
-	newfs ${NEWFSARGS} ${VND_RDEV}
-	fsck ${VND_RDEV}
-	mount ${VND_DEV} ${MOUNT_POINT}
-
-rd_teardown:
-	@df -i ${MOUNT_POINT}
-	-umount ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-
-rdsetroot:	${TOP}/../common/elfrdsetroot.c
-	${HOSTCC} -DDEBUG -o rdsetroot ${TOP}/../common/elfrdsetroot.c
-
-unconfig:
-	-umount -f ${MOUNT_POINT}
-	-vnconfig -u ${VND}
-
-.PRECIOUS:	${IMAGE}
-
-install:
-	cp ${BSD_RD} cd${REV}.iso ${DESTDIR}/snapshot/
-
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-	crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}
-
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
-	make -f ${CBIN}.mk all
-
-${CRUNCHCONF}: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
-
-do_files:
-	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
-	    sh ${TOP}/../miniroot/runlist.sh ${LISTS}
-	rm ${MOUNT_POINT}/${CBIN}
-
-clean cleandir:
-	/bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
-	*.o *.lo *.c bsd ${BSD_RD} cd${REV}.iso \
-	rdsetroot
-	rm -rf cd-dir
-
-beforeinstall:
-	cp ${BSD.RD} cd${REV}.iso ${DESTDIR}/snapshot
-
-.include <bsd.obj.mk>
-.include <bsd.subdir.mk>