From f04a94da8fcfe2ddaa118640c9391b52c4c31a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Mon, 29 Aug 2022 16:09:07 +0200
Subject: groups/211.native_packages_cmdline.group: tree: bump to v2.0.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ørjan Malde <red@foxi.me>
---
 groups/211.native_packages_cmdline.group |  4 ++--
 patches/tree-2.0.2_pre.local.patch       | 29 -----------------------------
 patches/tree-2.0.3_pre.local.patch       | 12 ++++++++++++
 3 files changed, 14 insertions(+), 31 deletions(-)
 delete mode 100644 patches/tree-2.0.2_pre.local.patch
 create mode 100644 patches/tree-2.0.3_pre.local.patch

diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group
index 6e592097..9f67c9e5 100644
--- a/groups/211.native_packages_cmdline.group
+++ b/groups/211.native_packages_cmdline.group
@@ -258,8 +258,8 @@ 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:=7d693a1d88d3c4e70a73e03b8dbbdc12c2945d482647494f2f5bd83a479eeeaf};
-: ${PKG_TREE_VERSION:=2.0.2};
+: ${PKG_TREE_SHA256SUM:=ba14e77b5f9dc7f8250c3f702ec5b6be2f93cd0fa87311bab3239676866a3b1d};
+: ${PKG_TREE_VERSION:=2.0.3};
 : ${PKG_TREE_URL:=http://mama.indstate.edu/users/ice/tree/src/tree-${PKG_TREE_VERSION}.tgz};
 : ${PKG_TREE_CFLAGS_BUILD:="${NATIVE_PACKAGES_CFLAGS_CONFIGURE}"};
 : ${PKG_TREE_CFLAGS_BUILD_EXTRA:="-std=c99"};
diff --git a/patches/tree-2.0.2_pre.local.patch b/patches/tree-2.0.2_pre.local.patch
deleted file mode 100644
index 09dccba9..00000000
--- a/patches/tree-2.0.2_pre.local.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ru tree-2.0.2.orig/Makefile tree-2.0.2/Makefile
---- tree-2.0.2.orig/Makefile	2022-02-16 22:45:43.000000000 +0100
-+++ tree-2.0.2/Makefile	2022-02-17 22:49:24.340545322 +0100
-@@ -26,15 +26,13 @@
- DESTDIR=${PREFIX}/bin
- MAN=tree.1
- # Probably needs to be ${PREFIX}/share/man for most systems now
--MANDIR=${PREFIX}/man
-+MANDIR=${DESTDIR}${PREFIX}/share/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
- 
- # Uncomment for FreeBSD:
- #CC=cc
-@@ -105,7 +103,7 @@
- install: tree
- 	$(INSTALL) -d $(DESTDIR)
- 	$(INSTALL) -d $(MANDIR)/man1
--	$(INSTALL) $(TREE_DEST) $(DESTDIR)/$(TREE_DEST); \
-+	$(INSTALL) $(TREE_DEST) $(DESTDIR)${PREFIX}/bin/$(TREE_DEST); \
- 	$(INSTALL) -m 644 doc/$(MAN) $(MANDIR)/man1/$(MAN)
- 
- distclean:
diff --git a/patches/tree-2.0.3_pre.local.patch b/patches/tree-2.0.3_pre.local.patch
new file mode 100644
index 00000000..349747e7
--- /dev/null
+++ b/patches/tree-2.0.3_pre.local.patch
@@ -0,0 +1,12 @@
+diff -ru tree-2.0.3.orig/Makefile tree-2.0.3/Makefile
+--- tree-2.0.3.orig/Makefile	2022-08-29 16:06:51.186529283 +0200
++++ tree-2.0.3/Makefile	2022-08-29 16:07:26.594528175 +0200
+@@ -26,7 +26,7 @@
+ DESTDIR=${PREFIX}/bin
+ MAN=tree.1
+ # Probably needs to be ${PREFIX}/share/man for most systems now
+-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:
-- 
cgit v1.2.3