From owner-dev-commits-ports-main@freebsd.org Sun Aug 8 22:10:47 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8A33B665CAC; Sun, 8 Aug 2021 22:10:47 +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 4GjYLs32hJz4V5p; Sun, 8 Aug 2021 22:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BA69F1C5D5; Sun, 8 Aug 2021 22:10:38 +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 178MAc17029172; Sun, 8 Aug 2021 22:10:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 178MAcOF029159; Sun, 8 Aug 2021 22:10:38 GMT (envelope-from git) Date: Sun, 8 Aug 2021 22:10:38 GMT Message-Id: <202108082210.178MAcOF029159@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 0d3e9f1a62cd - main - deskutils/todo: Fix config path (TODOTXT_GLOBAL_CFG_FILE) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d3e9f1a62cdf03e1d1ec4b5284d887cc70053a5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2021 22:10:47 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d3e9f1a62cdf03e1d1ec4b5284d887cc70053a5 commit 0d3e9f1a62cdf03e1d1ec4b5284d887cc70053a5 Author: Po-Chuan Hsieh AuthorDate: 2021-08-08 21:42:16 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-08-08 21:46:40 +0000 deskutils/todo: Fix config path (TODOTXT_GLOBAL_CFG_FILE) - Bump PORTREVISION for package change PR: 257647 Reported by: Duane --- deskutils/todo/Makefile | 3 +++ deskutils/todo/files/patch-todo.sh | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/deskutils/todo/Makefile b/deskutils/todo/Makefile index 50bdce4a635e..9a8af2e89264 100644 --- a/deskutils/todo/Makefile +++ b/deskutils/todo/Makefile @@ -27,6 +27,9 @@ CONFLICTS_INSTALL= deforaos-todo devtodo SHEBANG_FILES= todo.sh todo_completion +post-patch: + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/todo.sh + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/todo.sh ${STAGEDIR}${PREFIX}/bin/todo ${INSTALL_DATA} ${WRKSRC}/todo.cfg ${STAGEDIR}${PREFIX}/etc/todo.cfg diff --git a/deskutils/todo/files/patch-todo.sh b/deskutils/todo/files/patch-todo.sh new file mode 100644 index 000000000000..794b6c7923bd --- /dev/null +++ b/deskutils/todo/files/patch-todo.sh @@ -0,0 +1,11 @@ +--- todo.sh.orig 2020-08-12 04:44:46 UTC ++++ todo.sh +@@ -622,7 +622,7 @@ TODOTXT_DEFAULT_ACTION=${TODOTXT_DEFAULT_ACTION:-} + TODOTXT_SORT_COMMAND=${TODOTXT_SORT_COMMAND:-env LC_COLLATE=C sort -f -k2} + TODOTXT_DISABLE_FILTER=${TODOTXT_DISABLE_FILTER:-} + TODOTXT_FINAL_FILTER=${TODOTXT_FINAL_FILTER:-cat} +-TODOTXT_GLOBAL_CFG_FILE=${TODOTXT_GLOBAL_CFG_FILE:-/etc/todo/config} ++TODOTXT_GLOBAL_CFG_FILE=${TODOTXT_GLOBAL_CFG_FILE:-%%PREFIX%%/etc/todo.cfg} + TODOTXT_SIGIL_BEFORE_PATTERN=${TODOTXT_SIGIL_BEFORE_PATTERN:-} # Allow any other non-whitespace entity before +project and @context; should be an optional match; example: \(w:\)\{0,1\} to allow w:@context. + TODOTXT_SIGIL_VALID_PATTERN=${TODOTXT_SIGIL_VALID_PATTERN:-.*} # Limit the valid characters (from the default any non-whitespace sequence) for +project and @context; example: [a-zA-Z]\{3,\} to only allow alphabetic ones that are at least three characters long. + TODOTXT_SIGIL_AFTER_PATTERN=${TODOTXT_SIGIL_AFTER_PATTERN:-} # Allow any other non-whitespace entity after +project and @context; should be an optional match; example: )\{0,1\} to allow (with the corresponding TODOTXT_SIGIL_BEFORE_PATTERN) enclosing in parentheses.