Skip to content

Commit

Permalink
devel/tig: Update to 2.5.8
Browse files Browse the repository at this point in the history
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
  • Loading branch information
John Hein authored and 0mp committed Jul 18, 2023
1 parent 7187c76 commit 184c1d6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
14 changes: 8 additions & 6 deletions 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}/

Expand All @@ -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
Expand All @@ -22,21 +22,23 @@ 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' \
man/man1/tig.1.gz \
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
Expand Down
6 changes: 3 additions & 3 deletions 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

0 comments on commit 184c1d6

Please sign in to comment.