git: ae04d0bf5123 - main - textproc/xml-commons: Improve port

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Sun, 01 Jun 2025 02:42:46 UTC
The branch main has been updated by vvd:

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

commit ae04d0bf5123f713a9d26b5681931dde2a3aa9fc
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-06-01 01:51:03 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-06-01 02:41:40 +0000

    textproc/xml-commons: Improve port
    
    - Resolve conflict install with textproc/xerces-j: both ports installs
      file xml-apis.jar.
    - Add LICENSE.
---
 textproc/xml-commons/Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/textproc/xml-commons/Makefile b/textproc/xml-commons/Makefile
index 8313a5d6115c..f64e5ca24b1f 100644
--- a/textproc/xml-commons/Makefile
+++ b/textproc/xml-commons/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	xml-commons
 DISTVERSION=	1.4.01
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	APACHE/xerces/${PORTNAME}/binaries
 DISTNAME=	${PORTNAME}-external-${DISTVERSION}
@@ -9,16 +10,21 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Provides common XML code for Apache projects
 WWW=		https://xerces.apache.org/xml-commons/
 
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USES=		java
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	${JAVAJARDIR}/xml-apis-ext.jar \
-		${JAVAJARDIR}/xml-apis.jar
+_JARDIR=	${JAVASHAREDIR}/${PORTNAME}
+PLIST_FILES=	${_JARDIR}/xml-apis.jar \
+		${_JARDIR}/xml-apis-ext.jar
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/xml-apis-ext.jar ${STAGEDIR}${JAVAJARDIR}
-	${INSTALL_DATA} ${WRKSRC}/xml-apis.jar ${STAGEDIR}${JAVAJARDIR}
+	${MKDIR} ${STAGEDIR}${_JARDIR}
+	${INSTALL_DATA} ${WRKSRC}/xml-apis-ext.jar ${STAGEDIR}${_JARDIR}
+	${INSTALL_DATA} ${WRKSRC}/xml-apis.jar ${STAGEDIR}${_JARDIR}
 
 .include <bsd.port.mk>