switch to installing source manuals (base part)

discussed with lots of people, tested by naddy@,
"move fast" deraadt@

3 files changed, 12 insertions, 24 deletions

diff --git a/gnu/usr.bin/lynx/Makefile.bsd-wrapper b/gnu/usr.bin/lynx/Makefile.bsd-wrapper
index bc314602191..bc07baa7518 100644
--- a/gnu/usr.bin/lynx/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/lynx/Makefile.bsd-wrapper
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.19 2010/09/06 17:35:57 naddy Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.20 2011/06/23 22:46:12 schwarze Exp $
 
 MAN=	lynx.1
-CLEANFILES=	lynx.cat1 lynx.1
+CLEANFILES+= lynx.1
 DPADD=	${LIBSSL} ${LIBCRYPTO}
 
 .if (${MACHINE} == "vax")
@@ -27,13 +27,7 @@ HELPFILES=	keystrokes/alt_edit_help.html keystrokes/bookmark_help.html \
 
 .include <bsd.own.mk>
 
-.ifdef NOMAN
-LYNX_CAT1=
-.else
-LYNX_CAT1=lynx.cat1
-.endif
-
-all:	config.status ${LYNX_CAT1}
+all:	config.status
 	${MAKE}
 
 .FORCE:	.IGNORE
diff --git a/gnu/usr.bin/perl/Makefile.bsd-wrapper b/gnu/usr.bin/perl/Makefile.bsd-wrapper
index 27a1496b43c..74d5da6e7d9 100644
--- a/gnu/usr.bin/perl/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/perl/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.84 2010/11/30 19:45:02 millert Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.85 2011/06/23 22:46:12 schwarze Exp $
 #
 # Build wrapper for Perl 5.10.0
 #
@@ -66,13 +66,12 @@ GENERATED=	config.sh ${GEN_AFTER}
 
 ${GEN_AFTER}: config.sh
 
-CLEANFILES=	config.sh Policy.sh DynaLoader.c ${MANALL} ${PSALL} ${MANSRCALL} stamp-mansrc.build
+CLEANFILES=	config.sh Policy.sh DynaLoader.c
 
 all:	perl.build man.build
 
-
 man.build: perl.build
-	cd ${.CURDIR} && exec ${MAKE} -f Makefile.bsd-wrapper1 $@
+	cd ${.CURDIR} && exec ${MAKE} -f Makefile.bsd-wrapper1 mansrc.build
 
 beforedepend: config.sh config.h bitcount.h uudmap.h Makefile makedepend x2p/Makefile writemain 
 	cd ${.OBJDIR} && exec ${MAKE} depend
@@ -212,4 +211,4 @@ install.lib:
 	${INSTALL} ${INSTALL_COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    lib${LIB}.so.${major}.${minor} ${DESTDIR}${LIBDIR}
 .endif
-.PHONY: perl.lib install.lib perl.build install.perl man.build mansrc.build
+.PHONY: perl.lib install.lib perl.build install.perl man.build
diff --git a/gnu/usr.bin/perl/Makefile.bsd-wrapper1 b/gnu/usr.bin/perl/Makefile.bsd-wrapper1
index 3947d937ea5..7c5026fb5f1 100644
--- a/gnu/usr.bin/perl/Makefile.bsd-wrapper1
+++ b/gnu/usr.bin/perl/Makefile.bsd-wrapper1
@@ -28,10 +28,9 @@ MLINKS=		c2ph.1 pstruct.1 s2p.1 psed.1 perl5121delta.1 perldelta.1 \
 		Pod::Checker.3p podchecker.3p Pod::Select.3p podselect.3p \
 		Pod::Usage.3p pod2usage.3p
 
-MANALL=
+MAN=
 _quick1=
 _quick3p=
-MANSRCALL=
 
 .for page sect file in \
     a2p 1 			x2p/a2p.pod \
@@ -729,13 +728,9 @@ MANSRCALL=
     warnings 3p			lib/warnings.pm \
     warnings::register 3p	lib/warnings/register.pm
 .  ifndef NOMAN
-MANALL+= ${page}.cat${sect}
-MANSRCALL+= ${page}.${sect}
+MAN+= ${page}.${sect}
 MANSRC_COOKIE=stamp-mansrc.build
 _quick${sect}+=${file} ${page}.${sect}
-.    ifdef MANPS
-PSALL+= ${page}.ps${sect}
-.    endif
 .  else
 MANSRC_COOKIE=
 .  endif
@@ -755,9 +750,9 @@ stamp-mansrc.build:
 	@cd ${.CURDIR} && exec ${MAKE} -f Makefile.bsd-wrapper1 mansrc.build
 	@touch $@
 
-man.build: ${MANSRC_COOKIE} .WAIT ${MANALL} ${PSALL}
-.PHONY: man.build mansrc.build
+.PHONY: mansrc.build
 
 cleandir:
-	rm -f ${MANALL} ${MANSRCALL} ${PSALL}
+	rm -f ${MAN} stamp-mansrc.build
+
 .include <bsd.man.mk>