Upgrade to GNU texinfo 4.1.

gnu/usr.bin/texinfo/Makefile

@@ -2,6 +2,6 @@
 # $FreeBSD$
 #
 
-SUBDIR= libtxi makeinfo info install-info texindex doc
+SUBDIR= libtxi makeinfo info infokey install-info texindex doc
 
 .include <bsd.subdir.mk>

gnu/usr.bin/texinfo/infokey/Makefile

@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PROG=	infokey
+SRCS=	infokey.c key.c
+NOMAN=	noman
+
+DPADD=	${LIBTXI}
+LDADD=	${LIBTXI}
+
+.include <bsd.prog.mk>
+
+.PATH:	${TXIDIR}/info

gnu/usr.bin/texinfo/makeinfo/Makefile

@@ -1,8 +1,9 @@
 # $FreeBSD$
 
 PROG=	makeinfo
-SRCS=	cmds.c defun.c files.c footnote.c html.c index.c insertion.c lang.c \
-	macro.c makeinfo.c multi.c node.c sectioning.c toc.c
+SRCS=	cmds.c docbook.c defun.c files.c footnote.c html.c \
+	index.c insertion.c lang.c macro.c makeinfo.c multi.c \
+	node.c sectioning.c toc.c xml.c
 
 DPADD+=	${LIBTXI}
 LDADD+=	${LIBTXI}