From nobody Tue Jul 18 15:16:24 2023 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 4R52bX60jSz4ms3x; Tue, 18 Jul 2023 15:16:24 +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 4R52bX5TM0z4DHn; Tue, 18 Jul 2023 15:16:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689693384; 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=wAXmqwHuORaggwESW2zDnt3jT3J3lSuzUJpFm+pro9c=; b=reyYUUy3B133A9DQvQG4ebhbakRYTFmf2Q6M9SzBt5kxQ60ULV1mG6P/TOzdFtVyhG3w2N cYHYiZWHnjaVatIQxOst6ogO285RgMhIYu/IIiBR/ttraMJ292sAnq8LyK56sEFkn2vJ9+ pT8oYeHVHDtp0fqoZqHTEzUUPNiw6TCsNy2g0eQGhxOinBz5gNPgWhxVi9zt+KHTNKC5HD v63R52unT6y1BgksA1uusnNp+SvsNq4+rApAb2TCf498b+fkc/9P4XKfB8sVThWGpl3/HO Tm3ge8Lhh7jH9wpkWbfhGUtEd68yvXAQzMT2HDtPRwpDFWhyV/OXCgPnI6WATw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689693384; 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=wAXmqwHuORaggwESW2zDnt3jT3J3lSuzUJpFm+pro9c=; b=M9+7kwP5/FhHRY35lR+O7D2C0+pEWn5ZHjAx50oOMiooSLHi8m9t64316uwl04KrtGNjOR Y3Zb31UGFp/z0MpPkpYS2af/NVePh1bNUZj44mM9ly1RDW5uSgL4jfVO4QqEekDfwr/v+P 18ZLCIBVw3IN6OI4bcTnB8Mf2a2CtIdN0IPZWGPCy4KzrPTkH5JvOY0gHzBqr5B3d70S4W ILJdoVYHkXTV1FYxdZWsehJFSjyASwglQXanu9DkJbjqVr+mQblerakhC/PQZWApZJSj4M OQcXWiz1QAuZPimY9bn2ZyOPfKogCRynZsybOBaHkIEs8ytI53G2viKh0P1YSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689693384; a=rsa-sha256; cv=none; b=Njv4pdmjOn5toLDTOTxvWId2M9PP6Y8H3VYuc6G5PUkpB3JW0msVGwUOq+OLNl2QXVXBjq nI6Zx2i3JZ0BnFssZi1MlGpue86e3oUntKD4LD2B/z1jjoi+oPK8XX6pVBGwTg4kJlWaWN WQ1OMRqn2tpLcJQjZfuDF7YPgNY/eQlw1+OYADObJc1T5edz2DHmH2VwU3B8rrSlSs+clS hgrXtd7TSqQ/ehU1Vw/9lEZzxevg44SzJzBcMq9+81mGCf2+bPL5Af7FCRfB/uh0ijMX3D LvNguer1nqFOT/ekqa124A+SR8fJkJnLCeFfCN6C8TSpQLJ1GSuPmYT7Bz+HwA== 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 4R52bX4ZPyz19WP; Tue, 18 Jul 2023 15:16:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36IFGOBo015734; Tue, 18 Jul 2023 15:16:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36IFGOJU015733; Tue, 18 Jul 2023 15:16:24 GMT (envelope-from git) Date: Tue, 18 Jul 2023 15:16:24 GMT Message-Id: <202307181516.36IFGOJU015733@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 184c1d6d8bea - main - devel/tig: Update to 2.5.8 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: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 184c1d6d8bea06f2942c63ace2df4449626dc419 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=184c1d6d8bea06f2942c63ace2df4449626dc419 commit 184c1d6d8bea06f2942c63ace2df4449626dc419 Author: John Hein AuthorDate: 2023-07-18 15:14:05 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-07-18 15:15:45 +0000 devel/tig: Update to 2.5.8 Apart from the update, the patch also fixes a missing dependency. If pcre2 (or pcre) is detected during 'configure', it will enable the pcre library during the build. If so, 'make stage-qa' will complain: > Error: /usr/local/bin/tig is linked to /usr/local/lib/libpcre2-posix.so.3 from devel/pcre2 but it is not declared as a dependency > Warning: you need LIB_DEPENDS+=libpcre2-posix.so:devel/pcre2 The patch also adds a PCRE option that explicity enables / disables pcre as desired. The default state of the PCRE option is off which is just like how packages are build in a package builder environment where the pcre package is not installed. But I have no problem with having it on by default (committer's discretion). The advantage is that it allows users to search via regexp which is a useful tool. The pcre libs have a friendly BSD3CLAUSE license. While here, tweak some sorting / formatting as hinted by portfmt/portclippy. PR: 270362 --- devel/tig/Makefile | 14 ++++++++------ devel/tig/distinfo | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/devel/tig/Makefile b/devel/tig/Makefile index 5c7e2c602d65..a8290a64b462 100644 --- a/devel/tig/Makefile +++ b/devel/tig/Makefile @@ -1,5 +1,5 @@ PORTNAME= tig -DISTVERSION= 2.5.5 +DISTVERSION= 2.5.8 CATEGORIES= devel MASTER_SITES= https://github.com/jonas/tig/releases/download/${DISTNAME}/ @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= git:devel/git -USES= iconv gmake ncurses readline +USES= gmake iconv ncurses readline GNU_CONFIGURE= yes CONFIGURE_ARGS= ${ICONV_CONFIGURE_BASE} MAKE_ARGS= V=1 @@ -22,8 +22,8 @@ INSTALL_TARGET= install install-doc-man # Tests fail when running as part of a non-interactive Poudriere # build, but using script(1) seems to be a good enough workaround and # allows them to run successfully anyway. -TEST_TARGET= test -DO_MAKE_TEST= /usr/bin/script -q /dev/null ${SETENV} ${TEST_ENV} ${GMAKE} +TEST_TARGET= test-address-sanitizer +DO_MAKE_TEST= script -q /dev/null ${SETENV} ${TEST_ENV} ${GMAKE} PLIST_FILES= bin/tig \ '@sample etc/tigrc.sample' \ @@ -31,12 +31,14 @@ PLIST_FILES= bin/tig \ man/man5/tigrc.5.gz \ man/man7/tigmanual.7.gz -OPTIONS_DEFINE= GIT +OPTIONS_DEFINE= GIT PCRE GIT_DESC= Install devel/git as runtime dependency GIT_RUN_DEPENDS= git:devel/git -GIT_VARS_OFF= PKGMESSAGE="${.CURDIR}/pkg-message-git" +GIT_VARS_OFF= PKGMESSAGE="${.CURDIR}/pkg-message-git" +PCRE_LIB_DEPENDS= lpcre2-posix.so:devel/pcre2 +PCRE_CONFIGURE_WITH= pcre post-install: ${MV} ${STAGEDIR}${PREFIX}/etc/tigrc ${STAGEDIR}${PREFIX}/etc/tigrc.sample diff --git a/devel/tig/distinfo b/devel/tig/distinfo index 104aea6ed57a..4a03b083b858 100644 --- a/devel/tig/distinfo +++ b/devel/tig/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642672607 -SHA256 (tig-2.5.5.tar.gz) = 24ba2c8beae889e6002ea7ced0e29851dee57c27fde8480fb9c64d5eb8765313 -SIZE (tig-2.5.5.tar.gz) = 1175752 +TIMESTAMP = 1678964725 +SHA256 (tig-2.5.8.tar.gz) = b70e0a42aed74a4a3990ccfe35262305917175e3164330c0889bd70580406391 +SIZE (tig-2.5.8.tar.gz) = 1179844