pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

asciidoc: add update candidate

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Mon Jan 24 12:05:11 2022 +0100
Changeset:	bb2e5337dd11e39b0409beeaf16f83451100ae31

Modified Files:
	Makefile
Added Files:
	asciidoc/DESCR
	asciidoc/Makefile
	asciidoc/PLIST
	asciidoc/TODO
	asciidoc/distinfo
	asciidoc/options.mk

Log Message:
asciidoc: add update candidate

packages fine, passes self-tests, but asciidoc script is broken

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bb2e5337dd11e39b0409beeaf16f83451100ae31

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile            |   1 +
 asciidoc/DESCR      |   3 ++
 asciidoc/Makefile   |  50 ++++++++++++++++++
 asciidoc/PLIST      | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 asciidoc/TODO       |   2 +
 asciidoc/distinfo   |   5 ++
 asciidoc/options.mk |  17 ++++++
 7 files changed, 226 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 76efe33ce3..8cc851467c 100644
--- a/Makefile
+++ b/Makefile
@@ -217,6 +217,7 @@ SUBDIR+=	arphic-uming-ttf
 SUBDIR+=	artemis
 SUBDIR+=	arx-libertatis-git
 SUBDIR+=	ascii2binary
+SUBDIR+=	asciidoc
 SUBDIR+=	aspell-dictionaries
 SUBDIR+=	asql
 SUBDIR+=	ast-ksh
diff --git a/asciidoc/DESCR b/asciidoc/DESCR
new file mode 100644
index 0000000000..1ee3ccf02e
--- /dev/null
+++ b/asciidoc/DESCR
@@ -0,0 +1,3 @@
+The asciidoc command translates specially formatted text files into
+various output formats such as HTML, docbook, LaTeX (experimental),
+man pages, and nicely formatted text.
diff --git a/asciidoc/Makefile b/asciidoc/Makefile
new file mode 100644
index 0000000000..1d4e63cf68
--- /dev/null
+++ b/asciidoc/Makefile
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.63 2022/01/24 09:58:21 wiz Exp $
+
+DISTNAME=	asciidoc-10.1.1
+CATEGORIES=	textproc
+MASTER_SITES=	${MASTER_SITE_GITHUB:=asciidoc/}
+GITHUB_PROJECT=	asciidoc-py3
+
+MAINTAINER=	gls%NetBSD.org@localhost
+HOMEPAGE=	http://www.asciidoc.org/
+COMMENT=	ASCII to formatted document converter
+LICENSE=	gnu-gpl-v2
+
+DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+DEPENDS+=	getopt-[0-9]*:../../misc/getopt
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-mock-[0-9]*:../../devel/py-test-mock
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-/-py-/}
+
+USE_TOOLS+=		pax
+
+SUBST_CLASSES+=		ad
+SUBST_STAGE.ad=		pre-configure
+SUBST_MESSAGE.ad=	Fixing hard-coded config file paths.
+SUBST_FILES.ad=		asciidoc/a2x.py asciidoc/asciidoc.py
+SUBST_SED.ad=		-e 's,^\(CONF_DIR\).*=.*,\1="${PREFIX}/share/asciidoc",'
+
+REPLACE_PYTHON+=	asciidoc/a2x.py
+REPLACE_PYTHON+=	asciidoc/asciidoc.py
+REPLACE_PYTHON+=	asciidoc/resources/filters/code/code-filter.py
+REPLACE_PYTHON+=	asciidoc/resources/filters/latex/latex2img.py
+REPLACE_PYTHON+=	asciidoc/resources/filters/music/music2png.py
+REPLACE_PYTHON+=	asciidoc/resources/filters/graphviz/graphviz2png.py
+REPLACE_PYTHON+=	asciidoc/resources/filters/unwraplatex.py
+REPLACE_PYTHON+=	tests/testasciidoc.py
+
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
+.include "options.mk"
+
+# as of 10.1.1
+# 10 failed, 37 passed, 4 warnings
+TEST_ENV+=	PYTHONPATH=${WRKSRC}/build/lib
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX}
+
+.include "../../lang/python/application.mk"
+.include "../../lang/python/egg.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/asciidoc/PLIST b/asciidoc/PLIST
new file mode 100644
index 0000000000..2b6e97c06a
--- /dev/null
+++ b/asciidoc/PLIST
@@ -0,0 +1,148 @@
+@comment $NetBSD: PLIST,v 1.21 2022/01/24 09:58:21 wiz Exp $
+bin/a2x
+bin/asciidoc
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/asciidoc/__init__.py
+${PYSITELIB}/asciidoc/__init__.pyc
+${PYSITELIB}/asciidoc/__init__.pyo
+${PYSITELIB}/asciidoc/__main__.py
+${PYSITELIB}/asciidoc/__main__.pyc
+${PYSITELIB}/asciidoc/__main__.pyo
+${PYSITELIB}/asciidoc/__metadata__.py
+${PYSITELIB}/asciidoc/__metadata__.pyc
+${PYSITELIB}/asciidoc/__metadata__.pyo
+${PYSITELIB}/asciidoc/a2x.py
+${PYSITELIB}/asciidoc/a2x.pyc
+${PYSITELIB}/asciidoc/a2x.pyo
+${PYSITELIB}/asciidoc/api.py
+${PYSITELIB}/asciidoc/api.pyc
+${PYSITELIB}/asciidoc/api.pyo
+${PYSITELIB}/asciidoc/asciidoc.py
+${PYSITELIB}/asciidoc/asciidoc.pyc
+${PYSITELIB}/asciidoc/asciidoc.pyo
+${PYSITELIB}/asciidoc/collections.py
+${PYSITELIB}/asciidoc/collections.pyc
+${PYSITELIB}/asciidoc/collections.pyo
+${PYSITELIB}/asciidoc/exceptions.py
+${PYSITELIB}/asciidoc/exceptions.pyc
+${PYSITELIB}/asciidoc/exceptions.pyo
+${PYSITELIB}/asciidoc/resources/asciidoc.conf
+${PYSITELIB}/asciidoc/resources/dblatex/asciidoc-dblatex.sty
+${PYSITELIB}/asciidoc/resources/dblatex/asciidoc-dblatex.xsl
+${PYSITELIB}/asciidoc/resources/dblatex/dblatex-readme.txt
+${PYSITELIB}/asciidoc/resources/docbook-xsl/asciidoc-docbook-xsl.txt
+${PYSITELIB}/asciidoc/resources/docbook-xsl/chunked.xsl
+${PYSITELIB}/asciidoc/resources/docbook-xsl/common.xsl
+${PYSITELIB}/asciidoc/resources/docbook-xsl/epub.xsl
+${PYSITELIB}/asciidoc/resources/docbook-xsl/fo.xsl
+${PYSITELIB}/asciidoc/resources/docbook-xsl/htmlhelp.xsl
+${PYSITELIB}/asciidoc/resources/docbook-xsl/manpage.xsl
+${PYSITELIB}/asciidoc/resources/docbook-xsl/text.xsl
+${PYSITELIB}/asciidoc/resources/docbook-xsl/xhtml.xsl
+${PYSITELIB}/asciidoc/resources/docbook45.conf
+${PYSITELIB}/asciidoc/resources/docbook5.conf
+${PYSITELIB}/asciidoc/resources/filters/code/code-filter-readme.txt
+${PYSITELIB}/asciidoc/resources/filters/code/code-filter-test.txt
+${PYSITELIB}/asciidoc/resources/filters/code/code-filter.conf
+${PYSITELIB}/asciidoc/resources/filters/code/code-filter.py
+${PYSITELIB}/asciidoc/resources/filters/code/code-filter.pyc
+${PYSITELIB}/asciidoc/resources/filters/code/code-filter.pyo
+${PYSITELIB}/asciidoc/resources/filters/graphviz/asciidoc-graphviz-sample.txt
+${PYSITELIB}/asciidoc/resources/filters/graphviz/graphviz-filter.conf
+${PYSITELIB}/asciidoc/resources/filters/graphviz/graphviz2png.py
+${PYSITELIB}/asciidoc/resources/filters/graphviz/graphviz2png.pyc
+${PYSITELIB}/asciidoc/resources/filters/graphviz/graphviz2png.pyo
+${PYSITELIB}/asciidoc/resources/filters/latex/latex-filter.conf
+${PYSITELIB}/asciidoc/resources/filters/latex/latex2img.py
+${PYSITELIB}/asciidoc/resources/filters/latex/latex2img.pyc
+${PYSITELIB}/asciidoc/resources/filters/latex/latex2img.pyo
+${PYSITELIB}/asciidoc/resources/filters/music/music-filter-test.txt
+${PYSITELIB}/asciidoc/resources/filters/music/music-filter.conf
+${PYSITELIB}/asciidoc/resources/filters/music/music2png.py
+${PYSITELIB}/asciidoc/resources/filters/music/music2png.pyc
+${PYSITELIB}/asciidoc/resources/filters/music/music2png.pyo
+${PYSITELIB}/asciidoc/resources/filters/source/source-highlight-filter-test.txt
+${PYSITELIB}/asciidoc/resources/filters/source/source-highlight-filter.conf
+${PYSITELIB}/asciidoc/resources/filters/unwraplatex.py
+${PYSITELIB}/asciidoc/resources/filters/unwraplatex.pyc
+${PYSITELIB}/asciidoc/resources/filters/unwraplatex.pyo
+${PYSITELIB}/asciidoc/resources/help.conf
+${PYSITELIB}/asciidoc/resources/html4.conf
+${PYSITELIB}/asciidoc/resources/html5.conf
+${PYSITELIB}/asciidoc/resources/icons/callouts/1.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/10.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/11.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/12.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/13.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/14.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/15.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/2.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/3.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/4.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/5.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/6.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/7.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/8.png
+${PYSITELIB}/asciidoc/resources/icons/callouts/9.png
+${PYSITELIB}/asciidoc/resources/icons/caution.png
+${PYSITELIB}/asciidoc/resources/icons/example.png
+${PYSITELIB}/asciidoc/resources/icons/home.png
+${PYSITELIB}/asciidoc/resources/icons/important.png
+${PYSITELIB}/asciidoc/resources/icons/next.png
+${PYSITELIB}/asciidoc/resources/icons/note.png
+${PYSITELIB}/asciidoc/resources/icons/prev.png
+${PYSITELIB}/asciidoc/resources/icons/tip.png
+${PYSITELIB}/asciidoc/resources/icons/up.png
+${PYSITELIB}/asciidoc/resources/icons/warning.png
+${PYSITELIB}/asciidoc/resources/javascripts/ASCIIMathML.js
+${PYSITELIB}/asciidoc/resources/javascripts/LaTeXMathML.js
+${PYSITELIB}/asciidoc/resources/javascripts/asciidoc.js
+${PYSITELIB}/asciidoc/resources/javascripts/slidy.js
+${PYSITELIB}/asciidoc/resources/javascripts/toc.js
+${PYSITELIB}/asciidoc/resources/lang-ca.conf
+${PYSITELIB}/asciidoc/resources/lang-cs.conf
+${PYSITELIB}/asciidoc/resources/lang-de.conf
+${PYSITELIB}/asciidoc/resources/lang-el.conf
+${PYSITELIB}/asciidoc/resources/lang-en.conf
+${PYSITELIB}/asciidoc/resources/lang-es.conf
+${PYSITELIB}/asciidoc/resources/lang-fi.conf
+${PYSITELIB}/asciidoc/resources/lang-fr.conf
+${PYSITELIB}/asciidoc/resources/lang-hu.conf
+${PYSITELIB}/asciidoc/resources/lang-id.conf
+${PYSITELIB}/asciidoc/resources/lang-it.conf
+${PYSITELIB}/asciidoc/resources/lang-ja.conf
+${PYSITELIB}/asciidoc/resources/lang-nl.conf
+${PYSITELIB}/asciidoc/resources/lang-pl.conf
+${PYSITELIB}/asciidoc/resources/lang-pt-BR.conf
+${PYSITELIB}/asciidoc/resources/lang-ro.conf
+${PYSITELIB}/asciidoc/resources/lang-ru.conf
+${PYSITELIB}/asciidoc/resources/lang-sv.conf
+${PYSITELIB}/asciidoc/resources/lang-uk.conf
+${PYSITELIB}/asciidoc/resources/lang-zh-CN.conf
+${PYSITELIB}/asciidoc/resources/latex.conf
+${PYSITELIB}/asciidoc/resources/slidy.conf
+${PYSITELIB}/asciidoc/resources/stylesheets/asciidoc.css
+${PYSITELIB}/asciidoc/resources/stylesheets/docbook-xsl.css
+${PYSITELIB}/asciidoc/resources/stylesheets/pygments.css
+${PYSITELIB}/asciidoc/resources/stylesheets/slidy.css
+${PYSITELIB}/asciidoc/resources/stylesheets/toc2.css
+${PYSITELIB}/asciidoc/resources/stylesheets/xhtml11-quirks.css
+${PYSITELIB}/asciidoc/resources/text.conf
+${PYSITELIB}/asciidoc/resources/themes/flask/flask.css
+${PYSITELIB}/asciidoc/resources/themes/volnitsky/volnitsky.css
+${PYSITELIB}/asciidoc/resources/xhtml11-quirks.conf
+${PYSITELIB}/asciidoc/resources/xhtml11.conf
+${PYSITELIB}/asciidoc/utils.py
+${PYSITELIB}/asciidoc/utils.pyc
+${PYSITELIB}/asciidoc/utils.pyo
+@pkgdir share/doc/asciidoc
+@pkgdir share/asciidoc/stylesheets
+@pkgdir share/asciidoc/javascripts
+@pkgdir share/asciidoc/images/icons/callouts
+@pkgdir share/asciidoc/filters
+@pkgdir share/asciidoc/docbook-xsl
+@pkgdir man/man1
diff --git a/asciidoc/TODO b/asciidoc/TODO
new file mode 100644
index 0000000000..bb2a5a5a25
--- /dev/null
+++ b/asciidoc/TODO
@@ -0,0 +1,2 @@
+The package seems fine, but when I use asciidoc,
+it also exits with code 1 and does nothing.
diff --git a/asciidoc/distinfo b/asciidoc/distinfo
new file mode 100644
index 0000000000..b5ee0e423e
--- /dev/null
+++ b/asciidoc/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.30 2022/01/24 09:58:21 wiz Exp $
+
+BLAKE2s (asciidoc-10.1.1.tar.gz) = cef4bd747f873dd25aa145ad66f70eef1001598276fdeb8697103d2a58df6e89
+SHA512 (asciidoc-10.1.1.tar.gz) = 110d26dc9cb9a009c86918447ec40a0f0daabbaeb4707679aa6840982d5058cf7b0ce16167cf4148a54ed0f61a59ca1d9aa3254db51c3409d22cd19ea27a88c4
+Size (asciidoc-10.1.1.tar.gz) = 1132934 bytes
diff --git a/asciidoc/options.mk b/asciidoc/options.mk
new file mode 100644
index 0000000000..fd8778ba06
--- /dev/null
+++ b/asciidoc/options.mk
@@ -0,0 +1,17 @@
+# $NetBSD: options.mk,v 1.3 2018/07/03 03:48:38 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.asciidoc
+PKG_SUPPORTED_OPTIONS=	pdf epub highlight
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mpdf)
+DEPENDS+=	dblatex-[0-9]*:../../textproc/dblatex
+.endif
+.if !empty(PKG_OPTIONS:Mepub)
+DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2
+DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
+.endif
+.if !empty(PKG_OPTIONS:Mhighlight)
+DEPENDS+=	source-highlight-[0-9]*:../../textproc/source-highlight
+.endif
Home | Main Index | Thread Index | Old Index