Merge sync of head

14 files changed, 20 insertions, 37 deletions

diff --git a/gnu/usr.bin/groff/src/Makefile b/gnu/usr.bin/groff/src/Makefile
index 7d2ca90..291b27c 100644
--- a/gnu/usr.bin/groff/src/Makefile
+++ b/gnu/usr.bin/groff/src/Makefile
@@ -2,4 +2,10 @@
 
 SUBDIR=		libs devices preproc roff utils
 
+SUBDIR_PARALLEL=
+
+.for subdir in ${SUBDIR:Nlibs}
+SUBDIR_DEPEND_${subdir}=	libs
+.endfor
+
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/devices/Makefile b/gnu/usr.bin/groff/src/devices/Makefile
index 8af4ff8..53dc4ed 100644
--- a/gnu/usr.bin/groff/src/devices/Makefile
+++ b/gnu/usr.bin/groff/src/devices/Makefile
@@ -2,4 +2,6 @@
 
 SUBDIR=		grodvi grohtml grolbp grolj4 grops grotty
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/libs/Makefile b/gnu/usr.bin/groff/src/libs/Makefile
index 1461cda..3738314 100644
--- a/gnu/usr.bin/groff/src/libs/Makefile
+++ b/gnu/usr.bin/groff/src/libs/Makefile
@@ -2,4 +2,6 @@
 
 SUBDIR=		libgroff libdriver libbib
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/Makefile b/gnu/usr.bin/groff/src/preproc/Makefile
index 70af839..38942fb 100644
--- a/gnu/usr.bin/groff/src/preproc/Makefile
+++ b/gnu/usr.bin/groff/src/preproc/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
-SUBDIR=		eqn grn html pic refer soelim tbl
+SUBDIR=		eqn grn html pic refer tbl
+
+SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend b/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
index 2991404..89c4028 100644
--- a/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/eqn/Makefile.depend
@@ -15,6 +15,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
+	usr.bin/yacc.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend b/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
index 436466d..bb28db8 100644
--- a/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/pic/Makefile.depend
@@ -15,6 +15,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
+	usr.bin/yacc.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend b/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
index 0eb0288..880c2e9 100644
--- a/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
+++ b/gnu/usr.bin/groff/src/preproc/refer/Makefile.depend
@@ -16,6 +16,7 @@ DIRDEPS = \
 	lib/libcompiler_rt \
 	lib/libcxxrt \
 	lib/msun \
+	usr.bin/yacc.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile b/gnu/usr.bin/groff/src/preproc/soelim/Makefile
deleted file mode 100644
index 2c68b80..0000000
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-PROG_CXX=	soelim
-SRCS=		soelim.cpp
-DPADD=		${LIBGROFF}
-LDADD=		${LIBGROFF}
-CLEANFILES=	${MAN}
-
-.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend b/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend
deleted file mode 100644
index 0c56806..0000000
--- a/gnu/usr.bin/groff/src/preproc/soelim/Makefile.depend
+++ /dev/null
@@ -1,24 +0,0 @@
-# Autogenerated - do NOT edit!
-
-DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-
-DIRDEPS = \
-	bin/cat.host \
-	gnu/lib/csu \
-	gnu/lib/libgcc \
-	gnu/usr.bin/groff/src/libs/libgroff \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libc++ \
-	lib/libcompiler_rt \
-	lib/libcxxrt \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/gnu/usr.bin/groff/src/roff/Makefile b/gnu/usr.bin/groff/src/roff/Makefile
index 543a990..6f23c42 100644
--- a/gnu/usr.bin/groff/src/roff/Makefile
+++ b/gnu/usr.bin/groff/src/roff/Makefile
@@ -2,4 +2,6 @@
 
 SUBDIR=		groff grog nroff psroff troff
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/roff/grog/Makefile.depend b/gnu/usr.bin/groff/src/roff/grog/Makefile.depend
index 18f420a..57b7e10 100644
--- a/gnu/usr.bin/groff/src/roff/grog/Makefile.depend
+++ b/gnu/usr.bin/groff/src/roff/grog/Makefile.depend
@@ -3,7 +3,6 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
-	bin/cat.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/groff/src/roff/nroff/Makefile.depend b/gnu/usr.bin/groff/src/roff/nroff/Makefile.depend
index 18f420a..57b7e10 100644
--- a/gnu/usr.bin/groff/src/roff/nroff/Makefile.depend
+++ b/gnu/usr.bin/groff/src/roff/nroff/Makefile.depend
@@ -3,7 +3,6 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
-	bin/cat.host \
 
 
 .include <dirdeps.mk>
diff --git a/gnu/usr.bin/groff/src/utils/Makefile b/gnu/usr.bin/groff/src/utils/Makefile
index 14953b9..045030c 100644
--- a/gnu/usr.bin/groff/src/utils/Makefile
+++ b/gnu/usr.bin/groff/src/utils/Makefile
@@ -2,4 +2,6 @@
 
 SUBDIR=		addftinfo afmtodit hpftodit indxbib lkbib lookbib pfbtops tfmtodit
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/groff/src/utils/afmtodit/Makefile.depend b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile.depend
index 18f420a..57b7e10 100644
--- a/gnu/usr.bin/groff/src/utils/afmtodit/Makefile.depend
+++ b/gnu/usr.bin/groff/src/utils/afmtodit/Makefile.depend
@@ -3,7 +3,6 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
-	bin/cat.host \
 
 
 .include <dirdeps.mk>