3 files changed, 44 insertions, 58 deletions

diff --git a/www/p5-CGI-Session/Makefile b/www/p5-CGI-Session/Makefile
index 8ae1ec6c479a..af6eeb1f715d 100644
--- a/www/p5-CGI-Session/Makefile
+++ b/www/p5-CGI-Session/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	CGI-Session
-PORTVERSION=	3.95
+PORTVERSION=	4.13
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	CGI
@@ -17,21 +17,26 @@ COMMENT=	Perl extension for persistent session management
 
 PERL_CONFIGURE=	yes
 
-MAN3=		CGI::Session::DB_File.3 \
-		CGI::Session::Example.3 \
-		CGI::Session::MySQL.3 \
-		CGI::Session::File.3 \
+MAN3=		\
 		CGI::Session.3 \
-		CGI::Session::ID::Incr.3 \
-		CGI::Session::ID::SHA1.3 \
-		CGI::Session::Serialize::FreezeThaw.3 \
-		CGI::Session::Serialize::Default.3 \
-		CGI::Session::BluePrint.3 \
-		CGI::Session::ID::MD5.3 \
-		CGI::Session::PostgreSQL.3 \
+		CGI::Session::Driver.3 \
+		CGI::Session::Driver::DBI.3 \
+		CGI::Session::Driver::db_file.3 \
+		CGI::Session::Driver::file.3 \
+		CGI::Session::Driver::mysql.3 \
+		CGI::Session::Driver::postgresql.3 \
+		CGI::Session::Driver::sqlite.3 \
+		CGI::Session::ErrorHandler.3 \
+		CGI::Session::ID::incr.3 \
+		CGI::Session::ID::md5.3 \
+		CGI::Session::ID::static.3 \
+		CGI::Session::Serialize::default.3 \
+		CGI::Session::Serialize::freezethaw.3 \
+		CGI::Session::Serialize::json.3 \
+		CGI::Session::Serialize::storable.3 \
+		CGI::Session::Serialize::yaml.3 \
+		CGI::Session::Test::Default.3 \
 		CGI::Session::Tutorial.3 \
-		CGI::Session::CookBook.3 \
-		CGI::Session::Serialize::Storable.3
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/p5-CGI-Session/distinfo b/www/p5-CGI-Session/distinfo
index 9235dc3aca46..381adc879321 100644
--- a/www/p5-CGI-Session/distinfo
+++ b/www/p5-CGI-Session/distinfo
@@ -1,3 +1,3 @@
-MD5 (CGI-Session-3.95.tar.gz) = fe9e46496c7c711c54ca13209ded500b
-SHA256 (CGI-Session-3.95.tar.gz) = 1335e9457e6d1b6a4b9a88d56dc06e46dd82258d9f6324047e6ffa8e7a949698
-SIZE (CGI-Session-3.95.tar.gz) = 57398
+MD5 (CGI-Session-4.13.tar.gz) = 3fa53260d98b24abe1e69f6b514bf131
+SHA256 (CGI-Session-4.13.tar.gz) = 58d47bee407c70fca7a0289956da3de4555e8dc178fe38bfe6216906ad2d8730
+SIZE (CGI-Session-4.13.tar.gz) = 56548
diff --git a/www/p5-CGI-Session/pkg-plist b/www/p5-CGI-Session/pkg-plist
index 4ac79c11f0aa..f6b4559baedc 100644
--- a/www/p5-CGI-Session/pkg-plist
+++ b/www/p5-CGI-Session/pkg-plist
@@ -1,47 +1,28 @@
-%%SITE_PERL%%/CGI/Session/BluePrint.pm
-%%SITE_PERL%%/CGI/Session/PostgreSQL.pm
-%%SITE_PERL%%/CGI/Session/Tutorial.pm
-%%SITE_PERL%%/CGI/Session/CookBook.pm
-%%SITE_PERL%%/CGI/Session/Serialize/FreezeThaw.pm
-%%SITE_PERL%%/CGI/Session/Serialize/Default.pm
-%%SITE_PERL%%/CGI/Session/Serialize/Storable.pm
-@dirrm %%SITE_PERL%%/CGI/Session/Serialize
-%%SITE_PERL%%/CGI/Session/ID/Incr.pm
-%%SITE_PERL%%/CGI/Session/ID/MD5.pm
-%%SITE_PERL%%/CGI/Session/ID/SHA1.pm
-@dirrm %%SITE_PERL%%/CGI/Session/ID
-%%SITE_PERL%%/CGI/Session/DB_File.pm
-%%SITE_PERL%%/CGI/Session/Example.pm
-%%SITE_PERL%%/CGI/Session/MySQL.pm
-%%SITE_PERL%%/CGI/Session/File.pm
 %%SITE_PERL%%/CGI/Session.pm
-%%SITE_PERL%%/auto/CGI/Session/remote_addr.al
-%%SITE_PERL%%/auto/CGI/Session/errstr.al
-%%SITE_PERL%%/auto/CGI/Session/expire.al
-%%SITE_PERL%%/auto/CGI/Session/_time_alias.al
-%%SITE_PERL%%/auto/CGI/Session/name.al
-%%SITE_PERL%%/auto/CGI/Session/header.al
-%%SITE_PERL%%/auto/CGI/Session/sync_param.al
-%%SITE_PERL%%/auto/CGI/Session/close.al
-%%SITE_PERL%%/auto/CGI/Session/expires.al
-%%SITE_PERL%%/auto/CGI/Session/ctime.al
-%%SITE_PERL%%/auto/CGI/Session/atime.al
-%%SITE_PERL%%/auto/CGI/Session/param_hashref.al
-%%SITE_PERL%%/auto/CGI/Session/save_param.al
-%%SITE_PERL%%/auto/CGI/Session/load_param.al
-%%SITE_PERL%%/auto/CGI/Session/clear.al
-%%SITE_PERL%%/auto/CGI/Session/error.al
-%%SITE_PERL%%/auto/CGI/Session/delete.al
-%%SITE_PERL%%/auto/CGI/Session/is_new.al
-%%SITE_PERL%%/auto/CGI/Session/version.al
-%%SITE_PERL%%/auto/CGI/Session/dump.al
-%%SITE_PERL%%/auto/CGI/Session/autosplit.ix
+%%SITE_PERL%%/CGI/Session/Driver.pm
+%%SITE_PERL%%/CGI/Session/Driver/DBI.pm
+%%SITE_PERL%%/CGI/Session/Driver/db_file.pm
+%%SITE_PERL%%/CGI/Session/Driver/file.pm
+%%SITE_PERL%%/CGI/Session/Driver/mysql.pm
+%%SITE_PERL%%/CGI/Session/Driver/postgresql.pm
+%%SITE_PERL%%/CGI/Session/Driver/sqlite.pm
+%%SITE_PERL%%/CGI/Session/ErrorHandler.pm
+%%SITE_PERL%%/CGI/Session/ID/incr.pm
+%%SITE_PERL%%/CGI/Session/ID/md5.pm
+%%SITE_PERL%%/CGI/Session/ID/static.pm
+%%SITE_PERL%%/CGI/Session/Serialize/default.pm
+%%SITE_PERL%%/CGI/Session/Serialize/freezethaw.pm
+%%SITE_PERL%%/CGI/Session/Serialize/json.pm
+%%SITE_PERL%%/CGI/Session/Serialize/storable.pm
+%%SITE_PERL%%/CGI/Session/Serialize/yaml.pm
+%%SITE_PERL%%/CGI/Session/Test/Default.pm
+%%SITE_PERL%%/CGI/Session/Tutorial.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session/.packlist
+@dirrm %%SITE_PERL%%/CGI/Session/Driver
+@dirrm %%SITE_PERL%%/CGI/Session/ID
+@dirrm %%SITE_PERL%%/CGI/Session/Serialize
+@dirrm %%SITE_PERL%%/CGI/Session/Test
 @dirrm %%SITE_PERL%%/CGI/Session
 @dirrmtry %%SITE_PERL%%/CGI
-@dirrm %%SITE_PERL%%/auto/CGI/Session
-@dirrmtry %%SITE_PERL%%/auto/CGI/Session
-@dirrmtry %%SITE_PERL%%/auto/CGI
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI/Session
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/CGI
-@dirrmtry %%SITE_PERL%%/mach/auto/CGI