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

Modified Files:
        maven.info maven.patch 
Log Message:
new upstream

Index: maven.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/maven.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- maven.patch 9 Aug 2010 21:46:41 -0000       1.3
+++ maven.patch 27 Oct 2010 19:19:36 -0000      1.4
@@ -1,7 +1,7 @@
-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 @@
+diff -Nurd apache-maven-3.0/bin/mvn apache-maven-3.0-new/bin/mvn
+--- apache-maven-3.0/bin/mvn   2010-10-04 07:54:17.000000000 -0400
++++ apache-maven-3.0-new/bin/mvn       2010-10-27 15:07:49.000000000 -0400
+@@ -37,6 +37,10 @@
    . /etc/mavenrc
  fi
  
@@ -12,19 +12,78 @@
  if [ -f "$HOME/.mavenrc" ] ; then
    . "$HOME/.mavenrc"
  fi
-@@ -142,6 +146,8 @@
-   echo "Warning: JAVA_HOME environment variable is not set."
+@@ -135,6 +139,7 @@
  fi
  
+ CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
 +[ -z "$CLASSWORLDS_CONF" ] && CLASSWORLDS_CONF="${M2_HOME}/bin/m2.conf"
+ 
+ # For Cygwin, switch paths to Windows format before running java
+ if $cygwin; then
+@@ -149,6 +154,6 @@
+ exec "$JAVACMD" \
+   $MAVEN_OPTS \
+   -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
+-  "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
++  "-Dclassworlds.conf=${CLASSWORLDS_CONF}" \
+   "-Dmaven.home=${M2_HOME}"  \
+   ${CLASSWORLDS_LAUNCHER} "$@"
+diff -Nurd apache-maven-3.0/bin/mvnDebug apache-maven-3.0-new/bin/mvnDebug
+--- apache-maven-3.0/bin/mvnDebug      2010-10-04 07:54:17.000000000 -0400
++++ apache-maven-3.0-new/bin/mvnDebug  2010-10-27 15:08:28.000000000 -0400
+@@ -41,6 +41,10 @@
+   . /etc/mavenrc
+ fi
+ 
++if [ -f @FINKPREFIX@/etc/maven/mavenrc ] ; then
++  . @FINKPREFIX@/etc/maven/mavenrc
++fi
 +
- CLASSWORLDS_LAUNCHER=org.codehaus.classworlds.Launcher
+ if [ -f "$HOME/.mavenrc" ] ; then
+   . "$HOME/.mavenrc"
+ fi
+@@ -139,6 +143,7 @@
+ fi
+ 
+ CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
++[ -z "$CLASSWORLDS_CONF" ] && CLASSWORLDS_CONF="${M2_HOME}/bin/m2.conf"
  
  # For Cygwin, switch paths to Windows format before running java
-@@ -157,7 +163,7 @@
+ if $cygwin; then
+@@ -154,6 +159,6 @@
+   $MAVEN_OPTS \
+   $MAVEN_DEBUG_OPTS \
+   -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
+-  "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
++  "-Dclassworlds.conf=${CLASSWORLDS_CONF}" \
+   "-Dmaven.home=${M2_HOME}"  \
+   ${CLASSWORLDS_LAUNCHER} "$@"
+diff -Nurd apache-maven-3.0/bin/mvnyjp apache-maven-3.0-new/bin/mvnyjp
+--- apache-maven-3.0/bin/mvnyjp        2010-10-04 07:54:17.000000000 -0400
++++ apache-maven-3.0-new/bin/mvnyjp    2010-10-27 15:09:02.000000000 -0400
+@@ -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"
+ fi
+@@ -147,6 +151,7 @@
+ fi
+ 
+ CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
++[ -z "$CLASSWORLDS_CONF" ] && CLASSWORLDS_CONF="${M2_HOME}/bin/m2.conf"
+ 
+ # For Cygwin, switch paths to Windows format before running java
+ if $cygwin; then
+@@ -168,7 +173,7 @@
  exec "$JAVACMD" \
    $MAVEN_OPTS \
-   -classpath "${M2_HOME}"/boot/classworlds-*.jar \
+   -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
 -  "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
 +  "-Dclassworlds.conf=${CLASSWORLDS_CONF}" \
    "-Dmaven.home=${M2_HOME}"  \

Index: maven.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/maven.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- maven.info  9 Aug 2010 21:45:39 -0000       1.8
+++ maven.info  27 Oct 2010 19:19:36 -0000      1.9
@@ -1,5 +1,5 @@
 Package: maven
-Version: 2.2.1
+Version: 3.0
 Revision: 1
 Description: Software project management tool
 Type: java(1.5)
@@ -10,11 +10,11 @@
 BuildDepends: fink (>= 0.29.7-1)
 
 Source: mirror:apache:%n/binaries/apache-%n-%v-bin.tar.gz
-Source-MD5: 3f829ed854cbacdaca8f809e4954c916
+Source-MD5: 505560ca377b990a965c4e4f8da42daa
 SourceDirectory: apache-%n-%v
 PatchScript: sed -e 's,@FINKPREFIX@,%p,g' < %{PatchFile} | patch -p1
 PatchFile: %n.patch
-PatchFile-MD5: 04fe9cb9a4e11299faf370a0c6413503
+PatchFile-MD5: cd123d58b82db3ea80ce823059f2737a
 
 UseMaxBuildJobs: true
 CompileScript: echo "none needed"
@@ -27,6 +27,7 @@
        echo "CLASSWORLDS_CONF=%p/etc/maven/m2.conf" >> %i/etc/maven/mavenrc
        mv bin/m2.conf %i/etc/maven/
 
+       rm -rf bin/*.bat
        install -d -m 755 %i/bin
        mv bin/mvn %i/bin/
        rm -rf bin


------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in  U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store 
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to