Theo reported that make cleandir deleted too much, triggering this cleanup:

Since quite some time, the groff output files are checked into CVS.
* thus, no longer provide a "groff-clean" target to delete them
* from official targets, no longer call the "groff" target generating them
* do not reimplement "clean" and "cleandir", simply use the official targets

6 files changed, 13 insertions, 22 deletions

diff --git a/regress/usr.bin/mandoc/Makefile b/regress/usr.bin/mandoc/Makefile
index 335a639eda1..9c2ced9b2e7 100644
--- a/regress/usr.bin/mandoc/Makefile
+++ b/regress/usr.bin/mandoc/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.5 2011/01/04 01:15:39 schwarze Exp $
+# $OpenBSD: Makefile,v 1.6 2011/07/24 20:26:52 schwarze Exp $
 
 SUBDIR+= roff char mdoc man
 
-groff groff-clean: _SUBDIRUSE
-depend:	groff
+groff: _SUBDIRUSE
 
 .include <bsd.subdir.mk>
diff --git a/regress/usr.bin/mandoc/Makefile.inc b/regress/usr.bin/mandoc/Makefile.inc
index 24cf039eba9..0b1f0e184d1 100644
--- a/regress/usr.bin/mandoc/Makefile.inc
+++ b/regress/usr.bin/mandoc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.5 2011/05/31 08:00:25 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2011/07/24 20:26:52 schwarze Exp $
 
 DIFF=diff -au
 MANDOC?=mandoc
@@ -7,6 +7,8 @@ NROFF=/usr/local/bin/nroff -c -mandoc -Tascii
 SED=sed
 SH=/bin/sh
 
+CLEANFILES=*.mandoc_ascii
+
 all: clean
 
 groff: ${GROFF_TARGETS:C/$/.out_ascii/}
@@ -27,13 +29,3 @@ groff: ${GROFF_TARGETS:C/$/.out_ascii/}
 	@echo "  -> ${*}"
 	@MANDOC="${MANDOC}" MANDOCOPTS="${MANDOCOPTS}" \
 		${SH} ${.CURDIR}/${*}.sh 
-
-clean:
-	rm -f *.mandoc_ascii *.core
-
-groff-clean:
-.if defined(GROFF_TARGETS)
-	rm -f ${GROFF_TARGETS:C/$/.out_ascii/}
-.endif
-
-cleandir: groff-clean clean
diff --git a/regress/usr.bin/mandoc/char/Makefile b/regress/usr.bin/mandoc/char/Makefile
index 20ec64a8756..cf9d1b4ae13 100644
--- a/regress/usr.bin/mandoc/char/Makefile
+++ b/regress/usr.bin/mandoc/char/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.2 2011/01/30 16:05:29 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2011/07/24 20:26:52 schwarze Exp $
 
 SUBDIR+= space N
 
-groff groff-clean: _SUBDIRUSE
+groff: _SUBDIRUSE
 
 .include <bsd.subdir.mk>
diff --git a/regress/usr.bin/mandoc/man/Makefile b/regress/usr.bin/mandoc/man/Makefile
index 70d582cbbf3..fd34a4d7e8a 100644
--- a/regress/usr.bin/mandoc/man/Makefile
+++ b/regress/usr.bin/mandoc/man/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.4 2011/02/06 13:40:06 schwarze Exp $
+# $OpenBSD: Makefile,v 1.5 2011/07/24 20:26:52 schwarze Exp $
 
 SUBDIR= nf BI IP PP TH TP
 
-groff groff-clean: _SUBDIRUSE
+groff: _SUBDIRUSE
 
 .include <bsd.subdir.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Makefile b/regress/usr.bin/mandoc/mdoc/Makefile
index 642b6b4f9f3..e346668a0b4 100644
--- a/regress/usr.bin/mandoc/mdoc/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2011/02/06 22:56:45 schwarze Exp $
+# $OpenBSD: Makefile,v 1.15 2011/07/24 20:26:52 schwarze Exp $
 
 SUBDIR+= Ad Ar At Bd Bk Bl Bx Cd Er Fl Fo Ic In
 SUBDIR+= Lb Li Ms Mt Nd Nm No Ns Op Ox Pf Pp Rs Sm St Sx Sy Tn Vt Xr
@@ -7,6 +7,6 @@ SUBDIR+= blank
 # disabled, mandoc must be fixed:
 # Pa
 
-groff groff-clean: _SUBDIRUSE
+groff: _SUBDIRUSE
 
 .include <bsd.subdir.mk>
diff --git a/regress/usr.bin/mandoc/roff/Makefile b/regress/usr.bin/mandoc/roff/Makefile
index 3d1211bd8fd..5e21cc792c0 100644
--- a/regress/usr.bin/mandoc/roff/Makefile
+++ b/regress/usr.bin/mandoc/roff/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.6 2011/02/05 18:19:12 schwarze Exp $
+# $OpenBSD: Makefile,v 1.7 2011/07/24 20:26:52 schwarze Exp $
 
 SUBDIR+= args cond string br na ps rm sp
 
-groff groff-clean: _SUBDIRUSE
+groff: _SUBDIRUSE
 
 .include <bsd.subdir.mk>