Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory 
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18782/main/finkinfo/devel

Modified Files:
        maven.info maven.patch 
Log Message:
maven update, thanks to Trevor Harmon for the bump

Index: maven.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/maven.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- maven.patch 17 May 2007 18:42:37 -0000      1.2
+++ maven.patch 9 Aug 2010 21:46:41 -0000       1.3
@@ -1,18 +1,18 @@
-diff -uNr maven-2.0.6/bin/mvn maven-2.0.6-new/bin/mvn
---- maven-2.0.6/bin/mvn        2007-03-26 22:39:29.000000000 -0400
-+++ maven-2.0.6-new/bin/mvn    2007-05-17 13:30:28.000000000 -0400
-@@ -48,6 +48,10 @@
- if [ -f /etc/mavenrc ] ; then
+diff -urN apache-maven-2.2.1/bin/mvn apache-maven-2.2.1.new/bin/mvn
+--- apache-maven-2.2.1/bin/mvn 2009-08-06 12:18:12.000000000 -0700
++++ apache-maven-2.2.1.new/bin/mvn     2010-06-06 23:43:34.000000000 -0700
+@@ -45,6 +45,10 @@
    . /etc/mavenrc
  fi
+ 
 +if [ -f @FINKPREFIX@/etc/maven/mavenrc ] ; then
 +  . @FINKPREFIX@/etc/maven/mavenrc
 +fi
 +
- 
  if [ -f "$HOME/.mavenrc" ] ; then
    . "$HOME/.mavenrc"
-@@ -146,6 +150,8 @@
+ fi
+@@ -142,6 +146,8 @@
    echo "Warning: JAVA_HOME environment variable is not set."
  fi
  
@@ -21,7 +21,7 @@
  CLASSWORLDS_LAUNCHER=org.codehaus.classworlds.Launcher
  
  # For Cygwin, switch paths to Windows format before running java
-@@ -161,7 +167,7 @@
+@@ -157,7 +163,7 @@
  exec "$JAVACMD" \
    $MAVEN_OPTS \
    -classpath "${M2_HOME}"/boot/classworlds-*.jar \

Index: maven.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/maven.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- maven.info  27 Feb 2009 20:27:58 -0000      1.7
+++ maven.info  9 Aug 2010 21:45:39 -0000       1.8
@@ -1,16 +1,24 @@
 Package: maven
-Version: 2.0.10
+Version: 2.2.1
 Revision: 1
-Type: java(1.4)
+Description: Software project management tool
+Type: java(1.5)
+License: BSD
+Maintainer: Benjamin Reed <[email protected]>
+
+Depends: system-java (>= 1.5-1)
+BuildDepends: fink (>= 0.29.7-1)
+
 Source: mirror:apache:%n/binaries/apache-%n-%v-bin.tar.gz
-Source-MD5: 1673c4b206633155774ecbcab1c2fb2e
+Source-MD5: 3f829ed854cbacdaca8f809e4954c916
 SourceDirectory: apache-%n-%v
-PatchFile: %n.patch
-PatchFile-MD5: 3da755f98c82474b1d7dce54a19b2551
 PatchScript: sed -e 's,@FINKPREFIX@,%p,g' < %{PatchFile} | patch -p1
-Depends: system-java (>= 1.4-1)
-BuildDepends: fink (>= 0.26.0-1)
+PatchFile: %n.patch
+PatchFile-MD5: 04fe9cb9a4e11299faf370a0c6413503
+
+UseMaxBuildJobs: true
 CompileScript: echo "none needed"
+
 InstallScript: <<
 #!/bin/sh -ex
 
@@ -20,22 +28,24 @@
        mv bin/m2.conf %i/etc/maven/
 
        install -d -m 755 %i/bin
-       mv bin/m2 bin/mvn %i/bin/
+       mv bin/mvn %i/bin/
        rm -rf bin
        chmod 755 %i/bin/*
-
+       
        install -d -m 755 %i/share/maven
        mv boot conf lib %i/share/maven/
 
+       # Some Maven plugins expect the mvn executable to be located in 
$M2_HOME/bin
+       install -d -m 755 %i/share/maven/bin
+       ln -s %p/bin/mvn %i/share/maven/bin/mvn
 <<
 DocFiles: *.txt
+
 Homepage: http://maven.apache.org/
-Maintainer: Benjamin Reed <[email protected]>
-Description: Software project management tool
 DescDetail: <<
 Maven is a software project management and comprehension tool.
 Based on the concept of a project object model (POM), Maven can
 manage a project's build, reporting and documentation from a
 central piece of information.
 <<
-License: BSD
+


------------------------------------------------------------------------------
This SF.net email is sponsored by 

Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev 
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to