Fix latex2html for Perl 5.22. Bump revision.

3 files changed, 37 insertions, 9 deletions

diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 70ec9eeec7f..fe6cc0829ab 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2015/06/12 10:51:21 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2015/07/05 12:42:14 joerg Exp $
 
 DISTNAME=	latex2html-2008
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	textproc converters
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=support/latex2html/}
 
diff --git a/textproc/latex2html/distinfo b/textproc/latex2html/distinfo
index 3006a0f6aef..5e458cef896 100644
--- a/textproc/latex2html/distinfo
+++ b/textproc/latex2html/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2011/07/09 14:19:30 bsiegert Exp $
+$NetBSD: distinfo,v 1.12 2015/07/05 12:42:14 joerg Exp $
 
 SHA1 (latex2html-2008.tar.gz) = 5e0aa47572e0c13a4c5da51e963d5496be3f86e7
 RMD160 (latex2html-2008.tar.gz) = a95f06253d6fc8808ffedcad7edf8235194d7756
 Size (latex2html-2008.tar.gz) = 1133054 bytes
-SHA1 (patch-aa) = 146235dbac76107a765b86b28a81329328d8e0db
+SHA1 (patch-aa) = 5533e0365d010e37a1572be194bf932ceaeb6fb5
 SHA1 (patch-ab) = 784228fd8fafec43439fb7ff429eb0ba1e103d43
diff --git a/textproc/latex2html/patches/patch-aa b/textproc/latex2html/patches/patch-aa
index bbef63d29eb..c3ae87be9ee 100644
--- a/textproc/latex2html/patches/patch-aa
+++ b/textproc/latex2html/patches/patch-aa
@@ -1,10 +1,38 @@
-$NetBSD: patch-aa,v 1.1 2005/10/09 20:02:29 rillig Exp $
+$NetBSD: patch-aa,v 1.2 2015/07/05 12:42:14 joerg Exp $
 
 Some typos in the man page.
+Deal Perl 5.22.
 
---- latex2html.pin.orig	Fri Aug 23 07:15:01 2002
-+++ latex2html.pin	Sun Oct  9 21:58:17 2005
-@@ -16875,7 +16875,7 @@ S<[ B<-font_size> I<size> ]>
+--- latex2html.pin.orig	2004-01-08 06:15:01.000000000 +0000
++++ latex2html.pin
+@@ -532,7 +532,7 @@ $CHARSET = $charset || 'iso-8859-1';
+ #
+ # If possible, use icons of the same type as generated images
+ #
+-if ($IMAGE_TYPE && defined %{"icons_$IMAGE_TYPE"}) {
++if ($IMAGE_TYPE && %{"icons_$IMAGE_TYPE"}) {
+     %icons = %{"icons_$IMAGE_TYPE"};
+ }
+ 
+@@ -2112,7 +2112,7 @@ sub convert_iso_latin_chars {
+ 		"\nCould not find translation function for $default_language.\n\n")
+ 	    }
+ 	);
+-	if ($USE_UTF ||(!$NO_UTF &&(defined %unicode_table)&&length(%unicode_table)>2)) {
++	if ($USE_UTF ||(!$NO_UTF && %unicode_table &&length(%unicode_table)>2)) {
+ 	    &convert_to_unicode($_)};
+     }
+     $_ = join('', @case_processed, $_); undef(@case_processed);
+@@ -9117,7 +9117,7 @@ sub real_replace_strange_accents {
+     my ($charset) = "${CHARSET}_character_map_inv";
+     $charset =~ s/-/_/g;
+     # convert upper 8-bit characters
+-    if (defined %$charset &&($CHARSET =~ /8859[_\-]1$/)) {
++    if (%$charset &&($CHARSET =~ /8859[_\-]1$/)) {
+ 	s/([\200-\377])/
+ 	    $tmp = $$charset{'&#'.ord($1).';'};
+ 	    &mark_string($tmp) if ($tmp =~ m!\{!);
+@@ -16884,7 +16884,7 @@ S<[ B<-font_size> I<size> ]>
  S<[ B<->(B<no>)B<tex_defs> ]>
  S<[ B<->(B<no>)B<navigation> ]>
  S<[ B<->(B<no>)B<top_navigation> ]>
@@ -13,7 +41,7 @@ Some typos in the man page.
  S<[ B<->(B<no>)B<auto_navigation> ]>
  S<[ B<->(B<no>)B<index_in_navigation> ]>
  S<[ B<->(B<no>)B<contents_in_navigation> ]>
-@@ -17048,9 +17048,9 @@ Put a navigation panel at the top of eac
+@@ -17057,9 +17057,9 @@ Put a navigation panel at the top of eac
  
  Enables navigation links at the top of each page (default).