- update to maven-3.0.4

ok kurt@

devel/maven/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2011/10/07 13:54:31 kurt Exp $
+# $OpenBSD: Makefile,v 1.16 2013/02/06 17:46:44 jasper Exp $
 
 COMMENT=	software project management and comprehension tool
 
-DISTNAME=	apache-maven-2.2.1
+V=		3.0.4
+DISTNAME=	apache-maven-$V
 PKGNAME=	${DISTNAME:S/apache-//}
-REVISION=	2
 CATEGORIES=	devel
 
 HOMEPAGE=	http://maven.apache.org/
@@ -15,14 +15,14 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${MASTER_SITE_APACHE:=maven/binaries/} \
+MASTER_SITES=	${MASTER_SITE_APACHE:=maven/maven-3/${V}/binaries/} \
 		http://archive.apache.org/dist/maven/binaries/
 
 
 EXTRACT_SUFX=	-bin.tar.gz
 
 MODULES=	java
-MODJAVA_VER=	1.5+
+MODJAVA_VER=	1.6+
 RUN_DEPENDS=	java/javaPathHelper
 
 NO_BUILD=	Yes

devel/maven/distinfo

@@ -1,5 +1,2 @@
-MD5 (apache-maven-2.2.1-bin.tar.gz) = P4Ke2FTLrNrKj4CeSVTJFg==
-RMD160 (apache-maven-2.2.1-bin.tar.gz) = zbdXuhMwAy0UGv8tKjOSSZkhS/c=
-SHA1 (apache-maven-2.2.1-bin.tar.gz) = OsYwJeWGDE2FbhcqtVbRS1L5sfE=
-SHA256 (apache-maven-2.2.1-bin.tar.gz) = uaNlWUhqhiq/x/sgZP0UKfIDM8qulaxRIV0G1ywC03Y=
-SIZE (apache-maven-2.2.1-bin.tar.gz) = 2840961
+SHA256 (apache-maven-3.0.4-bin.tar.gz) = 01qHYDTAjLfiDqL7zxaLytTf9YAautgtSAVVF1E/qi8=
+SIZE (apache-maven-3.0.4-bin.tar.gz) = 4873043

devel/maven/patches/patch-bin_mvn

@@ -1,14 +1,14 @@
-$OpenBSD: patch-bin_mvn,v 1.2 2009/08/30 22:05:32 stsp Exp $
---- bin/mvn.orig	Thu Aug  6 20:18:08 2009
-+++ bin/mvn	Mon Aug 24 01:28:30 2009
-@@ -41,8 +41,8 @@ while [ "$1" != "" ] ; do
+$OpenBSD: patch-bin_mvn,v 1.3 2013/02/06 17:46:44 jasper Exp $
+--- bin/mvn.orig	Mon Feb  4 22:39:01 2013
++++ bin/mvn	Mon Feb  4 22:40:16 2013
+@@ -36,8 +36,8 @@
  
- done
+ if [ -z "$MAVEN_SKIP_RC" ] ; then
  
--if [ -f /etc/mavenrc ] ; then
--  . /etc/mavenrc
-+if [ -f %%SYSCONFDIR%%/maven/maven.rc ] ; then
-+  . %%SYSCONFDIR%%/maven/maven.rc
- fi
+-  if [ -f /etc/mavenrc ] ; then
+-    . /etc/mavenrc
++  if [ -f %%SYSCONFDIR%%/mavenrc ] ; then
++    . %%SYSCONFDIR%%/mavenrc
+   fi
  
- if [ -f "$HOME/.mavenrc" ] ; then
+   if [ -f "$HOME/.mavenrc" ] ; then

devel/maven/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2009/08/30 22:05:32 stsp Exp $
+@comment $OpenBSD: PLIST,v 1.3 2013/02/06 17:46:44 jasper Exp $
 ${DISTNAME}/
 ${DISTNAME}/LICENSE.txt
 ${DISTNAME}/NOTICE.txt
@@ -7,11 +7,42 @@ ${DISTNAME}/bin/
 ${DISTNAME}/bin/m2.conf
 ${DISTNAME}/bin/mvn
 ${DISTNAME}/bin/mvnDebug
+${DISTNAME}/bin/mvnyjp
 ${DISTNAME}/boot/
-${DISTNAME}/boot/classworlds-1.1.jar
+${DISTNAME}/boot/plexus-classworlds-2.4.jar
 ${DISTNAME}/conf
 ${DISTNAME}/lib/
-${DISTNAME}/lib/maven-2.2.1-uber.jar
+${DISTNAME}/lib/aether-api-1.13.1.jar
+${DISTNAME}/lib/aether-connector-wagon-1.13.1.jar
+${DISTNAME}/lib/aether-impl-1.13.1.jar
+${DISTNAME}/lib/aether-spi-1.13.1.jar
+${DISTNAME}/lib/aether-util-1.13.1.jar
+${DISTNAME}/lib/commons-cli-1.2.jar
+${DISTNAME}/lib/ext/
+${DISTNAME}/lib/ext/README.txt
+${DISTNAME}/lib/maven-aether-provider-3.0.4.jar
+${DISTNAME}/lib/maven-artifact-3.0.4.jar
+${DISTNAME}/lib/maven-compat-3.0.4.jar
+${DISTNAME}/lib/maven-core-3.0.4.jar
+${DISTNAME}/lib/maven-embedder-3.0.4.jar
+${DISTNAME}/lib/maven-model-3.0.4.jar
+${DISTNAME}/lib/maven-model-builder-3.0.4.jar
+${DISTNAME}/lib/maven-plugin-api-3.0.4.jar
+${DISTNAME}/lib/maven-repository-metadata-3.0.4.jar
+${DISTNAME}/lib/maven-settings-3.0.4.jar
+${DISTNAME}/lib/maven-settings-builder-3.0.4.jar
+${DISTNAME}/lib/plexus-cipher-1.7.jar
+${DISTNAME}/lib/plexus-component-annotations-1.5.5.jar
+${DISTNAME}/lib/plexus-interpolation-1.14.jar
+${DISTNAME}/lib/plexus-sec-dispatcher-1.3.jar
+${DISTNAME}/lib/plexus-utils-2.0.6.jar
+${DISTNAME}/lib/sisu-guava-0.9.9.jar
+${DISTNAME}/lib/sisu-guice-3.1.0-no_aop.jar
+${DISTNAME}/lib/sisu-inject-bean-2.3.0.jar
+${DISTNAME}/lib/sisu-inject-plexus-2.3.0.jar
+${DISTNAME}/lib/wagon-file-2.2.jar
+${DISTNAME}/lib/wagon-http-2.2-shaded.jar
+${DISTNAME}/lib/wagon-provider-api-2.2.jar
 bin/mvn
 share/examples/maven/
 @sample ${SYSCONFDIR}/maven/