Upgrade to GNU texinfo 4.0

10 files changed, 24 insertions, 128 deletions

diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile
index dac6f56..a8d2bd1 100644
--- a/gnu/usr.bin/texinfo/Makefile
+++ b/gnu/usr.bin/texinfo/Makefile
@@ -2,6 +2,6 @@
 # $FreeBSD$
 #
 
-SUBDIR= libtxi libintl makeinfo info install-info texindex doc
+SUBDIR= libtxi makeinfo info install-info texindex doc
 
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/texinfo/Makefile.inc b/gnu/usr.bin/texinfo/Makefile.inc
index d071bf0..f13fa38 100644
--- a/gnu/usr.bin/texinfo/Makefile.inc
+++ b/gnu/usr.bin/texinfo/Makefile.inc
@@ -2,16 +2,13 @@
 
 TXIDIR=		${.CURDIR}/../../../../contrib/texinfo
 
-.if exists(${.OBJDIR}/../libintl)
-LIBINTL=	${.OBJDIR}/../libintl/libintl.a
-.else
-LIBINTL=	${.CURDIR}/../libintl/libintl.a
-.endif
-
 .if exists(${.OBJDIR}/../libtxi)
 LIBTXI=		${.OBJDIR}/../libtxi/libtxi.a
 .else
 LIBTXI=		${.CURDIR}/../libtxi/libtxi.a
 .endif
 
+CFLAGS+=	-DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\" \
+		-I${TXIDIR} -I${TXIDIR}/lib
+
 .include "../Makefile.inc"
diff --git a/gnu/usr.bin/texinfo/doc/Makefile b/gnu/usr.bin/texinfo/doc/Makefile
index 2dfb17f..2a0b1a3 100644
--- a/gnu/usr.bin/texinfo/doc/Makefile
+++ b/gnu/usr.bin/texinfo/doc/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 INFO=	info info-stnd texinfo
+SRCDIR=	${TXIDIR}/doc
 
 CLEANFILES=	texinfo.texi
 
@@ -8,5 +9,3 @@ texinfo.texi: texinfo.txi
 	ln -fs ${.ALLSRC} ${.TARGET}
 
 .include <bsd.info.mk>
-
-.PATH: ${TXIDIR}/doc
diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile
index f8c0de7..247a0b9 100644
--- a/gnu/usr.bin/texinfo/info/Makefile
+++ b/gnu/usr.bin/texinfo/info/Makefile
@@ -1,24 +1,19 @@
 # $FreeBSD$
 
 PROG=	info
-NOMAN=  yes
+MAN1=	info.1
+MAN5=	info.5 texinfo.5
 
-SRCS=	dir.c display.c display.h doc.c doc.h dribble.c dribble.h
-SRCS+=	echo-area.c echo-area.h filesys.c filesys.h footnotes.c
-SRCS+=	footnotes.h funs.h gc.c gc.h indices.c indices.h
-SRCS+=	info-utils.c info-utils.h info.c info.h infodoc.c
-SRCS+=	infomap.c infomap.h m-x.c man.c man.h nodemenu.c nodes.c
-SRCS+=	nodes.h search.c search.h session.c session.h signals.c
-SRCS+=	signals.h termdep.h terminal.c terminal.h tilde.c tilde.h
-SRCS+=	variables.c variables.h window.c window.h
+SRCS=	dir.c display.c doc.c dribble.c echo-area.c filesys.c \
+	footnotes.c gc.c indices.c info-utils.c info.c infodoc.c \
+	infomap.c m-x.c man.c nodemenu.c nodes.c search.c session.c \
+	signals.c terminal.c tilde.c variables.c window.c
 
 CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\"
-CFLAGS+= -DLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H
-CFLAGS+= -I${TXIDIR} -I${TXIDIR}/lib -I../libintl
 
-DPADD=	${LIBTERMCAP} ${LIBTXI} ${LIBINTL}
-LDADD=	-ltermcap ${LIBTXI} ${LIBINTL}
+DPADD=	${LIBTERMCAP} ${LIBTXI}
+LDADD=	-ltermcap ${LIBTXI}
 
 .include <bsd.prog.mk>
 
-.PATH: ${TXIDIR}/info
+.PATH:	${TXIDIR}/info ${TXIDIR}/doc
diff --git a/gnu/usr.bin/texinfo/install-info/Makefile b/gnu/usr.bin/texinfo/install-info/Makefile
index d1f62c6..325c909 100644
--- a/gnu/usr.bin/texinfo/install-info/Makefile
+++ b/gnu/usr.bin/texinfo/install-info/Makefile
@@ -2,12 +2,9 @@
 
 PROG=	install-info
 
-CFLAGS+= -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\"
-CFLAGS+= -I${TXIDIR} -I${TXIDIR}/lib -I../libintl
-
-DPADD=	${LIBTXI} ${LIBINTL} -lz
-LDADD=	${LIBTXI} ${LIBINTL} -lz
+DPADD=	${LIBTXI}
+LDADD=	${LIBTXI}
 
 .include <bsd.prog.mk>
 
-.PATH: ${TXIDIR}/util
+.PATH:	${TXIDIR}/util ${TXIDIR}/doc
diff --git a/gnu/usr.bin/texinfo/install-info/install-info.1 b/gnu/usr.bin/texinfo/install-info/install-info.1
deleted file mode 100644
index 2199b66..0000000
--- a/gnu/usr.bin/texinfo/install-info/install-info.1
+++ /dev/null
@@ -1,60 +0,0 @@
-.\"
-.\" Copyright (c) 1997 David E. O'Brien (obrien@FreeBSD.org)
-.\"
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD$
-.\"
-.\" .TH install-info 1
-.Dd August 29, 1997
-.Dt INSTALL-INFO 1
-.Os BSD
-.Sh NAME
-.Nm install-info
-.Nd edits info/dir file for the GNU info hypertext system
-.Sh SYNOPSIS
-.Nm install-info
-.Ar program.info info/dir
-.Sh DESCRIPTION
-.Nm
-is often used within the
-.Fx
-ports collection.
-.Sh FILES
-.Bl -tag -width "/usr/share/info/dir" -compact
-.It Pa "/usr/share/info/dir"
-.It Pa "/usr/local/info/dir"
-.El
-.I F
-.Sh SEE ALSO
-.Xr info 1
-.\" .Sh DIAGNOSTICS
-.\" none.
-.\" .Sh BUGS
-.\" none known.
-.Sh AUTHORS
-This man page has been written by
-.An David O'Brien Aq obrien@NUXI.com
-.\" .Sh HISTORY
-.\" .Nm 
-.\" appeared in FreeBSD 2.1.
diff --git a/gnu/usr.bin/texinfo/libintl/Makefile b/gnu/usr.bin/texinfo/libintl/Makefile
deleted file mode 100644
index a034738..0000000
--- a/gnu/usr.bin/texinfo/libintl/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# $FreeBSD$
-
-LIB=	intl
-INTERNALLIB= true
-INTERNALSTATICLIB= true
-
-CFLAGS+= -DHAVE_CONFIG_H
-CFLAGS+= -DLOCALEDIR=\"/usr/share/locale\"
-CFLAGS+= -DGNULOCALEDIR=\"/usr/share/locale\"
-CFLAGS+= -DLOCALE_ALIAS_PATH=\"/usr/share/locale:.\"
-CFLAGS+= -I${TXIDIR} -I${TXIDIR}/lib -I${TXIDIR}/intl -I.
-
-SRCS=	bindtextdom.c dcgettext.c dgettext.c gettext.c
-SRCS+=	finddomain.c loadmsgcat.c localealias.c textdomain.c
-SRCS+=	l10nflist.c explodename.c intl-compat.c libintl.h
-
-CLEANFILES+= libintl.h
-
-libintl.h: libgettext.h
-	@ln -sf ${.OODATE} ${.TARGET}
-
-.include <bsd.lib.mk>
-
-.PATH: ${TXIDIR}/intl
diff --git a/gnu/usr.bin/texinfo/libtxi/Makefile b/gnu/usr.bin/texinfo/libtxi/Makefile
index 217b584..b7427aa 100644
--- a/gnu/usr.bin/texinfo/libtxi/Makefile
+++ b/gnu/usr.bin/texinfo/libtxi/Makefile
@@ -4,7 +4,7 @@ LIB=	txi
 INTERNALLIB= true
 INTERNALSTATICLIB= true
 
-SRCS=	getopt.c getopt1.c xmalloc.c xstrdup.c
+SRCS=	getopt.c getopt1.c substring.c xexit.c xmalloc.c xstrdup.c
 
 .include <bsd.lib.mk>
 
diff --git a/gnu/usr.bin/texinfo/makeinfo/Makefile b/gnu/usr.bin/texinfo/makeinfo/Makefile
index d8f420f..b291910 100644
--- a/gnu/usr.bin/texinfo/makeinfo/Makefile
+++ b/gnu/usr.bin/texinfo/makeinfo/Makefile
@@ -1,16 +1,12 @@
 # $FreeBSD$
 
 PROG=	makeinfo
-NOMAN=	yes
-SRCS=	makeinfo.c multi.c
-
-CFLAGS+= -DHAVE_CONFIG_H
-CFLAGS+= -DLOCALEDIR=\"/usr/share/locale\"
-CFLAGS+= -I${TXIDIR}/makeinfo -I${TXIDIR} -I${TXIDIR}/lib -I../libintl
+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 sectioning.h toc.c
 
 DPADD=	${LIBTXI} ${LIBINTL}
 LDADD=	${LIBTXI} ${LIBINTL}
 
 .include <bsd.prog.mk>
 
-.PATH: $(TXIDIR)/makeinfo
+.PATH:	$(TXIDIR)/makeinfo $(TXIDIR)/doc
diff --git a/gnu/usr.bin/texinfo/texindex/Makefile b/gnu/usr.bin/texinfo/texindex/Makefile
index 4f583e6..91c2dfc 100644
--- a/gnu/usr.bin/texinfo/texindex/Makefile
+++ b/gnu/usr.bin/texinfo/texindex/Makefile
@@ -1,14 +1,10 @@
 # $FreeBSD$
 
 PROG=	texindex
-NOMAN=	noman
 
-CFLAGS+= -DHAVE_CONFIG_H -DLOCALEDIR=\"/usr/share/locale\"
-CFLAGS+= -I${TXIDIR} -I${TXIDIR}/lib -I../libintl
-
-DPADD=	${LIBTXI} ${LIBINTL} -lz
-LDADD=	${LIBTXI} ${LIBINTL} -lz
+DPADD=	${LIBTXI}
+LDADD=	${LIBTXI}
 
 .include <bsd.prog.mk>
 
-.PATH: ${TXIDIR}/util
+.PATH:	${TXIDIR}/util ${TXIDIR}/doc