From 0b61a106b202e12da6f8af047a75908a3a8d902a Mon Sep 17 00:00:00 2001
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Mon, 25 Mar 2002 13:20:03 +0000
Subject: [PATCH] Upgrade to GNU texinfo 4.1.

---
 gnu/usr.bin/texinfo/Makefile          |  2 +-
 gnu/usr.bin/texinfo/infokey/Makefile  | 12 ++++++++++++
 gnu/usr.bin/texinfo/makeinfo/Makefile |  5 +++--
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 gnu/usr.bin/texinfo/infokey/Makefile

diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile
index a8d2bd1ef3d..dc0d9e420a2 100644
--- a/gnu/usr.bin/texinfo/Makefile
+++ b/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>
diff --git a/gnu/usr.bin/texinfo/infokey/Makefile b/gnu/usr.bin/texinfo/infokey/Makefile
new file mode 100644
index 00000000000..4f06ef23b3f
--- /dev/null
+++ b/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
diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile
index c758d5800ac..ecd5e5990ce 100644
--- a/gnu/usr.bin/texinfo/makeinfo/Makefile
+++ b/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}