Update to version 8.1.0.

Mention docbook and LaTeX in DESCRiption.

Add sourceforge to MASTER_SITES.

Add more directories to INSTALLATION_DIRS (maybe some are redundant).

Also install a2x.
Install man pages.
Install various configs and icons.

Add do-test target.

Following is from the AsciiDoc ChangeLog:

1. Version 8.1.0 (2006-10-22)

     * AsciiDoc generated XHTML documents now display as table of
       contents if the toc attribute is defined (JavaScript needs to be
       enabled for this to work). Thanks to Troy Hanson who contributed
       this feature based on a JavaScript by Mihai Bazon. I've simplified
       things somewhat to match Docbook XSL Stylesheets style, see Troy's
       [1]tpl User Guide for a fancier layout. Use the -a toc -a numbered
       command-line options to produce a number table of contents.
     * A [2]music filter is included in the distribution ./filters/
       directory. It translates music in [3]LilyPond or [4]ABC notation
       to standard classical notation in the form of a trimmed PNG image
       which is inserted into the AsciiDoc output document.
     * Incorporated Paul Melis's Win32 filter patch. This workaround
       allows AsciiDoc to run filters under Windows.
     * Added uninstall.sh script.
     * Rather than proliferate a confusing number of filter block
       delimiters the following convention has been adopted: delimiters
       belonging to DelimitedBlock filters distributed with AsciiDoc will
       consist of a word (normally a noun identifying the block content)
       followed by four or more tilde characters. This has necessitated
       changing existing filter delimiters (the old delimiters still work
       but may be deprecated in future versions):
          + The example code filter block delimiter is now the word code
            followed by four or more tilde characters.
          + The source highlight filter block delimiter is now the word
            source followed by four or more tilde characters.
     * Conditionally redefined subscript and superscripting so they use
       the old replacements mechanism when asciidoc7compatible is defined
       rather than the asciidoc 8 default unconstrained quoting (patch
       for affected files attached).
     * Moved the source highlight filter from ./examples/ to ./filter/.
     * Added {verbose} intrinsic attribute (useful for passing verbose
       flag to filters).
     * Added {outdir} intrinsic attribute.
     * Renamed {docdir} intrinsic attribute to unambiguous`{indir}
       ({docdir}` still works but may be removed in future release).
     * If asciidoc(1) outputs to stdout then instrinsic attribute
       {docname} is extracted from the input file name.
     _________________________________________________________________

2. Version 8.0.0 (2006-08-27)

   This is a major release because changes to quoting and index entry
   handling may break existing documents (see Additions and changes below
   and Appendix A: Migration Notes in the AsciiDoc User Guide).

   Please report any problems you encounter.

   [5]Stuart Rackham

   Additions and changes
     * Quoting can can occur within words (based on patch submitted by
       Benjamin Klum). See the Unconstrained Quotes sub-section in the
       User Guide.
     * The underline and plus characters can be used as alternatives to
       the existing apostrophe and backtick quote characters. They are
       arguably better choices than the apostrophe and backtick as they
       are not confused with punctuation.
     * The syntax for index entry macros have have been deprecated from
       +...+ and +...+ to ((...)) and (((...))) respectively. Rationale:
          + Bracketing is consistent other with [[...]] and <<...>>
            reference macros.
          + To easily confused with triple plus passthroughs.
          + To make way for the new monospace quoting.
     * Superscripts and subscripts are implemented as constrained quotes
       so they can now be escaped with a leading backslash and prefixed
       with with an attribute list.
     * An experimental LaTeX backend has been written by Benjamin Klum (a
       number additions in this release are to accommodate the LaTeX
       backend).
     * include macro file names now expand environment variables and
       tilde expansions.
     * A configuration file [quotes] entry can be undefined by setting to
       a blank value.
     * Added callto inline macro for Skype callto links.
     * Added colnumber attribute for table data markup.
     * A leading comment block or comment lines are now skipped
       (previously a document had to start with either attribute entries
       or a document Title).
     * Experimental rows attribute (number of source lines in table)
       available in table markup templates (used by experimental LaTeX
       backend).
     * Included install shell script written by [6]Jacob Mandelson for
       installing the tarball distribution.
     * Added INSTALL documentation file.
     * Added replacements2 substitution options -- a second replacements
       section.
     * Added the ability to redefine normal and verbatim substitutions
       with subsnormal and subsverbatim entries in configuration file
       [miscellaneous] section.
     * By default AttributeEntry values are substituted for
       specialcharacters and attributes, if you want a different
       AttributeEntry substitution set the attributeentry-subs attribute.
     * The name in name=value configuration file entries can now end with
       a backslash, just escape the trailing backslash with a backslash.
       For example:

     abc\\=xyz
       Results in name=abc\ and value=xyz -- previously this would have
       escaped the = character.
     * A blank configuration file section deletes any preceding section
       with the same name (applies to non-markup template sections).
     * A command-line attribute value with a @ suffix does not override
       existing document and configuration file attributes (normally
       command-line attributes have precedence over document and
       configuration file attributes).
     * localtime attribute is now encoded from the native system encoding
       to the output encoding. Patch submitted by [7]FKtPp -- here's his
       description of the problem:
       "I am a Chinese user of AsciiDoc and I find that when I use UTF-8
       (the default encoding) to write asciidoc documents in Windows
       platform the resulting html footer line will get screwed. It was
       caused by a localized tzname that was always encoded in the
       windows native encoding, which in my case is cp936."
     * a2x(1) can generate Open Document Text files using [8]docbook2odf.
       Currently docbook2odf(1) only processes a subset of DocBook,
       unimplemented elements are skipped.
     * The a2x(1) format option defaults to xhtml (previously a format
       had to be specified explicitly).
     * The -d, --doctype=DOCTYPE option has been added to a2x(1) which is
       a shortcut for --asciidoc-options="--doctype=DOCTYPE".
     * Replaced a2x(1) --no-icons and --no-copy options with their
       negated equivalents: --icons and --copy respectively. The default
       behavior has also changed: copying and use of icons is disabled by
       default. Rationale:
          + To make the default behavior more consistent since use of
            icons and CSS stylesheets does not apply to all formats.
          + To make the default behavior less surprising (the creation of
            icon and stylesheet output files must now be explicit).
     * a2x(1) has been bumped from version 0.1.1 to version 1.0.0.

   Bug fixes
     * Removed duplicate ./doc/a2x.1.txt from distribution tarball.
     * Documentation errata.
     * Attribute replacement is no longer performed twice in Titles and
       AttributeEntrys.
     * a2x(1) skipped asciidoc(1) execution when rerun with different
       --asciidoc-options options, it now always executes asciidoc(1).
       The problem was that previously asciidoc(1) was executed only if
       the output file was missing or older than the source file.

4 files changed, 75 insertions, 12 deletions

diff --git a/textproc/asciidoc/DESCR b/textproc/asciidoc/DESCR
index 8278015da58..1ee3ccf02e0 100644
--- a/textproc/asciidoc/DESCR
+++ b/textproc/asciidoc/DESCR
@@ -1,2 +1,3 @@
 The asciidoc command translates specially formatted text files into
-various output formats such as HTML, man pages, nicely formatted text.
+various output formats such as HTML, docbook, LaTeX (experimental),
+man pages, and nicely formatted text.
diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 8a60323cc07..f0335d4caee 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/07/10 09:28:05 rillig Exp $
+# $NetBSD: Makefile,v 1.2 2006/11/17 20:43:48 reed Exp $
 #
 
-DISTNAME=		asciidoc-7.1.2
+DISTNAME=		asciidoc-8.1.0
 CATEGORIES=		textproc
-MASTER_SITES=		${HOMEPAGE}
+MASTER_SITES=		${HOMEPAGE}	\
+			${MASTER_SITE_SOURCEFORGE:=asciidoc/}
 
 MAINTAINER=		rillig@NetBSD.org
 HOMEPAGE=		http://www.methods.co.nz/asciidoc/
@@ -22,12 +23,26 @@ SUBST_MESSAGE.ad=	Fixing hard-coded paths.
 SUBST_FILES.ad=		asciidoc.py
 SUBST_SED.ad=		-e 's,^\(GLOBAL_CONFIG_DIR\).*=.*,\1 = "${PREFIX}/share/asciidoc",'
 
-INSTALLATION_DIRS=	bin share/asciidoc
+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
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${PREFIX}/bin/asciidoc
-	cd ${WRKSRC} && ${PAX} -wr -pma *.conf stylesheets ${PREFIX}/share/asciidoc/.
-
+	${INSTALL_SCRIPT} ${WRKSRC}/a2x ${PREFIX}/bin/a2x
+	${INSTALL_MAN} ${WRKSRC}/doc/asciidoc.1 ${PREFIX}/${PKGMANDIR}/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${PREFIX}/${PKGMANDIR}/man1/
+	cd ${WRKSRC} && ${PAX} -wr -pma *.conf stylesheets filters/*.py \
+		filters/*.conf docbook-xsl/*.xsl stylesheets/*.css	\
+		javascripts/*.js images/icons/callouts/* images/icons/*.png \
+		${PREFIX}/share/asciidoc/.
+
+do-test:
+	cd ${WRKSRC} && ./asciidoc.py -v doc/asciidoc.txt
+
+# requires Python 2.3 or newer
 .include "../../lang/python/application.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/asciidoc/PLIST b/textproc/asciidoc/PLIST
index f7e4dbaa426..31084026392 100644
--- a/textproc/asciidoc/PLIST
+++ b/textproc/asciidoc/PLIST
@@ -1,9 +1,51 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/07/10 09:28:05 rillig Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/11/17 20:43:48 reed Exp $
+bin/a2x
 bin/asciidoc
+man/man1/a2x.1
+man/man1/asciidoc.1
 share/asciidoc/asciidoc.conf
+share/asciidoc/docbook-xsl/chunked.xsl
+share/asciidoc/docbook-xsl/common.xsl
+share/asciidoc/docbook-xsl/fo.xsl
+share/asciidoc/docbook-xsl/htmlhelp.xsl
+share/asciidoc/docbook-xsl/manpage.xsl
+share/asciidoc/docbook-xsl/xhtml.xsl
 share/asciidoc/docbook.conf
+share/asciidoc/filters/code-filter.conf
+share/asciidoc/filters/code-filter.py
+share/asciidoc/filters/music-filter.conf
+share/asciidoc/filters/music2png.py
+share/asciidoc/filters/source-highlight-filter.conf
 share/asciidoc/help.conf
 share/asciidoc/html4.conf
+share/asciidoc/images/icons/callouts/1.png
+share/asciidoc/images/icons/callouts/10.png
+share/asciidoc/images/icons/callouts/11.png
+share/asciidoc/images/icons/callouts/12.png
+share/asciidoc/images/icons/callouts/13.png
+share/asciidoc/images/icons/callouts/14.png
+share/asciidoc/images/icons/callouts/15.png
+share/asciidoc/images/icons/callouts/2.png
+share/asciidoc/images/icons/callouts/3.png
+share/asciidoc/images/icons/callouts/4.png
+share/asciidoc/images/icons/callouts/5.png
+share/asciidoc/images/icons/callouts/6.png
+share/asciidoc/images/icons/callouts/7.png
+share/asciidoc/images/icons/callouts/8.png
+share/asciidoc/images/icons/callouts/9.png
+share/asciidoc/images/icons/caution.png
+share/asciidoc/images/icons/example.png
+share/asciidoc/images/icons/home.png
+share/asciidoc/images/icons/important.png
+share/asciidoc/images/icons/next.png
+share/asciidoc/images/icons/note.png
+share/asciidoc/images/icons/prev.png
+share/asciidoc/images/icons/tip.png
+share/asciidoc/images/icons/up.png
+share/asciidoc/images/icons/warning.png
+share/asciidoc/javascripts/ASCIIMathML.js
+share/asciidoc/javascripts/toc.js
+share/asciidoc/latex.conf
 share/asciidoc/linuxdoc.conf
 share/asciidoc/stylesheets/docbook-xsl.css
 share/asciidoc/stylesheets/xhtml-deprecated-manpage.css
@@ -17,4 +59,9 @@ share/asciidoc/xhtml-deprecated.conf
 share/asciidoc/xhtml11-quirks.conf
 share/asciidoc/xhtml11.conf
 @dirrm share/asciidoc/stylesheets
+@dirrm share/asciidoc/javascripts
+@dirrm share/asciidoc/images/icons/callouts
+@dirrm share/asciidoc/images/icons
+@dirrm share/asciidoc/filters
+@dirrm share/asciidoc/docbook-xsl
 @dirrm share/asciidoc
diff --git a/textproc/asciidoc/distinfo b/textproc/asciidoc/distinfo
index f0dad5ea2f6..35d24e3dc02 100644
--- a/textproc/asciidoc/distinfo
+++ b/textproc/asciidoc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/07/10 09:28:05 rillig Exp $
+$NetBSD: distinfo,v 1.2 2006/11/17 20:43:48 reed Exp $
 
-SHA1 (asciidoc-7.1.2.tar.gz) = 51e5b49474065cd5b3feeb451252f97695216fc3
-RMD160 (asciidoc-7.1.2.tar.gz) = ca7d08c3b469b6c3d08f433e40100626e33739df
-Size (asciidoc-7.1.2.tar.gz) = 732871 bytes
+SHA1 (asciidoc-8.1.0.tar.gz) = 72eccad4e71b4aad294cb6c9200fffa490e034ae
+RMD160 (asciidoc-8.1.0.tar.gz) = 1f041b7dc56dd2b9c5db4b1d5ac310cce470db38
+Size (asciidoc-8.1.0.tar.gz) = 761244 bytes