From b76ec3067852c6155905c17a8b4524b42b0ca36c Mon Sep 17 00:00:00 2001
From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Thu, 18 Aug 2005 14:08:05 +0000
Subject: add JNI headers into staging area

---
 packages/classpath/classpath_0.14.bb | 7 ++++++-
 packages/classpath/classpath_0.15.bb | 7 ++++++-
 packages/classpath/classpath_0.17.bb | 7 ++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/packages/classpath/classpath_0.14.bb b/packages/classpath/classpath_0.14.bb
index ec29ad9cb8..c1c266c994 100644
--- a/packages/classpath/classpath_0.14.bb
+++ b/packages/classpath/classpath_0.14.bb
@@ -4,7 +4,7 @@ LICENSE = "Classpath"
 PRIORITY = "optional"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (${PV})"
@@ -22,6 +22,11 @@ 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/classpath/classpath_0.15.bb b/packages/classpath/classpath_0.15.bb
index ec29ad9cb8..c1c266c994 100644
--- a/packages/classpath/classpath_0.15.bb
+++ b/packages/classpath/classpath_0.15.bb
@@ -4,7 +4,7 @@ LICENSE = "Classpath"
 PRIORITY = "optional"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (${PV})"
@@ -22,6 +22,11 @@ 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/classpath/classpath_0.17.bb b/packages/classpath/classpath_0.17.bb
index ec29ad9cb8..fb41d7e9d8 100644
--- a/packages/classpath/classpath_0.17.bb
+++ b/packages/classpath/classpath_0.17.bb
@@ -4,7 +4,7 @@ LICENSE = "Classpath"
 PRIORITY = "optional"
 MAINTAINER = "Rene Wagner <rw@handhelds.org>"
 SECTION = "libs"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "glib-2.0 gtk+ libart-lgpl pango xtst jikes-native zip-native"
 RDEPENDS_${PN} = "${PN}-common (${PV})"
@@ -22,6 +22,11 @@ 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}
-- 
cgit v1.2.3


From 2911f265f90bd0ad30e1ecf472ddb0c5803dc203 Mon Sep 17 00:00:00 2001
From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Thu, 18 Aug 2005 14:17:29 +0000
Subject: add main classes (bootclass) into staging area

---
 packages/kaffe/kaffeh-native_1.1.5.bb | 5 ++++-
 packages/kaffe/kaffeh-native_cvs.bb   | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/kaffe/kaffeh-native_1.1.5.bb b/packages/kaffe/kaffeh-native_1.1.5.bb
index dccc7559f4..569301f3f7 100644
--- a/packages/kaffe/kaffeh-native_1.1.5.bb
+++ b/packages/kaffe/kaffeh-native_1.1.5.bb
@@ -1,6 +1,6 @@
 SRC_URI = "http://www.kaffe.org/ftp/pub/kaffe/v1.1.x-development/kaffe-${PV}.tar.gz"
 S = "${WORKDIR}/kaffe-${PV}"
-PR = "r2"
+PR = "r3"
 
 include kaffe.inc
 
@@ -22,4 +22,7 @@ EXTRA_OECONF = "--disable-alsatest \
 
 do_stage() {
 	install -m 0755 kaffe/kaffeh/kaffeh ${STAGING_BINDIR}/
+
+	install -d ${STAGING_DATADIR}/kaffeh
+	install -m 0755 libraries/javalib/*.jar ${STAGING_DATADIR}/kaffeh/
 }
diff --git a/packages/kaffe/kaffeh-native_cvs.bb b/packages/kaffe/kaffeh-native_cvs.bb
index 3a67db2759..2b10385e82 100644
--- a/packages/kaffe/kaffeh-native_cvs.bb
+++ b/packages/kaffe/kaffeh-native_cvs.bb
@@ -1,6 +1,6 @@
 PV = "1.1.5+cvs${CVSDATE}"
 DEFAULT_PREFERENCE = "-1"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "cvs://readonly:readonly@cvs.kaffe.org/cvs/kaffe;module=kaffe"
 S = "${WORKDIR}/kaffe"
@@ -25,4 +25,8 @@ EXTRA_OECONF = "--disable-alsatest \
 
 do_stage() {
 	install -m 0755 kaffe/kaffeh/kaffeh ${STAGING_BINDIR}/
+
+        install -d ${STAGING_DATADIR}/kaffeh
+        install -m 0755 libraries/javalib/*.jar ${STAGING_DATADIR}/kaffeh/
 }
+
-- 
cgit v1.2.3


From 9412a268d68b3411bb9129a1fea49644102a256c Mon Sep 17 00:00:00 2001
From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Thu, 18 Aug 2005 14:19:39 +0000
Subject: add zip-native to DEPENDS

---
 packages/kaffe/kaffe.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kaffe/kaffe.inc b/packages/kaffe/kaffe.inc
index 0cede21082..ea308f1043 100644
--- a/packages/kaffe/kaffe.inc
+++ b/packages/kaffe/kaffe.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Kaffe is a clean room implementation of the Java Virtual Machine"
 HOMEPAGE = "http://www.kaffe.org/"
 LICENSE  = "GPL LGPL W3C Classpath BSD"
 
-DEPENDS = "jikes-native fastjar-native libffi"
+DEPENDS = "jikes-native fastjar-native libffi zip-native"
 
 SRC_URI += "file://disable-automake-checks.patch;patch=1"
 
-- 
cgit v1.2.3


From 1ed1b4e67ff7d56d51a551a9c8f9721a652710ca Mon Sep 17 00:00:00 2001
From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Thu, 18 Aug 2005 14:59:58 +0000
Subject: add avetanabt. now we can use bluetooth with java (JSR-82)

---
 packages/avetanabt/.mtn2git_empty   |  0
 packages/avetanabt/avetanabt_svn.bb | 61 +++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 packages/avetanabt/.mtn2git_empty
 create mode 100644 packages/avetanabt/avetanabt_svn.bb

diff --git a/packages/avetanabt/.mtn2git_empty b/packages/avetanabt/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/avetanabt/avetanabt_svn.bb b/packages/avetanabt/avetanabt_svn.bb
new file mode 100644
index 0000000000..3f17a190e8
--- /dev/null
+++ b/packages/avetanabt/avetanabt_svn.bb
@@ -0,0 +1,61 @@
+DESCRIPTION = "avetanaBT: Bluetooth API implementation for Java (JSR-82)"
+SECTION = "devel"
+DEPENDS = "findutils-native jikes-native kaffeh-native fastjar-native bluez-libs classpath"
+#RDEPENDS = "bluez-utils"
+# Matthias Ringwald <mringwal@inf.ethz.ch> was helping me in the first phase. Thanks.
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "GPL"
+
+PV = "0.0cvs${CVSDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/avetanabt;module=avetanabt"
+
+S = "${WORKDIR}/avetanabt"
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${libdir}/libavetanaBT.so ${datadir}/avetanabt/avetanaBT.jar"
+
+do_compile() {
+
+  # doing nearly the same as in Makefile written...
+
+  mkdir -p build
+  rm -fr build/*
+
+  # javac -> jikes
+  ${STAGING_BINDIR}/find {de,javax,com} -iname *.java > file.list
+  ${STAGING_BINDIR}/jikes -verbose --bootclasspath ${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar -d build @file.list
+
+  # jar -> fastjar
+  cd build
+  ${STAGING_BINDIR}/fastjar -cf ../avetanaBT.jar de javax com
+  cd ..
+
+  # JNI generated header file - de_avetana_bluetooth_stack_BlueZ.h
+  # javah -> kaffeh
+  cd c
+  ${STAGING_BINDIR}/kaffeh -jni -classpath ../avetanaBT.jar:${STAGING_DIR}/${BUILD_SYS}/share/kaffeh/rt.jar de.avetana.bluetooth.stack.BlueZ
+
+  # Native language (C) library - libavetanaBT.so
+  ${CXX} ${CXXFLAGS} -shared -lbluetooth -I${STAGING_INCDIR}/classpath BlueZ.cpp -o ../libavetanaBT.so ${LDFLAGS}
+  cd ..
+
+}
+
+do_stage() {
+
+  install -d ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt
+  install avetanaBT.jar ${STAGING_DIR}/${BUILD_SYS}/share/avetanabt/
+
+}
+
+do_install() {
+
+  install -d ${D}${libdir}
+  install -m 0755 libavetanaBT.so ${D}${libdir}/
+
+  install -d ${D}${datadir}/avetanabt
+  install avetanaBT.jar ${D}${datadir}/avetanabt/
+ 
+}
-- 
cgit v1.2.3


From 75d01547a53ad17ec85783eb778eea6df9478122 Mon Sep 17 00:00:00 2001
From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Thu, 18 Aug 2005 16:24:08 +0000
Subject: add HOMEPAGE for further informations

---
 packages/avetanabt/avetanabt_svn.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/avetanabt/avetanabt_svn.bb b/packages/avetanabt/avetanabt_svn.bb
index 3f17a190e8..08adcbbdfd 100644
--- a/packages/avetanabt/avetanabt_svn.bb
+++ b/packages/avetanabt/avetanabt_svn.bb
@@ -5,6 +5,7 @@ DEPENDS = "findutils-native jikes-native kaffeh-native fastjar-native bluez-libs
 # Matthias Ringwald <mringwal@inf.ethz.ch> was helping me in the first phase. Thanks.
 MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
 LICENSE = "GPL"
+HOMEPAGE = "http://sourceforge.net/projects/avetanabt/"
 
 PV = "0.0cvs${CVSDATE}"
 PR = "r0"
-- 
cgit v1.2.3


From 6349c431fbf6167ddcc29e42b0d28733bc27b8ad Mon Sep 17 00:00:00 2001
From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Thu, 18 Aug 2005 20:56:32 +0000
Subject: add apr and apr-util: needed for subversion

---
 packages/apr/.mtn2git_empty    |  0
 packages/apr/apr-util_1.1.2.bb | 22 ++++++++++++++++++++++
 packages/apr/apr_1.1.1.bb      | 19 +++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 packages/apr/.mtn2git_empty
 create mode 100644 packages/apr/apr-util_1.1.2.bb
 create mode 100644 packages/apr/apr_1.1.1.bb

diff --git a/packages/apr/.mtn2git_empty b/packages/apr/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_1.1.2.bb
new file mode 100644
index 0000000000..e9f9587420
--- /dev/null
+++ b/packages/apr/apr-util_1.1.2.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Apache Portable Runtime (APR) companion library"
+SECTION = "libs"
+DEPENDS = "apr expat gdbm"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r0"
+
+# apache mirrors?
+SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.gz"
+
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
+
+inherit autotools lib_package binconfig
+
+do_configure() {
+  oe_runconf
+}
+
+do_stage() {
+  oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR}
+}
diff --git a/packages/apr/apr_1.1.1.bb b/packages/apr/apr_1.1.1.bb
new file mode 100644
index 0000000000..f67f31005e
--- /dev/null
+++ b/packages/apr/apr_1.1.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Apache Portable Runtime (APR) library"
+SECTION = "libs"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r0"
+
+# apache mirrors?
+SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.bz2"
+
+inherit autotools lib_package binconfig
+
+do_configure() {
+  oe_runconf
+}
+
+do_stage() {
+  oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR}
+}
-- 
cgit v1.2.3


From 7730b987f7ba6aa37d350102d52277032e94df9b Mon Sep 17 00:00:00 2001
From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Thu, 18 Aug 2005 21:01:24 +0000
Subject: disapproval of revision d272754d87c0dd9b0943c987e3ec44b5e6ff7864

---
 packages/apr/.mtn2git_empty    |  0
 packages/apr/apr-util_1.1.2.bb | 22 ----------------------
 packages/apr/apr_1.1.1.bb      | 19 -------------------
 3 files changed, 41 deletions(-)
 delete mode 100644 packages/apr/.mtn2git_empty
 delete mode 100644 packages/apr/apr-util_1.1.2.bb
 delete mode 100644 packages/apr/apr_1.1.1.bb

diff --git a/packages/apr/.mtn2git_empty b/packages/apr/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_1.1.2.bb
deleted file mode 100644
index e9f9587420..0000000000
--- a/packages/apr/apr-util_1.1.2.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Apache Portable Runtime (APR) companion library"
-SECTION = "libs"
-DEPENDS = "apr expat gdbm"
-MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
-LICENSE = "Apache License, Version 2.0"
-
-PR = "r0"
-
-# apache mirrors?
-SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.gz"
-
-EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
-
-inherit autotools lib_package binconfig
-
-do_configure() {
-  oe_runconf
-}
-
-do_stage() {
-  oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR}
-}
diff --git a/packages/apr/apr_1.1.1.bb b/packages/apr/apr_1.1.1.bb
deleted file mode 100644
index f67f31005e..0000000000
--- a/packages/apr/apr_1.1.1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "Apache Portable Runtime (APR) library"
-SECTION = "libs"
-MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
-LICENSE = "Apache License, Version 2.0"
-
-PR = "r0"
-
-# apache mirrors?
-SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.bz2"
-
-inherit autotools lib_package binconfig
-
-do_configure() {
-  oe_runconf
-}
-
-do_stage() {
-  oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR}
-}
-- 
cgit v1.2.3


From 70746d76649dce56539d0040bcade781fa083cd6 Mon Sep 17 00:00:00 2001
From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Thu, 18 Aug 2005 21:02:46 +0000
Subject: add apr and apr-util: needed for subversion

---
 packages/apr/.mtn2git_empty    |  0
 packages/apr/apr-util_1.1.2.bb | 26 ++++++++++++++++++++++++++
 packages/apr/apr_1.1.1.bb      | 23 +++++++++++++++++++++++
 3 files changed, 49 insertions(+)
 create mode 100644 packages/apr/.mtn2git_empty
 create mode 100644 packages/apr/apr-util_1.1.2.bb
 create mode 100644 packages/apr/apr_1.1.1.bb

diff --git a/packages/apr/.mtn2git_empty b/packages/apr/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_1.1.2.bb
new file mode 100644
index 0000000000..35cc787e6c
--- /dev/null
+++ b/packages/apr/apr-util_1.1.2.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Apache Portable Runtime (APR) companion library"
+SECTION = "libs"
+DEPENDS = "apr expat gdbm"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r0"
+
+# apache mirrors?
+SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.gz"
+
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
+
+inherit autotools lib_package binconfig
+
+do_configure() {
+
+  oe_runconf
+
+}
+
+do_stage() {
+
+  oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR}
+
+}
diff --git a/packages/apr/apr_1.1.1.bb b/packages/apr/apr_1.1.1.bb
new file mode 100644
index 0000000000..74dbe5185a
--- /dev/null
+++ b/packages/apr/apr_1.1.1.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Apache Portable Runtime (APR) library"
+SECTION = "libs"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r0"
+
+# apache mirrors?
+SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.bz2"
+
+inherit autotools lib_package binconfig
+
+do_configure() {
+
+  oe_runconf
+
+}
+
+do_stage() {
+
+  oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR}
+
+}
-- 
cgit v1.2.3


From 9c848958eea9264b2c2d9f5fdcd69fabc7bf7db1 Mon Sep 17 00:00:00 2001
From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Thu, 18 Aug 2005 21:09:05 +0000
Subject: disapproval of revision a6b994aea0347efce0b57615068f903230d4f9d7

---
 packages/apr/.mtn2git_empty    |  0
 packages/apr/apr-util_1.1.2.bb | 26 --------------------------
 packages/apr/apr_1.1.1.bb      | 23 -----------------------
 3 files changed, 49 deletions(-)
 delete mode 100644 packages/apr/.mtn2git_empty
 delete mode 100644 packages/apr/apr-util_1.1.2.bb
 delete mode 100644 packages/apr/apr_1.1.1.bb

diff --git a/packages/apr/.mtn2git_empty b/packages/apr/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_1.1.2.bb
deleted file mode 100644
index 35cc787e6c..0000000000
--- a/packages/apr/apr-util_1.1.2.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DESCRIPTION = "Apache Portable Runtime (APR) companion library"
-SECTION = "libs"
-DEPENDS = "apr expat gdbm"
-MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
-LICENSE = "Apache License, Version 2.0"
-
-PR = "r0"
-
-# apache mirrors?
-SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.gz"
-
-EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
-
-inherit autotools lib_package binconfig
-
-do_configure() {
-
-  oe_runconf
-
-}
-
-do_stage() {
-
-  oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR}
-
-}
diff --git a/packages/apr/apr_1.1.1.bb b/packages/apr/apr_1.1.1.bb
deleted file mode 100644
index 74dbe5185a..0000000000
--- a/packages/apr/apr_1.1.1.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "Apache Portable Runtime (APR) library"
-SECTION = "libs"
-MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
-LICENSE = "Apache License, Version 2.0"
-
-PR = "r0"
-
-# apache mirrors?
-SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.bz2"
-
-inherit autotools lib_package binconfig
-
-do_configure() {
-
-  oe_runconf
-
-}
-
-do_stage() {
-
-  oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR}
-
-}
-- 
cgit v1.2.3


From 81249f9f66d5ba90d834c89d929968874d960904 Mon Sep 17 00:00:00 2001
From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Thu, 18 Aug 2005 21:10:57 +0000
Subject: add apr and apr-util: needed for subversion

---
 packages/apr/apr-util_1.1.2.bb | 4 ----
 packages/apr/apr_1.1.1.bb      | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_1.1.2.bb
index 35cc787e6c..e9f9587420 100644
--- a/packages/apr/apr-util_1.1.2.bb
+++ b/packages/apr/apr-util_1.1.2.bb
@@ -14,13 +14,9 @@ EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGI
 inherit autotools lib_package binconfig
 
 do_configure() {
-
   oe_runconf
-
 }
 
 do_stage() {
-
   oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR}
-
 }
diff --git a/packages/apr/apr_1.1.1.bb b/packages/apr/apr_1.1.1.bb
index 74dbe5185a..f67f31005e 100644
--- a/packages/apr/apr_1.1.1.bb
+++ b/packages/apr/apr_1.1.1.bb
@@ -11,13 +11,9 @@ SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.bz2"
 inherit autotools lib_package binconfig
 
 do_configure() {
-
   oe_runconf
-
 }
 
 do_stage() {
-
   oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR}
-
 }
-- 
cgit v1.2.3


From 3d470bbf956ba5a3c2739528f4db8136401b208c Mon Sep 17 00:00:00 2001
From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Thu, 18 Aug 2005 21:14:13 +0000
Subject: add apr and apr-util: needed for subversion

---
 packages/apr/.mtn2git_empty    |  0
 packages/apr/apr-util_1.1.2.bb | 22 ++++++++++++++++++++++
 packages/apr/apr_1.1.1.bb      | 19 +++++++++++++++++++
 3 files changed, 41 insertions(+)
 create mode 100644 packages/apr/.mtn2git_empty
 create mode 100644 packages/apr/apr-util_1.1.2.bb
 create mode 100644 packages/apr/apr_1.1.1.bb

diff --git a/packages/apr/.mtn2git_empty b/packages/apr/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/apr/apr-util_1.1.2.bb b/packages/apr/apr-util_1.1.2.bb
new file mode 100644
index 0000000000..e9f9587420
--- /dev/null
+++ b/packages/apr/apr-util_1.1.2.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Apache Portable Runtime (APR) companion library"
+SECTION = "libs"
+DEPENDS = "apr expat gdbm"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r0"
+
+# apache mirrors?
+SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.gz"
+
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR} --with-dbm=gdbm --with-gdbm=${STAGING_DIR}/${HOST_SYS} --with-expat=${STAGING_DIR}/${HOST_SYS}"
+
+inherit autotools lib_package binconfig
+
+do_configure() {
+  oe_runconf
+}
+
+do_stage() {
+  oe_libinstall -a -so -C .libs libaprutil-1 ${STAGING_LIBDIR}
+}
diff --git a/packages/apr/apr_1.1.1.bb b/packages/apr/apr_1.1.1.bb
new file mode 100644
index 0000000000..f67f31005e
--- /dev/null
+++ b/packages/apr/apr_1.1.1.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Apache Portable Runtime (APR) library"
+SECTION = "libs"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r0"
+
+# apache mirrors?
+SRC_URI = "http://mirror.switch.ch/mirror/apache/dist/apr/${P}.tar.bz2"
+
+inherit autotools lib_package binconfig
+
+do_configure() {
+  oe_runconf
+}
+
+do_stage() {
+  oe_libinstall -a -so -C .libs libapr-1 ${STAGING_LIBDIR}
+}
-- 
cgit v1.2.3


From 225ba4c1050268ba2ded658ac0bb3118614d9151 Mon Sep 17 00:00:00 2001
From: Mustafa Yuecel <yuecelm@ee.ethz.ch>
Date: Thu, 18 Aug 2005 21:20:51 +0000
Subject: add subversion

---
 packages/subversion/.mtn2git_empty                 |  0
 packages/subversion/files/.mtn2git_empty           |  0
 .../files/disable-revision-install.patch           | 22 ++++++++++++++++++++++
 packages/subversion/subversion_1.2.0.bb            | 18 ++++++++++++++++++
 4 files changed, 40 insertions(+)
 create mode 100644 packages/subversion/.mtn2git_empty
 create mode 100644 packages/subversion/files/.mtn2git_empty
 create mode 100644 packages/subversion/files/disable-revision-install.patch
 create mode 100644 packages/subversion/subversion_1.2.0.bb

diff --git a/packages/subversion/.mtn2git_empty b/packages/subversion/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/subversion/files/.mtn2git_empty b/packages/subversion/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/subversion/files/disable-revision-install.patch b/packages/subversion/files/disable-revision-install.patch
new file mode 100644
index 0000000000..a1c60654cb
--- /dev/null
+++ b/packages/subversion/files/disable-revision-install.patch
@@ -0,0 +1,22 @@
+--- subversion-1.2.0-r0/Makefile.in.old	2005-07-17 22:28:21.898728312 +0200
++++ subversion-1.2.0-r0/Makefile.in	2005-07-17 22:30:05.361999504 +0200
+@@ -260,7 +260,7 @@
+ clean: external-clean local-clean
+ distclean: external-distclean local-distclean
+ extraclean: external-extraclean local-extraclean
+-install: external-install local-install revision-install
++install: external-install local-install #revision-install
+ 
+ @INCLUDE_OUTPUTS@
+ 
+@@ -320,8 +320,8 @@
+ local-install: @INSTALL_RULES@
+ 
+ ### HACK!! Find a better way to do this
+-revision-install:
+-	subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
++#revision-install:
++#	subversion/svnversion/svnversion $(top_srcdir) /repos/svn/trunk > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
+ 
+ install-static: @INSTALL_STATIC_RULES@
+ 
diff --git a/packages/subversion/subversion_1.2.0.bb b/packages/subversion/subversion_1.2.0.bb
new file mode 100644
index 0000000000..790a552666
--- /dev/null
+++ b/packages/subversion/subversion_1.2.0.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "The Subversion (svn) client"
+SECTION = "console/network"
+DEPENDS = "apr-util"
+MAINTAINER = "Mustafa Yuecel <yuecelm@ee.ethz.ch>"
+LICENSE = "GPL"
+
+PR = "r0"
+
+SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
+	   file://disable-revision-install.patch;patch=1"
+
+EXTRA_OECONF = "--without-neon --without-berkeley-db --without-apxs --without-apache --without-swig --with-apr=${STAGING_BINDIR} --with-apr-util=${STAGING_BINDIR}"
+
+inherit autotools
+
+do_configure() {
+  oe_runconf
+}
-- 
cgit v1.2.3