Index: head/gnu/usr.bin/gdb/gdb/Makefile
===================================================================
--- head/gnu/usr.bin/gdb/gdb/Makefile	(revision 131130)
+++ head/gnu/usr.bin/gdb/gdb/Makefile	(revision 131131)
@@ -1,17 +1,17 @@
 # $FreeBSD$
 
 PROG=	gdb
 SRCS=	gdb.c
 
-BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a	\
+BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \
 	${OBJ_BU}/libiberty/libiberty.a
 GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 
-# libthread_db.so calls back into gdb for the proc services. Make all the
+# libthread_db.so calls back into gdb for the proc services.  Make all the
 # global symbols visible.
 LDFLAGS+= -Wl,-E
 
-DPADD+= ${GDBLIBS} ${BULIBS} ${LIBREADLINE} ${LIBM}
-LDADD+= ${GDBLIBS} ${BULIBS} -lreadline -lm
+DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP}
+LDADD=	${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap
 
 .include <bsd.prog.mk>
Index: head/gnu/usr.bin/gdb/gdbtui/Makefile
===================================================================
--- head/gnu/usr.bin/gdb/gdbtui/Makefile	(revision 131130)
+++ head/gnu/usr.bin/gdb/gdbtui/Makefile	(revision 131131)
@@ -1,18 +1,18 @@
 # $FreeBSD$
 
 PROG=	gdbtui
-NOMAN=	yes
 SRCS=	tui-main.c
+NOMAN=	noman
 
-BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a	\
+BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \
 	${OBJ_BU}/libiberty/libiberty.a
 GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
 
-# libthread_db.so calls back into gdb for the proc services. Make all the
+# libthread_db.so calls back into gdb for the proc services.  Make all the
 # global symbols visible.
 LDFLAGS+= -Wl,-E
 
-DPADD+= ${GDBLIBS} ${BULIBS} ${LIBREADLINE} ${LIBM}
-LDADD+= ${GDBLIBS} ${BULIBS} -lreadline -lm
+DPADD=	${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP}
+LDADD=	${GDBLIBS} ${BULIBS} -lm -lreadline -ltermcap
 
 .include <bsd.prog.mk>