Rename a bunch of the old bsd.regress.mk variables into the new ones.

ok art@

36 files changed, 92 insertions, 92 deletions

diff --git a/regress/bin/ksh/Makefile b/regress/bin/ksh/Makefile
index cb18cb7db72..d25f066e237 100644
--- a/regress/bin/ksh/Makefile
+++ b/regress/bin/ksh/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1 2002/02/27 19:57:17 dhartmei Exp $
+# $OpenBSD: Makefile,v 1.2 2002/09/02 20:01:43 avsm Exp $
 
-REGRESSTARGETS=shcrash.sh
+REGRESS_TARGETS=shcrash.sh
 
 shcrash.sh:
 	ulimit -c 0 && sh ${.CURDIR}/shcrash.sh
 
-.PHONY: ${REGRESSTARGETS}
+.PHONY: ${REGRESS_TARGETS}
 
 .include <bsd.regress.mk>
diff --git a/regress/bin/md5/Makefile b/regress/bin/md5/Makefile
index dafbb3adaad..fb15e9b5eb8 100644
--- a/regress/bin/md5/Makefile
+++ b/regress/bin/md5/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.3 2002/02/18 10:36:26 art Exp $
+# $OpenBSD: Makefile,v 1.4 2002/09/02 20:01:43 avsm Exp $
 
-REGRESSTARGETS=md5 sha1 rmd160 md5_string_vs_files md5_pipe
-REGRESSTARGETS+=md5_pipe_vs_file md5_multiple_files
+REGRESS_TARGETS=md5 sha1 rmd160 md5_string_vs_files md5_pipe
+REGRESS_TARGETS+=md5_pipe_vs_file md5_multiple_files
 
 md5:
 	md5 -x | cmp -s ${.CURDIR}/testsuite.md5 /dev/stdin
@@ -33,6 +33,6 @@ md5_multiple_files:
 		false ; \
 	fi
 
-.PHONY: ${REGRESSTARGETS}
+.PHONY: ${REGRESS_TARGETS}
 
 .include <bsd.regress.mk>
diff --git a/regress/etc/MAKEDEV/Makefile b/regress/etc/MAKEDEV/Makefile
index 8cb1ec194d2..c3900717a13 100644
--- a/regress/etc/MAKEDEV/Makefile
+++ b/regress/etc/MAKEDEV/Makefile
@@ -1,5 +1,5 @@
 
-# $OpenBSD: Makefile,v 1.12 2002/02/21 14:34:28 todd Exp $
+# $OpenBSD: Makefile,v 1.13 2002/09/02 20:01:43 avsm Exp $
 
 MAKEDEVARCHS+=alpha amiga hp300 hppa i386 mac68k macppc mvme68k mvme88k
 MAKEDEVARCHS+=mvmeppc sparc sparc64 sun3 vax
@@ -8,15 +8,15 @@ MAKEDEVTARGS?=all ramdisk
 
 ETCSRCDIR?=	/usr/src/etc
 
-REGRESSSLOWTARGETS=${REGRESSTARGETS}
+REGRESS_SLOW_TARGETS=${REGRESS_TARGETS}
 
 # test separate targets, all, ramdisk/raminst, std, etc
 # t1 = all
 # t2 = ramdisk
 
-REGRESSTARGETS+= ${MAKEDEVARCHS}
+REGRESS_TARGETS+= ${MAKEDEVARCHS}
 
-${REGRESSTARGETS}:
+${REGRESS_TARGETS}:
 . for _T in ${MAKEDEVTARGS}
 	@echo "====> ${_T}.${.TARGET}"
 	@exec ${SUDO} rm -rf test.${_T}.${.TARGET}
diff --git a/regress/include/bitstring/Makefile b/regress/include/bitstring/Makefile
index c70c7ca7366..90f8baf76ea 100644
--- a/regress/include/bitstring/Makefile
+++ b/regress/include/bitstring/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.3 2002/01/01 23:00:51 art Exp $
+#	$OpenBSD: Makefile,v 1.4 2002/09/02 20:01:43 avsm Exp $
 #	$NetBSD: Makefile,v 1.4 1995/04/20 22:37:50 cgd Exp $
 
 PROG=	./bitstring_test
 
-REGRESSTARGETS=test-8 test-27 test-32 test-49 test-64 test-67
+REGRESS_TARGETS=test-8 test-27 test-32 test-49 test-64 test-67
 
 test-8: ${PROG}
 	${PROG} 8 | diff - ${.CURDIR}/good/8
diff --git a/regress/lib/csu/dtors/Makefile b/regress/lib/csu/dtors/Makefile
index 01bc4b1e029..a6884a8619c 100644
--- a/regress/lib/csu/dtors/Makefile
+++ b/regress/lib/csu/dtors/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 2002/02/18 11:09:48 art Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/09/02 20:01:43 avsm Exp $
 
 PROG=dtors
 
-REGRESSTARGETS=dtor-exit dtor-return
+REGRESS_TARGETS=dtor-exit dtor-return
 
 dtor-exit: dtors
 	./dtors
diff --git a/regress/lib/libc/db/Makefile b/regress/lib/libc/db/Makefile
index effbad43d2e..7d2882594da 100644
--- a/regress/lib/libc/db/Makefile
+++ b/regress/lib/libc/db/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2002/08/21 22:49:41 wcobb Exp $
+#	$OpenBSD: Makefile,v 1.10 2002/09/02 20:01:43 avsm Exp $
 #	$NetBSD: Makefile,v 1.11 1995/12/12 01:54:15 cgd Exp $
 
 PROG=	dbtest
@@ -13,10 +13,10 @@ DBTARGETS=1 2 3 4 5 6 7 8 9 10 11 12 13 20
 .for DT in ${DBTARGETS}
 db-${DT}: ${PROG}
 	sh ${.CURDIR}/run.test ${DT}
-REGRESSTARGETS+=db-${DT}
+REGRESS_TARGETS+=db-${DT}
 .PHONY: db-${DT}
 .endfor
 
-REGRESSSLOWTARGETS+=db-3 db-12 db-20
+REGRESS_SLOW_TARGETS+=db-3 db-12 db-20
 
 .include <bsd.regress.mk>
diff --git a/regress/lib/libc/getaddrinfo/Makefile b/regress/lib/libc/getaddrinfo/Makefile
index 31764f3db18..4d4978a6a2a 100644
--- a/regress/lib/libc/getaddrinfo/Makefile
+++ b/regress/lib/libc/getaddrinfo/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.2 2002/08/26 13:11:41 art Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/09/02 20:01:43 avsm Exp $
 
 PROG=		gaitest
 SRCS=		gaitest.c
 NOMAN=		# defined
 CLEANFILES+=	out
 
-REGRESSTARGETS=do-test
+REGRESS_TARGETS=do-test
 
 do-test: ${PROG}
 	sh ${.CURDIR}/testsuite.sh >out 2>&1
diff --git a/regress/lib/libc/longjmp/Makefile b/regress/lib/libc/longjmp/Makefile
index 53a310c8900..825e0f86d93 100644
--- a/regress/lib/libc/longjmp/Makefile
+++ b/regress/lib/libc/longjmp/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2002/02/18 11:27:45 art Exp $
+#	$OpenBSD: Makefile,v 1.4 2002/09/02 20:01:43 avsm Exp $
 PROG=	longjmp
 
 do-longjmp: ${PROG}
@@ -7,7 +7,7 @@ do-longjmp: ${PROG}
 do-_longjmp: ${PROG}
 	./longjmp -_
 
-REGRESSTARGETS=do-longjmp do-_longjmp
-.PHONY: ${REGRESSTARGETS}
+REGRESS_TARGETS=do-longjmp do-_longjmp
+.PHONY: ${REGRESS_TARGETS}
 
 .include <bsd.regress.mk>
diff --git a/regress/lib/libc/regex/Makefile b/regress/lib/libc/regex/Makefile
index 76d68a56ae6..a29686bca41 100644
--- a/regress/lib/libc/regex/Makefile
+++ b/regress/lib/libc/regex/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2002/01/01 23:00:51 art Exp $
+#	$OpenBSD: Makefile,v 1.5 2002/09/02 20:01:43 avsm Exp $
 #	$NetBSD: Makefile,v 1.2 1995/02/16 19:38:45 cgd Exp $
 
 PROG=	re
@@ -8,7 +8,7 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libc/regex
 
 TESTS=	${.CURDIR}/tests
 
-REGRESSTARGETS=do-reg do-reg-long do-reg-backref
+REGRESS_TARGETS=do-reg do-reg-long do-reg-backref
 
 do-reg: ${PROG}
 	./re < ${TESTS}
diff --git a/regress/lib/libc/sigreturn/Makefile b/regress/lib/libc/sigreturn/Makefile
index 277e1153b17..9891ba9e051 100644
--- a/regress/lib/libc/sigreturn/Makefile
+++ b/regress/lib/libc/sigreturn/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2002/01/04 13:53:32 art Exp $
+# $OpenBSD: Makefile,v 1.5 2002/09/02 20:01:43 avsm Exp $
 
 PROG=	sigret
 
 DEBUG+= -ggdb
 
-REGRESSTARGETS+= sigret-normal sigret-indirect sigret-altstack
+REGRESS_TARGETS+= sigret-normal sigret-indirect sigret-altstack
 
 sigret-normal: ${PROG}
 	./${PROG}
diff --git a/regress/lib/libc/sigsetjmp/Makefile b/regress/lib/libc/sigsetjmp/Makefile
index 12736245198..f88bea3b478 100644
--- a/regress/lib/libc/sigsetjmp/Makefile
+++ b/regress/lib/libc/sigsetjmp/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2002/02/18 11:35:09 art Exp $
+#	$OpenBSD: Makefile,v 1.5 2002/09/02 20:01:43 avsm Exp $
 
 PROG=	sigsetjmptest
 SRCS=	jmptest.c
@@ -7,13 +7,13 @@ CFLAGS+= -DTEST_SIGSETJMP
 
 .PATH:	${.CURDIR}/../setjmp
 
-REGRESSTARGETS=sigsetjmp-save sigsetjmp-nosave
+REGRESS_TARGETS=sigsetjmp-save sigsetjmp-nosave
 
 sigsetjmp-save: ${PROG}
 	./${PROG} save
 sigsetjmp-nosave: ${PROG}
 	./${PROG} nosave
 
-.PHONY: ${REGRESSTARGETS}
+.PHONY: ${REGRESS_TARGETS}
 
 .include <bsd.regress.mk>
diff --git a/regress/lib/libc_r/Makefile.inc b/regress/lib/libc_r/Makefile.inc
index c3c8a0887f3..cc9a763e4d8 100644
--- a/regress/lib/libc_r/Makefile.inc
+++ b/regress/lib/libc_r/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.5 2002/06/17 04:48:24 marc Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2002/09/02 20:01:43 avsm Exp $
 # Copyright (c) 1993 Chris Provenzano, proven@athena.mit.edu
 
 LIBC_R?=	/usr/lib/libc_r.a
@@ -22,4 +22,4 @@ CFLAGS+=	-I${.CURDIR}/../include
 
 NOMAN=
 
-REGRESSMAXTIME?=30
+REGRESS_MAXTIME?=30
diff --git a/regress/lib/libc_r/pcap/Makefile b/regress/lib/libc_r/pcap/Makefile
index db6184ea0f9..8e28bd914da 100644
--- a/regress/lib/libc_r/pcap/Makefile
+++ b/regress/lib/libc_r/pcap/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.7 2002/05/11 00:20:20 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2002/09/02 20:01:43 avsm Exp $
 
 PROG=	pcap
 
 DPADD+= ${LIBPCAP}
 LDADD+= -lpcap
 
-REGRESSTARGETS=		sudo-regress-${PROG}
-REGRESSROOTTARGETS=	${REGRESSTARGETS}
+REGRESS_TARGETS=		sudo-regress-${PROG}
+REGRESS_ROOT_TARGETS=	${REGRESS_TARGETS}
 
 sudo-regress-${PROG}: ${PROG}
 	${SUDO} ./${PROG}
diff --git a/regress/lib/libc_r/socket/2a/Makefile b/regress/lib/libc_r/socket/2a/Makefile
index 356add77f45..d000158fbac 100644
--- a/regress/lib/libc_r/socket/2a/Makefile
+++ b/regress/lib/libc_r/socket/2a/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2002/01/04 13:56:36 art Exp $
+# $OpenBSD: Makefile,v 1.4 2002/09/02 20:01:43 avsm Exp $
 
 PROG=	socket2a
 CFLAGS+= -I${.CURDIR}/../../include
 
-REGRESSTARGETS=dummy
+REGRESS_TARGETS=dummy
 
 dummy: ${PROG}
 	@cd ${.CURDIR}/../2; \
diff --git a/regress/lib/libc_r/stdarg/Makefile b/regress/lib/libc_r/stdarg/Makefile
index 2975e4b61c3..42769f3d63a 100644
--- a/regress/lib/libc_r/stdarg/Makefile
+++ b/regress/lib/libc_r/stdarg/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2002/01/03 00:43:48 art Exp $
+# $OpenBSD: Makefile,v 1.4 2002/09/02 20:01:43 avsm Exp $
 
 PROG=	stdarg
 
 CFLAGS+= -I${.CURDIR}/../include
 
-REGRESSMAXTIME= 10
+REGRESS_MAXTIME= 10
 
 .include <bsd.regress.mk>
diff --git a/regress/lib/libm/trivial1/Makefile b/regress/lib/libm/trivial1/Makefile
index 8a15b41025d..5878823f1ed 100644
--- a/regress/lib/libm/trivial1/Makefile
+++ b/regress/lib/libm/trivial1/Makefile
@@ -1,6 +1,6 @@
 
 PERL=perl
-REGRESSTARGETS=test-fp
+REGRESS_TARGETS=test-fp
 
 test-fp: test-fp.pl
 	${PERL} ${.CURDIR}/$@.pl | diff -u - ${.CURDIR}/test-fp.out
diff --git a/regress/lib/libpthread/Makefile.inc b/regress/lib/libpthread/Makefile.inc
index c3c8a0887f3..cc9a763e4d8 100644
--- a/regress/lib/libpthread/Makefile.inc
+++ b/regress/lib/libpthread/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.5 2002/06/17 04:48:24 marc Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2002/09/02 20:01:43 avsm Exp $
 # Copyright (c) 1993 Chris Provenzano, proven@athena.mit.edu
 
 LIBC_R?=	/usr/lib/libc_r.a
@@ -22,4 +22,4 @@ CFLAGS+=	-I${.CURDIR}/../include
 
 NOMAN=
 
-REGRESSMAXTIME?=30
+REGRESS_MAXTIME?=30
diff --git a/regress/lib/libpthread/pcap/Makefile b/regress/lib/libpthread/pcap/Makefile
index db6184ea0f9..8e28bd914da 100644
--- a/regress/lib/libpthread/pcap/Makefile
+++ b/regress/lib/libpthread/pcap/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.7 2002/05/11 00:20:20 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2002/09/02 20:01:43 avsm Exp $
 
 PROG=	pcap
 
 DPADD+= ${LIBPCAP}
 LDADD+= -lpcap
 
-REGRESSTARGETS=		sudo-regress-${PROG}
-REGRESSROOTTARGETS=	${REGRESSTARGETS}
+REGRESS_TARGETS=		sudo-regress-${PROG}
+REGRESS_ROOT_TARGETS=	${REGRESS_TARGETS}
 
 sudo-regress-${PROG}: ${PROG}
 	${SUDO} ./${PROG}
diff --git a/regress/lib/libpthread/socket/2a/Makefile b/regress/lib/libpthread/socket/2a/Makefile
index 356add77f45..d000158fbac 100644
--- a/regress/lib/libpthread/socket/2a/Makefile
+++ b/regress/lib/libpthread/socket/2a/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2002/01/04 13:56:36 art Exp $
+# $OpenBSD: Makefile,v 1.4 2002/09/02 20:01:43 avsm Exp $
 
 PROG=	socket2a
 CFLAGS+= -I${.CURDIR}/../../include
 
-REGRESSTARGETS=dummy
+REGRESS_TARGETS=dummy
 
 dummy: ${PROG}
 	@cd ${.CURDIR}/../2; \
diff --git a/regress/lib/libpthread/stdarg/Makefile b/regress/lib/libpthread/stdarg/Makefile
index 2975e4b61c3..42769f3d63a 100644
--- a/regress/lib/libpthread/stdarg/Makefile
+++ b/regress/lib/libpthread/stdarg/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2002/01/03 00:43:48 art Exp $
+# $OpenBSD: Makefile,v 1.4 2002/09/02 20:01:43 avsm Exp $
 
 PROG=	stdarg
 
 CFLAGS+= -I${.CURDIR}/../include
 
-REGRESSMAXTIME= 10
+REGRESS_MAXTIME= 10
 
 .include <bsd.regress.mk>
diff --git a/regress/lib/libssl/Makefile b/regress/lib/libssl/Makefile
index 4836bf9d4af..85608b96796 100644
--- a/regress/lib/libssl/Makefile
+++ b/regress/lib/libssl/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.8 2002/09/01 16:29:31 markus Exp $
+#	$OpenBSD: Makefile,v 1.9 2002/09/02 20:01:43 avsm Exp $
 
 CLEANFILES+= testdsa.key testdsa.pem rsakey.pem rsacert.pem dsa512.pem
 
-REGRESSTARGETS=ossltests ssl-enc ssl-dsa ssl-rsa 
+REGRESS_TARGETS=ossltests ssl-enc ssl-dsa ssl-rsa 
 
 OPENSSL=/usr/sbin/openssl
 CLEAR1=p
@@ -83,7 +83,7 @@ ssl-enc-${ENC}: ${CLEAR1} ${CLEAR2}.${ENC}
 ssl-enc-${ENC}.b64: ${CLEAR1} ${CLEAR2}.${ENC}.b64
 	cmp ${CLEAR1} ${CLEAR2}.${ENC}.b64
 
-REGRESSTARGETS+=ssl-enc-${ENC} ssl-enc-${ENC}.b64
+REGRESS_TARGETS+=ssl-enc-${ENC} ssl-enc-${ENC}.b64
 CLEANFILES+=${CIPHER}.${ENC} ${CIPHER}.${ENC}.b64 ${CLEAR2}.${ENC} ${CLEAR2}.${ENC}.b64 e_os.h .rnd
 .endfor
 
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 9f2440ea795..47e3dd283d6 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2002/07/30 15:01:41 henning Exp $
+# $OpenBSD: Makefile,v 1.28 2002/09/02 20:01:43 avsm Exp $
 
 PFTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
 PFFAIL=1 2 3 4 5 6 7 8 9 10 11 12 13
 
 .for n in ${PFFAIL}
-REGRESSTARGETS+=pfail${n}
+REGRESS_TARGETS+=pfail${n}
 
 pfail${n}:
 	if pfctl -nv -f - < ${.CURDIR}/pfail${n}.in > /dev/null 2>&1 ; then \
@@ -14,7 +14,7 @@ pfail${n}:
 .endfor
 
 .for n in ${PFTESTS}
-REGRESSTARGETS+=pf${n}
+REGRESS_TARGETS+=pf${n}
 
 pf${n}:
 	pfctl -nv -f - < ${.CURDIR}/pf${n}.in | \
@@ -22,6 +22,6 @@ pf${n}:
 
 .endfor
 
-.PHONY: ${REGRESSTARGETS}
+.PHONY: ${REGRESS_TARGETS}
 
 .include <bsd.regress.mk>
diff --git a/regress/share/man/Makefile b/regress/share/man/Makefile
index 5e7f84cbcad..218b948f61e 100644
--- a/regress/share/man/Makefile
+++ b/regress/share/man/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.8 2002/01/03 01:04:59 art Exp $
+#	$OpenBSD: Makefile,v 1.9 2002/09/02 20:01:43 avsm Exp $
 
-REGRESSTARGETS=do-cfman do-no3man do-scatman
-REGRESSSLOWTARGETS=${REGRESSTARGETS}
+REGRESS_TARGETS=do-cfman do-no3man do-scatman
+REGRESS_SLOW_TARGETS=${REGRESS_TARGETS}
 
 do-cfman:
 	perl ${.CURDIR}/cfman /usr/share/man
diff --git a/regress/sys/arch/i386/ldt/Makefile b/regress/sys/arch/i386/ldt/Makefile
index 8a78a5fef49..78528bd88a6 100644
--- a/regress/sys/arch/i386/ldt/Makefile
+++ b/regress/sys/arch/i386/ldt/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.3 2002/02/22 23:33:59 art Exp $
+#	$OpenBSD: Makefile,v 1.4 2002/09/02 20:01:43 avsm Exp $
 #	$NetBSD: Makefile,v 1.3 1995/04/20 22:42:19 cgd Exp $
 #
 # C Optimizer (-O) breaks this program - don't use !!
@@ -9,7 +9,7 @@ DPADD+=	${LIBARCH}
 LDADD+=	-li386
 
 .if ${MACHINE_ARCH} != "i386"
-REGRESSSKIP="yes"
+REGRESS_SKIP="yes"
 .endif
 
 .include <bsd.regress.mk>
diff --git a/regress/sys/ddb/Makefile b/regress/sys/ddb/Makefile
index aa69de6e74f..bf0f814ee72 100644
--- a/regress/sys/ddb/Makefile
+++ b/regress/sys/ddb/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.1 2002/06/11 09:12:38 niklas Exp $
+#	$OpenBSD: Makefile,v 1.2 2002/09/02 20:01:44 avsm Exp $
 
-REGRESSTARGETS=		comment
+REGRESS_TARGETS=		comment
 .if (${MACHINE} == "i386")
-REGRESSTARGETS+=	size
+REGRESS_TARGETS+=	size
 .endif
 
 SRC=		${.CURDIR}/../../..
diff --git a/regress/sys/kern/execve/Makefile b/regress/sys/kern/execve/Makefile
index ad216bf3390..0cf921d3d5e 100644
--- a/regress/sys/kern/execve/Makefile
+++ b/regress/sys/kern/execve/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2002/01/01 23:05:30 art Exp $
+#	$OpenBSD: Makefile,v 1.5 2002/09/02 20:01:44 avsm Exp $
 
 PROG=	doexec
 LDSTATIC= -static
@@ -14,7 +14,7 @@ CLEANFILES+= ${TESTFILES}
 
 all:	${PROG} ${TESTFILES}
 
-REGRESSTARGETS=	test-empty test-nonexist \
+REGRESS_TARGETS=	test-empty test-nonexist \
 		test-nonexistshell test-devnullscript test-badinterplen \
 		test-goodscript test-scriptarg test-scriptarg-nospace \
 		test-goodaout test-truncaout
diff --git a/regress/sys/kern/kqueue/Makefile b/regress/sys/kern/kqueue/Makefile
index 5ef54b11fcd..7d7994bd6e6 100644
--- a/regress/sys/kern/kqueue/Makefile
+++ b/regress/sys/kern/kqueue/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2002/06/19 03:05:07 mickey Exp $
+#	$OpenBSD: Makefile,v 1.5 2002/09/02 20:01:44 avsm Exp $
 
 PROG=	kqueue-test
 SRCS=	kqueue-pipe.c kqueue-fork.c main.c kqueue-process.c kqueue-random.c
@@ -12,7 +12,7 @@ kq-process: ${PROG}
 kq-random: ${PROG}
 	./${PROG} -r
 
-REGRESSTARGETS=kq-pipe kq-fork kq-process kq-random
-.PHONY: ${REGRESSTARGETS}
+REGRESS_TARGETS=kq-pipe kq-fork kq-process kq-random
+.PHONY: ${REGRESS_TARGETS}
 
 .include <bsd.regress.mk>
diff --git a/regress/sys/kern/nanosleep/Makefile b/regress/sys/kern/nanosleep/Makefile
index dc2a24ec25d..fca0da5e67f 100644
--- a/regress/sys/kern/nanosleep/Makefile
+++ b/regress/sys/kern/nanosleep/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 2002/02/17 05:33:33 art Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/09/02 20:01:44 avsm Exp $
 
 PROG=	nanosleep
 SRCS=	nanosleep.c
@@ -18,7 +18,7 @@ time_elapsed_with_signal: nanosleep
 short_time: nanosleep
 	./nanosleep -S
 
-REGRESSTARGETS=trivial with_signal time_elapsed time_elapsed_with_signal
-REGRESSTARGETS+=short_time
+REGRESS_TARGETS=trivial with_signal time_elapsed time_elapsed_with_signal
+REGRESS_TARGETS+=short_time
 
 .include <bsd.regress.mk>
diff --git a/regress/sys/kern/noexec/Makefile b/regress/sys/kern/noexec/Makefile
index 548ba25d7fa..cdaa36cc743 100644
--- a/regress/sys/kern/noexec/Makefile
+++ b/regress/sys/kern/noexec/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.1 2002/08/31 22:56:01 mickey Exp $
+#	$OpenBSD: Makefile,v 1.2 2002/09/02 20:01:44 avsm Exp $
 
 .if ${MACHINE} == "sparc64" || ${MACHINE} == "sparc" || \
     ${MACHINE} == "alpha" || ${MACHINE} == "macppc" || \
@@ -8,7 +8,7 @@
 PROG=	noexec
 CFLAGS+=-Wall -Werror
 LDSTATIC= ${STATIC}
-REGRESSTARGETS=		nxtext-mprotect \
+REGRESS_TARGETS=nxtext-mprotect \
 		nxdata	nxdata-mprotect \
 		nxbss	nxbss-mprotect \
 		nxheap	nxheap-mprotect \
@@ -42,7 +42,7 @@ nxstack-mprotect: ${PROG}
 	@./${PROG} -S -p
 
 .else
-REGRESSTARGETS=		# this architecture has no test for this
+REGRESS_TARGETS=		# this architecture has no test for this
 .endif
 
 .include <bsd.regress.mk>
diff --git a/regress/sys/kern/signal/sigfpe/Makefile b/regress/sys/kern/signal/sigfpe/Makefile
index c290ae2a0e0..8a21482eacc 100644
--- a/regress/sys/kern/signal/sigfpe/Makefile
+++ b/regress/sys/kern/signal/sigfpe/Makefile
@@ -1,11 +1,11 @@
-#	$OpenBSD: Makefile,v 1.2 2002/08/23 15:31:00 art Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/09/02 20:01:44 avsm Exp $
 
 PROG=	sigfpe
 
 # XXX - don't want the compiler to optimize away our tests
 CFLAGS=   -O0 ${PIPE} ${DEBUG}
 
-REGRESSTARGETS=	divzero oflow
+REGRESS_TARGETS=	divzero oflow
 
 divzero: ${PROG}
 	./${PROG} -z
diff --git a/regress/sys/kern/unfdpass/Makefile b/regress/sys/kern/unfdpass/Makefile
index e9c931e2e09..7bd78e99a43 100644
--- a/regress/sys/kern/unfdpass/Makefile
+++ b/regress/sys/kern/unfdpass/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.6 2002/02/11 12:36:58 art Exp $
+#	$OpenBSD: Makefile,v 1.7 2002/09/02 20:01:44 avsm Exp $
 #	$NetBSD: Makefile,v 1.3 1998/03/02 21:57:38 cgd Exp $
 
 PROG=	unfdpass
 
 CLEANFILES+=file1 file2 output test-sock
-REGRESSTARGETS=do-unfdpass
+REGRESS_TARGETS=do-unfdpass
 
 do-unfdpass: ${PROG}
 	./unfdpass > output
diff --git a/regress/usr.bin/m4/Makefile b/regress/usr.bin/m4/Makefile
index 0f3104d2312..562aa57ad5f 100644
--- a/regress/usr.bin/m4/Makefile
+++ b/regress/usr.bin/m4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2002/02/18 15:28:16 art Exp $
+#	$OpenBSD: Makefile,v 1.17 2002/09/02 20:01:44 avsm Exp $
 
 FIBOMAX=25
 M4=m4
@@ -6,7 +6,7 @@ M4=m4
 .SUFFIXES: .m4 .m4.uu
 CLEANFILES+= ff_after_dnl.m4 strangequotes.m4 fibo.out
 
-REGRESSTARGETS= test-ff_after_dnl test-m4wrap test-m4wrap2 test-fibo \
+REGRESS_TARGETS= test-ff_after_dnl test-m4wrap test-m4wrap2 test-fibo \
     test-patterns trip test-strangequotes test-redef test-quotes \
     test-weird test-args test-esyscmd
 
@@ -55,6 +55,6 @@ test-args:
 test-esyscmd:
 	${M4} ${.CURDIR}/esyscmd.m4 | diff -u - ${.CURDIR}/esyscmd.out
 
-.PHONY:	${REGRESSTARGETS}
+.PHONY:	${REGRESS_TARGETS}
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/make/Makefile b/regress/usr.bin/make/Makefile
index e790ee14c2d..7b209df9e8c 100644
--- a/regress/usr.bin/make/Makefile
+++ b/regress/usr.bin/make/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.18 2002/04/16 16:15:30 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2002/09/02 20:01:44 avsm Exp $
 
 # We don't pass t7, t13, t14, t17
 # and t16 yields piss poor performance
-REGRESSTARGETS=t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18
+REGRESS_TARGETS=t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t13 t14 t15 t16 t17 t18
 
 MALLOC_OPTIONS?=AZJ
 t1: t1.out
diff --git a/regress/usr.bin/sort/Makefile b/regress/usr.bin/sort/Makefile
index 447c9ad92cb..0213a0b8530 100644
--- a/regress/usr.bin/sort/Makefile
+++ b/regress/usr.bin/sort/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 2002/01/02 18:04:48 art Exp $
+#	$OpenBSD: Makefile,v 1.3 2002/09/02 20:01:44 avsm Exp $
 
 CLEANFILES+= in in1 out xx -k xsort linecount fields
 
-REGRESSTARGETS=do-stests
+REGRESS_TARGETS=do-stests
 
 # XXX - should be split up in this makefile, not in the script.
 # XXX - script doesn't return non-0 on failure.
diff --git a/regress/usr.bin/ssh/Makefile b/regress/usr.bin/ssh/Makefile
index 42ccf107b6a..2e18067276d 100644
--- a/regress/usr.bin/ssh/Makefile
+++ b/regress/usr.bin/ssh/Makefile
@@ -1,6 +1,6 @@
-#	$OpenBSD: Makefile,v 1.16 2002/07/16 09:14:06 markus Exp $
+#	$OpenBSD: Makefile,v 1.17 2002/09/02 20:01:44 avsm Exp $
 
-REGRESSTARGETS=	t1 t2 t3 t4 t5 t6 t7
+REGRESS_TARGETS=	t1 t2 t3 t4 t5 t6 t7
 
 CLEANFILES+=	t2.out t6.out1 t6.out2 t7.out t7.out.pub copy.1 copy.2
 
@@ -67,7 +67,7 @@ t7: t7.out
 	ssh-keygen -Bf t7.out > /dev/null
 
 .for t in ${LTESTS}
-REGRESSTARGETS+=t-${t}
+REGRESS_TARGETS+=t-${t}
 t-${t}:
 	sh ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/${t}.sh
 .endfor
diff --git a/regress/usr.bin/tsort/Makefile b/regress/usr.bin/tsort/Makefile
index 4e230133c98..2b7da1ccf25 100644
--- a/regress/usr.bin/tsort/Makefile
+++ b/regress/usr.bin/tsort/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.6 2002/01/03 01:24:32 art Exp $
+# $OpenBSD: Makefile,v 1.7 2002/09/02 20:01:44 avsm Exp $
 
-REGRESSTARGETS=t1 t2 t3 t4 t5 t6
-REGRESSSLOWTARGETS=t4
+REGRESS_TARGETS=t1 t2 t3 t4 t5 t6
+REGRESS_SLOW_TARGETS=t4
 
 t1: t1.out
 	perl ${.CURDIR}/tsort-check t1.out ${.CURDIR}/pairs1