diff --git a/devel/tig/Makefile b/devel/tig/Makefile index 97b2042db431..08be68bf2193 100644 --- a/devel/tig/Makefile +++ b/devel/tig/Makefile @@ -1,22 +1,22 @@ -# $NetBSD: Makefile,v 1.15 2017/01/04 18:16:32 roy Exp $ +# $NetBSD: Makefile,v 1.16 2021/01/26 14:11:02 fcambus Exp $ -DISTNAME= tig-1.2.1 -PKGREVISION= 3 +DISTNAME= tig-2.5.1 CATEGORIES= devel scm -MASTER_SITES= http://jonas.nitro.dk/tig/releases/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=jonas/} +GITHUB_RELEASE= ${DISTNAME} -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://jonas.nitro.dk/tig/ +MAINTAINER= fcambus@NetBSD.org +HOMEPAGE= https://jonas.github.io/tig/ COMMENT= Ncurses-based GIT repository tool LICENSE= gnu-gpl-v2 -BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc -BUILD_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto +TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc +TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto DEPENDS+= git-base-[0-9]*:../../devel/git-base GNU_CONFIGURE= yes USE_TOOLS+= gmake -FAKE_NCURSES= yes +USE_NCURSES= yes # Display issues with NetBSD curses(3) CONF_FILES= ${EGDIR}/tigrc ${PKG_SYSCONFDIR}/tigrc EGDIR= ${PREFIX}/share/examples/${PKGBASE} @@ -39,12 +39,13 @@ CFLAGS+= -D_BSD_SOURCE BUILD_TARGET= all doc INSTALL_TARGET= install install-doc +TEST_TARGET= test post-install: ${INSTALL_DATA_DIR} ${DESTDIR}/${EGDIR} && \ - ${INSTALL_DATA} ${WRKSRC}/contrib/tigrc ${DESTDIR}/${EGDIR} - -.include "options.mk" + ${INSTALL_DATA} ${WRKSRC}/tigrc ${DESTDIR}/${EGDIR} .include "../../converters/libiconv/buildlink3.mk" +.include "../../devel/ncursesw/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/tig/PLIST b/devel/tig/PLIST index 173afb292763..f9ddbba7cffe 100644 --- a/devel/tig/PLIST +++ b/devel/tig/PLIST @@ -1,5 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2014/04/04 21:00:24 ryoon Exp $ -bin/test-graph +@comment $NetBSD: PLIST,v 1.6 2021/01/26 14:11:02 fcambus Exp $ bin/tig man/man1/tig.1 man/man5/tigrc.5 diff --git a/devel/tig/distinfo b/devel/tig/distinfo index 0610defbe250..b930ae93dc1e 100644 --- a/devel/tig/distinfo +++ b/devel/tig/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 03:29:36 agc Exp $ +$NetBSD: distinfo,v 1.11 2021/01/26 14:11:02 fcambus Exp $ -SHA1 (tig-1.2.1.tar.gz) = 5755bae7342debf94ef33973e0eaff6207e623dc -RMD160 (tig-1.2.1.tar.gz) = cfb50c243d8a3aa4ec849232794144d5016d3cb5 -SHA512 (tig-1.2.1.tar.gz) = 6e58aab9970731454c264793f7c4ace1f04dc4a7bd3387e6ea23a58138ad176827050441530b45a7a9a877d89fd45b5a6a45d5bdd18605664b8bbd2876c5ab17 -Size (tig-1.2.1.tar.gz) = 160039 bytes -SHA1 (patch-aa) = f48be2c54131a100d3be6cae3051afc0a83b5fe0 -SHA1 (patch-contrib_config.make-Darwin) = b24435aceea930ea7a5f4c371c8b90360b6d4956 -SHA1 (patch-tig_c) = 1f309ad94737f11abc7e5f37d1ede91b2a17117c -SHA1 (patch-tig_h) = 81c4623867f80888cdb10109a3cd373937e24f43 +SHA1 (tig-2.5.1.tar.gz) = fd1b28bba7dff24ed112b869bb95a847c4e7ed3b +RMD160 (tig-2.5.1.tar.gz) = 2bc115eeecdcca3fe5014d2b544b2ddce349fd96 +SHA512 (tig-2.5.1.tar.gz) = e7c27a1e6357ce3cb4c02ff409d40c0ca67d10875eedbf467b9a280d8433cca15d16860256637041003384e7c536aca743ce971e623d3000dceeda598d6d3ae0 +Size (tig-2.5.1.tar.gz) = 1144666 bytes +SHA1 (patch-Makefile) = e8b0f62f4eb2e6a774c0558a10c8f64ece291d79 +SHA1 (patch-contrib_config.make-Darwin) = f44553e19dacbb6838f876e43c62e9261aa49f77 +SHA1 (patch-include_tig_tig.h) = 49c9152bc522eb0d6ceb3ca8933f1cb1958d9ece diff --git a/devel/tig/options.mk b/devel/tig/options.mk deleted file mode 100644 index cdbe591bcefd..000000000000 --- a/devel/tig/options.mk +++ /dev/null @@ -1,15 +0,0 @@ -# $NetBSD: options.mk,v 1.3 2017/01/04 18:16:32 roy 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" - -USE_CURSES= getsyx -.include "../../mk/curses.buildlink3.mk" diff --git a/devel/tig/patches/patch-Makefile b/devel/tig/patches/patch-Makefile new file mode 100644 index 000000000000..7165e880f3d7 --- /dev/null +++ b/devel/tig/patches/patch-Makefile @@ -0,0 +1,24 @@ +$NetBSD: patch-Makefile,v 1.1 2021/01/26 14:11:03 fcambus Exp $ + +- Don't make/install PDF. +- Do not install tigrc, this is handled via CONF_FILES by pkgsrc. + +--- Makefile.orig 2020-04-08 16:17:38.000000000 +0000 ++++ Makefile +@@ -51,7 +51,7 @@ TOOLS = test/tools/test-graph tools/doc- + TXTDOC = doc/tig.1.adoc doc/tigrc.5.adoc doc/manual.adoc NEWS.adoc README.adoc INSTALL.adoc test/API.adoc + 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. +@@ -96,7 +96,6 @@ export sysconfdir + + install: all + $(QUIET_INSTALL)tools/install.sh bin $(EXE) "$(DESTDIR)$(bindir)" +- $(QUIET_INSTALL)tools/install.sh data tigrc "$(DESTDIR)$(sysconfdir)" + + install-doc-man: doc-man + $(Q)$(foreach doc, $(filter %.1, $(MANDOC)), \ diff --git a/devel/tig/patches/patch-aa b/devel/tig/patches/patch-aa deleted file mode 100644 index 7b6113a72d27..000000000000 --- a/devel/tig/patches/patch-aa +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2014/04/04 21:00:24 ryoon Exp $ - -Don't make/install PDF. - ---- Makefile.orig 2013-09-18 01:13:35.000000000 +0000 -+++ Makefile -@@ -44,7 +44,7 @@ TESTS = test-graph - 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. -@@ -72,6 +72,7 @@ doc-html: $(HTMLDOC) - install: all - @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-contrib_config.make-Darwin b/devel/tig/patches/patch-contrib_config.make-Darwin index ded0dea15717..2ed2242c6121 100644 --- a/devel/tig/patches/patch-contrib_config.make-Darwin +++ b/devel/tig/patches/patch-contrib_config.make-Darwin @@ -1,9 +1,9 @@ -$NetBSD: patch-contrib_config.make-Darwin,v 1.1 2014/05/15 01:14:44 pho Exp $ +$NetBSD: patch-contrib_config.make-Darwin,v 1.2 2021/01/26 14:11:03 fcambus Exp $ Do not override XML_CATALOG_FILES on Darwin. That will only make xmllint try to find a wrong catalog. ---- contrib/config.make-Darwin.orig 2013-08-24 14:42:16.000000000 +0000 +--- contrib/config.make-Darwin.orig 2020-04-08 16:17:38.000000000 +0000 +++ contrib/config.make-Darwin @@ -1,8 +1,5 @@ # Example configuration for Darwin / Mac OS X. @@ -11,6 +11,6 @@ xmllint try to find a wrong catalog. -# Work-around for Homebrew-based xmlto. -export XML_CATALOG_FILES=/usr/local/etc/xml/catalog - - LDLIBS = -lcurses -liconv - CPPFLAGS = -DHAVE_CURSES_H + TIG_CFLAGS += -DHAVE_EXECINFO_H + TIG_LDLIBS = -liconv diff --git a/devel/tig/patches/patch-tig_h b/devel/tig/patches/patch-include_tig_tig.h similarity index 59% rename from devel/tig/patches/patch-tig_h rename to devel/tig/patches/patch-include_tig_tig.h index 4a2aafe3d1cc..11bb041c0bbf 100644 --- a/devel/tig/patches/patch-tig_h +++ b/devel/tig/patches/patch-include_tig_tig.h @@ -1,8 +1,10 @@ -$NetBSD: patch-tig_h,v 1.3 2013/08/23 05:09:28 schmonz Exp $ +$NetBSD: patch-include_tig_tig.h,v 1.1 2021/01/26 14:11:03 fcambus Exp $ ---- tig.h.orig 2013-08-10 14:27:10.000000000 +0000 -+++ tig.h -@@ -93,7 +93,7 @@ +Macro safety fix. + +--- include/tig/tig.h.orig 2020-04-08 16:17:38.000000000 +0000 ++++ include/tig/tig.h +@@ -119,7 +119,7 @@ #define MIN(x, y) ((x) < (y) ? (x) : (y)) #define MAX(x, y) ((x) > (y) ? (x) : (y)) diff --git a/devel/tig/patches/patch-tig_c b/devel/tig/patches/patch-tig_c deleted file mode 100644 index 64d6ff915579..000000000000 --- a/devel/tig/patches/patch-tig_c +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-tig_c,v 1.4 2014/04/04 21:00:24 ryoon Exp $ - ---- tig.c.orig 2013-08-24 14:42:16.000000000 +0000 -+++ tig.c -@@ -2669,20 +2669,20 @@ redraw_display(bool clear) - */ - - #define TOGGLE_MENU \ -- TOGGLE_(LINENO, '.', "line numbers", &opt_line_number, NULL) \ -+ TOGGLE_(LINENO, '.', "line numbers", &opt_line_number, (struct enum_map *)NULL) \ - TOGGLE_(DATE, 'D', "dates", &opt_date, date_map) \ - TOGGLE_(AUTHOR, 'A', "author", &opt_author, author_map) \ - TOGGLE_(GRAPHIC, '~', "graphics", &opt_line_graphics, graphic_map) \ -- 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) \ -- TOGGLE_(CHANGES, 'C', "local change display", &opt_show_changes, NULL) \ -- TOGGLE_(ID, 'X', "commit ID display", &opt_show_id, NULL) \ -- TOGGLE_(FILES, '%', "file filtering", &opt_file_filter, NULL) \ -- TOGGLE_(TITLE_OVERFLOW, '$', "commit title overflow display", &opt_show_title_overflow, NULL) \ -+ TOGGLE_(REFS, 'F', "reference display", &opt_show_refs, (struct enum_map *)NULL) \ -+ TOGGLE_(CHANGES, 'C', "local change display", &opt_show_changes, (struct enum_map *)NULL) \ -+ TOGGLE_(ID, 'X', "commit ID display", &opt_show_id, (struct enum_map *)NULL) \ -+ TOGGLE_(FILES, '%', "file filtering", &opt_file_filter, (struct enum_map *)NULL) \ -+ TOGGLE_(TITLE_OVERFLOW, '$', "commit title overflow display", &opt_show_title_overflow, (struct enum_map *)NULL) \ - - static bool - toggle_option(struct view *view, enum request request, char msg[SIZEOF_STR])