Index: head/gnu/usr.bin/Makefile
===================================================================
--- head/gnu/usr.bin/Makefile
+++ head/gnu/usr.bin/Makefile
@@ -5,21 +5,17 @@
 
 .if ${MK_CXX} != "no"
 SUBDIR.${MK_GCC}+=	gperf
-SUBDIR.${MK_GROFF}+=	groff
 .endif
 
 SUBDIR.${MK_BINUTILS}+=	binutils
 SUBDIR.${MK_DIALOG}+=	dialog
-
-.if ${MK_BINUTILS} != "no"
-SUBDIR.${MK_GDB}+=	gdb
-SUBDIR_DEPEND_gdb=	binutils
-.endif
-
 SUBDIR.${MK_GCC}+=	cc
 SUBDIR.${MK_GNU_DIFF}+=	diff3
 SUBDIR.${MK_GNU_GREP}+=	grep
+SUBDIR.${MK_GDB}+=	gdb
+SUBDIR_DEPEND_gdb=	binutils
 SUBDIR.${MK_GPL_DTC}+=	dtc
+SUBDIR.${MK_GROFF}+=	groff
 SUBDIR.${MK_TESTS}+=	tests
 
 SUBDIR_PARALLEL=