aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2016-10-06 03:57:02 +0800
committeramdmi3 <amdmi3@FreeBSD.org>2016-10-06 03:57:02 +0800
commitdf5753e274710a5a666f15153cfe2ddedead7d23 (patch)
treeea0be5f0df81c48fbd53ad72a1206e3b96dfb946 /devel
parent3bc3914a2c212348e847158df9d4c5516d9d1144 (diff)
downloadfreebsd-ports-gnome-df5753e274710a5a666f15153cfe2ddedead7d23.tar.gz
freebsd-ports-gnome-df5753e274710a5a666f15153cfe2ddedead7d23.tar.zst
freebsd-ports-gnome-df5753e274710a5a666f15153cfe2ddedead7d23.zip
- Update to 2.2
PR: 211850 Submitted by: lightside@gmx.com Approved by: maintainer timeout (darcsis@gmail.com, 6 weeks)
Diffstat (limited to 'devel')
-rw-r--r--devel/tig/Makefile5
-rw-r--r--devel/tig/distinfo5
-rw-r--r--devel/tig/files/patch-config.make.in11
-rw-r--r--devel/tig/files/patch-src_ui.c14
-rw-r--r--devel/tig/files/patch-tools_ax__lib__readline.m426
5 files changed, 32 insertions, 29 deletions
diff --git a/devel/tig/Makefile b/devel/tig/Makefile
index 116da3a86846..57062753113f 100644
--- a/devel/tig/Makefile
+++ b/devel/tig/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tig
-PORTVERSION= 2.1.1
+PORTVERSION= 2.2
CATEGORIES= devel
MASTER_SITES= http://jonas.nitro.dk/tig/releases/
@@ -14,9 +14,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= git:devel/git
+USES= autoreconf 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
diff --git a/devel/tig/distinfo b/devel/tig/distinfo
index 45ed46d6fe66..0cbba4d6ca52 100644
--- a/devel/tig/distinfo
+++ b/devel/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
diff --git a/devel/tig/files/patch-config.make.in b/devel/tig/files/patch-config.make.in
deleted file mode 100644
index 71824ac6d8f8..000000000000
--- a/devel/tig/files/patch-config.make.in
+++ /dev/null
@@ -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@
diff --git a/devel/tig/files/patch-src_ui.c b/devel/tig/files/patch-src_ui.c
deleted file mode 100644
index 4306caf29cec..000000000000
--- a/devel/tig/files/patch-src_ui.c
+++ /dev/null
@@ -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);
diff --git a/devel/tig/files/patch-tools_ax__lib__readline.m4 b/devel/tig/files/patch-tools_ax__lib__readline.m4
new file mode 100644
index 000000000000..dd1af6528558
--- /dev/null
+++ b/devel/tig/files/patch-tools_ax__lib__readline.m4
@@ -0,0 +1,26 @@
+--- tools/ax_lib_readline.m4.orig 2016-08-11 02:38:59 UTC
++++ tools/ax_lib_readline.m4
+@@ -33,17 +33,19 @@ _bash_needmsg=
+ fi
+ AC_CACHE_VAL(bash_cv_termcap_lib,
+ [AC_CHECK_FUNC(tgetent, bash_cv_termcap_lib=libc,
+- [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
+- [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
+- bash_cv_termcap_lib=gnutermcap
+ if test "$ax_cv_curses_which" = "ncursesw"; then
+ [AC_CHECK_LIB(ncursesw, tgetent, bash_cv_termcap_lib=libncursesw)]
+ elif test "$ax_cv_curses_which" = "ncurses"; then
+ [AC_CHECK_LIB(ncurses, tgetent, bash_cv_termcap_lib=libncurses)]
+ elif test "$ax_cv_curses_which" = "plaincurses"; then
+ [AC_CHECK_LIB(curses, tgetent, bash_cv_termcap_lib=libcurses)]
++else
++ [AC_CHECK_LIB(termcap, tgetent, bash_cv_termcap_lib=libtermcap,
++ [AC_CHECK_LIB(tinfo, tgetent, bash_cv_termcap_lib=libtinfo,
++ bash_cv_termcap_lib=gnutermcap
++ )])]
+ fi
+-)])])])
++)])
+ if test "X$_bash_needmsg" = "Xyes"; then
+ AC_MSG_CHECKING(which library has the termcap functions)
+ fi