From nobody Sat Jan 29 06:36:52 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 600421980A89; Sat, 29 Jan 2022 06:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jm4P022TXz4tb8; Sat, 29 Jan 2022 06:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643438212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=haUcrivt5U0kVAvt+FCy+vyqrteLgc2g64AO4TgwSVg=; b=pf4FhWNbkIT5X0xmsbDKZKN4n1v+bD26ZjaOLQKa7yyCQzrm9zJ7iXepYwIabru1DWYCza F4CPQ0LDNz1P9ZjFLCI3ywcm6DF9faWGed+qcu1SArTSMPMplokwZCD5VCabMKcKQ048nE hiYEdS/mgs+OaqC3JVVfukXMu7BDF6PX69kEpJTvoCWOKUXSeGZ7EE6S9jItb39VhiZ/8q NL0J6269lPFOkF8+1QeA4tCrxXDQI13cQBN7yMUUKh26XkBssGKOt+0qacNT8zf9RnCO1X grqJZ5U1Xz27uEb/L0n3CUcvL0/tLlzxOct/GJWuGlUiblA/CzInEUE/Wx98qg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 260741140A; Sat, 29 Jan 2022 06:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20T6aqUQ070650; Sat, 29 Jan 2022 06:36:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20T6aq2R070649; Sat, 29 Jan 2022 06:36:52 GMT (envelope-from git) Date: Sat, 29 Jan 2022 06:36:52 GMT Message-Id: <202201290636.20T6aq2R070649@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 7fbb727e11be - main - sysutils/tree: provide fallback download URL and other improvements List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fbb727e11bec00da6a84653a0bea0b02d9b9d4e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643438212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=haUcrivt5U0kVAvt+FCy+vyqrteLgc2g64AO4TgwSVg=; b=fvA42uBnb7GeIwuIRNZyemMOvs5bJQjh4M1s26dB/S5B8pz1Aa+8O5to4t+kOeJLyfs2F2 2vAhfKMTIaT7X5+yodukEONKsHdzTWMAQ++SZAHFCtUgA8khjRXfM+qJ1WOEaiUl1JqvP6 wAgjTJP8xZ1u7GPEV22hRY+WVXGybbvQMyRJRY0fKPCDz4mADsy6wYoDjT+elCtLMXXRB+ bFupLbof9AVnkLWonFmGvI7ZBkmwM+LNHsCOwOiiYO1+U88btW0SltKGfjk20/Zps31DvX kmftYx1m4ZqRH/8fmy3uu4MrgREhE5zBv0UDW6JZp7PggO0pOdNALfwG4slhTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643438212; a=rsa-sha256; cv=none; b=g/PGPe5bDl81xLqsmTHKW0zCWyvY2QdDXAuEEMqzsm60hemOr2eO4seWS/8Shz55JI9L+F CC5VlyJ+HG8AT+txV2c1dc4tQ2m8L0GMULFWU9tvJ/daT5DDyw3No8R1RX+PUBQ/lP5rhx 1HGm0Kmp7Fjg6gQuVIGTPgDW5rJzfQgLIdgOOuAKQi1gDNufjCBitXzolNVBGpBiYGah/Y AhabdiFj+5jMVAPLWYlp/RtpnPHtjTsU34VBSY6fWzx+Bb9ikJ+aogdYLXciv38DBvFMDb U3+kTsLA0XuUC4V4yZ4Shd8IB4IcPGRY4mn2qRdCnhj0rfdcnDLHpQ/akaiKkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=7fbb727e11bec00da6a84653a0bea0b02d9b9d4e commit 7fbb727e11bec00da6a84653a0bea0b02d9b9d4e Author: Alexey Dokuchaev AuthorDate: 2022-01-29 06:36:26 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-01-29 06:36:26 +0000 sysutils/tree: provide fallback download URL and other improvements - For some reason, upstream distfile site is currently inaccessible in certain parts of the world, e.g. Russia - Pass build-related variables down to inner Makefile via MAKE_ARGS and remove the patch file (particularly, it was patching `install' target which is useless as the port is using its own) - Adjust LICENSE (it's GPLv2 or later) and install documentation in the dedicated helper target (also install TODO file while here) PR: 261547 --- sysutils/tree/Makefile | 12 ++++++---- sysutils/tree/files/patch-Makefile | 47 -------------------------------------- 2 files changed, 7 insertions(+), 52 deletions(-) diff --git a/sysutils/tree/Makefile b/sysutils/tree/Makefile index ee3c57c218a2..fd3bf48d5112 100644 --- a/sysutils/tree/Makefile +++ b/sysutils/tree/Makefile @@ -3,27 +3,29 @@ PORTNAME= tree PORTVERSION= 2.0.1 CATEGORIES= sysutils -MASTER_SITES= http://mama.indstate.edu/users/ice/tree/src/ +MASTER_SITES= http://mama.indstate.edu/users/ice/tree/src/ \ + https://fossies.org/linux/misc/ MAINTAINER= gb@unistra.fr COMMENT= Display a tree-view of directories with optional color or HTML output -LICENSE= GPLv2 +LICENSE= GPLv2+ -MAKE_ENV+= MKDIR="${MKDIR}" USES= gmake tar:tgz +MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" PLIST_FILES= bin/tree \ man/man1/tree.1.gz \ man/man1/tree.fr.1.gz - -PORTDOCS= CHANGES README +PORTDOCS= CHANGES README TODO OPTIONS_DEFINE= DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tree ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + +do-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} diff --git a/sysutils/tree/files/patch-Makefile b/sysutils/tree/files/patch-Makefile deleted file mode 100644 index 8929131b36b8..000000000000 --- a/sysutils/tree/files/patch-Makefile +++ /dev/null @@ -1,47 +0,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 - DESTDIR=${PREFIX}/bin --MAN=tree.1 -+MAN=doc/tree.1 - 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 - -@@ -32,13 +32,13 @@ - - # 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 --#CFLAGS=-O2 -Wall -fomit-frame-pointer --#LDFLAGS=-s -+CC=cc -+CFLAGS=-O2 -Wall -fomit-frame-pointer -+LDFLAGS=-s - - # Uncomment for OpenBSD: - #TREE_DEST=colortree -@@ -101,11 +101,11 @@ - clean: - rm -f $(TREE_DEST) *.o *~ - --install: tree -- $(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) -+ ${BSD_INSTALL_PROGRAM} $(TREE_DEST) $(BINDIR) -+ ${BSD_INSTALL_MAN} $(MAN) $(MANDIR) - - distclean: - rm -f *.o *~