From ffd545fd5cd5e7abb6f9ebe1a968d52c2937913f Mon Sep 17 00:00:00 2001
From: Tiago Gomes <tiago.gomes@codethink.co.uk>
Date: Fri, 13 Feb 2015 16:14:48 +0000
Subject: strata/lorry: update to apr 1.5.1 and apr-util 1.5.4

This commit also changes these packages to be built from the git repos
created from the upstream svn ones, instead of tarball imports.
---
 strata/lorry.morph                     | 29 +++++++++++++++--------------
 strata/lorry/libapr-util-tarball.morph |  5 -----
 strata/lorry/libapr-util.morph         |  7 +++++++
 strata/lorry/libapr.morph              | 21 +++++++++++++++++++++
 4 files changed, 43 insertions(+), 19 deletions(-)
 delete mode 100644 strata/lorry/libapr-util-tarball.morph
 create mode 100644 strata/lorry/libapr-util.morph
 create mode 100644 strata/lorry/libapr.morph

diff --git a/strata/lorry.morph b/strata/lorry.morph
index 17f845cf..c66b8502 100644
--- a/strata/lorry.morph
+++ b/strata/lorry.morph
@@ -38,18 +38,19 @@ chunks:
   ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: libapr-tarball
-  repo: upstream:libapr-tarball
-  ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db
-  unpetrify-ref: baserock/morph
+- name: libapr
+  morph: strata/lorry/libapr.morph
+  repo: upstream:libapr
+  ref: 10835ec9a2d8bb9f7b867d15f29984d29744f028
+  unpetrify-ref: 1.5.1
   build-depends: []
-- name: libapr-util-tarball
-  morph: strata/lorry/libapr-util-tarball.morph
-  repo: upstream:libapr-util-tarball
-  ref: daba269ee5a262cc23621b3ee37ed368d2a2b69b
-  unpetrify-ref: baserock/morph
+- name: libapr-util
+  morph: strata/lorry/libapr-util.morph
+  repo: upstream:libapr-util
+  ref: 718a507e2e33d87ab15ff80cfe80aea8ae6c7163
+  unpetrify-ref: 1.5.4
   build-depends:
-  - libapr-tarball
+  - libapr
 - name: perl-dbi-tarball
   morph: strata/lorry/perl-dbi-tarball.morph
   repo: upstream:perl-dbi-tarball
@@ -67,8 +68,8 @@ chunks:
   ref: 6f61a1acd01dc2ad1d2f5c1f7458702c77c69f9c
   unpetrify-ref: baserock/morph
   build-depends:
-  - libapr-tarball
-  - libapr-util-tarball
+  - libapr
+  - libapr-util
 - name: swig-tarball
   morph: strata/lorry/swig-tarball.morph
   repo: upstream:swig-tarball
@@ -88,8 +89,8 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - swig-tarball
-  - libapr-tarball
-  - libapr-util-tarball
+  - libapr
+  - libapr-util
   - libserf-tarball
   - neon
 - name: mercurial-tarball
diff --git a/strata/lorry/libapr-util-tarball.morph b/strata/lorry/libapr-util-tarball.morph
deleted file mode 100644
index e34e3610..00000000
--- a/strata/lorry/libapr-util-tarball.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: libapr-util-tarball
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./configure --prefix "$PREFIX" --with-apr=/usr/bin/apr-1-config
diff --git a/strata/lorry/libapr-util.morph b/strata/lorry/libapr-util.morph
new file mode 100644
index 00000000..26db03ba
--- /dev/null
+++ b/strata/lorry/libapr-util.morph
@@ -0,0 +1,7 @@
+name: libapr-util
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- ./buildconf --with-apr=/usr/share/apr-1
+configure-commands:
+- ./configure --prefix "$PREFIX" --with-apr=/usr/bin/apr-1-config
diff --git a/strata/lorry/libapr.morph b/strata/lorry/libapr.morph
new file mode 100644
index 00000000..7be0cabb
--- /dev/null
+++ b/strata/lorry/libapr.morph
@@ -0,0 +1,21 @@
+name: libapr-tarball
+kind: chunk
+build-system: autotools
+pre-configure-commands:
+- ./buildconf
+configure-commands:
+- |
+  ./configure \
+    --prefix "$PREFIX" \
+    --disable-static \
+    --with-installbuilddir=/usr/share/apr-1/build
+post-install-commands:
+- |
+  # Install files required for apr-util
+  for file in find_apr.m4 apr_common.m4 install.sh gen-build.py \
+      get-version.sh config.guess config.sub
+  do
+    cp build/$file "$DESTDIR/$PREFIX"/share/apr-1/build/"$file"
+  done
+  # Create a symlink in the build directory to the include directory
+  ln -sf /usr/include/apr-1 "$DESTDIR/$PREFIX"/share/apr-1/build/
-- 
cgit v1.2.1