diff --git a/java/jakarta-commons-dbcp/Makefile b/java/jakarta-commons-dbcp/Makefile
index cf5cdc47b6a1..0463c966d7a3 100644
--- a/java/jakarta-commons-dbcp/Makefile
+++ b/java/jakarta-commons-dbcp/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	toha@toha.org.ua
 COMMENT=	The DBCP Component
 
 BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant \
-		${LOCALBASE}/share/java/classes/commons-pool.jar:${PORTSDIR}/java/jakarta-commons-pool \
+		${JAVAJARDIR}/commons-pool.jar:${PORTSDIR}/java/jakarta-commons-pool
 
 USE_JAVA=	1.2+
 
@@ -28,6 +28,7 @@ ANT?=		${LOCALBASE}/bin/ant
 ANT_TARGET=	build-jar
 .else
 ANT_TARGET=	build-jar javadoc
+PORTDOCS=	*
 .endif
 JAVASHAREDIR=	${PREFIX}/share/java
 JARDIR=		${JAVASHAREDIR}/classes
diff --git a/java/jakarta-commons-dbcp/files/patch-aa b/java/jakarta-commons-dbcp/files/patch-aa
deleted file mode 100644
index 85f8c2eb2e93..000000000000
--- a/java/jakarta-commons-dbcp/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** build.xml.orig	Sat Oct  4 14:56:13 2003
---- build.xml	Sat Oct  4 14:56:15 2003
-***************
-*** 282,288 ****
-              <patternset refid="patternset-non-test-classes"/>
-           </fileset>
-        </copy>
-!       <jar jarfile="${dest.jardir.jar}" manifest="${dest.conf}/MANIFEST.MF">
-           <fileset dir="${workdir}"/>
-        </jar>
-        <delete dir="${workdir}"/>
---- 282,288 ----
-              <patternset refid="patternset-non-test-classes"/>
-           </fileset>
-        </copy>
-!       <jar jarfile="${dest.jardir.jar}" manifest="${source.src.conf}/MANIFEST.MF">
-           <fileset dir="${workdir}"/>
-        </jar>
-        <delete dir="${workdir}"/>
diff --git a/java/jakarta-commons-dbcp/pkg-plist b/java/jakarta-commons-dbcp/pkg-plist
index 880490fbb524..32f95c279ae7 100644
--- a/java/jakarta-commons-dbcp/pkg-plist
+++ b/java/jakarta-commons-dbcp/pkg-plist
@@ -1,54 +1 @@
 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%%