From owner-svn-ports-all@freebsd.org Tue Jul 25 16:46:10 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C4F33CFCA5B; Tue, 25 Jul 2017 16:46:10 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5ABD083276; Tue, 25 Jul 2017 16:46:10 +0000 (UTC) (envelope-from matthew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6PGk9Gm082687; Tue, 25 Jul 2017 16:46:09 GMT (envelope-from matthew@FreeBSD.org) Received: (from matthew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6PGk8Sx082678; Tue, 25 Jul 2017 16:46:08 GMT (envelope-from matthew@FreeBSD.org) Message-Id: <201707251646.v6PGk8Sx082678@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: matthew set sender to matthew@FreeBSD.org using -f From: Matthew Seaman Date: Tue, 25 Jul 2017 16:46:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446612 - in head/devel: . maven maven/files maven3 maven31 maven33 X-SVN-Group: ports-head X-SVN-Commit-Author: matthew X-SVN-Commit-Paths: in head/devel: . maven maven/files maven3 maven31 maven33 X-SVN-Commit-Revision: 446612 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Jul 2017 16:46:10 -0000 Author: matthew Date: Tue Jul 25 16:46:08 2017 New Revision: 446612 URL: https://svnweb.freebsd.org/changeset/ports/446612 Log: New port: devel/maven -- maven-3.5.0 svn cp from devel/maven33 Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information. WWW: http://maven.apache.org/ Add CONFLICTS_INSTALL for devel/maven3, devel/maven31, devel/maven33[1] PR: 220959 Submitted by: jonc@chen.org.nz Approved by: [1] portmgr blanket Added: head/devel/maven/ - copied from r446537, head/devel/maven33/ Modified: head/devel/Makefile head/devel/maven/Makefile head/devel/maven/distinfo head/devel/maven/files/mvn.sh.in (contents, props changed) head/devel/maven/pkg-descr head/devel/maven/pkg-plist head/devel/maven3/Makefile head/devel/maven31/Makefile head/devel/maven33/Makefile Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Tue Jul 25 16:22:42 2017 (r446611) +++ head/devel/Makefile Tue Jul 25 16:46:08 2017 (r446612) @@ -1631,6 +1631,7 @@ SUBDIR += mate-common SUBDIR += matreshka SUBDIR += maven-wrapper + SUBDIR += maven SUBDIR += maven3 SUBDIR += maven31 SUBDIR += maven33 Modified: head/devel/maven/Makefile ============================================================================== --- head/devel/maven33/Makefile Mon Jul 24 17:01:34 2017 (r446537) +++ head/devel/maven/Makefile Tue Jul 25 16:46:08 2017 (r446612) @@ -1,18 +1,21 @@ +# Created by: JonathanChen # $FreeBSD$ -PORTNAME= maven33 -DISTVERSION= 3.3.9 +PORTNAME= maven +DISTVERSION= 3.5.0 CATEGORIES= devel java MASTER_SITES= APACHE/maven/maven-3/${DISTVERSION}/binaries DISTNAME= apache-maven-${DISTVERSION}-bin -MAINTAINER= yerenkow@gmail.com -COMMENT= Java project management tool, 3.3.x branch +MAINTAINER= jonc@chen.org.nz +COMMENT= Java project management tool LICENSE= APACHE20 RUN_DEPENDS= mvn:devel/maven-wrapper +CONFLICTS_INSTALL= maven3-* maven31-* maven33-* + USES= cpe CPE_PRODUCT= maven CPE_VENDOR= apache @@ -24,7 +27,7 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION} SUB_FILES= mvn.sh SUB_LIST= CLASSWORLDS_JAR=plexus-classworlds-2.5.2.jar -INSTANCE_FILE= 030303-${PORTNAME}-${PORTVERSION} +INSTANCE_FILE= ${PORTNAME}-${PORTVERSION} INSTANCES_DIR= etc/maven-wrapper/instances.d/ post-extract: @@ -32,11 +35,14 @@ post-extract: ${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE} do-install: - 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/ + 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 - ${MKDIR} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR} - ${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/${INSTANCES_DIR} + ${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} \ + ${STAGEDIR}${PREFIX}/${INSTANCES_DIR} .include Modified: head/devel/maven/distinfo ============================================================================== --- head/devel/maven33/distinfo Mon Jul 24 17:01:34 2017 (r446537) +++ head/devel/maven/distinfo Tue Jul 25 16:46:08 2017 (r446612) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471981912 -SHA256 (apache-maven-3.3.9-bin.tar.gz) = 6e3e9c949ab4695a204f74038717aa7b2689b1be94875899ac1b3fe42800ff82 -SIZE (apache-maven-3.3.9-bin.tar.gz) = 8491533 +TIMESTAMP = 1500859622 +SHA256 (apache-maven-3.5.0-bin.tar.gz) = beb91419245395bd69a4a6edad5ca3ec1a8b64e41457672dc687c173a495f034 +SIZE (apache-maven-3.5.0-bin.tar.gz) = 8534562 Modified: head/devel/maven/files/mvn.sh.in ============================================================================== --- head/devel/maven33/files/mvn.sh.in Mon Jul 24 17:01:34 2017 (r446537) +++ head/devel/maven/files/mvn.sh.in Tue Jul 25 16:46:08 2017 (r446612) @@ -1,6 +1,5 @@ #!/bin/sh # -# $FreeBSD$ if [ -f /etc/mavenrc ] ; then . /etc/mavenrc @@ -14,7 +13,8 @@ M2_HOME=${M2_HOME:-"%%DATADIR%%"} # traverses directory structure from process work directory to filesystem root # first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { +find_maven_basedir() +{ local basedir=$(pwd) local wdir=$(pwd) while [ "$wdir" != '/' ] ; do @@ -28,7 +28,8 @@ find_maven_basedir() { } # concatenates all lines of a file -concat_lines() { +concat_lines() +{ if [ -f "$1" ]; then echo "$(tr -s '\n' ' ' < "$1")" fi Modified: head/devel/maven/pkg-descr ============================================================================== --- head/devel/maven33/pkg-descr Mon Jul 24 17:01:34 2017 (r446537) +++ head/devel/maven/pkg-descr Tue Jul 25 16:46:08 2017 (r446612) @@ -1,6 +1,5 @@ -Apache Maven is a software project management and comprehension -tool. Based on the concept of a project object model (POM), Maven -can manage a project's build, reporting and documentation from a -central piece of information. +Apache Maven is a software project management and comprehension tool. Based on +the concept of a project object model (POM), Maven can manage a project's +build, reporting and documentation from a central piece of information. WWW: http://maven.apache.org/ Modified: head/devel/maven/pkg-plist ============================================================================== --- head/devel/maven33/pkg-plist Mon Jul 24 17:01:34 2017 (r446537) +++ head/devel/maven/pkg-plist Tue Jul 25 16:46:08 2017 (r446612) @@ -1,5 +1,4 @@ -etc/maven-wrapper/instances.d/030303-maven33-3.3.9 -%%DATADIR%%/030303-maven33-3.3.9 +etc/maven-wrapper/instances.d/maven-3.5.0 %%DATADIR%%/LICENSE %%DATADIR%%/NOTICE %%DATADIR%%/README.txt @@ -13,78 +12,90 @@ etc/maven-wrapper/instances.d/030303-maven33-3.3.9 %%DATADIR%%/conf/logging/simplelogger.properties %%DATADIR%%/conf/settings.xml %%DATADIR%%/conf/toolchains.xml -%%DATADIR%%/lib/aether-api-1.0.2.v20150114.jar -%%DATADIR%%/lib/aether-api.license -%%DATADIR%%/lib/aether-connector-basic-1.0.2.v20150114.jar -%%DATADIR%%/lib/aether-connector-basic.license -%%DATADIR%%/lib/aether-impl-1.0.2.v20150114.jar -%%DATADIR%%/lib/aether-impl.license -%%DATADIR%%/lib/aether-spi-1.0.2.v20150114.jar -%%DATADIR%%/lib/aether-spi.license -%%DATADIR%%/lib/aether-transport-wagon-1.0.2.v20150114.jar -%%DATADIR%%/lib/aether-transport-wagon.license -%%DATADIR%%/lib/aether-util-1.0.2.v20150114.jar -%%DATADIR%%/lib/aether-util.license %%DATADIR%%/lib/aopalliance-1.0.jar %%DATADIR%%/lib/cdi-api-1.0.jar %%DATADIR%%/lib/cdi-api.license -%%DATADIR%%/lib/commons-cli-1.2.jar -%%DATADIR%%/lib/commons-io-2.2.jar -%%DATADIR%%/lib/commons-lang-2.6.jar -%%DATADIR%%/lib/commons-lang3-3.4.jar +%%DATADIR%%/lib/commons-cli-1.4.jar +%%DATADIR%%/lib/commons-cli.license +%%DATADIR%%/lib/commons-io-2.5.jar +%%DATADIR%%/lib/commons-io.license +%%DATADIR%%/lib/commons-lang3-3.5.jar %%DATADIR%%/lib/commons-lang3.license %%DATADIR%%/lib/ext/README.txt -%%DATADIR%%/lib/guava-18.0.jar +%%DATADIR%%/lib/guava-20.0.jar %%DATADIR%%/lib/guice-4.0-no_aop.jar +%%DATADIR%%/lib/jansi-1.13.jar +%%DATADIR%%/lib/jansi-native/README.txt +%%DATADIR%%/lib/jansi-native/linux32/libjansi.so +%%DATADIR%%/lib/jansi-native/linux64/libjansi.so +%%DATADIR%%/lib/jansi-native/osx/libjansi.jnilib +%%DATADIR%%/lib/jansi-native/windows32/jansi.dll +%%DATADIR%%/lib/jansi-native/windows64/jansi.dll %%DATADIR%%/lib/javax.inject-1.jar -%%DATADIR%%/lib/jsoup-1.7.2.jar -%%DATADIR%%/lib/jsoup.license +%%DATADIR%%/lib/jcl-over-slf4j-1.7.22.jar +%%DATADIR%%/lib/jcl-over-slf4j.license %%DATADIR%%/lib/jsr250-api-1.0.jar %%DATADIR%%/lib/jsr250-api.license -%%DATADIR%%/lib/maven-aether-provider-3.3.9.jar -%%DATADIR%%/lib/maven-aether-provider.license -%%DATADIR%%/lib/maven-artifact-3.3.9.jar +%%DATADIR%%/lib/maven-artifact-3.5.0.jar %%DATADIR%%/lib/maven-artifact.license -%%DATADIR%%/lib/maven-builder-support-3.3.9.jar +%%DATADIR%%/lib/maven-builder-support-3.5.0.jar %%DATADIR%%/lib/maven-builder-support.license -%%DATADIR%%/lib/maven-compat-3.3.9.jar +%%DATADIR%%/lib/maven-compat-3.5.0.jar %%DATADIR%%/lib/maven-compat.license -%%DATADIR%%/lib/maven-core-3.3.9.jar +%%DATADIR%%/lib/maven-core-3.5.0.jar %%DATADIR%%/lib/maven-core.license -%%DATADIR%%/lib/maven-embedder-3.3.9.jar +%%DATADIR%%/lib/maven-embedder-3.5.0.jar %%DATADIR%%/lib/maven-embedder.license -%%DATADIR%%/lib/maven-model-3.3.9.jar -%%DATADIR%%/lib/maven-model-builder-3.3.9.jar +%%DATADIR%%/lib/maven-model-3.5.0.jar +%%DATADIR%%/lib/maven-model-builder-3.5.0.jar %%DATADIR%%/lib/maven-model-builder.license %%DATADIR%%/lib/maven-model.license -%%DATADIR%%/lib/maven-plugin-api-3.3.9.jar +%%DATADIR%%/lib/maven-plugin-api-3.5.0.jar %%DATADIR%%/lib/maven-plugin-api.license -%%DATADIR%%/lib/maven-repository-metadata-3.3.9.jar +%%DATADIR%%/lib/maven-repository-metadata-3.5.0.jar %%DATADIR%%/lib/maven-repository-metadata.license -%%DATADIR%%/lib/maven-settings-3.3.9.jar -%%DATADIR%%/lib/maven-settings-builder-3.3.9.jar +%%DATADIR%%/lib/maven-resolver-api-1.0.3.jar +%%DATADIR%%/lib/maven-resolver-api.license +%%DATADIR%%/lib/maven-resolver-connector-basic-1.0.3.jar +%%DATADIR%%/lib/maven-resolver-connector-basic.license +%%DATADIR%%/lib/maven-resolver-impl-1.0.3.jar +%%DATADIR%%/lib/maven-resolver-impl.license +%%DATADIR%%/lib/maven-resolver-provider-3.5.0.jar +%%DATADIR%%/lib/maven-resolver-provider.license +%%DATADIR%%/lib/maven-resolver-spi-1.0.3.jar +%%DATADIR%%/lib/maven-resolver-spi.license +%%DATADIR%%/lib/maven-resolver-transport-wagon-1.0.3.jar +%%DATADIR%%/lib/maven-resolver-transport-wagon.license +%%DATADIR%%/lib/maven-resolver-util-1.0.3.jar +%%DATADIR%%/lib/maven-resolver-util.license +%%DATADIR%%/lib/maven-settings-3.5.0.jar +%%DATADIR%%/lib/maven-settings-builder-3.5.0.jar %%DATADIR%%/lib/maven-settings-builder.license %%DATADIR%%/lib/maven-settings.license -%%DATADIR%%/lib/org.eclipse.sisu.inject-0.3.2.jar +%%DATADIR%%/lib/maven-shared-utils-3.1.0.jar +%%DATADIR%%/lib/maven-shared-utils.license +%%DATADIR%%/lib/maven-slf4j-provider-3.5.0.jar +%%DATADIR%%/lib/maven-slf4j-provider.license +%%DATADIR%%/lib/org.eclipse.sisu.inject-0.3.3.jar %%DATADIR%%/lib/org.eclipse.sisu.inject.license -%%DATADIR%%/lib/org.eclipse.sisu.plexus-0.3.2.jar +%%DATADIR%%/lib/org.eclipse.sisu.plexus-0.3.3.jar %%DATADIR%%/lib/org.eclipse.sisu.plexus.license %%DATADIR%%/lib/plexus-cipher-1.7.jar %%DATADIR%%/lib/plexus-cipher.license -%%DATADIR%%/lib/plexus-component-annotations-1.6.jar -%%DATADIR%%/lib/plexus-interpolation-1.21.jar -%%DATADIR%%/lib/plexus-sec-dispatcher-1.3.jar +%%DATADIR%%/lib/plexus-component-annotations-1.7.1.jar +%%DATADIR%%/lib/plexus-component-annotations.license +%%DATADIR%%/lib/plexus-interpolation-1.24.jar +%%DATADIR%%/lib/plexus-interpolation.license +%%DATADIR%%/lib/plexus-sec-dispatcher-1.4.jar %%DATADIR%%/lib/plexus-sec-dispatcher.license -%%DATADIR%%/lib/plexus-utils-3.0.22.jar -%%DATADIR%%/lib/slf4j-api-1.7.5.jar +%%DATADIR%%/lib/plexus-utils-3.0.24.jar +%%DATADIR%%/lib/plexus-utils.license +%%DATADIR%%/lib/slf4j-api-1.7.22.jar %%DATADIR%%/lib/slf4j-api.license -%%DATADIR%%/lib/slf4j-simple-1.7.5.jar -%%DATADIR%%/lib/slf4j-simple.license -%%DATADIR%%/lib/wagon-file-2.10.jar +%%DATADIR%%/lib/wagon-file-2.12.jar %%DATADIR%%/lib/wagon-file.license -%%DATADIR%%/lib/wagon-http-2.10-shaded.jar -%%DATADIR%%/lib/wagon-http-shared-2.10.jar -%%DATADIR%%/lib/wagon-http-shared.license +%%DATADIR%%/lib/wagon-http-2.12-shaded.jar %%DATADIR%%/lib/wagon-http.license -%%DATADIR%%/lib/wagon-provider-api-2.10.jar +%%DATADIR%%/lib/wagon-provider-api-2.12.jar %%DATADIR%%/lib/wagon-provider-api.license +%%DATADIR%%/maven-3.5.0 Modified: head/devel/maven3/Makefile ============================================================================== --- head/devel/maven3/Makefile Tue Jul 25 16:22:42 2017 (r446611) +++ head/devel/maven3/Makefile Tue Jul 25 16:46:08 2017 (r446612) @@ -14,6 +14,8 @@ LICENSE= APACHE20 RUN_DEPENDS= mvn:devel/maven-wrapper +CONFLICTS_INSTALL= maven-* maven33-* maven31-* + USES= cpe CPE_PRODUCT= maven CPE_VENDOR= apache Modified: head/devel/maven31/Makefile ============================================================================== --- head/devel/maven31/Makefile Tue Jul 25 16:22:42 2017 (r446611) +++ head/devel/maven31/Makefile Tue Jul 25 16:46:08 2017 (r446612) @@ -15,6 +15,8 @@ LICENSE= APACHE20 RUN_DEPENDS= mvn:devel/maven-wrapper +CONFLICTS_INSTALL= maven-* maven3-* maven33-* + USES= cpe CPE_PRODUCT= maven CPE_VENDOR= apache Modified: head/devel/maven33/Makefile ============================================================================== --- head/devel/maven33/Makefile Tue Jul 25 16:22:42 2017 (r446611) +++ head/devel/maven33/Makefile Tue Jul 25 16:46:08 2017 (r446612) @@ -13,6 +13,8 @@ LICENSE= APACHE20 RUN_DEPENDS= mvn:devel/maven-wrapper +CONFLICTS_INSTALL= maven-* maven3-* maven31-* + USES= cpe CPE_PRODUCT= maven CPE_VENDOR= apache