From 433f0177d0a0855e8bd7df40e3070caa53112863 Mon Sep 17 00:00:00 2001
From: uqs <uqs@FreeBSD.org>
Date: Tue, 22 Feb 2011 08:13:49 +0000
Subject: Flesh out WITHOUT_GROFF support to DTRT.

A full featured groff is required during buildworld, so build it always
and don't rely on it being present on the host system.

vgrind(1) is tightly coupled to a roff processor and will not be
built/installed when groff is disabled. Also much of the roff'ed
documentation under share/doc will not be built/installed when
WITHOUT_GROFF is defined.

Reviewed by:	ru (partial)
---
 etc/mtree/BSD.groff.dist | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 etc/mtree/BSD.usr.dist   | 38 --------------------------------------
 etc/mtree/Makefile       |  3 +++
 3 files changed, 51 insertions(+), 38 deletions(-)
 create mode 100644 etc/mtree/BSD.groff.dist

(limited to 'etc/mtree')

diff --git a/etc/mtree/BSD.groff.dist b/etc/mtree/BSD.groff.dist
new file mode 100644
index 0000000..3f21375
--- /dev/null
+++ b/etc/mtree/BSD.groff.dist
@@ -0,0 +1,48 @@
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    share
+        groff_font
+            devX100
+            ..
+            devX100-12
+            ..
+            devX75
+            ..
+            devX75-12
+            ..
+            devascii
+            ..
+            devcp1047
+            ..
+            devdvi
+            ..
+            devhtml
+            ..
+            devkoi8-r
+            ..
+            devlatin1
+            ..
+            devlbp
+            ..
+            devlj4
+            ..
+            devps
+            ..
+            devutf8
+            ..
+        ..
+        me
+        ..
+        tmac
+            mdoc
+            ..
+            mm
+            ..
+        ..
+    ..
+..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 07d69f2..1f8edf0 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -310,36 +310,6 @@
             fortune
             ..
         ..
-        groff_font
-            devX100
-            ..
-            devX100-12
-            ..
-            devX75
-            ..
-            devX75-12
-            ..
-            devascii
-            ..
-            devcp1047
-            ..
-            devdvi
-            ..
-            devhtml
-            ..
-            devkoi8-r
-            ..
-            devlatin1
-            ..
-            devlbp
-            ..
-            devlj4
-            ..
-            devps
-            ..
-            devutf8
-            ..
-        ..
         info
         ..
         locale
@@ -890,8 +860,6 @@
             man9
             ..
         ..
-        me
-        ..
         misc
             fonts
             ..
@@ -1266,12 +1234,6 @@
         ..
         tabset
         ..
-        tmac
-            mdoc
-            ..
-            mm
-            ..
-        ..
         vi
             catalog
             ..
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index 3090ffb..15da1bf 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -16,6 +16,9 @@ _BIND.chroot.dist=	BIND.chroot.dist
 _BIND.include.dist=	BIND.include.dist
 .endif
 .endif
+.if ${MK_GROFF} != "no"
+_BSD.groff.dist=	BSD.groff.dist
+.endif
 .if ${MK_SENDMAIL} != "no"
 _BSD.sendmail.dist=	BSD.sendmail.dist
 .endif
-- 
cgit v1.1