Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/gpl2/texinfo Apply our patches and add build glue.
details: https://anonhg.NetBSD.org/src/rev/dedae1c6b8b0
branches: trunk
changeset: 342908:dedae1c6b8b0
user: christos <christos%NetBSD.org@localhost>
date: Thu Jan 14 00:34:52 2016 +0000
description:
Apply our patches and add build glue.
diffstat:
external/gpl2/texinfo/Makefile | 42 ++
external/gpl2/texinfo/Makefile.inc | 16 +
external/gpl2/texinfo/bin/Makefile | 7 +
external/gpl2/texinfo/bin/Makefile.inc | 3 +
external/gpl2/texinfo/bin/info/Makefile | 20 +
external/gpl2/texinfo/bin/infokey/Makefile | 11 +
external/gpl2/texinfo/bin/install-info/Makefile | 15 +
external/gpl2/texinfo/bin/makeinfo/Makefile | 19 +
external/gpl2/texinfo/bin/texi2dvi/Makefile | 11 +
external/gpl2/texinfo/bin/texindex/Makefile | 9 +
external/gpl2/texinfo/dist/Makefile.in | 2 +-
external/gpl2/texinfo/dist/config.guess | 5 +-
external/gpl2/texinfo/dist/configure | 24 +
external/gpl2/texinfo/dist/doc/makeinfo.1 | 5 +-
external/gpl2/texinfo/dist/doc/texindex.1 | 8 +-
external/gpl2/texinfo/dist/doc/texinfo.txi | 2 +-
external/gpl2/texinfo/dist/info/echo-area.c | 4 +-
external/gpl2/texinfo/dist/info/info.c | 4 +-
external/gpl2/texinfo/dist/info/infokey.c | 6 +-
external/gpl2/texinfo/dist/info/nodes.c | 2 +-
external/gpl2/texinfo/dist/info/session.c | 12 +-
external/gpl2/texinfo/dist/info/terminal.c | 3 +-
external/gpl2/texinfo/dist/intl/Makefile.in | 2 +-
external/gpl2/texinfo/dist/lib/getopt.c | 2 +-
external/gpl2/texinfo/dist/lib/system.h | 6 +-
external/gpl2/texinfo/dist/makeinfo/cmds.c | 2 +-
external/gpl2/texinfo/dist/makeinfo/files.c | 5 +-
external/gpl2/texinfo/dist/makeinfo/files.h | 2 +-
external/gpl2/texinfo/dist/makeinfo/makeinfo.c | 7 +-
external/gpl2/texinfo/dist/makeinfo/makeinfo.h | 6 +-
external/gpl2/texinfo/dist/makeinfo/node.c | 2 +-
external/gpl2/texinfo/dist/makeinfo/sectioning.c | 9 +-
external/gpl2/texinfo/dist/makeinfo/xml.c | 4 +-
external/gpl2/texinfo/dist/po/Makefile.in.in | 2 +-
external/gpl2/texinfo/dist/util/install-info.c | 2 +-
external/gpl2/texinfo/dist/util/texi2dvi | 15 +-
external/gpl2/texinfo/dist/util/texindex.c | 472 +----------------------
external/gpl2/texinfo/include/config.h | 423 ++++++++++++++++++++
external/gpl2/texinfo/lib/Makefile | 37 +
external/gpl2/texinfo/makedoc/Makefile | 14 +
external/gpl2/texinfo/texinfo2netbsd | 80 +++
41 files changed, 817 insertions(+), 505 deletions(-)
diffs (truncated from 1868 to 300 lines):
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/texinfo/Makefile Thu Jan 14 00:34:52 2016 +0000
@@ -0,0 +1,42 @@
+# $NetBSD: Makefile,v 1.1 2016/01/14 00:34:52 christos Exp $
+
+.include <bsd.init.mk>
+.include "Makefile.inc"
+
+SUBDIR= makedoc .WAIT lib .WAIT bin
+
+.if ${MKSHARE} != "no"
+FILESDIR= /usr/share/misc
+FILES= epsf.tex texinfo.cat texinfo.dtd texinfo.tex texinfo.xsl
+VERSION!= ${TOOL_SED} -n "s/^\#define VERSION \"\(.*\)\"/\1/p" \
+ ${.CURDIR}/include/config.h
+
+texinfo.cat: texinfo-cat.in
+ ${TOOL_SED} 's/__VERSION__/${VERSION}/g' ${.ALLSRC} >${.TARGET}
+
+realall: texinfo.cat
+
+CLEANFILES+= texinfo.cat
+.endif
+
+.if ${MKNLS} != "no"
+.for F in cs.gmo da.gmo de.gmo de_AT.gmo eo.gmo fr.gmo he.gmo hr.gmo ja.gmo \
+ nb.gmo nl.gmo no.gmo pl.gmo ro.gmo ru.gmo sv.gmo tr.gmo zh_CN.gmo zh_TW.gmo
+FILES+= ${F}
+FILESDIR_${F}= /usr/share/locale/${F:.gmo=}/LC_MESSAGES
+FILESNAME_${F}= texinfo.mo
+.endfor
+# XXX: Do we want to install the following files too?
+#FILES+= txi-cs.tex txi-de.tex txi-en.tex txi-es.tex txi-fr.tex \
+# txi-it.tex txi-nl.tex txi-no.tex txi-pt.tex txi-tr.tex
+.endif
+
+MAN= info.5 texinfo.5
+
+TEXINFO= info-stnd.texi info.texi texinfo.txi
+
+.PATH: ${IDIST} ${IDIST}/doc ${IDIST}/po ${IDIST}/util
+
+.include <bsd.info.mk>
+.include <bsd.prog.mk>
+.include <bsd.subdir.mk>
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/texinfo/Makefile.inc Thu Jan 14 00:34:52 2016 +0000
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile.inc,v 1.1 2016/01/14 00:34:52 christos Exp $
+
+DIST= ${NETBSDSRCDIR}/external/gpl2/texinfo
+IDIST= ${DIST}/dist
+
+CPPFLAGS+= -I${DIST}/include -I${IDIST}/lib \
+ -DLOCALEDIR=\"/usr/share/locale\" -DHAVE_CONFIG_H
+
+CWARNFLAGS.clang+= -Wno-format-security
+
+.if !defined(MAKEDOC)
+PROGDPLIBS+= common ${DIST}/lib
+
+DPADD+= ${LIBINTL}
+LDADD+= -lintl
+.endif
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/bin/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/texinfo/bin/Makefile Thu Jan 14 00:34:52 2016 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile,v 1.1 2016/01/14 00:34:52 christos Exp $
+
+.include <bsd.init.mk>
+
+SUBDIR= info infokey install-info makeinfo texi2dvi texindex
+
+.include <bsd.subdir.mk>
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/bin/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/texinfo/bin/Makefile.inc Thu Jan 14 00:34:52 2016 +0000
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2016/01/14 00:34:52 christos Exp $
+
+.include "${.PARSEDIR}/../Makefile.inc"
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/bin/info/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/texinfo/bin/info/Makefile Thu Jan 14 00:34:52 2016 +0000
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile,v 1.1 2016/01/14 00:34:52 christos Exp $
+
+.include <bsd.init.mk>
+
+PROG= info
+SRCS= dir.c display.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
+
+COMMONDIR!=cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
+
+CPPFLAGS+= -I${IDIST}/info -I${COMMONDIR} \
+ -DDEFAULT_INFOPATH=\"/usr/pkg/info:/usr/X11R6/info:/usr/X11/info:/usr/local/info:/usr/share/info:/usr/info\"
+LDADD+= -lterminfo
+DPADD+= ${LIBTERMINFO}
+
+.include <bsd.prog.mk>
+
+.PATH: ${IDIST}/info ${IDIST}/doc
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/bin/infokey/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/texinfo/bin/infokey/Makefile Thu Jan 14 00:34:52 2016 +0000
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2016/01/14 00:34:52 christos Exp $
+
+.include <bsd.init.mk>
+
+PROG= infokey
+
+CPPFLAGS+= -I${IDIST}/info
+
+.include <bsd.prog.mk>
+
+.PATH: ${IDIST}/info ${IDIST}/doc
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/bin/install-info/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/texinfo/bin/install-info/Makefile Thu Jan 14 00:34:52 2016 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2016/01/14 00:34:52 christos Exp $
+
+.include <bsd.init.mk>
+
+PROG= install-info
+
+.include <bsd.prog.mk>
+
+.PATH: ${IDIST}/util ${IDIST}/doc
+
+infodir-meta:
+.if (${MKUNPRIVED} != "no" && ${MKINFO} != "no")
+ echo "./usr/share/info/dir type=file mode=0644 uname=${BINOWN} gname=${BINGRP}" \
+ | ${METALOG.add}
+.endif
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/bin/makeinfo/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/texinfo/bin/makeinfo/Makefile Thu Jan 14 00:34:52 2016 +0000
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2016/01/14 00:34:52 christos Exp $
+
+.include <bsd.init.mk>
+
+PROG= makeinfo
+SRCS= cmds.c defun.c files.c float.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 xref.c
+
+CPPFLAGS+= -I${IDIST}/makeinfo
+
+WARNS?= 0 # pointer sign issues
+
+.include <bsd.prog.mk>
+
+CPPFLAGS:= ${CPPFLAGS:S/-D_FORTIFY_SOURCE=2//}
+
+.PATH: ${IDIST}/makeinfo ${IDIST}/doc
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/bin/texi2dvi/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/texinfo/bin/texi2dvi/Makefile Thu Jan 14 00:34:52 2016 +0000
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2016/01/14 00:34:52 christos Exp $
+
+.include <bsd.init.mk>
+
+FILES= texi2dvi
+FILESMODE= ${BINMODE}
+MAN= texi2dvi.1
+
+.include <bsd.prog.mk>
+
+.PATH: ${IDIST}/util ${IDIST}/doc
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/bin/texindex/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/gpl2/texinfo/bin/texindex/Makefile Thu Jan 14 00:34:52 2016 +0000
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2016/01/14 00:34:52 christos Exp $
+
+.include <bsd.init.mk>
+
+PROG= texindex
+
+.include <bsd.prog.mk>
+
+.PATH: ${IDIST}/util ${IDIST}/doc
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/dist/Makefile.in
--- a/external/gpl2/texinfo/dist/Makefile.in Thu Jan 14 00:11:27 2016 +0000
+++ b/external/gpl2/texinfo/dist/Makefile.in Thu Jan 14 00:34:52 2016 +0000
@@ -230,7 +230,7 @@
# This is to prevent texinfo.tex from being included in the top-level
# distribution directory.
TEXINFO_TEX = doc/texinfo.tex
-@TOOLS_ONLY_FALSE@SUBDIRS = $(native_tools) intl m4 lib info makeinfo po util doc
+@TOOLS_ONLY_FALSE@SUBDIRS = $(native_tools) intl m4 lib makeinfo po util doc
@TOOLS_ONLY_TRUE@SUBDIRS = lib info makeinfo util
# for gettext.
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/dist/config.guess
--- a/external/gpl2/texinfo/dist/config.guess Thu Jan 14 00:11:27 2016 +0000
+++ b/external/gpl2/texinfo/dist/config.guess Thu Jan 14 00:34:52 2016 +0000
@@ -780,7 +780,7 @@
*:FreeBSD:*:*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
- i*:CYGWIN*:*)
+ i*:CYGWIN*:* | x86*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit 0 ;;
i*:MINGW*:*)
@@ -923,6 +923,9 @@
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
+ tile*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit 0 ;;
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/dist/configure
--- a/external/gpl2/texinfo/dist/configure Thu Jan 14 00:11:27 2016 +0000
+++ b/external/gpl2/texinfo/dist/configure Thu Jan 14 00:34:52 2016 +0000
@@ -1771,6 +1771,30 @@
+echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
+ # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+ enableval="$enable_maintainer_mode"
+ USE_MAINTAINER_MODE=$enableval
+else
+ USE_MAINTAINER_MODE=no
+fi;
+ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+else
+ MAINTAINER_MODE_TRUE='#'
+ MAINTAINER_MODE_FALSE=
+fi
+
+ MAINT=$MAINTAINER_MODE_TRUE
+
+
# When the Texinfo source is imported into other repositories
# (NetBSD and TeX Live), timestamps are generally not preserved. This
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/dist/doc/makeinfo.1
--- a/external/gpl2/texinfo/dist/doc/makeinfo.1 Thu Jan 14 00:11:27 2016 +0000
+++ b/external/gpl2/texinfo/dist/doc/makeinfo.1 Thu Jan 14 00:34:52 2016 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: makeinfo.1,v 1.1.1.1 2016/01/14 00:11:30 christos Exp $
+.\" $NetBSD: makeinfo.1,v 1.2 2016/01/14 00:34:52 christos Exp $
.\"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
.TH MAKEINFO "1" "December 2004" "makeinfo 4.8" "User Commands"
@@ -64,6 +64,9 @@
suppress splitting of Info or HTML output,
generate only one output file.
.TP
+\fB\-\-no\-version\-header\fR
+suppress header with makeinfo version and source path.
+.TP
\fB\-\-number\-sections\fR
output chapter and sectioning numbers.
.TP
diff -r fdef22ff3f9a -r dedae1c6b8b0 external/gpl2/texinfo/dist/doc/texindex.1
--- a/external/gpl2/texinfo/dist/doc/texindex.1 Thu Jan 14 00:11:27 2016 +0000
+++ b/external/gpl2/texinfo/dist/doc/texindex.1 Thu Jan 14 00:34:52 2016 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: texindex.1,v 1.1.1.1 2016/01/14 00:11:30 christos Exp $
+.\" $NetBSD: texindex.1,v 1.2 2016/01/14 00:34:52 christos Exp $
.\"
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.34.
.TH TEXINDEX "1" "December 2004" "texindex 4.8" "User Commands"
@@ -15,12 +15,6 @@
\fB\-h\fR, \fB\-\-help\fR
display this help and exit
.TP
-\fB\-k\fR, \fB\-\-keep\fR
-keep temporary files around after processing
-.TP
-\fB\-\-no\-keep\fR
-do not keep temporary files around after processing (default)
-.TP
\fB\-o\fR, \fB\-\-output\fR FILE
Home |
Main Index |
Thread Index |
Old Index