From 90e4b2bd8fdfb888335eeae9f5c2bdcaf183baeb Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 26 Oct 2020 08:22:38 -0500
Subject: [PATCH] wordgrinder: update to 0.8.

---
 srcpkgs/wordgrinder/patches/fix-objdir.patch  | 11 -------
 srcpkgs/wordgrinder/patches/osexec-bool.patch | 31 -------------------
 srcpkgs/wordgrinder/template                  | 14 ++++-----
 3 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 srcpkgs/wordgrinder/patches/fix-objdir.patch
 delete mode 100644 srcpkgs/wordgrinder/patches/osexec-bool.patch

diff --git a/srcpkgs/wordgrinder/patches/fix-objdir.patch b/srcpkgs/wordgrinder/patches/fix-objdir.patch
deleted file mode 100644
index b4fa19a5ab18d6..00000000000000
--- a/srcpkgs/wordgrinder/patches/fix-objdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -11,7 +11,7 @@
- DESTDIR ?=
- 
- # Where do the temporary files go?
--OBJDIR = /tmp/wg-build
-+OBJDIR = wg-build
- 
- # The compiler used for the native build (curses, X11)
- CC ?= cc
diff --git a/srcpkgs/wordgrinder/patches/osexec-bool.patch b/srcpkgs/wordgrinder/patches/osexec-bool.patch
deleted file mode 100644
index 713181b0bdc5a1..00000000000000
--- a/srcpkgs/wordgrinder/patches/osexec-bool.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- build.lua.orig
-+++ build.lua
-@@ -24,7 +24,7 @@
-     if package == "builtin" then
-         return true
-     end
--    return os.execute("pkg-config "..package) == 0
-+    return os.execute("pkg-config "..package)
- end
- 
- local function detect_package(name, package)
-@@ -54,7 +54,7 @@
- end
- 
- local function has_binary(binary)
--    return os.execute("type "..binary.." >/dev/null 2>&1") == 0
-+    return os.execute("type "..binary.." >/dev/null 2>&1")
- end
- 
- local function package_flags(package, kind)
-@@ -68,8 +68,8 @@
-     end
- 
-     local filename = os.tmpname()
--    local e = os.execute("pkg-config "..kind.." "..package.." > "..filename)
--    if e ~= 0 then
-+    
-+    if os.execute("pkg-config "..kind.." "..package.." > "..filename) == false then
-         error("required package "..package.." is not available")
-     end
-     local s = io.open(filename):read("*a")
diff --git a/srcpkgs/wordgrinder/template b/srcpkgs/wordgrinder/template
index 4f352f023e740a..f55be3a4df0c37 100644
--- a/srcpkgs/wordgrinder/template
+++ b/srcpkgs/wordgrinder/template
@@ -1,7 +1,7 @@
 # Template file for 'wordgrinder'
 pkgname=wordgrinder
-version=0.7.2
-revision=2
+version=0.8
+revision=1
 hostmakedepends="pkg-config ninja lua53"
 makedepends="libXft-devel lua53-devel"
 short_desc="A terminal-based word processor"
@@ -9,20 +9,20 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="http://cowlark.com/wordgrinder"
 distfiles="https://github.com/davidgiven/wordgrinder/archive/${version}.tar.gz"
-checksum=4e1bc659403f98479fe8619655f901c8c03eb87743374548b4d20a41d31d1dff
+checksum=856cbed2b4ccd5127f61c4997a30e642d414247970f69932f25b4b5a81b18d3f
 
 do_configure() {
 	export PKG_CONFIG_PATH=${XBPS_CROSS_BASE}/usr/lib/pkgconfig:${XBPS_CROSS_BASE}/usr/share/pkgconfig
 	export PKG_CONFIG_LIBDIR=${XBPS_CROSS_BASE}/usr/lib/pkgconfig
 	export PKG_CONFIG_SYSROOT_DIR=${XBPS_CROSS_BASE}
 	LDFLAGS+=" -lX11 "
-	make wg-build/build.ninja LUA_PACKAGE=lua LUA_INTERPRETER=/usr/bin/lua XFT_PACKAGE=xft
+	make .obj/build.ninja LUA_PACKAGE=lua LUA_INTERPRETER=/usr/bin/lua XFT_PACKAGE=xft
 }
 
 do_build() {
-	ninja -f wg-build/build.ninja bin/xwordgrinder-builtin-x11-release
-	ninja -f wg-build/build.ninja bin/wordgrinder-builtin-curses-release
-	ninja -f wg-build/build.ninja bin/wordgrinder.1
+	ninja -f .obj/build.ninja bin/xwordgrinder-builtin-x11-release
+	ninja -f .obj/build.ninja bin/wordgrinder-builtin-curses-release
+	ninja -f .obj/build.ninja bin/wordgrinder.1
 }
 
 do_install() {