The diff below updates maven to the latest release.
Please test, comment, ok.
Stefan
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/maven/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 26 Apr 2009 09:38:25 -0000 1.9
+++ Makefile 24 Aug 2009 00:35:50 -0000
@@ -2,8 +2,8 @@
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/
@@ -22,7 +22,6 @@ EXTRACT_SUFX= -bin.tar.gz
MODULES= java
MODJAVA_VER= 1.4+
-BUILD_DEPENDS= ::archivers/gtar
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
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/maven/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 5 Apr 2007 15:37:56 -0000 1.2
+++ distinfo 23 Aug 2009 23:39:32 -0000
@@ -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
Index: patches/patch-bin_mvn
===================================================================
RCS file: /cvs/ports/devel/maven/patches/patch-bin_mvn,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-bin_mvn
--- patches/patch-bin_mvn 8 Dec 2005 09:48:02 -0000 1.1.1.1
+++ patches/patch-bin_mvn 24 Aug 2009 00:28:35 -0000
@@ -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.
+--- 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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/maven/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 8 Dec 2005 09:48:02 -0000 1.1.1.1
+++ pkg/PLIST 24 Aug 2009 00:36:55 -0000
@@ -1,43 +1,18 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/12/08 09:48:02 bernd Exp $
-bin/mvn
${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
