[Midnightbsd-cvs] mports [21749] trunk/java/jakarta-commons-lang: minor cleanup

[laffer1 at midnightbsd.org]

Revision: 21749
          http://svnweb.midnightbsd.org/mports/?rev=21749
Author:   laffer1
Date:     2016-08-19 22:50:59 -0400 (Fri, 19 Aug 2016)
Log Message:
-----------
minor cleanup

Modified Paths:
--------------
    trunk/java/jakarta-commons-lang/Makefile
    trunk/java/jakarta-commons-lang/distinfo

Modified: trunk/java/jakarta-commons-lang/Makefile
===================================================================
--- trunk/java/jakarta-commons-lang/Makefile	2016-08-20 02:47:13 UTC (rev 21748)
+++ trunk/java/jakarta-commons-lang/Makefile	2016-08-20 02:50:59 UTC (rev 21749)
@@ -3,52 +3,44 @@
 PORTNAME=	commons-lang
 PORTVERSION=	2.6
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_APACHE_COMMONS_SOURCE}
-MASTER_SITE_SUBDIR=	${PORTNAME:S,commons-,,}
+MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	jakarta-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
-MAINTAINER=	ports at MidnightBSD.org
+MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Jakarta library with helper utilities for the java.lang API
 LICENSE=	apache2
 
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
-
 USE_ANT=	yes
-USE_JIKES=	no
-
 ALL_TARGET=	jar
-.if !defined(PACKAGE_BUILDING)
-.if !defined(NOPORTDOCS)
-ALL_TARGET+=	javadoc
-PORTDOCS=	*
-.endif
-.endif
 
 JARFILE=	${PORTNAME}-${PORTVERSION}.jar
 DESTJARFILE=	${PORTNAME}.jar
 PLIST_FILES=	%%JAVAJARDIR%%/${DESTJARFILE}
+PORTDOCS=	*
 
+OPTIONS_DEFINE=	DOCS
+
 .include <bsd.port.pre.mk>
 
-JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${TRUE}) | ${TAIL} -n 1
+.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} != ""
 MAKE_ARGS+=	-Djdk.javadoc=${JDK_API}
 .endif
 
 do-install:
-	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
-	@${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
-	@${ECHO_MSG} " [ DONE ]"
-
-.if !defined(NOPORTDOCS)
-	@${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 ]"
+	${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} \
+		${STAGEDIR}${JAVAJARDIR}/${DESTJARFILE}
+.if ${PORT_OPTIONS:MDOCS}
+	(cd ${WRKSRC}/target/apidocs && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${DOCSDIR})
 .endif
 
 .include <bsd.port.post.mk>

Modified: trunk/java/jakarta-commons-lang/distinfo
===================================================================
--- trunk/java/jakarta-commons-lang/distinfo	2016-08-20 02:47:13 UTC (rev 21748)
+++ trunk/java/jakarta-commons-lang/distinfo	2016-08-20 02:50:59 UTC (rev 21749)
@@ -1,3 +1,2 @@
 SHA256 (commons-lang-2.6-src.tar.gz) = 05479771851be0af057032fa26ad90aa0c91c10e1fc4439558a1ffa6f053bcd7
-RMD160 (commons-lang-2.6-src.tar.gz) = 9542bcc3323ddf1e93400e68f9e4d527c71bffd0
 SIZE (commons-lang-2.6-src.tar.gz) = 564032