diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-05-13 01:51:55 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-05-13 01:51:55 +0000 |
commit | 4b29b98acfcda1be76f68b4a7b94742dcbfb7d13 (patch) | |
tree | 745a2fd8db056ab6abc334632f30d620a44797c9 /sys-apps/texinfo | |
parent | Added fix for 10.4. (diff) | |
download | gentoo-2-4b29b98acfcda1be76f68b4a7b94742dcbfb7d13.tar.gz gentoo-2-4b29b98acfcda1be76f68b4a7b94742dcbfb7d13.tar.bz2 gentoo-2-4b29b98acfcda1be76f68b4a7b94742dcbfb7d13.zip |
Add a FreeBSD compatibility patch by Diego Petten� #92434.
(Portage version: 2.0.51.21-r1)
Diffstat (limited to 'sys-apps/texinfo')
-rw-r--r-- | sys-apps/texinfo/ChangeLog | 6 | ||||
-rw-r--r-- | sys-apps/texinfo/files/texinfo-4.8-freebsd.patch | 114 | ||||
-rw-r--r-- | sys-apps/texinfo/texinfo-4.8.ebuild | 7 |
3 files changed, 123 insertions, 4 deletions
diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog index 65054c9c0318..fdf4fc86482c 100644 --- a/sys-apps/texinfo/ChangeLog +++ b/sys-apps/texinfo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/texinfo # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.53 2005/04/25 02:06:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.54 2005/05/13 01:51:55 vapier Exp $ + + 13 May 2005; Mike Frysinger <vapier@gentoo.org> + +files/texinfo-4.8-freebsd.patch, texinfo-4.8.ebuild: + Add a FreeBSD compatibility patch by Diego Petten� #92434. 25 Apr 2005; Mike Frysinger <vapier@gentoo.org> texinfo-4.8.ebuild: Add a workaround for broken dependencies until it can be fixed properly in diff --git a/sys-apps/texinfo/files/texinfo-4.8-freebsd.patch b/sys-apps/texinfo/files/texinfo-4.8-freebsd.patch new file mode 100644 index 000000000000..b6909b72dc5b --- /dev/null +++ b/sys-apps/texinfo/files/texinfo-4.8-freebsd.patch @@ -0,0 +1,114 @@ +Adds a couple of commandline arguments which adds compatibility with fbsd's +install-info program. + +Patch by Diego Petten�. + +http://bugs.gentoo.org/92434 + +--- texinfo-4.8/util/install-info.c ++++ texinfo-4.8/util/install-info.c +@@ -22,6 +22,8 @@ + #include <getopt.h> + + static char *progname = "install-info"; ++/* Added for compatibility with FreeBSD texinfo */ ++static char *default_section = NULL; + + struct spec_entry; + struct spec_section; +@@ -117,9 +119,13 @@ + /* This table defines all the long-named options, says whether they + use an argument, and maps them into equivalent single-letter options. */ + ++/* defentry and defsection added for compatibility with FreeBSD texinfo */ ++ + 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' }, +@@ -428,6 +434,7 @@ + xexit (1); + } + ++/* defentry and defsection added for compatibility with FreeBSD's texinfo */ + void + print_help (void) + { +@@ -439,6 +446,10 @@ + --delete delete existing entries for INFO-FILE from DIR-FILE;\n\ + don't insert any new entries.\n\ + --dir-file=NAME specify file name of Info directory file.\n\ ++ --defentry=TEXT same as --entry, but only use TEXT if an entry is not\n\ ++ present in INFO-FILE.\n\ ++ --desection=SEC same as --section, but only use TEXT if an entry is not\n\ ++ present in INFO-FILE.\n\ + This is equivalent to using the DIR-FILE argument.\n\ + --entry=TEXT insert TEXT as an Info directory entry.\n\ + TEXT should have the form of an Info menu item line\n\ +@@ -1143,6 +1154,10 @@ + struct spec_entry *entries_to_add = NULL; + int n_entries_to_add = 0; + ++ /* Added for compatibility w/ original texinfo in FBSD */ ++ 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. */ + char *dir_data; +@@ -1205,6 +1220,7 @@ + dirfile = concat (optarg, "", "/dir"); + break; + ++ case 'E': + case 'e': + { + struct spec_entry *next +@@ -1222,6 +1238,20 @@ + next->next = entries_to_add; + entries_to_add = next; + n_entries_to_add++; ++ ++ /* Added for compatibility with FreeBSD's texinfo */ ++ 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 +1289,11 @@ + } + break; + ++ /* Added for compatibility with FreeBSD's texinfo */ ++ case 'S': ++ default_section = optarg; ++ break; ++ + case 'V': + printf ("install-info (GNU %s) %s\n", PACKAGE, VERSION); + puts (""); +@@ -1332,7 +1367,9 @@ + { + input_sections = (struct spec_section *) + xmalloc (sizeof (struct spec_section)); +- input_sections->name = "Miscellaneous"; ++ /* Modified for compatibility with FreeBSD's texinfo */ ++ input_sections->name = ++ default_section ? default_section : "Miscellaneous"; + input_sections->next = NULL; + input_sections->missing = 1; + } diff --git a/sys-apps/texinfo/texinfo-4.8.ebuild b/sys-apps/texinfo/texinfo-4.8.ebuild index a6878ae94402..09c910368c31 100644 --- a/sys-apps/texinfo/texinfo-4.8.ebuild +++ b/sys-apps/texinfo/texinfo-4.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.8.ebuild,v 1.9 2005/04/25 02:06:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.8.ebuild,v 1.10 2005/05/13 01:51:55 vapier Exp $ inherit flag-o-matic eutils @@ -19,11 +19,12 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-freebsd.patch - cd "${S}"/doc + cd doc # Get the texinfo info page to have a proper name of texinfo.info sed -i 's:setfilename texinfo:setfilename texinfo.info:' texinfo.txi - sed -i \ -e 's:INFO_DEPS = texinfo:INFO_DEPS = texinfo.info:' \ -e 's:texinfo\::texinfo.info\::' \ |