CVS commit: pkgsrc/devel/tig

["Kimmo Suominen" <kim%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kim
Date:           Sat Feb  4 09:25:50 UTC 2023

Modified Files:
        pkgsrc/devel/tig: Makefile distinfo
        pkgsrc/devel/tig/patches: patch-Makefile

Log Message:
tig: Run xmlto with "--skip-validation"

Workaround for PR pkg/57218


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/tig/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/tig/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/tig/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/tig/Makefile
diff -u pkgsrc/devel/tig/Makefile:1.24 pkgsrc/devel/tig/Makefile:1.25
--- pkgsrc/devel/tig/Makefile:1.24      Sun Sep 11 17:44:59 2022
+++ pkgsrc/devel/tig/Makefile   Sat Feb  4 09:25:50 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2022/09/11 17:44:59 fcambus Exp $
+# $NetBSD: Makefile,v 1.25 2023/02/04 09:25:50 kim Exp $
 
 DISTNAME=      tig-2.5.7
+PKGREVISION=   1
 CATEGORIES=    devel scm
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=jonas/}
 GITHUB_RELEASE=        ${DISTNAME}
@@ -27,6 +28,9 @@ CONFIGURE_ENV+=       GIT_CONFIG=${GIT_CONFIG:
 CONFIGURE_ARGS+=               ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 CONFIGURE_ARGS.gnu-iconv=      --with-libiconv=${BUILDLINK_PREFIX.iconv}
 
+# FIXME:
+MAKE_FLAGS+=   XMLTO_FLAGS=--skip-validation
+
 .include "../../mk/bsd.prefs.mk"
 .if !empty(GLIBC_VERSION)
 # Some version of glibc requires _XOPEN_SOURCE being defined to

Index: pkgsrc/devel/tig/distinfo
diff -u pkgsrc/devel/tig/distinfo:1.19 pkgsrc/devel/tig/distinfo:1.20
--- pkgsrc/devel/tig/distinfo:1.19      Sun Sep 11 17:44:59 2022
+++ pkgsrc/devel/tig/distinfo   Sat Feb  4 09:25:50 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2022/09/11 17:44:59 fcambus Exp $
+$NetBSD: distinfo,v 1.20 2023/02/04 09:25:50 kim Exp $
 
 BLAKE2s (tig-2.5.7.tar.gz) = 6501ae8a58e09b030d500524b537af120ed1dfb3ac349200ae67421b86192c99
 SHA512 (tig-2.5.7.tar.gz) = 26adbb8dc43ef7ec1eaf5d6def29a8b6dcf5e30825242fc489208139c8720805a265dd1ba412601df692f6d0438ee9e3171a3f8a3cc4599841d82dfc08a9ea1f
 Size (tig-2.5.7.tar.gz) = 1176146 bytes
-SHA1 (patch-Makefile) = 2745e89ad8b307558f7ecce38e40dcd69222cbc5
+SHA1 (patch-Makefile) = be72047f365b630f62f04fbb6b8f2de8628470e4
 SHA1 (patch-contrib_config.make-Darwin) = b340253dc02cf490dba86832f752660209971840
 SHA1 (patch-include_tig_tig.h) = ebc0eb9587477e8b782d6916124042ff2218bf64

Index: pkgsrc/devel/tig/patches/patch-Makefile
diff -u pkgsrc/devel/tig/patches/patch-Makefile:1.3 pkgsrc/devel/tig/patches/patch-Makefile:1.4
--- pkgsrc/devel/tig/patches/patch-Makefile:1.3 Wed Jan 12 21:39:33 2022
+++ pkgsrc/devel/tig/patches/patch-Makefile     Sat Feb  4 09:25:50 2023
@@ -1,11 +1,12 @@
-$NetBSD: patch-Makefile,v 1.3 2022/01/12 21:39:33 fcambus Exp $
+$NetBSD: patch-Makefile,v 1.4 2023/02/04 09:25:50 kim Exp $
 
 - Don't make/install PDF.
+- Add XMLTO_FLAGS.
 - Do not install tigrc, this is handled via CONF_FILES by pkgsrc.
 
---- Makefile.orig      2022-01-11 18:50:37.000000000 +0000
+--- Makefile.orig      2022-08-25 17:27:20.000000000 +0000
 +++ Makefile
-@@ -51,7 +51,7 @@ TOOLS        = test/tools/test-graph tools/doc-
+@@ -51,7 +51,7 @@
  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
@@ -14,7 +15,15 @@ $NetBSD: patch-Makefile,v 1.3 2022/01/12
  
  # Never include the release number in the tarname for tagged
  # versions.
-@@ -134,7 +134,6 @@ export sysconfdir
+@@ -70,6 +70,7 @@
+ ASCIIDOC ?= asciidoc
+ ASCIIDOC_FLAGS = -aversion=$(VERSION) -asysconfdir=$(sysconfdir) -f doc/asciidoc.conf
+ XMLTO ?= xmlto
++XMLTO_FLAGS =
+ DOCBOOK2PDF ?= docbook2pdf
+ 
+ LCOV ?= lcov
+@@ -134,7 +135,6 @@
  
  install: all
        $(QUIET_INSTALL)tools/install.sh bin $(EXE) "$(DESTDIR)$(bindir)"
@@ -22,3 +31,16 @@ $NetBSD: patch-Makefile,v 1.3 2022/01/12
  
  install-doc-man: doc-man
        $(Q)$(foreach doc, $(filter %.1, $(MANDOC)), \
+@@ -440,10 +440,10 @@
+       $(QUIET_ASCIIDOC)$(ASCIIDOC) $(ASCIIDOC_FLAGS) -b docbook -d article $<
+ 
+ % : %.xml
+-      $(QUIET_XMLTO)$(XMLTO) man -o doc $<
++      $(QUIET_XMLTO)$(XMLTO) $(XMLTO_FLAGS) man -o doc $<
+ 
+ %.html-chunked : %.xml
+-      $(QUIET_XMLTO)$(XMLTO) html -o $@ $<
++      $(QUIET_XMLTO)$(XMLTO) $(XMLTO_FLAGS) html -o $@ $<
+ 
+ %.pdf : %.xml
+       $(QUIET_DB2PDF)$(DOCBOOK2PDF) -o doc $<