Attachment 213532 Details for Bug 245723 – asciidoc.diff

[patch] asciidoc.diff

asciidoc.diff (text/plain), 9.88 KB, created by Antoine Brodin on 2020-04-18 14:22:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Brodin

Created: 2020-04-18 14:22:58 UTC

Size: 9.88 KB

patch

obsolete

>Index: devel/rsvndump/files/patch-configure
>===================================================================
>--- devel/rsvndump/files/patch-configure	(nonexistent)
>+++ devel/rsvndump/files/patch-configure	(working copy)
>@@ -0,0 +1,15 @@
>+--- configure.orig	2012-05-14 20:40:27 UTC
>++++ configure
>+@@ -3977,9 +3977,9 @@ fi
>+ 	if test $ver_maj -lt 8; then
>+ 		prog_version_ok="no"
>+ 	fi
>+-	if test $ver_min -lt 4; then
>+-		prog_version_ok="no"
>+-	fi
>++#	if test $ver_min -lt 4; then
>++#		prog_version_ok="no"
>++#	fi
>+ 	if test $ver_rev -lt 0; then
>+ 		prog_version_ok="no"
>+ 	fi
>
>Property changes on: devel/rsvndump/files/patch-configure
>___________________________________________________________________
>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
>Index: net/ntpsec/files/patch-wscript
>===================================================================
>--- net/ntpsec/files/patch-wscript	(nonexistent)
>+++ net/ntpsec/files/patch-wscript	(working copy)
>@@ -0,0 +1,10 @@
>+--- wscript.orig	2019-11-18 00:23:32 UTC
>++++ wscript
>+@@ -161,6 +161,7 @@ def configure(ctx):
>+         lines = ctx.cmd_and_log(cmd).split()[1].split(".")
>+         assert len(lines) == 3, "found %r lines, expected 3: %r" \
>+             % (len(lines), lines)
>++        lines[2] = '0'
>+         asciidocver_tuple = (int(lines[0]), int(lines[1]), int(lines[2]))
>+ 
>+         # Compare asciidoc version with the minimum required
>
>Property changes on: net/ntpsec/files/patch-wscript
>___________________________________________________________________
>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
>Index: sysutils/nut-devel/files/patch-configure.ac
>===================================================================
>--- sysutils/nut-devel/files/patch-configure.ac	(nonexistent)
>+++ sysutils/nut-devel/files/patch-configure.ac	(working copy)
>@@ -0,0 +1,11 @@
>+--- configure.ac.orig	2020-02-09 18:44:01 UTC
>++++ configure.ac
>+@@ -818,7 +818,7 @@ dnl not fail if we have no tools to generate it (so ad
>+ 		AC_MSG_CHECKING([if we can build ${nut_doc_build_target_base}])
>+ 		can_build_doc_man=no
>+ 		if test "${nut_have_asciidoc}" = yes ; then
>+-			( cd "$DOCTESTDIR" && ${A2X} --format manpage --destination-dir=. --xsltproc-opts "--nonet" "${abs_srcdir}"/docs/man/snmp-ups.txt && test -s snmp-ups.8 ) && can_build_doc_man=yes
>++			( cd "$DOCTESTDIR" && ${A2X} --format manpage --destination-dir=. --xsltproc-opts="--nonet" "${abs_srcdir}"/docs/man/snmp-ups.txt && test -s snmp-ups.8 ) && can_build_doc_man=yes
>+ 			rm -f "${DOCTESTDIR}"/snmp-ups.8
>+ 		fi
>+ 		if test "${can_build_doc_man}" = yes ; then
>
>Property changes on: sysutils/nut-devel/files/patch-configure.ac
>___________________________________________________________________
>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
>Index: sysutils/nut-devel/files/patch-docs_Makefile.am
>===================================================================
>--- sysutils/nut-devel/files/patch-docs_Makefile.am	(nonexistent)
>+++ sysutils/nut-devel/files/patch-docs_Makefile.am	(working copy)
>@@ -0,0 +1,17 @@
>+--- docs/Makefile.am.orig	2020-02-09 18:44:01 UTC
>++++ docs/Makefile.am
>+@@ -102,10 +102,10 @@ solaris-usb.html solaris-usb.chunked solaris-usb.pdf: 
>+ # variable ASCIIDOC_VERBOSE to "-v", ie:
>+ #   $ ASCIIDOC_VERBOSE=-v make
>+ A2X_COMMON_OPTS = $(ASCIIDOC_VERBOSE) --attribute icons \
>+-    --xsltproc-opts "--nonet" \
>+-    --xsltproc-opts "--stringparam nut.localdate \"`TZ=UTC date +%Y-%m-%d`\"" \
>+-    --xsltproc-opts "--stringparam nut.localtime \"`TZ=UTC date +%H:%M:%S`\"" \
>+-    --xsltproc-opts "--stringparam nut.nutversion \"@PACKAGE_VERSION@\"" \
>++    --xsltproc-opts="--nonet" \
>++    --xsltproc-opts="--stringparam nut.localdate \"`TZ=UTC date +%Y-%m-%d`\"" \
>++    --xsltproc-opts="--stringparam nut.localtime \"`TZ=UTC date +%H:%M:%S`\"" \
>++    --xsltproc-opts="--stringparam nut.nutversion \"@PACKAGE_VERSION@\"" \
>+     --attribute iconsdir=$(srcdir)/images \
>+     --attribute=badges \
>+     --attribute=external_title \
>
>Property changes on: sysutils/nut-devel/files/patch-docs_Makefile.am
>___________________________________________________________________
>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
>Index: sysutils/nut-devel/files/patch-docs_man_Makefile.am
>===================================================================
>--- sysutils/nut-devel/files/patch-docs_man_Makefile.am	(nonexistent)
>+++ sysutils/nut-devel/files/patch-docs_man_Makefile.am	(working copy)
>@@ -0,0 +1,11 @@
>+--- docs/man/Makefile.am.orig	2020-02-09 18:44:01 UTC
>++++ docs/man/Makefile.am
>+@@ -745,7 +745,7 @@ if HAVE_ASCIIDOC
>+ ### Prior to Asciidoc ~8.6.8, the --destination-dir flag didn't seem to affect the location of the intermediate .xml file.
>+ ### This parameter is currently required; see docs/Makefile.am for more detail.
>+ A2X_MANPAGE_OPTS = --doctype manpage --format manpage \
>+-	--xsltproc-opts "--nonet" \
>++	--xsltproc-opts="--nonet" \
>+ 	--attribute mansource="Network UPS Tools" \
>+ 	--attribute manversion="@PACKAGE_VERSION@" \
>+ 	--attribute manmanual="NUT Manual" \
>
>Property changes on: sysutils/nut-devel/files/patch-docs_man_Makefile.am
>___________________________________________________________________
>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
>Index: textproc/asciidoc/Makefile
>===================================================================
>--- textproc/asciidoc/Makefile	(revision 532022)
>+++ textproc/asciidoc/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	asciidoc
>-PORTVERSION=	8.6.10
>-PORTREVISION=	1
>+DISTVERSION=	9.0.0rc2
> CATEGORIES=	textproc
> 
> MAINTAINER=	sunpoet@FreeBSD.org
>@@ -16,7 +15,7 @@
> BUILD_DEPENDS=	${RUN_DEPENDS}
> RUN_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl
> 
>-USES=		autoreconf gmake gnome python:2.7 shebangfix
>+USES=		autoreconf gmake gnome python:3.5+ shebangfix
> USE_GNOME=	libxml2 libxslt
> 
> GNU_CONFIGURE=	yes
>@@ -23,13 +22,12 @@
> NO_ARCH=	yes
> 
> USE_GITHUB=	yes
>+GH_PROJECT=	asciidoc-py3
> 
> SHEBANG_GLOB=	*.py
>-SHEBANG_LANG=	python2
>-python2_CMD=	${PYTHON_CMD}
> 
> post-patch:
>-	@${REINPLACE_CMD} -e '/^INSTALL_PROG/ s|INSTALL_PROGRAM|INSTALL_SCRIPT|; s|\.conf|&.sample|; s|python$ a2x.py$|${PYTHON_CMD}\1|' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e '/^INSTALL_PROG/ s|INSTALL_PROGRAM|INSTALL_SCRIPT|; s|\.conf|&.sample|; s|python3 |${PYTHON_CMD} |' ${WRKSRC}/Makefile.in
> 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/a2x.py
> 	@${FIND} ${WRKSRC} -name '*.conf' | ${XARGS} -I % ${LN} % %.sample
> 
>Index: textproc/asciidoc/distinfo
>===================================================================
>--- textproc/asciidoc/distinfo	(revision 532022)
>+++ textproc/asciidoc/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1510440370
>-SHA256 (asciidoc-asciidoc-8.6.10_GH0.tar.gz) = 9e52f8578d891beaef25730a92a6e723596ddbd07bfe0d2a56486fcf63a0b983
>-SIZE (asciidoc-asciidoc-8.6.10_GH0.tar.gz) = 577208
>+TIMESTAMP = 1587203997
>+SHA256 (asciidoc-asciidoc-py3-9.0.0rc2_GH0.tar.gz) = ae4730dccaa9d5026e7d7f1bccc0cb28ebfc71e62f10151082e8a00d90708cbb
>+SIZE (asciidoc-asciidoc-py3-9.0.0rc2_GH0.tar.gz) = 1145229
>Index: textproc/asciidoc/files/patch-a2x.py
>===================================================================
>--- textproc/asciidoc/files/patch-a2x.py	(revision 532022)
>+++ textproc/asciidoc/files/patch-a2x.py	(working copy)
>@@ -1,6 +1,6 @@
>---- a2x.py.orig	2018-01-13 22:10:35 UTC
>+--- a2x.py.orig	2020-03-12 00:31:53 UTC
> +++ a2x.py
>-@@ -498,7 +498,7 @@ class A2X(AttrDict):
>+@@ -514,7 +514,7 @@ class A2X(AttrDict):
>              self.asciidoc_opts += ' --doctype %s' % self.doctype
>          for attr in self.attributes:
>              self.asciidoc_opts += ' --attribute "%s"' % attr
>Index: textproc/asciidoc/pkg-plist
>===================================================================
>--- textproc/asciidoc/pkg-plist	(revision 532022)
>+++ textproc/asciidoc/pkg-plist	(working copy)
>@@ -14,6 +14,7 @@
> %%ETCDIR%%/docbook-xsl/text.xsl
> %%ETCDIR%%/docbook-xsl/xhtml.xsl
> @sample %%ETCDIR%%/docbook45.conf.sample
>+@sample %%ETCDIR%%/docbook5.conf.sample
> @sample %%ETCDIR%%/filters/code/code-filter.conf.sample
> %%ETCDIR%%/filters/code/code-filter.py
> @sample %%ETCDIR%%/filters/graphviz/graphviz-filter.conf.sample
>@@ -23,6 +24,7 @@
> @sample %%ETCDIR%%/filters/music/music-filter.conf.sample
> %%ETCDIR%%/filters/music/music2png.py
> @sample %%ETCDIR%%/filters/source/source-highlight-filter.conf.sample
>+%%ETCDIR%%/filters/unwraplatex.py
> @sample %%ETCDIR%%/help.conf.sample
> @sample %%ETCDIR%%/html4.conf.sample
> @sample %%ETCDIR%%/html5.conf.sample
>@@ -57,6 +59,7 @@
> %%ETCDIR%%/javascripts/asciidoc.js
> %%ETCDIR%%/javascripts/slidy.js
> %%ETCDIR%%/javascripts/toc.js
>+@sample %%ETCDIR%%/lang-ca.conf.sample
> @sample %%ETCDIR%%/lang-cs.conf.sample
> @sample %%ETCDIR%%/lang-de.conf.sample
> @sample %%ETCDIR%%/lang-el.conf.sample
>@@ -75,6 +78,7 @@
> @sample %%ETCDIR%%/lang-ru.conf.sample
> @sample %%ETCDIR%%/lang-sv.conf.sample
> @sample %%ETCDIR%%/lang-uk.conf.sample
>+@sample %%ETCDIR%%/lang-zh-CN.conf.sample
> @sample %%ETCDIR%%/latex.conf.sample
> @sample %%ETCDIR%%/slidy.conf.sample
> %%ETCDIR%%/stylesheets/asciidoc.css
>@@ -91,3 +95,4 @@
> %%PYTHON_SITELIBDIR%%/asciidocapi.py
> man/man1/a2x.1.gz
> man/man1/asciidoc.1.gz
>+man/man1/testasciidoc.1.gz

Actions: View | Diff

Attachments on bug 245723: 213532