git: 22dbef930dd7 - main - devel/maven: update to 3.8.6

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Neel Chauhan <nc_at_FreeBSD.org>
Date: Tue, 21 Jun 2022 02:37:21 UTC
The branch main has been updated by nc:

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

commit 22dbef930dd7ee6b442d68daa0b83123b5245d00
Author:     Michael Osipov <michael.osipov@siemens.com>
AuthorDate: 2022-06-21 02:37:05 +0000
Commit:     Neel Chauhan <nc@FreeBSD.org>
CommitDate: 2022-06-21 02:37:05 +0000

    devel/maven: update to 3.8.6
    
    PR:     264790
---
 devel/maven/Makefile  | 23 +++++++++++++++--------
 devel/maven/distinfo  |  6 +++---
 devel/maven/pkg-plist | 14 +++++++-------
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index 52b9056a67bd..2e02190ed11e 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -1,7 +1,5 @@
-# Created by: JonathanChen <jonc@chen.org.nz>
-
 PORTNAME=	maven
-DISTVERSION=	3.8.5
+DISTVERSION=	3.8.6
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/maven/maven-3/${DISTVERSION}/binaries
 DISTNAME=	apache-maven-${DISTVERSION}-bin
@@ -21,8 +19,6 @@ USE_JAVA=	yes
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_ARCH=	yes
 NO_BUILD=	yes
-SUB_FILES=	mvn.sh
-SUB_LIST=	CLASSWORLDS_JAR=plexus-classworlds-2.6.0.jar
 WRKSRC=		${WRKDIR}/apache-maven-${DISTVERSION}
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 INSTANCE_FILE=	${PORTNAME}-${PORTVERSION}
@@ -32,13 +28,24 @@ post-extract:
 	${RM} -r ${WRKSRC}/lib/jansi-native ${WRKSRC}/bin/*.cmd
 	${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE}
 
+post-patch:
+	@${REINPLACE_CMD} \
+		-e '54,72d;74,75d' \
+		-e 's|/usr/local|${LOCALBASE}|g' \
+		-E -e 's|^MAVEN_HOME=.+$$|MAVEN_HOME="${DATADIR}"|g' ${WRKSRC}/bin/mvn
+	@${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete
+
 do-install:
-	cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} \
+	@cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} \
 		${STAGEDIR}${DATADIR}/{} \;
 	cd ${WRKSRC} && ${FIND} . -type f -not -path "\./bin/" \
 		-exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
-	${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${STAGEDIR}${DATADIR}/bin
-	${INSTALL_SCRIPT} ${WRKDIR}/mvn.sh ${STAGEDIR}${DATADIR}/bin/mvn
+	@cd ${STAGEDIR}${DATADIR} && ${FIND} conf -type f -exec ${CP} \
+		'{}' '{}'.sample \;
+	${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${STAGEDIR}${DATADIR}/bin/m2.conf.sample
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/mvn ${STAGEDIR}${DATADIR}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/mvnDebug ${STAGEDIR}${DATADIR}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/mvnyjp ${STAGEDIR}${DATADIR}/bin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
 	${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} \
 		${STAGEDIR}${PREFIX}/${INSTANCES_DIR}
diff --git a/devel/maven/distinfo b/devel/maven/distinfo
index 4e8c9efd7846..7a6de156e907 100644
--- a/devel/maven/distinfo
+++ b/devel/maven/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1647257304
-SHA256 (apache-maven-3.8.5-bin.tar.gz) = 88e30700f32a3f60e0d28d0f12a3525d29b7c20c72d130153df5b5d6d890c673
-SIZE (apache-maven-3.8.5-bin.tar.gz) = 8673123
+TIMESTAMP = 1655731646
+SHA256 (apache-maven-3.8.6-bin.tar.gz) = c7047a48deb626abf26f71ab3643d296db9b1e67f1faa7d988637deac876b5a9
+SIZE (apache-maven-3.8.6-bin.tar.gz) = 8676320
diff --git a/devel/maven/pkg-plist b/devel/maven/pkg-plist
index 4ddbaf2e3af3..0ff67a6b6b56 100644
--- a/devel/maven/pkg-plist
+++ b/devel/maven/pkg-plist
@@ -2,15 +2,15 @@
 %%DATADIR%%/LICENSE
 %%DATADIR%%/NOTICE
 %%DATADIR%%/README.txt
-%%DATADIR%%/bin/m2.conf
+@sample %%DATADIR%%/bin/m2.conf.sample
 %%DATADIR%%/bin/mvn
 %%DATADIR%%/bin/mvnDebug
 %%DATADIR%%/bin/mvnyjp
 %%DATADIR%%/boot/plexus-classworlds-2.6.0.jar
 %%DATADIR%%/boot/plexus-classworlds.license
-%%DATADIR%%/conf/logging/simplelogger.properties
-%%DATADIR%%/conf/settings.xml
-%%DATADIR%%/conf/toolchains.xml
+@sample %%DATADIR%%/conf/logging/simplelogger.properties.sample
+@sample %%DATADIR%%/conf/settings.xml.sample
+@sample %%DATADIR%%/conf/toolchains.xml.sample
 %%DATADIR%%/lib/commons-cli-1.4.jar
 %%DATADIR%%/lib/commons-cli.license
 %%DATADIR%%/lib/commons-io-2.6.jar
@@ -28,7 +28,7 @@
 %%DATADIR%%/lib/javax.annotation-api.license
 %%DATADIR%%/lib/javax.inject-1.jar
 %%DATADIR%%/lib/javax.inject.license
-%%DATADIR%%/lib/jcl-over-slf4j-1.7.32.jar
+%%DATADIR%%/lib/jcl-over-slf4j-1.7.36.jar
 %%DATADIR%%/lib/jcl-over-slf4j.license
 %%DATADIR%%/lib/maven-artifact-%%PORTVERSION%%.jar
 %%DATADIR%%/lib/maven-builder-support-%%PORTVERSION%%.jar
@@ -62,9 +62,9 @@
 %%DATADIR%%/lib/plexus-interpolation.license
 %%DATADIR%%/lib/plexus-sec-dispatcher-2.0.jar
 %%DATADIR%%/lib/plexus-sec-dispatcher.license
-%%DATADIR%%/lib/plexus-utils-3.3.0.jar
+%%DATADIR%%/lib/plexus-utils-3.3.1.jar
 %%DATADIR%%/lib/plexus-utils.license
-%%DATADIR%%/lib/slf4j-api-1.7.32.jar
+%%DATADIR%%/lib/slf4j-api-1.7.36.jar
 %%DATADIR%%/lib/slf4j-api.license
 %%DATADIR%%/lib/wagon-file-3.5.1.jar
 %%DATADIR%%/lib/wagon-http-3.5.1-shaded.jar