remove the abstraction REV on top of abstraction OSrev which is always

the sme.

66 files changed, 142 insertions, 185 deletions

diff --git a/distrib/alpha/Makefile.inc b/distrib/alpha/Makefile.inc
index e2812425600..29481c58ef3 100644
--- a/distrib/alpha/Makefile.inc
+++ b/distrib/alpha/Makefile.inc
@@ -1,3 +1,2 @@
-#	$OpenBSD: Makefile.inc,v 1.4 1998/06/27 20:52:01 todd Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 2019/04/29 01:48:39 deraadt Exp $
 
-REV=${OSrev}
diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index f3c9104d741..e486cbb4fd7 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.35 2019/04/28 16:26:07 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.36 2019/04/29 01:48:39 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
-IMAGE=		ramdisk${REV}.fs
+IMAGE=		ramdisk${OSrev}.fs
 
 STRIPOPTS?=	-R .SUNW_ctf -R .shstrtab
 
@@ -35,7 +35,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index 759970d9841..2b2c934edd2 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile.inc,v 1.41 2019/04/28 16:47:29 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.42 2019/04/29 01:48:39 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
-IMAGE=		ramdisk${REV}.fs
+IMAGE=		ramdisk${OSrev}.fs
 
 MOUNT_POINT=	/mnt
 
@@ -11,7 +11,7 @@ STRIPOPTS?=	-R .SUNW_ctf -R .shstrtab
 INSTALLBOOT?=	/usr/mdec/installboot -v
 
 XNAME?=		floppy
-FLOPPY?=	${XNAME}${REV}.fs
+FLOPPY?=	${XNAME}${OSrev}.fs
 FLOPPYBLKS?=	2880
 FLOPPYTYPE?=	floppy
 BOOT?=		/usr/mdec/boot
@@ -62,7 +62,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/alpha/common/list b/distrib/alpha/common/list
index be4d40920df..f1b45090d5b 100644
--- a/distrib/alpha/common/list
+++ b/distrib/alpha/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.49 2016/09/13 22:27:50 rpe Exp $
+#	$OpenBSD: list,v 1.50 2019/04/29 01:48:39 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -59,7 +59,7 @@ SPECIAL	cd dev; sh MAKEDEV ramdisk
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 TERMCAP	vt100,vt220,dumb			usr/share/misc/termcap
diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile
index d9d91e85505..ea17f254d22 100644
--- a/distrib/alpha/miniroot/Makefile
+++ b/distrib/alpha/miniroot/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.5 2019/04/28 16:47:29 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.6 2019/04/29 01:48:39 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-FS=		miniroot${REV}.fs
+FS=		miniroot${OSrev}.fs
 MOUNT_POINT=	/mnt
 
 .ifndef DESTDIR
diff --git a/distrib/amd64/Makefile.inc b/distrib/amd64/Makefile.inc
index 390422ce756..e0f82c772a9 100644
--- a/distrib/amd64/Makefile.inc
+++ b/distrib/amd64/Makefile.inc
@@ -1,5 +1,3 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2004/02/07 21:16:47 deraadt Exp $
-
-REV=	${OSrev}
+#	$OpenBSD: Makefile.inc,v 1.2 2019/04/29 01:48:39 deraadt Exp $
 
 .include <bsd.own.mk>
diff --git a/distrib/amd64/cdfs/Makefile b/distrib/amd64/cdfs/Makefile
index 2863ffa5359..a278ff8a916 100644
--- a/distrib/amd64/cdfs/Makefile
+++ b/distrib/amd64/cdfs/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.9 2019/04/28 15:32:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.10 2019/04/29 01:48:39 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-CDROM=	cd${REV}.iso
+CDROM=	cd${OSrev}.iso
 
 all: ${CDROM}
 
diff --git a/distrib/amd64/common/list b/distrib/amd64/common/list
index 75e1757b6ad..1910cdfddc3 100644
--- a/distrib/amd64/common/list
+++ b/distrib/amd64/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.45 2016/12/30 22:32:23 deraadt Exp $
+#	$OpenBSD: list,v 1.46 2019/04/29 01:48:39 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -68,7 +68,7 @@ COPY	${DESTDIR}/usr/mdec/mbr			usr/mdec/mbr
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 TERMCAP	vt100,vt220,dumb			usr/share/misc/termcap
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index 91fb457c442..672c5196a00 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.26 2019/04/28 17:35:29 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.27 2019/04/29 01:48:39 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-CDROM=		install${REV}.iso
+CDROM=		install${OSrev}.iso
 
-FS=		install${REV}.fs
+FS=		install${OSrev}.fs
 FSSIZE=		921536
 FSTYPE=		install360
 
diff --git a/distrib/amd64/ramdiskA/Makefile.inc b/distrib/amd64/ramdiskA/Makefile.inc
index e28208f1511..989eb3dcf11 100644
--- a/distrib/amd64/ramdiskA/Makefile.inc
+++ b/distrib/amd64/ramdiskA/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.12 2019/04/28 16:47:30 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.13 2019/04/29 01:48:39 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -9,7 +9,7 @@ UTILS?=		${.CURDIR}/../../miniroot
 MOUNT_POINT=	/mnt
 MTREE=		${UTILS}/mtree.conf
 
-FS?=		floppy${REV}.fs
+FS?=		floppy${OSrev}.fs
 BOOT?=		${DESTDIR}/usr/mdec/boot
 EFIBOOT?=	${DESTDIR}/usr/mdec/BOOTX64.EFI ${DESTDIR}/usr/mdec/BOOTIA32.EFI
 FLOPPYSIZE?=	2880
@@ -69,7 +69,7 @@ mr.fs: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/amd64/ramdisk_cd/Makefile.inc b/distrib/amd64/ramdisk_cd/Makefile.inc
index b4c92c4be68..4cf459413c7 100644
--- a/distrib/amd64/ramdisk_cd/Makefile.inc
+++ b/distrib/amd64/ramdisk_cd/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.12 2019/04/28 16:47:30 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.13 2019/04/29 01:48:39 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -9,7 +9,7 @@ UTILS?=		${.CURDIR}/../../miniroot
 MOUNT_POINT=	/mnt
 MTREE=		${UTILS}/mtree.conf
 
-FS?=		miniroot${REV}.fs
+FS?=		miniroot${OSrev}.fs
 BOOT?=		${DESTDIR}/usr/mdec/boot
 EFIBOOT?=	${DESTDIR}/usr/mdec/BOOTX64.EFI ${DESTDIR}/usr/mdec/BOOTIA32.EFI
 FLOPPYSIZE?=	2880
diff --git a/distrib/arm64/miniroot/Makefile b/distrib/arm64/miniroot/Makefile
index 6b1c0455a89..6175dea95ea 100644
--- a/distrib/arm64/miniroot/Makefile
+++ b/distrib/arm64/miniroot/Makefile
@@ -1,7 +1,5 @@
 
-REV=	${OSrev}
-
-IMAGE=	miniroot${REV}.fs
+IMAGE=	miniroot${OSrev}.fs
 
 MOUNT_POINT=	/mnt
 
diff --git a/distrib/arm64/ramdisk/Makefile b/distrib/arm64/ramdisk/Makefile
index 4ab90a5835a..98f5950075b 100644
--- a/distrib/arm64/ramdisk/Makefile
+++ b/distrib/arm64/ramdisk/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2019/04/28 15:32:03 deraadt Exp $
-
-REV=	${OSrev}
+#	$OpenBSD: Makefile,v 1.9 2019/04/29 01:48:39 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -43,7 +41,7 @@ ${IMAGE}: instbin
 	mkdir -p $@.d/usr/mdec/${DIR}
 .endfor
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/arm64/ramdisk/list b/distrib/arm64/ramdisk/list
index a316f220b45..f85de33c14d 100644
--- a/distrib/arm64/ramdisk/list
+++ b/distrib/arm64/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.8 2018/03/21 19:16:06 sthen Exp $
+#	$OpenBSD: list,v 1.9 2019/04/29 01:48:39 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -101,7 +101,7 @@ SPECIAL	cd dev; sh MAKEDEV ramdisk
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SYMLINK	/tmp/i/fstab.shadow			etc/fstab
diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc
index 299cd01f402..1f211a40696 100644
--- a/distrib/armv7/miniroot/Makefile.inc
+++ b/distrib/armv7/miniroot/Makefile.inc
@@ -1,7 +1,5 @@
 
-REV=	${OSrev}
-
-IMAGE=	miniroot-${BOARD}-${REV}.fs
+IMAGE=	miniroot-${BOARD}-${OSrev}.fs
 MKUBOOT?=	mkuboot
 
 MOUNT_POINT=	/mnt
diff --git a/distrib/armv7/ramdisk/Makefile b/distrib/armv7/ramdisk/Makefile
index d61e6432947..9950cdf7c8c 100644
--- a/distrib/armv7/ramdisk/Makefile
+++ b/distrib/armv7/ramdisk/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.21 2019/04/28 15:21:49 deraadt Exp $
-
-REV=	${OSrev}
+#	$OpenBSD: Makefile,v 1.22 2019/04/29 01:48:39 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -49,7 +47,7 @@ ${IMAGE}: instbin
 	mkdir -p $@.d/usr/mdec/${DIR}
 .endfor
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/armv7/ramdisk/list b/distrib/armv7/ramdisk/list
index 69fdcd98e9d..cc266188df9 100644
--- a/distrib/armv7/ramdisk/list
+++ b/distrib/armv7/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.38 2019/02/09 13:03:56 jsg Exp $
+#	$OpenBSD: list,v 1.39 2019/04/29 01:48:39 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -102,7 +102,7 @@ SPECIAL	cd dev; sh MAKEDEV ramdisk
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SYMLINK	/tmp/i/fstab.shadow			etc/fstab
diff --git a/distrib/hppa/Makefile.inc b/distrib/hppa/Makefile.inc
index 9aec5f464d0..ae30927ef90 100644
--- a/distrib/hppa/Makefile.inc
+++ b/distrib/hppa/Makefile.inc
@@ -1,3 +1,2 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2003/01/30 21:05:00 mickey Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 2019/04/29 01:48:39 deraadt Exp $
 
-REV=${OSrev}
diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile
index 5ffa812558b..971bb584691 100644
--- a/distrib/hppa/iso/Makefile
+++ b/distrib/hppa/iso/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.15 2019/04/28 14:48:10 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.16 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-CDROM=		install${REV}.iso
+CDROM=		install${OSrev}.iso
 RELXDIR?=	/home/relx-${MACHINE}
 RELDIR?=	/home/rel-${MACHINE}
 
diff --git a/distrib/hppa/list b/distrib/hppa/list
index fa00ccb0f23..d43ed5bdbd5 100644
--- a/distrib/hppa/list
+++ b/distrib/hppa/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.41 2018/03/21 19:16:06 sthen Exp $
+#	$OpenBSD: list,v 1.42 2019/04/29 01:48:39 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -64,7 +64,7 @@ SPECIAL	rm usr/bin/ftp-ssl
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index 1ba07e164e2..8b70ac71c78 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.39 2019/04/28 16:26:07 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.40 2019/04/29 01:48:40 deraadt Exp $
 
 ARCHDIR=	${.CURDIR}/..
 SRCDIR=		${.CURDIR}/../../..
@@ -9,7 +9,7 @@ SRCDIR=		${.CURDIR}/../../..
 .include "${ARCHDIR}/Makefile.inc"
 .endif
 
-IMAGE?=		ramdisk${REV}.fs
+IMAGE?=		ramdisk${OSrev}.fs
 CRUNCHGENOPTS?=-E
 RAMDISK?=	RAMDISK
 UTILS?=		${.CURDIR}/../../miniroot
@@ -17,8 +17,8 @@ UTILS?=		${.CURDIR}/../../miniroot
 LISTS=		${ARCHDIR}/list ${.CURDIR}/list.local
 MTREE=		${UTILS}/mtree.conf
 
-LIF?=		lif${REV}.fs
-CDROM?=		cd${REV}.iso
+LIF?=		lif${OSrev}.fs
+CDROM?=		cd${OSrev}.iso
 MKBOOT?=	/usr/mdec/mkboot
 BOOT?=		${DESTDIR}/usr/mdec/boot
 CDBOOT?=	${DESTDIR}/usr/mdec/cdboot
@@ -62,7 +62,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} ARCHDIR=${ARCHDIR} \
+	CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} ARCHDIR=${ARCHDIR} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/i386/Makefile.inc b/distrib/i386/Makefile.inc
index d504fb2a441..9ab174b4316 100644
--- a/distrib/i386/Makefile.inc
+++ b/distrib/i386/Makefile.inc
@@ -1,5 +1,3 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2002/04/22 02:40:02 deraadt Exp $
-
-REV=	${OSrev}
+#	$OpenBSD: Makefile.inc,v 1.2 2019/04/29 01:48:40 deraadt Exp $
 
 .include <bsd.own.mk>
diff --git a/distrib/i386/cdfs/Makefile b/distrib/i386/cdfs/Makefile
index 01ce8776783..fddfa78003b 100644
--- a/distrib/i386/cdfs/Makefile
+++ b/distrib/i386/cdfs/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.10 2019/04/28 15:32:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.11 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-CDROM=	cd${REV}.iso
+CDROM=	cd${OSrev}.iso
 
 all: ${CDROM}
 
diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index 9b78c6b04b9..d854eee0b47 100644
--- a/distrib/i386/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.49 2019/04/28 16:47:30 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.50 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -12,7 +12,7 @@ MOUNT_POINT=	/mnt
 MTREE=		${UTILS}/mtree.conf
 
 XNAME?=		floppy
-FS?=		${XNAME}${REV}.fs
+FS?=		${XNAME}${OSrev}.fs
 BOOT?=		${DESTDIR}/usr/mdec/boot
 FLOPPYSIZE?=	2880
 FLOPPYTYPE?=	floppy3
@@ -66,7 +66,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/i386/common/list b/distrib/i386/common/list
index fc738afed44..9c294b4bf87 100644
--- a/distrib/i386/common/list
+++ b/distrib/i386/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.48 2016/12/30 22:32:25 deraadt Exp $
+#	$OpenBSD: list,v 1.49 2019/04/29 01:48:40 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -68,7 +68,7 @@ COPY	${DESTDIR}/usr/mdec/mbr			usr/mdec/mbr
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 TERMCAP	vt100,vt220,dumb			usr/share/misc/termcap
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index 5023b180609..1d35802e861 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.19 2019/04/28 17:35:45 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.20 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-CDROM=		install${REV}.iso
+CDROM=		install${OSrev}.iso
 
-FS=		install${REV}.fs
+FS=		install${OSrev}.fs
 FSSIZE=		921600
 FSTYPE=		install360
 
diff --git a/distrib/landisk/miniroot/Makefile b/distrib/landisk/miniroot/Makefile
index acc09164e1a..eef34de6dc3 100644
--- a/distrib/landisk/miniroot/Makefile
+++ b/distrib/landisk/miniroot/Makefile
@@ -1,7 +1,5 @@
 
-REV=	${OSrev}
-
-IMAGE=	miniroot${REV}.fs
+IMAGE=	miniroot${OSrev}.fs
 
 MOUNT_POINT=	/mnt
 
diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile
index a8540d22338..94873a81954 100644
--- a/distrib/landisk/ramdisk/Makefile
+++ b/distrib/landisk/ramdisk/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.23 2019/04/28 15:21:49 deraadt Exp $
-
-REV=	${OSrev}
+#	$OpenBSD: Makefile,v 1.24 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -32,7 +30,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/landisk/ramdisk/list b/distrib/landisk/ramdisk/list
index 0666c202020..b1b73120153 100644
--- a/distrib/landisk/ramdisk/list
+++ b/distrib/landisk/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.46 2017/11/19 12:11:53 job Exp $
+#	$OpenBSD: list,v 1.47 2019/04/29 01:48:40 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -98,7 +98,7 @@ COPY	${DESTDIR}/usr/mdec/mbr			usr/mdec/mbr
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SYMLINK	/tmp/i/fstab.shadow			etc/fstab
diff --git a/distrib/loongson/Makefile.inc b/distrib/loongson/Makefile.inc
index bf37b924cbe..9ab174b4316 100644
--- a/distrib/loongson/Makefile.inc
+++ b/distrib/loongson/Makefile.inc
@@ -1,5 +1,3 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2010/02/07 08:38:40 otto Exp $
-
-REV=	${OSrev}
+#	$OpenBSD: Makefile.inc,v 1.2 2019/04/29 01:48:40 deraadt Exp $
 
 .include <bsd.own.mk>
diff --git a/distrib/loongson/cdfs/Makefile b/distrib/loongson/cdfs/Makefile
index fc1d376716c..d2bc5da23e3 100644
--- a/distrib/loongson/cdfs/Makefile
+++ b/distrib/loongson/cdfs/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.2 2019/04/28 15:32:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-CDROM=	cd${REV}.iso
+CDROM=	cd${OSrev}.iso
 
 all: ${CDROM}
 
diff --git a/distrib/loongson/miniroot/Makefile b/distrib/loongson/miniroot/Makefile
index 5204f2f9d12..5af6a5c9df6 100644
--- a/distrib/loongson/miniroot/Makefile
+++ b/distrib/loongson/miniroot/Makefile
@@ -1,7 +1,5 @@
 
-REV=	${OSrev}
-
-IMAGE=	miniroot${REV}.fs
+IMAGE=	miniroot${OSrev}.fs
 
 MOUNT_POINT=	/mnt
 
diff --git a/distrib/loongson/ramdisk/Makefile b/distrib/loongson/ramdisk/Makefile
index 98a763629e8..89c53e6585d 100644
--- a/distrib/loongson/ramdisk/Makefile
+++ b/distrib/loongson/ramdisk/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2019/04/28 15:21:49 deraadt Exp $
-
-REV=	${OSrev}
+#	$OpenBSD: Makefile,v 1.16 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -32,7 +30,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
@@ -56,7 +54,7 @@ ${CRUNCHCONF}: ${LISTS}
 
 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \
-	    lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd cd${REV}.iso
+	    lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd cd${OSrev}.iso
 	rm -rf cd-dir ${IMAGE}.d
 
 .ifdef RELEASEDIR
diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list
index d2da5605e13..0eaa67b1611 100644
--- a/distrib/loongson/ramdisk/list
+++ b/distrib/loongson/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.31 2017/11/19 12:11:53 job Exp $
+#	$OpenBSD: list,v 1.32 2019/04/29 01:48:40 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -76,7 +76,7 @@ COPY	${DESTDIR}/usr/mdec/mbr			usr/mdec/mbr
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SYMLINK	/tmp/i/fstab.shadow			etc/fstab
diff --git a/distrib/luna88k/Makefile.inc b/distrib/luna88k/Makefile.inc
index 8eaf135052a..fb3573b3c5d 100644
--- a/distrib/luna88k/Makefile.inc
+++ b/distrib/luna88k/Makefile.inc
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2004/04/21 18:40:18 miod Exp $
-
-REV=${OSrev}
+#	$OpenBSD: Makefile.inc,v 1.2 2019/04/29 01:48:40 deraadt Exp $
 
 LDSTATIC=-static
 
diff --git a/distrib/luna88k/miniroot/Makefile b/distrib/luna88k/miniroot/Makefile
index 3f5a056ea3a..4c4103c2c77 100644
--- a/distrib/luna88k/miniroot/Makefile
+++ b/distrib/luna88k/miniroot/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.4 2019/04/28 16:47:30 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-TARGET=		miniroot${REV}.fs
+TARGET=		miniroot${OSrev}.fs
 MOUNT_POINT=	/mnt
 
 .ifndef DESTDIR
diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile
index 45a4bc11243..b1b0277b3fb 100644
--- a/distrib/luna88k/ramdisk/Makefile
+++ b/distrib/luna88k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.22 2019/04/28 15:21:49 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.23 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -21,7 +21,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/luna88k/ramdisk/Makefile.inc b/distrib/luna88k/ramdisk/Makefile.inc
index bff487c1bca..53e1cd825a4 100644
--- a/distrib/luna88k/ramdisk/Makefile.inc
+++ b/distrib/luna88k/ramdisk/Makefile.inc
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: Makefile.inc,v 1.8 2019/04/28 15:21:49 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.9 2019/04/29 01:48:40 deraadt Exp $
 #
 
 # TOP is assumed to be defined by Makefile including this one.
@@ -28,7 +28,7 @@ instbin: instbin.mk instbin.cache instbin.c
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    OSrev=${OSrev} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
 	    RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS}
 	rm ${MOUNT_POINT}/instbin
 
diff --git a/distrib/luna88k/ramdisk/list b/distrib/luna88k/ramdisk/list
index 2f8a8365a7d..d4393a8018a 100644
--- a/distrib/luna88k/ramdisk/list
+++ b/distrib/luna88k/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.39 2017/11/19 12:11:54 job Exp $
+#	$OpenBSD: list,v 1.40 2019/04/29 01:48:40 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -66,7 +66,7 @@ SPECIAL	cd dev; sh MAKEDEV ramdisk
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SYMLINK	/tmp/i/fstab.shadow			etc/fstab
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile
index 9698cc27ff6..f2f5aa1e764 100644
--- a/distrib/macppc/ramdisk/Makefile
+++ b/distrib/macppc/ramdisk/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.38 2019/04/28 15:21:49 deraadt Exp $
-
-REV=	${OSrev}
+#	$OpenBSD: Makefile,v 1.39 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -55,7 +53,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
@@ -83,12 +81,12 @@ ${CRUNCHCONF}: ${LISTS}
 
 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \
-	    lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd cd${REV}.iso
+	    lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd cd${OSrev}.iso
 	rm -rf cd-dir ${IMAGE}.d
 
 .ifdef RELEASEDIR
 install:
-	cp bsd.rd cd${REV}.iso ${RELEASEDIR}
+	cp bsd.rd cd${OSrev}.iso ${RELEASEDIR}
 .endif
 
 .include <bsd.obj.mk>
diff --git a/distrib/macppc/ramdisk/list b/distrib/macppc/ramdisk/list
index 7b09bc6e1dc..59274fcbe1f 100644
--- a/distrib/macppc/ramdisk/list
+++ b/distrib/macppc/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.69 2018/03/21 19:16:06 sthen Exp $
+#	$OpenBSD: list,v 1.70 2019/04/29 01:48:40 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -78,7 +78,7 @@ COPY	${DESTDIR}/usr/mdec/mbr			usr/mdec/mbr
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SYMLINK	/tmp/i/fstab.shadow			etc/fstab
diff --git a/distrib/miniroot/list b/distrib/miniroot/list
index 04f59e5fea3..afdb3ef0ba1 100644
--- a/distrib/miniroot/list
+++ b/distrib/miniroot/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.70 2019/04/28 22:49:11 deraadt Exp $
+#	$OpenBSD: list,v 1.71 2019/04/29 01:48:40 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -60,7 +60,7 @@ LINK	instbin					usr/sbin/pwd_mkdb
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../miniroot/protocols		etc/protocols
 COPY	${CURDIR}/../miniroot/services		etc/services
 
diff --git a/distrib/octeon/miniroot/Makefile b/distrib/octeon/miniroot/Makefile
index f41736a48da..5b6f8c0586a 100644
--- a/distrib/octeon/miniroot/Makefile
+++ b/distrib/octeon/miniroot/Makefile
@@ -1,7 +1,5 @@
 
-REV=	${OSrev}
-
-IMAGE=	miniroot${REV}.fs
+IMAGE=	miniroot${OSrev}.fs
 
 MOUNT_POINT=	/mnt
 
diff --git a/distrib/octeon/ramdisk/Makefile b/distrib/octeon/ramdisk/Makefile
index 94fe30aaffe..ed386b35575 100644
--- a/distrib/octeon/ramdisk/Makefile
+++ b/distrib/octeon/ramdisk/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2019/04/28 15:21:50 deraadt Exp $
-
-REV=		${OSrev}
+#	$OpenBSD: Makefile,v 1.9 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -26,7 +24,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/octeon/ramdisk/list b/distrib/octeon/ramdisk/list
index c4bfe6d8794..d74a441a63d 100644
--- a/distrib/octeon/ramdisk/list
+++ b/distrib/octeon/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.23 2017/11/19 12:11:54 job Exp $
+#	$OpenBSD: list,v 1.24 2019/04/29 01:48:40 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -70,7 +70,7 @@ SPECIAL	cd dev; sh MAKEDEV ramdisk
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SYMLINK	/tmp/i/fstab.shadow			etc/fstab
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile
index 2fcbfc6462e..6cd851d5f61 100644
--- a/distrib/ramdisk/Makefile
+++ b/distrib/ramdisk/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.59 2019/04/28 16:47:30 deraadt Exp $
-
-REV=		${OSrev}
+#	$OpenBSD: Makefile,v 1.60 2019/04/29 01:48:40 deraadt Exp $
 
 ARCHDIR=	${.CURDIR}/../${MACHINE}/ramdisk
 
@@ -12,7 +10,7 @@ ARCHDIR=	${.CURDIR}/../${MACHINE}/ramdisk
 
 MOUNT_POINT?=	/mnt
 DISKTYPE=	rdroot
-IMAGE?=		ramdisk${REV}.fs
+IMAGE?=		ramdisk${OSrev}.fs
 IMAGESIZE?=	8192 # 4MB in 512 byte blocks
 CRUNCHGENOPTS?=-E
 UTILS?=		${.CURDIR}/../miniroot
@@ -20,7 +18,7 @@ UTILS?=		${.CURDIR}/../miniroot
 LISTS=		${.CURDIR}/list ${ARCHDIR}/list.local
 MTREE=		${UTILS}/mtree.conf
 
-FLOPPY?=	floppy${REV}.fs
+FLOPPY?=	floppy${OSrev}.fs
 FLOPPYSIZE?=	2880
 FLOPPYTYPE?=	floppy
 INSTALLBOOT?=	installboot
@@ -79,7 +77,7 @@ ${IMAGE}: instbin
 	newfs ${NEWFSOPTS_RD} /dev/r$(cat vnd)a
 	mount /dev/$(cat vnd)a ${MOUNT_POINT}
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
-	REV=${REV} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+	OSrev=${OSrev} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    ARCHDIR=${ARCHDIR} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
 	    RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS}
 	rm ${MOUNT_POINT}/instbin
diff --git a/distrib/ramdisk/list b/distrib/ramdisk/list
index f4662569a56..0503b9b0c56 100644
--- a/distrib/ramdisk/list
+++ b/distrib/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.59 2016/09/17 15:03:39 florian Exp $
+#	$OpenBSD: list,v 1.60 2019/04/29 01:48:40 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -60,7 +60,7 @@ LINK	instbin					usr/sbin/pwd_mkdb
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../miniroot/protocols		etc/protocols
 COPY	${CURDIR}/../miniroot/services		etc/services
 
diff --git a/distrib/sgi/Makefile.inc b/distrib/sgi/Makefile.inc
index b03e819dc2f..9ab174b4316 100644
--- a/distrib/sgi/Makefile.inc
+++ b/distrib/sgi/Makefile.inc
@@ -1,5 +1,3 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2005/04/27 03:10:29 deraadt Exp $
-
-REV=	${OSrev}
+#	$OpenBSD: Makefile.inc,v 1.2 2019/04/29 01:48:40 deraadt Exp $
 
 .include <bsd.own.mk>
diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile
index 9aa062dc0a1..d20afff6b97 100644
--- a/distrib/sgi/cdfs/Makefile
+++ b/distrib/sgi/cdfs/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.19 2019/04/28 16:47:31 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.20 2019/04/29 01:48:41 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-CDROM=	cd${REV}.iso
+CDROM=	cd${OSrev}.iso
 FFS=	ffs.img
 # must match the size of `minicdroot' in disktab
 CDFSMB=	15
diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile
index 135c2e174fd..eea445eb0b8 100644
--- a/distrib/sgi/iso/Makefile
+++ b/distrib/sgi/iso/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.31 2019/04/28 14:48:11 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.32 2019/04/29 01:48:41 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-CDROM=		install${REV}.iso
+CDROM=		install${OSrev}.iso
 RELXDIR?=	/home/relx-${MACHINE}
 RELDIR?=	/home/rel-${MACHINE}
 
diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile
index d86423a8a97..4522b2ad6d1 100644
--- a/distrib/sgi/ramdisk/Makefile
+++ b/distrib/sgi/ramdisk/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.26 2019/04/28 15:21:50 deraadt Exp $
-
-REV=		${OSrev}
+#	$OpenBSD: Makefile,v 1.27 2019/04/29 01:48:41 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -47,7 +45,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/sgi/ramdisk/list b/distrib/sgi/ramdisk/list
index e17a149678b..acd66b18454 100644
--- a/distrib/sgi/ramdisk/list
+++ b/distrib/sgi/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.56 2017/11/19 12:11:54 job Exp $
+#	$OpenBSD: list,v 1.57 2019/04/29 01:48:41 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -70,7 +70,7 @@ COPY	${DESTDIR}/usr/mdec/sgivol		usr/mdec/sgivol
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SYMLINK	/tmp/i/fstab.shadow			etc/fstab
diff --git a/distrib/socppc/miniroot/Makefile b/distrib/socppc/miniroot/Makefile
index 15838ea8cde..639c4232947 100644
--- a/distrib/socppc/miniroot/Makefile
+++ b/distrib/socppc/miniroot/Makefile
@@ -1,7 +1,5 @@
 
-REV=	${OSrev}
-
-IMAGE=	miniroot${REV}.fs
+IMAGE=	miniroot${OSrev}.fs
 
 MOUNT_POINT=	/mnt
 
diff --git a/distrib/socppc/ramdisk/Makefile b/distrib/socppc/ramdisk/Makefile
index 7185a3167f5..d090c6e6244 100644
--- a/distrib/socppc/ramdisk/Makefile
+++ b/distrib/socppc/ramdisk/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.21 2019/04/28 15:21:50 deraadt Exp $
-
-REV=	${OSrev}
+#	$OpenBSD: Makefile,v 1.22 2019/04/29 01:48:41 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -36,7 +34,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
@@ -60,7 +58,7 @@ ${CRUNCHCONF}: ${LISTS}
 
 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \
-	    lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd cd${REV}.iso
+	    lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd cd${OSrev}.iso
 	rm -rf cd-dir ${IMAGE}.d
 
 .ifdef RELEASEDIR
diff --git a/distrib/socppc/ramdisk/list b/distrib/socppc/ramdisk/list
index 15c440ec02b..6cbbc362b06 100644
--- a/distrib/socppc/ramdisk/list
+++ b/distrib/socppc/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.37 2017/11/19 12:11:54 job Exp $
+#	$OpenBSD: list,v 1.38 2019/04/29 01:48:41 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -73,7 +73,7 @@ COPY	${DESTDIR}/usr/mdec/mbr			usr/mdec/mbr
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SYMLINK	/tmp/i/fstab.shadow			etc/fstab
diff --git a/distrib/sparc64/Makefile.inc b/distrib/sparc64/Makefile.inc
index e6263225293..afbd3b05d8b 100644
--- a/distrib/sparc64/Makefile.inc
+++ b/distrib/sparc64/Makefile.inc
@@ -1,3 +1,2 @@
-#	$OpenBSD: Makefile.inc,v 1.2 2001/10/10 04:21:02 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 2019/04/29 01:48:41 deraadt Exp $
 
-REV=	${OSrev}
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index 9883e7ae4dc..43ddbf3831a 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.40 2019/04/28 16:26:07 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.41 2019/04/29 01:48:41 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
-IMAGE=		ramdisk${REV}.fs
+IMAGE=		ramdisk${OSrev}.fs
 LISTS?=		${.CURDIR}/list
 UTILS?=		${TOP}/../miniroot
 
@@ -33,7 +33,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/sparc64/bsd.rd/list b/distrib/sparc64/bsd.rd/list
index 0e1d22c6a25..97494d133bb 100644
--- a/distrib/sparc64/bsd.rd/list
+++ b/distrib/sparc64/bsd.rd/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.63 2018/10/07 01:16:40 jsg Exp $
+#	$OpenBSD: list,v 1.64 2019/04/29 01:48:41 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -68,7 +68,7 @@ SPECIAL	cd dev; sh MAKEDEV ramdisk
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SYMLINK	/tmp/i/fstab.shadow			etc/fstab
diff --git a/distrib/sparc64/cdfs/Makefile b/distrib/sparc64/cdfs/Makefile
index bd73065555c..6bee54bbb06 100644
--- a/distrib/sparc64/cdfs/Makefile
+++ b/distrib/sparc64/cdfs/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.17 2019/04/28 14:48:11 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.18 2019/04/29 01:48:41 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-CDROM=	cd${REV}.iso
+CDROM=	cd${OSrev}.iso
 
 all: ${CDROM}
 
@@ -29,10 +29,10 @@ ${CDROM}:
 	    -V "OpenBSD/sparc64 ${OSREV} boot-only CD" \
 	    -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir
 	vnconfig -v ${CDROM} > vnd
-	disklabel -w `cat vnd` fakecdrom "OpenBSD${REV}sparc64"
+	disklabel -w `cat vnd` fakecdrom "OpenBSD${OSrev}sparc64"
 	vnconfig -u `cat vnd`
 	rm -f vnd
-	mksuncd f ${CDROM} ${.OBJDIR}/../miniroot/miniroot${REV}.fs
+	mksuncd f ${CDROM} ${.OBJDIR}/../miniroot/miniroot${OSrev}.fs
 
 .ifdef RELEASEDIR
 install:
diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc
index 56dd320311e..87479a77ccc 100644
--- a/distrib/sparc64/common/Makefile.inc
+++ b/distrib/sparc64/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.21 2019/04/28 16:47:31 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.22 2019/04/29 01:48:41 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -12,7 +12,7 @@ MOUNT_POINT=	/mnt
 MTREE=		${UTILS}/mtree.conf
 
 XNAME?=		floppy
-FS?=		${XNAME}${REV}.fs
+FS?=		${XNAME}${OSrev}.fs
 LISTFLOPPY?=	${.CURDIR}/../common/list_floppy
 FLOPPYSIZE?=	144
 FLOPPYSECS?=	18
@@ -79,7 +79,7 @@ instbin: instbin.mk instbin.cache instbin.c
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    OSrev=${OSrev} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
 	    RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS}
 	rm ${MOUNT_POINT}/instbin
 
diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile
index 59b5e174f94..59ef6aeacb4 100644
--- a/distrib/sparc64/iso/Makefile
+++ b/distrib/sparc64/iso/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.17 2019/04/28 14:48:11 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.18 2019/04/29 01:48:41 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-CDROM=		install${REV}.iso
+CDROM=		install${OSrev}.iso
 RELXDIR?=	/home/relx-${MACHINE}
 RELDIR?=	/home/rel-${MACHINE}
 
@@ -44,10 +44,10 @@ ${CDROM}: ${BASE} ${XBASE}
 	    -V "OpenBSD/${MACHINE} ${OSREV} Install CD" \
 	    -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir
 	vnconfig -v ${.OBJDIR}/${CDROM} > vnd
-	disklabel -w `cat vnd` fakecdrom "OpenBSD${REV}${MACHINE}"
+	disklabel -w `cat vnd` fakecdrom "OpenBSD${OSrev}${MACHINE}"
 	vnconfig -u `cat vnd`
 	rm -f vnd
-	mksuncd f ${.OBJDIR}/${CDROM} ${.OBJDIR}/../miniroot/miniroot${REV}.fs
+	mksuncd f ${.OBJDIR}/${CDROM} ${.OBJDIR}/../miniroot/miniroot${OSrev}.fs
 
 install:
 	cp ${CDROM} ${RELDIR}/
diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile
index a82fe231e3c..234254a0dae 100644
--- a/distrib/sparc64/miniroot/Makefile
+++ b/distrib/sparc64/miniroot/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.10 2019/04/28 16:47:31 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.11 2019/04/29 01:48:41 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-TARGET=		miniroot${REV}.fs
+TARGET=		miniroot${OSrev}.fs
 MOUNT_POINT=	/mnt
 
 .ifndef DESTDIR
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index e5f4dfabe1c..ffb76ae02be 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.43 2019/04/28 16:47:31 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.44 2019/04/29 01:48:41 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -10,7 +10,7 @@ UTILS?=		${.CURDIR}/../../miniroot
 MOUNT_POINT=	/mnt
 MTREE=		${UTILS}/mtree.conf
 
-FLOPPY=		floppy${REV}.fs
+FLOPPY=		floppy${OSrev}.fs
 FLOPPYSIZE?=	2880
 FLOPPYTYPE?=	floppy
 
@@ -52,7 +52,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/sparc64/ramdisk/list b/distrib/sparc64/ramdisk/list
index 45f03cea552..04f678555c5 100644
--- a/distrib/sparc64/ramdisk/list
+++ b/distrib/sparc64/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.60 2018/04/08 22:38:56 kn Exp $
+#	$OpenBSD: list,v 1.61 2019/04/29 01:48:41 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -63,7 +63,7 @@ SPECIAL	cd dev; sh MAKEDEV ramdisk
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SYMLINK	/tmp/i/fstab.shadow			etc/fstab
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index a9ab4067129..656d3303f86 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.37 2019/04/28 16:47:31 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.38 2019/04/29 01:48:41 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -10,7 +10,7 @@ UTILS?=		${.CURDIR}/../../miniroot
 MOUNT_POINT=	/mnt
 MTREE=		${UTILS}/mtree.conf
 
-FLOPPY=		floppyB${REV}.fs
+FLOPPY=		floppyB${OSrev}.fs
 FLOPPYSIZE?=	2880
 FLOPPYTYPE?=	floppy
 
@@ -52,7 +52,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/sparc64/ramdiskB/list b/distrib/sparc64/ramdiskB/list
index 55c0966d261..8d27fab2c9d 100644
--- a/distrib/sparc64/ramdiskB/list
+++ b/distrib/sparc64/ramdiskB/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.50 2016/09/17 15:03:39 florian Exp $
+#	$OpenBSD: list,v 1.51 2019/04/29 01:48:41 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -62,7 +62,7 @@ SPECIAL	cd dev; sh MAKEDEV ramdisk
 COPY	${CURDIR}/../../miniroot/group		etc/group
 COPY	${CURDIR}/../../miniroot/master.passwd	etc/master.passwd
 SPECIAL	pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd
-COPY	${DESTDIR}/etc/signify/openbsd-${REV}-base.pub	etc/signify/openbsd-${REV}-base.pub
+COPY	${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub	etc/signify/openbsd-${OSrev}-base.pub
 COPY	${CURDIR}/../../miniroot/protocols	etc/protocols
 COPY	${CURDIR}/../../miniroot/services	etc/services
 SYMLINK	/tmp/i/fstab.shadow			etc/fstab