2 files changed, 59 insertions, 74 deletions

diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index 651f43995318..99aa202e5f59 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -1,39 +1,50 @@
 # New ports collection makefile for:    p5-WWW-Search
-# Version required:			1.019
+# Version required:			1.020
 # Date created:				June 26th 1997
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.4 1998/06/04 03:51:19 vanilla Exp $
+# $Id: Makefile,v 1.5 1998/08/06 15:16:35 vanilla Exp $
 #
 
-DISTNAME=	WWW-Search-1.019
-PKGNAME=	p5-WWW-Search-1.019
+DISTNAME=	WWW-Search-1.020
+PKGNAME=	p5-WWW-Search-1.020
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	WWW
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
-BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/5.005/LWP.pm:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
 
 USE_PERL5=	YES
 
-MAN1PREFIX=	${PREFIX}
-MAN1=		AutoSearch.1 WebSearch.1
-MAN3PREFIX=	${PREFIX}/lib/perl5/5.00501
-MAN3=		WWW::Search.3 WWW::Search::AltaVista.3 \
+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
+		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
 
 do-configure:
 		@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${PREFIX}/bin/perl Makefile.PL
diff --git a/www/p5-WWW-Search/pkg-plist b/www/p5-WWW-Search/pkg-plist
index 309bddb14642..5814b521ec19 100644
--- a/www/p5-WWW-Search/pkg-plist
+++ b/www/p5-WWW-Search/pkg-plist
@@ -1,57 +1,31 @@
 bin/AutoSearch
 bin/WebSearch
-lib/perl5/5.00501/man/man3/WWW::Search.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::AltaVista.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::AltaVista::AdvancedNews.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::AltaVista::AdvancedWeb.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::AltaVista::News.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::AltaVista::Web.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::Dejanews.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::Excite.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::Gopher.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::HotBot.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::Infoseek.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::Infoseek::Companies.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::Infoseek::Email.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::Infoseek::News.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::Infoseek::Web.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::Lycos.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::Magellan.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::PLweb.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::SFgate.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::Simple.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::Verity.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::WebCrawler.3.gz
-lib/perl5/5.00501/man/man3/WWW::Search::Yahoo.3.gz
-lib/perl5/5.00501/man/man3/WWW::SearchResult.3.gz
-lib/perl5/site_perl/5.005/WWW/Search.pm
-lib/perl5/site_perl/5.005/WWW/SearchResult.pm
-lib/perl5/site_perl/5.005/WWW/Search/AltaVista.pm
-lib/perl5/site_perl/5.005/WWW/Search/Dejanews.pm
-lib/perl5/site_perl/5.005/WWW/Search/Excite.pm
-lib/perl5/site_perl/5.005/WWW/Search/Gopher.pm
-lib/perl5/site_perl/5.005/WWW/Search/HotBot.pm
-lib/perl5/site_perl/5.005/WWW/Search/Infoseek.pm
-lib/perl5/site_perl/5.005/WWW/Search/Lycos.pm
-lib/perl5/site_perl/5.005/WWW/Search/Magellan.pm
-lib/perl5/site_perl/5.005/WWW/Search/PLweb.pm
-lib/perl5/site_perl/5.005/WWW/Search/SFgate.pm
-lib/perl5/site_perl/5.005/WWW/Search/Simple.pm
-lib/perl5/site_perl/5.005/WWW/Search/Verity.pm
-lib/perl5/site_perl/5.005/WWW/Search/WebCrawler.pm
-lib/perl5/site_perl/5.005/WWW/Search/Yahoo.pm
-lib/perl5/site_perl/5.005/WWW/Search/AltaVista/AdvancedNews.pm
-lib/perl5/site_perl/5.005/WWW/Search/AltaVista/AdvancedWeb.pm
-lib/perl5/site_perl/5.005/WWW/Search/AltaVista/News.pm
-lib/perl5/site_perl/5.005/WWW/Search/AltaVista/Web.pm
-lib/perl5/site_perl/5.005/WWW/Search/Infoseek/Companies.pm
-lib/perl5/site_perl/5.005/WWW/Search/Infoseek/Email.pm
-lib/perl5/site_perl/5.005/WWW/Search/Infoseek/News.pm
-lib/perl5/site_perl/5.005/WWW/Search/Infoseek/Web.pm
-lib/perl5/site_perl/5.005/i386-freebsd/auto/WWW/Search/.packlist
-man/man1/AutoSearch.1.gz
-man/man1/WebSearch.1.gz
-@dirrm lib/perl5/site_perl/5.005/WWW/Search/AltaVista
-@dirrm lib/perl5/site_perl/5.005/WWW/Search/Infoseek
-@dirrm lib/perl5/site_perl/5.005/WWW/Search
-@dirrm lib/perl5/site_perl/5.005/i386-freebsd/auto/WWW/Search
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/SearchResult.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/Gopher.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/HotBot.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Infoseek.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Lycos.pm
+lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Magellan.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/Simple.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%%/i386-freebsd/auto/WWW/Search/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/AltaVista
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Search/Infoseek
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/Search
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/i386-freebsd/auto/WWW/Search