merge of '28c74aa25680384c6f311fd8f4123ddb27c1ba65'

     and '77f81ea18669b5c79145faa5f0a96df1d7db3232'

113 files changed, 1884 insertions, 1198 deletions

diff --git a/packages/cacao/cacao.inc b/packages/cacao/cacao.inc
index 0d2b4c7ae1..e08cd5ec80 100644
--- a/packages/cacao/cacao.inc
+++ b/packages/cacao/cacao.inc
@@ -15,17 +15,33 @@ RPROVIDES_cacao = "java2-runtime"
 
 inherit java autotools update-alternatives
 
+# Old and new options do not interfere.
 EXTRA_OECONF = "\
 	${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
 	--enable-debug \
+	--with-vm-zip=${datadir}/cacao/vm.zip \
 	--with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-${PV} \
+  ${OLD_CACAO_OECONF} \
+  ${NEW_CACAO_OECONF} \
+  "
+
+# Options needed for Cacao < 0.99 (including hg snapshots)
+OLD_CACAO_OECONF = "\
 	--with-classpath-includedir=${STAGING_INCDIR}/classpath \
 	--with-classpath-classes=${STAGING_DATADIR}/classpath/glibj.zip \
 	--with-target-classpath-classes=${datadir}/classpath/glibj.zip \
-	--with-vm-zip=${datadir}/cacao/vm.zip \
-	--with-classpath-libdir=${libdir} \
+	--with-classpath-libdir=${libdir_jni}:${libdir} \
 	"
 
+# Options needed for Cacao >= 0.99
+NEW_CACAO_OECONF = "\
+  --with-build-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
+  --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
+  --with-java-runtime-library-libdir=${libdir_jni}:${libdir} \
+  --with-jni_md_h=${STAGING_INCDIR}/classpath \
+  --with-jni_h=${STAGING_INCDIR}/classpath \
+  "
+
 PACKAGES = "${PN} ${PN}-doc ${PN}-dbg"
 
 FILES_${PN} = "${bindir}/${PN} ${libdir}/lib*.so* ${datadir}/${PN}"
@@ -36,16 +52,3 @@ ALTERNATIVE_NAME = "java"
 ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}"
 ALTERNATIVE_PATH = "${bindir}/cacao"
 ALTERNATIVE_PRIORITY = "10"
-
-do_configure_prepend() {
-  # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
-  # configured in OE.
-  if [ -e src/vm/properties.c ]; then
-    sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/vm/properties.c
-  fi
-
-  if [ -e src/vm/properties.c ]; then
-    sed -i -e "s|OE_LIBDIR_JNI|${libdir_jni}|" src/vm/vm.c
-  fi
-}
-
diff --git a/packages/cacao/cacao_0.98+hg20071001.bb b/packages/cacao/cacao_0.98+hg20071001.bb
index 878827c28e..e897cfad41 100644
--- a/packages/cacao/cacao_0.98+hg20071001.bb
+++ b/packages/cacao/cacao_0.98+hg20071001.bb
@@ -1,10 +1,9 @@
 require cacao.inc
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "\
         http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518 \
-        file://cacao-0.98+svn-libdir.diff;patch=1 \
         file://cacao-0.98+svn-classpath_var.patch;patch=1 \
         file://cacao-0.98+hg-arm-cacheflush-fix.patch;patch=1 \
         file://cacao-0.98+hg-attachthread.patch;patch=1 \
diff --git a/packages/cacao/cacao_0.98+hg20080519.bb b/packages/cacao/cacao_0.98+hg20080519.bb
index efe0fbb898..0cd5132ef7 100644
--- a/packages/cacao/cacao_0.98+hg20080519.bb
+++ b/packages/cacao/cacao_0.98+hg20080519.bb
@@ -1,24 +1,12 @@
 require cacao.inc
 
-PR = "r0"
+PR = "r1"
 
-SRC_URI = "http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f \
-           file://cacao-hg20080519-classpath_var.patch;patch=1 \
-           file://cacao-hg20080519-libdir.patch;patch=1 \
-          "
+SRC_URI = "\
+  http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f \
+  file://cacao-${PV}-build-java-runtime-library-classes.patch;patch=1 \
+  "
 
 S = "${WORKDIR}/cacao"
 
-EXTRA_OECONF = "\
-        ${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
-        --enable-debug \
-        --with-vm-zip=${datadir}/cacao/vm.zip \
-        --with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-${PV} \
-        --with-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
-        --with-target-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
-        --with-java-runtime-library-libdir=${libdir} \
-        --with-jni_md_h=${STAGING_INCDIR}/classpath \
-        --with-jni_h=${STAGING_INCDIR}/classpath \
-        "
-
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/cacao/cacao_0.99.1.bb b/packages/cacao/cacao_0.99.1.bb
new file mode 100644
index 0000000000..a503c7d3d4
--- /dev/null
+++ b/packages/cacao/cacao_0.99.1.bb
@@ -0,0 +1,14 @@
+require cacao.inc
+
+PR = "r0"
+
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d \
+           file://cacao-${PV}-build-java-runtime-library-classes.patch;patch=1 \
+          "
+
+# Quirks for Nokia N800:
+# - with mfloat-abi=softfp the runtime fails to run anything
+# - without --enable-softfloat it cannot find files within Jars
+TARGET_CC_ARCH_nokia800 = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=soft"
+
+EXTRA_OECONF_append_nokia800 = "--enable-softfloat"
diff --git a/packages/cacao/cacaoh-native.inc b/packages/cacao/cacaoh-native.inc
index 3e7fdd60c6..3dfc7b1b98 100644
--- a/packages/cacao/cacaoh-native.inc
+++ b/packages/cacao/cacaoh-native.inc
@@ -6,14 +6,16 @@ DEPENDS = "libtool-native zlib-native virtual/javac-native classpath-native"
 
 S = "${WORKDIR}/cacao-${PV}"
 
-PR = "r1"
-
 inherit autotools native
 
 EXTRA_OECONF = " \
-    --with-classpath-includedir=${STAGING_INCDIR}/classpath \
-    --with-classpath-classes=${STAGING_DATADIR}/classpath/glibj.zip \
-    "
+  --with-classpath-includedir=${STAGING_INCDIR}/classpath \
+  --with-classpath-classes=${STAGING_DATADIR}/classpath/glibj.zip \
+  \
+  --with-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
+  --with-jni_md_h=${STAGING_INCDIR}/classpath \
+  --with-jni_h=${STAGING_INCDIR}/classpath \
+  "
 
 do_compile() {
   # Compile the header generator only (and what is needed for it).
diff --git a/packages/cacao/cacaoh-native_0.98+hg20071001.bb b/packages/cacao/cacaoh-native_0.98+hg20071001.bb
index cb552df827..75f5a306f4 100644
--- a/packages/cacao/cacaoh-native_0.98+hg20071001.bb
+++ b/packages/cacao/cacaoh-native_0.98+hg20071001.bb
@@ -1,5 +1,7 @@
 require cacaoh-native.inc
 
+PR = "r1"
+
 SRC_URI = "http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518"
 
 
diff --git a/packages/cacao/cacaoh-native_0.98+hg20080519.bb b/packages/cacao/cacaoh-native_0.98+hg20080519.bb
index 91880b20f9..7b930c4640 100644
--- a/packages/cacao/cacaoh-native_0.98+hg20080519.bb
+++ b/packages/cacao/cacaoh-native_0.98+hg20080519.bb
@@ -1,15 +1,9 @@
 require cacaoh-native.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://downloads.openmoko.org/sources/cacao-0.98+hg20080519.tar.gz;md5sum=1c6e0530be63ec8a4c0ab2935c2fdc8f"
 
 S = "${WORKDIR}/cacao"
 
-EXTRA_OECONF = " \
-        --with-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
-        --with-jni_md_h=${STAGING_INCDIR}/classpath \
-        --with-jni_h=${STAGING_INCDIR}/classpath \
-    "
-
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/cacao/cacaoh-native_0.99.1.bb b/packages/cacao/cacaoh-native_0.99.1.bb
new file mode 100644
index 0000000000..11735d4f31
--- /dev/null
+++ b/packages/cacao/cacaoh-native_0.99.1.bb
@@ -0,0 +1,5 @@
+require cacaoh-native.inc
+
+PR = "r0"
+
+SRC_URI = "http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=a5641452c7ba173060c99ed700950b3d"
diff --git a/packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch b/packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch
new file mode 100644
index 0000000000..7df1c480ea
--- /dev/null
+++ b/packages/cacao/files/cacao-0.98+hg20080519-build-java-runtime-library-classes.patch
@@ -0,0 +1,53 @@
+Index: cacao/configure.ac
+===================================================================
+--- cacao.orig/configure.ac	2008-06-27 01:23:44.000000000 +0200
++++ cacao/configure.ac	2008-06-27 01:24:02.000000000 +0200
+@@ -772,6 +772,7 @@
+ 
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES
++AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES
+ 
+ if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then
+    AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR
+Index: cacao/m4/java-runtime-library.m4
+===================================================================
+--- cacao.orig/m4/java-runtime-library.m4	2008-06-27 01:23:44.000000000 +0200
++++ cacao/m4/java-runtime-library.m4	2008-06-27 01:24:02.000000000 +0200
+@@ -93,20 +93,32 @@
+ AC_DEFINE_UNQUOTED([JAVA_RUNTIME_LIBRARY_CLASSES], "${JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes])
+ AC_SUBST(JAVA_RUNTIME_LIBRARY_CLASSES)
+ 
++dnl where are Java core library classes located at compilation time
++
++AC_DEFUN([AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES],[
++AC_MSG_CHECKING(where Java core library classes are located at compile time)
++AC_ARG_WITH([build-java-runtime-library-classes],
++            [AS_HELP_STRING(--with-build-java-runtime-library-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip]])],
++            [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}],
++            [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip])
++AC_MSG_RESULT(${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES})
++AC_DEFINE_UNQUOTED([BUILD_JAVA_RUNTIME_LIBRARY_CLASSES], "${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES}", [Java core library classes at compile time])
++AC_SUBST(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)
++])
++
+ dnl define BOOTCLASSPATH for Makefiles
+ case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+     cldc1.1 | gnuclasspath)
+-        BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
++        BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)"
+         ;;
+     *)
+-        BOOTCLASSPATH="\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
++        BOOTCLASSPATH="\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)"
+         ;;
+ esac
+ AC_SUBST(BOOTCLASSPATH)
+ ])
+ 
+-
+-dnl where are Java runtime library native libraries installed
++dnl where are Java runtime library native libraries installed (at compilation time)
+ 
+ AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[
+ AC_MSG_CHECKING(where Java runtime library native libraries are installed)
diff --git a/packages/cacao/files/cacao-0.98+svn-libdir.diff b/packages/cacao/files/cacao-0.98+svn-libdir.diff
deleted file mode 100644
index f5cf9ba5a1..0000000000
--- a/packages/cacao/files/cacao-0.98+svn-libdir.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: cacao-trunk/src/vm/properties.c
-===================================================================
---- cacao-trunk.orig/src/vm/properties.c	2007-08-31 13:20:41.000000000 +0200
-+++ cacao-trunk/src/vm/properties.c	2007-09-04 14:54:19.000000000 +0200
-@@ -210,15 +210,22 @@
- 
- # if defined(WITH_CLASSPATH_GNU)
- 
--	boot_library_path = CLASSPATH_LIBDIR"/classpath";
-+	boot_library_path = CLASSPATH_LIBDIR"/classpath:OE_LIBDIR_JNI";
- 
- # elif defined(WITH_CLASSPATH_SUN)
- 
--	boot_library_path = CLASSPATH_LIBDIR;
-+	boot_library_path = CLASSPATH_LIBDIR":OE_LIBDIR_JNI";
- 
- # elif defined(WITH_CLASSPATH_CLDC1_1)
- 
--	/* No boot_library_path required. */
-+	/* No boot_library_path required.
-+           Well, don't be that strict on Debian-like
-+           environments. Setting this to /usr/lib/jni
-+           makes it unneccessary to fumble with
-+           LD_LIBRARY_PATH to get things like MIDPath
-+           running.
-+        */
-+	boot_library_path = "OE_LIBDIR_JNI";
- 
- # else
- #  error unknown classpath configuration
diff --git a/packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch b/packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch
new file mode 100644
index 0000000000..dffc37b343
--- /dev/null
+++ b/packages/cacao/files/cacao-0.99.1-build-java-runtime-library-classes.patch
@@ -0,0 +1,51 @@
+diff -r 8484332b813c configure.ac
+--- a/configure.ac	Sun Jun 22 18:19:54 2008 +0200
++++ b/configure.ac	Mon Jun 23 08:53:17 2008 +0200
+@@ -550,6 +550,7 @@
+ 
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX
+ AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES
++AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES
+ 
+ if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then
+    AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR
+diff -r 8484332b813c m4/java-runtime-library.m4
+--- a/m4/java-runtime-library.m4	Sun Jun 22 18:19:54 2008 +0200
++++ b/m4/java-runtime-library.m4	Mon Jun 23 08:53:17 2008 +0200
+@@ -93,20 +93,32 @@
+ AC_DEFINE_UNQUOTED([JAVA_RUNTIME_LIBRARY_CLASSES], "${JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes])
+ AC_SUBST(JAVA_RUNTIME_LIBRARY_CLASSES)
+ 
++dnl where are Java core library classes located at compilation time
++
++AC_DEFUN([AC_CHECK_WITH_BUILD_JAVA_RUNTIME_LIBRARY_CLASSES],[
++AC_MSG_CHECKING(where Java core library classes are located at compile time)
++AC_ARG_WITH([build-java-runtime-library-classes],
++            [AS_HELP_STRING(--with-build-java-runtime-library-classes=<path>,path to Java core library classes (includes the name of the file and may be flat) [[default=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip]])],
++            [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}],
++            [BUILD_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip])
++AC_MSG_RESULT(${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES})
++AC_DEFINE_UNQUOTED([BUILD_JAVA_RUNTIME_LIBRARY_CLASSES], "${BUILD_JAVA_RUNTIME_LIBRARY_CLASSES}", [Java core library classes at compile time])
++AC_SUBST(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)
++])
++
+ dnl define BOOTCLASSPATH for Makefiles
+ case "${WITH_JAVA_RUNTIME_LIBRARY}" in
+     cldc1.1 | gnuclasspath)
+-        BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
++        BOOTCLASSPATH="\$(top_builddir)/src/classes/classes:\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)"
+         ;;
+     *)
+-        BOOTCLASSPATH="\$(JAVA_RUNTIME_LIBRARY_CLASSES)"
++        BOOTCLASSPATH="\$(BUILD_JAVA_RUNTIME_LIBRARY_CLASSES)"
+         ;;
+ esac
+ AC_SUBST(BOOTCLASSPATH)
+ ])
+ 
+-
+-dnl where are Java runtime library native libraries installed
++dnl where are Java runtime library native libraries installed (at compilation time)
+ 
+ AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[
+ AC_MSG_CHECKING(where Java runtime library native libraries are installed)
diff --git a/packages/cacao/files/cacao-hg20080519-classpath_var.patch b/packages/cacao/files/cacao-hg20080519-classpath_var.patch
deleted file mode 100644
index a3e39e0062..0000000000
--- a/packages/cacao/files/cacao-hg20080519-classpath_var.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: cacao/configure.ac
-===================================================================
---- cacao.orig/configure.ac	2008-05-21 14:16:33.000000000 +0800
-+++ cacao/configure.ac	2008-05-21 15:57:42.000000000 +0800
-@@ -772,6 +772,7 @@
- 
- AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_PREFIX
- AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_CLASSES
-+AC_CHECK_WITH_TARGET_JAVA_RUNTIME_LIBRARY_CLASSES
- 
- if test x"${ENABLE_JRE_LAYOUT}" = "xno"; then
-    AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR
-Index: cacao/m4/java-runtime-library.m4
-===================================================================
---- cacao.orig/m4/java-runtime-library.m4	2008-05-21 14:16:34.000000000 +0800
-+++ cacao/m4/java-runtime-library.m4	2008-05-21 16:18:23.000000000 +0800
-@@ -106,6 +106,29 @@
- ])
- 
- 
-+dnl where are Java runtime library classes installed on the target
-+
-+AC_DEFUN([AC_CHECK_WITH_TARGET_JAVA_RUNTIME_LIBRARY_CLASSES],[
-+AC_MSG_CHECKING(where Java runtime library classes are installed on the target)
-+AC_ARG_WITH([target-java-runtime-library-classes],
-+            [AS_HELP_STRING(--with-target-java-runtime-library-classes=<path>,path to Java runtime library classes (includes the name of the file and may be flat) [[default=(gnuclasspath:${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip,openjdk:${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes,*:${JAVA_RUNTIME_LIBRARY_PREFIX})]])],
-+            [TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${withval}],
-+            [case "${WITH_JAVA_RUNTIME_LIBRARY}" in
-+                 gnuclasspath)
-+                     TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/share/classpath/glibj.zip
-+                     ;;
-+                 openjdk)
-+                     TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}/control/build/${OS_DIR}-${JAVA_ARCH}/classes
-+                     ;;
-+                 *)
-+                     TARGET_JAVA_RUNTIME_LIBRARY_CLASSES=${JAVA_RUNTIME_LIBRARY_PREFIX}
-+                     ;;
-+             esac])
-+AC_MSG_RESULT(${TARGET_JAVA_RUNTIME_LIBRARY_CLASSES})
-+AC_DEFINE_UNQUOTED([TARGET_JAVA_RUNTIME_LIBRARY_CLASSES], "${TARGET_JAVA_RUNTIME_LIBRARY_CLASSES}", [Java runtime library classes on the target])
-+AC_SUBST(TARGET_JAVA_RUNTIME_LIBRARY_CLASSES)
-+])
-+
- dnl where are Java runtime library native libraries installed
- 
- AC_DEFUN([AC_CHECK_WITH_JAVA_RUNTIME_LIBRARY_LIBDIR],[
-Index: cacao/src/vm/properties.c
-===================================================================
---- cacao.orig/src/vm/properties.c	2008-05-21 14:16:34.000000000 +0800
-+++ cacao/src/vm/properties.c	2008-05-21 16:16:24.000000000 +0800
-@@ -295,14 +295,14 @@
- 		len =
- 			strlen(CACAO_VM_ZIP) +
- 			strlen(":") +
--			strlen(JAVA_RUNTIME_LIBRARY_CLASSES) +
-+			strlen(TARGET_JAVA_RUNTIME_LIBRARY_CLASSES) +
- 			strlen("0");
- 
- 		boot_class_path = MNEW(char, len);
- 
- 		strcpy(boot_class_path, CACAO_VM_ZIP);
- 		strcat(boot_class_path, ":");
--		strcat(boot_class_path, JAVA_RUNTIME_LIBRARY_CLASSES);
-+		strcat(boot_class_path, TARGET_JAVA_RUNTIME_LIBRARY_CLASSES);
- 
- # elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
- 
diff --git a/packages/cacao/files/cacao-hg20080519-libdir.patch b/packages/cacao/files/cacao-hg20080519-libdir.patch
deleted file mode 100644
index 1be13b3cfd..0000000000
--- a/packages/cacao/files/cacao-hg20080519-libdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: cacao/src/vm/properties.c
-===================================================================
---- cacao.orig/src/vm/properties.c	2008-05-21 15:26:21.000000000 +0800
-+++ cacao/src/vm/properties.c	2008-05-21 15:28:59.000000000 +0800
-@@ -211,15 +211,22 @@
- 
- # if defined(WITH_JAVA_RUNTIME_LIBRARY_GNU_CLASSPATH)
- 
--	boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR"/classpath";
-+	boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR"/classpath:OE_LIBDIR_JNI";
- 
- # elif defined(WITH_JAVA_RUNTIME_LIBRARY_OPENJDK)
- 
--	boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR;
-+	boot_library_path = JAVA_RUNTIME_LIBRARY_LIBDIR":OE_LIBDIR_JNI";
- 
- # elif defined(WITH_JAVA_RUNTIME_LIBRARY_CLDC1_1)
- 
--	/* No boot_library_path required. */
-+	/* No boot_library_path required.
-+	   Well, don't be that strict on Debian-like
-+	   environments. Setting this to /usr/lib/jni
-+	   makes it unneccessary to fumble with
-+	   LD_LIBRARY_PATH to get things like MIDPath
-+	   running.
-+	*/
-+	boot_library_path = "OE_LIBDIR_JNI";
- 
- # else
- #  error unknown classpath configuration
diff --git a/packages/jamvm/jamvm.inc b/packages/jamvm/jamvm.inc
index 930159e891..af6fd47ee6 100644
--- a/packages/jamvm/jamvm.inc
+++ b/packages/jamvm/jamvm.inc
@@ -19,4 +19,4 @@ CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
 
 ALTERNATIVE_NAME = "java"
 ALTERNATIVE_PATH = "${bindir}/jamvm"
-ALTERNATIVE_PRIORITY = "10"
+ALTERNATIVE_PRIORITY = "5"
diff --git a/packages/jamvm/jamvm_1.4.5.bb b/packages/jamvm/jamvm_1.4.5.bb
index 3cc0431266..8414c5615c 100644
--- a/packages/jamvm/jamvm_1.4.5.bb
+++ b/packages/jamvm/jamvm_1.4.5.bb
@@ -1,4 +1,6 @@
 require jamvm.inc
 
+PR = "r1"
+
 SRC_URI += "file://jamvm-1.3.1-size-defaults.patch;patch=1"
 
diff --git a/packages/jamvm/jamvm_1.5.0.bb b/packages/jamvm/jamvm_1.5.0.bb
index 366658dd97..81977a5f40 100644
--- a/packages/jamvm/jamvm_1.5.0.bb
+++ b/packages/jamvm/jamvm_1.5.0.bb
@@ -2,7 +2,7 @@ require jamvm.inc
 
 SRC_URI += "file://debian-jni.patch;patch=1;pnum=0"
 
-PR = "r1"
+PR = "r2"
 
 do_configure_prepend() {
   # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
diff --git a/packages/jamvm/jamvm_1.5.1.bb b/packages/jamvm/jamvm_1.5.1.bb
index bf9271c938..366658dd97 100644
--- a/packages/jamvm/jamvm_1.5.1.bb
+++ b/packages/jamvm/jamvm_1.5.1.bb
@@ -2,7 +2,7 @@ require jamvm.inc
 
 SRC_URI += "file://debian-jni.patch;patch=1;pnum=0"
 
-PR = "r0"
+PR = "r1"
 
 do_configure_prepend() {
   # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
diff --git a/packages/linux/linux-ml403-slab-2.6.x_git.bb b/packages/linux/linux-ml403-slab-2.6.x_git.bb
deleted file mode 100644
index ad823c2aa6..0000000000
--- a/packages/linux/linux-ml403-slab-2.6.x_git.bb
+++ /dev/null
@@ -1,80 +0,0 @@
-#Kernel for the xilinx-ml403 board using SecretLabs git tree
-# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-SECTION = "kernel"
-DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board"
-LICENSE = "GPL"
-PR = "r2"
-PV = "2.6+git${SRCDATE}"
-
-COMPATIBLE_MACHINE = "xilinx-ml403"
-
-SRC_URI = "file://xilinx-ml403_defconfig "
-
-inherit kernel xilinx-bsp
-
-S = "${WORKDIR}/linux-2.6"
-
-
-FILES_kernel-image = "/boot/zImage.elf"
-
-export OS = "Linux"
-ARCH = "ppc"
-KERNEL_IMAGETYPE = "zImage"
-KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
-
-#make sure git-native gets build before as
-python __anonymous () {
-
-    import bb
-
-
-    depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
-    depends = depends + " git-native:do_populate_staging"
-    bb.data.setVarFlag('do_fetch', 'depends', depends, d)
-
-}
-
-
-do_fetch () { 
-
-        cd ${WORKDIR} 
-        ${STAGING_BINDIR_NATIVE}/git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 
-        cd linux-2.6                
-        ${STAGING_BINDIR_NATIVE}/git clone git://git.secretlab.ca/git/linux-2.6-virtex.git  master 
-} 
-
-
-
-do_configure() {
-
-                install -m 644 ${WORKDIR}/xilinx-ml403_defconfig ${S}/.config
-                make ARCH=${ARCH} oldconfig
-}
-
-do_stage_append () {
-#need ppc platforms includes + friends in order for external kernel modules to compile as headers a$
-
-       install -d ${STAGING_KERNEL_DIR}/arch/
-       cp -pPR arch/ppc ${STAGING_KERNEL_DIR}/arch/
-       cp -pPR arch/powerpc ${STAGING_KERNEL_DIR}/arch/
-
-       install -d ${STAGING_KERNEL_DIR}/include/asm
-       cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
-       cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
-}
-
-
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \
-                 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-#seems like 2.6.21 kernel images have moved (or is this only for the Denx kernel ?)
-#so we need to copy the kernel image where kernel.bbclass expects it to be
-do_install_prepend() {
-        install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \
-                        arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
-}
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index 29cfb35bdb..3147ef46a7 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -2,9 +2,9 @@ require linux-omap.inc
 
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
 
-SRCREV = "6604ac6c8a14d583a463159f3a1601427dab7e05"
+SRCREV = "af933cd32a5e14f119a4acb4fe20055f6f8ab1aa"
 
-PV = "2.6.25+2.6.26-rc7+${PR}+git${SRCREV}"
+PV = "2.6.25+2.6.26-rc8+${PR}+git${SRCREV}"
 PR = "r30"
 
 
diff --git a/packages/linux/linux-ml403-slab-2.6.x/.mtn2git_empty b/packages/linux/linux-xilinx-slab/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/linux-ml403-slab-2.6.x/.mtn2git_empty
+++ b/packages/linux/linux-xilinx-slab/.mtn2git_empty
diff --git a/packages/linux/linux-ml403-slab-2.6.x/xilinx-ml403_defconfig b/packages/linux/linux-xilinx-slab/xilinx-ml403_defconfig
index 3babe21954..3babe21954 100644
--- a/packages/linux/linux-ml403-slab-2.6.x/xilinx-ml403_defconfig
+++ b/packages/linux/linux-xilinx-slab/xilinx-ml403_defconfig
diff --git a/packages/linux/linux-xilinx-slab_git.bb b/packages/linux/linux-xilinx-slab_git.bb
new file mode 100644
index 0000000000..df71fee865
--- /dev/null
+++ b/packages/linux/linux-xilinx-slab_git.bb
@@ -0,0 +1,48 @@
+#Kernel for the xilinx-ml403 board using SecretLabs git tree
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board"
+LICENSE = "GPL"
+
+SRCREV = "d7ed933b578d9c4dec0e23a5a6f78c464b31c47c"
+
+PR = "r3"
+PV = "2.6.25+2.6.26+${PR}+git${SRCREV}"
+
+COMPATIBLE_MACHINE = "xilinx-ml403"
+
+#inherit kernel xilinx-bsp
+inherit kernel
+
+S = "${WORKDIR}/git"
+
+
+FILES_kernel-image = "/boot/zImage.elf"
+
+export OS = "Linux"
+ARCH = "ppc"
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_OUTPUT = "arch/ppc/boot/images/zImage.elf"
+
+SRC_URI = "\
+           git://git.secretlab.ca/git/linux-2.6-virtex.git;protocol=git \
+          "
+
+do_configure() {
+
+                make ARCH=${ARCH} ml403_defconfig
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \
+                 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
+}
+
+#seems like 2.6.21 kernel images have moved (or is this only for the Denx kernel ?)
+#so we need to copy the kernel image where kernel.bbclass expects it to be
+#do_install_prepend() {
+#        install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \
+#                        arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
+#}
diff --git a/packages/midpath/files/0.2+0.3rc1-fix-crlf.patch b/packages/midpath/files/0.2+0.3rc1-fix-crlf.patch
new file mode 100644
index 0000000000..7e763bd587
--- /dev/null
+++ b/packages/midpath/files/0.2+0.3rc1-fix-crlf.patch
@@ -0,0 +1,87 @@
+Index: configuration/com/sun/midp/configuration/system_properties
+===================================================================
+--- configuration/com/sun/midp/configuration/system_properties	(Revision 290)
++++ configuration/com/sun/midp/configuration/system_properties	(Revision 291)
+@@ -1,47 +1,47 @@
+ javax.microedition.io.Connector.protocolpath=com.sun.midp.io
+-microedition.profiles=MIDP-2.0 
+-microedition.configuration=CLDC-1.1 
+-microedition.locale=en-US 
++microedition.profiles=MIDP-2.0
++microedition.configuration=CLDC-1.1
++microedition.locale=en-US
+ microedition.platform=j2me
+-microedition.encoding=ISO8859_1 
+-microedition.hostname=localhost 
++microedition.encoding=ISO8859_1
++microedition.hostname=localhost
+ microedition.commports= 
+-microedition.jtwi.version=1.0 
+-microedition.media.version=1.1 
+-supports.mixing=true 
+-supports.audio.capture=false 
+-supports.video.capture=false 
+-supports.recording=false 
++microedition.jtwi.version=1.0
++microedition.media.version=1.1
++supports.mixing=true
++supports.audio.capture=false
++supports.video.capture=false
++supports.recording=false
+ audio.encodings=encoding=audio/wav encoding=audio/x-wav encoding=pcm encoding=audio/mp3 encoding=audio/ogg
+ video.snapshot.encodings=encoding=png encoding=image/png
+ video.encodings= 
+-streamable.contents=encoding=audio/wav encoding=audio/x-wav encoding=pcm encoding=audio/mp3 encoding=audio/ogg 
+-microedition.io.file.FileConnection.version=1.0 
+-Bluetooth.api.version=1.1 
+-obex.api.version=1.1 
+-bluetooth.l2cap.receiveMTU.max=1024 
+-bluetooth.master.switch=true 
+-bluetooth.connected.devices.max=6 
+-bluetooth.sd.trans.max=8 
+-bluetooth.sd.attr.retrievable.max=16 
+-bluetooth.connected.inquiry=true 
+-bluetooth.connected.inquiry.scan=true 
+-bluetooth.connected.page=true 
+-bluetooth.connected.page.scan=true 
+-microedition.m3g.version=1.1 
+-microedition.location.version=1.1 
+-microedition.m2g.version=1.1 
+-microedition.m2g.svg.version=1.1 
+-microedition.m2g.svg.baseProfile=tiny 
+-xml.jaxp.subset.version=1.0 
+-xml.rpc.subset.version=1.0 
+-wireless.messaging.version=2.0 
+-wireless.messaging.sms.smsc=+17815511212 
+-wireless.messaging.mms.mmsc=+17815511212 
++streamable.contents=encoding=audio/wav encoding=audio/x-wav encoding=pcm encoding=audio/mp3 encoding=audio/ogg
++microedition.io.file.FileConnection.version=1.0
++Bluetooth.api.version=1.1
++obex.api.version=1.1
++bluetooth.l2cap.receiveMTU.max=1024
++bluetooth.master.switch=true
++bluetooth.connected.devices.max=6
++bluetooth.sd.trans.max=8
++bluetooth.sd.attr.retrievable.max=16
++bluetooth.connected.inquiry=true
++bluetooth.connected.inquiry.scan=true
++bluetooth.connected.page=true
++bluetooth.connected.page.scan=true
++microedition.m3g.version=1.1
++microedition.location.version=1.1
++microedition.m2g.version=1.1
++microedition.m2g.svg.version=1.1
++microedition.m2g.svg.baseProfile=tiny
++xml.jaxp.subset.version=1.0
++xml.rpc.subset.version=1.0
++wireless.messaging.version=2.0
++wireless.messaging.sms.smsc=+17815511212
++wireless.messaging.mms.mmsc=+17815511212
+ 
+ # microedition.pim.version=
+ # microedition.global.version=
+-# microedition.sip.version=1.0.1 
++# microedition.sip.version=1.0.1
+ # 
+ # com.sun.midp.io.http.proxy=
+ # com.sun.midp.io.http.force_non_persistent=
diff --git a/packages/midpath/files/configuration_maemo.cfg b/packages/midpath/files/configuration_maemo.cfg
new file mode 100644
index 0000000000..441a9cdfc5
--- /dev/null
+++ b/packages/midpath/files/configuration_maemo.cfg
@@ -0,0 +1,123 @@
+##========================================
+## Graphics parameters
+##========================================
+javax.microedition.lcdui.screenWidth:600
+javax.microedition.lcdui.screenHeight:400
+# Toolkit configuration (possible values: SDL, virtual)
+# The toolkit parameter should be set to "virtual" unless you know what you do.
+# (to change the UI backend, see the backend parameter of the virtual toolkit below)
+javax.microedition.lcdui.toolkit:virtual
+
+##======================================
+## Parameters for the Virtual UI Toolkit
+##======================================
+# Possible backend values: NULL, SDL, AWT, AWTGRABBER, SWT, X11, GTK, QT, FB
+org.thenesis.microbackend.ui.backend:SWT
+# SDL backend configuration.
+# Possible bitsPerPixels values: 8, 16, 32
+# Possible video mode values: SW, HW (i.e software, hardware)
+org.thenesis.microbackend.ui.sdl.bitsPerPixel:32
+org.thenesis.microbackend.ui.sdl.videoMode:SW
+# X11 backend configuration.
+# Display value examples: :0.0, 192.168.0.1:1.0
+org.thenesis.microbackend.ui.x11.Display::0.0
+# Linux Framebuffer (FB) backend configuration 
+# (see /proc/bus/input/devices to know which special files are  
+# associated with your mouse or touchscreen)
+org.thenesis.microbackend.ui.fb.framebufferDevice:/dev/fb0
+org.thenesis.microbackend.ui.fb.keyboardDevice:/dev/tty
+org.thenesis.microbackend.ui.fb.mouseDevice:/dev/input/event1
+org.thenesis.microbackend.ui.fb.touchscreenDevice:/dev/input/event2
+# Possible fontRenderer values: raw, BDF
+org.thenesis.midpath.ui.fontRenderer:raw
+org.thenesis.midpath.font.bdf.filename:VeraMono-12-8.bdf
+
+##==========================
+## Parameters for the sound
+##==========================
+# Sound configuration (possible values: SDL, virtual)
+# The "player" parameter should be set to "virtual" unless you know what you do.
+# The virtual engine requires this hardware configuration: 16 bits, stereo, little endian
+org.thenesis.midpath.sound.engine:virtual
+# Possible sound backend values: NULL, ALSA, ESD, PulseAudio
+org.thenesis.midpath.sound.backend:NULL
+org.thenesis.midpath.sound.device:default
+org.thenesis.midpath.sound.sampleRate:44100
+# Buffer size MUST be a power of two
+org.thenesis.midpath.sound.bufferSize:8192
+
+##======================================
+## IO parameters
+##======================================
+# IO (file, socket) backends (possible values: J2SE, CLDC)
+com.sun.midp.io.backend:J2SE
+# The RMS root path (if not defined, records are read/written in the current directory)
+com.sun.midp.rms.rootPath:/home/user/
+
+##======================================
+## Location (JSR179)
+##======================================
+# Location mode (possible values: GPS, KML, LMS, NMEA)
+org.thenesis.midpath.location.mode:GPS
+# Resource file URI (KML and NMEA mode only)
+# Examples:
+# -Load a KML file in the "res" package from the java classloader:
+#  org.thenesis.midpath.location.resource.uri:/res/location.kml 
+# -Load a NMEA file from the file system:
+#  org.thenesis.midpath.location.resource.uri:file:////absolute/path/to/location.kml
+org.thenesis.midpath.location.resource.uri:
+# Resource poll interval in milliseconds (KML, LMS, NMEA mode only)
+org.thenesis.midpath.location.resource.pollInterval:5000
+
+##======================================
+## Messaging (JSR120, JSR205)
+##======================================
+# SMS backend (possible values: NULL)
+org.thenesis.midpath.messaging.backend:NULL
+
+##======================================
+## MIDlet Suite Manager (J2SE only)
+##======================================
+# The MIDlet repository path (if not defined, MIDlets are searched in the current directory)
+org.thenesis.midpath.main.repositoryPath:/usr/share/midpath/repository
+
+##======================================
+## Event parameters
+##======================================
+javax.microedition.lcdui.pointerSupported:true
+javax.microedition.lcdui.pointerMotionSupported:true
+
+##======================================
+## Key mapping 
+## (AWT codes are used by convention - see java.awt.event.KeyEvent javadocs)
+##======================================
+# Cursor left
+org.thenesis.midpath.ui.keys.LEFT:37
+# Cursor up
+org.thenesis.midpath.ui.keys.UP:38
+# Cursor right
+org.thenesis.midpath.ui.keys.RIGHT:39
+# Cursor down
+org.thenesis.midpath.ui.keys.DOWN:40
+
+# Zoom -
+org.thenesis.midpath.ui.keys.GAME_A:119
+# Minimize/Maximize
+org.thenesis.midpath.ui.keys.GAME_B:117
+# Zoom +
+org.thenesis.midpath.ui.keys.GAME_C:118
+# Cursor button
+org.thenesis.midpath.ui.keys.FIRE:10
+
+# Back button
+org.thenesis.midpath.ui.keys.SOFT_BUTTON1:27
+# Menu button
+org.thenesis.midpath.ui.keys.SOFT_BUTTON2:115
+
+# unmapped
+org.thenesis.midpath.ui.keys.STAR:0  
+org.thenesis.midpath.ui.keys.POUND:0
+org.thenesis.midpath.ui.keys.DELETE:8
+org.thenesis.midpath.ui.keys.END:39
+org.thenesis.midpath.ui.keys.POWER:0
+org.thenesis.midpath.ui.keys.GAME_D:0
diff --git a/packages/midpath/files/configuration_openmoko.cfg b/packages/midpath/files/configuration_openmoko.cfg
new file mode 100644
index 0000000000..0691dca561
--- /dev/null
+++ b/packages/midpath/files/configuration_openmoko.cfg
@@ -0,0 +1,124 @@
+##========================================
+## Graphics parameters
+##========================================
+javax.microedition.lcdui.screenWidth:480
+javax.microedition.lcdui.screenHeight:330
+# Toolkit configuration (possible values: SDL, virtual)
+# The toolkit parameter should be set to "virtual" unless you know what you do.
+# (to change the UI backend, see the backend parameter of the virtual toolkit below)
+javax.microedition.lcdui.toolkit:virtual
+
+##======================================
+## Parameters for the Virtual UI Toolkit
+##======================================
+# Possible backend values: NULL, SDL, AWT, AWTGRABBER, SWT, X11, GTK, QT, FB
+org.thenesis.microbackend.ui.backend:SWT
+# SDL backend configuration.
+# Possible bitsPerPixels values: 8, 16, 32
+# Possible video mode values: SW, HW (i.e software, hardware)
+org.thenesis.microbackend.ui.sdl.bitsPerPixel:32
+org.thenesis.microbackend.ui.sdl.videoMode:SW
+# X11 backend configuration.
+# Display value examples: :0.0, 192.168.0.1:1.0
+org.thenesis.microbackend.ui.x11.Display::0.0
+# Linux Framebuffer (FB) backend configuration 
+# (see /proc/bus/input/devices to know which special files are  
+# associated with your mouse or touchscreen)
+org.thenesis.microbackend.ui.fb.framebufferDevice:/dev/fb0
+org.thenesis.microbackend.ui.fb.keyboardDevice:/dev/tty
+org.thenesis.microbackend.ui.fb.mouseDevice:/dev/input/event1
+org.thenesis.microbackend.ui.fb.touchscreenDevice:/dev/input/event2
+# Possible fontRenderer values: raw, BDF
+org.thenesis.midpath.ui.fontRenderer:raw
+org.thenesis.midpath.font.bdf.filename:VeraMono-12-8.bdf
+
+##==========================
+## Parameters for the sound
+##==========================
+# Sound configuration (possible values: SDL, virtual)
+# The "player" parameter should be set to "virtual" unless you know what you do.
+# The virtual engine requires this hardware configuration: 16 bits, stereo, little endian
+org.thenesis.midpath.sound.engine:virtual
+# Possible sound backend values: NULL, ALSA, ESD, PulseAudio
+org.thenesis.midpath.sound.backend:PulseAudio
+org.thenesis.midpath.sound.device:default
+org.thenesis.midpath.sound.sampleRate:44100
+# Buffer size MUST be a power of two
+org.thenesis.midpath.sound.bufferSize:8192
+
+##======================================
+## IO parameters
+##======================================
+# IO (file, socket) backends (possible values: J2SE, CLDC)
+com.sun.midp.io.backend:J2SE
+# The RMS root path (if not defined, records are read/written in the current directory)
+com.sun.midp.rms.rootPath:/home/root/
+
+##======================================
+## Location (JSR179)
+##======================================
+# Location mode (possible values: GPS, KML, LMS, NMEA)
+org.thenesis.midpath.location.mode:GPS
+# Resource file URI (KML and NMEA mode only)
+# Examples:
+# -Load a KML file in the "res" package from the java classloader:
+#  org.thenesis.midpath.location.resource.uri:/res/location.kml 
+# -Load a NMEA file from the file system:
+#  org.thenesis.midpath.location.resource.uri:file:////absolute/path/to/location.kml
+org.thenesis.midpath.location.resource.uri:
+# Resource poll interval in milliseconds (KML, LMS, NMEA mode only)
+org.thenesis.midpath.location.resource.pollInterval:5000
+
+##======================================
+## Messaging (JSR120, JSR205)
+##======================================
+# SMS backend (possible values: NULL)
+org.thenesis.midpath.messaging.backend:NULL
+
+##======================================
+## MIDlet Suite Manager (J2SE only)
+##======================================
+# The MIDlet repository path (if not defined, MIDlets are searched in the current directory)
+org.thenesis.midpath.main.repositoryPath:/usr/share/midpath/repository
+
+##======================================
+## Event parameters
+##======================================
+javax.microedition.lcdui.pointerSupported:true
+javax.microedition.lcdui.pointerMotionSupported:true
+
+##======================================
+## Key mapping 
+## (AWT codes are used by convention - see java.awt.event.KeyEvent javadocs)
+##======================================
+# 4
+org.thenesis.midpath.ui.keys.LEFT:52
+# 2
+org.thenesis.midpath.ui.keys.UP:50
+# 6
+org.thenesis.midpath.ui.keys.RIGHT:54
+# 8
+org.thenesis.midpath.ui.keys.DOWN:56
+
+# 1
+org.thenesis.midpath.ui.keys.GAME_A:49
+# 3
+org.thenesis.midpath.ui.keys.GAME_B:51
+# 7
+org.thenesis.midpath.ui.keys.GAME_C:55
+# 9
+org.thenesis.midpath.ui.keys.GAME_D:57
+# 5
+org.thenesis.midpath.ui.keys.FIRE:53
+
+# 0
+org.thenesis.midpath.ui.keys.SOFT_BUTTON1:48
+# pound/sign/#
+org.thenesis.midpath.ui.keys.SOFT_BUTTON2:520
+
+# unmapped
+org.thenesis.midpath.ui.keys.STAR:0  
+org.thenesis.midpath.ui.keys.POUND:0
+org.thenesis.midpath.ui.keys.DELETE:8
+org.thenesis.midpath.ui.keys.END:39
+org.thenesis.midpath.ui.keys.POWER:0
diff --git a/packages/midpath/files/midpath-launcher-j2se b/packages/midpath/files/midpath-launcher-j2se
new file mode 100644
index 0000000000..22928a0e1e
--- /dev/null
+++ b/packages/midpath/files/midpath-launcher-j2se
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+if [ ! $LAUNCHER_CLASS ]; then
+  LAUNCHER_CLASS=org.thenesis.midpath.main.MIDletLauncher
+fi
+
+if [ ! $JAVA ]; then
+  JAVA=java
+fi
+
+JAR_HOME=/usr/share/java
+
+MIDPATH_HOME=/usr/share/midpath
+
+JLP=/usr/lib/jni
+
+# Set the classpath
+CP=\
+$MIDPATH_HOME/configuration:\
+$MIDPATH_HOME/midpath.jar:\
+$MIDPATH_HOME/microbackend.jar:\
+$MIDPATH_HOME/sdljava-cldc.jar:\
+$MIDPATH_HOME/escher-cldc.jar:\
+$MIDPATH_HOME/jlayerme-cldc.jar:\
+$MIDPATH_HOME/jorbis-cldc.jar:\
+$MIDPATH_HOME/avetanabt-cldc.jar:\
+$MIDPATH_HOME/jgl-cldc.jar:\
+$MIDPATH_HOME/jsr239-opengles-jgl.jar:\
+$MIDPATH_HOME/jsr239-opengles-core.jar:\
+$MIDPATH_HOME/jsr239-opengles-nio.jar:\
+$MIDPATH_HOME/jsr184-m3g.jar:\
+$MIDPATH_HOME/jsr205-messaging.jar:\
+$MIDPATH_HOME/jsr179-location.jar:\
+$MIDPATH_HOME/jsr226-svg-core.jar:\
+$MIDPATH_HOME/jsr226-svg-midp2.jar:\
+$JAR_HOME/kxml2.jar:\
+$JAR_HOME/xmlpull.jar:\
+$JAR_HOME/swt.jar
+
+# Add whatever is mentioned in the CLASSPATH environment variable
+if [ $CLASSPATH ]
+then
+  CP=$CP:$CLASSPATH
+fi
+
+# Add the MIDlet jar to the classpath  (must be loaded by the main classloader)
+CP=$CP:$MIDPATH_HOME/repository/midpath-demos.jar
+
+$JAVA -cp $CP -Djava.library.path=$JLP $LAUNCHER_CLASS "$@"
+
diff --git a/packages/midpath/files/midpath-suitemanager b/packages/midpath/files/midpath-suitemanager
new file mode 100644
index 0000000000..41ccd5fcb6
--- /dev/null
+++ b/packages/midpath/files/midpath-suitemanager
@@ -0,0 +1,2 @@
+#!/bin/sh
+LAUNCHER_CLASS=org.thenesis.midpath.main.SuiteManager midpath-launcher-j2se "$@"
diff --git a/packages/midpath/files/midpath-suitemanager.desktop b/packages/midpath/files/midpath-suitemanager.desktop
new file mode 100644
index 0000000000..3d7833e74e
--- /dev/null
+++ b/packages/midpath/files/midpath-suitemanager.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=MIDPath SuiteManager
+Comment=Manage MIDlets
+Exec=midpath-suitemanager
+Icon=midpath
+Terminal=false
+Type=Application
+Categories=GTK;Office;
+X-SingleInstance=true
+StartupNotify=true
+
diff --git a/packages/midpath/files/midpath.png b/packages/midpath/files/midpath.png
new file mode 100644
index 0000000000..0066fe4f29
--- /dev/null
+++ b/packages/midpath/files/midpath.png
diff --git a/packages/midpath/files/shellscript.patch b/packages/midpath/files/shellscript.patch
deleted file mode 100644
index 17c39d0810..0000000000
--- a/packages/midpath/files/shellscript.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: midpath-0.1/bin/midpath-test-cacao-cldc.sh
-===================================================================
---- midpath-0.1.orig/bin/midpath-test-cacao-cldc.sh	2007-07-03 22:09:33.000000000 +0200
-+++ midpath-0.1/bin/midpath-test-cacao-cldc.sh	2007-08-24 22:31:32.000000000 +0200
-@@ -3,19 +3,13 @@
- # Adapt the next line to your environment
- JAVA_CMD=cacao
- 
--if [ "$MIDPATH_HOME" = "" ]; then
--  MIDPATH_HOME=$(pwd)/..
--fi
-+MIDPATH_HOME=
- 
- # Set the classpath
--BCP=$MIDPATH_HOME/dist/cldc1.1.jar:$MIDPATH_HOME/dist/midpath.jar:$MIDPATH_HOME/resources-embedded:$MIDPATH_HOME/dist/sdljava-cldc.jar:$MIDPATH_HOME/dist/escher-x11-cldc.jar:$MIDPATH_HOME/dist/kxml2-2.3.0.jar
-+BCP=$MIDPATH_HOME/cldc1.1.jar:$MIDPATH_HOME/midpath.jar:$MIDPATH_HOME/resources-embedded:$MIDPATH_HOME/sdljava-cldc.jar:$MIDPATH_HOME/escher-x11-cldc.jar:$MIDPATH_HOME/kxml2-2.3.0.jar
- # Add the  MIDlet jar to the classpath  (must be loaded by the main 
- # classloader yet)
--BCP=$BCP:$MIDPATH_HOME/dist/midpath-tests.jar
--
--# Path of the native libraries
--JLP=$MIDPATH_HOME/dist
--export LD_LIBRARY_PATH=$JLP 
-+BCP=$BCP:$MIDPATH_HOME/midpath-tests.jar
- 
- CLASS=org.thenesis.midpath.main.StandardMIDletLauncher
- # The classname of the MIDlet (we have to set it manually yet)
diff --git a/packages/midpath/midpath-alsa_0.1.bb b/packages/midpath/midpath-alsa_0.1.bb
deleted file mode 100644
index 1ccace8500..0000000000
--- a/packages/midpath/midpath-alsa_0.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-
-require midpath_${PV}.bb
-
-DEPENDS += "alsa-lib"
-RDEPENDS = "alsa-lib"
-
-do_configure() {
-	cd ${S}/native/alsa
-	sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" Makefile
-	cd ${S}/resources-embedded/com/sun/midp/configuration
-	sed -i -e "s|sound.backend:NULL|sound.backend:ALSA|" configuration.cfg
-}
-
-do_compile() {
-
-# Build the ALSA native part
-cd ${S}/native/alsa
-make || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${libdir}
-	install -m 0644 ${S}/native/alsa/libmidpathalsa.so ${D}${libdir}
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-	install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-	:
-}
-	
-
-FILES_${PN}  = "${libdir}/libmidpathalsa.so \
-                ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
-
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
diff --git a/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..664fb242e1
--- /dev/null
+++ b/packages/midpath/midpath-backend-alsa_0.2+0.3rc1.bb
@@ -0,0 +1,43 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath linux-libc-headers"
+
+do_compile() {
+  # Only ALSA backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --alsa
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmidpathalsa ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
diff --git a/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..18f448c1ec
--- /dev/null
+++ b/packages/midpath/midpath-backend-escher_0.2+0.3rc1.bb
@@ -0,0 +1,42 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-cldc"
+
+do_compile() {
+  # Only escher-cldc is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/escher-cldc.jar ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/escher-cldc.jar ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN}  = "${datadir}/midpath/escher-cldc.jar"
diff --git a/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..79994d1395
--- /dev/null
+++ b/packages/midpath/midpath-backend-esd_0.2+0.3rc1.bb
@@ -0,0 +1,44 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath esound"
+
+do_compile() {
+  # Only native esd backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --esd
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmidpathesd ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..c2fd6376a3
--- /dev/null
+++ b/packages/midpath/midpath-backend-fb_0.2+0.3rc1.bb
@@ -0,0 +1,43 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath linux-libc-headers"
+
+do_compile() {
+  # Only native framebuffer backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --fb
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmicrobackendfb ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
diff --git a/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..2e7c8bb53b
--- /dev/null
+++ b/packages/midpath/midpath-backend-gtk-hildon_0.2+0.3rc1.bb
@@ -0,0 +1,34 @@
+require midpath-backend-gtk_${PV}.bb
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+PROVIDES = "midpath-backend-gtk"
+
+DEPENDS += "libhildon libhildonfm"
+
+do_compile() {
+  # Only native gtk backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --gtk \
+    --enable-hildon
+}
+
diff --git a/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..619f56ffa7
--- /dev/null
+++ b/packages/midpath/midpath-backend-gtk_0.2+0.3rc1.bb
@@ -0,0 +1,44 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath gtk+"
+
+do_compile() {
+  # Only native gtk backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --gtk
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmicrobackendgtk ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..9f169c652e
--- /dev/null
+++ b/packages/midpath/midpath-backend-pulseaudio_0.2+0.3rc1.bb
@@ -0,0 +1,44 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath pulseaudio"
+
+do_compile() {
+  # Only native pulseaudio backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --pulse
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmidpathpulse ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..3f1c0e594f
--- /dev/null
+++ b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
@@ -0,0 +1,47 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath qt-mt"
+RCONFLICTS = "midpath-backend-qte"
+
+inherit qt3x11
+
+do_compile() {
+  # Only native qt3 backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --qt3
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmidpathqt ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..ba12796d28
--- /dev/null
+++ b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
@@ -0,0 +1,46 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath qt-mt"
+
+inherit qt4x11
+
+do_compile() {
+  # Only native qt4 backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --qt4
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmidpathqt4 ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..c812b34234
--- /dev/null
+++ b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
@@ -0,0 +1,47 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "classpath qt-mt"
+RCONFLICTS = "midpath-backend-qt3"
+
+inherit qt3e
+
+do_compile() {
+  # Only native qt3 backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --qte
+}
+
+do_install() {
+	oe_libinstall -C dist -so libmidpathqt ${D}${libdir_jni}
+}
+
+do_stage() {
+  :
+}
+	
+PACKAGES = "${PN} ${PN}-dbg"
+
+FILES_${PN} = "${libdir_jni}/lib*.so"
+FILES_${PN}-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..723fd41e43
--- /dev/null
+++ b/packages/midpath/midpath-backend-sdl_0.2+0.3rc1.bb
@@ -0,0 +1,59 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-cldc virtual/libsdl libsdl-mixer libsdl-ttf libsdl-image libsdl-gfx"
+
+RDEPENDS_${PN} = "${PN}-jni"
+
+do_compile() {
+  # Only sdljava-cldc and native SDL backend library is enabled
+  midpath_build \
+    --disable-cldc \
+    --disable-midpath \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --sdl \
+    --with-sdl-include="`sdl-config --cflags`"
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/sdljava-cldc.jar ${D}${datadir}/midpath
+
+	install -d ${D}${libdir_jni}
+	oe_libinstall -C dist -so libsdljava ${D}${libdir_jni}
+	oe_libinstall -C dist -so libsdljava_mixer ${D}${libdir_jni}
+	oe_libinstall -C dist -so libsdljava_ttf ${D}${libdir_jni}
+	oe_libinstall -C dist -so libsdljava_image ${D}${libdir_jni}
+	oe_libinstall -C dist -so libsdljava_gfx ${D}${libdir_jni}
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/sdljava-cldc.jar ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN} ${PN}-jni ${PN}-jni-dbg"
+
+FILES_${PN}  = "\
+		${datadir}/midpath/sdljava-cldc.jar \
+		"
+
+FILES_${PN}-jni  = "${libdir_jni}/lib*.so"
+FILES_${PN}-jni-dbg  = "${libdir_jni}/.debug/lib*.so"
+
diff --git a/packages/midpath/midpath-cldc-native_0.1.bb b/packages/midpath/midpath-cldc-native_0.1.bb
deleted file mode 100644
index 4e54497bde..0000000000
--- a/packages/midpath/midpath-cldc-native_0.1.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-
-inherit native
-
-require midpath-cldc_${PV}.bb
-
-
-PACKAGES = "${PN}-dbg  "
-
-do_install() {
-	:
-}
diff --git a/packages/midpath/midpath-cldc-sdl_0.1.bb b/packages/midpath/midpath-cldc-sdl_0.1.bb
deleted file mode 100644
index 6d777f6e8c..0000000000
--- a/packages/midpath/midpath-cldc-sdl_0.1.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-
-require midpath.inc
-
-do_configure() {
-        
-        cd ${S}/resources-embedded/com/sun/midp/configuration
-        sed -i -e "s|ui.backend:AWT|ui.backend:SDL|" \
-	       -e "s|bitsPerPixel:32|bitsPerPixel:16|" \
-	       configuration.cfg
-
-}
-
-
-do_compile() {
-
-# Build SDLJava for CLDC
-cd ${S}/external/sdljava-cldc
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH} -sourcepath ${S}/external/sdljava-cldc -source 1.3 -target 1.1" || exit 1
-make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1" JAR_FILE="sdljava-cldc.jar" JAR_FLAGS="cvf" || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${datadir}/java
-	install -m 0644 ${S}/external/sdljava-cldc/sdljava-cldc.jar ${D}${datadir}/java
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-        install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-	install -d ${STAGING_DATADIR}/java
-	install -m 0644 ${S}/external/sdljava-cldc/sdljava-cldc.jar ${STAGING_DATADIR}/java
-}
-	
-
-FILES_${PN}  = "${datadir}/java/sdljava-cldc.jar \
-		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
-
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
diff --git a/packages/midpath/midpath-cldc-x11_0.1.bb b/packages/midpath/midpath-cldc-x11_0.1.bb
deleted file mode 100644
index 7aa8e9c6d9..0000000000
--- a/packages/midpath/midpath-cldc-x11_0.1.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-
-require midpath.inc
-
-DEPENDS += "virtual/libx11 midpath-cldc"
-
-do_configure() {
-	
-	cd ${S}/resources-embedded/com/sun/midp/configuration
-	sed -i -e "s|ui.backend:AWT|ui.backend:X11|" configuration.cfg
-
-}
-
-do_compile() {
-
-# Build Escher X11 library
-cd ${S}/external/escher-cldc/core
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/escher-cldc/core -source 1.3 -target 1.1" || exit 1
-make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="escher-x11-cldc.jar" JAR_FLAGS="cvf" || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${datadir}
-	install -m 0644 ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${D}${datadir}
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-	install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-        install -d ${STAGING_DATADIR}/java
-        install -m 0644 ${S}/external/escher-cldc/core/escher-x11-cldc.jar ${STAGING_DATADIR}/java
-}
-	
-
-FILES_${PN}  = "${datadir}/java/escher-x11-cldc.jar \
-		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
diff --git a/packages/midpath/midpath-cldc_0.1.bb b/packages/midpath/midpath-cldc_0.1.bb
deleted file mode 100644
index e18d42781d..0000000000
--- a/packages/midpath/midpath-cldc_0.1.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-
-require midpath.inc
-
-do_compile() {
-
-mkdir -p ${S}/dist
-
-# Build CLDC1.1
-# Build base classes
-cd ${S}/external/cldc1.1/src
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" || exit 1
-make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath . -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes || exit 1
-# Build CLDC extra classes for MIDP2
-cd ${S}/src/cldc-glue
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -sourcepath ${S}/src/cldc-glue -source 1.3 -target 1.1"
-make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${S}/external/cldc1.1/classes -source 1.3 -target 1.1" CLASS_DIR=${S}/external/cldc1.1/classes
-# Make a jar
-${FASTJAR_CMD} cvf  ${S}/dist/midpath-cldc1.1.jar -C ${S}/external/cldc1.1/classes .
-
-
-}
-
-do_install() {
-	install -d ${D}${datadir}/midpath-cldc
-	install -m 0644 dist/midpath-cldc1.1.jar ${D}${datadir}/midpath-cldc
-}
-
-do_stage() {
-	install -d ${STAGING_DATADIR}/midpath-cldc
-	install -m 0644 dist/midpath-cldc1.1.jar ${STAGING_DATADIR}/midpath-cldc
-}
-	
-
-FILES_${PN}  = "${datadir}/midpath-cldc/midpath-cldc1.1.jar"
diff --git a/packages/midpath/midpath-cldc_0.2+0.3rc1.bb b/packages/midpath/midpath-cldc_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..f8dd8e6e22
--- /dev/null
+++ b/packages/midpath/midpath-cldc_0.2+0.3rc1.bb
@@ -0,0 +1,45 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DESCRIPTION = "Implementation of the CLDC profile for use in the MIDPath library"
+RPROVIDES  = "midpath-cldc java-cldc1.1"
+
+JAR = "midpath-cldc1.1.jar"
+
+do_compile() {
+  midpath_build \
+    --disable-midpath \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --with-cldc-jar=dist/${JAR}
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath-cldc
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath-cldc
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath-cldc
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath-cldc
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN}  = "${datadir}/midpath-cldc/${JAR}"
diff --git a/packages/midpath/midpath-common.inc b/packages/midpath/midpath-common.inc
new file mode 100644
index 0000000000..1690b4fc44
--- /dev/null
+++ b/packages/midpath/midpath-common.inc
@@ -0,0 +1,33 @@
+inherit java
+
+HOMEPAGE = "http://midpath.thenesis.org/"
+LICENSE  = "GPL"
+PRIORITY = "optional"
+SECTION  = "interpreters"
+
+DEPENDS = "virtual/javac-native classpath-native classpath fastjar-native"
+
+GLIBJ_ZIP = "${STAGING_DATADIR}/classpath/glibj.zip"
+
+CLDC_JAR = "${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar"
+
+do_unpackpost() {
+	# Remove unneccessary binary bits.
+  find lib -name "*.jar" -exec rm \{\} \;
+}
+
+addtask unpackpost after do_unpack before do_patch
+
+midpath_build() {
+  sh build.sh \
+    --enable-fastjar \
+    --with-j2se-jar ${GLIBJ_ZIP} \
+    --with-jar=fastjar \
+    --with-javac=javac \
+    --with-cldc-jar=${CLDC_JAR} \
+    --with-midpath-jar=${STAGING_DATADIR}/midpath/midpath.jar \
+    --with-kxml="${STAGING_DATADIR_JAVA}/kxml2.jar:${STAGING_DATADIR_JAVA}/xmlpull.jar" \
+    --with-jni-include="-I${STAGING_INCDIR}/classpath" \
+    "$@"
+
+}
diff --git a/packages/midpath/midpath-core_0.2+0.3rc1.bb b/packages/midpath/midpath-core_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..d0ba53bfbd
--- /dev/null
+++ b/packages/midpath/midpath-core_0.2+0.3rc1.bb
@@ -0,0 +1,90 @@
+DESCRIPTION = "MIDPath is a Java library which provides a MIDP2 implementation"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+require midpath-common.inc
+
+SRC_URI += "\
+  file://midpath-suitemanager \
+  file://midpath-launcher-j2se \
+  file://midpath-suitemanager.desktop \
+  file://midpath.png \
+  "
+
+PROVIDES = "java-midp2.0"
+DEPENDS += "midpath-cldc midpath-backend-sdl midpath-backend-escher swt3.4-gtk kxml2 bluez-libs"
+
+RDEPENDS += "libkxml2-java"
+
+JAR = "midpath.jar"
+
+do_compile() {
+  midpath_build \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --with-sdljava-cldc=${STAGING_DATADIR}/midpath/sdljava-cldc.jar \
+    --with-escher-cldc=${STAGING_DATADIR}/midpath/escher-cldc.jar \
+    --with-swt-jar=${STAGING_DATADIR_JAVA}/swt.jar \
+    --with-midpath-jar=${S}/dist/midpath.jar \
+    --bt
+}
+
+do_install() {
+  oe_libinstall -C dist -so libavetanabtcldc ${D}${libdir_jni}
+
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+	install -m 0644 dist/microbackend.jar ${D}${datadir}/midpath
+	install -m 0644 dist/avetanabt-cldc.jar ${D}${datadir}/midpath
+	install -m 0644 dist/jorbis-cldc.jar ${D}${datadir}/midpath
+	install -m 0644 dist/jlayerme-cldc.jar ${D}${datadir}/midpath
+
+  install -d ${D}${bindir}
+  install -m 0755 ${WORKDIR}/midpath-launcher-j2se ${D}${bindir}
+  install -m 0755 ${WORKDIR}/midpath-suitemanager ${D}${bindir}
+
+  install -d ${D}${datadir}/applications
+  install -m 0644 ${WORKDIR}/midpath-suitemanager.desktop ${D}${datadir}/applications
+
+  install -d ${D}${datadir}/pixmaps
+  install -m 0644 ${WORKDIR}/midpath.png ${D}${datadir}/pixmaps
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/microbackend.jar ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/avetanabt-cldc.jar ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/jorbis-cldc.jar ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/jlayerme-cldc.jar ${STAGING_DATADIR}/midpath
+}
+
+PACKAGES = "${PN}-bluetooth ${PN}-bluetooth-jni ${PN}-bluetooth-jni-dbg ${PN}-mp3 ${PN}-ogg ${PN}"
+RDEPENDS_${PN}-bluetooth = "${PN}-bluetooth-jni"
+
+FILES_${PN}-bluetooth = "${datadir}/midpath/avetanabt-cldc.jar"
+FILES_${PN}-bluetooth-jni = "${libdir_jni}/lib*.so"
+FILES_${PN}-bluetooth-jni-dbg = "${libdir_jni}/.debug/lib*.so"
+FILES_${PN}-mp3 = "${datadir}/midpath/jlayerme-cldc.jar"
+FILES_${PN}-ogg = "${datadir}/midpath/jorbis-cldc.jar"
+
+FILES_${PN} = "\
+  ${datadir}/midpath/*.jar \
+  ${datadir}/applications \
+  ${datadir}/pixmaps \
+  ${bindir} \
+	"
+
diff --git a/packages/midpath/midpath-demos_0.2+0.3rc1.bb b/packages/midpath/midpath-demos_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..1a2f690bf1
--- /dev/null
+++ b/packages/midpath/midpath-demos_0.2+0.3rc1.bb
@@ -0,0 +1,53 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS = "midpath-core midpath-location midpath-messaging midpath-svg midpath-opengles midpath-m3g"
+RDEPENDS = "midpath midpath-location midpath-messaging midpath-svg-midp midpath-opengles midpath-m3g"
+
+DESCRIPTION = "Demonstration programs of the MIDPath library"
+
+JAR = "midpath-demos.jar"
+
+do_compile() {
+  # Only Demos enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --with-location-jar=${STAGING_DATADIR}/midpath/jsr179-location.jar \
+    --with-messaging-jar=${STAGING_DATADIR}/midpath/jsr205-messaging.jar \
+    --with-svg-core-jar=${STAGING_DATADIR}/midpath/jsr226-svg-core.jar \
+    --with-opengles-core-jar=${STAGING_DATADIR}/midpath/jsr239-opengles-core.jar \
+    --with-opengles-nio-jar=${STAGING_DATADIR}/midpath/jsr239-opengles-nio.jar \
+    --with-m3g-jar=${STAGING_DATADIR}/midpath/jsr184-m3g.jar \
+    --with-avetanabt-cldc-jar=${STAGING_DATADIR}/midpath/avetanabt-cldc.jar
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath/repository
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath/repository
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath/repository
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath/repository
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${datadir}/midpath/repository/${JAR}"
diff --git a/packages/midpath/midpath-gtk_0.1.bb b/packages/midpath/midpath-gtk_0.1.bb
deleted file mode 100644
index 42f6325efa..0000000000
--- a/packages/midpath/midpath-gtk_0.1.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-
-require midpath.inc
-
-DEPENDS += "gtk+"
-
-do_configure() {
-	
-	cd ${S}/resources-embedded/com/sun/midp/configuration
-	sed -i -e "s|ui.backend:AWT|ui.backend:GTK|" configuration.cfg
-
-	cd ${S}/native/gtk
-        sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" Makefile
-
-}
-
-do_compile() {
-
-# Build the GTK native part
-cd ${S}/native/gtk
-make || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${libdir}
-	install -m 0644 ${S}/native/gtk/libmidpathgtk.so ${D}${libdir}
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-	install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-	:
-}
-	
-
-FILES_${PN}  = "${libdir}/libmidpathgtk.so \
-		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
diff --git a/packages/midpath/midpath-jgl_0.2+0.3rc1.bb b/packages/midpath/midpath-jgl_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..e003fe9bdb
--- /dev/null
+++ b/packages/midpath/midpath-jgl_0.2+0.3rc1.bb
@@ -0,0 +1,46 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-core"
+
+DESCRIPTION = "JGL CLDC API for use in the MIDPath library"
+
+JAR = "jgl-cldc.jar"
+
+do_compile() {
+  # Only JGL CLDC is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN}  = "${datadir}/midpath/${JAR}"
diff --git a/packages/midpath/midpath-location_0.2+0.3rc1.bb b/packages/midpath/midpath-location_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..349356fa65
--- /dev/null
+++ b/packages/midpath/midpath-location_0.2+0.3rc1.bb
@@ -0,0 +1,45 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DESCRIPTION = "Implementation of the JSR179 Location API for use in the MIDPath library"
+
+JAR = "jsr179-location.jar"
+
+do_compile() {
+  # Only location API is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --with-avetanabt-cldc-jar=${STAGING_DATADIR}/midpath/avetanabt-cldc.jar
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN}  = "${datadir}/midpath/${JAR}"
diff --git a/packages/midpath/midpath-m3g_0.2+0.3rc1.bb b/packages/midpath/midpath-m3g_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..a0a1c42dd4
--- /dev/null
+++ b/packages/midpath/midpath-m3g_0.2+0.3rc1.bb
@@ -0,0 +1,48 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-core midpath-opengles"
+
+DESCRIPTION = "Implementation of the JSR184 Mobile 3D Graphics API for use in the MIDPath library"
+
+JAR = "jsr184-m3g.jar"
+
+do_compile() {
+  # Only M3G API is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-demos \
+    --with-opengles-core-jar=${STAGING_DATADIR}/midpath/jsr239-opengles-core.jar \
+    --with-opengles-nio-jar=${STAGING_DATADIR}/midpath/jsr239-opengles-nio.jar
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN}  = "${datadir}/midpath/${JAR}"
diff --git a/packages/midpath/midpath-maemo_0.2+0.3rc1.bb b/packages/midpath/midpath-maemo_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..10fcf6681d
--- /dev/null
+++ b/packages/midpath/midpath-maemo_0.2+0.3rc1.bb
@@ -0,0 +1,19 @@
+require midpath.inc
+
+PR = "r0"
+
+# The patch fixes the system_properties file only deployed in this recipe.
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz \
+  file://0.2+0.3rc1-fix-crlf.patch;patch=1;pnum=0 \
+  "
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+PR = "r0"
+
+SRC_URI += "file://configuration_maemo.cfg"
+
+RDEPENDS += "java2-runtime libswt3.4-gtk-java midpath-core-bluetooth"
+
+CONFIGURATION = "configuration_maemo.cfg"
diff --git a/packages/midpath/midpath-messaging_0.2+0.3rc1.bb b/packages/midpath/midpath-messaging_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..554f864491
--- /dev/null
+++ b/packages/midpath/midpath-messaging_0.2+0.3rc1.bb
@@ -0,0 +1,46 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-core"
+
+DESCRIPTION = "Implementation of the JSR205 Wireless Messaging API for use in the MIDPath library"
+
+JAR = "jsr205-messaging.jar"
+
+do_compile() {
+  # Only location API is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN}"
+
+FILES_${PN}  = "${datadir}/midpath/${JAR}"
diff --git a/packages/midpath/midpath-opengles_0.2+0.3rc1.bb b/packages/midpath/midpath-opengles_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..b5b7d67954
--- /dev/null
+++ b/packages/midpath/midpath-opengles_0.2+0.3rc1.bb
@@ -0,0 +1,56 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-core midpath-jgl"
+RDEPENDS_${PN} = "midpath-core midpath-jgl ${PN}-core ${PN}-nio"
+
+DESCRIPTION = "Implementation of the JSR239 OpenGL ES API for use in the MIDPath library"
+
+JAR = "jsr239-opengles-jgl.jar"
+JAR2 = "jsr239-opengles-core.jar"
+JAR3 = "jsr239-opengles-nio.jar"
+
+do_compile() {
+  # Only OpenGL ES API is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-jgl-cldc \
+    --disable-avetanabt-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --with-jgl-cldc-jar=${STAGING_DATADIR}/midpath/jgl-cldc.jar
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR2} ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR3} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR2} ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR3} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN} ${PN}-core ${PN}-nio"
+
+FILES_${PN} = "${datadir}/midpath/${JAR}"
+FILES_${PN}-core = "${datadir}/midpath/${JAR2}"
+FILES_${PN}-nio = "${datadir}/midpath/${JAR3}"
diff --git a/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb b/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..edb20af441
--- /dev/null
+++ b/packages/midpath/midpath-openmoko_0.2+0.3rc1.bb
@@ -0,0 +1,19 @@
+require midpath.inc
+
+PR = "r0"
+
+# The patch fixes the system_properties file only deployed in this recipe.
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz \
+  file://0.2+0.3rc1-fix-crlf.patch;patch=1;pnum=0 \
+  "
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+PR = "r0"
+
+SRC_URI += "file://configuration_openmoko.cfg"
+
+RDEPENDS += "java2-runtime midpath-backend-pulseaudio libswt3.4-gtk-java midpath-core-bluetooth"
+
+CONFIGURATION = "configuration_openmoko.cfg"
diff --git a/packages/midpath/midpath-pulseaudio_0.1.bb b/packages/midpath/midpath-pulseaudio_0.1.bb
deleted file mode 100644
index 1a8c44d38c..0000000000
--- a/packages/midpath/midpath-pulseaudio_0.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-
-require midpath_${PV}.bb
-
-DEPENDS = "pulseaudio"
-RDEPENDS = "pulseaudio"
-
-do_configure() {
-	cd ${S}/native/pulseaudio
-	sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" Makefile
-	cd ${S}/resources-embedded/com/sun/midp/configuration
-	sed -i -e "s|sound.backend:NULL|sound.backend:PulseAudio|" configuration.cfg
-}
-
-do_compile() {
-
-# Build the PulseAudio native part
-cd ${S}/native/pulseaudio
-make || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${libdir}
-	install -m 0644 ${S}/native/pulseaudio/libmidpathpulse.so ${D}${libdir}
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-	install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-	:
-}
-	
-
-FILES_${PN}  = "${libdir}/libmidpathpulse.so \
-                ${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
-
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
diff --git a/packages/midpath/midpath-qt3x11_0.1.bb b/packages/midpath/midpath-qt3x11_0.1.bb
deleted file mode 100644
index 7ad9af9991..0000000000
--- a/packages/midpath/midpath-qt3x11_0.1.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-
-require midpath.inc
-
-DEPENDS += " qt-mt"
-RCONFILCTS = "midpath-qte"
-
-inherit qt3x11
-
-do_configure() {
-	
-	cd ${S}/resources-embedded/com/sun/midp/configuration
-	sed -i -e "s|ui.backend:AWT|ui.backend:QT|" configuration.cfg
-
-	cd ${S}/native/qt
-        sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal|" \
-               -e "s|\`pkg\-config \-\-cflags qt\-mt\`|\-I${QTDIR}/include/ -DQT_THREAD_SUPPORT|" \
-               -e "s|\`pkg\-config \-\-libs qt\-mt\`|\-L${QTDIR}/lib \-lqt-mt -lsupc++|" \
-               Makefile
-}
-
-do_compile() {
-
-# Build the QT native part
-cd ${S}/native/qt
-make || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${libdir}
-	install -m 0644 ${S}/native/qt/libmidpathqt.so ${D}${libdir}
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-	install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-	:
-}
-	
-
-FILES_${PN}  = "${libdir}/libmidpathqt.so \
-		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
-
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
diff --git a/packages/midpath/midpath-qte_0.1.bb b/packages/midpath/midpath-qte_0.1.bb
deleted file mode 100644
index 4b7144722f..0000000000
--- a/packages/midpath/midpath-qte_0.1.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-
-require midpath.inc
-
-DEPENDS += " qte-mt"
-RCONFLICTS = "midpath-qt3x11"
-
-do_configure() {
-	
-	cd ${S}/resources-embedded/com/sun/midp/configuration
-	sed -i -e "s|ui.backend:AWT|ui.backend:QT|" configuration.cfg
-
-	cd ${S}/native/qt
-        sed -i -e "s|\-I/usr/include/classpath|\-I${STAGING_INCDIR}/classpath-minimal -DQWS|" \
-               -e "s|\`pkg\-config \-\-cflags qt\-mt\`|\-I${QTDIR}/include/ -DQWS -DQT_THREAD_SUPPORT|" \
-               -e "s|\`pkg\-config \-\-libs qt\-mt\`|\-L${QTDIR}/lib \-lqte-mt -lsupc++|" \
-               Makefile
-}
-
-do_compile() {
-
-# Build the QT native part
-cd ${S}/native/qt
-make || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${libdir}
-	install -m 0644 ${S}/native/qt/libmidpathqt.so ${D}${libdir}
-	install -d ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration
-	install -m 0644 resources-embedded/com/sun/midp/configuration/configuration.cfg ${D}${datadir}/java/resources-embedded/com/sun/midp/configuration/
-}
-
-do_stage() {
-	:
-}
-	
-
-FILES_${PN}  = "${libdir}/libmidpathqt.so \
-		${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg \
-	       "
-
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
diff --git a/packages/midpath/midpath-svg_0.2+0.3rc1.bb b/packages/midpath/midpath-svg_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..d63caa5363
--- /dev/null
+++ b/packages/midpath/midpath-svg_0.2+0.3rc1.bb
@@ -0,0 +1,60 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-core midpath-webservices"
+RDEPENDS_${PN}-midp = "${PN}"
+RDEPENDS_${PN}-awt = "${PN}"
+
+DESCRIPTION = "Implementation of the JSR226 SVG API for use in the MIDPath library"
+
+JAR = "jsr226-svg-core.jar"
+JAR2 = "jsr226-svg-midp2.jar"
+JAR3 = "jsr226-svg-core.jar"
+
+do_compile() {
+  # Only SVG API is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-web_services-api \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos \
+    --enable-svg-api-awt \
+    --with-jaxp-jar=${STAGING_DATADIR}/midpath/jsr172-jaxp.jar
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR2} ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR3} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR2} ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR3} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN} ${PN}-midp ${PN}-awt"
+
+FILES_${PN}  = "${datadir}/midpath/${JAR}"
+
+FILES_${PN}-midp  = "${datadir}/midpath/${JAR2}"
+
+FILES_${PN}-awt  = "${datadir}/midpath/${JAR3}"
diff --git a/packages/midpath/midpath-test_0.1.bb b/packages/midpath/midpath-test_0.1.bb
deleted file mode 100644
index 3d06e80797..0000000000
--- a/packages/midpath/midpath-test_0.1.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-
-require midpath.inc
-
-SRC_URI += "file://shellscript.patch;patch=1"
-
-DEPENDS += " midpath"
-RDEPENDS += " midpath"
-
-CLDC_PATH = ${STAGING_DATADIR}/java/cldc1.1.jar
-
-do_configure() {
-        
-        cd ${S}/bin
-        sed -i -e "s|MIDPATH_HOME=|MIDPATH_HOME=${datadir}/java|" \
-		   midpath-test-cacao-cldc.sh
-
-}
-
-do_compile() {
-
-cd ${S}/tests
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${STAGING_DATADIR}/java/midpath.jar:${CLDC_PATH} -sourcepath ${S}/tests -source 1.3 -target 1.1" || exit 1
-make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${STAGING_DATADIR}/java/midpath.jar:${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="midpath-tests.jar" JAR_FLAGS="cvf" || exit 1
-
-}
-
-do_install() {
-	install -d ${D}${bindir}
-#	install -m 0755 bin/graphical_launcher-j2se.sh ${D}${bindir}
-#	install -m 0755 bin/midpath-test.sh ${D}${bindir}
-	install -m 0755 bin/midpath-test-cacao-cldc.sh ${D}${bindir}
-	install -d ${D}${datadir}/java
-	install -m 0644 ${S}/tests/midpath-tests.jar ${D}${datadir}/java
-}
-
-do_stage() {
-	:
-}
-	
-
-FILES_${PN}  = "${datadir}/java/midpath-tests.jar \
-#		${bindir}/graphical_launcher-j2se.sh \
-#		${bindir}/midpath-test.sh \
-		${bindir}/midpath-test-cacao-cldc.sh \
-	       "
diff --git a/packages/midpath/midpath-webservices_0.2+0.3rc1.bb b/packages/midpath/midpath-webservices_0.2+0.3rc1.bb
new file mode 100644
index 0000000000..7f2f197cc1
--- /dev/null
+++ b/packages/midpath/midpath-webservices_0.2+0.3rc1.bb
@@ -0,0 +1,51 @@
+require midpath-common.inc
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
+
+S = "${WORKDIR}/midpath-0.3rc1"
+
+DEPENDS += "midpath-core"
+RSUGGESTS_${PN} = "${PN}-jaxp"
+
+DESCRIPTION = "Implementation of the JSR172 J2ME Web Services API for use in the MIDPath library"
+
+JAR = "jsr172-jaxp.jar"
+JAR2 = "jsr172-jaxrpc.jar"
+
+do_compile() {
+  # Only web services API is enabled.
+  midpath_build \
+    --disable-midpath \
+    --disable-cldc \
+    --disable-sdljava-cldc \
+    --disable-escher-cldc \
+    --disable-jlayerme-cldc \
+    --disable-jorbis-cldc \
+    --disable-avetanabt-cldc \
+    --disable-jgl-cldc \
+    --disable-location-api \
+    --disable-messaging-api \
+    --disable-svg-api \
+    --disable-opengl-api \
+    --disable-m3g-api \
+    --disable-demos
+}
+
+do_install() {
+	install -d ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR} ${D}${datadir}/midpath
+	install -m 0644 dist/${JAR2} ${D}${datadir}/midpath
+}
+
+do_stage() {
+	install -d ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR} ${STAGING_DATADIR}/midpath
+	install -m 0644 dist/${JAR2} ${STAGING_DATADIR}/midpath
+}
+	
+PACKAGES = "${PN} ${PN}-jaxp"
+
+FILES_${PN}-jaxp  = "${datadir}/midpath/${JAR}"
+FILES_${PN}  = "${datadir}/midpath/${JAR2}"
diff --git a/packages/midpath/midpath.inc b/packages/midpath/midpath.inc
index 4bc3b71598..703d9bdd3c 100644
--- a/packages/midpath/midpath.inc
+++ b/packages/midpath/midpath.inc
@@ -1,22 +1,49 @@
-DESCRIPTION = "MIDPath is a Java library which provides a MIDP2 implementation"
-HOMEPAGE = "http://midpath.thenesis.org/"
-LICENSE  = "GPL"
-PRIORITY = "optional"
-SECTION  = "interpreters"
-PR = "r1"
+# This is the include recipe for the midpath recipes for your platform.
+#
+# To support your particular platform, write a proper configuration, add
+# a new recipe and decided which components it should install by modifying
+# RDEPENDS.
+require midpath-common.inc
 
-SRC_URI = "http://downloads.sourceforge.net/midpath/midpath-${PV}.tar.gz"
+RDEPENDS = "midpath-core midpath-core-bluetooth midpath-core-ogg midpath-core-mp3"
 
-S = "${WORKDIR}/midpath-${PV}"
+PROVIDES = "midpath"
+RPROVIDES = "midpath"
 
-DEPENDS = "virtual/javac-native fastjar-native classpath"
+CONFIGURATION = "${@bb.fatal('Variable CONFIGURATION is not set in your midpath.inc-based recipe.')}"
 
-JAVAC_CMD = "${STAGING_BINDIR_NATIVE}/javac"
+do_compile() {
+  :
+}
 
-FASTJAR_CMD = "${STAGING_BINDIR_NATIVE}/fastjar"
+do_install() {
+	# Installation of configuration.cfg:
+  # Creates a symbolic link at ${datadir}/midpath which points to ${sysconfdir}/midpath
+  install -d ${D}${datadir}/midpath/configuration/com/sun/midp/configuration
+  ln -sf ${sysconfdir}/midpath/configuration.cfg ${D}${datadir}/midpath/configuration/com/sun/midp/configuration/configuration.cfg
 
-JAVA_PATH = "${STAGING_DATADIR}/java"
+  # Put the file itself into ${sysconfdir}/midpath
+  install -d ${D}${sysconfdir}/midpath
+  install -m 0644 ${WORKDIR}/${CONFIGURATION} ${D}${sysconfdir}/midpath/configuration.cfg
 
-GNU_CLASSPATH_PATH = "${JAVA_PATH}/classpath/glibj.zip"
+  # Same procedure for MIDP2.0 required system properties
+  ln -sf ${sysconfdir}/midpath/system_properties ${D}${datadir}/midpath/configuration/com/sun/midp/configuration/system_properties
+  install -m 0644 configuration/com/sun/midp/configuration/system_properties ${D}${sysconfdir}/midpath
+
+  # Put l10n data into $datadir
+  install -d ${D}${datadir}/midpath/configuration/com/sun/midp/configuration/l10n
+  install -m 0644 configuration/com/sun/midp/configuration/l10n/en-US.xml ${D}${datadir}/midpath/configuration/com/sun/midp/configuration/l10n
+}
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "\
+	${datadir}/midpath/configuration \
+  ${sysconfdir}/midpath \
+	"
+
+CONFFILES_${PN} = "\
+  ${sysconfdir}/midpath/system_properties \
+  ${sysconfdir}/midpath/configuration.cfg \
+  "
 
-CLDC_PATH = ${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar
diff --git a/packages/midpath/midpath_0.1.bb b/packages/midpath/midpath_0.1.bb
deleted file mode 100644
index e787b053be..0000000000
--- a/packages/midpath/midpath_0.1.bb
+++ /dev/null
@@ -1,60 +0,0 @@
-
-require midpath.inc
-
-DEPENDS += " kxml2 midpath-cldc midpath-cldc-x11 midpath-cldc-sdl"
-RSUGGESTS += " kxml2"
-
-do_compile() {
-
-mkdir -p ${S}/dist
-
-# Build MP3 library
-cd ${S}/external/jlayerme-cldc/src
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/jlayerme-cldc/src -source 1.3 -target 1.1" || exit 1
-make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="jlayerme-cldc.jar" JAR_FLAGS="cvf" || exit 1
-cp ${S}/external/jlayerme-cldc/src/jlayerme-cldc.jar ${S}/dist
-
-# Build OGG library
-cd ${S}/external/jorbis-cldc/src
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -sourcepath ${S}/external/jorbis-cldc/src -source 1.3 -target 1.1" || exit 1
-make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH} -source 1.3 -target 1.1" JAR_FILE="jorbis-cldc.jar" JAR_FLAGS="cvf" || exit 1
-cp ${S}/external/jorbis-cldc/src/jorbis-cldc.jar ${S}/dist
-
-# Build Bluetooth library
-cd ${S}/external/javabluetooth/src
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${GNU_CLASSPATH_PATH}:${CLDC_PATH}:${S}/lib/RXTXcomm.jar -sourcepath ${S}/external/javabluetooth/src -source 1.3 -target 1.1" || exit 1
-make jar JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${GNU_CLASSPATH_PATH}:${CLDC_PATH}:${S}/lib/RXTXcomm.jar -source 1.3 -target 1.1" JAR_FILE="jsr82-bluetooth.jar" JAR_FLAGS="cvf" || exit 1
-cp ${S}/external/javabluetooth/src/jsr82-bluetooth.jar ${S}/dist
-
-# Build MIDPath
-cd ${S}/src/core
-make JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH}:${JAVA_PATH}/sdljava-cldc.jar:${JAVA_PATH}/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${JAVA_PATH}/kxml2-2.3.0.jar:${S}/lib/swt.jar -sourcepath ${S}/src/core -source 1.3 -target 1.1" || exit 1
-make install JAVAC=${JAVAC_CMD} JAVAC_FLAGS="-bootclasspath ${CLDC_PATH}:${GNU_CLASSPATH_PATH}:${JAVA_PATH}/sdljava-cldc.jar:${JAVA_PATH}/dist/escher-x11-cldc.jar:${S}/dist/jlayerme-cldc.jar:${S}/dist/jorbis-cldc.jar:${S}/dist/jsr82-bluetooth.jar:${JAVA_PATH}/lib/kxml2-2.3.0.jar:${S}/lib/swt.jar -source 1.3 -target 1.1" CLASS_DIR=${S}/src/core/classes || exit 1
-# Compile JVM.java separately as it can't be compiled against cldc.jar
-${JAVAC_CMD} -bootclasspath ${GNU_CLASSPATH_PATH} -source 1.3 -target 1.1 -d ${S}/src/core/classes com/sun/cldchi/jvm/JVM.java
-${FASTJAR_CMD} cvf ${S}/dist/midpath.jar -C ${S}/src/core/classes .
-
-}
-
-do_install() {
-	install -d ${D}${datadir}/java
-	install -m 0644 dist/midpath.jar ${D}${datadir}/java
-	install -d ${D}${datadir}/java/resources-embedded
-	cp -rf resources-embedded/ ${D}${datadir}/java/
-}
-
-do_stage() {
-	install -d ${STAGING_DATADIR}/java
-	install -m 0644 dist/midpath.jar ${STAGING_DATADIR}/java
-}
-
-
-FILES_${PN} = "${datadir}/java/midpath.jar \
-	       ${datadir}/java/resources-embedded/com/sun/midp/configuration/ \
-	       ${datadir}/java/resources-embedded/com/sun/midp/configuration/chameleon/ \
-	       ${datadir}/java/resources-embedded/com/sun/midp/configuration/l10n/ \
-	       ${datadir}/java/resources-embedded/com/sun/midp/chameleon/skins/resources/images/ \
-
-	       ${datadir}/java/resources-embedded/org/thenesis/midpath/font/bdf/ \
-	      " 
-CONFFILES_${PN} = "${datadir}/java/resources-embedded/com/sun/midp/configuration/configuration.cfg"
diff --git a/packages/obsolete/classpath/classpath-gtk_0.93.bb b/packages/obsolete/classpath/classpath-gtk_0.93.bb
deleted file mode 100644
index 3c9f073e26..0000000000
--- a/packages/obsolete/classpath/classpath-gtk_0.93.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require classpath.inc
-
-DEPENDS = "glib-2.0 gtk+ cairo gconf libart-lgpl pango libxtst virtual/javac-native zip-native"
-RDEPENDS_${PN} = "classpath-common (>= ${PV})"
-RCONFLICTS_${PN} = "classpath-minimal"
-
-SRC_URI += "file://disable-automake-checks-v2.patch;patch=1"
-
-EXTRA_OECONF = "--with-jikes --disable-plugin --disable-dssi"
diff --git a/packages/obsolete/classpath/classpath-gtk_cvs.bb b/packages/obsolete/classpath/classpath-gtk_cvs.bb
deleted file mode 100644
index 4d4895a319..0000000000
--- a/packages/obsolete/classpath/classpath-gtk_cvs.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-require classpath.inc
-
-PR = "r2"
-
-SRCDATE_${PN} ?= "20070501"
-PV = "0.93+cvs${SRCDATE}"
-
-### note from Laibsch: bug 2523 has information on how to build this package
-DEPENDS = "glib-2.0 gtk+ cairo gconf virtual/javac-native zip-native virtual/java-native libxtst"
-RDEPENDS_${PN} = "classpath-common (>= ${PV})"
-RCONFLICTS_${PN} = "classpath-minimal"
-
-SRC_URI = "cvs://anonymous@cvs.savannah.gnu.org/sources/classpath;module=classpath \
-           file://disable-automake-checks-v2.patch;patch=1"
-
-S = "${WORKDIR}/classpath"
-
-EXTRA_OECONF = "--with-javac=${STAGING_BINDIR_NATIVE}/javac --with-ecj-jar=${STAGING_DATADIR_NATIVE}/ecj-bootstrap.jar --disable-plugin --disable-dssi --disable-alsa"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/classpath
-	install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
-	install -d ${STAGING_DATADIR}/classpath
-	install -m 0755 lib/glibj.zip ${STAGING_DATADIR}/classpath/
-}
-
-do_install() {
-	autotools_do_install
-	mv ${D}${libdir}/security ${D}${libdir}/${PN}
-}
diff --git a/packages/obsolete/classpath/classpath-minimal-native_0.93.bb b/packages/obsolete/classpath/classpath-minimal-native_0.93.bb
deleted file mode 100644
index e7862e6e3f..0000000000
--- a/packages/obsolete/classpath/classpath-minimal-native_0.93.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require classpath.inc
-
-DEPENDS = "glib-2.0 libart-lgpl pango libxtst virtual/javac-native zip-native"
-PR = "r1"
-
-SRC_URI += "file://disable-automake-checks-v2.patch;patch=1"
-
-S = "${WORKDIR}/classpath-${PV}"
-
-inherit native
-
-EXTRA_OECONF = "--with-jikes --disable-gconf-peer --disable-gtk-peer --disable-plugin --disable-dssi --disable-examples"
-
-do_stage() {
-        install -d ${STAGING_INCDIR}/classpath
-        install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
-        install -d ${STAGING_DATADIR}/classpath
-        install -m 0755 lib/glibj.zip ${STAGING_DATADIR}/classpath/
-}
-
-do_install() {
-	:
-}
diff --git a/packages/obsolete/classpath/classpath-minimal-native_0.95.bb b/packages/obsolete/classpath/classpath-minimal-native_0.95.bb
deleted file mode 100644
index 28b25a7cb9..0000000000
--- a/packages/obsolete/classpath/classpath-minimal-native_0.95.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# classpath-minimal-native has no packages
-# primary goal is to speed up building of java virtual machines
-
-inherit native
-require classpath-minimal_${PV}.bb
-PR = "r0"
diff --git a/packages/obsolete/classpath/classpath-minimal_0.90.bb b/packages/obsolete/classpath/classpath-minimal_0.90.bb
deleted file mode 100644
index e006e23c32..0000000000
--- a/packages/obsolete/classpath/classpath-minimal_0.90.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require classpath.inc
-
-DEPENDS = "virtual/javac-native zip-native"
-RDEPENDS_${PBN}-minimal = "${PBN}-common (>= ${PV})"
-RCONFLICTS_${PBN}-minimal = "${PBN}-gtk"
-
-SRC_URI += "file://disable-automake-checks.patch;patch=1"
-
-EXTRA_OECONF = "--with-jikes --without-x --with-glibj --disable-gtk-peer --disable-alsa"
diff --git a/packages/obsolete/classpath/classpath-minimal_0.95.bb b/packages/obsolete/classpath/classpath-minimal_0.95.bb
deleted file mode 100644
index 1fe65edc08..0000000000
--- a/packages/obsolete/classpath/classpath-minimal_0.95.bb
+++ /dev/null
@@ -1,40 +0,0 @@
-DESCRIPTION = "GNU Classpath standard Java libraries"
-HOMEPAGE = "http://www.gnu.org/software/classpath/"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "Classpath"
-PROVIDES = "classpath"
-RPROVIDES = "classpath"
-PR = "r1"
-
-S = "${WORKDIR}/classpath-${PV}"
-
-SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
-
-DEPENDS = "virtual/javac-native zip-native"
-
-inherit autotools
-
-
-EXTRA_OECONF = "--with-glibj \
-                --with-javac=${STAGING_BINDIR_NATIVE}/javac \
-                --disable-alsa \
-                --disable-gconf-peer \
-                --disable-gtk-peer \
-                --disable-plugin \
-                --disable-dssi \
-                --disable-examples \
-               "
-do_install() {
-        :
-}
-
-do_stage() {
-        install -d ${STAGING_INCDIR}/classpath-minimal/
-        install -m 0644 include/jni.h ${STAGING_INCDIR}/classpath-minimal/
-        install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath-minimal/
-        install -d ${STAGING_DATADIR}/java/classpath-minimal/
-        install -m 0644 lib/glibj.zip ${STAGING_DATADIR}/java/classpath-minimal/
-}
-
-PACKAGES = "${PN}-dbg  "
diff --git a/packages/obsolete/classpath/classpath.inc b/packages/obsolete/classpath/classpath.inc
deleted file mode 100644
index d9498c99d5..0000000000
--- a/packages/obsolete/classpath/classpath.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "GNU Classpath standard Java libraries"
-HOMEPAGE = "http://www.gnu.org/software/classpath/"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "Classpath"
-PROVIDES = "classpath"
-RPROVIDES = "classpath"
-
-SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz \
-           file://gconf_version.patch;patch=1 \
-           file://fix-endian-arm-floats.patch;patch=1"
-
-inherit autotools
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/classpath
-	install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
-}
-
-do_install() {
-	autotools_do_install
-	mv ${D}${libdir}/security ${D}${libdir}/${PN}
-}
-
-PACKAGES =+ "classpath-common classpath-examples classpath-tools"
-FILES_classpath-common += "${datadir}/classpath/glibj.zip"
-FILES_classpath-examples += "${datadir}/classpath/examples"
-FILES_classpath-tools += "${datadir}/classpath/tools.zip ${datadir}/classpath/tools"
-FILES_classpath-dev += "${libdir}/*.so"
-FILES_classpath-dbg += "${libdir}/classpath/.debug"
diff --git a/packages/obsolete/classpath/classpath_0.14.bb b/packages/obsolete/classpath/classpath_0.14.bb
deleted file mode 100644
index a20aa73992..0000000000
--- a/packages/obsolete/classpath/classpath_0.14.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require classpath.inc
-
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native zip-native"
-RDEPENDS_${PN} = "${PN}-common (${PV})"
-PR = "r2"
-
-SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
-           file://disable-automake-checks.patch;patch=1"
-
-EXTRA_OECONF = "--with-jikes"
diff --git a/packages/obsolete/classpath/classpath_0.15.bb b/packages/obsolete/classpath/classpath_0.15.bb
deleted file mode 100644
index a20aa73992..0000000000
--- a/packages/obsolete/classpath/classpath_0.15.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require classpath.inc
-
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native zip-native"
-RDEPENDS_${PN} = "${PN}-common (${PV})"
-PR = "r2"
-
-SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
-           file://disable-automake-checks.patch;patch=1"
-
-EXTRA_OECONF = "--with-jikes"
diff --git a/packages/obsolete/classpath/classpath_0.17.bb b/packages/obsolete/classpath/classpath_0.17.bb
deleted file mode 100644
index a20aa73992..0000000000
--- a/packages/obsolete/classpath/classpath_0.17.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require classpath.inc
-
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native zip-native"
-RDEPENDS_${PN} = "${PN}-common (${PV})"
-PR = "r2"
-
-SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
-           file://disable-automake-checks.patch;patch=1"
-
-EXTRA_OECONF = "--with-jikes"
diff --git a/packages/obsolete/classpath/classpath_0.18.bb b/packages/obsolete/classpath/classpath_0.18.bb
deleted file mode 100644
index 8696501fcf..0000000000
--- a/packages/obsolete/classpath/classpath_0.18.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require classpath.inc
-
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native zip-native"
-RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
-PR = "r1"
-
-SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
-           file://disable-automake-checks.patch;patch=1"
-
-EXTRA_OECONF = "--with-jikes"
diff --git a/packages/obsolete/classpath/classpath_0.19.bb b/packages/obsolete/classpath/classpath_0.19.bb
deleted file mode 100644
index 8696501fcf..0000000000
--- a/packages/obsolete/classpath/classpath_0.19.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require classpath.inc
-
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native zip-native"
-RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
-PR = "r1"
-
-SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
-           file://disable-automake-checks.patch;patch=1"
-
-EXTRA_OECONF = "--with-jikes"
diff --git a/packages/obsolete/classpath/classpath_0.20.bb b/packages/obsolete/classpath/classpath_0.20.bb
deleted file mode 100644
index 8696501fcf..0000000000
--- a/packages/obsolete/classpath/classpath_0.20.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require classpath.inc
-
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native zip-native"
-RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
-PR = "r1"
-
-SRC_URI = "${GNU_MIRROR}/${PN}/${P}.tar.gz \
-           file://disable-automake-checks.patch;patch=1"
-
-EXTRA_OECONF = "--with-jikes"
diff --git a/packages/obsolete/classpath/classpath_cvs.bb b/packages/obsolete/classpath/classpath_cvs.bb
deleted file mode 100644
index 943af376a7..0000000000
--- a/packages/obsolete/classpath/classpath_cvs.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "GNU Classpath standard Java libraries"
-HOMEPAGE = "http://www.gnu.org/software/classpath/"
-LICENSE = "Classpath"
-PRIORITY = "optional"
-SECTION = "libs"
-PV = "0.20+cvs${SRCDATE}"
-
-DEFAULT_PREFERENCE = "-1"
-
-DEPENDS = "glib-2.0 gtk+ libart-lgpl pango libxtst virtual/javac-native zip-native"
-RDEPENDS_${PN} = "${PN}-common (>= ${PV})"
-
-SRC_URI = "cvs://anoncvs@cvs.gnu.org/cvsroot/classpath;method=pserver;rsh=ssh;module=classpath \
-           file://disable-automake-checks.patch;patch=1"
-S = "${WORKDIR}/classpath"
-
-inherit autotools
-
-EXTRA_OECONF = "--with-jikes"
-
-PACKAGES += " ${PN}-common ${PN}-examples"
-
-FILES_${PN} = "${libdir}/${PN}"
-FILES_${PN}-common = "${datadir}/${PN}/glibj.zip"
-FILES_${PN}-examples = "${datadir}/${PN}/examples"
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/classpath
-	install -m 0755 include/jni* ${STAGING_INCDIR}/classpath/
-}
-
-do_install() {
-	autotools_do_install
-	mv ${D}${libdir}/security ${D}${libdir}/${PN}
-}
diff --git a/packages/obsolete/classpath/files/disable-automake-checks-v2.patch b/packages/obsolete/classpath/files/disable-automake-checks-v2.patch
deleted file mode 100644
index 0c1df1acae..0000000000
--- a/packages/obsolete/classpath/files/disable-automake-checks-v2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sablevm-classpath-1.1.7/configure.ac.orig	2004-11-26 00:23:01.000000000 +0100
-+++ sablevm-classpath-1.1.7/configure.ac	2004-11-26 00:23:46.000000000 +0100
-@@ -34,7 +34,7 @@
- AC_SUBST(CLASSPATH_MODULE)
- 
- AC_PREREQ(2.59)
--AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability])
-+AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS([include/config.h])
- AC_PREFIX_DEFAULT(/usr/local)
- 
diff --git a/packages/obsolete/classpath/files/disable-automake-checks.patch b/packages/obsolete/classpath/files/disable-automake-checks.patch
deleted file mode 100644
index d6a55428ad..0000000000
--- a/packages/obsolete/classpath/files/disable-automake-checks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sablevm-classpath-1.1.7/configure.ac.orig	2004-11-26 00:23:01.000000000 +0100
-+++ sablevm-classpath-1.1.7/configure.ac	2004-11-26 00:23:46.000000000 +0100
-@@ -34,7 +34,7 @@
- AC_SUBST(CLASSPATH_MODULE)
- 
- AC_PREREQ(2.59)
--AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar])
-+AM_INIT_AUTOMAKE
- AC_CONFIG_HEADERS([include/config.h])
- AC_PREFIX_DEFAULT(/usr/local)
- 
diff --git a/packages/obsolete/classpath/files/fix-endian-arm-floats.patch b/packages/obsolete/classpath/files/fix-endian-arm-floats.patch
deleted file mode 100644
index a9af0611b2..0000000000
--- a/packages/obsolete/classpath/files/fix-endian-arm-floats.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- classpath/native/fdlibm/ieeefp.h.orig	2006-04-14 22:33:09.000000000 -0400
-+++ classpath/native/fdlibm/ieeefp.h	2006-04-14 22:41:46.000000000 -0400
-@@ -13,7 +13,7 @@
-    byte ordering was big or little endian depending upon the target.  
-    Modern floating-point formats are naturally ordered; in this case
-    __VFP_FP__ will be defined, even if soft-float.  */
--#ifdef __VFP_FP__
-+#ifdef __SOFTFP__
- #ifdef __ARMEL__
- #define __IEEE_LITTLE_ENDIAN
- #else
diff --git a/packages/obsolete/classpath/files/gconf_version.patch b/packages/obsolete/classpath/files/gconf_version.patch
deleted file mode 100644
index b1be1209a2..0000000000
--- a/packages/obsolete/classpath/files/gconf_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- classpath-0.93/configure.ac~	2007-03-29 15:52:30.000000000 -0500
-+++ classpath-0.93/configure.ac	2007-03-29 15:52:30.000000000 -0500
-@@ -496,7 +496,7 @@
- 
-   dnl gconf-peer
-   if  test "x${COMPILE_GCONF_PEER}" = xyes; then
--    PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.11.2)
-+    PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.6.0)
-     AC_SUBST(GCONF_CFLAGS)
-     AC_SUBST(GCONF_LIBS)
-     dnl we also need gdk for locking
diff --git a/packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch b/packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch
deleted file mode 100644
index a41beee982..0000000000
--- a/packages/obsolete/jamvm/files/jamvm-1.3.1-size-defaults.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- jamvm-1.3.1.orig/src/jam.h	2005-07-17 23:53:34.000000000 +0200
-+++ jamvm-1.3.1/src/jam.h	2005-07-17 23:54:17.000000000 +0200
-@@ -548,7 +548,9 @@
- #endif
- 
- /* default size of the Java stack */
-+#ifndef DEFAULT_STACK
- #define DEFAULT_STACK 64*KB
-+#endif
- 
- /* size of emergency area - big enough to create
-    a StackOverflow exception */
diff --git a/packages/obsolete/jamvm/jamvm-1.3.0/.mtn2git_empty b/packages/obsolete/jamvm/jamvm-1.3.0/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/obsolete/jamvm/jamvm-1.3.0/.mtn2git_empty
+++ /dev/null
diff --git a/packages/obsolete/jamvm/jamvm-1.3.0/heap-size.patch b/packages/obsolete/jamvm/jamvm-1.3.0/heap-size.patch
deleted file mode 100644
index 36d681889d..0000000000
--- a/packages/obsolete/jamvm/jamvm-1.3.0/heap-size.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- jamvm-1.3.0/src/jam.h.orig	2005-04-02 14:38:49.000000000 +0200
-+++ jamvm-1.3.0/src/jam.h	2005-04-02 14:41:18.000000000 +0200
-@@ -531,13 +531,19 @@
- #define MIN_STACK 2*KB
- 
- /* default minimum size of object heap */
-+#ifndef DEFAULT_MIN_HEAP
- #define DEFAULT_MIN_HEAP 2*MB
-+#endif
- 
- /* default maximum size of object heap */
-+#ifndef DEFAULT_MAX_HEAP
- #define DEFAULT_MAX_HEAP 128*MB
-+#endif
- 
- /* default size of the Java stack */
-+#ifndef DEFAULT_STACK
- #define DEFAULT_STACK 64*KB
-+#endif
- 
- /* size of emergency area - big enough to create
-    a StackOverflow exception */
diff --git a/packages/obsolete/jamvm/jamvm_1.3.0.bb b/packages/obsolete/jamvm/jamvm_1.3.0.bb
deleted file mode 100644
index ffdf74938f..0000000000
--- a/packages/obsolete/jamvm/jamvm_1.3.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2."
-HOMEPAGE = "http://jamvm.sourceforge.net/"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "interpreters"
-
-DEPENDS = "zlib classpath"
-RDEPENDS = "classpath (>= 0.14) classpath-common (>= 0.14)"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
-           file://heap-size.patch;patch=1"
-
-inherit autotools update-alternatives
-
-EXTRA_OECONF = "--with-classpath-install-dir=${prefix}"
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
-
-PROVIDES = "virtual/java"
-ALTERNATIVE_NAME = "java"
-ALTERNATIVE_PATH = "${bindir}/jamvm"
-ALTERNATIVE_PRIORITY = "10"
diff --git a/packages/obsolete/jamvm/jamvm_1.3.1.bb b/packages/obsolete/jamvm/jamvm_1.3.1.bb
deleted file mode 100644
index 20b1535707..0000000000
--- a/packages/obsolete/jamvm/jamvm_1.3.1.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2."
-HOMEPAGE = "http://jamvm.sourceforge.net/"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "interpreters"
-
-DEPENDS = "zlib classpath"
-RDEPENDS = "classpath (>= 0.14) classpath-common (>= 0.14)"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
-           file://jamvm-1.3.1-size-defaults.patch;patch=1"
-
-inherit autotools update-alternatives
-
-EXTRA_OECONF = "--with-classpath-install-dir=${prefix}"
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
-
-PROVIDES = "virtual/java"
-ALTERNATIVE_NAME = "java"
-ALTERNATIVE_PATH = "${bindir}/jamvm"
-ALTERNATIVE_PRIORITY = "10"
diff --git a/packages/obsolete/jamvm/jamvm_1.3.2.bb b/packages/obsolete/jamvm/jamvm_1.3.2.bb
deleted file mode 100644
index 9727fd6cda..0000000000
--- a/packages/obsolete/jamvm/jamvm_1.3.2.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2."
-HOMEPAGE = "http://jamvm.sourceforge.net/"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "interpreters"
-
-DEPENDS = "zlib classpath"
-RDEPENDS = "classpath (>= 0.14) classpath-common (>= 0.14)"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
-           file://jamvm-1.3.1-size-defaults.patch;patch=1"
-
-# This uses 32 bit arm, so force the instruction set to arm, not thumb
-ARM_INSTRUCTION_SET = "arm"
-
-inherit autotools update-alternatives
-
-EXTRA_OECONF = "--with-classpath-install-dir=${prefix}"
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
-
-PROVIDES = "virtual/java"
-ALTERNATIVE_NAME = "java"
-ALTERNATIVE_PATH = "${bindir}/jamvm"
-ALTERNATIVE_PRIORITY = "10"
diff --git a/packages/obsolete/jamvm/jamvm_1.4.1.bb b/packages/obsolete/jamvm/jamvm_1.4.1.bb
deleted file mode 100644
index 9727fd6cda..0000000000
--- a/packages/obsolete/jamvm/jamvm_1.4.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "A compact Java Virtual Machine which conforms to the JVM specification version 2."
-HOMEPAGE = "http://jamvm.sourceforge.net/"
-LICENSE = "GPL"
-PRIORITY = "optional"
-SECTION = "interpreters"
-
-DEPENDS = "zlib classpath"
-RDEPENDS = "classpath (>= 0.14) classpath-common (>= 0.14)"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz \
-           file://jamvm-1.3.1-size-defaults.patch;patch=1"
-
-# This uses 32 bit arm, so force the instruction set to arm, not thumb
-ARM_INSTRUCTION_SET = "arm"
-
-inherit autotools update-alternatives
-
-EXTRA_OECONF = "--with-classpath-install-dir=${prefix}"
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
-
-PROVIDES = "virtual/java"
-ALTERNATIVE_NAME = "java"
-ALTERNATIVE_PATH = "${bindir}/jamvm"
-ALTERNATIVE_PRIORITY = "10"
diff --git a/packages/obsolete/classpath/.mtn2git_empty b/packages/obsolete/olsr/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/obsolete/classpath/.mtn2git_empty
+++ b/packages/obsolete/olsr/.mtn2git_empty
diff --git a/packages/obsolete/classpath/files/.mtn2git_empty b/packages/obsolete/olsr/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/obsolete/classpath/files/.mtn2git_empty
+++ b/packages/obsolete/olsr/files/.mtn2git_empty
diff --git a/packages/olsr/olsrd/0.4.9-httpinfo-makefile.diff b/packages/obsolete/olsr/files/0.4.9-httpinfo-makefile.diff
index d4058f5b30..d4058f5b30 100644
--- a/packages/olsr/olsrd/0.4.9-httpinfo-makefile.diff
+++ b/packages/obsolete/olsr/files/0.4.9-httpinfo-makefile.diff
diff --git a/packages/olsr/olsrd/lib.diff b/packages/obsolete/olsr/files/lib.diff
index f3935cc53d..f3935cc53d 100644
--- a/packages/olsr/olsrd/lib.diff
+++ b/packages/obsolete/olsr/files/lib.diff
diff --git a/packages/olsr/olsr_0.3-1.bb b/packages/obsolete/olsr/olsr_0.3-1.bb
index 276e7b489d..276e7b489d 100644
--- a/packages/olsr/olsr_0.3-1.bb
+++ b/packages/obsolete/olsr/olsr_0.3-1.bb
diff --git a/packages/olsr/olsrd_0.4.10.bb b/packages/obsolete/olsr/olsrd_0.4.10.bb
index 9722ca7d8d..9722ca7d8d 100644
--- a/packages/olsr/olsrd_0.4.10.bb
+++ b/packages/obsolete/olsr/olsrd_0.4.10.bb
diff --git a/packages/olsr/olsrd_0.4.8.bb b/packages/obsolete/olsr/olsrd_0.4.8.bb
index c2b9c825b6..c2b9c825b6 100644
--- a/packages/olsr/olsrd_0.4.8.bb
+++ b/packages/obsolete/olsr/olsrd_0.4.8.bb
diff --git a/packages/olsr/olsrd_0.4.9.bb b/packages/obsolete/olsr/olsrd_0.4.9.bb
index 1f186f4bbb..1f186f4bbb 100644
--- a/packages/olsr/olsrd_0.4.9.bb
+++ b/packages/obsolete/olsr/olsrd_0.4.9.bb
diff --git a/packages/olsr/olsrd_cvs.bb b/packages/obsolete/olsr/olsrd_cvs.bb
index a6d2ff7657..a6d2ff7657 100644
--- a/packages/olsr/olsrd_cvs.bb
+++ b/packages/obsolete/olsr/olsrd_cvs.bb
diff --git a/packages/olsr/.mtn2git_empty b/packages/olsr/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/olsr/.mtn2git_empty
+++ /dev/null
diff --git a/packages/olsr/olsrd.inc b/packages/olsr/olsrd.inc
deleted file mode 100644
index e668f11847..0000000000
--- a/packages/olsr/olsrd.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "OLSR mesh routing daemon"
-HOMEPAGE = "http://www.olsr.org"
-DESCRIPTION_olsrd-libs = "OLSR mesh routing daemon -  optional libraries"
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "BSD"
-
-MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
-SRC_URI="http://www.olsr.org/releases/${MAJ_VER}/olsrd-${PV}.tar.bz2 \
-	file://init \
-	file://olsrd.conf"
-
-S = "${WORKDIR}/olsrd-${PV}"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "olsrd"
-INITSCRIPT_PARAMS = "defaults"
-EXTRA_OEMAKE="MAKEFLAGS=-I${WORKDIR}/olsrd-${PV}"
-
-
-do_configure() {
-	oe_runmake OS=linux clean
-}
-
-do_compile() {
-        oe_runmake 
-}
-
-do_install () {
-	oe_runmake OS=linux INSTALL_PREFIX=${D} STRIP=echo install install_libs
-	install -d ${D}/${sysconfdir}/init.d
-	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/olsrd
-	install -m 644 ${WORKDIR}/olsrd.conf ${D}/${sysconfdir}
-}
-
-
-PACKAGES =+ "olsrd-libs"
-FILES_olsrd-libs = "${libdir}/*.so.*"
-
-RDEPENDS_${PN} = "olsrd-libs"
-
-CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
diff --git a/packages/olsr/olsrd/.mtn2git_empty b/packages/olsr/olsrd/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/olsr/olsrd/.mtn2git_empty
+++ /dev/null
diff --git a/packages/olsr/olsrd_0.5.3.bb b/packages/olsr/olsrd_0.5.3.bb
deleted file mode 100644
index 34f20f64f8..0000000000
--- a/packages/olsr/olsrd_0.5.3.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-require olsrd.inc
-
-PR = "r0"
-
-SRC_URI="http://www.olsr.org/releases/${MAJ_VER}/olsrd-${PV}.tar.bz2 \
-        file://init \
-        file://olsrd.conf \
-        file://unbreak-makefile.patch;patch=1"
-
-do_compile() {
-	oe_runmake OS=linux clean
-	touch .depend
-	touch src/cfgparser/.depend
-	oe_runmake OS=linux all libs
-}
diff --git a/packages/obsolete/jamvm/.mtn2git_empty b/packages/olsrd/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/obsolete/jamvm/.mtn2git_empty
+++ b/packages/olsrd/.mtn2git_empty
diff --git a/packages/obsolete/jamvm/files/.mtn2git_empty b/packages/olsrd/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/obsolete/jamvm/files/.mtn2git_empty
+++ b/packages/olsrd/files/.mtn2git_empty
diff --git a/packages/olsr/olsrd/init b/packages/olsrd/files/init
index 46b2aaabd2..46b2aaabd2 100644
--- a/packages/olsr/olsrd/init
+++ b/packages/olsrd/files/init
diff --git a/packages/olsrd/files/olsrd-0.5.5-unbreak-makefile.patch b/packages/olsrd/files/olsrd-0.5.5-unbreak-makefile.patch
new file mode 100644
index 0000000000..c08a49524c
--- /dev/null
+++ b/packages/olsrd/files/olsrd-0.5.5-unbreak-makefile.patch
@@ -0,0 +1,47 @@
+Index: olsrd-a5b9cf969979/Makefile
+===================================================================
+--- olsrd-a5b9cf969979.orig/Makefile	2008-02-06 19:32:49.000000000 +0100
++++ olsrd-a5b9cf969979/Makefile	2008-06-23 15:33:35.000000000 +0200
+@@ -95,9 +95,8 @@
+ install: install_olsrd
+ 
+ install_bin:
+-		mkdir -p $(SBINDIR)
+-		install -m 755 $(EXENAME) $(SBINDIR)
+-		$(STRIP) $(SBINDIR)/$(EXENAME)
++		mkdir -p $(INSTALL_PREFIX)$(SBINDIR)
++		install -m 755 $(EXENAME) $(INSTALL_PREFIX)$(SBINDIR)
+ 
+ install_olsrd:	install_bin
+ 		@echo ========= C O N F I G U R A T I O N - F I L E ============
+@@ -109,16 +108,15 @@
+ 		@echo per default.
+ 		@echo can be found at files/olsrd.conf.default.lq
+ 		@echo ==========================================================
+-		mkdir -p $(ETCDIR)
+-		-cp -i files/olsrd.conf.default.lq $(CFGFILE)
++		mkdir -p $(INSTALL_PREFIX)$(ETCDIR)
+ 		@echo -------------------------------------------
+ 		@echo Edit $(CFGFILE) before running olsrd!!
+ 		@echo -------------------------------------------
+ 		@echo Installing manpages $(EXENAME)\(8\) and $(CFGNAME)\(5\)
+-		mkdir -p $(MANDIR)/man8/
+-		cp files/olsrd.8.gz $(MANDIR)/man8/$(EXENAME).8.gz
+-		mkdir -p $(MANDIR)/man5/
+-		cp files/olsrd.conf.5.gz $(MANDIR)/man5/$(CFGNAME).5.gz
++		mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man8/
++		cp files/olsrd.8.gz $(INSTALL_PREFIX)$(MANDIR)/man8/$(EXENAME).8.gz
++		mkdir -p $(INSTALL_PREFIX)$(MANDIR)/man5/
++		cp files/olsrd.conf.5.gz $(INSTALL_PREFIX)$(MANDIR)/man5/$(CFGNAME).5.gz
+ 
+ tags:
+ 		$(TAGCMD) -o $(TAGFILE) $(TAG_SRCS)
+@@ -140,7 +138,7 @@
+ 		$(MAKECMD) -C lib LIBDIR=$(LIBDIR) clean
+ 
+ libs_install install_libs:
+-		$(MAKECMD) -C lib LIBDIR=$(LIBDIR) install
++		$(MAKECMD) -C lib LIBDIR=$(INSTALL_PREFIX)$(LIBDIR) install
+ 
+ httpinfo:
+ 		$(MAKECMD) -C lib/httpinfo clean
diff --git a/packages/olsr/olsrd/olsrd.conf b/packages/olsrd/files/olsrd.conf
index dbd0472803..dbd0472803 100644
--- a/packages/olsr/olsrd/olsrd.conf
+++ b/packages/olsrd/files/olsrd.conf
diff --git a/packages/olsr/olsrd/unbreak-makefile.patch b/packages/olsrd/files/unbreak-makefile.patch
index cdf31df414..cdf31df414 100644
--- a/packages/olsr/olsrd/unbreak-makefile.patch
+++ b/packages/olsrd/files/unbreak-makefile.patch
diff --git a/packages/olsrd/olsrd.inc b/packages/olsrd/olsrd.inc
new file mode 100644
index 0000000000..7fd25c23dd
--- /dev/null
+++ b/packages/olsrd/olsrd.inc
@@ -0,0 +1,70 @@
+DESCRIPTION = "OLSR mesh routing daemon"
+HOMEPAGE = "http://www.olsr.org"
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "BSD"
+
+MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "http://www.olsr.org/releases/${MAJ_VER}/olsrd-${PV}.tar.bz2 \
+	file://init \
+	file://olsrd.conf"
+
+S = "${WORKDIR}/olsrd-${PV}"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "olsrd"
+INITSCRIPT_PARAMS = "defaults"
+EXTRA_OEMAKE = "MAKEFLAGS=-I${WORKDIR}/olsrd-${PV}"
+
+do_configure() {
+	oe_runmake OS=linux clean
+}
+
+do_compile() {
+  oe_runmake OS=linux clean
+  touch .depend
+  touch src/cfgparser/.depend
+  oe_runmake OS=linux all libs
+}
+
+do_install () {
+	oe_runmake OS=linux INSTALL_PREFIX=${D} STRIP=echo install install_libs
+
+	install -d ${D}/${sysconfdir}/init.d
+	install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/olsrd
+	install -m 644 ${WORKDIR}/olsrd.conf ${D}/${sysconfdir}
+}
+
+PACKAGES =+ "\
+  olsrd-plugin-dyngw \
+  olsrd-plugin-dyngw-plain \
+  olsrd-plugin-httpinfo \
+  olsrd-plugin-nameservice \
+  olsrd-plugin-quagga \
+  olsrd-plugin-tas \
+  olsrd-plugin-pgraph \
+  olsrd-plugin-bmf \
+  olsrd-plugin-txtinfo \
+  olsrd-plugin-arprefresh \
+  olsrd-plugin-secure \
+  olsrd-plugin-dotdraw \
+  olsrd-plugin-mini \
+  "
+
+FILES_olsrd-plugin-dyngw = "${libdir}/${PN}_dyn_gw.so.*"
+FILES_olsrd-plugin-dyngw-plain = "${libdir}/${PN}_dyn_gw_plain.so.*"
+FILES_olsrd-plugin-httpinfo = "${libdir}/${PN}_httpinfo.so.*"
+FILES_olsrd-plugin-nameservice = "${libdir}/${PN}_nameservice.so.*"
+FILES_olsrd-plugin-quagga = "${libdir}/${PN}_quagga.so.*"
+FILES_olsrd-plugin-tas = "${libdir}/${PN}_tas.so.*"
+FILES_olsrd-plugin-pgraph = "${libdir}/${PN}_pgraph.so.*"
+FILES_olsrd-plugin-bmf = "${libdir}/${PN}_bmf.so.*"
+FILES_olsrd-plugin-txtinfo = "${libdir}/${PN}_txtinfo.so.*"
+FILES_olsrd-plugin-arprefresh = "${libdir}/${PN}_arprefresh.so.*"
+FILES_olsrd-plugin-dotdraw = "${libdir}/${PN}_dot_draw.so.*"
+FILES_olsrd-plugin-secure = "${libdir}/${PN}_secure.so.*"
+FILES_olsrd-plugin-mini = "${libdir}/${PN}_mini.so.*"
+
+CONFFILES_${PN} = "${sysconfdir}/olsrd.conf"
+
diff --git a/packages/olsrd/olsrd_0.5.3.bb b/packages/olsrd/olsrd_0.5.3.bb
new file mode 100644
index 0000000000..1af0f257fd
--- /dev/null
+++ b/packages/olsrd/olsrd_0.5.3.bb
@@ -0,0 +1,6 @@
+require olsrd.inc
+
+PR = "r1"
+
+SRC_URI += "file://unbreak-makefile.patch;patch=1"
+
diff --git a/packages/olsrd/olsrd_0.5.5.bb b/packages/olsrd/olsrd_0.5.5.bb
new file mode 100644
index 0000000000..d87197481e
--- /dev/null
+++ b/packages/olsrd/olsrd_0.5.5.bb
@@ -0,0 +1,7 @@
+require olsrd.inc
+PR = "r0"
+
+# Oddity in the 0.5.5 source tarball.
+S = "${WORKDIR}/olsrd-a5b9cf969979"
+
+SRC_URI += "file://olsrd-0.5.5-unbreak-makefile.patch;patch=1"