Attachment #215153 for bug #246927

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

Lines 2-8 Link Here

(-)devel/git/Makefile (-1 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= git	4	PORTNAME= git
5	DISTVERSION= 2.26.2	5	DISTVERSION= 2.27.0
6	CATEGORIES= devel	6	CATEGORIES= devel
7	MASTER_SITES= KERNEL_ORG/software/scm/git	7	MASTER_SITES= KERNEL_ORG/software/scm/git
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \	8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \

Lines 1-7 Link Here

(-)devel/git/distinfo (-7 / +7 lines)
1	TIMESTAMP = 1587408675	1	TIMESTAMP = 1591056153
2	SHA256 (git-2.26.2.tar.xz) = 6d65132471df9e531807cb2746f8be317e22a343b9385bbe11c9ce7f0d2fc848	2	SHA256 (git-2.27.0.tar.xz) = 73ca9774d7fa226e1d87c1909401623f96dca6a044e583b9a762e84d7d1a73f9
3	SIZE (git-2.26.2.tar.xz) = 6007864	3	SIZE (git-2.27.0.tar.xz) = 6074636
4	SHA256 (git-manpages-2.26.2.tar.xz) = 433de104f74a855b7074d88a27e77bf6f0764074e449ffc863f987c124716465	4	SHA256 (git-manpages-2.27.0.tar.xz) = e6cbab49b04c975886fdddf46eb24c5645c6799224208db8b01143091d9bd49c
5	SIZE (git-manpages-2.26.2.tar.xz) = 462052	5	SIZE (git-manpages-2.27.0.tar.xz) = 470724
6	SHA256 (git-htmldocs-2.26.2.tar.xz) = 763c2ab83b980edb210d45d9ad25337afd3610ac3749f4124964f86bbdbb201e	6	SHA256 (git-htmldocs-2.27.0.tar.xz) = ffa91681b6a8f558745924b1dbb76d604c9e52b27c525c6bd470c0123f7f4af3
7	SIZE (git-htmldocs-2.26.2.tar.xz) = 1304788	7	SIZE (git-htmldocs-2.27.0.tar.xz) = 1325820




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




libexec/git-core/git-bisect--helper
libexec/git-core/git-blame
libexec/git-core/git-branch
libexec/git-core/git-bugreport
libexec/git-core/git-bundle
libexec/git-core/git-cat-file
libexec/git-core/git-check-attr

libexec/git-core/git-init-db
libexec/git-core/git-instaweb
libexec/git-core/git-interpret-trailers
libexec/git-core/git-legacy-stash
libexec/git-core/git-log
libexec/git-core/git-ls-files
libexec/git-core/git-ls-remote

man/man1/git-bisect.1.gz
man/man1/git-blame.1.gz
man/man1/git-branch.1.gz
man/man1/git-bugreport.1.gz
man/man1/git-bundle.1.gz
man/man1/git-cat-file.1.gz
man/man1/git-check-attr.1.gz

%%CVS%%man/man7/gitcvs-migration.7.gz
man/man7/gitdiffcore.7.gz
man/man7/giteveryday.7.gz
man/man7/gitfaq.7.gz
man/man7/gitglossary.7.gz
man/man7/gitnamespaces.7.gz
man/man7/gitremote-helpers.7.gz

Return to bug 246927

Lines 1-29 Link Here

(-)devel/git/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) \

Lines 38-43 Link Here

(-)devel/git/pkg-plist (-1 / +3 lines)
38	libexec/git-core/git-bisect--helper	38	libexec/git-core/git-bisect--helper
39	libexec/git-core/git-blame	39	libexec/git-core/git-blame
40	libexec/git-core/git-branch	40	libexec/git-core/git-branch
		41	libexec/git-core/git-bugreport
41	libexec/git-core/git-bundle	42	libexec/git-core/git-bundle
42	libexec/git-core/git-cat-file	43	libexec/git-core/git-cat-file
43	libexec/git-core/git-check-attr	44	libexec/git-core/git-check-attr
Lines 99-105 Link Here
99	libexec/git-core/git-init-db	100	libexec/git-core/git-init-db
100	libexec/git-core/git-instaweb	101	libexec/git-core/git-instaweb
101	libexec/git-core/git-interpret-trailers	102	libexec/git-core/git-interpret-trailers
102	libexec/git-core/git-legacy-stash
103	libexec/git-core/git-log	103	libexec/git-core/git-log
104	libexec/git-core/git-ls-files	104	libexec/git-core/git-ls-files
105	libexec/git-core/git-ls-remote	105	libexec/git-core/git-ls-remote
Lines 234-239 Link Here
234	man/man1/git-bisect.1.gz	234	man/man1/git-bisect.1.gz
235	man/man1/git-blame.1.gz	235	man/man1/git-blame.1.gz
236	man/man1/git-branch.1.gz	236	man/man1/git-branch.1.gz
		237	man/man1/git-bugreport.1.gz
237	man/man1/git-bundle.1.gz	238	man/man1/git-bundle.1.gz
238	man/man1/git-cat-file.1.gz	239	man/man1/git-cat-file.1.gz
239	man/man1/git-check-attr.1.gz	240	man/man1/git-check-attr.1.gz
Lines 393-398 Link Here
393	%%CVS%%man/man7/gitcvs-migration.7.gz	394	%%CVS%%man/man7/gitcvs-migration.7.gz
394	man/man7/gitdiffcore.7.gz	395	man/man7/gitdiffcore.7.gz
395	man/man7/giteveryday.7.gz	396	man/man7/giteveryday.7.gz
		397	man/man7/gitfaq.7.gz
396	man/man7/gitglossary.7.gz	398	man/man7/gitglossary.7.gz
397	man/man7/gitnamespaces.7.gz	399	man/man7/gitnamespaces.7.gz
398	man/man7/gitremote-helpers.7.gz	400	man/man7/gitremote-helpers.7.gz