Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Jan 2014 12:30:33 +0000 (UTC)
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r338869 - in head/devel: . maven31 maven31/files
Message-ID:  <201401061230.s06CUXmh034272@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: fluffy
Date: Mon Jan  6 12:30:32 2014
New Revision: 338869
URL: http://svnweb.freebsd.org/changeset/ports/338869

Log:
  - Add maven31, as separate branch of Apache Maven engine
  - Pass maintanership to Alexander Yerenkow
  - Connect maven31 to devel/Makefile
  
  Submitted by:	Alexander Yerenkow via skype
  Approved by:	hq@, maintainer of maven3, in email discussion with Alexander

Added:
  head/devel/maven31/
     - copied from r338866, head/devel/maven3/
  head/devel/maven31/pkg-plist   (contents, props changed)
Modified:
  head/devel/Makefile
  head/devel/maven31/Makefile
  head/devel/maven31/distinfo
  head/devel/maven31/files/mvn.sh.in

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Mon Jan  6 12:21:33 2014	(r338868)
+++ head/devel/Makefile	Mon Jan  6 12:30:32 2014	(r338869)
@@ -1201,6 +1201,7 @@
     SUBDIR += maven-wrapper
     SUBDIR += maven2
     SUBDIR += maven3
+    SUBDIR += maven31
     SUBDIR += mcpp
     SUBDIR += mdds
     SUBDIR += meck

Modified: head/devel/maven31/Makefile
==============================================================================
--- head/devel/maven3/Makefile	Mon Jan  6 12:05:42 2014	(r338866)
+++ head/devel/maven31/Makefile	Mon Jan  6 12:30:32 2014	(r338869)
@@ -1,15 +1,15 @@
 # Created by: Herve Quiroz <hq@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	maven3
-DISTVERSION=	3.0.4
+PORTNAME=	maven31
+DISTVERSION=	3.1.1
 CATEGORIES=	devel java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	maven/binaries
 DISTNAME=	apache-maven-${DISTVERSION}-bin
 
-MAINTAINER=	hq@FreeBSD.org
-COMMENT=	Java project management tool, 3.x branch
+MAINTAINER=	yerenkow@gmail.com
+COMMENT=	Java project management tool, 3.1.x branch
 
 LICENSE=	APACHE20
 
@@ -22,27 +22,19 @@ DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/apache-maven-${DISTVERSION}
 SUB_FILES=	mvn.sh
 SUB_LIST=	CLASSWORLDS_JAR=plexus-classworlds-2.4.jar
-INSTANCE_FILE=	030004-${PORTNAME}-${PORTVERSION}
+INSTANCE_FILE=	030101-${PORTNAME}-${PORTVERSION}
 INSTANCES_DIR=	etc/maven-wrapper/instances.d/
-PLIST_FILES=	${INSTANCES_DIR}/${INSTANCE_FILE}
 
-NO_STAGE=	yes
 post-extract:
 	${RM} -f ${WRKSRC}/bin/*.bat
 	${ECHO_CMD} "${DATADIR}" > ${WRKSRC}/${INSTANCE_FILE}
 
 do-install:
-	cd ${WRKSRC} && ${FIND} . -type d -exec ${MKDIR} ${DATADIR}/{} \;
-	cd ${WRKSRC} && ${FIND} . -type f -not -path "\./bin/" -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
-	${INSTALL_DATA} ${WRKSRC}/bin/m2.conf ${DATADIR}/bin/
-	${INSTALL_SCRIPT} ${WRKDIR}/mvn.sh ${DATADIR}/bin/mvn
-	${MKDIR} ${PREFIX}/${INSTANCES_DIR}
-	${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} ${PREFIX}/${INSTANCES_DIR}
-
-post-install:
-	@${FIND} -s ${WRKSRC} -not -type d 2>/dev/null | \
-		${SED} -ne 's,^${WRKSRC},${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
-	@${FIND} -s -d ${WRKSRC} -type d 2>/dev/null | \
-		${SED} -ne 's,^${WRKSRC},@dirrm ${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
+	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}
 
 .include <bsd.port.mk>

Modified: head/devel/maven31/distinfo
==============================================================================
--- head/devel/maven3/distinfo	Mon Jan  6 12:05:42 2014	(r338866)
+++ head/devel/maven31/distinfo	Mon Jan  6 12:30:32 2014	(r338869)
@@ -1,2 +1,2 @@
-SHA256 (apache-maven-3.0.4-bin.tar.gz) = d35a876034c08cb7e20ea2fbcf168bcad4dff5801abad82d48055517513faa2f
-SIZE (apache-maven-3.0.4-bin.tar.gz) = 4873043
+SHA256 (apache-maven-3.1.1-bin.tar.gz) = 077ed466455991d5abb4748a1d022e2d2a54dc4d557c723ecbacdc857c61d51b
+SIZE (apache-maven-3.1.1-bin.tar.gz) = 5494427

Modified: head/devel/maven31/files/mvn.sh.in
==============================================================================
--- head/devel/maven3/files/mvn.sh.in	Mon Jan  6 12:05:42 2014	(r338866)
+++ head/devel/maven31/files/mvn.sh.in	Mon Jan  6 12:30:32 2014	(r338869)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/devel/maven3/files/mvn.sh.in,v 1.1 2011-09-01 21:53:01 hq Exp $
+# $FreeBSD$
 
 if [ -f /etc/mavenrc ] ; then
 	. /etc/mavenrc

Added: head/devel/maven31/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/maven31/pkg-plist	Mon Jan  6 12:30:32 2014	(r338869)
@@ -0,0 +1,71 @@
+etc/maven-wrapper/instances.d/030101-maven31-3.1.1
+%%DATADIR%%/030101-maven31-3.1.1
+%%DATADIR%%/LICENSE
+%%DATADIR%%/NOTICE
+%%DATADIR%%/README.txt
+%%DATADIR%%/bin/m2.conf
+%%DATADIR%%/bin/mvn
+%%DATADIR%%/bin/mvnDebug
+%%DATADIR%%/bin/mvnyjp
+%%DATADIR%%/boot/plexus-classworlds-2.5.1.jar
+%%DATADIR%%/conf/logging/simplelogger.properties
+%%DATADIR%%/conf/settings.xml
+%%DATADIR%%/lib/aether-api-0.9.0.M2.jar
+%%DATADIR%%/lib/aether-api.license
+%%DATADIR%%/lib/aether-connector-wagon-0.9.0.M2.jar
+%%DATADIR%%/lib/aether-connector-wagon.license
+%%DATADIR%%/lib/aether-impl-0.9.0.M2.jar
+%%DATADIR%%/lib/aether-impl.license
+%%DATADIR%%/lib/aether-spi-0.9.0.M2.jar
+%%DATADIR%%/lib/aether-spi.license
+%%DATADIR%%/lib/aether-util-0.9.0.M2.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/ext/README.txt
+%%DATADIR%%/lib/guava-11.0.2.jar
+%%DATADIR%%/lib/javax.inject-1.jar
+%%DATADIR%%/lib/jsr250-api-1.0.jar
+%%DATADIR%%/lib/jsr250-api.license
+%%DATADIR%%/lib/jsr305-1.3.9.jar
+%%DATADIR%%/lib/maven-aether-provider-3.1.1.jar
+%%DATADIR%%/lib/maven-artifact-3.1.1.jar
+%%DATADIR%%/lib/maven-compat-3.1.1.jar
+%%DATADIR%%/lib/maven-core-3.1.1.jar
+%%DATADIR%%/lib/maven-embedder-3.1.1.jar
+%%DATADIR%%/lib/maven-model-3.1.1.jar
+%%DATADIR%%/lib/maven-model-builder-3.1.1.jar
+%%DATADIR%%/lib/maven-plugin-api-3.1.1.jar
+%%DATADIR%%/lib/maven-repository-metadata-3.1.1.jar
+%%DATADIR%%/lib/maven-settings-3.1.1.jar
+%%DATADIR%%/lib/maven-settings-builder-3.1.1.jar
+%%DATADIR%%/lib/org.eclipse.sisu.inject-0.0.0.M5.jar
+%%DATADIR%%/lib/org.eclipse.sisu.inject.license
+%%DATADIR%%/lib/org.eclipse.sisu.plexus-0.0.0.M5.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.5.5.jar
+%%DATADIR%%/lib/plexus-interpolation-1.19.jar
+%%DATADIR%%/lib/plexus-sec-dispatcher-1.3.jar
+%%DATADIR%%/lib/plexus-sec-dispatcher.license
+%%DATADIR%%/lib/plexus-utils-3.0.15.jar
+%%DATADIR%%/lib/sisu-guice-3.1.3-no_aop.jar
+%%DATADIR%%/lib/slf4j-api-1.7.5.jar
+%%DATADIR%%/lib/slf4j-api.license
+%%DATADIR%%/lib/slf4j-simple-1.7.5.jar
+%%DATADIR%%/lib/slf4j-simple.license
+%%DATADIR%%/lib/wagon-file-2.4.jar
+%%DATADIR%%/lib/wagon-http-2.4-shaded.jar
+%%DATADIR%%/lib/wagon-provider-api-2.4.jar
+@dirrmtry %%DATADIR%%/lib/ext
+@dirrmtry %%DATADIR%%/lib
+@dirrmtry %%DATADIR%%/conf/logging
+@dirrmtry %%DATADIR%%/conf
+@dirrmtry %%DATADIR%%/boot
+@dirrmtry %%DATADIR%%/bin
+@dirrmtry %%DATADIR%%
+@dirrmtry etc/maven-wrapper/instances.d
+@dirrmtry etc/maven-wrapper



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401061230.s06CUXmh034272>