Update commons-[dbcp|pool] to 1.1.

Utilize DOCSDIR and PORTDOCS macros.

Submitted by:	Anton Yudin <toha@toha.org.ua> (maintainer)
PR:		59050

6 files changed, 107 insertions, 101 deletions

diff --git a/java/jakarta-commons-dbcp/Makefile b/java/jakarta-commons-dbcp/Makefile
index 6f08557c006c..cf5cdc47b6a1 100644
--- a/java/jakarta-commons-dbcp/Makefile
+++ b/java/jakarta-commons-dbcp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	commons-dbcp
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/commons/dbcp/source/
 PKGNAMEPREFIX=	jakarta-
@@ -21,13 +21,13 @@ BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant \
 
 USE_JAVA=	1.2+
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
 ANT?=		${LOCALBASE}/bin/ant
 .if defined(NOPORTDOCS)
-ANT_TARGET=	dist-jar
+ANT_TARGET=	build-jar
 .else
-ANT_TARGET=	dist-jar doc
+ANT_TARGET=	build-jar javadoc
 .endif
 JAVASHAREDIR=	${PREFIX}/share/java
 JARDIR=		${JAVASHAREDIR}/classes
diff --git a/java/jakarta-commons-dbcp/distinfo b/java/jakarta-commons-dbcp/distinfo
index 5652dd3278d5..41c99894e3a9 100644
--- a/java/jakarta-commons-dbcp/distinfo
+++ b/java/jakarta-commons-dbcp/distinfo
@@ -1 +1 @@
-MD5 (jakarta/commons-dbcp-1.0-src.tar.gz) = 85305821547f060fb6090f022c33e5f9
+MD5 (jakarta/commons-dbcp-1.1-src.tar.gz) = 0b18468ef288406ea6d073c35abd9311
diff --git a/java/jakarta-commons-dbcp/pkg-plist b/java/jakarta-commons-dbcp/pkg-plist
index d471b9bd72de..880490fbb524 100644
--- a/java/jakarta-commons-dbcp/pkg-plist
+++ b/java/jakarta-commons-dbcp/pkg-plist
@@ -1,48 +1,54 @@
-share/doc/commons-dbcp/allclasses-frame.html
-share/doc/commons-dbcp/allclasses-noframe.html
-share/doc/commons-dbcp/constant-values.html
-share/doc/commons-dbcp/index-all.html
-share/doc/commons-dbcp/index.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/AbandonedConfig.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/AbandonedObjectPool.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/AbandonedTrace.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/BasicDataSource.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/BasicDataSourceFactory.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/ConnectionFactory.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/DataSourceConnectionFactory.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/DbcpException.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/DelegatingCallableStatement.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/DelegatingConnection.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/DelegatingPreparedStatement.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/DelegatingResultSet.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/DelegatingStatement.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/DriverConnectionFactory.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/DriverManagerConnectionFactory.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/PoolableConnection.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/PoolableConnectionFactory.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/PoolablePreparedStatement.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/PoolingConnection.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/PoolingDataSource.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/PoolingDriver.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/cpdsadapter/package-frame.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/cpdsadapter/package-summary.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/package-frame.html
-share/doc/commons-dbcp/org/apache/commons/dbcp/package-summary.html
-share/doc/commons-dbcp/org/apache/commons/jocl/ConstructorUtil.html
-share/doc/commons-dbcp/org/apache/commons/jocl/JOCLContentHandler.html
-share/doc/commons-dbcp/org/apache/commons/jocl/package-frame.html
-share/doc/commons-dbcp/org/apache/commons/jocl/package-summary.html
-share/doc/commons-dbcp/overview-frame.html
-share/doc/commons-dbcp/overview-summary.html
-share/doc/commons-dbcp/package-list
-share/doc/commons-dbcp/packages.html
-share/doc/commons-dbcp/serialized-form.html
-share/doc/commons-dbcp/stylesheet.css
-@dirrm share/doc/commons-dbcp/org/apache/commons/dbcp/cpdsadapter
-@dirrm share/doc/commons-dbcp/org/apache/commons/dbcp
-@dirrm share/doc/commons-dbcp/org/apache/commons/jocl
-@dirrm share/doc/commons-dbcp/org/apache/commons
-@dirrm share/doc/commons-dbcp/org/apache
-@dirrm share/doc/commons-dbcp/org
-@dirrm share/doc/commons-dbcp
+share/java/classes/commons-dbcp.jar
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/cpdsadapter/package-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/cpdsadapter/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/datasources/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/datasources/package-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/datasources/PerUserPoolDataSourceFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/datasources/SharedPoolDataSource.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/datasources/SharedPoolDataSourceFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/ConnectionFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/BasicDataSource.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/BasicDataSourceFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/DataSourceConnectionFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/DelegatingCallableStatement.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/DelegatingConnection.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/DelegatingPreparedStatement.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/DelegatingResultSet.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/DelegatingStatement.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/DriverConnectionFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/DriverManagerConnectionFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/PoolableConnection.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/PoolableConnectionFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/PoolablePreparedStatement.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/PoolingConnection.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/PoolingDataSource.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/PoolingDriver.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/package-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/SQLNestedException.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/dbcp/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/jocl/package-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/jocl/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/jocl/ConstructorUtil.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/jocl/JOCLContentHandler.html
+%%PORTDOCS%%%%DOCSDIR%%/serialized-form.html
+%%PORTDOCS%%%%DOCSDIR%%/packages.html
+%%PORTDOCS%%%%DOCSDIR%%/package-list
+%%PORTDOCS%%%%DOCSDIR%%/overview-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/overview-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index-all.html
+%%PORTDOCS%%%%DOCSDIR%%/constant-values.html
+%%PORTDOCS%%%%DOCSDIR%%/allclasses-noframe.html
+%%PORTDOCS%%%%DOCSDIR%%/stylesheet.css
+%%PORTDOCS%%%%DOCSDIR%%/allclasses-frame.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/apache/commons/dbcp/cpdsadapter
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/apache/commons/dbcp/datasources
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/apache/commons/dbcp
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/apache/commons/jocl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/apache/commons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/apache
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/org
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/java/jakarta-commons-pool/Makefile b/java/jakarta-commons-pool/Makefile
index d877d5fa9a14..7b4b0665102d 100644
--- a/java/jakarta-commons-pool/Makefile
+++ b/java/jakarta-commons-pool/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	commons-pool
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1
 CATEGORIES=	java
 MASTER_SITES=	http://www.apache.org/dist/jakarta/commons/pool/source/
 PKGNAMEPREFIX=	jakarta-
-DISTNAME=	pool-${PORTVERSION}-src
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 DIST_SUBDIR=	jakarta
 
 MAINTAINER=	toha@toha.org.ua
@@ -20,13 +20,13 @@ BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
 
 USE_JAVA=	1.2+
 
-WRKSRC=		${WRKDIR}/commons-${DISTNAME}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
 ANT?=		${LOCALBASE}/bin/ant
 .if defined(NOPORTDOCS)
-ANT_TARGET=	dist-jar
+ANT_TARGET=	build-jar
 .else
-ANT_TARGET=	dist-jar doc
+ANT_TARGET=	build-jar javadoc
 .endif
 JAVASHAREDIR=	${PREFIX}/share/java
 JARDIR=		${JAVASHAREDIR}/classes
diff --git a/java/jakarta-commons-pool/distinfo b/java/jakarta-commons-pool/distinfo
index 8573c24d1973..93beef25a5aa 100644
--- a/java/jakarta-commons-pool/distinfo
+++ b/java/jakarta-commons-pool/distinfo
@@ -1 +1 @@
-MD5 (jakarta/pool-1.0.1-src.tar.gz) = df9aaf5ee3e5d68abbee6eca0b8d037f
+MD5 (jakarta/commons-pool-1.1-src.tar.gz) = 344b568101f56cf5bc73d43e6fbe5892
diff --git a/java/jakarta-commons-pool/pkg-plist b/java/jakarta-commons-pool/pkg-plist
index 39e649b8e554..48828c763e50 100644
--- a/java/jakarta-commons-pool/pkg-plist
+++ b/java/jakarta-commons-pool/pkg-plist
@@ -1,43 +1,43 @@
-share/doc/commons-pool/allclasses-frame.html
-share/doc/commons-pool/allclasses-noframe.html
-share/doc/commons-pool/constant-values.html
-share/doc/commons-pool/index-all.html
-share/doc/commons-pool/index.html
-share/doc/commons-pool/org/apache/commons/pool/BaseKeyedObjectPool.html
-share/doc/commons-pool/org/apache/commons/pool/BaseKeyedPoolableObjectFactory.html
-share/doc/commons-pool/org/apache/commons/pool/BaseObjectPool.html
-share/doc/commons-pool/org/apache/commons/pool/BasePoolableObjectFactory.html
-share/doc/commons-pool/org/apache/commons/pool/KeyedObjectPool.html
-share/doc/commons-pool/org/apache/commons/pool/KeyedObjectPoolFactory.html
-share/doc/commons-pool/org/apache/commons/pool/KeyedPoolableObjectFactory.html
-share/doc/commons-pool/org/apache/commons/pool/ObjectPool.html
-share/doc/commons-pool/org/apache/commons/pool/ObjectPoolFactory.html
-share/doc/commons-pool/org/apache/commons/pool/PoolableObjectFactory.html
-share/doc/commons-pool/org/apache/commons/pool/impl/GenericKeyedObjectPool.Config.html
-share/doc/commons-pool/org/apache/commons/pool/impl/GenericKeyedObjectPool.html
-share/doc/commons-pool/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.html
-share/doc/commons-pool/org/apache/commons/pool/impl/GenericObjectPool.Config.html
-share/doc/commons-pool/org/apache/commons/pool/impl/GenericObjectPool.html
-share/doc/commons-pool/org/apache/commons/pool/impl/GenericObjectPoolFactory.html
-share/doc/commons-pool/org/apache/commons/pool/impl/SoftReferenceObjectPool.html
-share/doc/commons-pool/org/apache/commons/pool/impl/StackKeyedObjectPool.html
-share/doc/commons-pool/org/apache/commons/pool/impl/StackKeyedObjectPoolFactory.html
-share/doc/commons-pool/org/apache/commons/pool/impl/StackObjectPool.html
-share/doc/commons-pool/org/apache/commons/pool/impl/StackObjectPoolFactory.html
-share/doc/commons-pool/org/apache/commons/pool/impl/package-frame.html
-share/doc/commons-pool/org/apache/commons/pool/impl/package-summary.html
-share/doc/commons-pool/org/apache/commons/pool/package-frame.html
-share/doc/commons-pool/org/apache/commons/pool/package-summary.html
-share/doc/commons-pool/overview-frame.html
-share/doc/commons-pool/overview-summary.html
-share/doc/commons-pool/package-list
-share/doc/commons-pool/packages.html
-share/doc/commons-pool/serialized-form.html
-share/doc/commons-pool/stylesheet.css
 share/java/classes/commons-pool.jar
-@dirrm share/doc/commons-pool/org/apache/commons/pool/impl
-@dirrm share/doc/commons-pool/org/apache/commons/pool
-@dirrm share/doc/commons-pool/org/apache/commons
-@dirrm share/doc/commons-pool/org/apache
-@dirrm share/doc/commons-pool/org
-@dirrm share/doc/commons-pool
+%%PORTDOCS%%%%DOCSDIR%%/allclasses-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/allclasses-noframe.html
+%%PORTDOCS%%%%DOCSDIR%%/constant-values.html
+%%PORTDOCS%%%%DOCSDIR%%/index-all.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/BaseKeyedObjectPool.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/BaseKeyedPoolableObjectFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/BaseObjectPool.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/BasePoolableObjectFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/KeyedObjectPool.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/KeyedObjectPoolFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/KeyedPoolableObjectFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/ObjectPool.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/ObjectPoolFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/PoolableObjectFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/impl/GenericKeyedObjectPool.Config.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/impl/GenericKeyedObjectPool.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/impl/GenericKeyedObjectPoolFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/impl/GenericObjectPool.Config.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/impl/GenericObjectPool.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/impl/GenericObjectPoolFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/impl/SoftReferenceObjectPool.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/impl/StackKeyedObjectPool.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/impl/StackKeyedObjectPoolFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/impl/StackObjectPool.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/impl/StackObjectPoolFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/impl/package-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/impl/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/package-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/org/apache/commons/pool/package-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/overview-frame.html
+%%PORTDOCS%%%%DOCSDIR%%/overview-summary.html
+%%PORTDOCS%%%%DOCSDIR%%/package-list
+%%PORTDOCS%%%%DOCSDIR%%/packages.html
+%%PORTDOCS%%%%DOCSDIR%%/serialized-form.html
+%%PORTDOCS%%%%DOCSDIR%%/stylesheet.css
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/apache/commons/pool/impl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/apache/commons/pool
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/apache/commons
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/apache
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/org
+%%PORTDOCS%%@dirrm %%DOCSDIR%%