Commit ee59de03 authored by johans's avatar johans
Browse files

- Update to texinfo 6.0

  https://lists.gnu.org/archive/html/bug-texinfo/2015-06/msg00052.html
- Remove patch that is now included upstream
parent 4070e4e8
......@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= texinfo
PORTVERSION= 5.2.20150205
PORTVERSION= 6.0.20150626
CATEGORIES= print
MASTER_SITES= ftp://ftp.stack.nl/pub/users/johans/texinfo/${PORTVERSION:E}/ \
GNU
......
SHA256 (texinfo/5.2.20150205/texinfo-5.2.tar.xz) = 5471ef683a64588a7cfef46ef2bdd3fbcbca89d847e10832612293f105e44eda
SIZE (texinfo/5.2.20150205/texinfo-5.2.tar.xz) = 3812944
SHA256 (texinfo/5.2.20150205/htmlxref.cnf) = 8e31d6f20c2368c9e1b178d10200ced2f8015381284a98c0b9c1aa5bf9ddc189
SIZE (texinfo/5.2.20150205/htmlxref.cnf) = 20027
SHA256 (texinfo/5.2.20150205/texinfo.tex) = 386c922fb45c03686eb47acee064690629e81876c47860be1e5ae923958af174
SIZE (texinfo/5.2.20150205/texinfo.tex) = 334109
SHA256 (texinfo/5.2.20150205/texi2dvi) = 63f8d7bdd49fd8a30a90ddef8e768a467b48a6eed50179052d6246fd10a1c19d
SIZE (texinfo/5.2.20150205/texi2dvi) = 56384
SHA256 (texinfo/6.0.20150626/texinfo-6.0.tar.xz) = 11ba4358696e8be3b3c7cfc88b89cf69525791aeabf0ee0a59ca58ebbd3471e4
SIZE (texinfo/6.0.20150626/texinfo-6.0.tar.xz) = 4086712
SHA256 (texinfo/6.0.20150626/htmlxref.cnf) = 9f3ddb06df93d9b4ba457686caf78f4abb9488ab4076f73a5916ecb77f227819
SIZE (texinfo/6.0.20150626/htmlxref.cnf) = 20074
SHA256 (texinfo/6.0.20150626/texinfo.tex) = 0be5d6a271cefe15c2675ab24dd4143f7f5d3bce7b64f3a38564a50e192469a5
SIZE (texinfo/6.0.20150626/texinfo.tex) = 335682
SHA256 (texinfo/6.0.20150626/texi2dvi) = 09bce88252a1fb10014465a7f63ef6fdf2bda645e6381541a14cef3eeeeabff1
SIZE (texinfo/6.0.20150626/texi2dvi) = 57337
--- install-info/install-info.c.orig 2013-01-07 00:18:56.000000000 +0100
+++ install-info/install-info.c 2013-02-19 09:15:24.000000000 +0100
@@ -26,6 +26,7 @@
#define TAB_WIDTH 8
static char *progname = "install-info";
+static char *default_section = NULL;
struct spec_entry;
struct spec_section;
@@ -146,6 +147,8 @@ struct option longopts[] =
{ "calign", required_argument, NULL, 'C'},
{ "debug", no_argument, NULL, 'g' },
{ "delete", no_argument, NULL, 'r' },
+ { "defentry", required_argument, NULL, 'E' },
+ { "defsection", required_argument, NULL, 'S' },
{ "dir-file", required_argument, NULL, 'd' },
{ "entry", required_argument, NULL, 'e' },
{ "name", required_argument, NULL, 't' },
@@ -543,6 +546,10 @@ Options:\n\
--debug report what is being done.\n\
--delete delete existing entries for INFO-FILE from DIR-FILE;\n\
don't insert any new entries.\n\
+ --defentry=TEXT like --entry, but only use TEXT if an entry\n\
+ is not present in INFO-FILE.\n\
+ --defsection=TEXT like --section, but only use TEXT if a section\n\
+ is not present in INFO-FILE.\n\
--description=TEXT the description of the entry is TEXT; used with\n\
the --name option to become synonymous with the\n\
--entry option.\n\
@@ -1857,6 +1864,8 @@ main (int argc, char *argv[])
struct spec_entry *entries_to_add = NULL;
struct spec_entry *entries_to_add_from_file = NULL;
int n_entries_to_add = 0;
+ struct spec_entry *default_entries_to_add = NULL;
+ int n_default_entries_to_add = 0;
/* Record the old text of the dir file, as plain characters,
as lines, and as nodes. */
@@ -2041,6 +2050,7 @@ main (int argc, char *argv[])
}
break;
+ case 'E':
case 'e':
{
struct spec_entry *next
@@ -2055,12 +2065,18 @@ main (int argc, char *argv[])
next->text_len = olen;
next->entry_sections = NULL;
next->entry_sections_tail = NULL;
- next->next = entries_to_add;
next->missing_name = 0;
next->missing_basename = 0;
next->missing_description = 0;
- entries_to_add = next;
- n_entries_to_add++;
+ if (opt == 'e') {
+ next->next = entries_to_add;
+ entries_to_add = next;
+ n_entries_to_add++;
+ } else {
+ next->next = default_entries_to_add;
+ default_entries_to_add = next;
+ n_default_entries_to_add++;
+ }
}
break;
@@ -2127,6 +2143,10 @@ main (int argc, char *argv[])
}
break;
+ case 'S':
+ default_section = optarg;
+ break;
+
case 's':
{
struct spec_section *next
@@ -2315,7 +2335,7 @@ There is NO WARRANTY, to the extent perm
{
input_sections = (struct spec_section *)
xmalloc (sizeof (struct spec_section));
- input_sections->name = "Miscellaneous";
+ input_sections->name = default_section ? default_section : "Miscellaneous";
input_sections->next = NULL;
input_sections->missing = 1;
}
bin/info
bin/infokey
bin/install-info
bin/makeinfo
bin/pdftexi2dvi
......@@ -9,7 +8,6 @@ bin/texi2dvi
bin/texi2pdf
bin/texindex
man/man1/info.1.gz
man/man1/infokey.1.gz
man/man1/install-info.1.gz
man/man1/makeinfo.1.gz
man/man1/pdftexi2dvi.1.gz
......@@ -20,6 +18,8 @@ man/man1/texi2pdf.1.gz
man/man1/texindex.1.gz
man/man5/info.5.gz
man/man5/texinfo.5.gz
%%NLS%%share/locale/ca.us-ascii/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/ca/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/cs/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/da/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/de.us-ascii/LC_MESSAGES/texinfo_document.mo
......@@ -27,8 +27,8 @@ man/man5/texinfo.5.gz
%%NLS%%share/locale/de_AT/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/eo/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/eo/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/es.us-ascii/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/es/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/es/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/fr/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/fr/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/he/LC_MESSAGES/texinfo.mo
......@@ -47,6 +47,7 @@ man/man5/texinfo.5.gz
%%NLS%%share/locale/pl/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/pt.us-ascii/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/pt_BR.us-ascii/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/ro/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/ru/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/rw/LC_MESSAGES/texinfo.mo
......@@ -54,28 +55,10 @@ man/man5/texinfo.5.gz
%%NLS%%share/locale/sv/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/tr/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/uk/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/uk/LC_MESSAGES/texinfo_document.mo
%%NLS%%share/locale/vi/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/texinfo.mo
%%TEXMF%%/tex/texinfo/texinfo.tex
%%TEXMF%%/tex/texinfo/txi-cs.tex
%%TEXMF%%/tex/texinfo/txi-de.tex
%%TEXMF%%/tex/texinfo/txi-en.tex
%%TEXMF%%/tex/texinfo/txi-es.tex
%%TEXMF%%/tex/texinfo/txi-fr.tex
%%TEXMF%%/tex/texinfo/txi-hu.tex
%%TEXMF%%/tex/texinfo/txi-is.tex
%%TEXMF%%/tex/texinfo/txi-it.tex
%%TEXMF%%/tex/texinfo/txi-nb.tex
%%TEXMF%%/tex/texinfo/txi-nl.tex
%%TEXMF%%/tex/texinfo/txi-nn.tex
%%TEXMF%%/tex/texinfo/txi-pl.tex
%%TEXMF%%/tex/texinfo/txi-pt.tex
%%TEXMF%%/tex/texinfo/txi-ru.tex
%%TEXMF%%/tex/texinfo/txi-sr.tex
%%TEXMF%%/tex/texinfo/txi-tr.tex
%%TEXMF%%/tex/texinfo/txi-uk.tex
%%TEXMF%%/tex/generic/epsf/epsf.tex
%%DATADIR%%/DebugTexinfo/DebugCount.pm
%%DATADIR%%/DebugTexinfo/DebugTree.pm
%%DATADIR%%/Pod-Simple-Texinfo/Pod/Simple/Texinfo.pm
......@@ -109,6 +92,7 @@ man/man5/texinfo.5.gz
%%DATADIR%%/init/html32.pm
%%DATADIR%%/init/latex2html.pm
%%DATADIR%%/init/tex4ht.pm
%%DATADIR%%/lib/Text-Unidecode/lib/Text/Unidecode.pm
%%DATADIR%%/lib/Text-Unidecode/lib/Text/Unidecode/x00.pm
%%DATADIR%%/lib/Text-Unidecode/lib/Text/Unidecode/x01.pm
%%DATADIR%%/lib/Text-Unidecode/lib/Text/Unidecode/x02.pm
......@@ -289,12 +273,12 @@ man/man5/texinfo.5.gz
%%DATADIR%%/lib/Text-Unidecode/lib/Text/Unidecode/xfd.pm
%%DATADIR%%/lib/Text-Unidecode/lib/Text/Unidecode/xfe.pm
%%DATADIR%%/lib/Text-Unidecode/lib/Text/Unidecode/xff.pm
%%DATADIR%%/lib/Text-Unidecode/lib/Text/Unidecode.pm
%%DATADIR%%/lib/Unicode-EastAsianWidth/lib/Unicode/EastAsianWidth.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/Messages.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/Recode.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/Recode/_Aliases.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/Recode/_Conversions.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/Recode.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/RecodeData.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/RecodeData/ASMO_449.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/RecodeData/ATARI_ST.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/RecodeData/ATARI_ST_EURO.pm
......@@ -433,8 +417,28 @@ man/man5/texinfo.5.gz
%%DATADIR%%/lib/libintl-perl/lib/Locale/RecodeData/UTF_8.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/RecodeData/VISCII.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/RecodeData/_Encode.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/RecodeData.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/TextDomain.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/Util.pm
%%DATADIR%%/lib/libintl-perl/lib/Locale/gettext_pp.pm
%%DATADIR%%/texindex.awk
%%DATADIR%%/texinfo.dtd
%%TEXMF%%/tex/generic/epsf/epsf.tex
%%TEXMF%%/tex/texinfo/texinfo.tex
%%TEXMF%%/tex/texinfo/txi-ca.tex
%%TEXMF%%/tex/texinfo/txi-cs.tex
%%TEXMF%%/tex/texinfo/txi-de.tex
%%TEXMF%%/tex/texinfo/txi-en.tex
%%TEXMF%%/tex/texinfo/txi-es.tex
%%TEXMF%%/tex/texinfo/txi-fr.tex
%%TEXMF%%/tex/texinfo/txi-hu.tex
%%TEXMF%%/tex/texinfo/txi-is.tex
%%TEXMF%%/tex/texinfo/txi-it.tex
%%TEXMF%%/tex/texinfo/txi-nb.tex
%%TEXMF%%/tex/texinfo/txi-nl.tex
%%TEXMF%%/tex/texinfo/txi-nn.tex
%%TEXMF%%/tex/texinfo/txi-pl.tex
%%TEXMF%%/tex/texinfo/txi-pt.tex
%%TEXMF%%/tex/texinfo/txi-ru.tex
%%TEXMF%%/tex/texinfo/txi-sr.tex
%%TEXMF%%/tex/texinfo/txi-tr.tex
%%TEXMF%%/tex/texinfo/txi-uk.tex
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment