svn commit: r282318 - in head: . gnu/usr.bin/groff/src/preproc tools/build/mk usr.bin usr.bin/soelim usr.bin/soeliminate

[Baptiste Daroussin]

Author: bapt
Date: Fri May  1 20:08:25 2015
New Revision: 282318
URL: https://svnweb.freebsd.org/changeset/base/282318

Log:
  Replace groff's soelim by soeliminate(1) renamed soelim(1)

Added:
  head/usr.bin/soelim/
     - copied from r281993, head/usr.bin/soeliminate/
  head/usr.bin/soelim/soelim.1
     - copied, changed from r281993, head/usr.bin/soeliminate/soeliminate.1
  head/usr.bin/soelim/soelim.c
     - copied, changed from r281993, head/usr.bin/soeliminate/soeliminate.c
Deleted:
  head/usr.bin/soelim/soeliminate.1
  head/usr.bin/soelim/soeliminate.c
  head/usr.bin/soeliminate/
Modified:
  head/Makefile.inc1
  head/ObsoleteFiles.inc
  head/gnu/usr.bin/groff/src/preproc/Makefile
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/usr.bin/Makefile
  head/usr.bin/soelim/Makefile

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Fri May  1 19:14:32 2015	(r282317)
+++ head/Makefile.inc1	Fri May  1 20:08:25 2015	(r282318)
@@ -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"

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Fri May  1 19:14:32 2015	(r282317)
+++ head/ObsoleteFiles.inc	Fri May  1 20:08:25 2015	(r282318)
@@ -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

Modified: head/gnu/usr.bin/groff/src/preproc/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/preproc/Makefile	Fri May  1 19:14:32 2015	(r282317)
+++ head/gnu/usr.bin/groff/src/preproc/Makefile	Fri May  1 20:08:25 2015	(r282318)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR=		eqn grn html pic refer soelim tbl
+SUBDIR=		eqn grn html pic refer tbl
 
 SUBDIR_PARALLEL=
 

Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc	Fri May  1 19:14:32 2015	(r282317)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc	Fri May  1 20:08:25 2015	(r282318)
@@ -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.
 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

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Fri May  1 19:14:32 2015	(r282317)
+++ head/usr.bin/Makefile	Fri May  1 20:08:25 2015	(r282318)
@@ -151,7 +151,7 @@ SUBDIR=	${_addr2line} \
 	showmount \
 	${_size} \
 	sockstat \
-	soeliminate \
+	soelim \
 	sort \
 	split \
 	stat \

Modified: head/usr.bin/soelim/Makefile
==============================================================================
--- head/usr.bin/soeliminate/Makefile	Sun Apr 26 06:52:19 2015	(r281993)
+++ head/usr.bin/soelim/Makefile	Fri May  1 20:08:25 2015	(r282318)
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-PROG=	soeliminate
+PROG=	soelim
 
 .include <bsd.prog.mk>

Copied and modified: head/usr.bin/soelim/soelim.1 (from r281993, head/usr.bin/soeliminate/soeliminate.1)
==============================================================================
--- head/usr.bin/soeliminate/soeliminate.1	Sun Apr 26 06:52:19 2015	(r281993, copy source)
+++ head/usr.bin/soelim/soelim.1	Fri May  1 20:08:25 2015	(r282318)
@@ -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

Copied and modified: head/usr.bin/soelim/soelim.c (from r281993, head/usr.bin/soeliminate/soeliminate.c)
==============================================================================
--- head/usr.bin/soeliminate/soeliminate.c	Sun Apr 26 06:52:19 2015	(r281993, copy source)
+++ head/usr.bin/soelim/soelim.c	Fri May  1 20:08:25 2015	(r282318)
@@ -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);
 }