summaryrefslogtreecommitdiffstats
path: root/usr.bin/Makefile
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2014-11-22 01:22:03 +0000
committerbapt <bapt@FreeBSD.org>2014-11-22 01:22:03 +0000
commit46ace2ba1695ac922032e5e7ffe97f01f418ad60 (patch)
tree44f6dad9e61a4ea1c604f531e5dac63444488213 /usr.bin/Makefile
parent64ef011694f10e052c30876edfa0c000ed0fe98a (diff)
downloadFreeBSD-src-46ace2ba1695ac922032e5e7ffe97f01f418ad60.zip
FreeBSD-src-46ace2ba1695ac922032e5e7ffe97f01f418ad60.tar.gz
Add a new soeliminate(1) command
mandoc(1) does not provide an equivalent of the GNU groff's soelim(1) as an external binary. It does provide the funcitonnality but internally. Lots if manpages in ports uses ".so" directives to include the content of another manpage, which works properly if the manpages are not compressed. With compressed manpages it will fail. So we need to preprocess those manpages with soelim(1) before compressing them. soeliminate(1) add the minimum functionnality from soelim(1) required for that task, in order to still be able to prepare properly those manpages in case we ship the base system only with mandoc as a manpage renderer. soeliminate(1) accept all the arguments from soelim(1) for compatibility but only '-I dir' is really functionnal. Name it soeliminate and not soelim, so groff from base or ports can still call soelim(1) for its internal use and avoid potential incompatibilities MFC after: 1 month
Diffstat (limited to 'usr.bin/Makefile')
-rw-r--r--usr.bin/Makefile21
1 files changed, 11 insertions, 10 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 865be93..37b672c 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -1,7 +1,7 @@
# From: @(#)Makefile 8.3 (Berkeley) 1/7/94
# $FreeBSD$
-.include <src.opts.mk>
+.include <bsd.own.mk>
# XXX MISSING: deroff diction graph learn plot
# spell spline struct xsend
@@ -149,6 +149,7 @@ SUBDIR= alias \
shar \
showmount \
sockstat \
+ soeliminate \
sort \
split \
stat \
@@ -164,7 +165,6 @@ SUBDIR= alias \
${_tests} \
tftp \
time \
- timeout \
tip \
top \
touch \
@@ -184,6 +184,7 @@ SUBDIR= alias \
unvis \
uudecode \
uuencode \
+ vi \
vis \
vmstat \
w \
@@ -233,10 +234,6 @@ SUBDIR+= calendar
_clang= clang
.endif
-.if ${MK_FMAKE} != "no"
-SUBDIR+= make
-.endif
-
.if ${MK_GPL_DTC} != "yes"
SUBDIR+= dtc
.endif
@@ -269,6 +266,10 @@ SUBDIR+= drill
SUBDIR+= host
.endif
+.if ${MK_LIBTHR} != "no"
+SUBDIR+= csup
+.endif
+
.if ${MK_LOCATE} != "no"
SUBDIR+= locate
.endif
@@ -282,7 +283,11 @@ SUBDIR+= msgs
.endif
.if ${MK_MAKE} != "no"
+.if ${MK_BMAKE} != "no"
SUBDIR+= bmake
+.else
+SUBDIR+= make
+.endif
.endif
.if ${MK_MAN_UTILS} != "no"
@@ -358,10 +363,6 @@ SUBDIR+= xstr
SUBDIR+= yacc
.endif
-.if ${MK_VI} != "no"
-SUBDIR+= vi
-.endif
-
.if ${MK_VT} != "no"
SUBDIR+= vtfontcvt
.endif
OpenPOWER on IntegriCloud