5 files changed, 27 insertions, 27 deletions

diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index 19190f426993..ff09bdbb174c 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	HTML-Parser
-PORTVERSION=	3.28
+PORTVERSION=	3.31
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
@@ -15,12 +15,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Perl5 module for parse HTML tag
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset
+BUILD_DEPENDS=	${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		HTML::Entities.3 \
 		HTML::Filter.3 \
 		HTML::HeadParser.3 \
diff --git a/www/p5-HTML-Parser/distinfo b/www/p5-HTML-Parser/distinfo
index 483d275eae93..91d0d2039cfb 100644
--- a/www/p5-HTML-Parser/distinfo
+++ b/www/p5-HTML-Parser/distinfo
@@ -1 +1 @@
-MD5 (HTML-Parser-3.28.tar.gz) = c904aa58c6ba2d35ffcb635935467cef
+MD5 (HTML-Parser-3.31.tar.gz) = 143e38e18c6166fb1c8950a037139454
diff --git a/www/p5-HTML-Parser/files/patch-Makefile.PL b/www/p5-HTML-Parser/files/patch-Makefile.PL
index 451e9bddad1a..ce404ccef789 100644
--- a/www/p5-HTML-Parser/files/patch-Makefile.PL
+++ b/www/p5-HTML-Parser/files/patch-Makefile.PL
@@ -1,23 +1,22 @@
---- Makefile.PL.orig	Tue Dec 26 15:48:57 2000
-+++ Makefile.PL	Mon Jan  8 21:06:36 2001
+--- Makefile.PL.orig	Fri Aug 15 17:32:56 2003
++++ Makefile.PL	Wed Aug 27 14:44:10 2003
 @@ -10,19 +10,7 @@
  }
  
- if ($] >= 5.007) {
+ if ($] >= 5.008) {
 -    print <<"EOT";
 -
--Perl-5.7 provide experimental core support for Unicode strings.  You
--can compile HTML::Entities so that Unicode entities like &euro; and
--&#x20AC; are decoded into a string containing "\\x{20AC}".  If you
--select no to the question below such entities will be left alone and
--only entities in the Latin-1 range is decoded.
+-Perl-5.8 provide core support for Unicode strings.  You can compile
+-HTML::Entities so that Unicode entities like &euro; and &#x20AC; are
+-decoded into a string containing "\\x{20AC}".  If you select no to
+-the question below such entities will be left alone and only entities
+-in the Latin-1 range is decoded.
 -
 -EOT
 -    my $ans = prompt("Do you want decoding on unicode entities?", "no");
 -    if ($ans =~ /^y(es)?$/i) {
--	push(@define, "-DUNICODE_ENTITIES");
+ 	push(@define, "-DUNICODE_ENTITIES");
 -    }
-+    push(@define, "-DUNICODE_ENTITIES");
  }
  push(@extra, "DEFINE" => "@define") if @define;
  
diff --git a/www/p5-HTML-Parser/pkg-descr b/www/p5-HTML-Parser/pkg-descr
index e35a7d088eae..aacd8daf680d 100644
--- a/www/p5-HTML-Parser/pkg-descr
+++ b/www/p5-HTML-Parser/pkg-descr
@@ -6,5 +6,7 @@ reports and discussions about these modules can still be sent to the
 the HTML-Tree module collection that create and extract information from
 HTML syntax trees.
 
+WWW: http://search.cpan.org/dist/HTML-Parser/
+
 - Vanilla
 vanilla@FreeBSD.ORG
diff --git a/www/p5-HTML-Parser/pkg-plist b/www/p5-HTML-Parser/pkg-plist
index 7e9056e88604..51ca772a0b55 100644
--- a/www/p5-HTML-Parser/pkg-plist
+++ b/www/p5-HTML-Parser/pkg-plist
@@ -1,13 +1,13 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Entities.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Filter.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/HeadParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/LinkExtor.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/Parser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/PullParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML/TokeParser.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Parser/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Parser/Parser.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Parser/Parser.so
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML/Parser
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/HTML 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Entities.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Filter.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/HeadParser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/LinkExtor.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/Parser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/PullParser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/HTML/TokeParser.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser/Parser.bs
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser/Parser.so
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Parser
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/HTML