Drop bootprog_maker (formerly enabled by -M) and bootprog_date (formerly

disabled by -D) from the output of newvers_stand.sh. Change -D to the inverted logic, so that it adds the date to bootprog_rev in (). Change all platforms accordingly. -D is added if MKREPRO is not yes and wasn't present before. Platforms that didn't use -D don't depend on MKREPRO now either.
2011-01-22 19:19:14 +00:00 · 2011-01-22 19:19:14 +00:00 · 3c550524b5
parent 87c238c4a3
commit 3c550524b5
84 changed files with 203 additions and 248 deletions
--- a/sys/arch/acorn26/stand/Makefile.buildboot
+++ b/sys/arch/acorn26/stand/Makefile.buildboot
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.buildboot,v 1.11 2009/04/03 10:38:12 tsutsui Exp $
+#	$NetBSD: Makefile.buildboot,v 1.12 2011/01/22 19:19:14 joerg Exp $

 S?=	${.CURDIR}/../../../..

@ -18,11 +18,14 @@ LIBCRTEND=

 RISCOSTYPE ?= ff8

+.include <bsd.own.mk>
+
 SRCS+=		vers.c
 CLEANFILES+=	vers.c
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}

 CPPFLAGS+=	-D_STANDALONE -DHIMEM=0x28000
 CPPFLAGS+=	-I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
--- a/sys/arch/acorn26/stand/boot26/boot26.c
+++ b/sys/arch/acorn26/stand/boot26/boot26.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot26.c,v 1.5 2007/03/04 05:59:04 christos Exp $	*/
+/*	$NetBSD: boot26.c,v 1.6 2011/01/22 19:19:14 joerg Exp $	*/

 /*-
 * Copyright (c) 1998, 1999, 2000, 2001 Ben Harris
@ -37,8 +37,6 @@

 extern const char bootprog_rev[];
 extern const char bootprog_name[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];

 int debug = 1;

@ -68,7 +66,6 @@ main(int argc, char **argv)
 	int ret;

 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);

 	os_read_mem_map_info(&nbpp, &npages);
 	if (debug)
--- a/sys/arch/acorn32/stand/Makefile.buildboot
+++ b/sys/arch/acorn32/stand/Makefile.buildboot
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.buildboot,v 1.13 2009/04/03 10:38:12 tsutsui Exp $
+#	$NetBSD: Makefile.buildboot,v 1.14 2011/01/22 19:19:14 joerg Exp $

 S?=	${.CURDIR}/../../../..

@ -28,11 +28,14 @@ RELOC=8000
 LINKFLAGS+=-N -Ttext ${RELOC}
 .endif

+.include <bsd.own.mk>
+
 SRCS+=		vers.c
 CLEANFILES+=	vers.c
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}

 CPPFLAGS+=	-D_STANDALONE 
 CPPFLAGS+=	-I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
--- a/sys/arch/acorn32/stand/boot32/boot32.c
+++ b/sys/arch/acorn32/stand/boot32/boot32.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot32.c,v 1.37 2009/08/02 11:20:37 gavan Exp $	*/
+/*	$NetBSD: boot32.c,v 1.38 2011/01/22 19:19:15 joerg Exp $	*/

 /*-
 * Copyright (c) 2002 Reinoud Zandijk
@ -130,9 +130,6 @@ u_long	 scratch_virtualbase, scratch_physicalbase;
 /* bootprogram identifiers */
 extern const char bootprog_rev[];
 extern const char bootprog_name[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];
-

 /* predefines / prototypes */
 void	 init_datastructures(void);
@ -774,7 +771,6 @@ main(int argc, char **argv)

 	printf("\n\n");
 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
 	printf(">> Booting NetBSD/acorn32 on a RiscPC/A7000/NC\n");
 	printf("\n");

--- a/sys/arch/alpha/stand/Makefile.bootprogs
+++ b/sys/arch/alpha/stand/Makefile.bootprogs
@ -1,5 +1,6 @@
-# $NetBSD: Makefile.bootprogs,v 1.30 2009/04/20 13:15:12 tsutsui Exp $
+# $NetBSD: Makefile.bootprogs,v 1.31 2011/01/22 19:19:15 joerg Exp $

+.include <bsd.own.mk>
 .include <bsd.sys.mk>		# for HOST_SH

 S=	${.CURDIR}/../../../..
@ -36,7 +37,8 @@ CFLAGS+=	-Werror ${CWARNFLAGS}
 .if exists(version)
 .PHONY: vers.c
 vers.c: version
-	${HOST_SH} ${S}/conf/newvers_stand.sh -N ${.CURDIR}/version "alpha"
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    -N ${.CURDIR}/version "alpha"

 SRCS+=	vers.c
 CLEANFILES+= vers.c
--- a/sys/arch/alpha/stand/common/boot.c
+++ b/sys/arch/alpha/stand/common/boot.c
@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.31 2010/08/25 16:30:44 christos Exp $ */
+/* $NetBSD: boot.c,v 1.32 2011/01/22 19:19:15 joerg Exp $ */

 /*
 * Copyright (c) 1992, 1993
@ -91,7 +91,6 @@ main(long fd)
 	printf("\n");
 	printf("NetBSD/alpha " NETBSD_VERS " " BOOT_TYPE_NAME " Bootstrap, Revision %s\n",
 	    bootprog_rev);
-	printf("(%s, %s)\n", bootprog_maker, bootprog_date);
 	printf("\n");

 	/* set up the booted device descriptor */
--- a/sys/arch/alpha/stand/common/common.h
+++ b/sys/arch/alpha/stand/common/common.h
@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.13 2009/03/14 14:45:53 dsl Exp $ */
+/* $NetBSD: common.h,v 1.14 2011/01/22 19:19:15 joerg Exp $ */

 /*
 * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@ -43,8 +43,6 @@ void		switch_palcode(void);
 * vers.c (generated by newvers.sh)
 */
 extern const char bootprog_rev[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];


 /*
--- a/sys/arch/alpha/stand/standtest/test.c
+++ b/sys/arch/alpha/stand/standtest/test.c
@ -1,4 +1,4 @@
-/* $NetBSD: test.c,v 1.4 2009/03/14 21:04:03 dsl Exp $ */
+/* $NetBSD: test.c,v 1.5 2011/01/22 19:19:15 joerg Exp $ */

 /*
 * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@ -102,7 +102,6 @@ main(unsigned long pfn, unsigned long ptb, unsigned long bim, unsigned long bip,
 	printf("\n");
 	printf("NetBSD/alpha " NETBSD_VERS
 	    " Standalone Test Program, Revision %s\n", bootprog_rev);
-	printf("(%s, %s)\n", bootprog_maker, bootprog_date);
 	printf("\n");

 	arg_pfn = pfn;
--- a/sys/arch/amiga/stand/bootblock/boot/Makefile
+++ b/sys/arch/amiga/stand/bootblock/boot/Makefile
@ -1,5 +1,6 @@
-#	$NetBSD: Makefile,v 1.43 2010/07/06 06:09:56 mrg Exp $
+#	$NetBSD: Makefile,v 1.44 2011/01/22 19:19:15 joerg Exp $

+.include <bsd.own.mk>
 .include <bsd.sys.mk>		# for HOST_SH

 ### what we need:
@ -113,7 +114,8 @@ libboot.a: ${OBJS}

 vers.o: vers.c
 vers.c:	${.CURDIR}/version
-	${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh -N ${.CURDIR}/version "amiga"
+	${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh \
+	    ${${MKREPRO} == "yes" :?:-D} -N ${.CURDIR}/version "amiga"

 .if !make(obj) && !make(clean) && !make(cleandir)
 .NOPATH: machine m68k
--- a/sys/arch/amiga/stand/bootblock/boot/main.c
+++ b/sys/arch/amiga/stand/bootblock/boot/main.c
@ -1,5 +1,5 @@
 /*
- * $NetBSD: main.c,v 1.26 2011/01/13 22:02:06 phx Exp $
+ * $NetBSD: main.c,v 1.27 2011/01/22 19:19:16 joerg Exp $
 *
 *
 * Copyright (c) 1996,1999 Ignatios Souvatzis
@ -60,8 +60,6 @@
 * vers.c (generated by newvers.sh)
 */
 extern const char bootprog_rev[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];

 void startit(void *, u_long, u_long, void *, u_long, u_long, int, void *,
 	     int, int, u_long, u_long, u_long, int);
@ -162,7 +160,6 @@ again:
 	printf("\nNetBSD/Amiga " NETBSD_VERS " Bootstrap, Revision %s\n",
 	    bootprog_rev);
 #endif
-	printf("(%s, %s)\n", bootprog_maker, bootprog_date);
 	printf("\n");
 	printf("Boot: [%s] ", kernel_name);

--- a/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
+++ b/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.14 2010/07/06 06:09:57 mrg Exp $
+#	$NetBSD: Makefile,v 1.15 2011/01/22 19:19:16 joerg Exp $

 ### what we need:

@ -101,7 +101,8 @@ libboot.a: ${OBJS}

 .PHONY:	vers.c
 vers.c:	${.CURDIR}/../boot/version
-	${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh -NDM ${.CURDIR}/../boot/version "amiga"
+	${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh -N \
+	    ${.CURDIR}/../boot/version "amiga"

 .if !make(obj) && !make(clean) && !make(cleandir)
 .NOPATH: machine m68k
--- a/sys/arch/arc/stand/boot/Makefile
+++ b/sys/arch/arc/stand/boot/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/01/21 15:59:05 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2011/01/22 19:19:16 joerg Exp $

 .include <bsd.own.mk>
 .include <bsd.sys.mk>	# for ${HOST_SH}
@ -38,7 +38,8 @@ TEXTADDR=  0x80f00000
 .if exists(version)
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version ${MACHINE}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/version ${MACHINE}

 SRCS+=	vers.c
 CLEANFILES+= vers.c
--- a/sys/arch/arc/stand/boot/boot.c
+++ b/sys/arch/arc/stand/boot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.6 2008/04/28 20:23:13 martin Exp $	*/
+/*	$NetBSD: boot.c,v 1.7 2011/01/22 19:19:16 joerg Exp $	*/

 /*-
 * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -143,7 +143,6 @@ main(int argc, char **argv)
 	/* print a banner */
 	printf("\n");
 	printf("%s Bootstrap, Revision %s\n", bootprog_name, bootprog_rev);
-	printf("(%s, %s)\n", bootprog_maker, bootprog_date);

 	memset(marks, 0, sizeof marks);

--- a/sys/arch/arc/stand/boot/common.h
+++ b/sys/arch/arc/stand/boot/common.h
@ -1,4 +1,4 @@
-/*	$NetBSD: common.h,v 1.3 2008/04/28 20:23:13 martin Exp $	*/
+/*	$NetBSD: common.h,v 1.4 2011/01/22 19:19:16 joerg Exp $	*/

 /*-
 * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -34,5 +34,3 @@
 */
 extern const char bootprog_name[];
 extern const char bootprog_rev[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];
--- a/sys/arch/bebox/stand/boot/Makefile
+++ b/sys/arch/bebox/stand/boot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.30 2011/01/21 15:59:05 joerg Exp $
+#	$NetBSD: Makefile,v 1.31 2011/01/22 19:19:16 joerg Exp $

 NOMAN= # defined

@ -74,8 +74,8 @@ powerpc::
 .endif

 vers.c: ${.CURDIR}/../boot/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/../boot/version \
-		"bebox" ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/../boot/version "bebox" ${NEWVERSWHAT}

 ${PROG}: ${OBJS} ${LIBS}
 	${LD} -o ${PROG}.elf -N -T ${.CURDIR}/../boot/ld.script \
--- a/sys/arch/bebox/stand/boot/boot.c
+++ b/sys/arch/bebox/stand/boot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.24 2010/10/27 10:37:38 kiyohara Exp $	*/
+/*	$NetBSD: boot.c,v 1.25 2011/01/22 19:19:16 joerg Exp $	*/

 /*
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -63,7 +63,7 @@ struct btinfo_console btinfo_console;
 struct btinfo_clock btinfo_clock;
 struct btinfo_rootdevice btinfo_rootdevice;

-extern char bootprog_name[], bootprog_rev[], bootprog_maker[], bootprog_date[];
+extern char bootprog_name[], bootprog_rev[];

 void main(void);
 void exec_kernel(char *, void *);
@ -119,7 +119,6 @@ main(void)
 	wait_for(&CPU1_alive);

 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
 	printf(">> Memory: %d k\n", btinfo_memory.memsize / 1024);

 	/*
--- a/sys/arch/cobalt/stand/boot/Makefile
+++ b/sys/arch/cobalt/stand/boot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.21 2010/05/27 06:58:13 dholland Exp $
+#	$NetBSD: Makefile,v 1.22 2011/01/22 19:19:16 joerg Exp $

 NOMAN= # defined

@ -97,7 +97,8 @@ LIBS=		${SALIB} ${ZLIB} ${KERNLIB}

 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "cobalt"
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/version "cobalt"

 ${PROG}: ${LDSCRIPT} ${OBJS} ${LIBS}
 	${LD} -Map ${PROG}.map -N -x -Ttext ${LOAD_ADDRESS} \
--- a/sys/arch/cobalt/stand/boot/boot.c
+++ b/sys/arch/cobalt/stand/boot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.19 2010/01/10 09:34:45 tsutsui Exp $	*/
+/*	$NetBSD: boot.c,v 1.20 2011/01/22 19:19:16 joerg Exp $	*/

 /*-
 * Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -377,7 +377,6 @@ print_banner(unsigned int memsize)
 	printf("\n");
 	printf(">> %s " NETBSD_VERS " Bootloader, Revision %s [@%p]\n",
 			bootprog_name, bootprog_rev, (void*)&start);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
 	printf(">> Model:\t\t%s\n", cobalt_model[cobalt_id]);
 	printf(">> Memory:\t\t%lu k\n", (memsize - MIPS_KSEG0_START) / 1024);
 	printf(">> PROM boot string:\t%s\n", bootstring);
--- a/sys/arch/cobalt/stand/boot/common.h
+++ b/sys/arch/cobalt/stand/boot/common.h
@ -1,4 +1,4 @@
-/*	$NetBSD: common.h,v 1.2 2008/04/28 20:23:16 martin Exp $	*/
+/*	$NetBSD: common.h,v 1.3 2011/01/22 19:19:16 joerg Exp $	*/

 /*-
 * Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -34,5 +34,3 @@
 */
 extern const char bootprog_rev[];
 extern const char bootprog_name[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];
--- a/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
+++ b/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.gzboot,v 1.16 2010/05/27 06:58:13 dholland Exp $
+#	$NetBSD: Makefile.gzboot,v 1.17 2011/01/22 19:19:17 joerg Exp $

 NOMAN=  # defined

@ -96,8 +96,8 @@ LIBLIST=${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN} ${LIBSA}

 .PHONY: vers.c
 vers.c: ${VERSIONFILE}
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.ALLSRC} '${PLATFORM}' \
-	    ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.ALLSRC} '${PLATFORM}' ${NEWVERSWHAT}

 ${PROG}: ${PROGSYM}
 	${OBJCOPY} -O binary ${PROGSYM} ${.TARGET}
--- a/sys/arch/evbarm/stand/gzboot/gzboot.c
+++ b/sys/arch/evbarm/stand/gzboot/gzboot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: gzboot.c,v 1.14 2009/10/26 19:16:55 cegger Exp $	*/
+/*	$NetBSD: gzboot.c,v 1.15 2011/01/22 19:19:17 joerg Exp $	*/

 /*
 * Copyright (c) 2002 Wasabi Systems, Inc.
@ -114,15 +114,13 @@ void	gzcopy(void *, const void *, size_t);
 void
 main(void)
 {
-	extern char bootprog_name[], bootprog_rev[],
-	    bootprog_maker[], bootprog_date[];
+	extern char bootprog_name[], bootprog_rev[];
 	void (*loadaddr)(void) = (void *) md_root_loadaddr;

 	cons_init();

 	printf("\n");
 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);

 	board_init();

--- a/sys/arch/ews4800mips/stand/boot/Makefile
+++ b/sys/arch/ews4800mips/stand/boot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2010/05/27 06:58:13 dholland Exp $
+#	$NetBSD: Makefile,v 1.12 2011/01/22 19:19:17 joerg Exp $

 WARNS		?= 1
 NOMAN		=
@ -52,7 +52,7 @@ SRCS		+= pdinfo.c vtoc.c
 .PHONY: vers.c
 vers.c: version
 	${_MKTARGET_CREATE}
-	${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${.CURDIR}/version ${MACHINE}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version ${MACHINE}

 SRCS+=	vers.c
 CLEANFILES+= vers.c
--- a/sys/arch/hp300/stand/Makefile.buildboot
+++ b/sys/arch/hp300/stand/Makefile.buildboot
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.buildboot,v 1.29 2009/04/03 10:38:12 tsutsui Exp $
+#	$NetBSD: Makefile.buildboot,v 1.30 2011/01/22 19:19:17 joerg Exp $

 # RELOC=FFF00000 allows for boot prog up to FF000 (1044480) bytes long
 RELOC=	FFF00000
@ -34,7 +34,7 @@ LIBCRTEND=
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
 	${HOST_SH} ${S}/conf/newvers_stand.sh \
-		-DM ${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}
+	    ${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}

 ${PROG}: ${PROGAOUT}
 	${OBJCOPY} --output-target=binary ${PROGAOUT} ${PROGAOUT}.bin
--- a/sys/arch/hp700/stand/Makefile.buildboot
+++ b/sys/arch/hp700/stand/Makefile.buildboot
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.buildboot,v 1.13 2009/05/03 17:33:29 tsutsui Exp $
+#	$NetBSD: Makefile.buildboot,v 1.14 2011/01/22 19:19:17 joerg Exp $

 RELOC=	120000
 HEAP_LIMIT=0x1c0000
@ -24,6 +24,8 @@ NOMAN=
 STRIPFLAG=
 BINMODE=	444

+.include <bsd.own.mk>
+
 CPPFLAGS+=	-nostdinc -I${.CURDIR}/../../.. -I${.CURDIR}/../../../.. \
 		-I${.OBJDIR}
 CFLAGS+=	-Os -msoft-float -Wno-main
@ -34,8 +36,8 @@ SRCS+=		vers.c
 CLEANFILES+=	vers.c

 vers.c: ${.CURDIR}/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version \
-		hp700 ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/version hp700 ${NEWVERSWHAT}

 CPPFLAGS+=		-D_STANDALONE -Dhp700 ${DEBUGFLAGS}
 CPPFLAGS+=		-DRELOC=0x${RELOC} -DHEAP_LIMIT=${HEAP_LIMIT}
--- a/sys/arch/hp700/stand/boot/boot.c
+++ b/sys/arch/hp700/stand/boot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.11 2009/11/03 05:07:25 snj Exp $	*/
+/*	$NetBSD: boot.c,v 1.12 2011/01/22 19:19:17 joerg Exp $	*/

 /*-
 * Copyright (c) 1982, 1986, 1990, 1993
@ -132,7 +132,6 @@ main(void)

 	printf("\n");
 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
 	printf(">> Enter \"reset\" to reset system.\n");

 	for (;;) {
--- a/sys/arch/hp700/stand/common/libsa.h
+++ b/sys/arch/hp700/stand/common/libsa.h
@ -1,4 +1,4 @@
-/*	$NetBSD: libsa.h,v 1.8 2009/11/03 05:07:26 snj Exp $	*/
+/*	$NetBSD: libsa.h,v 1.9 2011/01/22 19:19:18 joerg Exp $	*/

 /*	$OpenBSD: libsa.h,v 1.7 1999/12/23 04:07:47 mickey Exp $	*/

@ -91,5 +91,4 @@ int	som_load(int, struct x_param *);
 int	som_ldsym(int, struct x_param *);

 extern int debug;
-extern	char bootprog_name[], bootprog_rev[], bootprog_date[],
-		bootprog_maker[];
+extern	char bootprog_name[], bootprog_rev[];
--- a/sys/arch/hpcmips/stand/lcboot/Makefile
+++ b/sys/arch/hpcmips/stand/lcboot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2011/01/21 15:59:06 joerg Exp $
+#	$NetBSD: Makefile,v 1.11 2011/01/22 19:19:18 joerg Exp $
 .include <bsd.own.mk>

 ROMICE?=	no
@ -70,7 +70,8 @@ SRCS+=	vers.c
 CLEANFILES+=	vers.c
 .PHONY: vers.c
 vers.c: ${VERSIONFILE}
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.ALLSRC} 'hpcmips' ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.ALLSRC} 'hpcmips' ${NEWVERSWHAT}
 .endif

 CLEANFILES+=	${PROG}
--- a/sys/arch/hpcmips/stand/lcboot/main.c
+++ b/sys/arch/hpcmips/stand/lcboot/main.c
@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.5 2005/12/11 12:17:34 christos Exp $ */
+/* $NetBSD: main.c,v 1.6 2011/01/22 19:19:18 joerg Exp $ */

 /*
 * Copyright (c) 2003 Naoto Shimazaki.
@ -107,7 +107,7 @@
 *
 */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: main.c,v 1.5 2005/12/11 12:17:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: main.c,v 1.6 2011/01/22 19:19:18 joerg Exp $");

 #include <lib/libsa/stand.h>

@ -131,8 +131,6 @@ __KERNEL_RCSID(0, "$NetBSD: main.c,v 1.5 2005/12/11 12:17:34 christos Exp $");

 extern const char bootprog_rev[];
 extern const char bootprog_name[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];

 static void command_help(char *opt);
 static void command_dump(char *opt);
@ -178,7 +176,6 @@ print_banner(void)
 {
 	printf("\n");
 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
 #if 0
 	printf(">> Memory: %d/%d k\n", getbasemem(), getextmem());
 #endif
--- a/sys/arch/i386/stand/Makefile.booters
+++ b/sys/arch/i386/stand/Makefile.booters
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.booters,v 1.81 2010/12/22 20:46:42 jakllsch Exp $
+#	$NetBSD: Makefile.booters,v 1.82 2011/01/22 19:19:18 joerg Exp $

 .include <bsd.own.mk>

@ -98,7 +98,7 @@ LDFLAGS+=-Wl,-M -Wl,-e,start 	# -N does not work properly.
 LIBLIST=${LIBI386} ${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN} ${LIBI386} ${LIBSA}

 vers.c: ${VERSIONFILE} ${SOURCES} ${S}/conf/newvers_stand.sh
-	${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${VERSIONFILE} x86 ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${VERSIONFILE} x86 ${NEWVERSWHAT}

 CLEANFILES+= ${BASE}.sym
 ${BASE}.sym: ${STARTFILE} ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${LIBI386}
--- a/sys/arch/i386/stand/boot/Makefile.boot
+++ b/sys/arch/i386/stand/boot/Makefile.boot
@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.48 2011/01/05 23:13:01 jakllsch Exp $
+# $NetBSD: Makefile.boot,v 1.49 2011/01/22 19:19:18 joerg Exp $

 S=	${.CURDIR}/../../../../..

@ -137,7 +137,7 @@ LIBLIST= ${LIBI386} ${LIBSA} ${LIBZ} ${LIBKERN} ${LIBI386} ${LIBSA}
 CLEANFILES+= ${PROG}.tmp ${PROG}.map ${PROG}.syms vers.c

 vers.c: ${VERSIONFILE} ${SOURCES} ${LIBLIST} ${.CURDIR}/../Makefile.boot
-	${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${VERSIONFILE} x86 ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${VERSIONFILE} x86 ${NEWVERSWHAT}

 # Anything that calls 'real_to_prot' must have a %pc < 0x10000.
 # We link the program, find the callers (all in libi386), then
--- a/sys/arch/ia64/stand/common/newvers.sh
+++ b/sys/arch/ia64/stand/common/newvers.sh
@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 # $FreeBSD: src/sys/boot/common/newvers.sh,v 1.5 2004/07/01 06:40:12 ps Exp $
-#	$NetBSD: newvers.sh,v 1.2 2006/04/22 07:58:53 cherry Exp $
+#	$NetBSD: newvers.sh,v 1.3 2011/01/22 19:19:18 joerg Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
 #	The Regents of the University of California.  All rights reserved.
@ -33,11 +33,8 @@
 #	@(#)newvers.sh	8.1 (Berkeley) 4/20/94

 LC_ALL=C; export LC_ALL
-u=${USER-root} h=${HOSTNAME-`hostname`} t=`date`
 #r=`head -n 6 $1 | tail -n 1 | awk -F: ' { print $1 } '`
 r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1`

 echo "char bootprog_name[] = \"FreeBSD/${3} ${2}\";" > vers.c
 echo "char bootprog_rev[] = \"${r}\";" >> vers.c
-echo "char bootprog_date[] = \"${t}\";" >> vers.c
-echo "char bootprog_maker[] = \"${u}@${h}\";" >> vers.c
--- a/sys/arch/ia64/stand/ia64/efi/Makefile
+++ b/sys/arch/ia64/stand/ia64/efi/Makefile
@ -2,7 +2,7 @@ S=	${.CURDIR}/../../../../..

 VERSIONFILE= ${.CURDIR}/version

-.include <../Makefile.booters>
+.include "../Makefile.booters"

 PROG=		loader.sym

@ -47,7 +47,8 @@ CLEANFILES+=	vers.c loader.efi ${OBJS}
 NEWVERSWHAT=	"EFI boot" ${MACHINE_ARCH}

 vers.c: ${VERSIONFILE} ${SOURCES}
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}

 loader.efi: ${PROG}
 	if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \
--- a/sys/arch/ia64/stand/ia64/efi/main.c
+++ b/sys/arch/ia64/stand/ia64/efi/main.c
@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.6 2009/07/20 04:59:04 kiyohara Exp $	*/
+/*	$NetBSD: main.c,v 1.7 2011/01/22 19:19:19 joerg Exp $	*/

 /*-
 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
@ -46,8 +46,6 @@

 extern char bootprog_name[];
 extern char bootprog_rev[];
-extern char bootprog_date[];
-extern char bootprog_maker[];

 struct efi_devdesc	currdev;	/* our current device */
 struct arch_switch	archsw;		/* MI/MD interface boundary */
@ -135,7 +133,6 @@ main(int argc, CHAR16 *argv[])

 	printf("\n");
 	printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf("(%s, %s)\n", bootprog_maker, bootprog_date);

 	i = efifs_get_unit(img->DeviceHandle);
 	if (i >= 0) {
--- a/sys/arch/ia64/stand/ia64/ski/Makefile
+++ b/sys/arch/ia64/stand/ia64/ski/Makefile
@ -2,7 +2,7 @@ S=	${.CURDIR}/../../../../..

 VERSIONFILE= ${.CURDIR}/version

-.include <../Makefile.booters>
+.include "../Makefile.booters"

 PROG=		skiload
 MAN=#
@ -36,7 +36,8 @@ CLEANFILES+=	vers.c skiload ${OBJS}
 NEWVERSWHAT=	"ia64 SKI boot" ${MACHINE_ARCH}

 vers.c: ${VERSIONFILE} ${SOURCES}
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}

 DPADD=		${LIBLIST}

--- a/sys/arch/ia64/stand/ia64/ski/main.c
+++ b/sys/arch/ia64/stand/ia64/ski/main.c
@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.2 2009/07/20 04:59:04 kiyohara Exp $	*/
+/*	$NetBSD: main.c,v 1.3 2011/01/22 19:19:19 joerg Exp $	*/

 /*-
 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
@ -39,9 +39,6 @@ static int command_quit(int argc, char *argv[]);

 extern char bootprog_name[];
 extern char bootprog_rev[];
-extern char bootprog_date[];
-extern char bootprog_maker[];
-

 struct bootblk_command commands[] = {
 	COMMON_COMMANDS,
@ -91,7 +88,6 @@ ski_main(void)

 	printf("\n");
 	printf("%s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf("(%s, %s)\n", bootprog_maker, bootprog_date);
 #if 0
 	printf("Memory: %ld k\n", memsize() / 1024);
 #endif
--- a/sys/arch/landisk/stand/boot/Makefile.boot
+++ b/sys/arch/landisk/stand/boot/Makefile.boot
@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.3 2009/04/22 17:13:36 tsutsui Exp $
+# $NetBSD: Makefile.boot,v 1.4 2011/01/22 19:19:19 joerg Exp $

 PROG?=		boot

@ -34,7 +34,8 @@ LIBLIST=	${LIBSA} ${LIBZ} ${LIBKERN}
 CLEANFILES+=	${PROG}.sym ${PROG}.map vers.c

 vers.c: ${VERSIONFILE} ${SOURCES} ${.CURDIR}/../Makefile.boot
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}

 ${PROG}: ${OBJS} ${LIBLIST}
 	${LD} -o ${PROG}.sym ${LDFLAGS} -Ttext ${SECONDARY_LOAD_ADDRESS} \
--- a/sys/arch/landisk/stand/boot/boot2.c
+++ b/sys/arch/landisk/stand/boot/boot2.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot2.c,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
+/*	$NetBSD: boot2.c,v 1.2 2011/01/22 19:19:19 joerg Exp $	*/

 /*
 * Copyright (c) 2003
@ -213,12 +213,9 @@ print_banner(void)
 {
 	extern const char bootprog_name[];
 	extern const char bootprog_rev[];
-	extern const char bootprog_date[];
-	extern const char bootprog_maker[];

 	printf("\n");
 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
 }

 void
--- a/sys/arch/macppc/stand/ofwboot/Makefile
+++ b/sys/arch/macppc/stand/ofwboot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.50 2010/05/27 06:58:14 dholland Exp $
+#	$NetBSD: Makefile,v 1.51 2011/01/22 19:19:19 joerg Exp $

 S=	${.CURDIR}/../../../..

@ -29,9 +29,9 @@ NOMAN=		# defined
 STRIPFLAG=
 BINMODE=	444

-.if !defined(FIXCOFF)
 .include <bsd.own.mk>

+.if !defined(FIXCOFF)
 .if !defined(TOOL_MACPPCFIXCOFF)
 TOOL_MACPPCFIXCOFFDIR!=	cd ${.CURDIR}/../fixcoff && ${PRINTOBJDIR}
 TOOL_MACPPCFIXCOFF=	${TOOL_MACPPCFIXCOFFDIR}/fixcoff
@ -77,7 +77,8 @@ cleanlibdir:

 .PHONY: vers.c
 vers.c: version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "macppc" ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/version "macppc" ${NEWVERSWHAT}

 all realall: ${PROG} ${PROG}.xcf ${PROG}.elf

--- a/sys/arch/macppc/stand/ofwboot/boot.c
+++ b/sys/arch/macppc/stand/ofwboot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.25 2010/08/25 16:33:51 christos Exp $	*/
+/*	$NetBSD: boot.c,v 1.26 2011/01/22 19:19:19 joerg Exp $	*/

 /*-
 * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -208,8 +208,7 @@ _rtt(void)
 void
 main(void)
 {
-	extern char bootprog_name[], bootprog_rev[],
-		    bootprog_maker[], bootprog_date[];
+	extern char bootprog_name[], bootprog_rev[];
 	int chosen, options, openprom;
 	char bootline[512];		/* Should check size? */
 	char *cp;
@ -219,7 +218,6 @@ main(void)

 	printf("\n");
 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);

 	/*
 	 * Figure out what version of Open Firmware...
--- a/sys/arch/mipsco/stand/Makefile.booters
+++ b/sys/arch/mipsco/stand/Makefile.booters
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.booters,v 1.16 2010/05/27 06:58:14 dholland Exp $
+#	$NetBSD: Makefile.booters,v 1.17 2011/01/22 19:19:19 joerg Exp $

 .include <bsd.sys.mk>		# for HOST_SH

@ -121,7 +121,8 @@ LIBS=		${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}

 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh -N ${.CURDIR}/version "mipsco"
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    -N ${.CURDIR}/version "mipsco"

 ${PROG}: machine-links ${LDSCRIPT} ${OBJS} ${LIBS}
 	${LD} ${OFORMAT} -Map ${PROG}.map -N -x -Ttext ${LOAD_ADDRESS} \
--- a/sys/arch/mipsco/stand/common/boot.c
+++ b/sys/arch/mipsco/stand/common/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.8 2009/03/14 21:04:12 dsl Exp $	*/
+/*	$NetBSD: boot.c,v 1.9 2011/01/22 19:19:20 joerg Exp $	*/

 /*-
 * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -118,7 +118,6 @@ main(int argc, char **argv)
 	printf("\n");
 	printf("NetBSD/mipsco " NETBSD_VERS " " BOOT_TYPE_NAME 
 	       " Bootstrap, Revision %s\n", bootprog_rev);
-	printf("(%s, %s)\n\n", bootprog_maker, bootprog_date);

 	/* initialise bootinfo structure early */
 	bi_init(BOOTINFO_ADDR);
--- a/sys/arch/mipsco/stand/common/common.h
+++ b/sys/arch/mipsco/stand/common/common.h
@ -1,4 +1,4 @@
-/*	$NetBSD: common.h,v 1.3 2009/03/14 14:46:03 dsl Exp $	*/
+/*	$NetBSD: common.h,v 1.4 2011/01/22 19:19:20 joerg Exp $	*/

 /*-
 * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -42,5 +42,3 @@ int prom_write(int, void *, int);
 * vers.c (generated by newvers.sh)
 */
 extern const char bootprog_rev[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];
--- a/sys/arch/mvme68k/stand/Makefile.booters
+++ b/sys/arch/mvme68k/stand/Makefile.booters
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.booters,v 1.21 2011/01/02 05:30:11 tsutsui Exp $
+#	$NetBSD: Makefile.booters,v 1.22 2011/01/22 19:19:20 joerg Exp $

 S?=		${.CURDIR}/../../../..
 MDEC_DIR?=	/usr/mdec
@ -35,7 +35,7 @@ SRCS+= vers.c
 CLEANFILES+= vers.c

 vers.c: version
-	${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${.CURDIR}/version "mvme68k"
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "mvme68k"
 .endif

 .include <bsd.klinks.mk>
--- a/sys/arch/mvmeppc/stand/Makefile.booters
+++ b/sys/arch/mvmeppc/stand/Makefile.booters
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.booters,v 1.11 2011/01/02 09:40:51 tsutsui Exp $
+#	$NetBSD: Makefile.booters,v 1.12 2011/01/22 19:19:20 joerg Exp $

 S?=		${.CURDIR}/../../../..
 MDEC_DIR?=	/usr/mdec
@ -32,7 +32,7 @@ SRCS+= vers.c
 CLEANFILES+= vers.c

 vers.c: version
-	${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${.CURDIR}/version "mvmeppc"
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "mvmeppc"
 .endif

 .include <bsd.klinks.mk>
--- a/sys/arch/news68k/stand/Makefile.inc
+++ b/sys/arch/news68k/stand/Makefile.inc
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.8 2008/07/16 13:19:20 tsutsui Exp $
+#	$NetBSD: Makefile.inc,v 1.9 2011/01/22 19:19:20 joerg Exp $

 BINDIR= /usr/mdec

@ -10,7 +10,7 @@ CFLAGS+= -ffreestanding
 .PHONY: vers.c
 vers.c: version
 	${_MKTARGET_CREATE}
-	${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${.CURDIR}/version ${MACHINE}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version ${MACHINE}

 SRCS+=	vers.c
 CLEANFILES+= vers.c
--- a/sys/arch/newsmips/stand/Makefile.inc
+++ b/sys/arch/newsmips/stand/Makefile.inc
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.6 2006/06/29 01:45:03 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.7 2011/01/22 19:19:20 joerg Exp $

 BINDIR= /usr/mdec

@ -8,7 +8,8 @@ BINDIR= /usr/mdec
 .PHONY: vers.c
 vers.c: version
 	${_MKTARGET_CREATE}
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version ${MACHINE}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/version ${MACHINE}
 SRCS+=  vers.c
 CLEANFILES+= vers.c
 .endif
--- a/sys/arch/newsmips/stand/boot/boot.c
+++ b/sys/arch/newsmips/stand/boot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.18 2010/08/25 16:35:57 christos Exp $	*/
+/*	$NetBSD: boot.c,v 1.19 2011/01/22 19:19:21 joerg Exp $	*/

 /*-
 * Copyright (C) 1999 Tsubai Masanari.  All rights reserved.
@ -43,8 +43,6 @@ extern char _edata[], _end[];
 /* version strings in vers.c (generated by newvers.sh) */
 extern const char bootprog_name[];
 extern const char bootprog_rev[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];

 struct apbus_sysinfo *_sip;
 int apbus;
@ -93,7 +91,6 @@ boot(uint32_t a0, uint32_t a1, uint32_t a2, uint32_t a3, uint32_t a4,

 	printf("%s Secondary Boot, Revision %s\n",
 	    bootprog_name, bootprog_rev);
-        printf("(%s, %s)\n", bootprog_maker, bootprog_date);

 	if (apbus) {
 		char *bootdev = (char *)a1;
--- a/sys/arch/next68k/stand/boot/Makefile
+++ b/sys/arch/next68k/stand/boot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.23 2009/12/29 20:21:46 elad Exp $
+#	$NetBSD: Makefile,v 1.24 2011/01/22 19:19:21 joerg Exp $

 NOMAN=	# defined

@ -81,7 +81,7 @@ build.c:
 	${HOST_SH} ${.CURDIR}/newvers.sh

 vers.c: version
-	${HOST_SH} ${S}/conf/newvers_stand.sh -MD ${.CURDIR}/version "next68k"
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "next68k"

 #installboot: ${.CURDIR}/installboot.sh
 #	@rm -f installboot
--- a/sys/arch/ofppc/stand/ofwboot/Makefile
+++ b/sys/arch/ofppc/stand/ofwboot/Makefile
@ -1,7 +1,9 @@
-#	$NetBSD: Makefile,v 1.25 2009/09/11 12:00:12 phx Exp $
+#	$NetBSD: Makefile,v 1.26 2011/01/22 19:19:21 joerg Exp $

 S!=	cd ${.CURDIR}/../../../.. ; pwd

+.include <bsd.own.mk>
+
 PROG=		ofwboot
 SRCS=		ofwstart.S Locore.c boot.c ofdev.c net.c netif_of.c
 SRCS+=		mbr.c rdb.c vers.c
@ -69,7 +71,8 @@ LIBSA=		${SALIB}

 .PHONY: vers.c
 vers.c: version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "ofppc" ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/version "ofppc" ${NEWVERSWHAT}

 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 	${LD} -s -N -T ${.CURDIR}/ldscript -Ttext ${RELOC} -Bstatic \
--- a/sys/arch/ofppc/stand/ofwboot/boot.c
+++ b/sys/arch/ofppc/stand/ofwboot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.22 2009/01/12 07:49:57 tsutsui Exp $	*/
+/*	$NetBSD: boot.c,v 1.23 2011/01/22 19:19:21 joerg Exp $	*/

 /*-
 * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -188,8 +188,7 @@ _rtt(void)
 void
 main(void)
 {
-	extern char bootprog_name[], bootprog_rev[],
-		    bootprog_maker[], bootprog_date[];
+	extern char bootprog_name[], bootprog_rev[];
 	int chosen, cpu, cpunode, j, is64=0;
 	char bootline[512];		/* Should check size? */
 	char *cp;
@ -199,7 +198,6 @@ main(void)

 	printf("\n");
 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);

 #ifdef OFWDUMP
 	chosen = OF_finddevice("/");
--- a/sys/arch/pmax/stand/Makefile.booters
+++ b/sys/arch/pmax/stand/Makefile.booters
@ -1,5 +1,6 @@
-# $NetBSD: Makefile.booters,v 1.52 2010/05/27 06:58:14 dholland Exp $
+# $NetBSD: Makefile.booters,v 1.53 2011/01/22 19:19:21 joerg Exp $

+.include <bsd.own.mk>
 .include <bsd.sys.mk>		# for HOST_SH

 # $S must correspond to the top of the 'sys' tree
@ -97,10 +98,9 @@ LIBSA=		${SALIB}

 LIBS=		${LIBSA} ${LIBZ} ${LIBSA} ${LIBKERN}

-.include <bsd.own.mk>
-
 vers.c: ${.CURDIR}/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh -N ${.CURDIR}/version "pmax"
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-Do} \
+	    -N ${.CURDIR}/version "pmax"

 ${PROG}: ${OBJS} ${LIBS}
 	${LD} -Map ${PROG}.map -N -x -Ttext ${LOAD_ADDRESS} \
--- a/sys/arch/pmax/stand/common/boot.c
+++ b/sys/arch/pmax/stand/common/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.18 2009/03/14 15:36:12 dsl Exp $	*/
+/*	$NetBSD: boot.c,v 1.19 2011/01/22 19:19:21 joerg Exp $	*/

 /*-
 * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -121,7 +121,6 @@ main(int argc, char **argv)
 	printf("\n");
 	printf("NetBSD/pmax " NETBSD_VERS " " BOOT_TYPE_NAME " Bootstrap, Revision %s\n",
 	    bootprog_rev);
-	printf("(%s, %s)\n", bootprog_maker, bootprog_date);
 	printf("\n");

 	/* initialise bootinfo structure early */
--- a/sys/arch/pmax/stand/common/common.h
+++ b/sys/arch/pmax/stand/common/common.h
@ -1,4 +1,4 @@
-/*	$NetBSD: common.h,v 1.10 2011/01/10 17:01:17 tsutsui Exp $	*/
+/*	$NetBSD: common.h,v 1.11 2011/01/22 19:19:21 joerg Exp $	*/

 /*-
 * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -53,5 +53,3 @@ int prom_write(int, void *, int);
 * vers.c (generated by newvers.sh)
 */
 extern const char bootprog_rev[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];
--- a/sys/arch/pmax/stand/smallnet/smallnet.c
+++ b/sys/arch/pmax/stand/smallnet/smallnet.c
@ -1,4 +1,4 @@
-/*	$NetBSD: smallnet.c,v 1.7 2009/03/14 15:36:12 dsl Exp $	*/
+/*	$NetBSD: smallnet.c,v 1.8 2011/01/22 19:19:21 joerg Exp $	*/

 /*-
 * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -77,7 +77,6 @@ main(int argc, char **argv)

 	printf("NetBSD/pmax " NETBSD_VERS " " BOOT_TYPE_NAME
 	    " Bootstrap, Revision %s\n", bootprog_rev);
-	printf("(%s, %s)\n", bootprog_maker, bootprog_date);

 	/* initialise bootinfo structure early */
 	bi_init(BOOTINFO_ADDR);
--- a/sys/arch/prep/stand/boot/Makefile
+++ b/sys/arch/prep/stand/boot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2011/01/21 15:59:08 joerg Exp $
+#	$NetBSD: Makefile,v 1.25 2011/01/22 19:19:22 joerg Exp $

 NOMAN= # defined

@ -69,7 +69,8 @@ powerpc::
 .endif

 vers.c: ${.CURDIR}/../boot/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/../boot/version "prep" ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/../boot/version "prep" ${NEWVERSWHAT}

 ${PROG}: ${OBJS} ${LIBS}
 	${LD} -o ${PROG}.elf -N -T ${.CURDIR}/../boot/ld.script \
--- a/sys/arch/prep/stand/boot/boot.c
+++ b/sys/arch/prep/stand/boot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.17 2010/03/02 21:52:32 matt Exp $	*/
+/*	$NetBSD: boot.c,v 1.18 2011/01/22 19:19:22 joerg Exp $	*/

 /*
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -61,7 +61,7 @@ struct btinfo_clock btinfo_clock;
 RESIDUAL residual;

 extern u_long ns_per_tick;
-extern char bootprog_name[], bootprog_rev[], bootprog_maker[], bootprog_date[];
+extern char bootprog_name[], bootprog_rev[];

 void boot(void *, u_long);
 static void exec_kernel(char *);
@ -138,7 +138,6 @@ boot(void *resp, u_long loadaddr)

 	printf("\n");
 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);

 	for (;;) {
 		name = names[n++];
--- a/sys/arch/rs6000/stand/boot/Makefile
+++ b/sys/arch/rs6000/stand/boot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2011/01/21 15:59:09 joerg Exp $
+#	$NetBSD: Makefile,v 1.4 2011/01/22 19:19:22 joerg Exp $

 NOMAN= # defined

@ -64,7 +64,8 @@ powerpc::
 .endif

 vers.c: ${.CURDIR}/../boot/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/../boot/version "rs6000" ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/../boot/version "rs6000" ${NEWVERSWHAT}

 ${PROG}: ${OBJS} ${LIBS}
 	${LD} -o ${PROG} -s -N -T ${.CURDIR}/../boot/ld.script \
--- a/sys/arch/rs6000/stand/boot/boot.c
+++ b/sys/arch/rs6000/stand/boot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.4 2010/03/02 21:52:32 matt Exp $	*/
+/*	$NetBSD: boot.c,v 1.5 2011/01/22 19:19:22 joerg Exp $	*/

 /*
 * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -63,7 +63,7 @@ struct btinfo_console btinfo_console;
 struct ipl_directory ipldir;*/

 extern u_long ns_per_tick;
-extern char bootprog_name[], bootprog_rev[], bootprog_maker[], bootprog_date[];
+extern char bootprog_name[], bootprog_rev[];

 void boot(void *, void *);
 static void exec_kernel(char *);
@ -213,7 +213,6 @@ boot(void *iplcb_p, void *extiplcb_p)
 	setled(0x38000000); /* attempting boot */
 	printf("\n");
 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);

 	for (;;) {
 		name = names[n++];
--- a/sys/arch/sandpoint/stand/netboot/main.c
+++ b/sys/arch/sandpoint/stand/netboot/main.c
@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.40 2011/01/12 07:38:43 nisimura Exp $ */
+/* $NetBSD: main.c,v 1.41 2011/01/22 19:19:22 joerg Exp $ */

 /*-
 * Copyright (c) 2007 The NetBSD Foundation, Inc.
@ -89,7 +89,7 @@ void module_load(char *);
 int module_open(struct boot_module *);

 void main(int, char **);
-extern char bootprog_rev[], bootprog_maker[], bootprog_date[];
+extern char bootprog_rev[];

 int brdtype;
 uint32_t busclock, cpuclock;
@ -110,7 +110,6 @@ main(int argc, char *argv[])

 	printf("\n");
 	printf(">> NetBSD/sandpoint Boot, Revision %s\n", bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);

 	brdprop = brd_lookup(brdtype);
 	printf("%s, cpu %u MHz, bus %u MHz, %dMB SDRAM\n", brdprop->verbose,
--- a/sys/arch/sandpoint/stand/netboot/newvers.sh
+++ b/sys/arch/sandpoint/stand/netboot/newvers.sh
@ -5,12 +5,7 @@ while read vers comment
 do
 	version=$vers
 done < $1
-developer=${USER:-"releng"}
-[ -f /bin/hostname ] && buildhost=@`/bin/hostname`
-date=`date`

 cat <<EoF >vers.c
 const char bootprog_rev[] = "$version";
-const char bootprog_date[] = "$date";
-const char bootprog_maker[] = "$developer$buildhost";
 EoF
--- a/sys/arch/sbmips/stand/Makefile.bootprogs
+++ b/sys/arch/sbmips/stand/Makefile.bootprogs
@ -1,5 +1,6 @@
-# $NetBSD: Makefile.bootprogs,v 1.7 2009/01/12 07:30:45 tsutsui Exp $
+# $NetBSD: Makefile.bootprogs,v 1.8 2011/01/22 19:19:22 joerg Exp $

+.include <bsd.own.mk>
 .include <bsd.sys.mk>		# for HOST_SH

 S=	${.CURDIR}/../../../..
@ -49,7 +50,8 @@ CWARNFLAGS+=	-Wno-pointer-sign
 .if exists(version)
 .PHONY: vers.c
 vers.c: version
-	${HOST_SH} ${S}/conf/newvers_stand.sh -N ${.CURDIR}/version "sbmips"
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    -N ${.CURDIR}/version "sbmips"

 SRCS+=	vers.c
 CLEANFILES+= vers.c
--- a/sys/arch/sbmips/stand/common/boot.c
+++ b/sys/arch/sbmips/stand/common/boot.c
@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.5 2009/03/18 16:00:14 cegger Exp $ */
+/* $NetBSD: boot.c,v 1.6 2011/01/22 19:19:22 joerg Exp $ */

 /*
 * Copyright (c) 1992, 1993
@ -92,7 +92,6 @@ main(long fwhandle,long fd,long fwentry)
 	printf("\n");
 	printf("NetBSD/sbmips " NETBSD_VERS " " BOOT_TYPE_NAME " Bootstrap, Revision %s\n",
 	    bootprog_rev);
-	printf("(%s, %s)\n", bootprog_maker, bootprog_date);
 	printf("\n");

 	/* set up the booted device descriptor */
--- a/sys/arch/sbmips/stand/common/common.h
+++ b/sys/arch/sbmips/stand/common/common.h
@ -1,4 +1,4 @@
-/* $NetBSD: common.h,v 1.2 2009/03/14 14:46:06 dsl Exp $ */
+/* $NetBSD: common.h,v 1.3 2011/01/22 19:19:22 joerg Exp $ */

 /*
 * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@ -41,9 +41,6 @@ int		getchar(void);
 * vers.c (generated by newvers.sh)
 */
 extern const char bootprog_rev[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];
-

 /*
 * booted_dev.c
--- a/sys/arch/sgimips/stand/Makefile.booters
+++ b/sys/arch/sgimips/stand/Makefile.booters
@ -1,5 +1,6 @@
-# $NetBSD: Makefile.booters,v 1.17 2009/12/14 00:46:14 matt Exp $
+# $NetBSD: Makefile.booters,v 1.18 2011/01/22 19:19:23 joerg Exp $

+.include <bsd.own.mk>
 .include <bsd.sys.mk>		# for HOST_SH

 # $S must correspond to the top of the 'sys' tree
@ -48,7 +49,8 @@ LOAD_ADDRESS_IP32?=	0x80002000
 .if exists(version)
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "sgimips"
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/version "sgimips"

 SRCS+=	vers.c
 CLEANFILES+= vers.c
--- a/sys/arch/sgimips/stand/boot64/Makefile
+++ b/sys/arch/sgimips/stand/boot64/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2010/05/27 06:58:15 dholland Exp $
+#	$NetBSD: Makefile,v 1.8 2011/01/22 19:19:23 joerg Exp $

 PROG=	ip30boot

@ -7,6 +7,7 @@ SRCS=	start64.S boot.c bootinfo.c conf.c devopen.c putchar.c getchar.c \

 CLEANFILES+=	boot.map

+.include <bsd.own.mk>
 .include <bsd.sys.mk>		# for HOST_SH

 # $S must correspond to the top of the 'sys' tree
@ -41,7 +42,8 @@ LOAD_ADDRESS_IP30?=	0xa800000020080000
 .if exists(version)
 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "sgimips"
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/version "sgimips"

 SRCS+=	vers.c
 CLEANFILES+= vers.c
--- a/sys/arch/sgimips/stand/common/boot.c
+++ b/sys/arch/sgimips/stand/common/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.17 2008/04/28 20:23:34 martin Exp $	*/
+/*	$NetBSD: boot.c,v 1.18 2011/01/22 19:19:23 joerg Exp $	*/

 /*-
 * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -135,7 +135,6 @@ main(int argc, char **argv)
 	printf("\n");
 	printf("%s " NETBSD_VERS " Bootstrap, Revision %s\n",
 	    bootprog_name, bootprog_rev);
-	printf("(%s, %s)\n", bootprog_maker, bootprog_date);
 	printf("\n");

 	memset(marks, 0, sizeof marks);
--- a/sys/arch/sgimips/stand/common/common.h
+++ b/sys/arch/sgimips/stand/common/common.h
@ -1,4 +1,4 @@
-/*	$NetBSD: common.h,v 1.4 2008/04/28 20:23:34 martin Exp $	*/
+/*	$NetBSD: common.h,v 1.5 2011/01/22 19:19:23 joerg Exp $	*/

 /*-
 * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -34,5 +34,3 @@
 */
 extern const char bootprog_rev[];
 extern const char bootprog_name[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];
--- a/sys/arch/shark/stand/ofwboot/Makefile
+++ b/sys/arch/shark/stand/ofwboot/Makefile
@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.11 2009/01/12 07:32:32 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.12 2011/01/22 19:19:23 joerg Exp $
+
+.include <bsd.own.mk>

 S=		${.CURDIR}/../../../..

@ -64,7 +66,8 @@ LIBSA=		${SALIB}

 .PHONY: vers.c
 vers.c: version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "shark" ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/version "shark" ${NEWVERSWHAT}

 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 	${LD} -s -N -Ttext ${RELOC} -Bstatic -e ${ENTRY} -o ${.TARGET}.aout \
--- a/sys/arch/shark/stand/ofwboot/boot.c
+++ b/sys/arch/shark/stand/ofwboot/boot.c
@ -1,5 +1,5 @@
 #define	DEBUG
-/*	$NetBSD: boot.c,v 1.6 2008/04/28 20:23:35 martin Exp $	*/
+/*	$NetBSD: boot.c,v 1.7 2011/01/22 19:19:23 joerg Exp $	*/

 /*-
 * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -186,8 +186,7 @@ _rtt(void)
 void
 main(void)
 {
-	extern char bootprog_name[], bootprog_rev[],
-		    bootprog_maker[], bootprog_date[];
+	extern char bootprog_name[], bootprog_rev[];
 	int chosen;
 	char bootline[512];		/* Should check size? */
 	char *cp, *startbuf, *endbuf;
@ -197,7 +196,6 @@ main(void)

 	printf("\n");
 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);

 	/*
 	 * Get the boot arguments from Openfirmware
--- a/sys/arch/sparc/stand/boot/Makefile
+++ b/sys/arch/sparc/stand/boot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.36 2009/12/13 05:01:33 nakayama Exp $
+#	$NetBSD: Makefile,v 1.37 2011/01/22 19:19:23 joerg Exp $

 STRIPFLAG=
 PROGSOURCE=	boot.c net.c netif_sun.c conf.c openfirm.c bootinfo.c \
@ -33,7 +33,8 @@ realall: ${FILES}

 .PHONY: vers.c
 vers.c: version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "sparc" ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/version "sparc" ${NEWVERSWHAT}

 .for RELOC in ${RELOCS}
 boot.${RELOC}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
--- a/sys/arch/sparc/stand/boot/boot.c
+++ b/sys/arch/sparc/stand/boot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.26 2010/08/25 20:16:48 christos Exp $ */
+/*	$NetBSD: boot.c,v 1.27 2011/01/22 19:19:23 joerg Exp $ */

 /*-
 * Copyright (c) 1982, 1986, 1990, 1993
@ -60,7 +60,7 @@ paddr_t bstart, bend;	/* physical start & end address of the boot program */
 int	compatmode = 0;		/* For loading older kernels */
 u_long	loadaddrmask = -1UL;

-extern char bootprog_name[], bootprog_rev[], bootprog_date[], bootprog_maker[];
+extern char bootprog_name[], bootprog_rev[];

 int	main(void);
 typedef void (*entry_t)(void *, int, int, int, long, long);
@ -256,7 +256,6 @@ main(void)
 	mmu_init();

 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);

 	/* massage machine prom */
 	prom_patch();
--- a/sys/arch/sparc/stand/ofwboot/Makefile
+++ b/sys/arch/sparc/stand/ofwboot/Makefile
@ -1,8 +1,10 @@
-#	$NetBSD: Makefile,v 1.26 2011/01/17 18:11:10 joerg Exp $
+#	$NetBSD: Makefile,v 1.27 2011/01/22 19:19:24 joerg Exp $

 CURDIR=	${.CURDIR}
 S=	${CURDIR}/../../../..

+.include <bsd.own.mk>
+
 #
 # Override normal settings
 #
@ -93,7 +95,8 @@ cleanlibdir:
 	-rm -rf lib

 vers.c: version
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${CURDIR}/version "sparc64" ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${CURDIR}/version "sparc64" ${NEWVERSWHAT}

 CLEANFILES+= vers.c

--- a/sys/arch/sparc/stand/ofwboot/boot.c
+++ b/sys/arch/sparc/stand/ofwboot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.26 2010/11/06 21:33:42 mrg Exp $	*/
+/*	$NetBSD: boot.c,v 1.27 2011/01/22 19:19:24 joerg Exp $	*/

 /*
 * Copyright (c) 1997, 1999 Eduardo E. Horvath.  All rights reserved.
@ -507,7 +507,6 @@ main(void *ofw)
 	prom_init();

 	printf("\r>> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	DPRINTF((">> (%s, %s)\n", bootprog_maker, bootprog_date));

 	/* Figure boot arguments */
 	strncpy(bootdev, prom_getbootpath(), sizeof(bootdev) - 1);
--- a/sys/arch/sparc/stand/ofwboot/boot.h
+++ b/sys/arch/sparc/stand/ofwboot/boot.h
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.h,v 1.5 2008/04/28 20:23:36 martin Exp $	*/
+/*	$NetBSD: boot.h,v 1.6 2011/01/22 19:19:24 joerg Exp $	*/

 /*-
 * Copyright (c) 2005 The NetBSD Foundation, Inc.
@ -42,8 +42,6 @@
 */
 extern const char bootprog_rev[];
 extern const char bootprog_name[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];

 /* bootinfo.c */
 extern u_long	bi_init(u_long);
--- a/sys/arch/sun68k/stand/libsa/Makefile.inc
+++ b/sys/arch/sun68k/stand/libsa/Makefile.inc
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.2 2009/09/25 11:19:35 he Exp $
+#	$NetBSD: Makefile.inc,v 1.3 2011/01/22 19:19:24 joerg Exp $

 S!=	cd ${SA_EXTRADIR}/../../../..; pwd

@ -19,8 +19,8 @@ SRCS+=	ctrlsp.S
 SRCS+=	mulsi3.S divsi3.S udivsi3.S modsi3.S umodsi3.S

 vers.c: ${SA_EXTRADIR}/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh \
-	    -MD ${SA_EXTRADIR}/version "${MACHINE}"
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${SA_EXTRADIR}/version "${MACHINE}"

 SRCS+=	vers.c
 CLEANFILES+=	vers.c
--- a/sys/arch/vax/boot/boot/Makefile
+++ b/sys/arch/vax/boot/boot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.37 2006/03/08 09:32:22 sekiya Exp $
+#	$NetBSD: Makefile,v 1.38 2011/01/22 19:19:24 joerg Exp $

 S=	${.CURDIR}/../../../..

@ -33,7 +33,8 @@ LIBKERN=${KERNLIB}

 .PHONY: vers.c
 vers.c: ${.CURDIR}/version
-	${HOST_SH} ${S}/conf/newvers_stand.sh -NM ${.CURDIR}/version "${MACHINE}"
+	${HOST_SH} ${S}/conf/newvers_stand.sh -N ${${MKREPRO} == "yes" :?:-D} \
+	    ${.CURDIR}/version "${MACHINE}"

 ${PROG}: machine-links ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
 	${_MKTARGET_LINK}
--- a/sys/arch/vax/boot/boot/boot.c
+++ b/sys/arch/vax/boot/boot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.30 2009/10/26 19:16:58 cegger Exp $ */
+/*	$NetBSD: boot.c,v 1.31 2011/01/22 19:19:24 joerg Exp $ */
 /*-
 * Copyright (c) 1982, 1986 The Regents of the University of California.
 * All rights reserved.
@ -96,15 +96,14 @@ Xmain(void)
 	int io;
 	int j, nu;
 	u_long marks[MARK_MAX];
-	extern const char bootprog_rev[], bootprog_date[];
+	extern const char bootprog_rev[];

 	io = 0;
 	skip = 1;
 	autoconf();

 	askname = bootrpb.rpb_bootr5 & RB_ASKNAME;
-	printf("\n\r>> NetBSD/vax boot [%s %s] <<\n", bootprog_rev,
-		bootprog_date);
+	printf("\n\r>> NetBSD/vax boot [%s] <<\n", bootprog_rev);
 	printf(">> Press any key to abort autoboot  ");
 	sluttid = getsecs() + 5;
 	senast = 0;
--- a/sys/arch/x68k/stand/boot/Makefile
+++ b/sys/arch/x68k/stand/boot/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2010/07/06 06:00:01 mrg Exp $
+#	$NetBSD: Makefile,v 1.19 2011/01/22 19:19:24 joerg Exp $

 NOMAN=		# defined

@ -32,7 +32,8 @@ SRCS+=		vers.c
 CLEANFILES+=	vers.c
 vers.c:	${VERSIONFILE}
 	${_MKTARGET_CREATE}
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}

 CPPFLAGS+=	-nostdinc -I$S -I${.OBJDIR} -I$M/stand/libsa
 CPPFLAGS+=	-I$M/stand/libiocs -I${COMMONDIR}
--- a/sys/arch/x68k/stand/boot/boot.c
+++ b/sys/arch/x68k/stand/boot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.15 2010/08/25 16:37:02 christos Exp $	*/
+/*	$NetBSD: boot.c,v 1.16 2011/01/22 19:19:24 joerg Exp $	*/

 /*
 * Copyright (c) 2001 Minoura Makoto
@ -275,8 +275,6 @@ bootmenu(void)

 extern const char bootprog_rev[];
 extern const char bootprog_name[];
-extern const char bootprog_date[];
-extern const char bootprog_maker[];

 /*
 * Arguments from the boot block:
@ -321,8 +319,6 @@ bootmain(int bootdev)
 	default:
 		printf("Warning: unknown boot device: %x\n", bootdev);
 	}
-	print_title("%s, Revision %s\n\t(%s, %s)",
-		    bootprog_name, bootprog_rev,
-		    bootprog_maker, bootprog_date);
+	print_title("%s, Revision %s\n", bootprog_name, bootprog_rev);
 	bootmenu();
 }
--- a/sys/arch/x68k/stand/boot_ufs/Makefile
+++ b/sys/arch/x68k/stand/boot_ufs/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2010/07/06 06:00:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.25 2011/01/22 19:19:24 joerg Exp $

 NOMAN=		# defined

@ -34,7 +34,8 @@ SRCS+=		vers.c
 CLEANFILES+=	vers.c
 vers.c:	${VERSIONFILE}
 	${_MKTARGET_CREATE}
-	${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh \
+	    ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}

 CFLAGS=	-Os -fomit-frame-pointer
 CFLAGS+= -W -Wall -Wstrict-prototypes -Wmissing-prototypes
--- a/sys/arch/x68k/stand/boot_ustar/Makefile
+++ b/sys/arch/x68k/stand/boot_ustar/Makefile
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2010/07/06 06:00:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.18 2011/01/22 19:19:24 joerg Exp $

 NOMAN=		# defined

@ -29,7 +29,8 @@ SRCS+=		vers.c
 CLEANFILES+=	vers.c
 vers.c:	${VERSIONFILE}
 	${_MKTARGET_CREATE}
-	${HOST_SH} ${S}/conf/newvers_stand.sh -DM ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh \
+	    ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}

 CPPFLAGS+= -DTEXTADDR="0x$(TEXT)" -DBOOT_TEXTADDR="0x$(BOOT_TEXT)"
 CPPFLAGS+= -DBOOT=\"$(BOOT)\" -DBOOT_VERS=\"$(VERSION)\"
--- a/sys/arch/zaurus/stand/zboot/Makefile
+++ b/sys/arch/zaurus/stand/zboot/Makefile
@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.4 2010/05/27 06:58:15 dholland Exp $
+#	$NetBSD: Makefile,v 1.5 2011/01/22 19:19:25 joerg Exp $
+
+.include <bsd.own.mk>

 PROG=		zboot

@ -46,7 +48,8 @@ SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_USE_LOADFILE=yes
 LIBSA=		${SALIB}

 ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
-	${HOST_SH} ${S}/conf/newvers_stand.sh ${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}
+	${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
+	    ${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}
 	${CC} -c vers.c
 	${LD} ${LDFLAGS} -o ${PROG} ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBKERN}

--- a/sys/arch/zaurus/stand/zboot/boot.c
+++ b/sys/arch/zaurus/stand/zboot/boot.c
@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.1 2009/03/02 09:33:02 nonaka Exp $	*/
+/*	$NetBSD: boot.c,v 1.2 2011/01/22 19:19:25 joerg Exp $	*/

 /*
 * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
@ -172,12 +172,9 @@ print_banner(void)
 {
 	extern const char bootprog_name[];
 	extern const char bootprog_rev[];
-	extern const char bootprog_date[];
-	extern const char bootprog_maker[];

 	printf("\n");
 	printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
-	printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
 }

 void
--- a/sys/conf/newvers_stand.sh
+++ b/sys/conf/newvers_stand.sh
@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-# $NetBSD: newvers_stand.sh,v 1.7 2009/02/20 13:41:27 yamt Exp $
+# $NetBSD: newvers_stand.sh,v 1.8 2011/01/22 19:19:25 joerg Exp $
 #
 # Copyright (c) 2000 The NetBSD Foundation, Inc.
 # All rights reserved.
@ -33,22 +33,20 @@
 # bootblock build on various architectures.
 #
 # Called as:
-#	sh ${S}/conf/newvers_stand.sh [-NDM] VERSION_FILE ARCH [EXTRA_MSG]
+#	sh ${S}/conf/newvers_stand.sh [-N] VERSION_FILE ARCH [EXTRA_MSG]

 cwd=$(dirname $0)

 add_name=yes
-add_date=yes
-add_maker=yes
+add_date=no
 add_kernrev=yes

 # parse command args
-while getopts "NDMK?" OPT; do
+while getopts "DKN?" OPT; do
 	case $OPT in
-	N)	add_name=no;;
-	D)	add_date=no;;
-	M)	add_maker=no;;
+	D)	add_date=yes;;
 	K)	add_kernrev=no;;
+	N)	add_name=no;;
 	?)	echo "Syntax: newvers_stand.sh [-NDMK] VERSION_TEMPLATE ARCH EXTRA_COMMENT" >&2
 		exit 1;;
 	esac
@ -57,9 +55,13 @@ done
 shift `expr $OPTIND - 1`

 r=`awk -F: '$1 ~ /^[0-9.]*$/ { it = $1; } END { print it }' $1`
+t=`LC_ALL=C date`

-# always add revision info
-echo "const char bootprog_rev[] = \"${r}\";" > vers.c
+if [ $add_date = yes ]; then
+	echo "const char bootprog_rev[] = \"${r} (${t})\";" > vers.c
+else
+	echo "const char bootprog_rev[] = \"${r}\";" > vers.c
+fi

 if [ $add_name = yes ]; then
 	a="$2"		# architecture name
@ -68,16 +70,6 @@ if [ $add_name = yes ]; then
 	echo "const char bootprog_name[] = \"NetBSD/${a}${extra}\";" >> vers.c
 fi

-if [ $add_date = yes ]; then
-	t=`LC_ALL=C date`
-	echo "const char bootprog_date[] = \"${t}\";" >> vers.c
-fi
-
-if [ $add_maker = yes ]; then
-	u=${USER-root} h=`hostname`
-	echo "const char bootprog_maker[] = \"${u}@${h}\";" >> vers.c
-fi
-
 if [ $add_kernrev = yes ]; then
 	osr=$(sh ${cwd}/osrelease.sh)
 	echo "const char bootprog_kernrev[] = \"${osr}\";" >> vers.c