diff --git a/java/jakarta-commons-cli/Makefile b/java/jakarta-commons-cli/Makefile
index a252584de3d5..f2b8ef5da209 100644
--- a/java/jakarta-commons-cli/Makefile
+++ b/java/jakarta-commons-cli/Makefile
@@ -24,24 +24,16 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 JARFILE=	${PORTNAME}-${PORTVERSION}.jar
 DESTJARFILE=	${PORTNAME}.jar
 PLIST_FILES=	%%JAVAJARDIR%%/${DESTJARFILE}
-.if !defined(NOPORTDOCS)
 PORTDOCS=	*
-DOC_FILES=	LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-.endif
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
-	@${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
-	@${ECHO_MSG} " [ DONE ]"
-.if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
-	@-${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} apidocs ${DOCSDIR}
-.for f in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
-.endfor
-	@${ECHO_MSG} " [ DONE ]"
-.endif
+	${INSTALL_DATA} ${WRKSRC}/${JARFILE} \
+		${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC} && ${INSTALL_DATA} LICENSE.txt NOTICE.txt \
+		RELEASE-NOTES.txt ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>