[33624] trunk/dports/java/eclipse-ecj32

[ryandesign at macports.org]

Revision: 33624
          http://trac.macosforge.org/projects/macports/changeset/33624
Author:   ryandesign at macports.org
Date:     2008-01-31 14:37:22 -0800 (Thu, 31 Jan 2008)

Log Message:
-----------
eclipse-ecj32: don't hardcode /opt/local into the ecj launcher script; follow-up to r33623; closes #14011

Modified Paths:
--------------
    trunk/dports/java/eclipse-ecj32/Portfile

Added Paths:
-----------
    trunk/dports/java/eclipse-ecj32/files/ecj.in

Removed Paths:
-------------
    trunk/dports/java/eclipse-ecj32/files/ecj

Modified: trunk/dports/java/eclipse-ecj32/Portfile
===================================================================
--- trunk/dports/java/eclipse-ecj32/Portfile	2008-01-31 22:33:22 UTC (rev 33623)
+++ trunk/dports/java/eclipse-ecj32/Portfile	2008-01-31 22:37:22 UTC (rev 33624)
@@ -4,7 +4,7 @@
 
 name                    eclipse-ecj32
 version                 3.2.2-200702121330
-revision                1
+revision                2
 categories              java
 maintainers             gmail.com:mvfranz openmaintainer
 platforms               darwin
@@ -31,7 +31,8 @@
 
 post-patch {
     copy ${filespath}/build.xml ${worksrcpath}
-    copy ${filespath}/ecj ${worksrcpath}
+    copy ${filespath}/ecj.in ${worksrcpath}/ecj
+    reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/ecj
     file mkdir ${worksrcpath}/META-INF
     copy ${filespath}/MANIFEST.MF ${worksrcpath}/META-INF
 }

Deleted: trunk/dports/java/eclipse-ecj32/files/ecj
===================================================================
--- trunk/dports/java/eclipse-ecj32/files/ecj	2008-01-31 22:33:22 UTC (rev 33623)
+++ trunk/dports/java/eclipse-ecj32/files/ecj	2008-01-31 22:37:22 UTC (rev 33624)
@@ -1,31 +0,0 @@
-#!/bin/bash
-# remove double bootclasspath entries:
-BOOTCLASSPATH=""
-BOOTCLASSPATH=$(find /opt/local/share/java -name "libgcj*.jar" -print | tr "\n" ":"):$(find /opt/local/share/java/ -name "glibj*.jar" -print | tr "\n" ":")
-OPTIONS=""
-while [ $# -gt 0 ]
-do
-  if [ $1 = "-bootclasspath" ]
-  then
-    BOOTCLASSPATH=$2:$BOOTCLASSPATH
-    shift
-    shift
-    continue
-  fi
-  OPTIONS="$OPTIONS $1"
-  shift
-done
-GIJ_EXECUTABLE=$(ls /opt/local/bin/gij* | tail -n1)
-if [ -e /usr/bin/java ]
-then
-  exec /usr/bin/java -jar /opt/local/share/java/eclipse-ecj.jar -bootclasspath $BOOTCLASSPATH $OPTIONS
-elif [ -e /usr/bin/cacao ]
-then
-  exec /usr/bin/cacao -jar /opt/local/share/java/eclipse-ecj.jar -bootclasspath $BOOTCLASSPATH $OPTIONS
-elif [ -e  ]
-then
-  exec $GIJ_EXECUTABLE -jar /opt/local/share/java/eclipse-ecj.jar -bootclasspath $BOOTCLASSPATH $OPTIONS
-else
-  echo "no java vm found :("
-  exit -1
-fi

Copied: trunk/dports/java/eclipse-ecj32/files/ecj.in (from rev 33623, trunk/dports/java/eclipse-ecj32/files/ecj)
===================================================================
--- trunk/dports/java/eclipse-ecj32/files/ecj.in	                        (rev 0)
+++ trunk/dports/java/eclipse-ecj32/files/ecj.in	2008-01-31 22:37:22 UTC (rev 33624)
@@ -0,0 +1,31 @@
+#!/bin/bash
+# remove double bootclasspath entries:
+BOOTCLASSPATH=""
+BOOTCLASSPATH=$(find @PREFIX@/share/java -name "libgcj*.jar" -print | tr "\n" ":"):$(find @PREFIX@/share/java/ -name "glibj*.jar" -print | tr "\n" ":")
+OPTIONS=""
+while [ $# -gt 0 ]
+do
+  if [ $1 = "-bootclasspath" ]
+  then
+    BOOTCLASSPATH=$2:$BOOTCLASSPATH
+    shift
+    shift
+    continue
+  fi
+  OPTIONS="$OPTIONS $1"
+  shift
+done
+GIJ_EXECUTABLE=$(ls @PREFIX@/bin/gij* | tail -n1)
+if [ -e /usr/bin/java ]
+then
+  exec /usr/bin/java -jar @PREFIX@/share/java/eclipse-ecj.jar -bootclasspath $BOOTCLASSPATH $OPTIONS
+elif [ -e /usr/bin/cacao ]
+then
+  exec /usr/bin/cacao -jar @PREFIX@/share/java/eclipse-ecj.jar -bootclasspath $BOOTCLASSPATH $OPTIONS
+elif [ -e  ]
+then
+  exec $GIJ_EXECUTABLE -jar @PREFIX@/share/java/eclipse-ecj.jar -bootclasspath $BOOTCLASSPATH $OPTIONS
+else
+  echo "no java vm found :("
+  exit -1
+fi

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080131/f26a2b53/attachment.html