Updated to 8.5.3.

Changelog way too long to mention here.
Refer to http://www.methods.co.nz/asciidoc/CHANGELOG.html for complete
list of changes.

3 files changed, 27 insertions, 15 deletions

diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 3aa11a9da23..1fd81adc817 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/02/10 19:17:46 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/05/15 20:23:38 gls Exp $
 #
 
-DISTNAME=		asciidoc-8.3.3
-PKGREVISION=		1
+DISTNAME=		asciidoc-8.5.3
 CATEGORIES=		textproc
-MASTER_SITES=		${HOMEPAGE}	\
+MASTER_SITES=		${HOMEPAGE:Q} \
 			${MASTER_SITE_SOURCEFORGE:=asciidoc/}
 
 MAINTAINER=		gdt@NetBSD.org
@@ -16,9 +15,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 DEPENDS+=		docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 DEPENDS+=		getopt-[0-9]*:../../misc/getopt
 
-REPLACE_BASH+=		a2x
-USE_TOOLS+=		bash:run pax
-PYTHON_PATCH_SCRIPTS=	asciidoc.py
+USE_TOOLS+=		pax
+PYTHON_PATCH_SCRIPTS=	a2x.py asciidoc.py
 PYTHON_PATCH_SCRIPTS+=	filters/code/code-filter.py
 PYTHON_PATCH_SCRIPTS+=	filters/music/music2png.py
 PYTHON_PATCH_SCRIPTS+=	filters/graphviz/graphviz2png.py
@@ -31,17 +29,23 @@ SUBST_MESSAGE.ad=	Fixing hard-coded config file paths.
 SUBST_FILES.ad=		a2x asciidoc.py
 SUBST_SED.ad=		-e 's,^\(CONF_DIR\).*=.*,\1="${PREFIX}/share/asciidoc",'
 
+SUBST_CLASSES+=		ae
+SUBST_STAGE.ae=		pre-configure
+SUBST_MESSAGE.ae=	Fixing hard-coded Python interpreter paths.
+SUBST_FILES.ae=		a2x.py asciidoc.conf
+SUBST_SED.ae=		-e 's,python,${PYTHONBIN},'
+
 INSTALLATION_DIRS=	bin share/asciidoc share/asciidoc/filters \
 			share/asciidoc/docbook-xsl share/asciidoc/stylesheets \
 			share/asciidoc/javascripts \
 			share/asciidoc/images/icons/callouts \
-			${PKGMANDIR}/man1 ${DOCDIR}
+			${PKGMANDIR}/man1 ${DOCDIR} \
 
 DOCDIR=		${PREFIX}/share/doc/asciidoc
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${DESTDIR}${PREFIX}/bin/asciidoc
-	${INSTALL_SCRIPT} ${WRKSRC}/a2x ${DESTDIR}${PREFIX}/bin/a2x
+	${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}
diff --git a/textproc/asciidoc/PLIST b/textproc/asciidoc/PLIST
index dabbe432602..c84fc937a22 100644
--- a/textproc/asciidoc/PLIST
+++ b/textproc/asciidoc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:17:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/05/15 20:23:38 gls Exp $
 bin/a2x
 bin/asciidoc
 man/man1/a2x.1
@@ -6,6 +6,7 @@ man/man1/asciidoc.1
 share/asciidoc/asciidoc.conf
 share/asciidoc/docbook-xsl/chunked.xsl
 share/asciidoc/docbook-xsl/common.xsl
+share/asciidoc/docbook-xsl/epub.xsl
 share/asciidoc/docbook-xsl/fo.xsl
 share/asciidoc/docbook-xsl/htmlhelp.xsl
 share/asciidoc/docbook-xsl/manpage.xsl
@@ -54,8 +55,16 @@ share/asciidoc/images/icons/up.png
 share/asciidoc/images/icons/warning.png
 share/asciidoc/javascripts/ASCIIMathML.js
 share/asciidoc/javascripts/LaTeXMathML.js
+share/asciidoc/javascripts/asciidoc-xhtml11.js
 share/asciidoc/javascripts/toc.js
+share/asciidoc/lang-de.conf
+share/asciidoc/lang-en.conf
 share/asciidoc/lang-es.conf
+share/asciidoc/lang-fr.conf
+share/asciidoc/lang-hu.conf
+share/asciidoc/lang-it.conf
+share/asciidoc/lang-pt-BR.conf
+share/asciidoc/lang-ru.conf
 share/asciidoc/latex.conf
 share/asciidoc/stylesheets/docbook-xsl.css
 share/asciidoc/stylesheets/xhtml11-manpage.css
diff --git a/textproc/asciidoc/distinfo b/textproc/asciidoc/distinfo
index c33be969063..4221ad0fb98 100644
--- a/textproc/asciidoc/distinfo
+++ b/textproc/asciidoc/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2009/03/06 15:17:07 wiz Exp $
+$NetBSD: distinfo,v 1.8 2010/05/15 20:23:38 gls Exp $
 
-SHA1 (asciidoc-8.3.3.tar.gz) = 6c85063185deaeecee6389cdadafd3e88c5ae160
-RMD160 (asciidoc-8.3.3.tar.gz) = 42417668d1fe1d6a1b580c7ee49ad54d2688f207
-Size (asciidoc-8.3.3.tar.gz) = 1050151 bytes
-SHA1 (patch-aa) = fab20eec609960b05b0bab034159b6138436f30a
+SHA1 (asciidoc-8.5.3.tar.gz) = 78fd756e17c9b83abfeb43806dff95db10bff8bc
+RMD160 (asciidoc-8.5.3.tar.gz) = c34aa2be7bc30f8ac0dbbd162f9feecbb345cf98
+Size (asciidoc-8.5.3.tar.gz) = 1254979 bytes