Cleanup so that make install can run, many install: maninstall changed

to just install:, sperious targets and CLEANFILES removed.

8 files changed, 16 insertions, 29 deletions

diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index f79edaa8e19b..fef2a8f7fdf9 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -9,7 +9,8 @@ CLEANFILES=ar.5.0
 
 ar.0: ar.5.0
 
-afterinstall:
+# XXX BROKEN: afterinstall:
+XXXafterinstall:
 	install -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} ar.5.0 \
 	    ${DESTDIR}${MANDIR}5/ar.0
 
diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile
index 44eaa4ac64b4..0168e7e0dd76 100644
--- a/usr.bin/id/Makefile
+++ b/usr.bin/id/Makefile
@@ -3,12 +3,13 @@
 PROG=	id
 MAN1=   id.0 groups.0 whoami.0
 
+# XXX BROKEN:	afterinstall:
 afterinstall:
 	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/groups.sh ${DESTDIR}/usr/bin/groups
 	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/whoami.sh ${DESTDIR}/usr/bin/whoami
-	${MINSTALL} groups.0 ${DESTDIR}${MANDIR}1/groups.0
-	${MINSTALL} whoami.0 ${DESTDIR}${MANDIR}1/whoami.0
+#XXX	${MINSTALL} groups.0 ${DESTDIR}${MANDIR}1/groups.0
+#XXX	${MINSTALL} whoami.0 ${DESTDIR}${MANDIR}1/whoami.0
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/lorder/Makefile b/usr.bin/lorder/Makefile
index 12f99c62ca13..96264e8b2049 100644
--- a/usr.bin/lorder/Makefile
+++ b/usr.bin/lorder/Makefile
@@ -2,9 +2,8 @@
 
 MAN1=	lorder.0
 
-install: maninstall
+install:
 	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/lorder.sh ${DESTDIR}/${BINDIR}/lorder
 
 .include <bsd.prog.mk>
-.include <bsd.man.mk>
diff --git a/usr.bin/pagesize/Makefile b/usr.bin/pagesize/Makefile
index 0a4d65226b83..a53468671b2d 100644
--- a/usr.bin/pagesize/Makefile
+++ b/usr.bin/pagesize/Makefile
@@ -2,16 +2,8 @@
 
 MAN1=	pagesize.0
 
-all pagesize: ${MAN1}
-
-clean depend lint tags:
-
-cleandir:
-	rm -f ${MAN1}
-
-install: maninstall
+install:
 	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/pagesize.sh ${DESTDIR}/${BINDIR}/pagesize
 
 .include <bsd.prog.mk>
-.include <bsd.man.mk>
diff --git a/usr.bin/ranlib/Makefile b/usr.bin/ranlib/Makefile
index 4acf99e1148a..e7cdf1d376a9 100644
--- a/usr.bin/ranlib/Makefile
+++ b/usr.bin/ranlib/Makefile
@@ -5,12 +5,14 @@ SRCS=	archive.c build.c misc.c ranlib.c touch.c
 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../ar
 MAN1=	ranlib.0
 VPATH=	${.CURDIR}/../ar
-CLEANFILES=ranlib.5.0
 
-ranlib.0: ranlib.5.0
+# XXX BROKEN: manual pages
+# XXX CLEANFILES=ranlib.5.0
 
-afterinstall:
-	install -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} ranlib.5.0 \
-	    ${DESTDIR}${MANDIR}5/ranlib.0
+# XXX ranlib.0: ranlib.5.0
+
+# XXX afterinstall:
+# XXX 	install -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} ranlib.5.0 \
+# XXX 	    ${DESTDIR}${MANDIR}5/ranlib.0
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile
index 2d8a5de87982..fc1295faa893 100644
--- a/usr.bin/shar/Makefile
+++ b/usr.bin/shar/Makefile
@@ -2,13 +2,6 @@
 
 MAN1=	shar.0
 
-all shar: ${MAN1}
-
-clean depend lint tags:
-
-cleandir:
-	rm -f ${MAN1}
-
 beforeinstall:
 	install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${.CURDIR}/shar.sh ${DESTDIR}/usr/bin/shar
diff --git a/usr.bin/strip/Makefile b/usr.bin/strip/Makefile
index aedea503d158..f713477073fc 100644
--- a/usr.bin/strip/Makefile
+++ b/usr.bin/strip/Makefile
@@ -2,10 +2,9 @@
 
 PROG=	strip
 
-install: maninstall
+install:
 	install -c -o ${BINOWN} -g ${BINOWN} -m ${BINMODE} strip \
 	    ${DESTDIR}${BINDIR}
 	./strip ${DESTDIR}${BINDIR}/strip
-	rm -f ./strip
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index 69de3ab13bd7..83cc8e0ffbba 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -5,7 +5,7 @@ SRCS=	stat_flags.c xinstall.c
 MAN1=	install.0
 .PATH:	${.CURDIR}/../../bin/ls
 
-install: maninstall
+install:
 	install ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	    ${PROG} ${DESTDIR}${BINDIR}/install