6 files changed, 44 insertions, 31 deletions

diff --git a/devel/p5-ResourcePool/Makefile b/devel/p5-ResourcePool/Makefile
index e7ed4fd46562..318272f5ddb2 100644
--- a/devel/p5-ResourcePool/Makefile
+++ b/devel/p5-ResourcePool/Makefile
@@ -7,14 +7,18 @@
 #
 
 PORTNAME=	ResourcePool
-PORTVERSION=	0.9909
+PORTVERSION=	1.0000
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN} \
 		http://www.fatalmind.com/projects/ResourcePool/
 MASTER_SITE_SUBDIR=	../by-authors/id/M/MW/MWS
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	erwin@lansing.dk
+COMMENT=	A generic way to use connection caching for any kind of resources
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	YES
 
@@ -23,13 +27,12 @@ MAN3=	ResourcePool.3 \
 	ResourcePool::BigPicture.3 \
 	ResourcePool::ExtensionGuide.3 \
 	ResourcePool::Factory.3 \
-	ResourcePool::Factory::DBI.3 \
-	ResourcePool::Factory::Net::LDAP.3 \
 	ResourcePool::LoadBalancer.3 \
 	ResourcePool::Resource.3 \
-	ResourcePool::Resource::DBI.3 \
-	ResourcePool::Resource::Net::LDAP.3 \
 	ResourcePool::Singleton.3 \
 	ResourcePool::UML.3
 
+post-install:
+	@${CAT} pkg-message
+
 .include <bsd.port.mk>
diff --git a/devel/p5-ResourcePool/distinfo b/devel/p5-ResourcePool/distinfo
index 4059bf1c4b4f..54f04f588941 100644
--- a/devel/p5-ResourcePool/distinfo
+++ b/devel/p5-ResourcePool/distinfo
@@ -1 +1 @@
-MD5 (ResourcePool-0.9909.tar.gz) = 3d04d1744f8c47e80db4919dd9ff89b5
+MD5 (ResourcePool-1.0000.tar.gz) = 08ca6f1889a9b7234d95033b5c9a06e9
diff --git a/devel/p5-ResourcePool/pkg-comment b/devel/p5-ResourcePool/pkg-comment
deleted file mode 100644
index 5a27312d5ca4..000000000000
--- a/devel/p5-ResourcePool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A generic way to use connection caching for any kind of resources
diff --git a/devel/p5-ResourcePool/pkg-descr b/devel/p5-ResourcePool/pkg-descr
index f4c962c90f12..ed75757fc485 100644
--- a/devel/p5-ResourcePool/pkg-descr
+++ b/devel/p5-ResourcePool/pkg-descr
@@ -1,13 +1,24 @@
-The ResourcePool provides a generic way to use connection caching for any
-kind of resources. The package includes classes to deal with DBI and
-Net::LDAP resources and is easily extensible. It has also a LoadBalancer
-class to spread load across different servers and is able to do fail over
-to increase the overall availability of the service.
-
-Use this package if you... 
-   ...want to use connection caching (persistent connections) for something
-      which is NOT DBI (e.g. Net::LDAP).
-   ...have more then one server which can handle your requests and need to
-      implement load balancing and/or fail over.
+The ResourcePool is a generic connection caching and pooling management
+facility. It might be used in an Apache/mod_perl environment to support
+connection caching like Apache::DBI for non-DBI resources
+(e.g. Net::LDAP). It's also useful in a stand alone perl application
+to handle connection pools.
+
+The key benefit of ResourcePool is the generic design which makes it
+easily extensible to new resource types.
+
+The ResourcePool has a simple check mechanism to detect and close broken
+connections (e.g. if the database server was restarted) and opens new
+connections if possible.
+
+If you are new to ResourcePool you should go to the ResourcePool::BigPicture
+documentation which provides the best entry point to this module.
+
+The ResourcePool itself handles always exactly equivalent connections
+(e.g. connections to the same server with the same user-name and password)
+and is therefore not able to do a load balancing. The
+ResourcePool::LoadBalancer is able to do a advanced load balancing across
+different servers and increases the overall availability by applying a
+failover policy if there is a server breakdown. 
 
 WWW: http://www.fatalmind.com/projects/ResourcePool/
diff --git a/devel/p5-ResourcePool/pkg-message b/devel/p5-ResourcePool/pkg-message
new file mode 100644
index 000000000000..d14871df81ad
--- /dev/null
+++ b/devel/p5-ResourcePool/pkg-message
@@ -0,0 +1,8 @@
+==============================================================================
+
+From this version 1.0000 on, the p5-ResourcePool package will not contain 
+resource bindings anymore. The previously included bindings for 
+DBI and Net::LDAP are available in the databases/p5-ResourcePool-Resource-DBI 
+and net/p5-ResourcePool-Resource-Net-LDAP ports.
+
+==============================================================================
diff --git a/devel/p5-ResourcePool/pkg-plist b/devel/p5-ResourcePool/pkg-plist
index e3e65674e32c..1de90b8eef36 100644
--- a/devel/p5-ResourcePool/pkg-plist
+++ b/devel/p5-ResourcePool/pkg-plist
@@ -4,25 +4,17 @@ lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/BigPicture.pod
 lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/ExtensionGuide.pod
 lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory.pm
 lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/DBI.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/Net/LDAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/Net/LDAP.pod
 lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer.pm
 lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer.pod
+lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer/LeastUsage.pm
+lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer/FallBack.pm
+lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer/RoundRobin.pm
 lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource.pm
 lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/DBI.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/DBI.pod
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/Net/LDAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/Net/LDAP.pod
 lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Singleton.pm
 lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Singleton.pod
 lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/UML.pod
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory/Net
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Factory
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource/Net
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/Resource
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool/LoadBalancer
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/ResourcePool
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool/.packlist
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/ResourcePool