From 8392904ccefed4d7b7aaf86135ccb2c4cba24568 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: Mon, 15 Feb 2021 13:29:21 +0700
Subject: [PATCH] libzen: fix build

---
 srcpkgs/libzen/files/proper-mt-fix.patch | 1 +
 srcpkgs/libzen/template                  | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libzen/files/proper-mt-fix.patch b/srcpkgs/libzen/files/proper-mt-fix.patch
index ca5776474cb..1bfbcd3c903 100644
--- a/srcpkgs/libzen/files/proper-mt-fix.patch
+++ b/srcpkgs/libzen/files/proper-mt-fix.patch
@@ -22,6 +22,7 @@ index 8e431b5..6a25aee 100644
 +
  target_include_directories(zen PUBLIC
    $<BUILD_INTERFACE:${ZenLib_SOURCES_PATH}>
 $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>)
+
 diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
 index c0ff266..62a1bf5 100644
 --- a/Project/GNU/Library/configure.ac
diff --git a/srcpkgs/libzen/template b/srcpkgs/libzen/template
index 43a48529fba..1b4c96e10e8 100644
--- a/srcpkgs/libzen/template
+++ b/srcpkgs/libzen/template
@@ -17,8 +17,7 @@ wrksrc=ZenLib
 build_wrksrc="Project/GNU/Library"
 
 do_patch() {
-	# applying via patches/ wasn't working great
-	cd $XBPS_BUILDDIR/ZenLib
+	cd $wrksrc
 	patch -Np1 < $FILESDIR/proper-mt-fix.patch
 }
 
@@ -29,18 +28,18 @@ pre_configure() {
 do_install() {
 	make DESTDIR=${DESTDIR} install
 	install -dm 755 ${DESTDIR}/usr/include/ZenLib
-	install -m 644 ${wrksrc}/ZenLib/Source/ZenLib/*.h \
+	install -m 644 ${wrksrc}/Source/ZenLib/*.h \
 		${DESTDIR}/usr/include/ZenLib
 	for i in HTTP_Client Format/Html Format/Http; do
 		install -dm0755 ${DESTDIR}/usr/include/ZenLib/$i
-		install -m0644 ${wrksrc}/ZenLib/Source/ZenLib/$i/*.h \
+		install -m0644 ${wrksrc}/Source/ZenLib/$i/*.h \
 			${DESTDIR}/usr/include/ZenLib/$i
 	done
 	install -dm 755 ${DESTDIR}/usr/lib/pkgconfig
 	install -m 644 libzen.pc ${DESTDIR}/usr/lib/pkgconfig
 	sed -i -e 's|Version: |Version: '$version'|g' \
 		${DESTDIR}/usr/lib/pkgconfig/libzen.pc
-	vlicense ${wrksrc}/ZenLib/License.txt
+	vlicense ${wrksrc}/License.txt
 }
 
 libzen-devel_package() {