diff options
| -rw-r--r-- | groups/211.native_packages_cmdline.group | 4 | ||||
| -rw-r--r-- | patches/tree-2.0.3_pre.local.patch | 12 | ||||
| -rw-r--r-- | patches/tree-2.0.4_pre.local.patch | 21 |
3 files changed, 23 insertions, 14 deletions
diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group index aff873e5..92c60cf2 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:=ba14e77b5f9dc7f8250c3f702ec5b6be2f93cd0fa87311bab3239676866a3b1d}; -: ${PKG_TREE_VERSION:=2.0.3}; +: ${PKG_TREE_SHA256SUM:=b0ea92197849579a3f09a50dbefc3d4708caf555d304a830e16e20b73b4ffa74}; +: ${PKG_TREE_VERSION:=2.0.4}; : ${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.3_pre.local.patch b/patches/tree-2.0.3_pre.local.patch deleted file mode 100644 index 349747e7..00000000 --- a/patches/tree-2.0.3_pre.local.patch +++ /dev/null @@ -1,12 +0,0 @@ -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: diff --git a/patches/tree-2.0.4_pre.local.patch b/patches/tree-2.0.4_pre.local.patch new file mode 100644 index 00000000..2c868850 --- /dev/null +++ b/patches/tree-2.0.4_pre.local.patch @@ -0,0 +1,21 @@ +diff -ru tree-2.0.4.orig/Makefile tree-2.0.4/Makefile +--- tree-2.0.4.orig/Makefile 2022-09-06 15:31:53.000000000 +0200 ++++ tree-2.0.4/Makefile 2022-09-10 22:06:29.081774574 +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: +@@ -105,7 +105,7 @@ + install: tree + $(INSTALL) -d $(DESTDIR) + $(INSTALL) -d $(MANDIR)/man1 +- $(INSTALL) $(TREE_DEST) $(DESTDIR)/$(TREE_DEST); \ ++ $(INSTALL) $(TREE_DEST) $(DESTDIR)/bin/$(TREE_DEST); \ + $(INSTALL) -m 644 doc/$(MAN) $(MANDIR)/man1/$(MAN) + + distclean: |