From 2dbac06c656114e99594eb7a0dadd3dd7d1a8b3f Mon Sep 17 00:00:00 2001
From: Ørjan Malde <red@foxi.me>
Date: Feb 06 2022 09:18:22 +0000
Subject: groups/211.native_packages_cmdline.group: tree: bump to v2.0.1


Signed-off-by: Ørjan Malde <red@foxi.me>

---

diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group
index b1fd48f..f291925 100644
--- a/groups/211.native_packages_cmdline.group
+++ b/groups/211.native_packages_cmdline.group
@@ -251,13 +251,11 @@ libopts_cv_run_fopen_binary=yes"};
 : ${PKG_TOILET_DEPENDS:="libcaca"};
 : ${PKG_TOILET_URLS_GIT:=toilet=https://github.com/cacalabs/toilet@master};
 : ${PKG_TOILET_ENV_VARS_EXTRA:="CACA_CFLAGS=-I${PREFIX_NATIVE}/include:CACA_LIBS=-L${PREFIX_NATIVE} -lcaca"};
-: ${PKG_TREE_SHA256SUM:=715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2};
-: ${PKG_TREE_VERSION:=1.8.0};
+: ${PKG_TREE_SHA256SUM:=e3339c5a194cf6b4080f15ec59faa3679f02d5a793b2147912fbfcfb4cdf2239};
+: ${PKG_TREE_VERSION:=2.0.1};
 : ${PKG_TREE_URL:=http://mama.indstate.edu/users/ice/tree/src/tree-${PKG_TREE_VERSION}.tgz};
-: ${PKG_TREE_BUILD_STEPS_DISABLE:=install_make};
-: ${PKG_TREE_INSTALL_FILES_V2:="
-	../tree-${PKG_TREE_VERSION}/tree=bin/%[FNAME]
-	../tree-${PKG_TREE_VERSION}/doc/tree.1=share/man/man1/%[FNAME]"};
+: ${PKG_TREE_CFLAGS_BUILD:="${NATIVE_PACKAGES_CFLAGS_CONFIGURE}"};
+: ${PKG_TREE_CFLAGS_BUILD_EXTRA:="-std=c99"};
 : ${PKG_TREE_IN_TREE:=1};
 : ${PKG_TERMINALLY_TETRIS_DEPENDS:="ncurses"};
 : ${PKG_TERMINALLY_TETRIS_URLS_GIT:=terminally_tetris=https://github.com/thecardkid/terminally-tetris.git@master};
diff --git a/patches/tree-2.0.1.local.patch b/patches/tree-2.0.1.local.patch
new file mode 100644
index 0000000..ebcca91
--- /dev/null
+++ b/patches/tree-2.0.1.local.patch
@@ -0,0 +1,35 @@
+diff -ru tree-2.0.1.orig/Makefile tree-2.0.1/Makefile
+--- tree-2.0.1.orig/Makefile	2022-01-03 20:11:10.000000000 +0100
++++ tree-2.0.1/Makefile	2022-02-06 10:15:01.067413455 +0100
+@@ -23,17 +23,18 @@
+ 
+ VERSION=2.0.1
+ TREE_DEST=tree
+-DESTDIR=${PREFIX}/bin
++DESTDIR=${DESTDIR}
++BINDIR=${DESTDIR}${PREFIX}/bin
+ MAN=tree.1
+-MANDIR=${PREFIX}/man
++MANDIR=${DESTDIR}${PREFIX}/man
+ OBJS=tree.o list.o hash.o color.o file.o filter.o info.o unix.o xml.o json.o html.o strverscmp.o
+ 
+ # Uncomment options below for your particular OS:
+ 
+ # Linux defaults:
+ #CFLAGS=-ggdb -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-CFLAGS=-O3 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-LDFLAGS=-s
++#CFLAGS=-O3 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++#LDFLAGS=-s
+ 
+ # Uncomment for FreeBSD:
+ #CC=cc
+@@ -104,7 +105,7 @@
+ install: tree
+ 	$(INSTALL) -d $(DESTDIR)
+ 	$(INSTALL) -d $(MANDIR)/man1
+-	$(INSTALL) $(TREE_DEST) $(DESTDIR)/$(TREE_DEST); \
++	$(INSTALL) $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
+ 	$(INSTALL) -m 644 doc/$(MAN) $(MANDIR)/man1/$(MAN)
+ 
+ distclean: