From 05155e81c697f344eb74c5c606b9d28ad521caab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 21 May 2020 19:59:58 +0700
Subject: [PATCH] apr: remove $XBPS_CROSS_BASE cruft

---
 srcpkgs/apr/template | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/apr/template b/srcpkgs/apr/template
index aef1aae62b9..f2dc1241668 100644
--- a/srcpkgs/apr/template
+++ b/srcpkgs/apr/template
@@ -1,7 +1,7 @@
 # Template file for 'apr'
 pkgname=apr
 version=1.7.0
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-installbuilddir=/usr/share/apr-1/build"
 makedepends="expat-devel libuuid-devel"
@@ -42,6 +42,14 @@ pre_build() {
 	fi
 }
 
+post_install() {
+	if [ "$CROSS_BUILD" ]; then
+		vsed -i -e "s,$XBPS_CROSS_BASE,,g" \
+			"$DESTDIR/usr/bin/apr-1-config" \
+			"$DESTDIR/usr/share/apr-1/build/apr_rules.mk"
+	fi
+}
+
 apr-devel_package() {
 	depends="libtool libuuid-devel apr>=${version}_${revision}"
 	short_desc+=" - development files"
@@ -53,6 +61,6 @@ apr-devel_package() {
 		vmove "usr/lib/*.so"
 		vmove "usr/lib/*.exp"
 		vmove usr/lib/pkgconfig
-		ln -sf /usr/bin/libtool ${PKGDESTDIR}/usr/share/apr-1/build/libtool
+		ln -sf ../../../bin/libtool "$PKGDESTDIR/usr/share/apr-1/build/"
 	}
 }