git: 3a74e04f0a59 - main - java/apache-commons-logging: Improve port

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Tue, 30 Sep 2025 16:01:32 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3a74e04f0a59e2cce1332b331f5713a5389a9e10

commit 3a74e04f0a59e2cce1332b331f5713a5389a9e10
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-09-30 15:52:31 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-09-30 16:00:45 +0000

    java/apache-commons-logging: Improve port
    
    - Add LICENSE_FILE.
    - Add EXTRACT_AFTER_ARGS to prevent extract unnecessary files.
    - Replace %%JAVAJARDIR%% with ${JAVAJARDIR} in PLIST_FILES.
    - Replace LN with RLN.
    - Copy documentation only if DOCS option is on.
    - Add to documentation NOTICE.txt RELEASE-NOTES.txt.
    
    PR:             286425
    Approved by:    Atanu Biswas <atanubiswas484@gmail.com> (maintainer)
---
 java/apache-commons-logging/Makefile | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/java/apache-commons-logging/Makefile b/java/apache-commons-logging/Makefile
index 6ba44b395918..1050f090e52d 100644
--- a/java/apache-commons-logging/Makefile
+++ b/java/apache-commons-logging/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	commons-logging
 DISTVERSION=	1.3.5
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	apache-
@@ -10,9 +11,15 @@ COMMENT=	Generic logging wrapper library
 WWW=		https://commons.apache.org/proper/commons-logging/
 
 LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		java
 
+EXTRACT_AFTER_ARGS=	--exclude ._* \
+			--exclude .DS_Store \
+			--exclude ${PORTNAME}-${DISTVERSION}-*.jar \
+			--no-same-owner --no-same-permissions
+
 NO_ARCH=	yes
 NO_BUILD=	yes
 
@@ -20,18 +27,19 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 JARFILE=	${PORTNAME}-${DISTVERSION}.jar
 
-PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME}.jar \
-		%%JAVAJARDIR%%/${JARFILE}
+PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar \
+		${JAVAJARDIR}/${JARFILE}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-post-extract:
-	@${FIND} ${WRKSRC} -name "._*" -delete
-
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}
-	${LN} -sf ${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
-	(cd ${WRKSRC}/apidocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	${RLN}  ${STAGEDIR}${JAVAJARDIR}/${JARFILE} \
+		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+
+do-install-DOCS-on:
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR} && \
+	${INSTALL_DATA} NOTICE.txt RELEASE-NOTES.txt ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>