Attachment 231268 Details for Bug 261414 – Fixed tree patch for version 2.0.1

[patch] Fixed tree patch for version 2.0.1

tree-2.0.1-1.patch (text/plain), 3.86 KB, created by Guy Brand on 2022-01-24 12:20:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guy Brand

Created: 2022-01-24 12:20:24 UTC

Size: 3.86 KB

patch

obsolete

>From 78d82ca4ec831aa8fbfb13cffee0a3bdd141bdf8 Mon Sep 17 00:00:00 2001
>From: Guy Brand <gb@unistra.fr>
>Date: Sun, 23 Jan 2022 13:18:33 +0100
>Subject: [PATCH] Upgrade to tree 2.0.1
>
>---
> Makefile             |  7 +++---
> distinfo             |  6 ++---
> files/patch-Makefile | 56 ++++++++++++++++++--------------------------
> 3 files changed, 30 insertions(+), 39 deletions(-)
>
>diff --git a/Makefile b/Makefile
>index f19de7a..ee3c57c 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -1,9 +1,9 @@
> # Created by: Alan Eldridge <alane@FreeBSD.org>
> 
> PORTNAME=	tree
>-PORTVERSION=	1.8.0
>+PORTVERSION=	2.0.1
> CATEGORIES=	sysutils
>-MASTER_SITES=	ftp://mama.indstate.edu/linux/tree/
>+MASTER_SITES=	http://mama.indstate.edu/users/ice/tree/src/
> 
> MAINTAINER=	gb@unistra.fr
> COMMENT=	Display a tree-view of directories with optional color or HTML output
>@@ -14,7 +14,8 @@ MAKE_ENV+=	MKDIR="${MKDIR}"
> USES=		gmake tar:tgz
> 
> PLIST_FILES=	bin/tree \
>-		man/man1/tree.1.gz
>+		man/man1/tree.1.gz \
>+		man/man1/tree.fr.1.gz
> 
> PORTDOCS=	CHANGES README
> 
>diff --git a/distinfo b/distinfo
>index 5460698..0a93a77 100644
>--- a/distinfo
>+++ b/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1553186634
>-SHA256 (tree-1.8.0.tgz) = 715d5d4b434321ce74706d0dd067505bb60c5ea83b5f0b3655dae40aa6f9b7c2
>-SIZE (tree-1.8.0.tgz) = 50286
>+TIMESTAMP = 1642887600
>+SHA256 (tree-2.0.1.tgz) = e3339c5a194cf6b4080f15ec59faa3679f02d5a793b2147912fbfcfb4cdf2239
>+SIZE (tree-2.0.1.tgz) = 57213
>diff --git a/files/patch-Makefile b/files/patch-Makefile
>index 5adfa17..8929131 100644
>--- a/files/patch-Makefile
>+++ b/files/patch-Makefile
>@@ -1,52 +1,42 @@
>---- Makefile.orig	2018-01-18 21:02:20.000000000 +0100
>-+++ Makefile	2019-03-20 11:22:05.133686000 +0100
>-@@ -16,28 +16,28 @@
>- # along with this program; if not, write to the Free Software
>- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
>- 
>--prefix = /usr
>-+prefix = ${PREFIX}
>- 
>--CC=gcc
>-+CC?=cc
>- 
>- VERSION=1.8.0
>+--- Makefile.orig	2022-01-23 13:10:10.027280000 +0100
>++++ Makefile	2022-01-23 13:14:05.143686000 +0100
>+@@ -24,7 +24,7 @@
>+ VERSION=2.0.1
>  TREE_DEST=tree
>- BINDIR=${prefix}/bin
>+ DESTDIR=${PREFIX}/bin
> -MAN=tree.1
> +MAN=doc/tree.1
>- MANDIR=${prefix}/man/man1
>- OBJS=tree.o unix.o html.o xml.o json.o hash.o color.o file.o
>+ MANDIR=${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:
>+@@ -32,13 +32,13 @@
>  
>  # Linux defaults:
>--CFLAGS=-ggdb -pedantic -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
>-+#CFLAGS=-ggdb -pedantic -Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
>- #CFLAGS=-O4 -Wall  -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
>- #LDFLAGS=-s
>+ #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
> -#CFLAGS=-O2 -Wall -fomit-frame-pointer
> -#LDFLAGS=-s
>--#OBJS+=strverscmp.o
>++CC=cc
> +CFLAGS=-O2 -Wall -fomit-frame-pointer
> +LDFLAGS=-s
>-+OBJS+=strverscmp.o
>  
>  # Uncomment for OpenBSD:
>  #TREE_DEST=colortree
>-@@ -108,13 +108,11 @@
>- 	if [ -f tree.o ]; then rm *.o; fi
>- 	rm -f *~
>+@@ -101,11 +101,11 @@
>+ clean:
>+ 	rm -f $(TREE_DEST) *.o *~
>  
> -install: tree
>--	install -d $(BINDIR)
>--	install -d $(MANDIR)
>--	if [ -e $(TREE_DEST) ]; then \
>--		install $(TREE_DEST) $(BINDIR)/$(TREE_DEST); \
>--	fi
>--	install doc/$(MAN) $(MANDIR)/$(MAN)
>+-	$(INSTALL) -d $(DESTDIR)
>+-	$(INSTALL) -d $(MANDIR)/man1
>+-	$(INSTALL) $(TREE_DEST) $(DESTDIR)/$(TREE_DEST); \
>+-	$(INSTALL) -m 644 doc/$(MAN) $(MANDIR)/man1/$(MAN)
> +install: $(TREE_DEST)
> +	@$(MKDIR) $(BINDIR)
> +	@$(MKDIR) $(MANDIR)
>@@ -54,4 +44,4 @@
> +	${BSD_INSTALL_MAN} $(MAN) $(MANDIR)
>  
>  distclean:
>- 	if [ -f tree.o ]; then rm *.o; fi
>+ 	rm -f *.o *~
>-- 
>2.34.1
>

Actions: View | Diff

Attachments on bug 261414: 231249 | 231268