Tue Jun 10 13:06:30 2008 UTC ()
Update to 8.2.6.  Significant changes (plus assorted minor changes and
bugfixes);

     * asciidoc(1) and a2x(1) man pages formatted to conform to
       man-pages(7) recommendations.
     * Old code-filter syntax (pre-8.1.0) is no longer recognized so that
       malformed two-line level 2 titles are no longer confused with
       code-filter block delimiters.


(gdt)
diff -r1.12 -r1.13 pkgsrc/textproc/asciidoc/Makefile
diff -r1.6 -r1.7 pkgsrc/textproc/asciidoc/PLIST
diff -r1.4 -r1.5 pkgsrc/textproc/asciidoc/distinfo
diff -r1.1 -r1.2 pkgsrc/textproc/asciidoc/patches/patch-aa
cvs diff -r1.12 -r1.13 pkgsrc/textproc/asciidoc/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/asciidoc/Makefile 2008/06/06 19:51:14 1.12
+++ pkgsrc/textproc/asciidoc/Makefile 2008/06/10 13:06:30 1.13
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.12 2008/06/06 19:51:14 gdt Exp $ 1# $NetBSD: Makefile,v 1.13 2008/06/10 13:06:30 gdt Exp $
2# 2#
3 3
4DISTNAME= asciidoc-8.2.5 4DISTNAME= asciidoc-8.2.6
5PKGREVISION= 4 
6CATEGORIES= textproc 5CATEGORIES= textproc
7MASTER_SITES= ${HOMEPAGE} \ 6MASTER_SITES= ${HOMEPAGE} \
8 ${MASTER_SITE_SOURCEFORGE:=asciidoc/} 7 ${MASTER_SITE_SOURCEFORGE:=asciidoc/}
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.methods.co.nz/asciidoc/ 10HOMEPAGE= http://www.methods.co.nz/asciidoc/
12COMMENT= ASCII to formatted document converter 11COMMENT= ASCII to formatted document converter
13 12
14DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl 13DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
15DEPENDS+= getopt-[0-9]*:../../misc/getopt 14DEPENDS+= getopt-[0-9]*:../../misc/getopt
16 15
17REPLACE_BASH+= a2x 16REPLACE_BASH+= a2x
18USE_TOOLS+= bash:run pax 17USE_TOOLS+= bash:run pax
cvs diff -r1.6 -r1.7 pkgsrc/textproc/asciidoc/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/asciidoc/PLIST 2007/12/09 20:56:41 1.6
+++ pkgsrc/textproc/asciidoc/PLIST 2008/06/10 13:06:30 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2007/12/09 20:56:41 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.7 2008/06/10 13:06:30 gdt Exp $
2bin/a2x 2bin/a2x
3bin/asciidoc 3bin/asciidoc
4man/man1/a2x.1 4man/man1/a2x.1
5man/man1/asciidoc.1 5man/man1/asciidoc.1
6share/asciidoc/asciidoc.conf 6share/asciidoc/asciidoc.conf
7share/asciidoc/docbook-xsl/chunked.xsl 7share/asciidoc/docbook-xsl/chunked.xsl
8share/asciidoc/docbook-xsl/common.xsl 8share/asciidoc/docbook-xsl/common.xsl
9share/asciidoc/docbook-xsl/fo.xsl 9share/asciidoc/docbook-xsl/fo.xsl
10share/asciidoc/docbook-xsl/htmlhelp.xsl 10share/asciidoc/docbook-xsl/htmlhelp.xsl
11share/asciidoc/docbook-xsl/manpage.xsl 11share/asciidoc/docbook-xsl/manpage.xsl
12share/asciidoc/docbook-xsl/xhtml.xsl 12share/asciidoc/docbook-xsl/xhtml.xsl
13share/asciidoc/docbook.conf 13share/asciidoc/docbook.conf
14share/asciidoc/filters/code-filter.conf 14share/asciidoc/filters/code-filter.conf
@@ -40,26 +40,27 @@ share/asciidoc/images/icons/home.png @@ -40,26 +40,27 @@ share/asciidoc/images/icons/home.png
40share/asciidoc/images/icons/important.png 40share/asciidoc/images/icons/important.png
41share/asciidoc/images/icons/next.png 41share/asciidoc/images/icons/next.png
42share/asciidoc/images/icons/note.png 42share/asciidoc/images/icons/note.png
43share/asciidoc/images/icons/prev.png 43share/asciidoc/images/icons/prev.png
44share/asciidoc/images/icons/tip.png 44share/asciidoc/images/icons/tip.png
45share/asciidoc/images/icons/up.png 45share/asciidoc/images/icons/up.png
46share/asciidoc/images/icons/warning.png 46share/asciidoc/images/icons/warning.png
47share/asciidoc/javascripts/ASCIIMathML.js 47share/asciidoc/javascripts/ASCIIMathML.js
48share/asciidoc/javascripts/LaTeXMathML.js 48share/asciidoc/javascripts/LaTeXMathML.js
49share/asciidoc/javascripts/toc.js 49share/asciidoc/javascripts/toc.js
50share/asciidoc/lang-es.conf 50share/asciidoc/lang-es.conf
51share/asciidoc/latex.conf 51share/asciidoc/latex.conf
52share/asciidoc/linuxdoc.conf 52share/asciidoc/linuxdoc.conf
 53share/asciidoc/stylesheets/compact.css
53share/asciidoc/stylesheets/docbook-xsl.css 54share/asciidoc/stylesheets/docbook-xsl.css
54share/asciidoc/stylesheets/xhtml-deprecated-manpage.css 55share/asciidoc/stylesheets/xhtml-deprecated-manpage.css
55share/asciidoc/stylesheets/xhtml-deprecated.css 56share/asciidoc/stylesheets/xhtml-deprecated.css
56share/asciidoc/stylesheets/xhtml11-manpage.css 57share/asciidoc/stylesheets/xhtml11-manpage.css
57share/asciidoc/stylesheets/xhtml11-quirks.css 58share/asciidoc/stylesheets/xhtml11-quirks.css
58share/asciidoc/stylesheets/xhtml11.css 59share/asciidoc/stylesheets/xhtml11.css
59share/asciidoc/text.conf 60share/asciidoc/text.conf
60share/asciidoc/xhtml-deprecated-css.conf 61share/asciidoc/xhtml-deprecated-css.conf
61share/asciidoc/xhtml-deprecated.conf 62share/asciidoc/xhtml-deprecated.conf
62share/asciidoc/xhtml11-quirks.conf 63share/asciidoc/xhtml11-quirks.conf
63share/asciidoc/xhtml11.conf 64share/asciidoc/xhtml11.conf
64share/doc/asciidoc/asciidoc.html 65share/doc/asciidoc/asciidoc.html
65share/doc/asciidoc/asciidoc.txt 66share/doc/asciidoc/asciidoc.txt
cvs diff -r1.4 -r1.5 pkgsrc/textproc/asciidoc/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/asciidoc/distinfo 2008/06/06 19:51:14 1.4
+++ pkgsrc/textproc/asciidoc/distinfo 2008/06/10 13:06:30 1.5
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.4 2008/06/06 19:51:14 gdt Exp $ 1$NetBSD: distinfo,v 1.5 2008/06/10 13:06:30 gdt Exp $
2 2
3SHA1 (asciidoc-8.2.5.tar.gz) = 792bc45a17a0b54f8744214251fb08989e178d25 3SHA1 (asciidoc-8.2.6.tar.gz) = cce98ed670c462a3a007b03b6f92d2108c5bc405
4RMD160 (asciidoc-8.2.5.tar.gz) = 966ee7af72a3c53916e7bf6a1670f23ce739adfc 4RMD160 (asciidoc-8.2.6.tar.gz) = c07d2eaa04d16275c44756236023c0789cf54310
5Size (asciidoc-8.2.5.tar.gz) = 722902 bytes 5Size (asciidoc-8.2.6.tar.gz) = 739790 bytes
6SHA1 (patch-aa) = e10d700a0206bada293ab71f64edbe50dcf4a000 6SHA1 (patch-aa) = f8e1128a7ea77a6c4bcfa023b6fcb040cc3882de
cvs diff -r1.1 -r1.2 pkgsrc/textproc/asciidoc/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/textproc/asciidoc/patches/Attic/patch-aa 2008/06/06 19:51:14 1.1
+++ pkgsrc/textproc/asciidoc/patches/Attic/patch-aa 2008/06/10 13:06:30 1.2
@@ -1,18 +1,21 @@ @@ -1,18 +1,21 @@
1$NetBSD: patch-aa,v 1.1 2008/06/06 19:51:14 gdt Exp $ 1$NetBSD: patch-aa,v 1.2 2008/06/10 13:06:30 gdt Exp $
2 2
3a2x uses the '-u' argument to cp, which POSIX does not specify: 3a2x uses the '-u' argument to cp, which POSIX does not specify:
4 http://www.opengroup.org/onlinepubs/009695399/utilities/cp.html 4 http://www.opengroup.org/onlinepubs/009695399/utilities/cp.html
5 5
 6Filed upstream on 20080609 as
 7https://sourceforge.net/tracker/index.php?func=detail&aid=1989227&group_id=67797&atid=519005
 8
6--- a2x.orig 2007-10-28 23:50:53.000000000 -0400 9--- a2x.orig 2007-10-28 23:50:53.000000000 -0400
7+++ a2x 10+++ a2x
8@@ -379,7 +379,7 @@ function copy_stylesheet() 11@@ -379,7 +379,7 @@ function copy_stylesheet()
9 if [[ "$src" -ef "$dst" ]]; then 12 if [[ "$src" -ef "$dst" ]]; then
10 return 13 return
11 fi 14 fi
12- execute_command_2 "cp -u \"$src\" \"$dst\"" 15- execute_command_2 "cp -u \"$src\" \"$dst\""
13+ execute_command_2 "cp \"$src\" \"$dst\"" 16+ execute_command_2 "cp \"$src\" \"$dst\""
14 } 17 }
15  18
16 # Copy distribution admonition and navigation icons to destination directory 19 # Copy distribution admonition and navigation icons to destination directory
17@@ -405,7 +405,7 @@ function copy_icons() 20@@ -405,7 +405,7 @@ function copy_icons()
18 else 21 else