java/apache-commons-collections:

- Update to 3.2.2 - the latest release in 3.x series
- Add LICENSE_FILE
- Drop now needless dos2unix conversion
- Rework port description

4 files changed, 26 insertions, 19 deletions

diff --git a/java/apache-commons-collections/Makefile b/java/apache-commons-collections/Makefile
index 16ab1601e58f..18b15d83f86e 100644
--- a/java/apache-commons-collections/Makefile
+++ b/java/apache-commons-collections/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	commons-collections
-PORTVERSION=	3.2.1
+PORTVERSION=	3.2.2
 CATEGORIES=	java devel
 MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	apache-
@@ -12,17 +12,15 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Classes that extend/augment the Java Collections Framework
 
 LICENSE=	APACHE20
-
-USES=		dos2unix
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_JAVA=	yes
 JAVA_VERSION=	8+
 USE_ANT=	yes
-DOS2UNIX_GLOB=	Multi*.java Test*.java
 
 ALL_TARGET=	jar
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
-OTHERDOCS=	DEVELOPERS-GUIDE.html LICENSE.txt PROPOSAL.html README.txt RELEASE-NOTES.html
+PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar
+OTHERDOCS=	DEVELOPERS-GUIDE.html PROPOSAL.html README.txt RELEASE-NOTES.txt
 PORTDOCS=	apidocs ${OTHERDOCS}
 
 OPTIONS_DEFINE=	DOCS
diff --git a/java/apache-commons-collections/distinfo b/java/apache-commons-collections/distinfo
index ef7c4127095b..7c9db0d8a06b 100644
--- a/java/apache-commons-collections/distinfo
+++ b/java/apache-commons-collections/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1570206793
-SHA256 (commons-collections-3.2.1-src.tar.gz) = 9a4a800cb7ecdaf3b6f608cd608682b88b506f1b1c4b727d15471ae3329fc63d
-SIZE (commons-collections-3.2.1-src.tar.gz) = 609930
+TIMESTAMP = 1593348160
+SHA256 (commons-collections-3.2.2-src.tar.gz) = 070d94fe77969d8949bd129a618e6a7bee6b83b5b5db3ef3f983395a5428b914
+SIZE (commons-collections-3.2.2-src.tar.gz) = 630693
diff --git a/java/apache-commons-collections/files/patch-src_conf_MANIFEST.MF b/java/apache-commons-collections/files/patch-src_conf_MANIFEST.MF
new file mode 100644
index 000000000000..7822e2da9848
--- /dev/null
+++ b/java/apache-commons-collections/files/patch-src_conf_MANIFEST.MF
@@ -0,0 +1,15 @@
+--- src/conf/MANIFEST.MF.orig	2020-06-28 13:06:28 UTC
++++ src/conf/MANIFEST.MF
+@@ -0,0 +1,12 @@
++Manifest-Version: 1.0
++Package: org.apache.commons.collections
++Extension-Name: commons-collections
++Specification-Version: @version@
++Specification-Vendor: Apache Software Foundation
++Specification-Title: Commons Collections
++Implementation-Version: @version@
++Implementation-Vendor: Apache Software Foundation
++Implementation-Title: Commons Collections
++Implementation-Vendor-Id: org.apache
++X-Compile-Source-JDK: 1.3
++X-Compile-Target-JDK: 1.3
diff --git a/java/apache-commons-collections/pkg-descr b/java/apache-commons-collections/pkg-descr
index 82612041d587..2bd43bc1ee26 100644
--- a/java/apache-commons-collections/pkg-descr
+++ b/java/apache-commons-collections/pkg-descr
@@ -1,11 +1,5 @@
-A suite of classes that extend or augment the Java Collections Framework.
+A suite of classes that extend or augment the Java Collections
+Framework. Commons-Collections seek to build upon the JDK classes
+by providing new interfaces, implementations and utilities.
 
-Commons-Collections seek to build upon the JDK classes by providing new interfaces, implementations and utilities. There are many features,
-including:
-
-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://commons.apache.org/proper/commons-collections/
+WWW: https://commons.apache.org/proper/commons-collections/