3 files changed, 88 insertions, 54 deletions

diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index 5cf6e70c2e53..1cf537fc592d 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -1,60 +1,63 @@
 # New ports collection makefile for:    p5-WWW-Search
-# Version required:			1.021
+# Version required:			2.10
 # Date created:				June 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	WWW-Search-1.021
-PKGNAME=	p5-WWW-Search-1.021
+DISTNAME=	WWW-Search-2.10
+PKGNAME=	p5-WWW-Search-2.10
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	WWW
 
 MAINTAINER=	jfitz@FreeBSD.org
 
-BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
-
-BROKEN=		"installs files in /usr/bin"
+BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
+		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree
 
 USE_PERL5=	YES
 
 MAN1=		AutoSearch.1 \
 		WebSearch.1
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3=		WWW::Search.3 \
-		WWW::Search::AltaVista.3 \
-		WWW::Search::AltaVista::AdvancedNews.3 \
-		WWW::Search::AltaVista::AdvancedWeb.3 \
-		WWW::Search::AltaVista::News.3 \
-		WWW::Search::AltaVista::Web.3 \
-		WWW::Search::Dejanews.3 \
-		WWW::Search::Excite.3 \
-		WWW::Search::HotBot.3 \
-		WWW::Search::Infoseek.3 \
-		WWW::Search::Infoseek::Email.3 \
-		WWW::Search::Infoseek::News.3 \
-		WWW::Search::Infoseek::Web.3 \
-		WWW::Search::Lycos.3 \
-		WWW::Search::Magellan.3 \
-		WWW::Search::PLweb.3 \
-		WWW::Search::SFgate.3 \
-		WWW::Search::WebCrawler.3 \
-		WWW::Search::Yahoo.3 \
-		WWW::SearchResult.3 \
-		WWW::Search::Infoseek::Companies.3 \
-		WWW::Search::Verity.3 \
-		WWW::Search::Gopher.3 \
-		WWW::Search::Simple.3
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 300000
-BROKEN=         perl
-.endif
+MAN3=		WWW::Search::AOL::Classifieds::Employment.3 \
+		WWW::Search::AltaVista::Careers.3 \
+		WWW::Search::AltaVista::Intranet.3 \
+		WWW::Search::Crawler.3 \
+		WWW::Search::Dice.3 \
+		WWW::Search::Euroseek.3 \
+		WWW::Search::Excite::News.3 \
+		WWW::Search::ExciteForWebServers.3 \
+		WWW::Search::Fireball.3 \
+		WWW::Search::FolioViews.3 \
+		WWW::Search::GoTo.3 \
+		WWW::Search::Google.3 \
+		WWW::Search::HeadHunter.3 \
+		WWW::Search::HotFiles.3 \
+		WWW::Search::Livelink.3 \
+		WWW::Search::LookSmart.3 \
+		WWW::Search::Lycos::Pages.3 \
+		WWW::Search::Lycos::Sites.3 \
+		WWW::Search::MSIndexServer.3 \
+		WWW::Search::MetaCrawler.3 \
+		WWW::Search::Metapedia.3 \
+		WWW::Search::Monster.3 \
+		WWW::Search::NetFind.3 \
+		WWW::Search::NorthernLight.3 \
+		WWW::Search::Null.3 \
+		WWW::Search::OpenDirectory.3 \
+		WWW::Search::Search97.3 \
+		WWW::Search::Snap.3 \
+		WWW::Search::Test.3 \
+		WWW::Search::Yahoo::Classifieds::Employment.3 \
+		WWW::Search::ZDNet.3
+
+post-patch:
+		@${PERL} -pi -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/Makefile.PL
 
 do-configure:
 		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PERL5} Makefile.PL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-WWW-Search/distinfo b/www/p5-WWW-Search/distinfo
index a5347b9415c8..b3b37260383a 100644
--- a/www/p5-WWW-Search/distinfo
+++ b/www/p5-WWW-Search/distinfo
@@ -1 +1 @@
-MD5 (WWW-Search-1.021.tar.gz) = 1493ee19be1b7828f7caebf96c7973f9
+MD5 (WWW-Search-2.10.tar.gz) = e4a98dc911715daffcc1463e37e603b2
diff --git a/www/p5-WWW-Search/pkg-plist b/www/p5-WWW-Search/pkg-plist
index 8f29cfcaafd6..93c91628c8fa 100644
--- a/www/p5-WWW-Search/pkg-plist
+++ b/www/p5-WWW-Search/pkg-plist
@@ -1,31 +1,62 @@
 bin/AutoSearch
 bin/WebSearch
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/SearchResult.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Search/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AOL/Classifieds/Employment.pm
 lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AltaVista.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Dejanews.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Excite.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AltaVista/AdvancedNews.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AltaVista/AdvancedWeb.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AltaVista/Careers.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AltaVista/Intranet.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AltaVista/News.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AltaVista/Web.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Crawler.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Dice.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Euroseek.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Excite/News.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/ExciteForWebServers.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Fireball.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/FolioViews.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/GoTo.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Google.pm
 lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Gopher.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/HotBot.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/HeadHunter.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/HotFiles.pm
 lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Infoseek.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Infoseek/Companies.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Infoseek/Email.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Infoseek/News.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Infoseek/Web.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Livelink.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/LookSmart.pm
 lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Lycos.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Lycos/Pages.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Lycos/Sites.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/MSIndexServer.pm
 lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Magellan.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/MetaCrawler.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Metapedia.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Monster.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/NetFind.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/NorthernLight.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Null.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/OpenDirectory.pm
 lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/PLweb.pm
 lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/SFgate.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Search97.pm
 lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Simple.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Snap.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Test.pm
 lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Verity.pm
 lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/WebCrawler.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Yahoo.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AltaVista/AdvancedNews.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AltaVista/AdvancedWeb.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AltaVista/News.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AltaVista/Web.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Infoseek/Companies.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Infoseek/Email.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Infoseek/News.pm
-lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Infoseek/Web.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Search/.packlist
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Yahoo/Classifieds/Employment.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/ZDNet.pm
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Search
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AOL/Classifieds
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AltaVista
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AOL
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Excite
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Infoseek
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Lycos
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Yahoo/Classifieds
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Yahoo
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Search
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/WWW/Search