- Update to 3.1

- Use USE_ANT
- Use %%JAVAJARDIR%%
- Use ${INSTALL_DATA} and ${CPIO} rather than ${CP} [1]
- ECHO_CMD -> ECHO_MSG
- Fix homepage in pkg-descr (and arrange the text a little)
- Add 'devel' category

PR:		70213
Submitted by:	me
Reviewed by:	glewis [1]
Approved by:	glewis (mentor), znerd (maintainer)

3 files changed, 25 insertions, 35 deletions

diff --git a/java/jakarta-commons-collections/Makefile b/java/jakarta-commons-collections/Makefile
index fcd30cf17777..1c95022a90d7 100644
--- a/java/jakarta-commons-collections/Makefile
+++ b/java/jakarta-commons-collections/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	commons-collections
-PORTVERSION=	3.0
-CATEGORIES=	java
+PORTVERSION=	3.1
+CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_APACHE_JAKARTA}
 MASTER_SITE_SUBDIR=	commons/collections/source/
 PKGNAMEPREFIX=	jakarta-
@@ -16,43 +16,35 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	znerd@FreeBSD.org
 COMMENT=	Classes that extend/augment the Java Collections Framework
 
-BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/apache-ant
-
 USE_JAVA=	yes
 JAVA_VERSION=	1.2+
+USE_ANT=	yes
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-ANT?=		${LOCALBASE}/bin/ant
-ANT_TARGET=	jar
+ALL_TARGET=	jar
 .if !defined(NOPORTDOCS)
-ANT_TARGET+=	javadoc
+ALL_TARGET+=	javadoc
 OTHERDOCS=	DEVELOPERS-GUIDE.html LICENSE.txt PROPOSAL.html README.txt RELEASE-NOTES.html STATUS.html
 PORTDOCS=	apidocs ${OTHERDOCS}
 .endif
 JARFILE=	${PORTNAME}-${PORTVERSION}.jar
 DESTJARFILE=	${PORTNAME}.jar
-PLIST_FILES+=	${JAVAJARDIR:S,^${PREFIX}/,,}/${DESTJARFILE}
-
-do-build:
-	@cd ${WRKSRC} && ${ANT} ${ANT_TARGET}
+PLIST_FILES+=	%%JAVAJARDIR%%/${DESTJARFILE}
 
 do-install:
-	@${ECHO_CMD} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
+	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
 	@${MKDIR} ${JAVAJARDIR}
-	@${CP} ${WRKSRC}/build/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
-	@${ECHO_CMD} " [ DONE ]"
+	@${INSTALL_DATA} ${WRKSRC}/build/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
+	@${ECHO_MSG} " [ DONE ]"
 
 .if !defined(NOPORTDOCS)
-	@${ECHO_CMD} -n ">> Installing documentation in ${DOCSDIR}..."
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${DOCSDIR}
-	@${CP} -r ${WRKSRC}/build/docs/apidocs ${DOCSDIR}
-	@${ECHO_CMD} -n " apidocs"
-.for DOCFILE in ${OTHERDOCS}
-	@${CP} ${WRKSRC}/${DOCFILE} ${DOCSDIR}
-	@${ECHO_CMD} -n " ${DOCFILE}"
-.endfor
-	@${ECHO_CMD} " [ DONE ]"
+	@cd ${WRKSRC}/build/docs && ${FIND} apidocs \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
+	@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
+	@${ECHO_MSG} " [ DONE ]"
 .endif
 
 .include <bsd.port.mk>
diff --git a/java/jakarta-commons-collections/distinfo b/java/jakarta-commons-collections/distinfo
index c94baa1125e5..d78f7eee05c8 100644
--- a/java/jakarta-commons-collections/distinfo
+++ b/java/jakarta-commons-collections/distinfo
@@ -1,2 +1,2 @@
-MD5 (commons-collections-3.0-src.tar.gz) = 94d08b038526781e9f757048bb68cbae
-SIZE (commons-collections-3.0-src.tar.gz) = 1067775
+MD5 (commons-collections-3.1-src.tar.gz) = 2da710d9c81ae85ee3a386e7ed1b1fe8
+SIZE (commons-collections-3.1-src.tar.gz) = 1137330
diff --git a/java/jakarta-commons-collections/pkg-descr b/java/jakarta-commons-collections/pkg-descr
index 3755e0aa0324..37cd4521e19c 100644
--- a/java/jakarta-commons-collections/pkg-descr
+++ b/java/jakarta-commons-collections/pkg-descr
@@ -1,14 +1,12 @@
-a suite of classes that extend or augment the Java Collections
-Framework.
+A suite of classes that extend or augment the Java Collections Framework.
 
-There are certain holes left unfilled by Sun's implementations,
-and the Jakarta-Commons Collections Component strives to fulfill
-them. Among the features of this package are: 
+There are certain holes left unfilled by Sun's implementations, and the
+Jakarta-Commons Collections Component strives to fulfill them. Among the
+features of this package are: 
 
-Special-purpose implementations of Lists and Maps for fast access
-Adapter classes from Java1-style containers (arrays,
-enumerations) to Java 2-style collections.
-Methods to test or create typical set-theory properties of
+Special-purpose implementations of Lists and Maps for fast access Adapter
+classes from Java1-style containers (arrays, enumerations) to Java 2-style
+collections. Methods to test or create typical set-theory properties of
 collections such as union, intersection, and closure.
 
-WWW: http://jakarta.apache.org/commons/collections.html
+WWW: http://jakarta.apache.org/commons/collections/