summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjs <bjs>2008-11-08 10:44:12 +0000
committerbjs <bjs>2008-11-08 10:44:12 +0000
commit27d8305b5322ee376bb40810cc87be5fccc0dcf0 (patch)
treec6a796e62d617ce9cb454827623674c26c1d8365
parentc0028c1510797fb56de101bb0f92c95f1d75396a (diff)
downloadpkgsrc-27d8305b5322ee376bb40810cc87be5fccc0dcf0.tar.gz
Update to tig-0.12.1.
Changes: tig-0.12.1 ---------- Improvements: * Status view: revert uncommitted diff chunks and unstaged files with changes. Bound to ! by default. * Main view: use --topo-order also when rev-list arguments are given on the command line. * Log view: support for refreshing. Bug fixes: * Status view: use ls-files' --exclude-standard so user specific ignore rules are effective. The option was added in git version 1.5.4. * Stage view: fix assertion failure triggered when updating while status view is not displayed. * Help view: avoid confusion by showing "(no key)" instead of "?" for unbound requests. * Reload repository references when refreshing the main (and log) view. * Do not maximize views when refreshing. tig-0.12 -------- Improvements: * F5 also refreshes the current view. * Allow line graphics to be disabled with new line-graphics option. * Main view: also include the reference names when searching. * Main view: support for refreshing. * Main view: disable boundary commits by default. Use --boundary when they should be shown. (Debian bug 498628) * Stage view: add stage-next action to jump to next diff chunk that can be staged. By default bound to @. * Configure: check for the ncurses header files. * Add author-width option to costumize the width of the author column. For example, put the following in ~/.tigrc: set author-width = 10 Bug fixes: * Fix regression when staging all diff chunks in a section. * Bind the maximize view action to O; it conflicted with the keybinding to launch the merge tool in the status view. * Fix problem with $(cmd) usage in shell code. Some shells (jsh) installed as /bin/sh does not support it. * Do not show incomplete boundary commits when --no-walk is used. * Documentation: Rename gitlink macro to support AsciiDoc 8.2.3. * Ignore pipe reads with errno "Success" reported after a signals, for example when refreshing doing background loading. tig-0.11 -------- Incompatibilities: * Remove parsing of deprecated options: -g, -l, -d. * The first seen -- will stop option parsing and is passed to git instead of breaking out of tig's option parsing. New features: * Blame view; bound to B by default, reachable from the command line and the tree, status, and stage views. * Blame/main view: allow display of date, author, and references to be toggled on/off. Bound to D, A, and F respectively. * Add action to maximize the current view. Improvements: * Show the current branch in the status view. * Show local/light-weight tags. Bug fixes: * Fix regressions for the pager mode. * Fix refreshing of the index with working directory info.
-rw-r--r--devel/tig/Makefile14
-rw-r--r--devel/tig/PLIST5
-rw-r--r--devel/tig/distinfo13
-rw-r--r--devel/tig/options.mk18
-rw-r--r--devel/tig/patches/patch-aa8
5 files changed, 42 insertions, 16 deletions
diff --git a/devel/tig/Makefile b/devel/tig/Makefile
index de5a613bbfb..256feed50c4 100644
--- a/devel/tig/Makefile
+++ b/devel/tig/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/04/06 05:13:45 bjs Exp $
+# $NetBSD: Makefile,v 1.3 2008/11/08 10:44:12 bjs Exp $
#
-DISTNAME= tig-0.10.1
+DISTNAME= tig-0.12.1
CATEGORIES= devel scm
MASTER_SITES= http://jonas.nitro.dk/tig/releases/
@@ -19,6 +19,9 @@ GNU_CONFIGURE= yes
USE_TOOLS+= gmake
USE_NCURSES= yes
+CONF_FILES= ${EGDIR}/tigrc ${PKG_SYSCONFDIR}/tigrc
+EGDIR= ${PREFIX}/share/examples/${PKGBASE}
+
GIT_CONFIG= ${PREFIX}/bin/git-config
CONFIGURE_ENV+= GIT_CONFIG=${GIT_CONFIG:Q}
@@ -28,6 +31,11 @@ CONFIGURE_ARGS.gnu-iconv= --with-libiconv=${BUILDLINK_PREFIX.iconv}
BUILD_TARGET= all doc
INSTALL_TARGET= install install-doc
-.include "../../devel/ncurses/buildlink3.mk"
+post-install:
+ ${INSTALL_DATA_DIR} ${DESTDIR}/${EGDIR} && \
+ ${INSTALL_DATA} ${WRKSRC}/contrib/tigrc ${DESTDIR}/${EGDIR}
+
+.include "options.mk"
+
.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/tig/PLIST b/devel/tig/PLIST
index 55e27a8c031..a8ccd56d922 100644
--- a/devel/tig/PLIST
+++ b/devel/tig/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/11/16 07:41:11 bjs Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/11/08 10:44:12 bjs Exp $
bin/tig
man/man1/tig.1
man/man5/tigrc.5
+share/doc/tig/NEWS.html
share/doc/tig/README.html
share/doc/tig/manual.html
share/doc/tig/tig.1.html
share/doc/tig/tigrc.5.html
+share/examples/tig/tigrc
+@dirrm share/examples/tig
@dirrm share/doc/tig
diff --git a/devel/tig/distinfo b/devel/tig/distinfo
index 1e4f714857c..539ca3c187e 100644
--- a/devel/tig/distinfo
+++ b/devel/tig/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/04/06 05:13:45 bjs Exp $
+$NetBSD: distinfo,v 1.3 2008/11/08 10:44:12 bjs Exp $
-SHA1 (tig-0.10.1.tar.gz) = 7793d3a7f603b3cbcc3746f9ef4b724d54693eb9
-RMD160 (tig-0.10.1.tar.gz) = c9052bb4e1a9d4fb6551b492cfdce540afb402a4
-Size (tig-0.10.1.tar.gz) = 104006 bytes
-SHA1 (patch-aa) = 0c0ee454f8d2e7dfad6ed5fa83eeb00adc16da77
-SHA1 (patch-ab) = c27ccfe5169cb911ede50159e459169fa760c2f8
-SHA1 (patch-ac) = ae186a0611244326392b01022222872b3b569f7d
-SHA1 (patch-ad) = eca9e88286bbe3d3d675465f28f53e95062e716a
+SHA1 (tig-0.12.1.tar.gz) = b867a22e248e3c014489ea7c33567e4ca885d88a
+RMD160 (tig-0.12.1.tar.gz) = ab854872590439015fcd871d61334524811e4920
+Size (tig-0.12.1.tar.gz) = 121286 bytes
+SHA1 (patch-aa) = f3577b38895c5d0cb57dfb9843a66199d2fd0983
diff --git a/devel/tig/options.mk b/devel/tig/options.mk
new file mode 100644
index 00000000000..4972d2352a0
--- /dev/null
+++ b/devel/tig/options.mk
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2008/11/08 10:44:12 bjs Exp $
+#
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.tig
+PKG_SUPPORTED_OPTIONS= wide-curses
+###
+### Git commit messages often contain UTF-8, so we default
+### to this here.
+###
+PKG_SUGGESTED_OPTIONS+= wide-curses
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mwide-curses)
+. include "../../devel/ncursesw/buildlink3.mk"
+.else
+. include "../../devel/ncurses/buildlink3.mk"
+.endif
diff --git a/devel/tig/patches/patch-aa b/devel/tig/patches/patch-aa
index 254794dd6ea..97e36cec58c 100644
--- a/devel/tig/patches/patch-aa
+++ b/devel/tig/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/11/16 07:41:11 bjs Exp $
+$NetBSD: patch-aa,v 1.2 2008/11/08 10:44:12 bjs Exp $
Don't make/install PDF.
---- Makefile.orig 2007-09-29 17:16:27.000000000 -0400
+--- Makefile.orig 2008-10-08 08:44:57.000000000 -0400
+++ Makefile
-@@ -37,7 +37,7 @@ DFLAGS = -g -DDEBUG -Werror
+@@ -38,7 +38,7 @@ DFLAGS = -g -DDEBUG -Werror
PROGS = tig
MANDOC = tig.1 tigrc.5
- HTMLDOC = tig.1.html tigrc.5.html manual.html README.html
+ 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