Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Apr 2020 19:48:33 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r532404 - in head: devel/rsvndump/files net/ntpsec/files sysutils/nut-devel/files textproc/asciidoc
Message-ID:  <202004211948.03LJmXnX007484@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Tue Apr 21 19:48:33 2020
New Revision: 532404
URL: https://svnweb.freebsd.org/changeset/ports/532404

Log:
  Update textproc/asciidoc to 9.0.0rc2
  
  Changes:	https://github.com/asciidoc/asciidoc-py3/releases
  		https://github.com/asciidoc/asciidoc-py3/blob/master/CHANGELOG.txt
  PR:		245723
  Submitted by:	antoine

Added:
  head/devel/rsvndump/files/
  head/devel/rsvndump/files/patch-configure   (contents, props changed)
  head/net/ntpsec/files/
  head/net/ntpsec/files/patch-wscript   (contents, props changed)
  head/sysutils/nut-devel/files/patch-configure.ac   (contents, props changed)
  head/sysutils/nut-devel/files/patch-docs_Makefile.am   (contents, props changed)
  head/sysutils/nut-devel/files/patch-docs_man_Makefile.am   (contents, props changed)
Modified:
  head/textproc/asciidoc/Makefile
  head/textproc/asciidoc/distinfo
  head/textproc/asciidoc/pkg-plist

Added: head/devel/rsvndump/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/rsvndump/files/patch-configure	Tue Apr 21 19:48:33 2020	(r532404)
@@ -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

Added: head/net/ntpsec/files/patch-wscript
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntpsec/files/patch-wscript	Tue Apr 21 19:48:33 2020	(r532404)
@@ -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

Added: head/sysutils/nut-devel/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/nut-devel/files/patch-configure.ac	Tue Apr 21 19:48:33 2020	(r532404)
@@ -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

Added: head/sysutils/nut-devel/files/patch-docs_Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/nut-devel/files/patch-docs_Makefile.am	Tue Apr 21 19:48:33 2020	(r532404)
@@ -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 \

Added: head/sysutils/nut-devel/files/patch-docs_man_Makefile.am
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/nut-devel/files/patch-docs_man_Makefile.am	Tue Apr 21 19:48:33 2020	(r532404)
@@ -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" \

Modified: head/textproc/asciidoc/Makefile
==============================================================================
--- head/textproc/asciidoc/Makefile	Tue Apr 21 19:48:25 2020	(r532403)
+++ head/textproc/asciidoc/Makefile	Tue Apr 21 19:48:33 2020	(r532404)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	asciidoc
-PORTVERSION=	8.6.10
-PORTREVISION=	1
+PORTVERSION=	9.0.0rc2
 CATEGORIES=	textproc
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -16,20 +15,19 @@ LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 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
 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
 

Modified: head/textproc/asciidoc/distinfo
==============================================================================
--- head/textproc/asciidoc/distinfo	Tue Apr 21 19:48:25 2020	(r532403)
+++ head/textproc/asciidoc/distinfo	Tue Apr 21 19:48:33 2020	(r532404)
@@ -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 = 1587445502
+SHA256 (asciidoc-asciidoc-py3-9.0.0rc2_GH0.tar.gz) = ae4730dccaa9d5026e7d7f1bccc0cb28ebfc71e62f10151082e8a00d90708cbb
+SIZE (asciidoc-asciidoc-py3-9.0.0rc2_GH0.tar.gz) = 1145229

Modified: head/textproc/asciidoc/pkg-plist
==============================================================================
--- head/textproc/asciidoc/pkg-plist	Tue Apr 21 19:48:25 2020	(r532403)
+++ head/textproc/asciidoc/pkg-plist	Tue Apr 21 19:48:33 2020	(r532404)
@@ -14,6 +14,7 @@ bin/asciidoc.py
 %%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 @@ bin/asciidoc.py
 @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 @@ bin/asciidoc.py
 %%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 @@ bin/asciidoc.py
 @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 @@ bin/asciidoc.py
 %%PYTHON_SITELIBDIR%%/asciidocapi.py
 man/man1/a2x.1.gz
 man/man1/asciidoc.1.gz
+man/man1/testasciidoc.1.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004211948.03LJmXnX007484>