svn commit: r534399 - in head/devel/git: . files
Renato Botelho
garga at FreeBSD.org
Fri May 8 12:32:45 UTC 2020
Author: garga
Date: Fri May 8 12:32:44 2020
New Revision: 534399
URL: https://svnweb.freebsd.org/changeset/ports/534399
Log:
devel/git: Use rubygem-asciidoctor to build docs
asciidoctor and python2 are deprecated and upstream is moving to
asciidoctor gem as default tool to build documentation
PR: 245657
Submitted by: Bjorn Neergaard <bjorn at neersighted.com>
Sponsored by: Rubicon Communications, LLC (Netgate)
Added:
head/devel/git/files/patch-contrib__subtree__Makefile (contents, props changed)
Modified:
head/devel/git/Makefile
Modified: head/devel/git/Makefile
==============================================================================
--- head/devel/git/Makefile Fri May 8 12:25:42 2020 (r534398)
+++ head/devel/git/Makefile Fri May 8 12:32:44 2020 (r534399)
@@ -113,9 +113,8 @@ GUI_MAKE_ARGS_OFF= NO_TCLTK=yes
SVN_RUN_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
p5-subversion>=0:devel/p5-subversion
-SUBTREE_BUILD_DEPENDS= xmlto:textproc/xmlto \
- asciidoc:textproc/asciidoc \
- docbook-xml>0:textproc/docbook-xml
+SUBTREE_BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor\
+ xmlto:textproc/xmlto
CVS_RUN_DEPENDS= cvsps:devel/cvsps
@@ -220,7 +219,7 @@ post-install-HTMLDOCS-on:
post-install-SUBTREE-on:
cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \
- ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} install install-doc
+ ${MAKE_CMD} ${MAKE_FLAGS} Makefile USE_ASCIIDOCTOR=1 ${MAKE_ARGS} install install-doc
post-install-CONTRIB-on:
@${ECHO_MSG} "===> Installing contributed scripts"
Added: head/devel/git/files/patch-contrib__subtree__Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/git/files/patch-contrib__subtree__Makefile Fri May 8 12:32:44 2020 (r534399)
@@ -0,0 +1,29 @@
+--- contrib/subtree/Makefile.orig 2020-04-14 01:51:03 UTC
++++ contrib/subtree/Makefile
+@@ -25,14 +25,16 @@ ASCIIDOC_HTML = xhtml11
+ ASCIIDOC_DOCBOOK = docbook
+ ASCIIDOC_EXTRA =
+ XMLTO = xmlto
++XMLTO_EXTRA =
+
+ ifdef USE_ASCIIDOCTOR
+ ASCIIDOC = asciidoctor
+ ASCIIDOC_CONF =
+ ASCIIDOC_HTML = xhtml5
+-ASCIIDOC_DOCBOOK = docbook45
++ASCIIDOC_DOCBOOK = docbook
+ ASCIIDOC_EXTRA += -I../../Documentation -rasciidoctor-extensions
+ ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
++XMLTO_EXTRA += --skip-validation
+ endif
+
+ ifndef SHELL_PATH
+@@ -78,7 +80,7 @@ install-html: $(GIT_SUBTREE_HTML)
+ $(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)
+
+ $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
+- $(XMLTO) -m $(MANPAGE_XSL) man $^
++ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^
+
+ $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
+ $(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \
More information about the svn-ports-all
mailing list