CVS commit: pkgsrc/textproc/asciidoc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jul  3 03:48:38 UTC 2018

Modified Files:
        pkgsrc/textproc/asciidoc: Makefile PLIST distinfo options.mk

Log Message:
asciidoc: updated to 8.6.10

Version 8.6.10:
Additions and changes
- Improve reproducibility of builds (e.g. support SOURCE_DATE_EPOCH)
- Add SVG output support
- Improve documentation
- Update translations


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/textproc/asciidoc/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/asciidoc/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/asciidoc/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/asciidoc/options.mk

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

Modified files:

Index: pkgsrc/textproc/asciidoc/Makefile
diff -u pkgsrc/textproc/asciidoc/Makefile:1.44 pkgsrc/textproc/asciidoc/Makefile:1.45
--- pkgsrc/textproc/asciidoc/Makefile:1.44      Sun Jan  1 14:43:59 2017
+++ pkgsrc/textproc/asciidoc/Makefile   Tue Jul  3 03:48:38 2018
@@ -1,27 +1,18 @@
-# $NetBSD: Makefile,v 1.44 2017/01/01 14:43:59 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2018/07/03 03:48:38 adam Exp $
 
-DISTNAME=              asciidoc-8.6.9
-PKGREVISION=           2
-CATEGORIES=            textproc
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=asciidoc/}
-
-MAINTAINER=            gls%NetBSD.org@localhost
-HOMEPAGE=              http://www.asciidoc.org/
-COMMENT=               ASCII to formatted document converter
-LICENSE=               gnu-gpl-v2
+DISTNAME=      asciidoc-8.6.10
+CATEGORIES=    textproc
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=asciidoc/}
+
+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
+DEPENDS+=      docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+DEPENDS+=      getopt-[0-9]*:../../misc/getopt
 
 USE_TOOLS+=            pax
-REPLACE_PYTHON=        a2x.py asciidoc.py asciidocapi.py
-REPLACE_PYTHON+=       filters/code/code-filter.py
-REPLACE_PYTHON+=       filters/latex/latex2png.py
-REPLACE_PYTHON+=       filters/music/music2png.py
-REPLACE_PYTHON+=       filters/graphviz/graphviz2png.py
-REPLACE_PYTHON+=       tests/testasciidoc.py tests/asciidocapi.py
-
-NO_BUILD=              yes
 
 SUBST_CLASSES+=                ad
 SUBST_STAGE.ad=                pre-configure
@@ -33,14 +24,15 @@ REPLACE_PYTHON+=    a2x.py
 REPLACE_PYTHON+=       asciidoc.py
 REPLACE_PYTHON+=       asciidocapi.py
 REPLACE_PYTHON+=       filters/code/code-filter.py
+REPLACE_PYTHON+=       filters/latex/latex2img.py
 REPLACE_PYTHON+=       filters/latex/latex2png.py
 REPLACE_PYTHON+=       filters/music/music2png.py
 REPLACE_PYTHON+=       filters/graphviz/graphviz2png.py
-REPLACE_PYTHON+=       tests/testasciidoc.py
+REPLACE_PYTHON+=       filters/unwraplatex.py
 REPLACE_PYTHON+=       tests/asciidocapi.py
-REPLACE_PYTHON+=       html5.conf xhtml11.conf xhtml11-quirks.conf
+REPLACE_PYTHON+=       tests/testasciidoc.py
 
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # not yet ported as of 8.6.9 (as seen e.g. in git-docs)
+PYTHON_VERSIONS_ACCEPTED=      27
 
 INSTALLATION_DIRS=     bin share/asciidoc share/asciidoc/filters \
                        share/asciidoc/docbook-xsl share/asciidoc/stylesheets \
@@ -52,23 +44,23 @@ DOCDIR=                     ${PREFIX}/share/doc/asciidoc
 
 .include "options.mk"
 
+do-build:
+       cd ${WRKSRC} && \
+               ${PYTHONBIN} a2x.py -f manpage doc/a2x.1.txt && \
+               ${PYTHONBIN} a2x.py -f manpage doc/asciidoc.1.txt
+
 do-install:
        ${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${DESTDIR}${PREFIX}/bin/asciidoc
        ${INSTALL_SCRIPT} ${WRKSRC}/a2x.py ${DESTDIR}${PREFIX}/bin/a2x
        ${INSTALL_MAN} ${WRKSRC}/doc/asciidoc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
        ${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
        ${INSTALL_DATA} ${WRKSRC}/doc/asciidoc.txt ${DESTDIR}${DOCDIR}
-
-       cd ${WRKSRC} && pax -wr -pma *.conf filters \
-               docbook-xsl/*.xsl stylesheets/*.css     \
-               javascripts/*.js images/* dblatex/* \
+       cd ${WRKSRC} && pax -wr -pma *.conf filters docbook-xsl/*.xsl \
+               stylesheets/*.css javascripts/*.js images/* dblatex/* \
                ${DESTDIR}${PREFIX}/share/asciidoc/.
 
-       cd ${WRKSRC}/doc && pax -wr -pma *.csv *.txt *.pdf *.epub \
-               ${DESTDIR}${DOCDIR}
-
 do-test:
-       cd ${WRKSRC} && ./asciidoc.py -v doc/asciidoc.txt
+       cd ${WRKSRC} && ${PYTHONBIN} asciidoc.py -v doc/asciidoc.txt
 
 .include "../../lang/python/application.mk"
 .include "../../textproc/libxslt/buildlink3.mk"

Index: pkgsrc/textproc/asciidoc/PLIST
diff -u pkgsrc/textproc/asciidoc/PLIST:1.17 pkgsrc/textproc/asciidoc/PLIST:1.18
--- pkgsrc/textproc/asciidoc/PLIST:1.17 Sat Nov 23 18:37:40 2013
+++ pkgsrc/textproc/asciidoc/PLIST      Tue Jul  3 03:48:38 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2013/11/23 18:37:40 gls Exp $
+@comment $NetBSD: PLIST,v 1.18 2018/07/03 03:48:38 adam Exp $
 bin/a2x
 bin/asciidoc
 man/man1/a2x.1
@@ -24,12 +24,13 @@ share/asciidoc/filters/graphviz/asciidoc
 share/asciidoc/filters/graphviz/graphviz-filter.conf
 share/asciidoc/filters/graphviz/graphviz2png.py
 share/asciidoc/filters/latex/latex-filter.conf
-share/asciidoc/filters/latex/latex2png.py
+share/asciidoc/filters/latex/latex2img.py
 share/asciidoc/filters/music/music-filter-test.txt
 share/asciidoc/filters/music/music-filter.conf
 share/asciidoc/filters/music/music2png.py
 share/asciidoc/filters/source/source-highlight-filter-test.txt
 share/asciidoc/filters/source/source-highlight-filter.conf
+share/asciidoc/filters/unwraplatex.py
 share/asciidoc/help.conf
 share/asciidoc/html4.conf
 share/asciidoc/html5.conf
@@ -72,13 +73,18 @@ share/asciidoc/lang-de.conf
 share/asciidoc/lang-el.conf
 share/asciidoc/lang-en.conf
 share/asciidoc/lang-es.conf
+share/asciidoc/lang-fi.conf
 share/asciidoc/lang-fr.conf
 share/asciidoc/lang-hu.conf
+share/asciidoc/lang-id.conf
 share/asciidoc/lang-it.conf
+share/asciidoc/lang-ja.conf
 share/asciidoc/lang-nl.conf
+share/asciidoc/lang-pl.conf
 share/asciidoc/lang-pt-BR.conf
 share/asciidoc/lang-ro.conf
 share/asciidoc/lang-ru.conf
+share/asciidoc/lang-sv.conf
 share/asciidoc/lang-uk.conf
 share/asciidoc/latex.conf
 share/asciidoc/slidy.conf
@@ -91,30 +97,4 @@ share/asciidoc/stylesheets/xhtml11-quirk
 share/asciidoc/text.conf
 share/asciidoc/xhtml11-quirks.conf
 share/asciidoc/xhtml11.conf
-share/doc/asciidoc/a2x.1.txt
-share/doc/asciidoc/article.pdf
-share/doc/asciidoc/article.txt
-share/doc/asciidoc/asciidoc.1.txt
 share/doc/asciidoc/asciidoc.txt
-share/doc/asciidoc/asciidocapi.txt
-share/doc/asciidoc/asciimathml.txt
-share/doc/asciidoc/book-multi.txt
-share/doc/asciidoc/book.epub
-share/doc/asciidoc/book.txt
-share/doc/asciidoc/customers.csv
-share/doc/asciidoc/epub-notes.txt
-share/doc/asciidoc/faq.txt
-share/doc/asciidoc/latex-backend.txt
-share/doc/asciidoc/latex-bugs.txt
-share/doc/asciidoc/latex-filter.pdf
-share/doc/asciidoc/latex-filter.txt
-share/doc/asciidoc/latexmath.txt
-share/doc/asciidoc/latexmathml.txt
-share/doc/asciidoc/music-filter.pdf
-share/doc/asciidoc/music-filter.txt
-share/doc/asciidoc/publishing-ebooks-with-asciidoc.txt
-share/doc/asciidoc/slidy-example.txt
-share/doc/asciidoc/slidy.txt
-share/doc/asciidoc/source-highlight-filter.pdf
-share/doc/asciidoc/source-highlight-filter.txt
-share/doc/asciidoc/testasciidoc.txt

Index: pkgsrc/textproc/asciidoc/distinfo
diff -u pkgsrc/textproc/asciidoc/distinfo:1.18 pkgsrc/textproc/asciidoc/distinfo:1.19
--- pkgsrc/textproc/asciidoc/distinfo:1.18      Wed Nov  4 01:59:18 2015
+++ pkgsrc/textproc/asciidoc/distinfo   Tue Jul  3 03:48:38 2018
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2015/11/04 01:59:18 agc Exp $
+$NetBSD: distinfo,v 1.19 2018/07/03 03:48:38 adam Exp $
 
-SHA1 (asciidoc-8.6.9.tar.gz) = 82e574dd061640561fa0560644bc74df71fb7305
-RMD160 (asciidoc-8.6.9.tar.gz) = f19936593e3bed2755d77d38dd78a4769f77c7fa
-SHA512 (asciidoc-8.6.9.tar.gz) = 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955
-Size (asciidoc-8.6.9.tar.gz) = 907253 bytes
+SHA1 (asciidoc-8.6.10.tar.gz) = 53b9c916bb4e29d2a4b850446be070ef81dcd792
+RMD160 (asciidoc-8.6.10.tar.gz) = 42346e7f17f136c0e7c5abb61216ef570aaa2dd9
+SHA512 (asciidoc-8.6.10.tar.gz) = 6ecc86977baaf1c756691e3f661e43ef2bb24e606898f6075bfa6f174d1fdc5e77d00853ffe014847e295364349d6ad34f3b8209cb97870e0233012fc38a281a
+Size (asciidoc-8.6.10.tar.gz) = 577208 bytes

Index: pkgsrc/textproc/asciidoc/options.mk
diff -u pkgsrc/textproc/asciidoc/options.mk:1.2 pkgsrc/textproc/asciidoc/options.mk:1.3
--- pkgsrc/textproc/asciidoc/options.mk:1.2     Mon Feb 13 22:38:06 2012
+++ pkgsrc/textproc/asciidoc/options.mk Tue Jul  3 03:48:38 2018
@@ -1,8 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2012/02/13 22:38:06 gls Exp $
+# $NetBSD: options.mk,v 1.3 2018/07/03 03:48:38 adam Exp $
 
-PKG_OPTIONS_VAR=               PKG_OPTIONS.asciidoc
+PKG_OPTIONS_VAR=       PKG_OPTIONS.asciidoc
 PKG_SUPPORTED_OPTIONS= pdf epub highlight
-PKG_SUGGESTED_OPTIONS=
 
 .include "../../mk/bsd.options.mk"