From ed60e1162822ed4d4cfbe961d037e9b9ae99d827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Thu, 17 Feb 2022 22:51:22 +0100
Subject: groups/211.native_packages_cmdline.group: tree: bump to v2.0.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ørjan Malde <red@foxi.me>
---
 patches/tree-2.0.1.local.patch     | 35 -----------------------------------
 patches/tree-2.0.2_pre.local.patch | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 35 deletions(-)
 delete mode 100644 patches/tree-2.0.1.local.patch
 create mode 100644 patches/tree-2.0.2_pre.local.patch

(limited to 'patches')

diff --git a/patches/tree-2.0.1.local.patch b/patches/tree-2.0.1.local.patch
deleted file mode 100644
index ebcca91c..00000000
--- a/patches/tree-2.0.1.local.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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:
diff --git a/patches/tree-2.0.2_pre.local.patch b/patches/tree-2.0.2_pre.local.patch
new file mode 100644
index 00000000..09dccba9
--- /dev/null
+++ b/patches/tree-2.0.2_pre.local.patch
@@ -0,0 +1,29 @@
+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:
-- 
cgit v1.2.3