From 636b9fa47bb0d94f7def2834f855ff681a4965be Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Sun, 21 Jun 2015 20:12:27 +0300
Subject: [PATCH] apr: Update to 1.5.2

---
 mingw-w64-apr/PKGBUILD | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/mingw-w64-apr/PKGBUILD b/mingw-w64-apr/PKGBUILD
index cc010617a1..6d76c9b0d6 100644
--- a/mingw-w64-apr/PKGBUILD
+++ b/mingw-w64-apr/PKGBUILD
@@ -2,54 +2,56 @@
 
 _realname=apr
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.5.1
+pkgver=1.5.2
 pkgrel=1
 pkgdesc="The Apache Portable Runtime (mingw-w64)"
 arch=('any')
 url="https://apr.apache.org/"
 license=('APACHE')
-
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
-            )
-
-source=("http://www.apache.org/dist/apr/apr-${pkgver}-win32-src.zip"
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-libtool")
+source=(http://www.apache.org/dist/apr/${_realname}-${pkgver}.tar.bz2{,.asc}
         'apr_ssize_t.patch'
         'apr_wtypes.patch')
-md5sums=('684a3756a2f8955e837b53e8089e10b0'
+md5sums=('4e9769f3349fe11fc0a5e1b224c236aa'
+         'SKIP'
          'b91081b97f838246446c5795371faf6a'
          '0326d335f035f8f13dea4296efb1faab')
 
 prepare() {
-  cd "${srcdir}/apr-${pkgver}"
+  cd "${srcdir}/${_realname}-${pkgver}"
 
   patch -p0 -i ${srcdir}/apr_ssize_t.patch
   patch -p0 -i ${srcdir}/apr_wtypes.patch
 
-  autoreconf -fi
+  ./buildconf
+  # autoreconf -fi
 }
 
 build() {
-  cd "${srcdir}/apr-${pkgver}"
+  [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
+  mkdir -p build-${MINGW_CHOST}
+  cd build-${MINGW_CHOST}
 
-  ./buildconf
   # Disable IPv6.
-  ./configure --prefix="${MINGW_PREFIX}" \
+  ../${_realname}-${pkgver}/configure \
+    --prefix="${MINGW_PREFIX}" \
     --includedir="${MINGW_PREFIX}/include/apr-1" \
     --with-installbuilddir="${MINGW_PREFIX}/share/apr-1/build" \
     --enable-nonportable-atomics \
     --with-devrandom=/dev/urandom \
     --disable-ipv6
-  make -j7
+
+  make
 }
 
 #check() {
-#  cd "${srcdir}/apr-${pkgver}"
+#  cd "${srcdir}/build-${MINGW_CHOST}"
 #  make -j1 check
 #}
 
 package() {
-  cd "${srcdir}/apr-${pkgver}"
-  make -j7 DESTDIR="$pkgdir" install
+  cd "${srcdir}/build-${MINGW_CHOST}"
+  make DESTDIR="${pkgdir}" install
 
   #pushd "${pkgdir}${MINGW_PREFIX}" > /dev/null
   #export PREFIX_WIN=`pwd -W`