Hi ports@,
Here is a patch to update devel/tig to 2.2.
Notable changes:
- Added a FAKE_FLAGS directive so upstream Makefile install target puts
'tigrc' where it should (and not outside of every prefix)
- We do not need to install 'tigrc' manually in post-install anymore
- Dropped a no longer necessary patch
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/tig/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile 10 Apr 2016 21:29:05 -0000 1.19
+++ Makefile 17 Aug 2016 15:27:51 -0000
@@ -2,8 +2,7 @@
COMMENT = ncurses Git repository browser
-DISTNAME = tig-2.1.1
-REVISION = 2
+DISTNAME = tig-2.2
CATEGORIES = devel
@@ -31,13 +30,13 @@ ALL_TARGET = all doc-man doc-html
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS += --with-libiconv=${LOCALBASE} DOCBOOK2PDF=false
+FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/tig
+
NO_TEST = Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tig
${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${PREFIX}/share/doc/tig
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tig
- ${INSTALL_DATA} ${WRKSRC}/tigrc ${PREFIX}/share/examples/tig
${INSTALL_MAN} ${WRKSRC}/doc/tig.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/doc/tigrc.5 ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/doc/tigmanual.7 ${PREFIX}/man/man7
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/tig/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo 5 Dec 2015 22:26:33 -0000 1.10
+++ distinfo 17 Aug 2016 15:27:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (tig-2.1.1.tar.gz) = UMUXn9VkuCm2ss7Ah+ZvEM+HmWAd4ZNQ3wdyrnfkhS8=
-SIZE (tig-2.1.1.tar.gz) = 641710
+SHA256 (tig-2.2.tar.gz) = j1IT06u0XKmnmBC40qKhLZQRErxGgrz6kfNNt0lCdUw=
+SIZE (tig-2.2.tar.gz) = 1030062
Index: patches/patch-src_graph-v2_c
===================================================================
RCS file: patches/patch-src_graph-v2_c
diff -N patches/patch-src_graph-v2_c
--- patches/patch-src_graph-v2_c 10 Jun 2015 18:33:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_graph-v2_c,v 1.1 2015/06/10 18:33:00 matthieu Exp $
-
-Fix potential invalid read in shift_left()
-https://github.com/jonas/tig/commit/38e8e7d1527cab1d7c9d5cc8030c940d4e2485fb
-
---- src/graph-v2.c.orig Wed Mar 11 04:30:33 2015
-+++ src/graph-v2.c Wed Jun 10 08:43:43 2015
-@@ -668,7 +668,7 @@
- symbol->matches_commit = (strcmp(column->id, graph->id) ==
0);
-
- symbol->shift_left = shift_left(row, prev_row, pos);
-- symbol->continue_shift = shift_left(row, prev_row, pos + 1);
-+ symbol->continue_shift = (pos + 1 < row->size) ?
shift_left(row, prev_row, pos + 1) : 0;
- symbol->below_shift =
prev_row->columns[pos].symbol.shift_left;
-
- symbol->new_column = new_column(row, prev_row, pos);
