2 files changed, 65 insertions, 90 deletions

diff --git a/java/jakarta-commons-cli/Makefile b/java/jakarta-commons-cli/Makefile
index 56a35039ffdb..702cb43f2a00 100644
--- a/java/jakarta-commons-cli/Makefile
+++ b/java/jakarta-commons-cli/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${ANT}:${PORTSDIR}/devel/jakarta-ant \
 		${LOCALBASE}/share/java/classes/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang
 
 USE_JAVA=	1.2+
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_SUB+=	T=${TARGET_DIR:S/^${PREFIX}\///}
 ANT?=		${LOCALBASE}/bin/ant
@@ -29,21 +29,22 @@ ANT_TARGET=	jar javadoc -Dnoget -verbose
 .endif
 JAVASHAREDIR=	${PREFIX}/share/java
 JARDIR=		${JAVASHAREDIR}/classes
-JARFILE=	${PORTNAME}.jar
+JARFILE=	${PORTNAME}-${PORTVERSION}-beta-2-dev.jar
+DESTJARFILE=	${PORTNAME}.jar
 
 do-build:
 	@${MKDIR} ${WRKSRC}/lib
 	@cd ${WRKSRC} && ${ANT} ${ANT_TARGET}
 
 do-install:
-	@${ECHO} -n ">> Installing JAR as ${JARDIR}/${JARFILE}..."
-	@${CP} ${WRKSRC}/dist/${JARFILE} ${JARDIR}/
+	@${ECHO} -n ">> Installing JAR as ${JARDIR}/${DESTJARFILE}..."
+	@${CP} ${WRKSRC}/target/${JARFILE} ${JARDIR}/${DESTJARFILE}
 	@${ECHO} " [ DONE ]"
 
 .if !defined(NOPORTDOCS)
 	@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
 	${MKDIR} ${DOCSDIR}
-	${CP} -r ${WRKSRC}/dist/docs/api/* ${DOCSDIR}
+	${CP} -r ${WRKSRC}/target/docs/apidocs/* ${DOCSDIR}
 	@${ECHO} " [ DONE ]"
 .endif
 
diff --git a/java/jakarta-commons-cli/pkg-plist b/java/jakarta-commons-cli/pkg-plist
index 4314c7365fea..afe9beae934c 100644
--- a/java/jakarta-commons-cli/pkg-plist
+++ b/java/jakarta-commons-cli/pkg-plist
@@ -1,85 +1,59 @@
-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/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/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/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/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/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/HashBag.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/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/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/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
-share/doc/commons-collections/overview-summary.html
-share/doc/commons-collections/overview-frame.html
-share/doc/commons-collections/index.html
-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
-@dirrm share/doc/commons-collections/org/apache
-@dirrm share/doc/commons-collections/org
-@dirrm share/doc/commons-collections
+share/doc/commons-cli/org/apache/commons/cli/class-use/MissingOptionException.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/OptionGroup.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/Parser.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/BasicParser.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/ParseException.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/UnrecognizedOptionException.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/HelpFormatter.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/HelpFormatter.StringBufferComparator.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/OptionBuilder.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/AlreadySelectedException.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/MissingArgumentException.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/GnuParser.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/Options.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/PosixParser.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/Option.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/CommandLine.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/PatternOptionBuilder.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/CommandLineParser.html
+share/doc/commons-cli/org/apache/commons/cli/class-use/TypeHandler.html
+share/doc/commons-cli/org/apache/commons/cli/package-use.html
+share/doc/commons-cli/org/apache/commons/cli/package-summary.html
+share/doc/commons-cli/org/apache/commons/cli/package-tree.html
+share/doc/commons-cli/org/apache/commons/cli/package-frame.html
+share/doc/commons-cli/org/apache/commons/cli/CommandLineParser.html
+share/doc/commons-cli/org/apache/commons/cli/BasicParser.html
+share/doc/commons-cli/org/apache/commons/cli/CommandLine.html
+share/doc/commons-cli/org/apache/commons/cli/GnuParser.html
+share/doc/commons-cli/org/apache/commons/cli/HelpFormatter.html
+share/doc/commons-cli/org/apache/commons/cli/HelpFormatter.StringBufferComparator.html
+share/doc/commons-cli/org/apache/commons/cli/Option.html
+share/doc/commons-cli/org/apache/commons/cli/OptionBuilder.html
+share/doc/commons-cli/org/apache/commons/cli/OptionGroup.html
+share/doc/commons-cli/org/apache/commons/cli/Options.html
+share/doc/commons-cli/org/apache/commons/cli/Parser.html
+share/doc/commons-cli/org/apache/commons/cli/PatternOptionBuilder.html
+share/doc/commons-cli/org/apache/commons/cli/PosixParser.html
+share/doc/commons-cli/org/apache/commons/cli/TypeHandler.html
+share/doc/commons-cli/org/apache/commons/cli/AlreadySelectedException.html
+share/doc/commons-cli/org/apache/commons/cli/MissingArgumentException.html
+share/doc/commons-cli/org/apache/commons/cli/MissingOptionException.html
+share/doc/commons-cli/org/apache/commons/cli/ParseException.html
+share/doc/commons-cli/org/apache/commons/cli/UnrecognizedOptionException.html
+share/doc/commons-cli/serialized-form.html
+share/doc/commons-cli/packages.html
+share/doc/commons-cli/package-list
+share/doc/commons-cli/overview-tree.html
+share/doc/commons-cli/index.html
+share/doc/commons-cli/index-all.html
+share/doc/commons-cli/help-doc.html
+share/doc/commons-cli/deprecated-list.html
+share/doc/commons-cli/stylesheet.css
+share/doc/commons-cli/allclasses-frame.html
+share/java/classes/commons-cli.jar
+@dirrm share/doc/commons-cli/org/apache/commons/cli/class-use
+@dirrm share/doc/commons-cli/org/apache/commons/cli
+@dirrm share/doc/commons-cli/org/apache/commons
+@dirrm share/doc/commons-cli/org/apache
+@dirrm share/doc/commons-cli/org
+@dirrm share/doc/commons-cli