- Update to bsd.java.mk 2.0 [1]

- Use USE_ANT
- Remove unneeded PLIST_SUB entries
- Dynamic packing list
- Use JAVALIBDIR in BUILD_DEPENDS
- Use INSTALL_DATA to install documentation and JAR files
- Use ECHO_MSG rather than ECHO
- Use MASTER_SITE_APACHE_JAKARTA
- Remove DIST_SUBDIR
- Add 'devel' category

PR:		76036
Submitted by:	maintainer [1]
Approved by:	maintainer

3 files changed, 25 insertions, 23 deletions

diff --git a/java/jakarta-commons-pool/Makefile b/java/jakarta-commons-pool/Makefile
index dde542aee426..3290797f04d0 100644
--- a/java/jakarta-commons-pool/Makefile
+++ b/java/jakarta-commons-pool/Makefile
@@ -7,46 +7,49 @@
 
 PORTNAME=	commons-pool
 PORTVERSION=	1.2
-CATEGORIES=	java
-MASTER_SITES=	http://www.apache.org/dist/jakarta/commons/pool/source/
+CATEGORIES=	java devel
+MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
+MASTER_SITE_SUBDIR=	${PORTNAME:S,-,/,}/source
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-DIST_SUBDIR=	jakarta
 
 MAINTAINER=	toha@toha.org.ua
 COMMENT=	Jakarta Object-pooling API
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant \
-		${JAVAJARDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections
+BUILD_DEPENDS=	${JAR_DEPENDS}
+RUN_DEPENDS=	${JAR_DEPENDS}
 
-USE_JAVA=	1.2+
+JAR_DEPENDS=	${JAVALIBDIR}/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections
+
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
-ANT?=		${LOCALBASE}/bin/ant
+
+USE_ANT=	yes
+MAKE_ENV+=	ANT_INCLUDE_SHARED_JARS=YES
 .if defined(NOPORTDOCS)
-ANT_TARGET=	build-jar
+ALL_TARGET=	build-jar
 .else
-ANT_TARGET=	build-jar javadoc
+ALL_TARGET=	build-jar javadoc
 PORTDOCS=	*
 .endif
 JARFILE=	${PORTNAME}.jar
 DESTJARFILE=	${PORTNAME}.jar
 
-do-build:
-	@cd ${WRKSRC} && \
-		${SETENV} ANT_INCLUDE_SHARED_JARS=YES ${ANT} ${ANT_TARGET}
+PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
 
 do-install:
-	@${ECHO} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
-	@${CP} ${WRKSRC}/dist/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
-	@${ECHO} " [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
+	@${INSTALL_DATA} ${WRKSRC}/dist/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
+	@${ECHO_MSG} " [ DONE ]"
 
 .if !defined(NOPORTDOCS)
-	@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -r ${WRKSRC}/dist/docs/api/* ${DOCSDIR}
-	@${ECHO} " [ DONE ]"
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
+	@cd ${WRKSRC}/dist/docs/api \
+	  && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
+	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
+	@${ECHO_MSG} " [ DONE ]"
 .endif
 
 .include <bsd.port.mk>
diff --git a/java/jakarta-commons-pool/distinfo b/java/jakarta-commons-pool/distinfo
index a98ecd8219bb..1ed1db1f69b5 100644
--- a/java/jakarta-commons-pool/distinfo
+++ b/java/jakarta-commons-pool/distinfo
@@ -1,2 +1,2 @@
-MD5 (jakarta/commons-pool-1.2-src.tar.gz) = e7dc9f479c6a4260f84f6751b434295a
-SIZE (jakarta/commons-pool-1.2-src.tar.gz) = 269500
+MD5 (commons-pool-1.2-src.tar.gz) = e7dc9f479c6a4260f84f6751b434295a
+SIZE (commons-pool-1.2-src.tar.gz) = 269500
diff --git a/java/jakarta-commons-pool/pkg-plist b/java/jakarta-commons-pool/pkg-plist
deleted file mode 100644
index a0ad44396c9f..000000000000
--- a/java/jakarta-commons-pool/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-%%JAVAJARDIR%%/commons-pool.jar