diff options
| author | uqs <uqs@FreeBSD.org> | 2011-02-22 08:13:49 +0000 |
|---|---|---|
| committer | uqs <uqs@FreeBSD.org> | 2011-02-22 08:13:49 +0000 |
| commit | 433f0177d0a0855e8bd7df40e3070caa53112863 (patch) | |
| tree | bc4366064e389b18b74f217f17bd3ee50484e806 /etc | |
| parent | 39bd167d328aba193d4774d21ec95b107419b186 (diff) | |
| download | FreeBSD-src-433f0177d0a0855e8bd7df40e3070caa53112863.zip FreeBSD-src-433f0177d0a0855e8bd7df40e3070caa53112863.tar.gz | |
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)
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 3 | ||||
| -rw-r--r-- | etc/mtree/BSD.groff.dist | 48 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 38 | ||||
| -rw-r--r-- | etc/mtree/Makefile | 3 |
4 files changed, 54 insertions, 38 deletions
diff --git a/etc/Makefile b/etc/Makefile index 83bc50a..e7fa2d5 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -271,6 +271,9 @@ distrib-dirs: mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BIND.chroot.dist \ -p ${DESTDIR}/var/named .endif +.if ${MK_GROFF} != "no" + mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.groff.dist -p ${DESTDIR}/usr +.endif .if ${MK_SENDMAIL} != "no" mtree -deU ${MTREE_FOLLOWS_SYMLINKS} -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/ .endif 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 |
