Update to 1.4 release and unbreak.

Take maintainership.

Approved by:	maintainer (by email)

3 files changed, 25 insertions, 36 deletions

diff --git a/java/jakarta-commons-dbcp/Makefile b/java/jakarta-commons-dbcp/Makefile
index b19f9b3516bc..fabdbc84f094 100644
--- a/java/jakarta-commons-dbcp/Makefile
+++ b/java/jakarta-commons-dbcp/Makefile
@@ -6,57 +6,44 @@
 #
 
 PORTNAME=	commons-dbcp
-PORTVERSION=	1.2.2
+PORTVERSION=	1.4
 CATEGORIES=	java databases
 MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-DIST_SUBDIR=	jakarta
 
-MAINTAINER=	toha@toha.org.ua
+MAINTAINER=	ale@FreeBSD.org
 COMMENT=	The DBCP Component
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant \
-		${JAVAJARDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections \
-		${JAVAJARDIR}/commons-pool.jar:${PORTSDIR}/java/jakarta-commons-pool
-
-BROKEN=		does not build unless jakarta-commons-collections is compiled with jdk15
+BUILD_DEPENDS=	${JAVALIBDIR}/commons-pool.jar:${PORTSDIR}/java/jakarta-commons-pool \
+		${JAVALIBDIR}/jta.jar:${PORTSDIR}/java/jta
+RUN_DEPENDS=	${JAVALIBDIR}/commons-pool.jar:${PORTSDIR}/java/jakarta-commons-pool \
+		${JAVALIBDIR}/jta.jar:${PORTSDIR}/java/jta
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.4 1.5
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
-ANT?=		${LOCALBASE}/bin/ant
-.if defined(NOPORTDOCS)
-ANT_TARGET=	build-jar
-.else
-ANT_TARGET=	build-jar javadoc
-PORTDOCS=	*
+JAVA_VERSION=	1.4+
+
+USE_ANT=	yes
+MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
+ALL_TARGET=	build-jar
+.if !defined(NOPORTDOCS)
+ALL_TARGET+=	javadoc
 .endif
-JAVASHAREDIR=	${PREFIX}/share/java
-JARDIR=		${JAVASHAREDIR}/classes
-JARFILE=	${PORTNAME}.jar
-DESTJARFILE=	${PORTNAME}.jar
-PLIST_FILES+=	%%JAVAJARDIR%%/${DESTJARFILE}
 
-post-patch:
-	@${CP} ${WRKSRC}/LICENSE.txt ${WRKSRC}/../LICENSE
+PORTDOCS=	*
 
-do-build:
-	@cd ${WRKSRC} && \
-		${SETENV} JAVA_HOME=${JAVA_HOME} ANT_INCLUDE_SHARED_JARS=YES \
-			${ANT} ${ANT_TARGET}
+PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
 
 do-install:
-	@${ECHO} -n ">> Installing JAR as ${JARDIR}/${DESTJARFILE}..."
-	@${CP} ${WRKSRC}/dist/${JARFILE} ${JARDIR}/${DESTJARFILE}
+	@${ECHO} -n ">> Installing JAR as ${JAVAJARDIR}/${PORTNAME}.jar..."
+	@${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}.jar ${JAVAJARDIR}/
 	@${ECHO} " [ DONE ]"
-
 .if !defined(NOPORTDOCS)
 	@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${DOCSDIR}
-	@${CP} -r ${WRKSRC}/dist/docs/api/* ${DOCSDIR}
+	@cd ${WRKSRC}/dist/docs && ${FIND} api \
+		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
 	@${ECHO} " [ DONE ]"
 .endif
 
diff --git a/java/jakarta-commons-dbcp/distinfo b/java/jakarta-commons-dbcp/distinfo
index 8fc1bf0200eb..0688a690cc36 100644
--- a/java/jakarta-commons-dbcp/distinfo
+++ b/java/jakarta-commons-dbcp/distinfo
@@ -1,3 +1,2 @@
-MD5 (jakarta/commons-dbcp-1.2.2-src.tar.gz) = 57bad7d2abfaa175c743521caccdbd8f
-SHA256 (jakarta/commons-dbcp-1.2.2-src.tar.gz) = 62ba04a48f14cfe7d3aa415fb3a57547955a63a6f422ac79ca1da08f3660edd9
-SIZE (jakarta/commons-dbcp-1.2.2-src.tar.gz) = 641291
+SHA256 (jakarta/commons-dbcp-1.4-src.tar.gz) = f5f10846e79fc71121fe7402c61d71575506b01b59e719e974ebc4d99e6df283
+SIZE (jakarta/commons-dbcp-1.4-src.tar.gz) = 932507
diff --git a/java/jakarta-commons-dbcp/pkg-descr b/java/jakarta-commons-dbcp/pkg-descr
index 101422ea803d..470871cca12f 100644
--- a/java/jakarta-commons-dbcp/pkg-descr
+++ b/java/jakarta-commons-dbcp/pkg-descr
@@ -20,4 +20,7 @@ The DBCP Component
    The commons-dbcp package relies on code in the commons-pool package to
    provide the underlying object pool mechanisms that it utilizes.
 
-WWW: http://jakarta.apache.org/commons/dbcp/
+WWW: http://commons.apache.org/dbcp/
+
+- Alex Dupre
+ale@FreeBSD.org