diff -rcd java/jakarta-commons-dbcp.orig/Makefile java/jakarta-commons-dbcp/Makefile
*** java/jakarta-commons-dbcp.orig/Makefile	Mon Oct  6 11:28:48 2003
--- java/jakarta-commons-dbcp/Makefile	Sat Nov  8 13:15:01 2003
***************
*** 6,12 ****
  #
  
  PORTNAME=	commons-dbcp
! PORTVERSION=	1.0
  CATEGORIES=	java
  MASTER_SITES=	http://www.apache.org/dist/jakarta/commons/dbcp/source/
  PKGNAMEPREFIX=	jakarta-
--- 6,12 ----
  #
  
  PORTNAME=	commons-dbcp
! PORTVERSION=	1.1
  CATEGORIES=	java
  MASTER_SITES=	http://www.apache.org/dist/jakarta/commons/dbcp/source/
  PKGNAMEPREFIX=	jakarta-
***************
*** 21,33 ****
  
  USE_JAVA=	1.2+
  
! WRKSRC=		${WRKDIR}/${DISTNAME}
  PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
  ANT?=		${LOCALBASE}/bin/ant
  .if defined(NOPORTDOCS)
! ANT_TARGET=	dist-jar
  .else
! ANT_TARGET=	dist-jar doc
  .endif
  JAVASHAREDIR=	${PREFIX}/share/java
  JARDIR=		${JAVASHAREDIR}/classes
--- 21,33 ----
  
  USE_JAVA=	1.2+
  
! WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
  PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
  ANT?=		${LOCALBASE}/bin/ant
  .if defined(NOPORTDOCS)
! ANT_TARGET=	build-jar
  .else
! ANT_TARGET=	build-jar javadoc
  .endif
  JAVASHAREDIR=	${PREFIX}/share/java
  JARDIR=		${JAVASHAREDIR}/classes
diff -rcd java/jakarta-commons-dbcp.orig/distinfo java/jakarta-commons-dbcp/distinfo
*** java/jakarta-commons-dbcp.orig/distinfo	Mon Oct  6 11:28:48 2003
--- java/jakarta-commons-dbcp/distinfo	Sat Nov  8 11:30:54 2003
***************
*** 1 ****
! MD5 (jakarta/commons-dbcp-1.0-src.tar.gz) = 85305821547f060fb6090f022c33e5f9
--- 1 ----
! MD5 (jakarta/commons-dbcp-1.1-src.tar.gz) = 0b18468ef288406ea6d073c35abd9311
Only in java/jakarta-commons-dbcp.orig/files: patch-aa
Only in java/jakarta-commons-dbcp: patch-aa
diff -rcd java/jakarta-commons-dbcp.orig/pkg-plist java/jakarta-commons-dbcp/pkg-plist
*** java/jakarta-commons-dbcp.orig/pkg-plist	Mon Oct  6 11:28:48 2003
--- java/jakarta-commons-dbcp/pkg-plist	Sat Nov  8 13:21:38 2003
***************
*** 1,16 ****
! 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
--- 1,18 ----
! share/java/classes/commons-dbcp.jar
! 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/cpdsadapter/DriverAdapterCPDS.html
! share/doc/commons-dbcp/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.html
! share/doc/commons-dbcp/org/apache/commons/dbcp/datasources/package-summary.html
! share/doc/commons-dbcp/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.html
! share/doc/commons-dbcp/org/apache/commons/dbcp/datasources/package-frame.html
! share/doc/commons-dbcp/org/apache/commons/dbcp/datasources/PerUserPoolDataSourceFactory.html
! share/doc/commons-dbcp/org/apache/commons/dbcp/datasources/SharedPoolDataSource.html
! share/doc/commons-dbcp/org/apache/commons/dbcp/datasources/SharedPoolDataSourceFactory.html
! share/doc/commons-dbcp/org/apache/commons/dbcp/ConnectionFactory.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/DataSourceConnectionFactory.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
***************
*** 24,45 ****
  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
--- 26,51 ----
  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/package-frame.html
+ share/doc/commons-dbcp/org/apache/commons/dbcp/SQLNestedException.html
  share/doc/commons-dbcp/org/apache/commons/dbcp/package-summary.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/org/apache/commons/jocl/ConstructorUtil.html
! share/doc/commons-dbcp/org/apache/commons/jocl/JOCLContentHandler.html
  share/doc/commons-dbcp/serialized-form.html
+ share/doc/commons-dbcp/packages.html
+ share/doc/commons-dbcp/package-list
+ share/doc/commons-dbcp/overview-summary.html
+ share/doc/commons-dbcp/overview-frame.html
+ share/doc/commons-dbcp/index.html
+ share/doc/commons-dbcp/index-all.html
+ share/doc/commons-dbcp/constant-values.html
+ share/doc/commons-dbcp/allclasses-noframe.html
  share/doc/commons-dbcp/stylesheet.css
+ share/doc/commons-dbcp/allclasses-frame.html
  @dirrm share/doc/commons-dbcp/org/apache/commons/dbcp/cpdsadapter
+ @dirrm share/doc/commons-dbcp/org/apache/commons/dbcp/datasources
  @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