From 2a1b49deb8380fe29a152df7dd34d21e6ffb9de6 Mon Sep 17 00:00:00 2001
From: Sam Bingner <sam@bingner.com>
Date: Wed, 15 Aug 2018 15:03:53 -1000
Subject: Update apr-util to 1.6.1

---
 data/apr-util/_metadata/version      |   2 +-
 data/apr-util/apr-util-1.2.12.tar.gz | Bin 668292 -> 0 bytes
 data/apr-util/apr-util-1.6.1.tar.bz2 | Bin 0 -> 428595 bytes
 data/apr-util/make.sh                |   5 ++++-
 4 files changed, 5 insertions(+), 2 deletions(-)
 delete mode 100644 data/apr-util/apr-util-1.2.12.tar.gz
 create mode 100644 data/apr-util/apr-util-1.6.1.tar.bz2

(limited to 'data/apr-util')

diff --git a/data/apr-util/_metadata/version b/data/apr-util/_metadata/version
index f2ae0b4a2..9c6d6293b 100644
--- a/data/apr-util/_metadata/version
+++ b/data/apr-util/_metadata/version
@@ -1 +1 @@
-1.2.12
+1.6.1
diff --git a/data/apr-util/apr-util-1.2.12.tar.gz b/data/apr-util/apr-util-1.2.12.tar.gz
deleted file mode 100644
index a97916bee..000000000
Binary files a/data/apr-util/apr-util-1.2.12.tar.gz and /dev/null differ
diff --git a/data/apr-util/apr-util-1.6.1.tar.bz2 b/data/apr-util/apr-util-1.6.1.tar.bz2
new file mode 100644
index 000000000..f4785d667
Binary files /dev/null and b/data/apr-util/apr-util-1.6.1.tar.bz2 differ
diff --git a/data/apr-util/make.sh b/data/apr-util/make.sh
index 2a4ca3fa2..eb45aca88 100644
--- a/data/apr-util/make.sh
+++ b/data/apr-util/make.sh
@@ -1,4 +1,7 @@
 pkg:setup
-pkg:configure --disable-static --with-apr="$(PKG_WORK_ apr)/apr-1.2.12" --with-berkeley-db="${PKG_ROOT}"
+APRWORK=("$(PKG_WORK_ _apr)"/*/)
+pkg:configure --disable-static --with-apr="${APRWORK}" --with-berkeley-db="$(PKG_DEST_ berkeleydb)"
+# WTF configure... I need to fix this
+sed -ie 's/db-6.9/db/' Makefile
 make
 pkg:install
-- 
cgit v1.2.3