From 5a881d0d782cb69b7754f7438ba66b703f4884ba Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 10 Sep 2009 12:49:38 -0700
Subject: cherokee: Add new version 0.99.24

* Use INC_PR
* Add new recipe for 0.99.24
* Add --with-mysql configure option to point
  to staging area. Otherwise with build machines
  having local installation of mysql-dev, cherokee
  configures itself to use the headers from /usr/include/mysql

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Cliff Brake <cbrake@bec-systems.com>
---
 conf/checksums.ini                   |  4 ++++
 recipes/cherokee/cherokee.inc        |  1 +
 recipes/cherokee/cherokee_0.4.29.bb  |  2 +-
 recipes/cherokee/cherokee_0.5.3.bb   |  3 +--
 recipes/cherokee/cherokee_0.5.5.bb   |  3 +--
 recipes/cherokee/cherokee_0.98.0.bb  |  2 +-
 recipes/cherokee/cherokee_0.99.24.bb | 12 ++++++++++++
 7 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 recipes/cherokee/cherokee_0.99.24.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 7d3bf188bc..c5ce891f13 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3682,6 +3682,10 @@ sha256=e9c6feee2a626a38cd69c726ed31ffbbf55d288386f50fe6f90fa63de410d67a
 md5=9f1876232bdfdfa5b4e02ff0636e7241
 sha256=701721a58aa79b93a4f3aaf633f0b842a05b07c73996cd44e78a383a7387226d
 
+[http://www.cherokee-project.com/download/0.99/0.99.24/cherokee-0.99.24.tar.gz]
+md5=5afed8bdd6020dc5bf0ba9ec83b947f1
+sha256=0581b5eafba9a993d035467c51bfa85fa76ca46043fab95e6f7592ad8f4f38e1
+
 [http://www.call-with-current-continuation.org/chicken-2.6.tar.gz]
 md5=332edae079bb34d815369f4ba5181983
 sha256=32385c5393c7376035f911f3e887351b1ce8fb6e56498cc4258815bc6db06326
diff --git a/recipes/cherokee/cherokee.inc b/recipes/cherokee/cherokee.inc
index 58ffe1ac94..16ecfbfe1f 100644
--- a/recipes/cherokee/cherokee.inc
+++ b/recipes/cherokee/cherokee.inc
@@ -4,6 +4,7 @@ HOMEPAGE = "http://www.cherokee-project.com/"
 SECTION = "network"
 LICENSE = "GPL"
 DEPENDS = "libpcre gnutls"
+INC_PR = "r7"
 
 SRC_URI = "http://www.cherokee-project.com/download/0.5/${PV}/cherokee-${PV}.tar.gz \
            file://cherokee.init "
diff --git a/recipes/cherokee/cherokee_0.4.29.bb b/recipes/cherokee/cherokee_0.4.29.bb
index 42eae684e7..a2c43e3c78 100644
--- a/recipes/cherokee/cherokee_0.4.29.bb
+++ b/recipes/cherokee/cherokee_0.4.29.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://www.0x50.org/download/0.4/${PV}/${P}.tar.gz \
 	  file://Makefile.in.patch;patch=1 \
 	  file://Makefile.cget.patch;patch=1 \
 	  file://util.patch;patch=1"
-PR = "r1"
+PR = "${INC_PR}.0"
 
 inherit autotools
 
diff --git a/recipes/cherokee/cherokee_0.5.3.bb b/recipes/cherokee/cherokee_0.5.3.bb
index 1fe9df46c0..a6e14e75c8 100644
--- a/recipes/cherokee/cherokee_0.5.3.bb
+++ b/recipes/cherokee/cherokee_0.5.3.bb
@@ -1,11 +1,10 @@
-PR = "r7"
-
 SRC_URI_append = "file://configure.patch;patch=1 \
                   file://Makefile.in.patch;patch=1 \
                   file://Makefile.cget.patch;patch=1 \
                   file://util.patch;patch=1"
 
 require cherokee.inc
+PR = "${INC_PR}.0"
 
 do_configure() {
         gnu-configize
diff --git a/recipes/cherokee/cherokee_0.5.5.bb b/recipes/cherokee/cherokee_0.5.5.bb
index 73b4d52418..c12f519622 100644
--- a/recipes/cherokee/cherokee_0.5.5.bb
+++ b/recipes/cherokee/cherokee_0.5.5.bb
@@ -1,5 +1,3 @@
-PR = "r4"
-
 SRC_URI_append = "file://configure.in.patch;patch=1 \
                   file://Makefile.am.patch;patch=1"
 
@@ -9,3 +7,4 @@ do_install_prepend () {
 }
 
 require cherokee.inc
+PR = "${INC_PR}.0"
diff --git a/recipes/cherokee/cherokee_0.98.0.bb b/recipes/cherokee/cherokee_0.98.0.bb
index a8ebaa8f72..264e7a54af 100644
--- a/recipes/cherokee/cherokee_0.98.0.bb
+++ b/recipes/cherokee/cherokee_0.98.0.bb
@@ -1,6 +1,6 @@
 require cherokee.inc
 
-PR = "r1"
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://www.cherokee-project.com/download/0.98/${PV}/cherokee-${PV}.tar.gz \
            file://cherokee.init "
diff --git a/recipes/cherokee/cherokee_0.99.24.bb b/recipes/cherokee/cherokee_0.99.24.bb
new file mode 100644
index 0000000000..b5d016006f
--- /dev/null
+++ b/recipes/cherokee/cherokee_0.99.24.bb
@@ -0,0 +1,12 @@
+require cherokee.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "http://www.cherokee-project.com/download/0.99/${PV}/cherokee-${PV}.tar.gz \
+           file://cherokee.init "
+
+CONFFILES_${PN} = " \
+${sysconfdir}/cherokee/cherokee.conf \
+${sysconfdir}/init.d/cherokee \
+"
+EXTRA_OECONF += "--with-mysql=${STAGING_INCDIR}/mysql"
-- 
cgit v1.2.3