mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

- Update to 4.13

Browse Source 
Feature safe:	yes
This commit is contained in:
Pietro Cerutti 2011-02-03 22:08:47 +00:00
parent 026b96d982
commit b050784999
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=268594
6 changed files with 102 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
print/texinfo/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= texinfo
PORTVERSION= 4.11
PORTREVISION= 1
PORTVERSION= 4.13
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -15,7 +14,6 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A typeset documentation system with multiple format output
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
INSTALL_TARGET= install install-tex
@ -31,7 +29,7 @@ CONFIGURE_ENV= \
INFO= ${PORTNAME} info-stnd info
MAN1= info.1 infokey.1 install-info.1 makeinfo.1 texi2dvi.1 \
texindex.1
texi2pdf.1 pdftexi2dvi.1 texindex.1
MAN5= info.5 texinfo.5
PLIST_SUB= TEXMFLOCAL=${TEXMFLOCAL}

5
print/texinfo/distinfo
View File

@ -1,3 +1,2 @@
MD5 (texinfo-4.11.tar.bz2) = c6bf13df4fbeff8ce874aacd6a51e814
SHA256 (texinfo-4.11.tar.bz2) = 61033d48778ac7a6c80ac7cee66ca962fc4a1565fad13759618916f7f292f5f7
SIZE (texinfo-4.11.tar.bz2) = 1659601
SHA256 (texinfo-4.13.tar.gz) = 1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68
SIZE (texinfo-4.13.tar.gz) = 2751071

14
print/texinfo/files/patch-doc::Makefile.in
View File

@ -1,6 +1,6 @@
--- doc/Makefile.in.orig 2007-09-10 02:37:44.000000000 +0200
+++ doc/Makefile.in 2008-06-05 17:17:59.000000000 +0200
@@ -104,7 +104,7 @@
--- doc/Makefile.in.orig 2011-02-03 19:34:53.000000000 +0000
+++ doc/Makefile.in 2011-02-03 19:35:33.000000000 +0000
@@ -121,7 +121,7 @@
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
@ -9,16 +9,16 @@
TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
DVIS = texinfo.dvi info-stnd.dvi info.dvi
@@ -375,7 +375,7 @@
@@ -436,7 +436,7 @@
# Put texinfo.txi first because that's the most important.
info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
-DISTCLEANFILES = texinfo texinfo-* info*.info*
+DISTCLEANFILES = texinfo.info texinfo-* info*.info*
man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1 \
info.5 texinfo.5
man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 \
info.5 texinfo.5 texi2dvi.1 texi2pdf.1 pdftexi2dvi.1
@@ -455,7 +455,7 @@
@@ -526,7 +526,7 @@
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh

89
print/texinfo/files/patch-install-info_install-info.c Normal file
View File

@ -0,0 +1,89 @@
--- install-info/install-info.c.orig 2011-02-03 21:48:38.000000000 +0000
+++ install-info/install-info.c 2011-02-03 21:56:15.000000000 +0000
@@ -25,6 +25,7 @@
#define TAB_WIDTH 8
static char *progname = "install-info";
+static char *default_section = NULL;
struct spec_entry;
struct spec_section;
@@ -145,6 +146,8 @@
{ "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' },
@@ -515,6 +518,10 @@
--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\
@@ -1814,6 +1821,8 @@
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. */
@@ -1998,6 +2007,7 @@
}
break;
+ case 'E':
case 'e':
{
struct spec_entry *next
@@ -2012,12 +2022,18 @@
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;
@@ -2084,6 +2100,10 @@
}
break;
+ case 'S':
+ default_section = optarg;
+ break;
+
case 's':
{
struct spec_section *next
@@ -2273,7 +2293,7 @@
{
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;
}

90
print/texinfo/files/patch-util__install-info.c
View File

@ -1,90 +0,0 @@
--- util/install-info.c.orig Mon Oct 17 21:05:19 2005
+++ util/install-info.c Mon Oct 17 21:24:07 2005
@@ -22,6 +22,7 @@
#include <getopt.h>
static char *progname = "install-info";
+static char *default_section = NULL;
struct spec_entry;
struct spec_section;
@@ -120,6 +121,8 @@
struct option longopts[] =
{
{ "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' },
{ "help", no_argument, NULL, 'h' },
@@ -439,6 +442,10 @@
Options:\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\
--dir-file=NAME specify file name of Info directory file.\n\
This is equivalent to using the DIR-FILE argument.\n\
--entry=TEXT insert TEXT as an Info directory entry.\n\
@@ -1142,6 +1149,8 @@
struct spec_section *input_sections = NULL;
struct spec_entry *entries_to_add = 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. */
@@ -1205,6 +1214,7 @@
dirfile = concat (optarg, "", "/dir");
break;
+ case 'E':
case 'e':
{
struct spec_entry *next
@@ -1219,9 +1229,18 @@
next->text_len = olen;
next->entry_sections = NULL;
next->entry_sections_tail = NULL;
- next->next = entries_to_add;
- 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;
@@ -1259,6 +1278,10 @@
}
break;
+ case 'S':
+ default_section = optarg;
+ break;
+
case 'V':
printf ("install-info (GNU %s) %s\n", PACKAGE, VERSION);
puts ("");
@@ -1332,7 +1355,8 @@
{
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;
}

4
print/texinfo/pkg-plist
View File

@ -11,6 +11,7 @@ bin/pdftexi2dvi
%%NLS%%share/locale/de/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/de_AT/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/eo/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/es/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/fr/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/he/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/hr/LC_MESSAGES/texinfo.mo
@ -18,7 +19,6 @@ bin/pdftexi2dvi
%%NLS%%share/locale/ja/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/nb/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/nl/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/no/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/pl/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/ro/LC_MESSAGES/texinfo.mo
%%NLS%%share/locale/ru/LC_MESSAGES/texinfo.mo
@ -38,8 +38,8 @@ bin/pdftexi2dvi
%%TEXMFLOCAL%%/tex/texinfo/txi-es.tex
%%TEXMFLOCAL%%/tex/texinfo/txi-fr.tex
%%TEXMFLOCAL%%/tex/texinfo/txi-it.tex
%%TEXMFLOCAL%%/tex/texinfo/txi-nb.tex
%%TEXMFLOCAL%%/tex/texinfo/txi-nl.tex
%%TEXMFLOCAL%%/tex/texinfo/txi-no.tex
%%TEXMFLOCAL%%/tex/texinfo/txi-pl.tex
%%TEXMFLOCAL%%/tex/texinfo/txi-pt.tex
%%TEXMFLOCAL%%/tex/texinfo/txi-ru.tex