- Remove unneeded JAVA_RUN statement

- Remove redundant port name in COMMENT
- Use CPIO to make docs install stage more simple
- Use %%JAVAJARDIR%%
- Use INSTALL_DATA for JAR file

1 files changed, 6 insertions, 10 deletions

diff --git a/java/trove4j/Makefile b/java/trove4j/Makefile
index 90cec1a317ad..1f21a2ff01e4 100644
--- a/java/trove4j/Makefile
+++ b/java/trove4j/Makefile
@@ -12,32 +12,28 @@ MASTER_SITE_SUBDIR=	trove4j
 DISTNAME=	trove-${PORTVERSION}
 
 MAINTAINER=	hq@FreeBSD.org
-COMMENT=	GNU Trove: High performance collections for Java
+COMMENT=	High performance collections API for Java
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.3+
-JAVA_RUN=	jdk
 NO_BUILD=	yes
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	javadocs AUTHORS ChangeLog LICENSE.txt README-license.txt README.txt
 .endif
 JARFILE=	trove.jar
-PLIST_FILES+=	${JAVAJARDIR:S,^${PREFIX}/,,}/${JARFILE}
+PLIST_FILES+=	%%JAVAJARDIR%%/${JARFILE}
 
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
 	@${MKDIR} ${JAVAJARDIR}
-	@${CP} ${WRKSRC}/lib/${JARFILE} ${JAVAJARDIR}/
+	@${INSTALL_DATA} ${WRKSRC}/lib/${JARFILE} ${JAVAJARDIR}/
 	@${ECHO_MSG} " [ DONE ]"
 .if !defined(NOPORTDOCS)
-	@${ECHO_MSG} -n ">> Installing documentation..."
+	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
 	@${MKDIR} ${DOCSDIR}
-.for DOCFILE in ${PORTDOCS}
-	@${CP} -r ${WRKSRC}/${DOCFILE} ${DOCSDIR}/
-	@${ECHO_MSG} -n " ${DOCFILE}"
-.endfor
-	@${CHOWN} -h -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	@cd ${WRKSRC} && ${FIND} ${PORTDOCS} \
+	  | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
 	@${ECHO_MSG} " [ DONE ]"
 .endif