From owner-p4-projects@FreeBSD.ORG  Wed Jul 28 08:21:47 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 01784106632E; Wed, 28 Jul 2010 08:21:39 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E82F71065746
	for <perforce@FreeBSD.org>; Wed, 28 Jul 2010 08:21:37 +0000 (UTC)
	(envelope-from bfiedler@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7580F8FC25
	for <perforce@FreeBSD.org>; Wed, 28 Jul 2010 08:21:37 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o6S8Lbap009192
	for <perforce@FreeBSD.org>; Wed, 28 Jul 2010 08:21:37 GMT
	(envelope-from bfiedler@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o6S8LbmA009190
	for perforce@freebsd.org; Wed, 28 Jul 2010 08:21:37 GMT
	(envelope-from bfiedler@FreeBSD.org)
Date: Wed, 28 Jul 2010 08:21:37 GMT
Message-Id: <201007280821.o6S8LbmA009190@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bfiedler@FreeBSD.org using -f
From: Benjamin Fiedler <bfiedler@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181476 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jul 2010 08:21:47 -0000

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

Change 181476 by bfiedler@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"