Index: head/net/p5-GeoIP2/Makefile
===================================================================
--- head/net/p5-GeoIP2/Makefile	(revision 362823)
+++ head/net/p5-GeoIP2/Makefile	(revision 362824)
@@ -1,38 +1,36 @@
 # Created by: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	GeoIP2
-PORTVERSION=	0.040.002
-PORTREVISION=	1
+PORTVERSION=	0.040005
 CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:DROLSKY
+MASTER_SITE_SUBDIR=	CPAN:MAXMIND
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl API for MaxMind GeoIP2 web services and databases
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-Data-Validate-IP>=0.19:${PORTSDIR}/net-mgmt/p5-Data-Validate-IP \
 		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
 		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
 		p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
 		p5-MaxMind-DB-Reader>=0:${PORTSDIR}/net/p5-MaxMind-DB-Reader \
 		p5-Moo>=0:${PORTSDIR}/devel/p5-Moo \
 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
 		p5-Throwable>=0:${PORTSDIR}/devel/p5-Throwable \
 		p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny \
 		p5-URI>=0:${PORTSDIR}/net/p5-URI \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
 		p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \
 		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
 
 USE_PERL5=	configure
 USES=		perl5
 
 .include <bsd.port.mk>
Index: head/net/p5-GeoIP2/distinfo
===================================================================
--- head/net/p5-GeoIP2/distinfo	(revision 362823)
+++ head/net/p5-GeoIP2/distinfo	(revision 362824)
@@ -1,2 +1,2 @@
-SHA256 (GeoIP2-0.040002.tar.gz) = 570545d8049a85cb66f012001e7eeaaedb431a26be1ac831c1691ffadd85c099
-SIZE (GeoIP2-0.040002.tar.gz) = 68853
+SHA256 (GeoIP2-0.040005.tar.gz) = cf485db8bde0c862a207aa5cc4a25091f12dea01af58fc2944c2ed31a61934d2
+SIZE (GeoIP2-0.040005.tar.gz) = 219132
Index: head/net/p5-GeoIP2/pkg-plist
===================================================================
--- head/net/p5-GeoIP2/pkg-plist	(revision 362823)
+++ head/net/p5-GeoIP2/pkg-plist	(revision 362824)
@@ -1,62 +1,69 @@
 bin/web-service-request
 %%SITE_PERL%%/GeoIP2.pm
 %%SITE_PERL%%/GeoIP2/Database/Reader.pm
 %%SITE_PERL%%/GeoIP2/Error/Generic.pm
 %%SITE_PERL%%/GeoIP2/Error/HTTP.pm
 %%SITE_PERL%%/GeoIP2/Error/IPAddressNotFound.pm
 %%SITE_PERL%%/GeoIP2/Error/Type.pm
 %%SITE_PERL%%/GeoIP2/Error/WebService.pm
 %%SITE_PERL%%/GeoIP2/Model/City.pm
-%%SITE_PERL%%/GeoIP2/Model/CityISPOrg.pm
+%%SITE_PERL%%/GeoIP2/Model/ConnectionType.pm
 %%SITE_PERL%%/GeoIP2/Model/Country.pm
-%%SITE_PERL%%/GeoIP2/Model/Omni.pm
+%%SITE_PERL%%/GeoIP2/Model/Domain.pm
+%%SITE_PERL%%/GeoIP2/Model/ISP.pm
+%%SITE_PERL%%/GeoIP2/Model/Insights.pm
 %%SITE_PERL%%/GeoIP2/Record/City.pm
 %%SITE_PERL%%/GeoIP2/Record/Continent.pm
 %%SITE_PERL%%/GeoIP2/Record/Country.pm
 %%SITE_PERL%%/GeoIP2/Record/Location.pm
 %%SITE_PERL%%/GeoIP2/Record/MaxMind.pm
 %%SITE_PERL%%/GeoIP2/Record/Postal.pm
 %%SITE_PERL%%/GeoIP2/Record/RepresentedCountry.pm
 %%SITE_PERL%%/GeoIP2/Record/Subdivision.pm
 %%SITE_PERL%%/GeoIP2/Record/Traits.pm
 %%SITE_PERL%%/GeoIP2/Role/Error/HTTP.pm
+%%SITE_PERL%%/GeoIP2/Role/HasIPAddress.pm
 %%SITE_PERL%%/GeoIP2/Role/HasLocales.pm
 %%SITE_PERL%%/GeoIP2/Role/Model.pm
+%%SITE_PERL%%/GeoIP2/Role/Model/Flat.pm
 %%SITE_PERL%%/GeoIP2/Role/Model/HasSubdivisions.pm
+%%SITE_PERL%%/GeoIP2/Role/Model/Location.pm
 %%SITE_PERL%%/GeoIP2/Role/Record/Country.pm
 %%SITE_PERL%%/GeoIP2/Role/Record/HasNames.pm
 %%SITE_PERL%%/GeoIP2/Types.pm
 %%SITE_PERL%%/GeoIP2/WebService/Client.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/GeoIP2/.packlist
 %%PERL5_MAN3%%/GeoIP2.3.gz
 %%PERL5_MAN3%%/GeoIP2::Database::Reader.3.gz
 %%PERL5_MAN3%%/GeoIP2::Error::Generic.3.gz
 %%PERL5_MAN3%%/GeoIP2::Error::HTTP.3.gz
 %%PERL5_MAN3%%/GeoIP2::Error::IPAddressNotFound.3.gz
 %%PERL5_MAN3%%/GeoIP2::Error::Type.3.gz
 %%PERL5_MAN3%%/GeoIP2::Error::WebService.3.gz
 %%PERL5_MAN3%%/GeoIP2::Model::City.3.gz
-%%PERL5_MAN3%%/GeoIP2::Model::CityISPOrg.3.gz
+%%PERL5_MAN3%%/GeoIP2::Model::ConnectionType.3.gz
 %%PERL5_MAN3%%/GeoIP2::Model::Country.3.gz
-%%PERL5_MAN3%%/GeoIP2::Model::Omni.3.gz
+%%PERL5_MAN3%%/GeoIP2::Model::Domain.3.gz
+%%PERL5_MAN3%%/GeoIP2::Model::ISP.3.gz
+%%PERL5_MAN3%%/GeoIP2::Model::Insights.3.gz
 %%PERL5_MAN3%%/GeoIP2::Record::City.3.gz
 %%PERL5_MAN3%%/GeoIP2::Record::Continent.3.gz
 %%PERL5_MAN3%%/GeoIP2::Record::Country.3.gz
 %%PERL5_MAN3%%/GeoIP2::Record::Location.3.gz
 %%PERL5_MAN3%%/GeoIP2::Record::MaxMind.3.gz
 %%PERL5_MAN3%%/GeoIP2::Record::Postal.3.gz
 %%PERL5_MAN3%%/GeoIP2::Record::RepresentedCountry.3.gz
 %%PERL5_MAN3%%/GeoIP2::Record::Subdivision.3.gz
 %%PERL5_MAN3%%/GeoIP2::Record::Traits.3.gz
 %%PERL5_MAN3%%/GeoIP2::WebService::Client.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/GeoIP2
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/GeoIP2
 @dirrm %%SITE_PERL%%/GeoIP2/WebService
 @dirrm %%SITE_PERL%%/GeoIP2/Role/Record
 @dirrm %%SITE_PERL%%/GeoIP2/Role/Model
 @dirrm %%SITE_PERL%%/GeoIP2/Role/Error
 @dirrm %%SITE_PERL%%/GeoIP2/Role
 @dirrm %%SITE_PERL%%/GeoIP2/Record
 @dirrm %%SITE_PERL%%/GeoIP2/Model
 @dirrm %%SITE_PERL%%/GeoIP2/Error
 @dirrm %%SITE_PERL%%/GeoIP2/Database
-@dirrmtry %%SITE_PERL%%/GeoIP2
+@dirrm %%SITE_PERL%%/GeoIP2