Update to 1.72.

Submitted by:	hrs

6 files changed, 111 insertions, 74 deletions

diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile
index e05f721eb716..f0fefc480c59 100644
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@@ -6,20 +6,19 @@
 #
 
 PORTNAME=	texi2html
-PORTVERSION=	1.66
-PORTREVISION=	3
+PORTVERSION=	1.72
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.cvshome.org/files/70/10/
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	hrs
 
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	Texinfo to HTML converter
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-multiplatform
 USE_PERL5=	yes
-USE_BZIP2=	yes
-USE_AUTOMAKE_VER=	15
-USE_AUTOCONF_VER=	253
-AUTOMAKE_ARGS=	-a
 USE_GMAKE=	yes
 
 PROGRAM_PREFIX?=
diff --git a/textproc/texi2html/distinfo b/textproc/texi2html/distinfo
index 371041302603..398c31366607 100644
--- a/textproc/texi2html/distinfo
+++ b/textproc/texi2html/distinfo
@@ -1,2 +1,2 @@
-MD5 (texi2html-1.66.tar.bz2) = a79b311ac2e4dea779f1b223ea5a1d13
-SIZE (texi2html-1.66.tar.bz2) = 158221
+MD5 (texi2html-1.72.tar.gz) = 879b3ca9f01259887781e35551cc4898
+SIZE (texi2html-1.72.tar.gz) = 416739
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
diff --git a/textproc/texi2html/pkg-plist b/textproc/texi2html/pkg-plist
index 8bf70d3069d8..b931590036aa 100644
--- a/textproc/texi2html/pkg-plist
+++ b/textproc/texi2html/pkg-plist
@@ -1,3 +1,91 @@
+@comment $FreeBSD$
 bin/%%PROGRAM_PREFIX%%texi2html
-%%DOCSDIR%%/texi2html.html
-@dirrm %%DOCSDIR%%
+%%DATADIR%%/i18n/en
+%%DATADIR%%/i18n/de
+%%DATADIR%%/i18n/es
+%%DATADIR%%/i18n/fr
+%%DATADIR%%/i18n/nl
+%%DATADIR%%/i18n/no
+%%DATADIR%%/i18n/pt
+%%DATADIR%%/images/a_begin.gif
+%%DATADIR%%/images/a_begin_na.gif
+%%DATADIR%%/images/a_document.gif
+%%DATADIR%%/images/a_document_na.gif
+%%DATADIR%%/images/a_empty.gif
+%%DATADIR%%/images/a_end.gif
+%%DATADIR%%/images/a_end_na.gif
+%%DATADIR%%/images/a_help.gif
+%%DATADIR%%/images/a_help_na.gif
+%%DATADIR%%/images/a_index.gif
+%%DATADIR%%/images/a_index_na.gif
+%%DATADIR%%/images/a_leftdouble.gif
+%%DATADIR%%/images/a_leftdouble_na.gif
+%%DATADIR%%/images/a_left.gif
+%%DATADIR%%/images/a_left_na.gif
+%%DATADIR%%/images/a_page.gif
+%%DATADIR%%/images/a_page_na.gif
+%%DATADIR%%/images/a_rightdouble.gif
+%%DATADIR%%/images/a_rightdouble_na.gif
+%%DATADIR%%/images/a_right.gif
+%%DATADIR%%/images/bg.jpg
+%%DATADIR%%/images/a_right_na.gif
+%%DATADIR%%/images/a_searchdoc.gif
+%%DATADIR%%/images/a_searchdoc_na.gif
+%%DATADIR%%/images/a_search.gif
+%%DATADIR%%/images/a_search_na.gif
+%%DATADIR%%/images/a_tableofcon.gif
+%%DATADIR%%/images/a_tableofcon_na.gif
+%%DATADIR%%/images/a_top.gif
+%%DATADIR%%/images/a_top_na.gif
+%%DATADIR%%/images/a_up.gif
+%%DATADIR%%/images/a_up_na.gif
+%%DATADIR%%/images/bg_left.gif
+%%DATADIR%%/images/bg_right.gif
+%%DATADIR%%/images/blue_dir.gif
+%%DATADIR%%/images/blue_down.gif
+%%DATADIR%%/images/blue_grab.gif
+%%DATADIR%%/images/blue_help.gif
+%%DATADIR%%/images/blue_next.gif
+%%DATADIR%%/images/blue_nnext.gif
+%%DATADIR%%/images/blue_pprev.gif
+%%DATADIR%%/images/blue_prev.gif
+%%DATADIR%%/images/blue_readme.gif
+%%DATADIR%%/images/blue_top.gif
+%%DATADIR%%/images/blue_up.gif
+%%DATADIR%%/images/blue_uup.gif
+%%DATADIR%%/images/contents_motif.gif
+%%DATADIR%%/images/COPYING
+%%DATADIR%%/images/index_motif.gif
+%%DATADIR%%/images/Mybg.gif
+%%DATADIR%%/images/next_motif.gif
+%%DATADIR%%/images/next_motif_gr.gif
+%%DATADIR%%/images/previous_motif.gif
+%%DATADIR%%/images/previous_motif_gr.gif
+%%DATADIR%%/images/spacer3.gif
+%%DATADIR%%/images/xy_contents.gif
+%%DATADIR%%/images/xy_foot.gif
+%%DATADIR%%/images/xy_next.gif
+%%DATADIR%%/images/xy_next_gr.gif
+%%DATADIR%%/images/xy_nextsection.gif
+%%DATADIR%%/images/xy_nextsection_gr.gif
+%%DATADIR%%/images/xy_previous.gif
+%%DATADIR%%/images/xy_previous_gr.gif
+%%DATADIR%%/images/xy_previoussection.gif
+%%DATADIR%%/images/xy_previoussection_gr.gif
+%%DATADIR%%/images/xy_up.gif
+%%DATADIR%%/images/xy_up_gr.gif
+%%DATADIR%%/l2h.init
+%%DATADIR%%/makeinfo.init
+%%DATADIR%%/xhtml.init
+%%DATADIR%%/html32.init
+%%DATADIR%%/book.init
+%%DATADIR%%/noheaders.init
+%%DATADIR%%/inlinestyle.init
+%%DATADIR%%/utf8.init
+%%DATADIR%%/chm.init
+%%DATADIR%%/roff.init
+@dirrm %%DATADIR%%/i18n
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%
+share/doc/texinfo/texi2html.html
+@dirrm share/doc/texinfo