Update to 1.2.1

Changelog:
tig-1.2.1
---------

Incompatibilities:

 - Move manual and man pages to doc/ directory and rename AsciiDoc files
   to have .asciidoc as the extension to make them render on GitHub.

Improvements:

 - Show blob sizes in the tree view either as bytes or using binary unit
   prefixes. Example: `set show-file-size = units`. (GH #163)
 - Reduce main view memory usage and startup time, especially when revision
   graph rendering is disabled. (GH #160)

Bug fixes:

 - Fix submodule-related setup to check for non-zero return value from
   setenv(). (GH #188)

5 files changed, 28 insertions, 28 deletions

diff --git a/devel/tig/Makefile b/devel/tig/Makefile
index 7295daf7d35..7d2d94fc494 100644
--- a/devel/tig/Makefile
+++ b/devel/tig/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2014/04/04 20:45:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2014/04/04 21:00:24 ryoon Exp $
 
-DISTNAME=	tig-1.2
-PKGREVISION=	2
+DISTNAME=	tig-1.2.1
 CATEGORIES=	devel scm
 MASTER_SITES=	http://jonas.nitro.dk/tig/releases/
 
diff --git a/devel/tig/PLIST b/devel/tig/PLIST
index 362e355f3b6..173afb29276 100644
--- a/devel/tig/PLIST
+++ b/devel/tig/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2011/04/10 10:24:47 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/04/04 21:00:24 ryoon Exp $
 bin/test-graph
 bin/tig
 man/man1/tig.1
 man/man5/tigrc.5
 man/man7/tigmanual.7
+share/doc/tig/INSTALL.html
 share/doc/tig/NEWS.html
 share/doc/tig/README.html
 share/doc/tig/manual.html
diff --git a/devel/tig/distinfo b/devel/tig/distinfo
index 42b2bbcc823..c1bcd18ed2c 100644
--- a/devel/tig/distinfo
+++ b/devel/tig/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2013/08/23 05:09:28 schmonz Exp $
+$NetBSD: distinfo,v 1.8 2014/04/04 21:00:24 ryoon Exp $
 
-SHA1 (tig-1.2.tar.gz) = 38bff28a205b94623ad0c087a3073c986002dc83
-RMD160 (tig-1.2.tar.gz) = 419d66b2ac5c2daff163a01f0db442a7e1e7b11b
-Size (tig-1.2.tar.gz) = 216724 bytes
-SHA1 (patch-aa) = 2cb821a030f1f40fbdf098d1ffd339f3012b4b81
-SHA1 (patch-tig_c) = a02c564e805670213277fe3c8484a0cd289bcee1
+SHA1 (tig-1.2.1.tar.gz) = 5755bae7342debf94ef33973e0eaff6207e623dc
+RMD160 (tig-1.2.1.tar.gz) = cfb50c243d8a3aa4ec849232794144d5016d3cb5
+Size (tig-1.2.1.tar.gz) = 160039 bytes
+SHA1 (patch-aa) = f48be2c54131a100d3be6cae3051afc0a83b5fe0
+SHA1 (patch-tig_c) = 1f309ad94737f11abc7e5f37d1ede91b2a17117c
 SHA1 (patch-tig_h) = 81c4623867f80888cdb10109a3cd373937e24f43
diff --git a/devel/tig/patches/patch-aa b/devel/tig/patches/patch-aa
index b22623f4125..7b6113a72d2 100644
--- a/devel/tig/patches/patch-aa
+++ b/devel/tig/patches/patch-aa
@@ -1,24 +1,23 @@
-$NetBSD: patch-aa,v 1.5 2013/08/23 05:09:28 schmonz Exp $
+$NetBSD: patch-aa,v 1.6 2014/04/04 21:00:24 ryoon Exp $
 
-Don't make/install PDF, and be sure to install test-graph.
+Don't make/install PDF.
 
---- Makefile.orig	2013-08-10 14:27:12.000000000 +0000
+--- Makefile.orig	2013-09-18 01:13:35.000000000 +0000
 +++ Makefile
 @@ -44,7 +44,7 @@ TESTS	= test-graph
- TXTDOC	= tig.1.txt tigrc.5.txt manual.txt NEWS README INSTALL BUGS
- MANDOC	= tig.1 tigrc.5 tigmanual.7
- HTMLDOC = tig.1.html tigrc.5.html manual.html README.html NEWS.html
--ALLDOC	= $(MANDOC) $(HTMLDOC) manual.html-chunked manual.pdf
-+ALLDOC	= $(MANDOC) $(HTMLDOC) manual.html-chunked
+ TXTDOC	= doc/tig.1.asciidoc doc/tigrc.5.asciidoc doc/manual.asciidoc NEWS README INSTALL BUGS
+ MANDOC	= doc/tig.1 doc/tigrc.5 doc/tigmanual.7
+ HTMLDOC = doc/tig.1.html doc/tigrc.5.html doc/manual.html README.html INSTALL.html NEWS.html
+-ALLDOC	= $(MANDOC) $(HTMLDOC) doc/manual.html-chunked doc/manual.pdf
++ALLDOC	= $(MANDOC) $(HTMLDOC) doc/manual.html-chunked
  
  # Never include the release number in the tarname for tagged
  # versions.
-@@ -71,7 +71,7 @@ doc-html: $(HTMLDOC)
- 
+@@ -72,6 +72,7 @@ doc-html: $(HTMLDOC)
  install: all
- 	mkdir -p $(DESTDIR)$(bindir) && \
--	for prog in $(PROGS); do \
-+	for prog in $(PROGS) $(TESTS); do \
- 		install -p -m 0755 "$$prog" "$(DESTDIR)$(bindir)"; \
- 	done
+ 	@mkdir -p $(DESTDIR)$(bindir)
+ 	install -p -m 0755 $(EXE) "$(DESTDIR)$(bindir)"
++	install -p -m 0755 $(TESTS) "$(DESTDIR)$(bindir)"
  
+ install-doc-man: doc-man
+ 	mkdir -p $(DESTDIR)$(mandir)/man1 \
diff --git a/devel/tig/patches/patch-tig_c b/devel/tig/patches/patch-tig_c
index 0e515d1a866..64d6ff91557 100644
--- a/devel/tig/patches/patch-tig_c
+++ b/devel/tig/patches/patch-tig_c
@@ -1,8 +1,8 @@
-$NetBSD: patch-tig_c,v 1.3 2013/08/23 05:09:28 schmonz Exp $
+$NetBSD: patch-tig_c,v 1.4 2014/04/04 21:00:24 ryoon Exp $
 
---- tig.c.orig	2013-08-10 14:27:10.000000000 +0000
+--- tig.c.orig	2013-08-24 14:42:16.000000000 +0000
 +++ tig.c
-@@ -2594,19 +2594,19 @@ redraw_display(bool clear)
+@@ -2669,20 +2669,20 @@ redraw_display(bool clear)
   */
  
  #define TOGGLE_MENU \
@@ -14,6 +14,7 @@ $NetBSD: patch-tig_c,v 1.3 2013/08/23 05:09:28 schmonz Exp $
 -	TOGGLE_(REV_GRAPH, 'g', "revision graph",    &opt_rev_graph, NULL) \
 +	TOGGLE_(REV_GRAPH, 'g', "revision graph",    &opt_rev_graph, (struct enum_map *)NULL) \
  	TOGGLE_(FILENAME,  '#', "file names",        &opt_filename, filename_map) \
+ 	TOGGLE_(FILE_SIZE, '*', "file sizes",        &opt_file_size, file_size_map) \
  	TOGGLE_(IGNORE_SPACE, 'W', "space changes",  &opt_ignore_space, ignore_space_map) \
  	TOGGLE_(COMMIT_ORDER, 'l', "commit order",   &opt_commit_order, commit_order_map) \
 -	TOGGLE_(REFS,      'F', "reference display", &opt_show_refs, NULL) \