- Add NO_ARCH

- Switch to options helpers
- Simplify installation

1 files changed, 10 insertions, 11 deletions

diff --git a/textproc/apache-poi/Makefile b/textproc/apache-poi/Makefile
index d4dc48541b34..699e0a37c10f 100644
--- a/textproc/apache-poi/Makefile
+++ b/textproc/apache-poi/Makefile
@@ -14,34 +14,33 @@ COMMENT=	Java API To Access Microsoft Format Files
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-PORTDOCS=	*
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
+NO_ARCH=	yes
 RELEASE_DATE=	20160307
 JARNAMES=	examples excelant scratchpad ooxml ooxml-schemas
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
-OPTIONS_DEFINE=	DOCS
-
 USES=		cpe
 CPE_VENDOR=	apache
 
+PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar
+PORTDOCS=	*
+
 .for i in ${JARNAMES}
 PLIST_FILES+=	%%JAVAJARDIR%%/${PORTNAME}-${i}.jar
 .endfor
 
+OPTIONS_DEFINE=	DOCS
+
 do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${RELEASE_DATE}.jar..."
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}-${RELEASE_DATE}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 .for i in ${JARNAMES}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${i}-${PORTVERSION}-${RELEASE_DATE}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${i}.jar
 .endfor
-	@${ECHO_MSG} " [ DONE ]"
-	@${ECHO_MSG} -n ">> Installing documentation in ${STAGEDIR}${DOCSDIR}/..."
-	@cd ${WRKSRC}/docs \
-	  && ${FIND} . -type d -not -empty -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
-	@${ECHO_MSG} " [ DONE ]"
+
+do-install-DOCS-on:
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+	@${RMDIR} ${STAGEDIR}${DOCSDIR}/skin/css
 
 .include <bsd.port.mk>