From owner-svn-src-all@FreeBSD.ORG  Sun Oct  3 22:24:15 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 270DE106566B;
	Sun,  3 Oct 2010 22:24:15 +0000 (UTC)
	(envelope-from gordon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 15A2B8FC08;
	Sun,  3 Oct 2010 22:24:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o93MOET2092213;
	Sun, 3 Oct 2010 22:24:14 GMT (envelope-from gordon@svn.freebsd.org)
Received: (from gordon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o93MOEGj092210;
	Sun, 3 Oct 2010 22:24:14 GMT (envelope-from gordon@svn.freebsd.org)
Message-Id: <201010032224.o93MOEGj092210@svn.freebsd.org>
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Sun, 3 Oct 2010 22:24:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213391 - in head: gnu/usr.bin usr.bin
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Oct 2010 22:24:15 -0000

Author: gordon
Date: Sun Oct  3 22:24:14 2010
New Revision: 213391
URL: http://svn.freebsd.org/changeset/base/213391

Log:
  Retire GNU man in favor of the newly written BSDL version.
  
  Approved by:	wes (mentor)

Modified:
  head/gnu/usr.bin/Makefile
  head/usr.bin/Makefile

Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile	Sun Oct  3 21:56:20 2010	(r213390)
+++ head/gnu/usr.bin/Makefile	Sun Oct  3 22:24:14 2010	(r213391)
@@ -13,7 +13,6 @@ SUBDIR= ${_binutils} \
 	${_gperf} \
 	${_grep} \
 	${_groff} \
-	${_man} \
 	patch \
 	${_rcs} \
 	sdiff \
@@ -44,10 +43,6 @@ _dtc=		dtc
 _texinfo=	texinfo
 .endif
 
-.if ${MK_MAN_UTILS} != "no"
-_man=		man
-.endif
-
 .if ${MK_RCS} != "no"
 _rcs=		rcs
 .endif

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Sun Oct  3 21:56:20 2010	(r213390)
+++ head/usr.bin/Makefile	Sun Oct  3 22:24:14 2010	(r213391)
@@ -5,7 +5,7 @@
 
 # XXX MISSING:		deroff diction graph learn plot
 #			spell spline struct xsend
-# XXX Use GNU versions: apropos diff ld man patch whatis
+# XXX Use GNU versions: diff ld patch
 # Moved to secure: bdes
 #
 
@@ -94,6 +94,7 @@ SUBDIR=	alias \
 	lzmainfo \
 	m4 \
 	${_makewhatis} \
+	${_man} \
 	mesg \
 	minigzip \
 	ministat \
@@ -266,6 +267,7 @@ SUBDIR+=	make
 
 .if ${MK_MAN_UTILS} != "no"
 _makewhatis=	makewhatis
+_man=		man
 .endif
 
 .if ${MK_NETCAT} != "no"