summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--groups/211.native_packages_cmdline.group4
-rw-r--r--patches/tree-2.0.2_pre.local.patch (renamed from patches/tree-2.0.1.local.patch)24
2 files changed, 11 insertions, 17 deletions
diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group
index 4ad86361..ca842c23 100644
--- a/groups/211.native_packages_cmdline.group
+++ b/groups/211.native_packages_cmdline.group
@@ -252,8 +252,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:=e3339c5a194cf6b4080f15ec59faa3679f02d5a793b2147912fbfcfb4cdf2239};
-: ${PKG_TREE_VERSION:=2.0.1};
+: ${PKG_TREE_SHA256SUM:=7d693a1d88d3c4e70a73e03b8dbbdc12c2945d482647494f2f5bd83a479eeeaf};
+: ${PKG_TREE_VERSION:=2.0.2};
: ${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.1.local.patch b/patches/tree-2.0.2_pre.local.patch
index ebcca91c..09dccba9 100644
--- a/patches/tree-2.0.1.local.patch
+++ b/patches/tree-2.0.2_pre.local.patch
@@ -1,16 +1,12 @@
-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
+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}/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:
@@ -19,17 +15,15 @@ diff -ru tree-2.0.1.orig/Makefile tree-2.0.1/Makefile
#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 @@
+@@ -105,7 +103,7 @@
install: tree
$(INSTALL) -d $(DESTDIR)
$(INSTALL) -d $(MANDIR)/man1
- $(INSTALL) $(TREE_DEST) $(DESTDIR)/$(TREE_DEST); \
-+ $(INSTALL) $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
++ $(INSTALL) $(TREE_DEST) $(DESTDIR)${PREFIX}/bin/$(TREE_DEST); \
$(INSTALL) -m 644 doc/$(MAN) $(MANDIR)/man1/$(MAN)
distclean: