4 files changed, 85 insertions, 74 deletions

diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index 5db219971e11..6a1b433d5163 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -6,20 +6,26 @@
 #
 
 PORTNAME=	maven
-PORTVERSION=	1.0.r1
-PORTREVISION=	1
+PORTVERSION=	1.0.r2
 CATEGORIES=	devel java
 MASTER_SITES=	http://nagoya.apache.org/mirror/%SUBDIR%/binaries/
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-1.0-rc1
+DISTNAME=	${PORTNAME}-1.0-rc2
 
 MAINTAINER=	rui@ruilopes.com
 COMMENT=	Java project management and project comprehension tool
 
-USE_JAVA=	1.3+
+USE_BZIP2=	yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.3+
 NO_BUILD=	YES
 DIR=		share/java/maven
 PLIST_SUB=	DIR=${DIR}
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+post-configure:
+	@${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
+		-e 's,%%DIR%%,${DIR},g' pkg-message > ${PKGMESSAGE}
 
 do-install:
 	@cd ${WRKSRC} && ${FIND} . \! -name '*.bat' \! -name repository \
@@ -31,7 +37,11 @@ do-install:
 	${CHMOD} ${SHAREMODE} ${PREFIX}/${DIR}/bin/*.conf
 	${FIND} ${PREFIX}/${DIR} -type d | ${XARGS} ${CHMOD} +rx
 	${LN} -fs ${PREFIX}/${DIR}/bin/maven ${PREFIX}/bin
-	@${CAT} ${PKGDIR}/pkg-message
+
+post-install:
+.if !defined(BATCH)
+	@${CAT} ${PKGMESSAGE}
+.endif
 
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
diff --git a/devel/maven/distinfo b/devel/maven/distinfo
index 0e206e7572c9..adde448f099e 100644
--- a/devel/maven/distinfo
+++ b/devel/maven/distinfo
@@ -1,2 +1,2 @@
-MD5 (maven-1.0-rc1.tar.gz) = 7f5e787ff3b930d906d01243ccf7c237
-SIZE (maven-1.0-rc1.tar.gz) = 4867912
+MD5 (maven-1.0-rc2.tar.bz2) = 07cf754e8287a0390fee40672f9f974b
+SIZE (maven-1.0-rc2.tar.bz2) = 5599243
diff --git a/devel/maven/pkg-message b/devel/maven/pkg-message
index 52c51b3dddd9..0e1896cd98a7 100644
--- a/devel/maven/pkg-message
+++ b/devel/maven/pkg-message
@@ -3,10 +3,10 @@ To work with Maven you need to set the following environment variables:
   * JAVA_HOME
     Set it to the base directory of your java installation.
   * MAVEN_HOME
-    Set it to ``/usr/local/share/java/maven''.
+    Set it to ``%%PREFIX%%/%%DIR%%''.
 
 Then, you should initialize your repository with:
-  /usr/local/share/java/maven/bin/install_repo.sh ~/.maven/repository
+  %%PREFIX%%/%%DIR%%/bin/install_repo.sh ~/.maven/repository
 
 If you are behind a proxy, create a ~/.mavenrc file with something like:
   MAVEN_OPTS="$MAVEN_OPTS -Dmaven.proxy.host=YOUR_PROXY_HOSTNAME
diff --git a/devel/maven/pkg-plist b/devel/maven/pkg-plist
index a69990c21bd3..0662565a94bf 100644
--- a/devel/maven/pkg-plist
+++ b/devel/maven/pkg-plist
@@ -17,8 +17,8 @@ bin/maven
 %%DIR%%/lib/commons-jelly-tags-define-20030211.142932.jar
 %%DIR%%/lib/commons-jelly-tags-util-20030211.141939.jar
 %%DIR%%/lib/commons-jexl-1.0-beta-1.jar
-%%DIR%%/lib/commons-lang-1.0-b1.1.jar
-%%DIR%%/lib/commons-logging-1.0.1.jar
+%%DIR%%/lib/commons-lang-2.0.jar
+%%DIR%%/lib/commons-logging-1.0.3.jar
 %%DIR%%/lib/dom4j-1.4-dev-8.jar
 %%DIR%%/lib/endorsed/xerces-2.4.0.jar
 %%DIR%%/lib/endorsed/xml-apis-1.0.b2.jar
@@ -26,92 +26,93 @@ bin/maven
 %%DIR%%/lib/log4j-1.2.8.jar
 %%DIR%%/lib/maven.jar
 %%DIR%%/lib/plexus-0.6.jar
-%%DIR%%/lib/werkz-1.0-beta-10.jar
+%%DIR%%/lib/werkz-20040114.081319.jar
 %%DIR%%/lib/which-1.0.jar
-%%DIR%%/lib/xpp3-1.1.2a.jar
+%%DIR%%/maven-navigation-1.0.xsd
 %%DIR%%/maven-project.xsd
-%%DIR%%/plugins/maven-ant-plugin-1.4.jar
+%%DIR%%/plugins/maven-announcement-plugin-1.0.jar
+%%DIR%%/plugins/maven-ant-plugin-1.6.jar
 %%DIR%%/plugins/maven-antlr-plugin-1.1.jar
-%%DIR%%/plugins/maven-appserver-plugin-2.0-dev.jar
-%%DIR%%/plugins/maven-artifact-plugin-1.0.jar
+%%DIR%%/plugins/maven-appserver-plugin-2.0.jar
+%%DIR%%/plugins/maven-artifact-plugin-1.1.jar
 %%DIR%%/plugins/maven-ashkelon-plugin-1.1.jar
-%%DIR%%/plugins/maven-cactus-plugin-3.1.jar
-%%DIR%%/plugins/maven-castor-plugin-1.0.jar
-%%DIR%%/plugins/maven-changelog-plugin-1.3.jar
-%%DIR%%/plugins/maven-changes-plugin-1.2.jar
-%%DIR%%/plugins/maven-checkstyle-plugin-2.1.jar
+%%DIR%%/plugins/maven-aspectj-plugin-2.0.jar
+%%DIR%%/plugins/maven-aspectwerkz-plugin-1.1.jar
+%%DIR%%/plugins/maven-caller-plugin-1.0.jar
+%%DIR%%/plugins/maven-castor-plugin-1.1.jar
+%%DIR%%/plugins/maven-changelog-plugin-1.4.jar
+%%DIR%%/plugins/maven-changes-plugin-1.3.jar
+%%DIR%%/plugins/maven-checkstyle-plugin-2.3.jar
 %%DIR%%/plugins/maven-clean-plugin-1.1.jar
-%%DIR%%/plugins/maven-clover-plugin-1.2.jar
+%%DIR%%/plugins/maven-clover-plugin-1.4.jar
 %%DIR%%/plugins/maven-codeswitcher-plugin-1.1.jar
 %%DIR%%/plugins/maven-console-plugin-1.0.jar
-%%DIR%%/plugins/maven-cruisecontrol-plugin-1.0.jar
-%%DIR%%/plugins/maven-deploy-plugin-1.1.jar
-%%DIR%%/plugins/maven-developer-activity-plugin-1.3.jar
-%%DIR%%/plugins/maven-dist-plugin-1.3.jar
+%%DIR%%/plugins/maven-cruisecontrol-plugin-1.1.jar
+%%DIR%%/plugins/maven-dashboard-plugin-1.2.jar
+%%DIR%%/plugins/maven-deploy-plugin-1.2.jar
+%%DIR%%/plugins/maven-developer-activity-plugin-1.4.jar
+%%DIR%%/plugins/maven-dist-plugin-1.4.jar
 %%DIR%%/plugins/maven-docbook-plugin-1.1.jar
-%%DIR%%/plugins/maven-ear-plugin-1.2.jar
-%%DIR%%/plugins/maven-eclipse-plugin-1.4.jar
-%%DIR%%/plugins/maven-ejb-plugin-1.1.jar
-%%DIR%%/plugins/maven-faq-plugin-1.1.jar
-%%DIR%%/plugins/maven-file-activity-plugin-1.3.jar
-%%DIR%%/plugins/maven-genapp-plugin-2.0.jar
+%%DIR%%/plugins/maven-ear-plugin-1.4.jar
+%%DIR%%/plugins/maven-eclipse-plugin-1.6.jar
+%%DIR%%/plugins/maven-ejb-plugin-1.3.jar
+%%DIR%%/plugins/maven-faq-plugin-1.2.jar
+%%DIR%%/plugins/maven-file-activity-plugin-1.4.jar
+%%DIR%%/plugins/maven-genapp-plugin-2.1.jar
 %%DIR%%/plugins/maven-gump-plugin-1.2.jar
-%%DIR%%/plugins/maven-hibernate-plugin-1.0-SNAPHOT.jar
-%%DIR%%/plugins/maven-html2xdoc-plugin-1.1.jar
-%%DIR%%/plugins/maven-idea-plugin-1.2.jar
-%%DIR%%/plugins/maven-j2ee-plugin-1.3.jar
+%%DIR%%/plugins/maven-hibernate-plugin-1.0.jar
+%%DIR%%/plugins/maven-html2xdoc-plugin-1.2.jar
+%%DIR%%/plugins/maven-idea-plugin-1.3.jar
+%%DIR%%/plugins/maven-j2ee-plugin-1.4.jar
 %%DIR%%/plugins/maven-jalopy-plugin-1.1.jar
-%%DIR%%/plugins/maven-jar-plugin-1.3.jar
+%%DIR%%/plugins/maven-jar-plugin-1.4.jar
 %%DIR%%/plugins/maven-java-plugin-1.3.jar
-%%DIR%%/plugins/maven-javadoc-plugin-1.3.jar
-%%DIR%%/plugins/maven-jboss-plugin-1.3.jar
-%%DIR%%/plugins/maven-jbuilder-plugin-1.3.jar
-%%DIR%%/plugins/maven-jcoverage-plugin-1.0.1.jar
-%%DIR%%/plugins/maven-jdee-plugin-1.0-beta-1.jar
-%%DIR%%/plugins/maven-jdepend-plugin-1.3.jar
-%%DIR%%/plugins/maven-jdeveloper-plugin-1.2.jar
-%%DIR%%/plugins/maven-jellydoc-plugin-1.1.jar
-%%DIR%%/plugins/maven-jnlp-plugin-1.2.jar
+%%DIR%%/plugins/maven-javacc-plugin-1.0.jar
+%%DIR%%/plugins/maven-javadoc-plugin-1.4.jar
+%%DIR%%/plugins/maven-jboss-plugin-1.4.jar
+%%DIR%%/plugins/maven-jbuilder-plugin-1.4.jar
+%%DIR%%/plugins/maven-jcoverage-plugin-1.0.3.jar
+%%DIR%%/plugins/maven-jdee-plugin-1.0.jar
+%%DIR%%/plugins/maven-jdepend-plugin-1.4.jar
+%%DIR%%/plugins/maven-jdeveloper-plugin-1.3.jar
+%%DIR%%/plugins/maven-jdiff-plugin-1.2.jar
+%%DIR%%/plugins/maven-jellydoc-plugin-1.2.jar
+%%DIR%%/plugins/maven-jetty-plugin-1.0.jar
+%%DIR%%/plugins/maven-jira-plugin-1.0.jar
+%%DIR%%/plugins/maven-jnlp-plugin-1.3.jar
 %%DIR%%/plugins/maven-junit-doclet-plugin-1.1.jar
-%%DIR%%/plugins/maven-junit-report-plugin-1.3.jar
-%%DIR%%/plugins/maven-jxr-plugin-1.2.jar
+%%DIR%%/plugins/maven-junit-report-plugin-1.5.jar
+%%DIR%%/plugins/maven-jxr-plugin-1.3.jar
 %%DIR%%/plugins/maven-latex-plugin-1.1.jar
 %%DIR%%/plugins/maven-latka-plugin-1.3.jar
 %%DIR%%/plugins/maven-license-plugin-1.1.jar
-%%DIR%%/plugins/maven-linkcheck-plugin-1.1.jar
-%%DIR%%/plugins/maven-multiproject-plugin-1.1.jar
+%%DIR%%/plugins/maven-linkcheck-plugin-1.2.jar
+%%DIR%%/plugins/maven-multichanges-plugin-1.0.jar
+%%DIR%%/plugins/maven-multiproject-plugin-1.2.jar
 %%DIR%%/plugins/maven-native-plugin-1.0.jar
-%%DIR%%/plugins/maven-pdf-plugin-1.2.jar
+%%DIR%%/plugins/maven-nsis-plugin-1.0.jar
+%%DIR%%/plugins/maven-pdf-plugin-2.0.jar
 %%DIR%%/plugins/maven-perforce-plugin-1.1.jar
-%%DIR%%/plugins/maven-plexus-plugin-0.3.jar
-%%DIR%%/plugins/maven-plugin-plugin-1.1.jar
-%%DIR%%/plugins/maven-pmd-plugin-1.2.jar
+%%DIR%%/plugins/maven-plugin-plugin-1.3.jar
+%%DIR%%/plugins/maven-pmd-plugin-1.3.jar
 %%DIR%%/plugins/maven-pom-plugin-1.3.jar
-%%DIR%%/plugins/maven-release-plugin-1.1.jar
-%%DIR%%/plugins/maven-repository-plugin-1.0.jar
-%%DIR%%/plugins/maven-runner-plugin-0.3.jar
-%%DIR%%/plugins/maven-scm-plugin-1.1.jar
-%%DIR%%/plugins/maven-sea-plugin-1.0.jar
-%%DIR%%/plugins/maven-shell-plugin-1.0.jar
-%%DIR%%/plugins/maven-simian-plugin-1.2.jar
-%%DIR%%/plugins/maven-site-plugin-1.3.jar
-%%DIR%%/plugins/maven-statcvs-plugin-2.0.jar
+%%DIR%%/plugins/maven-release-plugin-1.2.jar
+%%DIR%%/plugins/maven-repository-plugin-1.1.jar
+%%DIR%%/plugins/maven-scm-plugin-1.2.jar
+%%DIR%%/plugins/maven-shell-plugin-1.1.jar
+%%DIR%%/plugins/maven-simian-plugin-1.3.jar
+%%DIR%%/plugins/maven-site-plugin-1.5.jar
+%%DIR%%/plugins/maven-statcvs-plugin-2.1.jar
 %%DIR%%/plugins/maven-struts-plugin-1.2.jar
-%%DIR%%/plugins/maven-summit-plugin-1.1.jar
-%%DIR%%/plugins/maven-tasklist-plugin-2.2.jar
-%%DIR%%/plugins/maven-test-plugin-1.4.jar
+%%DIR%%/plugins/maven-tasklist-plugin-2.3.jar
+%%DIR%%/plugins/maven-test-plugin-1.5.jar
 %%DIR%%/plugins/maven-tjdo-plugin-1.0.0.jar
-%%DIR%%/plugins/maven-torque-plugin-3.2.jar
-%%DIR%%/plugins/maven-touchstone-partner-plugin-1.0.jar
-%%DIR%%/plugins/maven-touchstone-plugin-1.0.jar
 %%DIR%%/plugins/maven-uberjar-plugin-1.1.jar
 %%DIR%%/plugins/maven-vdoclet-plugin-1.1.jar
-%%DIR%%/plugins/maven-war-plugin-1.4.jar
-%%DIR%%/plugins/maven-was40-plugin-1.0.jar
-%%DIR%%/plugins/maven-webserver-plugin-2.0-dev.jar
+%%DIR%%/plugins/maven-war-plugin-1.5.jar
+%%DIR%%/plugins/maven-webserver-plugin-2.0.jar
 %%DIR%%/plugins/maven-wizard-plugin-1.0.jar
-%%DIR%%/plugins/maven-word2html-plugin-1.4.jar
-%%DIR%%/plugins/maven-xdoc-plugin-1.4.jar
+%%DIR%%/plugins/maven-xdoc-plugin-1.6.jar
 @dirrm %%DIR%%/plugins
 @dirrm %%DIR%%/lib/endorsed
 @dirrm %%DIR%%/lib