Attachment #213452 for bug #245657

View | Details | Raw Unified | Return to bug 245657
Collapse All | Expand All




SVN_RUN_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
			p5-subversion>=0:devel/p5-subversion

SUBTREE_BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor\
			xmlto:textproc/xmlto
			docbook-xml>0:textproc/docbook-xml

CVS_RUN_DEPENDS=	cvsps:devel/cvsps



post-install-SUBTREE-on:
	cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \
		${MAKE_CMD} ${MAKE_FLAGS} Makefile USE_ASCIIDOCTOR=1 ${MAKE_ARGS} install install-doc

post-install-CONTRIB-on:
	@${ECHO_MSG} "===> Installing contributed scripts"




--- 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) \

Return to bug 245657

Lines 113-121 Link Here

(-)Makefile (-4 / +3 lines)
113	SVN_RUN_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \	113	SVN_RUN_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
114	p5-subversion>=0:devel/p5-subversion	114	p5-subversion>=0:devel/p5-subversion
115		115
116	SUBTREE_BUILD_DEPENDS= xmlto:textproc/xmlto \	116	SUBTREE_BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor\
117	asciidoc:textproc/asciidoc \	117	xmlto:textproc/xmlto
118	docbook-xml>0:textproc/docbook-xml
119		118
120	CVS_RUN_DEPENDS= cvsps:devel/cvsps	119	CVS_RUN_DEPENDS= cvsps:devel/cvsps
121		120
Lines 220-226 Link Here
220		219
221	post-install-SUBTREE-on:	220	post-install-SUBTREE-on:
222	cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \	221	cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \
223	${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} install install-doc	222	${MAKE_CMD} ${MAKE_FLAGS} Makefile USE_ASCIIDOCTOR=1 ${MAKE_ARGS} install install-doc
224		223
225	post-install-CONTRIB-on:	224	post-install-CONTRIB-on:
226	@${ECHO_MSG} "===> Installing contributed scripts"	225	@${ECHO_MSG} "===> Installing contributed scripts"

Line 0 Link Here

(-)files/patch-contrib__subtree__Makefile (+29 lines)
	1	--- contrib/subtree/Makefile.orig 2020-04-14 01:51:03 UTC
	2	+++ contrib/subtree/Makefile
	3	@@ -25,14 +25,16 @@ ASCIIDOC_HTML = xhtml11
	4	ASCIIDOC_DOCBOOK = docbook
	5	ASCIIDOC_EXTRA =
	6	XMLTO = xmlto
	7	+XMLTO_EXTRA =
	8
	9	ifdef USE_ASCIIDOCTOR
	10	ASCIIDOC = asciidoctor
	11	ASCIIDOC_CONF =
	12	ASCIIDOC_HTML = xhtml5
	13	-ASCIIDOC_DOCBOOK = docbook45
	14	+ASCIIDOC_DOCBOOK = docbook
	15	ASCIIDOC_EXTRA += -I../../Documentation -rasciidoctor-extensions
	16	ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
	17	+XMLTO_EXTRA += --skip-validation
	18	endif
	19
	20	ifndef SHELL_PATH
	21	@@ -78,7 +80,7 @@ install-html: $(GIT_SUBTREE_HTML)
	22	$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)
	23
	24	$(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
	25	- $(XMLTO) -m $(MANPAGE_XSL) man $^
	26	+ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^
	27
	28	$(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
	29	$(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \