Date: Fri, 28 Jan 2022 23:28:06 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3f32ccaefa18 - main - textproc/asciidoc: Update to 10.1.1 Message-ID: <202201282328.20SNS6nV094295@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f32ccaefa18b2e96ec029ba5a79f0bf1c00d983 commit 3f32ccaefa18b2e96ec029ba5a79f0bf1c00d983 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2022-01-28 23:18:43 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2022-01-28 23:26:39 +0000 textproc/asciidoc: Update to 10.1.1 - Change MASTER_SITES to CHEESESHOP Changes: https://github.com/asciidoc-py/asciidoc-py/releases --- textproc/asciidoc/Makefile | 20 ++---- textproc/asciidoc/distinfo | 6 +- textproc/asciidoc/files/patch-Makefile.in | 50 -------------- textproc/asciidoc/files/patch-a2x.py | 11 --- textproc/asciidoc/files/patch-asciidoc-a2x.py | 10 +++ textproc/asciidoc/pkg-plist | 98 --------------------------- 6 files changed, 19 insertions(+), 176 deletions(-) diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile index a00626d92106..37d78daf5338 100644 --- a/textproc/asciidoc/Makefile +++ b/textproc/asciidoc/Makefile @@ -1,9 +1,9 @@ # Created by: anholt@FreeBSD.org PORTNAME= asciidoc -PORTVERSION= 9.1.1 +PORTVERSION= 10.1.1 CATEGORIES= textproc -MASTER_SITES= https://github.com/asciidoc/asciidoc-py3/releases/download/${PORTVERSION}/ +MASTER_SITES= CHEESESHOP MAINTAINER= sunpoet@FreeBSD.org COMMENT= Text document format for writing short documents and man pages @@ -14,21 +14,13 @@ LICENSE_COMB= multi BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl -USES= gmake gnome python:3.5+ shebangfix +USES= gnome python:3.5+ shebangfix +USE_PYTHON= autoplist distutils noflavors USE_GNOME= libxml2 libxslt -GNU_CONFIGURE= yes NO_ARCH= yes -SHEBANG_GLOB= *.py - -post-patch: - @${REINPLACE_CMD} -e 's|python3 |${PYTHON_CMD} |' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/a2x.py - @${FIND} ${WRKSRC} -name '*.conf' | ${XARGS} -I % ${LN} % %.sample - -post-install: - ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/ - ${INSTALL_DATA} ${WRKSRC}/asciidocapi.py ${STAGEDIR}${PYTHON_SITELIBDIR}/ +SHEBANG_FILES= asciidoc/resources/filters/*.py \ + asciidoc/resources/filters/*/*.py .include <bsd.port.mk> diff --git a/textproc/asciidoc/distinfo b/textproc/asciidoc/distinfo index 90bf4b8c3e2a..2bf19239911b 100644 --- a/textproc/asciidoc/distinfo +++ b/textproc/asciidoc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1632227478 -SHA256 (asciidoc-9.1.1.tar.gz) = ea39760ac2739496c14002902571592dc2ae2fa673296ec141a9e491d9c11fca -SIZE (asciidoc-9.1.1.tar.gz) = 1259206 +TIMESTAMP = 1643382510 +SHA256 (asciidoc-10.1.1.tar.gz) = 33ac648f7b38fa8712cfdbbfd2465a263fea2dcd106946fcf7d59ae6473b47c5 +SIZE (asciidoc-10.1.1.tar.gz) = 214619 diff --git a/textproc/asciidoc/files/patch-Makefile.in b/textproc/asciidoc/files/patch-Makefile.in deleted file mode 100644 index fa9fe52bfb80..000000000000 --- a/textproc/asciidoc/files/patch-Makefile.in +++ /dev/null @@ -1,50 +0,0 @@ ---- Makefile.in.orig 2020-06-02 05:11:24 UTC -+++ Makefile.in -@@ -10,7 +10,7 @@ - .NOTPARALLEL: - - INSTALL = @INSTALL@ --INSTALL_PROG = @INSTALL_PROGRAM@ -+INSTALL_PROG = @INSTALL_SCRIPT@ - INSTALL_DATA = @INSTALL_DATA@ - PACKAGE_TARNAME = @PACKAGE_TARNAME@ - SED = @SED@ -@@ -37,32 +37,32 @@ progdir = $(bindir) - manp = $(patsubst %1.txt,%1,$(wildcard doc/*.1.txt)) - manpdir = $(mandir)/man1 - --conf = $(wildcard *.conf) -+conf = $(wildcard *.conf.sample) - confdir = $(ASCIIDOCCONF) - - filtersdir = $(ASCIIDOCCONF)/filters - - codefilter = filters/code/code-filter.py - codefilterdir = $(filtersdir)/code --codefilterconf = filters/code/code-filter.conf -+codefilterconf = filters/code/code-filter.conf.sample - codefilterconfdir = $(filtersdir)/code - - graphvizfilter = filters/graphviz/graphviz2png.py - graphvizfilterdir = $(filtersdir)/graphviz --graphvizfilterconf = filters/graphviz/graphviz-filter.conf -+graphvizfilterconf = filters/graphviz/graphviz-filter.conf.sample - graphvizfilterconfdir = $(filtersdir)/graphviz - - musicfilter = filters/music/music2png.py - musicfilterdir = $(filtersdir)/music --musicfilterconf = filters/music/music-filter.conf -+musicfilterconf = filters/music/music-filter.conf.sample - musicfilterconfdir = $(filtersdir)/music - --sourcefilterconf = filters/source/source-highlight-filter.conf -+sourcefilterconf = filters/source/source-highlight-filter.conf.sample - sourcefilterconfdir = $(filtersdir)/source - - latexfilter = filters/latex/latex2img.py - latexfilterdir = $(filtersdir)/latex --latexfilterconf = filters/latex/latex-filter.conf -+latexfilterconf = filters/latex/latex-filter.conf.sample - latexfilterconfdir = $(filtersdir)/latex - - unwraplatexfilter = filters/unwraplatex.py diff --git a/textproc/asciidoc/files/patch-a2x.py b/textproc/asciidoc/files/patch-a2x.py deleted file mode 100644 index 570e532ca13e..000000000000 --- a/textproc/asciidoc/files/patch-a2x.py +++ /dev/null @@ -1,11 +0,0 @@ ---- a2x.py.orig 2018-01-13 22:10:35 UTC -+++ a2x.py -@@ -498,7 +498,7 @@ class A2X(AttrDict): - self.asciidoc_opts += ' --doctype %s' % self.doctype - for attr in self.attributes: - self.asciidoc_opts += ' --attribute "%s"' % attr --# self.xsltproc_opts += ' --nonet' -+ self.xsltproc_opts += ' --nonet --path %%LOCALBASE%%/share/xsl/docbook/manpages/' - if self.verbose: - self.asciidoc_opts += ' --verbose' - self.dblatex_opts += ' -V' diff --git a/textproc/asciidoc/files/patch-asciidoc-a2x.py b/textproc/asciidoc/files/patch-asciidoc-a2x.py new file mode 100644 index 000000000000..92735151d5f4 --- /dev/null +++ b/textproc/asciidoc/files/patch-asciidoc-a2x.py @@ -0,0 +1,10 @@ +--- asciidoc/a2x.py.orig 2021-12-20 19:54:07 UTC ++++ asciidoc/a2x.py +@@ -520,6 +520,7 @@ class A2X(AttrDict): + for attr in self.attributes: + self.asciidoc_opts.append(('--attribute', attr)) + # self.xsltproc_opts += ' --nonet' ++ self.xsltproc_opts += ' --nonet --path %%LOCALBASE%%/share/xsl/docbook/manpages/' + if self.verbose: + self.asciidoc_opts.append(('--verbose',)) + self.dblatex_opts += ' -V' diff --git a/textproc/asciidoc/pkg-plist b/textproc/asciidoc/pkg-plist deleted file mode 100644 index 0c8e907a9600..000000000000 --- a/textproc/asciidoc/pkg-plist +++ /dev/null @@ -1,98 +0,0 @@ -bin/a2x -bin/a2x.py -bin/asciidoc -bin/asciidoc.py -@sample %%ETCDIR%%/asciidoc.conf.sample -%%ETCDIR%%/dblatex/asciidoc-dblatex.sty -%%ETCDIR%%/dblatex/asciidoc-dblatex.xsl -%%ETCDIR%%/docbook-xsl/chunked.xsl -%%ETCDIR%%/docbook-xsl/common.xsl -%%ETCDIR%%/docbook-xsl/epub.xsl -%%ETCDIR%%/docbook-xsl/fo.xsl -%%ETCDIR%%/docbook-xsl/htmlhelp.xsl -%%ETCDIR%%/docbook-xsl/manpage.xsl -%%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 -%%ETCDIR%%/filters/graphviz/graphviz2png.py -@sample %%ETCDIR%%/filters/latex/latex-filter.conf.sample -%%ETCDIR%%/filters/latex/latex2img.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 -%%ETCDIR%%/images/icons/README -%%ETCDIR%%/images/icons/callouts/1.png -%%ETCDIR%%/images/icons/callouts/10.png -%%ETCDIR%%/images/icons/callouts/11.png -%%ETCDIR%%/images/icons/callouts/12.png -%%ETCDIR%%/images/icons/callouts/13.png -%%ETCDIR%%/images/icons/callouts/14.png -%%ETCDIR%%/images/icons/callouts/15.png -%%ETCDIR%%/images/icons/callouts/2.png -%%ETCDIR%%/images/icons/callouts/3.png -%%ETCDIR%%/images/icons/callouts/4.png -%%ETCDIR%%/images/icons/callouts/5.png -%%ETCDIR%%/images/icons/callouts/6.png -%%ETCDIR%%/images/icons/callouts/7.png -%%ETCDIR%%/images/icons/callouts/8.png -%%ETCDIR%%/images/icons/callouts/9.png -%%ETCDIR%%/images/icons/caution.png -%%ETCDIR%%/images/icons/example.png -%%ETCDIR%%/images/icons/home.png -%%ETCDIR%%/images/icons/important.png -%%ETCDIR%%/images/icons/next.png -%%ETCDIR%%/images/icons/note.png -%%ETCDIR%%/images/icons/prev.png -%%ETCDIR%%/images/icons/tip.png -%%ETCDIR%%/images/icons/up.png -%%ETCDIR%%/images/icons/warning.png -%%ETCDIR%%/javascripts/ASCIIMathML.js -%%ETCDIR%%/javascripts/LaTeXMathML.js -%%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 -@sample %%ETCDIR%%/lang-en.conf.sample -@sample %%ETCDIR%%/lang-es.conf.sample -@sample %%ETCDIR%%/lang-fi.conf.sample -@sample %%ETCDIR%%/lang-fr.conf.sample -@sample %%ETCDIR%%/lang-hu.conf.sample -@sample %%ETCDIR%%/lang-id.conf.sample -@sample %%ETCDIR%%/lang-it.conf.sample -@sample %%ETCDIR%%/lang-ja.conf.sample -@sample %%ETCDIR%%/lang-nl.conf.sample -@sample %%ETCDIR%%/lang-pl.conf.sample -@sample %%ETCDIR%%/lang-pt-BR.conf.sample -@sample %%ETCDIR%%/lang-ro.conf.sample -@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 -%%ETCDIR%%/stylesheets/docbook-xsl.css -%%ETCDIR%%/stylesheets/pygments.css -%%ETCDIR%%/stylesheets/slidy.css -%%ETCDIR%%/stylesheets/toc2.css -%%ETCDIR%%/stylesheets/xhtml11-quirks.css -@sample %%ETCDIR%%/text.conf.sample -%%ETCDIR%%/themes/flask/flask.css -%%ETCDIR%%/themes/volnitsky/volnitsky.css -@sample %%ETCDIR%%/xhtml11.conf.sample -@sample %%ETCDIR%%/xhtml11-quirks.conf.sample -%%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?202201282328.20SNS6nV094295>