4 files changed, 26 insertions, 32 deletions

diff --git a/net/p5-Net-Google/Makefile b/net/p5-Net-Google/Makefile
index 7d556aa10588..85de6b8a92aa 100644
--- a/net/p5-Net-Google/Makefile
+++ b/net/p5-Net-Google/Makefile
@@ -6,34 +6,22 @@
 #
 
 PORTNAME=	Net-Google
-PORTVERSION=	0.52
+PORTVERSION=	0.60
 CATEGORIES=	net perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@FreeBSD.org
-COMMENT=	simple OOP-ish interface to the Google SOAP API
+COMMENT=	Simple OOP-ish interface to the Google SOAP API
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite
+BUILD_DEPENDS=	${SITE_PERL}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
 MAN3=		Net::Google.3 Net::Google::Cache.3 Net::Google::Response.3 \
-		Net::Google::Search.3 Net::Google::Spelling.3 \
-		Net::Google::Service.3
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+		Net::Google::Search.3 Net::Google::Service.3 \
+		Net::Google::Spelling.3 Net::Google::tool.3
 
-.include <bsd.port.pre.mk>
-
-SITE_PERL?=     ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
-
-PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
-PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
-
-.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 6
-BUILD_DEPENDS+= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 6
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/p5-Net-Google/distinfo b/net/p5-Net-Google/distinfo
index 310cd0e6244f..f3a3240c3699 100644
--- a/net/p5-Net-Google/distinfo
+++ b/net/p5-Net-Google/distinfo
@@ -1 +1 @@
-MD5 (Net-Google-0.52.tar.gz) = 2fa8826cb347d79a123405be66fcb0db
+MD5 (Net-Google-0.60.tar.gz) = e1be119f48548145ae1143d72ec1f18b
diff --git a/net/p5-Net-Google/pkg-descr b/net/p5-Net-Google/pkg-descr
index b7223cd82e0b..996efc29e8c2 100644
--- a/net/p5-Net-Google/pkg-descr
+++ b/net/p5-Net-Google/pkg-descr
@@ -1 +1,6 @@
 Provides a simple OOP-ish interface to the Google SOAP API
+
+WWW: http://search.cpan.org/dist/Net-Google/
+
+-- Sergey Skvortsov
+skv@FreeBSD.org
diff --git a/net/p5-Net-Google/pkg-plist b/net/p5-Net-Google/pkg-plist
index 22a3d9aacf06..bd118d001696 100644
--- a/net/p5-Net-Google/pkg-plist
+++ b/net/p5-Net-Google/pkg-plist
@@ -1,13 +1,14 @@
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Google/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/Net/Google.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Google/Cache.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Google/Response.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Google/Search.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Google/Service.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/Google/Services/GoogleSearch.wsdl
-lib/perl5/site_perl/%%PERL_VER%%/Net/Google/Spelling.pm
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Google/Services
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/Google
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net/Google
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google/.packlist
+%%SITE_PERL%%/Net/Google.pm
+%%SITE_PERL%%/Net//Google/tool.pm
+%%SITE_PERL%%/Net/Google/Cache.pm
+%%SITE_PERL%%/Net/Google/Response.pm
+%%SITE_PERL%%/Net/Google/Search.pm
+%%SITE_PERL%%/Net/Google/Service.pm
+%%SITE_PERL%%/Net/Google/Services/GoogleSearch.wsdl
+%%SITE_PERL%%/Net/Google/Spelling.pm
+@dirrm %%SITE_PERL%%/Net/Google/Services
+@dirrm %%SITE_PERL%%/Net/Google
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/Google
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/auto/Net 2>/dev/null || true