From nobody Tue Jun 21 02:37:21 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 442D3863A01; Tue, 21 Jun 2022 02:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LRrJf0CHLz3nNq; Tue, 21 Jun 2022 02:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655779042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OialhOjPAW4lm/b4YqIP210xSRSdTmkYq4nlPfrbdVw=; b=p4pEZg15EIUy1cIC/AjciVBOXvFOOVINkS28ZNughAiLE4iB/+w9itd8bAIzVWoUWZJLvn ohUXbqT0OHf9X2EPGzYAIvVL3d4xiwMrN2gH+hulvSNe3y494ozt8Gqr3EeVw40+671J3+ n9FtXcGofxISMdliNujixgkFDbgHqXN29bHl+h6NigMeo9HsenYpe5RCcVnpuHfB+Vueiy cQBdk7gsm2p7q04xD2QkvKAtvT0bwq58NE92NjvmtFfaq2JOr0oHnQ7JSqF8YwSSxvl03Z movydLrmnpeOyejxIvhDtFWSHED5kSuh/UEkoidSwj3bw9QOvTOM0qQ68d46Cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D933312AF; Tue, 21 Jun 2022 02:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25L2bLcR022484; Tue, 21 Jun 2022 02:37:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25L2bLsG022483; Tue, 21 Jun 2022 02:37:21 GMT (envelope-from git) Date: Tue, 21 Jun 2022 02:37:21 GMT Message-Id: <202206210237.25L2bLsG022483@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 22dbef930dd7 - main - devel/maven: update to 3.8.6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22dbef930dd7ee6b442d68daa0b83123b5245d00 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655779042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OialhOjPAW4lm/b4YqIP210xSRSdTmkYq4nlPfrbdVw=; b=LW47qA2mXeM9MKRkpEMjNeRvC++930byoeV4CiCWX4AVRG+DZEZC1shth7eBVj7pWTrOWl TcAlvjHNE0Ifez6gpVoDZpp45eOyGe9wL28o1JagyWDBFQVJNNnhPMAgMv3zD7bupX/Omp /XILBiAyZH07FEMHPZv1FZAmsZ2Xcvo2z+O5ZlY+xLIshp+ljssVXJiuM8WekJMMMAqPgx 6VI0lR+dBLYTYAL9ylx+1ejyQTmWbVLOSj7wwW9cSvaXuOPGXoTSdn/U6C4WZPkZ5TD4F9 8aoc+hB/EK9Df6mfkHVZrvMr2zntROWDF0ciXIPLb5HyewzfT3XGCK4BIneQCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655779042; a=rsa-sha256; cv=none; b=PpqgU2wyVKywtZOK9qA9w2WWWYTP9F2OzQSVTxCcN2yDQMQgAaa/RSu8b8x5yTlUG2p6SE VM4dG0PWKubxlOF4hYK4BhKusAq3N93wnP4AhMHllkyfIywwbIUQyfbH7OpliobqfBXN9U fII3cC7A0Ii7TX9RKj8s8zgfMu9zkDe+TGptkS0SICM/1uO7JWjsprS8YzjNnrUpFU+NGa w8V1trvilFrcA/ddf6cvynO5o534oVdh/Qoq0kpY+2W6i8q96dsXbupy/fXMJV9uiLoPUW 8NKGlZcaAMLntVBoeXqBE8bu0cVlJlbQRxbKJSn3DPYIajSgXXTl4yCjve9FTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=22dbef930dd7ee6b442d68daa0b83123b5245d00 commit 22dbef930dd7ee6b442d68daa0b83123b5245d00 Author: Michael Osipov AuthorDate: 2022-06-21 02:37:05 +0000 Commit: Neel Chauhan 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 - 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