Sat Feb 4 09:25:50 2023 UTC ()
tig: Run xmlto with "--skip-validation"

Workaround for PR pkg/57218


(kim)
diff -r1.24 -r1.25 pkgsrc/devel/tig/Makefile
diff -r1.19 -r1.20 pkgsrc/devel/tig/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/tig/patches/patch-Makefile
cvs diff -r1.24 -r1.25 pkgsrc/devel/tig/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/tig/Makefile 2022/09/11 17:44:59 1.24
+++ pkgsrc/devel/tig/Makefile 2023/02/04 09:25:50 1.25
@@ -1,42 +1,46 @@ @@ -1,42 +1,46 @@
1# $NetBSD: Makefile,v 1.24 2022/09/11 17:44:59 fcambus Exp $ 1# $NetBSD: Makefile,v 1.25 2023/02/04 09:25:50 kim Exp $
2 2
3DISTNAME= tig-2.5.7 3DISTNAME= tig-2.5.7
 4PKGREVISION= 1
4CATEGORIES= devel scm 5CATEGORIES= devel scm
5MASTER_SITES= ${MASTER_SITE_GITHUB:=jonas/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=jonas/}
6GITHUB_RELEASE= ${DISTNAME} 7GITHUB_RELEASE= ${DISTNAME}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://jonas.github.io/tig/ 10HOMEPAGE= https://jonas.github.io/tig/
10COMMENT= Ncurses-based GIT repository tool 11COMMENT= Ncurses-based GIT repository tool
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc 14TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
14TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto 15TOOL_DEPENDS+= xmlto-[0-9]*:../../textproc/xmlto
15DEPENDS+= git-base-[0-9]*:../../devel/git-base 16DEPENDS+= git-base-[0-9]*:../../devel/git-base
16 17
17GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
18USE_TOOLS+= gmake gsed 19USE_TOOLS+= gmake gsed
19USE_NCURSES= yes # Display issues with NetBSD curses(3) 20USE_NCURSES= yes # Display issues with NetBSD curses(3)
20 21
21CONF_FILES= ${EGDIR}/tigrc ${PKG_SYSCONFDIR}/tigrc 22CONF_FILES= ${EGDIR}/tigrc ${PKG_SYSCONFDIR}/tigrc
22EGDIR= ${PREFIX}/share/examples/${PKGBASE} 23EGDIR= ${PREFIX}/share/examples/${PKGBASE}
23 24
24GIT_CONFIG= ${PREFIX}/bin/git-config 25GIT_CONFIG= ${PREFIX}/bin/git-config
25CONFIGURE_ENV+= GIT_CONFIG=${GIT_CONFIG:Q} 26CONFIGURE_ENV+= GIT_CONFIG=${GIT_CONFIG:Q}
26 27
27CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv} 28CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
28CONFIGURE_ARGS.gnu-iconv= --with-libiconv=${BUILDLINK_PREFIX.iconv} 29CONFIGURE_ARGS.gnu-iconv= --with-libiconv=${BUILDLINK_PREFIX.iconv}
29 30
 31# FIXME:
 32MAKE_FLAGS+= XMLTO_FLAGS=--skip-validation
 33
30.include "../../mk/bsd.prefs.mk" 34.include "../../mk/bsd.prefs.mk"
31.if !empty(GLIBC_VERSION) 35.if !empty(GLIBC_VERSION)
32# Some version of glibc requires _XOPEN_SOURCE being defined to 36# Some version of glibc requires _XOPEN_SOURCE being defined to
33# provide S_IFMT in <sys/stat.h> 37# provide S_IFMT in <sys/stat.h>
34CFLAGS+= -D_XOPEN_SOURCE 38CFLAGS+= -D_XOPEN_SOURCE
35# It is also required to define _BSD_SOURCE to get struct timezone 39# It is also required to define _BSD_SOURCE to get struct timezone
36# defined in <sys/time.h> 40# defined in <sys/time.h>
37CFLAGS+= -D_BSD_SOURCE 41CFLAGS+= -D_BSD_SOURCE
38.endif 42.endif
39 43
40BUILD_TARGET= all doc 44BUILD_TARGET= all doc
41INSTALL_TARGET= install install-doc 45INSTALL_TARGET= install install-doc
42TEST_TARGET= test 46TEST_TARGET= test
cvs diff -r1.19 -r1.20 pkgsrc/devel/tig/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/tig/distinfo 2022/09/11 17:44:59 1.19
+++ pkgsrc/devel/tig/distinfo 2023/02/04 09:25:50 1.20
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.19 2022/09/11 17:44:59 fcambus Exp $ 1$NetBSD: distinfo,v 1.20 2023/02/04 09:25:50 kim Exp $
2 2
3BLAKE2s (tig-2.5.7.tar.gz) = 6501ae8a58e09b030d500524b537af120ed1dfb3ac349200ae67421b86192c99 3BLAKE2s (tig-2.5.7.tar.gz) = 6501ae8a58e09b030d500524b537af120ed1dfb3ac349200ae67421b86192c99
4SHA512 (tig-2.5.7.tar.gz) = 26adbb8dc43ef7ec1eaf5d6def29a8b6dcf5e30825242fc489208139c8720805a265dd1ba412601df692f6d0438ee9e3171a3f8a3cc4599841d82dfc08a9ea1f 4SHA512 (tig-2.5.7.tar.gz) = 26adbb8dc43ef7ec1eaf5d6def29a8b6dcf5e30825242fc489208139c8720805a265dd1ba412601df692f6d0438ee9e3171a3f8a3cc4599841d82dfc08a9ea1f
5Size (tig-2.5.7.tar.gz) = 1176146 bytes 5Size (tig-2.5.7.tar.gz) = 1176146 bytes
6SHA1 (patch-Makefile) = 2745e89ad8b307558f7ecce38e40dcd69222cbc5 6SHA1 (patch-Makefile) = be72047f365b630f62f04fbb6b8f2de8628470e4
7SHA1 (patch-contrib_config.make-Darwin) = b340253dc02cf490dba86832f752660209971840 7SHA1 (patch-contrib_config.make-Darwin) = b340253dc02cf490dba86832f752660209971840
8SHA1 (patch-include_tig_tig.h) = ebc0eb9587477e8b782d6916124042ff2218bf64 8SHA1 (patch-include_tig_tig.h) = ebc0eb9587477e8b782d6916124042ff2218bf64
cvs diff -r1.3 -r1.4 pkgsrc/devel/tig/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/devel/tig/patches/patch-Makefile 2022/01/12 21:39:33 1.3
+++ pkgsrc/devel/tig/patches/patch-Makefile 2023/02/04 09:25:50 1.4
@@ -1,24 +1,46 @@ @@ -1,24 +1,46 @@
1$NetBSD: patch-Makefile,v 1.3 2022/01/12 21:39:33 fcambus Exp $ 1$NetBSD: patch-Makefile,v 1.4 2023/02/04 09:25:50 kim Exp $
2 2
3- Don't make/install PDF. 3- Don't make/install PDF.
 4- Add XMLTO_FLAGS.
4- Do not install tigrc, this is handled via CONF_FILES by pkgsrc. 5- Do not install tigrc, this is handled via CONF_FILES by pkgsrc.
5 6
6--- Makefile.orig 2022-01-11 18:50:37.000000000 +0000 7--- Makefile.orig 2022-08-25 17:27:20.000000000 +0000
7+++ Makefile 8+++ Makefile
8@@ -51,7 +51,7 @@ TOOLS = test/tools/test-graph tools/doc- 9@@ -51,7 +51,7 @@
9 TXTDOC = doc/tig.1.adoc doc/tigrc.5.adoc doc/manual.adoc NEWS.adoc README.adoc INSTALL.adoc test/API.adoc 10 TXTDOC = doc/tig.1.adoc doc/tigrc.5.adoc doc/manual.adoc NEWS.adoc README.adoc INSTALL.adoc test/API.adoc
10 MANDOC = doc/tig.1 doc/tigrc.5 doc/tigmanual.7 11 MANDOC = doc/tig.1 doc/tigrc.5 doc/tigmanual.7
11 HTMLDOC = doc/tig.1.html doc/tigrc.5.html doc/manual.html README.html INSTALL.html NEWS.html 12 HTMLDOC = doc/tig.1.html doc/tigrc.5.html doc/manual.html README.html INSTALL.html NEWS.html
12-ALLDOC = $(MANDOC) $(HTMLDOC) doc/manual.html-chunked doc/manual.pdf 13-ALLDOC = $(MANDOC) $(HTMLDOC) doc/manual.html-chunked doc/manual.pdf
13+ALLDOC = $(MANDOC) $(HTMLDOC) doc/manual.html-chunked 14+ALLDOC = $(MANDOC) $(HTMLDOC) doc/manual.html-chunked
14  15
15 # Never include the release number in the tarname for tagged 16 # Never include the release number in the tarname for tagged
16 # versions. 17 # versions.
17@@ -134,7 +134,6 @@ export sysconfdir 18@@ -70,6 +70,7 @@
 19 ASCIIDOC ?= asciidoc
 20 ASCIIDOC_FLAGS = -aversion=$(VERSION) -asysconfdir=$(sysconfdir) -f doc/asciidoc.conf
 21 XMLTO ?= xmlto
 22+XMLTO_FLAGS =
 23 DOCBOOK2PDF ?= docbook2pdf
 24
 25 LCOV ?= lcov
 26@@ -134,7 +135,6 @@
18  27
19 install: all 28 install: all
20 $(QUIET_INSTALL)tools/install.sh bin $(EXE) "$(DESTDIR)$(bindir)" 29 $(QUIET_INSTALL)tools/install.sh bin $(EXE) "$(DESTDIR)$(bindir)"
21- $(QUIET_INSTALL)tools/install.sh data tigrc "$(DESTDIR)$(sysconfdir)" 30- $(QUIET_INSTALL)tools/install.sh data tigrc "$(DESTDIR)$(sysconfdir)"
22  31
23 install-doc-man: doc-man 32 install-doc-man: doc-man
24 $(Q)$(foreach doc, $(filter %.1, $(MANDOC)), \ 33 $(Q)$(foreach doc, $(filter %.1, $(MANDOC)), \
 34@@ -440,10 +440,10 @@
 35 $(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_FLAGS) -b docbook -d article $<
 36
 37 % : %.xml
 38- $(QUIET_XMLTO)$(XMLTO) man -o doc $<
 39+ $(QUIET_XMLTO)$(XMLTO) $(XMLTO_FLAGS) man -o doc $<
 40
 41 %.html-chunked : %.xml
 42- $(QUIET_XMLTO)$(XMLTO) html -o $@ $<
 43+ $(QUIET_XMLTO)$(XMLTO) $(XMLTO_FLAGS) html -o $@ $<
 44
 45 %.pdf : %.xml
 46 $(QUIET_DB2PDF)$(DOCBOOK2PDF) -o doc $<