PERFORCE change 181476 for review

[Benjamin Fiedler]

http://p4web.freebsd.org/@@181476?ac=10

Change 181476 by bfiedler at freebsd-home on 2010/07/27 14:45:11

	Set man and groff to conditional builds; use Gordon's man replacement

Affected files ...

.. //depot/projects/soc2010/bsdtextproc/src/gnu/usr.bin/Makefile#3 edit
.. //depot/projects/soc2010/bsdtextproc/src/usr.bin/Makefile#5 edit
.. //depot/projects/soc2010/bsdtextproc/src/usr.bin/man/Makefile#1 add
.. //depot/projects/soc2010/bsdtextproc/src/usr.bin/man/man.sh#1 add

Differences ...

==== //depot/projects/soc2010/bsdtextproc/src/gnu/usr.bin/Makefile#3 (text+ko) ====

@@ -45,8 +45,10 @@
 .endif
 
 .if ${MK_MAN_UTILS} != "no"
+.if !defined(WITH_MANDOC)
 _man=		man
 .endif
+.endif
 
 .if ${MK_RCS} != "no"
 _rcs=		rcs

==== //depot/projects/soc2010/bsdtextproc/src/usr.bin/Makefile#5 (text+ko) ====

@@ -122,6 +122,8 @@
 	${_mail} \
 	${_make} \
 	${_makewhatis} \
+	${_man} \
+	${_mandoc} \
 	mesg \
 	minigzip \
 	ministat \
@@ -243,10 +245,6 @@
 	${_ypmatch} \
 	${_ypwhich}
 
-.if defined(WITH_MANDOC)
-SUBDIR+= mdocml
-.endif
-
 .if ${MACHINE_ARCH} != "arm"
 _truss=		truss
 .endif
@@ -263,6 +261,11 @@
 
 .if ${MK_MAN_UTILS} != "no"
 _catman=	catman
+.if defined(WITH_MANDOC)
+_mandoc=        mandoc
+_man=           man
+.endif
+
 .endif
 
 .if ${MK_BIND_UTILS} != "no"