3 files changed, 13 insertions, 63 deletions
diff --git a/textproc/texi2html/files/patch-ab b/textproc/texi2html/files/patch-ab
deleted file mode 100644
index a4f4b8f3b39d..000000000000
--- a/textproc/texi2html/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- doc/Makefile.am.orig
-+++ doc/Makefile.am
-@@ -9,7 +9,7 @@
- CLEANFILES = texi2html.ps texi2html.pdf texi2html.html \
-              texi2html.ascii
- #
--htmldir = $(prefix)/html
-+htmldir = $(prefix)/share/doc/texi2html
- html_DATA    = texi2html.html
- 
- # use the script out of the distribution NOT
-
diff --git a/textproc/texi2html/files/patch-doc::Makefile.in b/textproc/texi2html/files/patch-doc::Makefile.in
new file mode 100644
index 000000000000..664063f83394
--- /dev/null
+++ b/textproc/texi2html/files/patch-doc::Makefile.in
@@ -0,0 +1,13 @@
+--- doc/Makefile.in.orig	Thu Dec 30 00:42:11 2004
++++ doc/Makefile.in	Thu Jan  6 18:18:11 2005
+@@ -147,8 +147,8 @@
+              texi2html.ascii
+ 
+ #
+-texinfodata = $(datadir)/texinfo
+-texinfohtmldir = $(texinfodata)/html
++texinfodata = $(datadir)/doc/texinfo
++texinfohtmldir = $(texinfodata)
+ texinfohtml_DATA = texi2html.html
+ 
+ # use the script out of the distribution NOT
diff --git a/textproc/texi2html/files/patch-texi2html.pl b/textproc/texi2html/files/patch-texi2html.pl
deleted file mode 100644
index f3660d0a9bb6..000000000000
--- a/textproc/texi2html/files/patch-texi2html.pl
+++ /dev/null
@@ -1,51 +0,0 @@
---- texi2html.pl.old	Sat Dec 13 07:39:45 2003
-+++ texi2html.pl	Sat Dec 13 07:40:11 2003
-@@ -174,7 +174,6 @@
-             $ext
-             $extensions
-             $failed
--            $fh_name
-             $file
-             $first_index_chapter
-             $first_line
-@@ -4127,25 +4126,22 @@
- sub open
- {
-     my($name) = @_;
-+    local *FH;
- 
--    ++$fh_name;
--    no strict "refs";
--    if (open($fh_name, $name))
-+    if (open(*FH, $name))
-     {
--        unshift(@fhs, $fh_name);
-+        unshift(@fhs, *FH);
-     }
-     else
-     {
-         warn "$ERROR Can't read file $name: $!\n";
-     }
--    use strict "refs";
- }
- 
- sub init_input
- {
-     @fhs = ();			# hold the file handles to read
-     @input_spool = ();		# spooled lines to read
--    $fh_name = 'FH000';
-     &open($docu);
- }
- 
-@@ -4420,9 +4416,8 @@
-         if ($style =~ /^\&/)
-         {                       # custom
-             $style = $';
--            no strict "refs";
--            $text = &$style($text, $texi_style);
--            use strict "refs";
-+            eval "\$text = &$style(\$text, \$texi_style)";
-+            die $@ if $@;
-         }
-         elsif ($style)
-         {                       # good style