- Don't mkdir ${JAVAJARDIR} (already in mtree)

- Use %%JAVAJARDIR%%
- Use FIND | INSTALL_DATA rather than CP

1 files changed, 3 insertions, 8 deletions

diff --git a/java/jakarta-commons-discovery/Makefile b/java/jakarta-commons-discovery/Makefile
index cb57e0a0bf75..12f206a2c7ed 100644
--- a/java/jakarta-commons-discovery/Makefile
+++ b/java/jakarta-commons-discovery/Makefile
@@ -24,24 +24,19 @@ NO_BUILD=	YES
 PORTDOCS=	api LICENSE
 .endif
 JARFILE=	${PORTNAME}.jar
-PLIST_FILES+=	${JAVAJARDIR:S,^${PREFIX}/,,}/${JARFILE}
+PLIST_FILES+=	%%JAVAJARDIR%%/${JARFILE}
 
 post-extract:
 	@${MV} ${WRKSRC}/LICENSE ${WRKSRC}/docs/
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
-	@${MKDIR} ${JAVAJARDIR}
 	@${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${JAVAJARDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} -n ">> Installing documentation..."
-	@${MKDIR} ${DOCSDIR}
-.for DOCFILE in ${PORTDOCS}
-	@${CP} -r ${WRKSRC}/docs/${DOCFILE} ${DOCSDIR}/
-	@${ECHO_MSG} -n " ${DOCFILE}"
-.endfor
-	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	@cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
+	@cd ${WRKSRC}/docs && ${FIND} ${PORTDOCS} -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
 	@${ECHO_MSG} " [ DONE ]"
 .endif