diff options
-rw-r--r-- | Makefile.inc1 | 3 | ||||
-rw-r--r-- | ObsoleteFiles.inc | 3 | ||||
-rw-r--r-- | gnu/usr.bin/groff/src/preproc/Makefile | 2 | ||||
-rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 2 | ||||
-rw-r--r-- | usr.bin/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/soelim/Makefile (renamed from usr.bin/soeliminate/Makefile) | 2 | ||||
-rw-r--r-- | usr.bin/soelim/soelim.1 (renamed from usr.bin/soeliminate/soeliminate.1) | 6 | ||||
-rw-r--r-- | usr.bin/soelim/soelim.c (renamed from usr.bin/soeliminate/soeliminate.c) | 2 |
8 files changed, 12 insertions, 10 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index f21d779228af..213e1c68c9ba 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1263,7 +1263,8 @@ _gperf= gnu/usr.bin/gperf .endif .if ${MK_GROFF} != "no" -_groff= gnu/usr.bin/groff +_groff= gnu/usr.bin/groff \ + usr.bin/soelim .endif .if ${MK_VT} != "no" diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 5a61f278809e..a8a9f9091e07 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20150501 +OLD_FILES+=usr/bin/soeliminate +OLD_FILES+=usr/share/man/man1/soeliminate.1.gz # 20150501: Remove the nvlist_.*[vf] functions manpages. OLD_FILES+=usr/share/man/man3/nvlist_addf_binary.3.gz OLD_FILES+=usr/share/man/man3/nvlist_addf_bool.3.gz diff --git a/gnu/usr.bin/groff/src/preproc/Makefile b/gnu/usr.bin/groff/src/preproc/Makefile index f208bf2389be..38942fba374e 100644 --- a/gnu/usr.bin/groff/src/preproc/Makefile +++ b/gnu/usr.bin/groff/src/preproc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SUBDIR= eqn grn html pic refer soelim tbl +SUBDIR= eqn grn html pic refer tbl SUBDIR_PARALLEL= diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index ab99fd95076a..a519580a7a67 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1839,7 +1839,6 @@ OLD_FILES+=usr/bin/post-grohtml OLD_FILES+=usr/bin/pre-grohtml OLD_FILES+=usr/bin/psroff OLD_FILES+=usr/bin/refer -OLD_FILES+=usr/bin/soelim OLD_FILES+=usr/bin/tbl OLD_FILES+=usr/bin/tfmtodit OLD_FILES+=usr/bin/troff @@ -2246,7 +2245,6 @@ OLD_FILES+=usr/share/man/man1/pfbtops.1.gz OLD_FILES+=usr/share/man/man1/pic.1.gz OLD_FILES+=usr/share/man/man1/psroff.1.gz OLD_FILES+=usr/share/man/man1/refer.1.gz -OLD_FILES+=usr/share/man/man1/soelim.1.gz OLD_FILES+=usr/share/man/man1/tbl.1.gz OLD_FILES+=usr/share/man/man1/tfmtodit.1.gz OLD_FILES+=usr/share/man/man1/troff.1.gz diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 8082a7fff468..a0c83bb044b5 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -151,7 +151,7 @@ SUBDIR= ${_addr2line} \ showmount \ ${_size} \ sockstat \ - soeliminate \ + soelim \ sort \ split \ stat \ diff --git a/usr.bin/soeliminate/Makefile b/usr.bin/soelim/Makefile index 17d4525988cf..463d67743126 100644 --- a/usr.bin/soeliminate/Makefile +++ b/usr.bin/soelim/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -PROG= soeliminate +PROG= soelim .include <bsd.prog.mk> diff --git a/usr.bin/soeliminate/soeliminate.1 b/usr.bin/soelim/soelim.1 index eeb5657b02be..af6e7f7020bc 100644 --- a/usr.bin/soeliminate/soeliminate.1 +++ b/usr.bin/soelim/soelim.1 @@ -24,11 +24,11 @@ .\" .\" $FreeBSD$ .\" -.Dd November 22, 2014 -.Dt SOELIMINATE 1 +.Dd May 1, 2015 +.Dt SOELIM 1 .Os .Sh NAME -.Nm soeliminate +.Nm soelim .Nd interpret .so directive in manpages .Sh SYNOPSIS .Nm diff --git a/usr.bin/soeliminate/soeliminate.c b/usr.bin/soelim/soelim.c index 80b337ff57d3..78364c2f8b66 100644 --- a/usr.bin/soeliminate/soeliminate.c +++ b/usr.bin/soelim/soelim.c @@ -45,7 +45,7 @@ static void usage(void) { - fprintf(stderr, "usage: soeliminate [-Crtv] [-I dir] [files]\n"); + fprintf(stderr, "usage: soelim [-Crtv] [-I dir] [files]\n"); exit(EXIT_FAILURE); } |