step by step, more removal of differences

9 files changed, 37 insertions, 37 deletions

diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile
index 0c6ae7ffc81..7e2e8f43106 100644
--- a/distrib/alpha/miniroot/Makefile
+++ b/distrib/alpha/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.11 2019/04/30 23:25:19 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.12 2019/04/30 23:37:31 deraadt Exp $
 
 FS=		miniroot${OSrev}.fs
 FSSIZE=		5760
@@ -87,9 +87,6 @@ mr.fs: instbin
 	rm $@.d/instbin
 	makefs ${MRMAKEFSARGS} $@ $@.d
 
-instbin.conf: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
-
 instbin.mk instbin.cache instbin.c: instbin.conf
 	crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib \
 	    -c instbin.c -e instbin -m instbin.mk instbin.conf
@@ -98,6 +95,9 @@ instbin: instbin.mk instbin.cache instbin.c
 	${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all
 	strip ${STRIPOPTS} instbin
 
+instbin.conf: ${LISTS}
+	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
+
 unconfig:
 	-umount -f ${MOUNT_POINT}
 	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index d5c3bf3839c..75c81a8a45b 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.30 2019/04/30 21:14:58 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.31 2019/04/30 23:37:31 deraadt Exp $
 
 FS=		install${OSrev}.fs
 FSSIZE=		921536
@@ -24,7 +24,7 @@ MSDOSSIZE=	960
 TOTALSIZE!=	expr ${FSSIZE} + ${MSDOSSIZE}
 TEMPLATE=	${.CURDIR}/template
 
-all: ${CDROM} ${FS}
+all: ${FS} ${CDROM}
 
 ${FS}: ${BASE} ${XBASE} bsd.gz
 	dd if=/dev/zero of=${FS} bs=512 count=${TOTALSIZE}
diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile
index 1620649c708..ba821c28920 100644
--- a/distrib/amd64/ramdisk_cd/Makefile
+++ b/distrib/amd64/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2019/04/30 23:25:19 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.17 2019/04/30 23:37:31 deraadt Exp $
 
 FS=		miniroot${OSrev}.fs
 FSSIZE=		9600
@@ -81,9 +81,6 @@ mr.fs: instbin
 	rm $@.d/instbin
 	makefs ${MRMAKEFSARGS} $@ $@.d
 
-instbin.conf: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
-
 instbin.mk instbin.cache instbin.c: instbin.conf
 	crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib \
 	    -c instbin.c -e instbin -m instbin.mk instbin.conf
@@ -92,6 +89,9 @@ instbin: instbin.mk instbin.cache instbin.c
 	${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all
 	strip -R .comment -R .SUNW_ctf instbin
 
+instbin.conf: ${LISTS}
+	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
+
 unconfig:
 	-umount -f ${MOUNT_POINT}
 	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index 7f7a9fa8c6d..c3f12ffd991 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.23 2019/04/30 21:14:59 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.24 2019/04/30 23:37:32 deraadt Exp $
 
 FS=		install${OSrev}.fs
 FSSIZE=		921600
@@ -18,7 +18,7 @@ BASE=		${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \
 XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
 		${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz
 
-all: ${CDROM} ${FS}
+all: ${FS} ${CDROM}
 
 ${FS}: ${BASE} ${XBASE} bsd.gz
 	dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE}
diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile
index 7ee54c5da0f..45b3308b92e 100644
--- a/distrib/i386/ramdisk_cd/Makefile
+++ b/distrib/i386/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.10 2019/04/30 23:25:19 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.11 2019/04/30 23:37:32 deraadt Exp $
 
 FS=		miniroot${OSrev}.fs
 FSSIZE=		7936
@@ -103,7 +103,7 @@ install:
 .endif
 
 clean cleandir:
-	/bin/rm -f *.core mr.fs instbin instbin.mk instbin*.cache \
+	rm -f *.core mr.fs instbin instbin.mk instbin*.cache \
 	    *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs \
 	    lib*.a lib*.olist instbin.map boot instbin.conf ${FS}
 	rm -rf mr.fs.d
diff --git a/distrib/octeon/ramdisk/Makefile b/distrib/octeon/ramdisk/Makefile
index 4d391d4bf17..9b1790f2e9b 100644
--- a/distrib/octeon/ramdisk/Makefile
+++ b/distrib/octeon/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.13 2019/04/30 23:25:19 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.14 2019/04/30 23:37:32 deraadt Exp $
 
 FS=		miniroot${OSrev}.fs
 FSSIZE=		24576
@@ -33,6 +33,11 @@ bsd.rd: mr.fs bsd
 	cp bsd bsd.rd
 	rdsetroot bsd.rd mr.fs
 
+bsd:
+	cd ${.CURDIR}/../../../sys/arch/octeon/compile/RAMDISK && \
+	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}'
+	cp -p ${.CURDIR}/../../../sys/arch/octeon/compile/RAMDISK/obj/bsd bsd
+
 mr.fs: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
@@ -43,11 +48,6 @@ mr.fs: instbin
 	rm $@.d/instbin
 	makefs ${MRMAKEFSARGS} $@ $@.d
 
-bsd:
-	cd ${.CURDIR}/../../../sys/arch/octeon/compile/RAMDISK && \
-	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}'
-	cp -p ${.CURDIR}/../../../sys/arch/octeon/compile/RAMDISK/obj/bsd bsd
-
 instbin.mk instbin.cache instbin.c: instbin.conf
 	crunchgen -E -M -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib \
 	    -c instbin.c -e instbin -m instbin.mk instbin.conf
@@ -58,11 +58,6 @@ instbin: instbin.mk instbin.cache instbin.c
 instbin.conf: ${LISTS}
 	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
 
-clean cleandir:
-	rm -f *.core mr.fs instbin instbin.mk instbin.cache \
-	    lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd
-	rm -rf cd-dir mr.fs.d
-
 unconfig:
 	-umount -f ${MOUNT_POINT}
 	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
@@ -74,4 +69,9 @@ install:
 	cp ${FS} ${RELEASEDIR}
 .endif
 
+clean cleandir:
+	rm -f *.core mr.fs instbin instbin.mk instbin.cache \
+	    lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd
+	rm -rf cd-dir mr.fs.d
+
 .include <bsd.obj.mk>
diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile
index 5000ce43f74..3713f5247de 100644
--- a/distrib/sparc64/miniroot/Makefile
+++ b/distrib/sparc64/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2019/04/30 23:25:19 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.17 2019/04/30 23:37:32 deraadt Exp $
 
 FS=		miniroot${OSrev}.fs
 FSSIZE=		5760
@@ -83,9 +83,6 @@ mr.fs: instbin
 	rm $@.d/instbin
 	makefs ${MRMAKEFSARGS} $@ $@.d
 
-instbin.conf: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
-
 instbin.mk instbin.cache instbin.c: instbin.conf
 	crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib \
 	    -c instbin.c -e instbin -m instbin.mk instbin.conf
@@ -93,6 +90,9 @@ instbin.mk instbin.cache instbin.c: instbin.conf
 instbin: instbin.mk instbin.cache instbin.c
 	${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all
 
+instbin.conf: ${LISTS}
+	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
+
 unconfig:
 	-umount -f ${MOUNT_POINT}
 	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index 4be57d5aa0a..02e68244f05 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.47 2019/04/30 21:15:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.48 2019/04/30 23:37:32 deraadt Exp $
 
 FS=		floppy${OSrev}.fs
 FSSIZE=		2880
@@ -57,9 +57,6 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}'
 	cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISKU1/obj/bsd bsd
 
-instbin.conf: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
-
 instbin.mk instbin.cache instbin.c: instbin.conf
 	crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib \
 	    -c instbin.c -e instbin -m instbin.mk instbin.conf
@@ -67,6 +64,9 @@ instbin.mk instbin.cache instbin.c: instbin.conf
 instbin: instbin.mk instbin.cache instbin.c
 	${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all
 
+instbin.conf: ${LISTS}
+	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
+
 unconfig:
 	-umount -f ${MOUNT_POINT}
 	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index 0b1b78e083e..0f7353ab98d 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.42 2019/04/30 23:25:19 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.43 2019/04/30 23:37:32 deraadt Exp $
 
 FS=		floppyB${OSrev}.fs
 FSDISKTYPE=	floppy
@@ -53,9 +53,6 @@ bsd:
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}'
 	cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISKU5/obj/bsd bsd
 
-instbin.conf: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
-
 instbin.mk instbin.cache instbin.c: instbin.conf
 	crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib \
 	    -c instbin.c -e instbin -m instbin.mk instbin.conf
@@ -63,6 +60,9 @@ instbin.mk instbin.cache instbin.c: instbin.conf
 instbin: instbin.mk instbin.cache instbin.c
 	${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all
 
+instbin.conf: ${LISTS}
+	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
+
 unconfig:
 	-umount -f ${MOUNT_POINT}
 	-[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd