FreeBSD Bugzilla – Attachment 213452 Details for
Bug 245657
[PATCH] devel/git: build with asciidoctor
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
asciidoctor.patch
asciidoctor.patch (text/plain), 2.34 KB, created by
Bjorn Neergaard
on 2020-04-16 06:44:29 UTC
(
hide
)
Description:
asciidoctor.patch
Filename:
MIME Type:
Creator:
Bjorn Neergaard
Created:
2020-04-16 06:44:29 UTC
Size:
2.34 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 531816) >+++ Makefile (working copy) >@@ -113,9 +113,8 @@ > 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-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" >Index: files/patch-contrib__subtree__Makefile >=================================================================== >--- files/patch-contrib__subtree__Makefile (nonexistent) >+++ files/patch-contrib__subtree__Makefile (working copy) >@@ -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) \ > >Property changes on: files/patch-contrib__subtree__Makefile >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 245657
: 213452