Bug 59050

Summary: update jakarta-commons-dbcp and jakarta-commons-pool ports
Product: Ports & Packages Reporter: toha <toha>
Component: Individual Port(s)Assignee: freebsd-ports-bugs (Nobody) <ports-bugs>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff
none
file.diff none

Description toha 2003-11-08 11:40:13 UTC 

    


    


      



        
          Comment 1
        

        
          toha

        

        
        

        
          2003-11-11 10:29:54 UTC
        

      






honor NOPORTDOCS:


diff -ur 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,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 @@
 
 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 -ur 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 +1 @@
-MD5 (jakarta/commons-dbcp-1.0-src.tar.gz) = 85305821547f060fb6090f022c33e5f9
+MD5 (jakarta/commons-dbcp-1.1-src.tar.gz) = 0b18468ef288406ea6d073c35abd9311
Only in java/jakarta-commons-dbcp.orig/files: patch-aa
diff -ur 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	Tue Nov 11 12:15:20 2003
@@ -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 -ur java/jakarta-commons-pool.orig/Makefile java/jakarta-commons-pool/Makefile
--- java/jakarta-commons-pool.orig/Makefile	Mon Oct  6 11:27:58 2003
+++ java/jakarta-commons-pool/Makefile	Sat Nov  8 11:41:01 2003
@@ -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 @@
 
 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 -ur java/jakarta-commons-pool.orig/distinfo java/jakarta-commons-pool/distinfo
--- java/jakarta-commons-pool.orig/distinfo	Mon Oct  6 11:27:58 2003
+++ java/jakarta-commons-pool/distinfo	Sat Nov  8 11:38:57 2003
@@ -1 +1 @@
-MD5 (jakarta/pool-1.0.1-src.tar.gz) = df9aaf5ee3e5d68abbee6eca0b8d037f
+MD5 (jakarta/commons-pool-1.1-src.tar.gz) = 344b568101f56cf5bc73d43e6fbe5892
diff -ur java/jakarta-commons-pool.orig/pkg-plist java/jakarta-commons-pool/pkg-plist
--- java/jakarta-commons-pool.orig/pkg-plist	Mon Oct  6 11:27:58 2003
+++ java/jakarta-commons-pool/pkg-plist	Tue Nov 11 12:20:48 2003
@@ -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%%

    


    


      



        
          Comment 2
        

        
          Sergey A. Osokin

        

        
            freebsd_committer
            freebsd_triage
        

        
          2003-11-11 11:56:16 UTC
        

      






State Changed
From-To: open->closed

Committed, thanks!