4 files changed, 42 insertions, 25 deletions

diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index c3cb20be2922..e944a9b8835a 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	WWW-Search
-PORTVERSION=	2.41
+PORTVERSION=	2.42
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	WWW
@@ -15,14 +15,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	erwin@FreeBSD.org
 COMMENT=	A perl5 module for WWW searches
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/Inline.pm:${PORTSDIR}/devel/p5-Test-Inline \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/User.pm:${PORTSDIR}/sysutils/p5-User \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+		${SITE_PERL}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree \
+		${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
+		${SITE_PERL}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite \
+		${SITE_PERL}/Test/Inline.pm:${PORTSDIR}/devel/p5-Test-Inline \
+		${SITE_PERL}/User.pm:${PORTSDIR}/sysutils/p5-User \
+		${SITE_PERL}/Getopt/Long.pm:${PORTSDIR}/devel/p5-Getopt-Long \
+		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -38,11 +38,16 @@ MAN3=		WWW::Search.3 \
 		WWW::Search::Simple.3 \
 		WWW::Search::Test.3
 
+post-patch:
+	@${RM} ${WRKSRC}/lib/WWW/Search/Test.pm.orig
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500601
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
+RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
+		${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-WWW-Search/distinfo b/www/p5-WWW-Search/distinfo
index 7b039351a996..eeb6a242b863 100644
--- a/www/p5-WWW-Search/distinfo
+++ b/www/p5-WWW-Search/distinfo
@@ -1 +1 @@
-MD5 (WWW-Search-2.41.tar.gz) = c9ad187f607aae12f098d32aef83604c
+MD5 (WWW-Search-2.42.tar.gz) = 7e33c8cef93709a3011a261ad173860a
diff --git a/www/p5-WWW-Search/files/patch-lib::WWW::Search::Test.pm b/www/p5-WWW-Search/files/patch-lib::WWW::Search::Test.pm
new file mode 100644
index 000000000000..213e45b07ce6
--- /dev/null
+++ b/www/p5-WWW-Search/files/patch-lib::WWW::Search::Test.pm
@@ -0,0 +1,11 @@
+--- lib/WWW/Search/Test.pm~	Tue Jul 15 05:02:28 2003
++++ lib/WWW/Search/Test.pm	Thu Aug  7 15:18:31 2003
+@@ -627,7 +627,7 @@
+       print $oResult->url, "\n";

+       foreach my $sField (qw( title description score change_date index_date size company location source ))

+         {

+-        print "  $sField==", $oResult->$sField, "==\n" if defined($oResult->$sField);

++        print "  $sField==", eval "$oResult->$sField", "==\n" if $oResult->can($sField);

+         } # foreach

+       } # foreach

+     } # if

diff --git a/www/p5-WWW-Search/pkg-plist b/www/p5-WWW-Search/pkg-plist
index dfaa42b1c128..0566367a67b7 100644
--- a/www/p5-WWW-Search/pkg-plist
+++ b/www/p5-WWW-Search/pkg-plist
@@ -1,16 +1,17 @@
 bin/AutoSearch
 bin/WebSearch
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Search/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Null.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Null/Count.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Null/Empty.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Null/Error.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/SearchResult.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Result.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Test.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Null
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Search 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/WWW/Search 2>/dev/null || true
+%%SITE_PERL%%/WWW/Search.pm
+%%SITE_PERL%%/WWW/Search/Null.pm
+%%SITE_PERL%%/WWW/Search/Null/Count.pm
+%%SITE_PERL%%/WWW/Search/Null/Empty.pm
+%%SITE_PERL%%/WWW/Search/Null/Error.pm
+%%SITE_PERL%%/WWW/Search/Result.pm
+%%SITE_PERL%%/WWW/Search/Simple.pm
+%%SITE_PERL%%/WWW/Search/Test.pm
+%%SITE_PERL%%/WWW/SearchResult.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search/.packlist
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/Search 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW 2>/dev/null || true
+@dirrm %%SITE_PERL%%/WWW/Search/Null
+@unexec rmdir %D/%%SITE_PERL%%/WWW/Search 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true