svn commit: r355885 - head/java/jakarta-commons-cli

[Pawel Pekala]

Author: pawel
Date: Fri May 30 18:02:03 2014
New Revision: 355885
URL: http://svnweb.freebsd.org/changeset/ports/355885
QAT: https://qat.redports.org/buildarchive/r355885/

Log:
  - Add staging support
  - Convert to new options framework

Modified:
  head/java/jakarta-commons-cli/Makefile

Modified: head/java/jakarta-commons-cli/Makefile
==============================================================================
--- head/java/jakarta-commons-cli/Makefile	Fri May 30 17:49:55 2014	(r355884)
+++ head/java/jakarta-commons-cli/Makefile	Fri May 30 18:02:03 2014	(r355885)
@@ -24,24 +24,16 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVER
 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>