From 6efa7df9d3506dc39644113d097b8d88723f4906 Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Mon, 18 Oct 2010 17:11:29 +0000
Subject: [PATCH] The base no longer uses old groff -- it uses mandoc(1).  The
 ports tree still sometimes needs groff, but there it is pulled in as a
 build-dependency, and it is the newer groff.  We are able to do this now due
 to the hard work if ingo.

---
 src/etc/mtree/4.4BSD.dist |  76 +----------------------------
 src/etc/mtree/4.4BSD.usr  | 100 +-------------------------------------
 2 files changed, 2 insertions(+), 174 deletions(-)

diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 9663a985..37d59a0f 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.208 2010/10/18 04:17:11 deraadt Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.209 2010/10/18 17:11:29 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -740,64 +740,6 @@ quiz.db
 # ./usr/share/games
 ..
 
-# ./usr/share/groff_font
-groff_font
-
-# ./usr/share/groff_font/devX100
-devX100
-# ./usr/share/groff_font/devX100
-..
-
-# ./usr/share/groff_font/devX100-12
-devX100-12
-# ./usr/share/groff_font/devX100-12
-..
-
-# ./usr/share/groff_font/devX75
-devX75
-# ./usr/share/groff_font/devX75
-..
-
-# ./usr/share/groff_font/devX75-12
-devX75-12
-# ./usr/share/groff_font/devX75-12
-..
-
-# ./usr/share/groff_font/devascii
-devascii
-# ./usr/share/groff_font/devascii
-..
-
-# ./usr/share/groff_font/devdvi
-devdvi
-
-# ./usr/share/groff_font/devdvi/generate
-generate
-# ./usr/share/groff_font/devdvi/generate
-..
-
-# ./usr/share/groff_font/devdvi
-..
-
-# ./usr/share/groff_font/devlatin1
-devlatin1
-# ./usr/share/groff_font/devlatin1
-..
-
-# ./usr/share/groff_font/devps
-devps
-
-# ./usr/share/groff_font/devps/generate
-generate
-# ./usr/share/groff_font/devps/generate
-..
-
-# ./usr/share/groff_font/devps
-..
-
-# ./usr/share/groff_font
-..
-
 # ./usr/share/info
 info
 # ./usr/share/info
@@ -2187,22 +2129,6 @@ tabset
 # ./usr/share/tabset
 ..
 
-# ./usr/share/tmac
-tmac
-
-# ./usr/share/tmac/mdoc
-mdoc
-# ./usr/share/tmac/mdoc
-..
-
-# ./usr/share/tmac/mm
-mm
-# ./usr/share/tmac/mm
-..
-
-# ./usr/share/tmac
-..
-
 # ./usr/share/vi
 vi
 
diff --git a/src/etc/mtree/4.4BSD.usr b/src/etc/mtree/4.4BSD.usr
index a63a82db..b1fc6f3f 100644
--- a/src/etc/mtree/4.4BSD.usr
+++ b/src/etc/mtree/4.4BSD.usr
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.usr,v 1.24 2010/10/18 04:17:11 deraadt Exp $
+#	$OpenBSD: 4.4BSD.usr,v 1.25 2010/10/18 17:11:29 deraadt Exp $
 #	$NetBSD: 4.4BSD.usr,v 1.3 1996/05/12 23:30:37 thorpej Exp $
 #
 #	   user: bostic
@@ -710,84 +710,6 @@ quiz.db         type=dir uname=root gname=wheel mode=0755
 # ./share/games
 ..
 
-
-# ./share/groff_font
-/set type=file gname=wheel uname=root mode=0755
-groff_font      type=dir
-
-# ./share/groff_font/devX100
-/set type=file gname=wheel uname=root mode=0644
-devX100         type=dir mode=0755
-# ./share/groff_font/devX100
-..
-
-
-# ./share/groff_font/devX100-12
-/set type=file gname=wheel uname=root mode=0644
-devX100-12      type=dir mode=0755
-# ./share/groff_font/devX100-12
-..
-
-
-# ./share/groff_font/devX75
-/set type=file gname=wheel uname=root mode=0644
-devX75          type=dir mode=0755
-# ./share/groff_font/devX75
-..
-
-
-# ./share/groff_font/devX75-12
-/set type=file gname=wheel uname=root mode=0644
-devX75-12       type=dir mode=0755
-# ./share/groff_font/devX75-12
-..
-
-
-# ./share/groff_font/devascii
-/set type=file gname=wheel uname=root mode=0644
-devascii        type=dir mode=0755
-# ./share/groff_font/devascii
-..
-
-
-# ./share/groff_font/devdvi
-/set type=file gname=wheel uname=root mode=0644
-devdvi          type=dir mode=0755
-
-# ./share/groff_font/devdvi/generate
-/set type=file gname=wheel uname=root mode=0644
-generate        type=dir mode=0755
-# ./share/groff_font/devdvi/generate
-..
-
-# ./share/groff_font/devdvi
-..
-
-
-# ./share/groff_font/devlatin1
-/set type=file gname=wheel uname=root mode=0644
-devlatin1       type=dir mode=0755
-# ./share/groff_font/devlatin1
-..
-
-
-# ./share/groff_font/devps
-/set type=file gname=wheel uname=root mode=0644
-devps           type=dir mode=0755
-
-# ./share/groff_font/devps/generate
-/set type=file gname=wheel uname=root mode=0644
-generate        type=dir mode=0755
-# ./share/groff_font/devps/generate
-..
-
-# ./share/groff_font/devps
-..
-
-# ./share/groff_font
-..
-
-
 # ./share/locale
 locale          type=dir mode=0755
 # ./share/locale
@@ -1026,26 +948,6 @@ tabset          type=dir uname=root gname=wheel mode=0755
 ..
 
 
-# ./share/tmac
-/set type=file gname=wheel uname=root mode=0644
-tmac            type=dir mode=0755
-
-# ./share/tmac/mdoc
-/set type=file gname=wheel uname=root mode=0644
-mdoc            type=dir mode=0755
-# ./share/tmac/mdoc
-..
-
-# ./share/tmac/mm
-/set type=file gname=wheel uname=root mode=0644
-mm              type=dir mode=0755
-# ./share/tmac/mm
-..
-
-# ./share/tmac
-..
-
-
 # ./share/zoneinfo
 /set type=file gname=bin uname=root mode=0444
 zoneinfo        type=dir mode=0555