From 30989780244d5c762154e7153838f7e5c1f99192 Mon Sep 17 00:00:00 2001
From: Herve Quiroz <hq@FreeBSD.org>
Date: Mon, 29 Nov 2004 02:46:40 +0000
Subject: Project is now under the Apache 2.0 license, which is included in the
 distribution.

---
 java/jakarta-commons-logging/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'java/jakarta-commons-logging')

diff --git a/java/jakarta-commons-logging/Makefile b/java/jakarta-commons-logging/Makefile
index aa5fe4b5564d..d4f60a520b87 100644
--- a/java/jakarta-commons-logging/Makefile
+++ b/java/jakarta-commons-logging/Makefile
@@ -43,14 +43,12 @@ BUILD_DEPENDS+=	${JAVALIBDIR}/logkit.jar:${PORTSDIR}/java/avalon-logkit
 ALL_TARGET=	compile
 .if !defined(NOPORTDOCS)
 ALL_TARGET+=	javadoc
-PORTDOCS=	api LICENSE
+OTHERDOCS=	LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
+PORTDOCS=	api ${OTHERDOCS}
 .endif
 JARFILE=	${PORTNAME}.jar
 PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
 
-post-extract:
-	@${CP} ${PORTSDIR}/java/jakarta-commons-beanutils/files/LICENSE ${WRKSRC}/
-
 do-install:
 	@${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${JARFILE}..."
 	@${INSTALL_DATA} ${WRKSRC}/target/${JARFILE} ${JAVAJARDIR}/${JARFILE}
@@ -61,7 +59,7 @@ do-install:
 	@cd ${WRKSRC}/dist/docs \
 	  && ${FIND} api -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \
 	  && ${FIND} api -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \;
-	@${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}/
+	@${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 	@${ECHO_MSG} " ${PORTDOCS} [ DONE ]"
 .endif
 
-- 
cgit v1.2.3