trivial conversions to bsd.regress.mk

7 files changed, 23 insertions, 55 deletions

diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index 95b8a31a4a3..3b8a629ea24 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2001/11/26 16:53:27 jasoni Exp $
+# $OpenBSD: Makefile,v 1.12 2002/01/01 23:05:30 art Exp $
 
-NOMAN=
-NOPROG=
 PFTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13
 PFFAIL=1 2 3 4 5 6 7 8
 
 .for n in ${PFFAIL}
-regress: pfail${n}
+REGRESSTARGETS+=pfail${n}
 
 pfail${n}:
 	@pfctl -nv -R - < ${.CURDIR}/pfail${n}.in > /dev/null 2>&1 && \
@@ -16,7 +14,7 @@ pfail${n}:
 .endfor
 
 .for n in ${PFTESTS}
-regress: pf${n}
+REGRESSTARGETS+=pf${n}
 
 pf${n}: pf${n}.out
 	@cmp -s ${.CURDIR}/pf${n}.ok pf${n}.out || \
@@ -37,7 +35,6 @@ binat1.out:
 
 CLEANFILES+=binat1.out
 
-regress: binat1
+REGRESSTARGETS+=binat1
 
-.PHONY: regress
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/regress/share/man/Makefile b/regress/share/man/Makefile
index da5920e1852..3de53711a32 100644
--- a/regress/share/man/Makefile
+++ b/regress/share/man/Makefile
@@ -1,14 +1,12 @@
-#	$OpenBSD: Makefile,v 1.6 2000/04/02 18:47:50 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 2002/01/01 23:05:30 art Exp $
 
-NOPROG=
-NOMAN=
-
-regress: cfman no3man scatman
+REGRESSTARGETS=do-cfman do-no3man do-scatman
+do-cfman:
 	perl ${.CURDIR}/cfman /usr/share/man
+do-no3man:
 	perl ${.CURDIR}/no3man /usr/share/man
+do-scatman:
 	perl ${.CURDIR}/scatman /usr/share/man
 
-install:
-
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
 
diff --git a/regress/sys/kern/dup2/Makefile b/regress/sys/kern/dup2/Makefile
index 2b965247bc8..73f879f9bde 100644
--- a/regress/sys/kern/dup2/Makefile
+++ b/regress/sys/kern/dup2/Makefile
@@ -1,11 +1,5 @@
-#	$OpenBSD: Makefile,v 1.1 2001/10/08 22:40:50 art Exp $
+#	$OpenBSD: Makefile,v 1.2 2002/01/01 23:05:30 art Exp $
 
 PROG=	dup2test
-NOMAN=	noman, no way, man
 
-install:
-
-regress:
-	./dup2test
-
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/regress/sys/kern/execve/Makefile b/regress/sys/kern/execve/Makefile
index 72a3e65d5ee..ad216bf3390 100644
--- a/regress/sys/kern/execve/Makefile
+++ b/regress/sys/kern/execve/Makefile
@@ -1,8 +1,6 @@
-#	$OpenBSD: Makefile,v 1.3 2001/01/06 18:26:32 millert Exp $
+#	$OpenBSD: Makefile,v 1.4 2002/01/01 23:05:30 art Exp $
 
 PROG=	doexec
-NOMAN=	noman, no way, man
-
 LDSTATIC= -static
 
 RP=	${.OBJDIR}/${PROG}
@@ -16,9 +14,7 @@ CLEANFILES+= ${TESTFILES}
 
 all:	${PROG} ${TESTFILES}
 
-install:
-
-regress:	test-empty test-nonexist \
+REGRESSTARGETS=	test-empty test-nonexist \
 		test-nonexistshell test-devnullscript test-badinterplen \
 		test-goodscript test-scriptarg test-scriptarg-nospace \
 		test-goodaout test-truncaout
@@ -85,4 +81,4 @@ truncaout: goodaout
 test-truncaout: ${PROG} truncaout
 	${RP} ${.OBJDIR}/truncaout | diff - ${OD}/truncaout
 
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/regress/sys/kern/getrusage/Makefile b/regress/sys/kern/getrusage/Makefile
index 97cbab8a5e0..7b4cc07b33a 100644
--- a/regress/sys/kern/getrusage/Makefile
+++ b/regress/sys/kern/getrusage/Makefile
@@ -1,11 +1,5 @@
-#	$OpenBSD: Makefile,v 1.1 2001/12/17 01:22:05 nordin Exp $
+#	$OpenBSD: Makefile,v 1.2 2002/01/01 23:05:30 art Exp $
 
 PROG=	getrusage
-NOMAN=	noman, no way, man
 
-install:
-
-regress:
-	./getrusage
-
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/regress/sys/kern/mmap/Makefile b/regress/sys/kern/mmap/Makefile
index f2eb5c8dc01..665afc928cf 100644
--- a/regress/sys/kern/mmap/Makefile
+++ b/regress/sys/kern/mmap/Makefile
@@ -1,11 +1,5 @@
-#	$OpenBSD: Makefile,v 1.1 2001/06/19 08:41:59 niklas Exp $
+#	$OpenBSD: Makefile,v 1.2 2002/01/01 23:05:31 art Exp $
 
 PROG=	mmaptest
-NOMAN=	noman, no way, man
 
-install:
-
-regress:
-	./mmaptest
-
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/m4/Makefile b/regress/usr.bin/m4/Makefile
index ef9665700ec..90b06cb0ef9 100644
--- a/regress/usr.bin/m4/Makefile
+++ b/regress/usr.bin/m4/Makefile
@@ -1,21 +1,16 @@
-#	$OpenBSD: Makefile,v 1.14 2001/10/14 09:41:55 todd Exp $
+#	$OpenBSD: Makefile,v 1.15 2002/01/01 23:05:30 art Exp $
 #	$NetBSD: Makefile,v 1.2 1999/02/13 02:54:33 lukem Exp $
 
-NOMAN=
-NOPROG=
-
 FIBOMAX=25
 M4=m4
 
 .SUFFIXES: .m4 .m4.uu
 CLEANFILES+= ff_after_dnl.m4 strangequotes.m4 fibo.out
 
-ALL_TESTS= test-ff_after_dnl test-m4wrap test-m4wrap2 test-fibo \
+REGRESSTARGETS= 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
 
-regress: ${ALL_TESTS}
-
 test-ff_after_dnl: ff_after_dnl.m4
 	${M4} ff_after_dnl.m4 | diff - ${.CURDIR}/ff_after_dnl.out
 
@@ -63,4 +58,4 @@ test-esyscmd:
 
 .PHONY:	${ALL_TESTS}
 
-.include <bsd.prog.mk>
+.include <bsd.regress.mk>