--- arduino     2009-08-11 19:00:04.000000000 -0400
+++ arduino    2009-10-17 13:39:14.000000000 -0400
@@ -8,14 +8,14 @@
     lib/*.jar \
     ;
 do
-    CLASSPATH="${CLASSPATH}:${APPDIR}/${LIB}"
+    CLASSPATH="${CLASSPATH+$CLASSPATH:}${APPDIR}/${LIB}"
 done
+CLASSPATH="${CLASSPATH+$CLASSPATH:}$(java-config -dp antlr)"
+CLASSPATH="${CLASSPATH+$CLASSPATH:}$(java-config -dp rxtx-2)"
 export CLASSPATH

-LD_LIBRARY_PATH=`pwd`/lib:${LD_LIBRARY_PATH}
+LD_LIBRARY_PATH="$(java-config -di rxtx-2)${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
 export LD_LIBRARY_PATH

-export PATH="${APPDIR}/java/bin:${PATH}"
-
 java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base