From 8e5f27936a45def2387f57e492c9aa4ca6bda97f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com>
Date: Wed, 9 Jun 2010 13:01:53 +0000
Subject: [PATCH]  - build haproxy 1.4.6

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36160 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 buildout/profiles/official-2.12.cfg    |  4 ++--
 buildout/profiles/official.cfg         |  2 +-
 buildout/software-profiles/haproxy.cfg | 17 +++++++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/buildout/profiles/official-2.12.cfg b/buildout/profiles/official-2.12.cfg
index ac42c7dc58..cdba849636 100644
--- a/buildout/profiles/official-2.12.cfg
+++ b/buildout/profiles/official-2.12.cfg
@@ -34,8 +34,8 @@ parts =
   itools-build
   apache
   memcached
-#  ocropus
-#  haproxy
+  ocropus
+  haproxy
   varnish
   mysql-tritonn-5.0
   mysql-python
diff --git a/buildout/profiles/official.cfg b/buildout/profiles/official.cfg
index 4d2eaf8e81..54a9ff5671 100644
--- a/buildout/profiles/official.cfg
+++ b/buildout/profiles/official.cfg
@@ -28,7 +28,7 @@ parts =
   apache
   memcached
   ocropus
-#  haproxy
+  haproxy
   varnish
   mysql-tritonn-5.0
   zope-2.8
diff --git a/buildout/software-profiles/haproxy.cfg b/buildout/software-profiles/haproxy.cfg
index 17716fd4f0..a16b2ede94 100644
--- a/buildout/software-profiles/haproxy.cfg
+++ b/buildout/software-profiles/haproxy.cfg
@@ -2,9 +2,14 @@
 parts = haproxy
 
 [haproxy]
-recipe = hexagonit.recipe.cmmi
-url = http://haproxy.1wt.eu/download/1.3/src/haproxy-1.3.23.tar.gz
-md5sum = 4ffe926ccf4f4d53f149290eb001fad5
-configure-command =
-make-targets =
-  linux26
+recipe = erp5.recipe.softwareinstance
+url = http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.6.tar.gz
+# source-directory-contains is a hack for zc.recipe.cmmi
+source-directory-contains = Makefile
+run-configure = false
+# XXX-Luke: autodetection shall be provided by erp5.recipe.softwareinstance
+#           with possible overriding customisation
+# linux26 might be better target, but on this level portability is a must
+make-options = TARGET=generic
+make-install-options = TARGET=generic
+make-install-destination-parameter = PREFIX=
-- 
2.30.9