From 560796a277d7c13d3635e5ee07d9b374f3760eb6 Mon Sep 17 00:00:00 2001
From: stsp <stsp@openbsd.org>
Date: Sun, 30 Aug 2009 22:05:25 +0000
Subject: [PATCH] Update to 2.2.1. Now depends on devel/jdk >= 1.5 instead of
 lang/kaffe, so i386/amd64 only. Tested by me on i386 and by Tobias Sarnowski
 on amd64. ok bernd@ kurt@

---
 devel/maven/Makefile              | 12 +++++-----
 devel/maven/distinfo              | 10 ++++-----
 devel/maven/patches/patch-bin_mvn | 12 +++++-----
 devel/maven/pkg/PLIST             | 37 +++++--------------------------
 4 files changed, 22 insertions(+), 49 deletions(-)

diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index f454faba522..cb725962427 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2009/04/26 09:38:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2009/08/30 22:05:25 stsp Exp $
 
 COMMENT=	software project management and comprehension tool
 
-DISTNAME=	maven-2.0
-PKGNAME=	${DISTNAME}p6
+PKGNAME=	maven-2.2.1
+DISTNAME=	apache-${PKGNAME}
 CATEGORIES=	devel
 
 HOMEPAGE=	http://maven.apache.org/
@@ -21,8 +21,7 @@ MASTER_SITES=	${MASTER_SITE_APACHE:=maven/binaries/} \
 EXTRACT_SUFX=	-bin.tar.gz
 
 MODULES=	java
-MODJAVA_VER=	1.4+
-BUILD_DEPENDS=	::archivers/gtar
+MODJAVA_VER=	1.5+
 RUN_DEPENDS=	::java/javaPathHelper
 
 NO_BUILD=	Yes
@@ -30,14 +29,13 @@ NO_REGRESS=	Yes
 
 MAVEN_HOME=	${LOCALBASE}/${DISTNAME}
 SAMPLEDIR=	${PREFIX}/share/examples/maven
-TAR=		${LOCALBASE}/bin/gtar
 SUBST_VARS+=	DISTNAME
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${DISTNAME}
 	${INSTALL_DATA_DIR} ${SAMPLEDIR}
 	cd ${WRKDIST} && \
-		tar -cf - bin core lib `find * -prune -type f` | \
+		tar -cf - bin boot lib `find * -prune -type f` | \
 		tar -C ${PREFIX}/${DISTNAME} -xf -
 	find ${WRKINST} -name \*.orig -or -name \*.bat -or -name \*.exe | \
 		xargs rm
diff --git a/devel/maven/distinfo b/devel/maven/distinfo
index cd4f36380dd..5d838b14e8f 100644
--- a/devel/maven/distinfo
+++ b/devel/maven/distinfo
@@ -1,5 +1,5 @@
-MD5 (maven-2.0-bin.tar.gz) = 7CwG3bcZGsgJzidKAuS5sg==
-RMD160 (maven-2.0-bin.tar.gz) = 7wJ4NB8xkbyH3J46MCkuNgLW+a0=
-SHA1 (maven-2.0-bin.tar.gz) = aUdHf5FHITFFXos0NZqISUR9sM0=
-SHA256 (maven-2.0-bin.tar.gz) = jHJXnsk7qdU9j4bkVfKq1HipEINbUQqHCE+eu3rEAso=
-SIZE (maven-2.0-bin.tar.gz) = 1167211
+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
diff --git a/devel/maven/patches/patch-bin_mvn b/devel/maven/patches/patch-bin_mvn
index 87d4af59123..cf8319992b7 100644
--- a/devel/maven/patches/patch-bin_mvn
+++ b/devel/maven/patches/patch-bin_mvn
@@ -1,9 +1,9 @@
-$OpenBSD: patch-bin_mvn,v 1.1.1.1 2005/12/08 09:48:02 bernd Exp $
---- bin/mvn.orig	Wed Oct 19 21:11:17 2005
-+++ bin/mvn	Mon Dec  5 15:53:30 2005
-@@ -18,8 +18,8 @@
- #   Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
- #   reserved.
+$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
+ 
+ done
  
 -if [ -f /etc/mavenrc ] ; then
 -  . /etc/mavenrc
diff --git a/devel/maven/pkg/PLIST b/devel/maven/pkg/PLIST
index c752f1713db..d7da5fd62ef 100644
--- a/devel/maven/pkg/PLIST
+++ b/devel/maven/pkg/PLIST
@@ -1,43 +1,18 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/12/08 09:48:02 bernd Exp $
-bin/mvn
+@comment $OpenBSD: PLIST,v 1.2 2009/08/30 22:05:32 stsp Exp $
 ${DISTNAME}/
 ${DISTNAME}/LICENSE.txt
 ${DISTNAME}/NOTICE.txt
 ${DISTNAME}/README.txt
 ${DISTNAME}/bin/
-${DISTNAME}/bin/m2
 ${DISTNAME}/bin/m2.conf
 ${DISTNAME}/bin/mvn
+${DISTNAME}/bin/mvnDebug
+${DISTNAME}/boot/
+${DISTNAME}/boot/classworlds-1.1.jar
 ${DISTNAME}/conf
-${DISTNAME}/core/
-${DISTNAME}/core/boot/
-${DISTNAME}/core/boot/classworlds-1.1-alpha-2.jar
-${DISTNAME}/core/plexus-container-default-1.0-alpha-8.jar
-${DISTNAME}/core/plexus-utils-1.0.4.jar
 ${DISTNAME}/lib/
-${DISTNAME}/lib/commons-cli-1.0.jar
-${DISTNAME}/lib/doxia-sink-api-1.0-alpha-4.jar
-${DISTNAME}/lib/jsch-0.1.23.jar
-${DISTNAME}/lib/maven-artifact-2.0-1.jar
-${DISTNAME}/lib/maven-artifact-manager-2.0-1.jar
-${DISTNAME}/lib/maven-core-2.0.jar
-${DISTNAME}/lib/maven-error-diagnostics-2.0.jar
-${DISTNAME}/lib/maven-model-2.0.jar
-${DISTNAME}/lib/maven-monitor-2.0.jar
-${DISTNAME}/lib/maven-plugin-api-2.0.jar
-${DISTNAME}/lib/maven-plugin-descriptor-2.0.jar
-${DISTNAME}/lib/maven-plugin-parameter-documenter-2.0.jar
-${DISTNAME}/lib/maven-plugin-registry-2.0.jar
-${DISTNAME}/lib/maven-profile-2.0.jar
-${DISTNAME}/lib/maven-project-2.0-1.jar
-${DISTNAME}/lib/maven-reporting-api-2.0.jar
-${DISTNAME}/lib/maven-repository-metadata-2.0.jar
-${DISTNAME}/lib/maven-settings-2.0.jar
-${DISTNAME}/lib/plexus-interactivity-api-1.0-alpha-4.jar
-${DISTNAME}/lib/wagon-file-1.0-alpha-5.jar
-${DISTNAME}/lib/wagon-http-lightweight-1.0-alpha-5.jar
-${DISTNAME}/lib/wagon-provider-api-1.0-alpha-5.jar
-${DISTNAME}/lib/wagon-ssh-1.0-alpha-5.jar
+${DISTNAME}/lib/maven-2.2.1-uber.jar
+bin/mvn
 share/examples/maven/
 @sample ${SYSCONFDIR}/maven/
 share/examples/maven/maven.rc