From 6591403ab9bc9fc2b6e1e5490977d0e91f8e5f69 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Sun, 27 Mar 2022 22:52:23 -0500
Subject: [PATCH] berry: 0.1.11

---
 srcpkgs/berry/patches/fix-cross.patch | 48 +++++----------------------
 srcpkgs/berry/template                |  9 ++---
 2 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/srcpkgs/berry/patches/fix-cross.patch b/srcpkgs/berry/patches/fix-cross.patch
index 3756ccfa40c..eace39b7a1f 100644
--- a/srcpkgs/berry/patches/fix-cross.patch
+++ b/srcpkgs/berry/patches/fix-cross.patch
@@ -1,41 +1,11 @@
---- a/config.mk
-+++ b/config.mk
-@@ -9,11 +9,11 @@
- # Customize below to fit your system
+--- a/configure
++++ b/configure
+@@ -26,7 +26,7 @@
+ progs="CC=gcc CC=clang CC=cc INSTALL=install"
  
- # paths
--PREFIX = /usr/local
-+PREFIX = /usr
- MANPREFIX = ${PREFIX}/share/man
+ # Required dependencies
+-pkgs="x11 xinerama fontconfig xft"
++pkgs="x11 xinerama fontconfig xft freetype2"
  
--X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11INC = $(XBPS_CROSS_BASE)/usr/include
-+X11LIB = $(XBPS_CROSS_BASE)/usr/lib
- 
- # Xinerama, comment if you don't want it
- XINERAMALIBS  = -lXinerama
-@@ -21,7 +21,7 @@
- 
- # freetype
- FREETYPELIBS = -lfontconfig -lXft
--FREETYPEINC = /usr/include/freetype2
-+FREETYPEINC = $(XBPS_CROSS_BASE)/usr/include/freetype2
- # OpenBSD (uncomment)
- #FREETYPEINC = ${X11INC}/freetype2
- 
-@@ -36,7 +36,7 @@
- # flags
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${DEBUG_CPPFLAGS}
- #CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS}
--CFLAGS   = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES)
-+CFLAGS   += -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES)
- LDFLAGS  = ${LIBS}
- 
- # Solaris
-@@ -44,4 +44,4 @@
- #LDFLAGS = ${LIBS}
- 
- # compiler and linker
--CC = cc
-+#CC = cc
+ # Default pkg flags to substitute when pkg-config is not found
+ pkg_libs="-lX11 -lXinerama -lfontconfig -lfreetype -lXft"
diff --git a/srcpkgs/berry/template b/srcpkgs/berry/template
index 05256589af2..7e2f79c0964 100644
--- a/srcpkgs/berry/template
+++ b/srcpkgs/berry/template
@@ -1,16 +1,17 @@
 # Template file for 'berry'
 pkgname=berry
-version=0.1.7
+version=0.1.11
 revision=1
-build_style=gnu-makefile
-make_use_env=yes
+build_style=configure
+configure_args="--prefix=/usr"
+hostmakedepends="pkg-config which"
 makedepends="libX11-devel libXinerama-devel libXft-devel freetype-devel"
 short_desc="Healthy, bite-sized window manager"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="MIT"
 homepage="https://github.com/JLErvin/berry"
 distfiles="https://github.com/JLErvin/berry/archive/${version}.tar.gz"
-checksum=1d6de883a0cd96ceb167c5ad2e855b0b15fa84872d41a22e05d0fdf0cf4be6b8
+checksum=9beab0c1458fba7cf304dd45b710829640342bc42cfe61f0ae8c2b5391163142
 
 post_install() {
 	vlicense LICENSE