--- tig.orig/Makefile	2016-04-01 14:00:51 UTC
+++ tig/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: head/devel/tig/Makefile 412346 2016-04-01 14:00:51Z mat $
 
 PORTNAME=	tig
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	devel
 MASTER_SITES=	http://jonas.nitro.dk/tig/releases/
 
@@ -14,9 +14,11 @@
 
 RUN_DEPENDS=	git:devel/git
 
+USES=	iconv gmake ncurses readline:port
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_BASE}
-USES=		iconv gmake ncurses readline:port
+
+MAKE_ARGS=	V=1
 
 ALL_TARGET=	all strip
 INSTALL_TARGET=	install
@@ -34,4 +36,11 @@
 			man/man5/tigrc.5.gz \
 			man/man7/tigmanual.7.gz
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD
+# Remove linking with libtermcap.so, which is libncurses.so on FreeBSD.
+CONFIGURE_ARGS+=	bash_cv_termcap_lib=libc
+.endif
+
+.include <bsd.port.post.mk>
--- tig.orig/distinfo	2015-05-04 11:17:03 UTC
+++ tig/distinfo
@@ -1,2 +1,3 @@
-SHA256 (tig-2.1.1.tar.gz) = 50c5179fd564b829b6b2cec087e66f10cf8799601de19350df0772ae77e4852f
-SIZE (tig-2.1.1.tar.gz) = 641710
+TIMESTAMP = 1470883142
+SHA256 (tig-2.2.tar.gz) = 8f5213d3abb45ca9a79810b8d2a2a12d941112bc4682bcfa91f34db74942754c
+SIZE (tig-2.2.tar.gz) = 1030062
--- tig.orig/files/patch-config.make.in	2015-05-04 11:17:03 UTC
+++ tig/files/patch-config.make.in
@@ -1,11 +0,0 @@
---- config.make.in.orig	2015-04-09 00:19:11 UTC
-+++ config.make.in
-@@ -12,7 +12,7 @@ CC = @CC@
- CFLAGS = @CFLAGS@ @COVERAGE_CFLAGS@
- CPPFLAGS = @CPPFLAGS@ -DHAVE_CONFIG_H
- LDFLAGS = @LDFLAGS@
--LDLIBS = @LIBS@ @CURSES_LIB@
-+LDLIBS = @CURSES_LIB@ @LIBS@
- 
- ASCIIDOC = @ASCIIDOC@
- XMLTO = @XMLTO@
--- tig.orig/files/patch-src_ui.c	2015-05-04 11:17:03 UTC
+++ tig/files/patch-src_ui.c
@@ -1,14 +0,0 @@
-# Origin: https://github.com/jonas/tig/commit/718c6e94fcc111e5607d6ca0bf3d15271adc0d97
-# Subject: ui: fix crash due to out-of-bounds array access
-
---- src/ui.c.orig	2015-04-09 00:19:11 UTC
-+++ src/ui.c
-@@ -293,7 +293,7 @@ open_file_finder(const char *commit)
- 	finder.keymap = get_keymap("search", STRING_SIZE("search")),
- 	file_finder_update(&finder);
- 	file_finder_draw(&finder);
--	if (read_prompt_incremental("Find file: ", FALSE, file_finder_input_handler, &finder))
-+	if (read_prompt_incremental("Find file: ", FALSE, file_finder_input_handler, &finder) && finder.pos.lineno < finder.lines)
- 		file = get_path(finder.line[finder.pos.lineno]->text);
- 
- 	file_finder_done(&finder);