- Add staging support

- Convert to new options framework

java/jakarta-commons-lang/Makefile

@@ -16,22 +16,22 @@ LICENSE=	APACHE20
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-
 USE_ANT=	yes
-
 ALL_TARGET=	jar
-.if !defined(NOPORTDOCS)
-ALL_TARGET+=	javadoc
-PORTDOCS=	*
-.endif
 
 JARFILE=	${PORTNAME}-${PORTVERSION}.jar
 DESTJARFILE=	${PORTNAME}.jar
 PLIST_FILES=	%%JAVAJARDIR%%/${DESTJARFILE}
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
+.if ${PORT_OPTIONS:MDOCS}
+ALL_TARGET+=	javadoc
+.endif
+
 JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${ECHO_CMD}) | ${TAIL} -n 1
 
 .if ${JDK_API} != ""
@@ -39,16 +39,11 @@ MAKE_ARGS+=	-Djdk.javadoc=${JDK_API}
 .endif
 
 do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
+	${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} \
-	@${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
+		${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
-	@${ECHO_MSG} " [ DONE ]"
+.if ${PORT_OPTIONS:MDOCS}
-
+	(cd ${WRKSRC}/target/apidocs && ${COPYTREE_SHARE} . \
-.if !defined(NOPORTDOCS)
+		${STAGEDIR}${DOCSDIR})
-	@${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}/..."
-	@cd ${WRKSRC}/target/apidocs \
-	  && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
-	  && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-	@${ECHO_MSG} " [ DONE ]"
 .endif
 
 .include <bsd.port.post.mk>