3 files changed, 40 insertions, 19 deletions

diff --git a/java/jakarta-commons-collections/Makefile b/java/jakarta-commons-collections/Makefile
index 32986888b885..1bcb489c92fa 100644
--- a/java/jakarta-commons-collections/Makefile
+++ b/java/jakarta-commons-collections/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	commons-collections
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 CATEGORIES=	java
 MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-commons/release/${PORTNAME}/v${PORTVERSION}/
 PKGNAMEPREFIX=	jakarta-
diff --git a/java/jakarta-commons-collections/distinfo b/java/jakarta-commons-collections/distinfo
index ca7bdb4a98af..5538127e9433 100644
--- a/java/jakarta-commons-collections/distinfo
+++ b/java/jakarta-commons-collections/distinfo
@@ -1 +1 @@
-MD5 (commons-collections-2.0-src.tar.gz) = c7cc95130838336ec5ffe14ea5fcb661
+MD5 (commons-collections-2.1-src.tar.gz) = ee30c02b1b57693f72cd86c899b925d9
diff --git a/java/jakarta-commons-collections/pkg-plist b/java/jakarta-commons-collections/pkg-plist
index cbd1a6d5f28b..4314c7365fea 100644
--- a/java/jakarta-commons-collections/pkg-plist
+++ b/java/jakarta-commons-collections/pkg-plist
@@ -1,51 +1,71 @@
-share/doc/commons-collections/org/apache/commons/collections/comparators/package-summary.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/UniqueFilterIterator.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/package-frame.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/ArrayIterator.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/CollatingIterator.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/EnumerationIterator.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/FilterIterator.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/FilterListIterator.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/IteratorChain.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/IteratorEnumeration.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/ListIteratorWrapper.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/ProxyIterator.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/ProxyListIterator.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/SingletonIterator.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/SingletonListIterator.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/TransformIterator.html
+share/doc/commons-collections/org/apache/commons/collections/iterators/package-summary.html
+share/doc/commons-collections/org/apache/commons/collections/comparators/ComparatorChain.html
 share/doc/commons-collections/org/apache/commons/collections/comparators/package-frame.html
 share/doc/commons-collections/org/apache/commons/collections/comparators/ComparableComparator.html
-share/doc/commons-collections/org/apache/commons/collections/comparators/ComparatorChain.html
+share/doc/commons-collections/org/apache/commons/collections/comparators/package-summary.html
+share/doc/commons-collections/org/apache/commons/collections/comparators/NullComparator.html
 share/doc/commons-collections/org/apache/commons/collections/comparators/ReverseComparator.html
-share/doc/commons-collections/org/apache/commons/collections/package-frame.html
+share/doc/commons-collections/org/apache/commons/collections/comparators/TransformingComparator.html
 share/doc/commons-collections/org/apache/commons/collections/Bag.html
+share/doc/commons-collections/org/apache/commons/collections/Buffer.html
 share/doc/commons-collections/org/apache/commons/collections/Closure.html
+share/doc/commons-collections/org/apache/commons/collections/Factory.html
 share/doc/commons-collections/org/apache/commons/collections/MultiMap.html
 share/doc/commons-collections/org/apache/commons/collections/Predicate.html
 share/doc/commons-collections/org/apache/commons/collections/PriorityQueue.html
 share/doc/commons-collections/org/apache/commons/collections/SortedBag.html
 share/doc/commons-collections/org/apache/commons/collections/Transformer.html
-share/doc/commons-collections/org/apache/commons/collections/AbstractBag.html
-share/doc/commons-collections/org/apache/commons/collections/ArrayIterator.html
 share/doc/commons-collections/org/apache/commons/collections/ArrayStack.html
+share/doc/commons-collections/org/apache/commons/collections/BagUtils.html
 share/doc/commons-collections/org/apache/commons/collections/BeanMap.html
 share/doc/commons-collections/org/apache/commons/collections/BeanMap.MyMapEntry.html
 share/doc/commons-collections/org/apache/commons/collections/BinaryHeap.html
+share/doc/commons-collections/org/apache/commons/collections/BoundedFifoBuffer.html
+share/doc/commons-collections/org/apache/commons/collections/BufferUtils.html
 share/doc/commons-collections/org/apache/commons/collections/CollectionUtils.html
+share/doc/commons-collections/org/apache/commons/collections/ComparatorUtils.html
 share/doc/commons-collections/org/apache/commons/collections/CursorableLinkedList.html
-share/doc/commons-collections/org/apache/commons/collections/DefaultMapBag.html
 share/doc/commons-collections/org/apache/commons/collections/CursorableLinkedList.Cursor.html
+share/doc/commons-collections/org/apache/commons/collections/DefaultMapBag.html
 share/doc/commons-collections/org/apache/commons/collections/DefaultMapEntry.html
 share/doc/commons-collections/org/apache/commons/collections/DoubleOrderedMap.html
-share/doc/commons-collections/org/apache/commons/collections/EnumerationIterator.html
 share/doc/commons-collections/org/apache/commons/collections/ExtendedProperties.html
 share/doc/commons-collections/org/apache/commons/collections/FastArrayList.html
 share/doc/commons-collections/org/apache/commons/collections/FastHashMap.html
 share/doc/commons-collections/org/apache/commons/collections/FastTreeMap.html
-share/doc/commons-collections/org/apache/commons/collections/FilterIterator.html
-share/doc/commons-collections/org/apache/commons/collections/FilterListIterator.html
 share/doc/commons-collections/org/apache/commons/collections/HashBag.html
-share/doc/commons-collections/org/apache/commons/collections/IteratorEnumeration.html
+share/doc/commons-collections/org/apache/commons/collections/IteratorUtils.html
+share/doc/commons-collections/org/apache/commons/collections/ListUtils.html
 share/doc/commons-collections/org/apache/commons/collections/LRUMap.html
 share/doc/commons-collections/org/apache/commons/collections/MapUtils.html
 share/doc/commons-collections/org/apache/commons/collections/MultiHashMap.html
-share/doc/commons-collections/org/apache/commons/collections/ProxyIterator.html
-share/doc/commons-collections/org/apache/commons/collections/ProxyListIterator.html
 share/doc/commons-collections/org/apache/commons/collections/ProxyMap.html
+share/doc/commons-collections/org/apache/commons/collections/ReferenceMap.html
 share/doc/commons-collections/org/apache/commons/collections/SequencedHashMap.html
-share/doc/commons-collections/org/apache/commons/collections/SingletonIterator.html
-share/doc/commons-collections/org/apache/commons/collections/SoftRefHashMap.html
-share/doc/commons-collections/org/apache/commons/collections/StringStack.html
+share/doc/commons-collections/org/apache/commons/collections/SetUtils.html
+share/doc/commons-collections/org/apache/commons/collections/StaticBucketMap.html
 share/doc/commons-collections/org/apache/commons/collections/SynchronizedPriorityQueue.html
-share/doc/commons-collections/org/apache/commons/collections/TransformIterator.html
-share/doc/commons-collections/org/apache/commons/collections/package-summary.html
 share/doc/commons-collections/org/apache/commons/collections/TreeBag.html
+share/doc/commons-collections/org/apache/commons/collections/UnboundedFifoBuffer.html
+share/doc/commons-collections/org/apache/commons/collections/BufferOverflowException.html
+share/doc/commons-collections/org/apache/commons/collections/package-summary.html
+share/doc/commons-collections/org/apache/commons/collections/BufferUnderflowException.html
+share/doc/commons-collections/org/apache/commons/collections/package-frame.html
 share/doc/commons-collections/serialized-form.html
 share/doc/commons-collections/packages.html
 share/doc/commons-collections/package-list
@@ -56,6 +76,7 @@ share/doc/commons-collections/index-all.html
 share/doc/commons-collections/stylesheet.css
 share/doc/commons-collections/allclasses-frame.html
 share/java/classes/commons-collections.jar
+@dirrm share/doc/commons-collections/org/apache/commons/collections/iterators
 @dirrm share/doc/commons-collections/org/apache/commons/collections/comparators
 @dirrm share/doc/commons-collections/org/apache/commons/collections
 @dirrm share/doc/commons-collections/org/apache/commons