diff options
| author | Herve Quiroz <hq@FreeBSD.org> | 2011-09-21 07:01:06 +0000 |
|---|---|---|
| committer | Herve Quiroz <hq@FreeBSD.org> | 2011-09-21 07:01:06 +0000 |
| commit | 7d8621cc588b4432f659705eac901bf78c8fb29f (patch) | |
| tree | 120bc1d9f586632cbdb0bf55b0eb456c4d88d84f | |
| parent | f4b101538c08b59c5affab5592ebe2c179de305c (diff) | |
Use devel/maven-wrapper
Notes
Notes:
svn path=/head/; revision=282103
| -rw-r--r-- | devel/maven2/Makefile | 10 | ||||
| -rw-r--r-- | devel/maven3/Makefile | 14 |
2 files changed, 16 insertions, 8 deletions
diff --git a/devel/maven2/Makefile b/devel/maven2/Makefile index 161181134812..a0e6537cd19f 100644 --- a/devel/maven2/Makefile +++ b/devel/maven2/Makefile @@ -7,6 +7,7 @@ PORTNAME= maven2 DISTVERSION= 2.2.1 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= maven/binaries @@ -15,6 +16,8 @@ DISTNAME= apache-maven-${DISTVERSION}-bin MAINTAINER= hq@FreeBSD.org COMMENT= Java project management tool, 2.0 branch +RUN_DEPENDS= bin/mvn:${PORTSDIR}/devel/maven-wrapper + USE_JAVA= yes JAVA_VERSION= 1.5+ NO_BUILD= yes @@ -22,19 +25,22 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} SUB_FILES= m2.sh SUB_LIST= CLASSWORLDS_JAR=classworlds-1.1.jar WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION} +INSTANCE_FILE= 020201-${PORTNAME}-${PORTVERSION} +INSTANCES_DIR= etc/maven-wrapper/instances.d/ +PLIST_FILES= ${INSTANCES_DIR}/${INSTANCE_FILE} post-extract: ${RM} -f ${WRKSRC}/bin/m2.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}/m2.sh ${DATADIR}/bin/mvn - ${LN} -fs ${DATADIR}/bin/mvn ${PREFIX}/bin/mvn + ${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} ${PREFIX}/${INSTANCES_DIR} post-install: - @${ECHO_CMD} 'bin/mvn' >> ${TMPPLIST} @${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 | \ diff --git a/devel/maven3/Makefile b/devel/maven3/Makefile index 5dd879485bed..c44915cf8932 100644 --- a/devel/maven3/Makefile +++ b/devel/maven3/Makefile @@ -7,6 +7,7 @@ PORTNAME= maven3 DISTVERSION= 3.0.3 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_APACHE} MASTER_SITE_SUBDIR= maven/binaries @@ -15,6 +16,8 @@ DISTNAME= apache-maven-${DISTVERSION}-bin MAINTAINER= hq@FreeBSD.org COMMENT= Java project management tool, 3.x branch +RUN_DEPENDS= bin/mvn:${PORTSDIR}/devel/maven-wrapper + USE_JAVA= yes JAVA_VERSION= 1.5+ NO_BUILD= yes @@ -22,21 +25,20 @@ DATADIR= ${JAVASHAREDIR}/${PORTNAME} WRKSRC= ${WRKDIR}/apache-maven-${DISTVERSION} SUB_FILES= mvn.sh SUB_LIST= CLASSWORLDS_JAR=plexus-classworlds-2.4.jar -.if !exists(${LOCALBASE}/bin/mvn) -PLIST_FILES+= bin/mvn -.endif +INSTANCE_FILE= 030003-${PORTNAME}-${PORTVERSION} +INSTANCES_DIR= etc/maven-wrapper/instances.d/ +PLIST_FILES= ${INSTANCES_DIR}/${INSTANCE_FILE} 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 -.if !exists(${LOCALBASE}/bin/mvn) - ${LN} -fs ${DATADIR}/bin/mvn ${PREFIX}/bin/mvn -.endif + ${INSTALL_DATA} ${WRKSRC}/${INSTANCE_FILE} ${PREFIX}/${INSTANCES_DIR} post-install: @${FIND} -s ${WRKSRC} -not -type d 2>/dev/null | \ |