asciidoc: 8.2.6=>8.2.7

4 files changed, 41 insertions, 20 deletions

diff --git a/asciidoc/.footprint b/asciidoc/.footprint
index 170b30972..1557a0357 100644
--- a/asciidoc/.footprint
+++ b/asciidoc/.footprint
@@ -5,6 +5,9 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/etc/
 drwxr-xr-x	root/root	usr/etc/asciidoc/
 -rw-r--r--	root/root	usr/etc/asciidoc/asciidoc.conf
+drwxr-xr-x	root/root	usr/etc/asciidoc/dblatex/
+-rw-r--r--	root/root	usr/etc/asciidoc/dblatex/asciidoc-dblatex.sty
+-rw-r--r--	root/root	usr/etc/asciidoc/dblatex/asciidoc-dblatex.xsl
 drwxr-xr-x	root/root	usr/etc/asciidoc/docbook-xsl/
 -rw-r--r--	root/root	usr/etc/asciidoc/docbook-xsl/chunked.xsl
 -rw-r--r--	root/root	usr/etc/asciidoc/docbook-xsl/common.xsl
@@ -56,14 +59,15 @@ drwxr-xr-x	root/root	usr/etc/asciidoc/javascripts/
 -rw-r--r--	root/root	usr/etc/asciidoc/lang-es.conf
 -rw-r--r--	root/root	usr/etc/asciidoc/latex.conf
 -rw-r--r--	root/root	usr/etc/asciidoc/linuxdoc.conf
+-rw-r--r--	root/root	usr/etc/asciidoc/math.conf
 drwxr-xr-x	root/root	usr/etc/asciidoc/stylesheets/
--rw-r--r--	root/root	usr/etc/asciidoc/stylesheets/compact.css
 -rw-r--r--	root/root	usr/etc/asciidoc/stylesheets/docbook-xsl.css
 -rw-r--r--	root/root	usr/etc/asciidoc/stylesheets/xhtml-deprecated-manpage.css
 -rw-r--r--	root/root	usr/etc/asciidoc/stylesheets/xhtml-deprecated.css
 -rw-r--r--	root/root	usr/etc/asciidoc/stylesheets/xhtml11-manpage.css
 -rw-r--r--	root/root	usr/etc/asciidoc/stylesheets/xhtml11-quirks.css
 -rw-r--r--	root/root	usr/etc/asciidoc/stylesheets/xhtml11.css
+-rw-r--r--	root/root	usr/etc/asciidoc/t.conf
 -rw-r--r--	root/root	usr/etc/asciidoc/text.conf
 -rw-r--r--	root/root	usr/etc/asciidoc/xhtml-deprecated-css.conf
 -rw-r--r--	root/root	usr/etc/asciidoc/xhtml-deprecated.conf
diff --git a/asciidoc/.md5sum b/asciidoc/.md5sum
index 9d6a5b064..0246aad2f 100644
--- a/asciidoc/.md5sum
+++ b/asciidoc/.md5sum
@@ -1 +1 @@
-1df4cee138a096131a94fe7d29066345  asciidoc-8.2.6.tar.gz
+f631c10bcf7216eaf6bc804c84ebb8e1  asciidoc-8.2.7.tar.gz
diff --git a/asciidoc/Pkgfile b/asciidoc/Pkgfile
index 016c09461..5aab56a7d 100644
--- a/asciidoc/Pkgfile
+++ b/asciidoc/Pkgfile
@@ -5,27 +5,44 @@
 # Nice to have: source-highlight
 
 name=asciidoc
-version=8.2.6
+version=8.2.7
 release=1
 source=(http://www.methods.co.nz/$name/$name-$version.tar.gz)
 
 build() {
+    # f#$king install script >:|
     cd $name-$version
     sed -i '/^CONF_DIR/s|/etc/asciidoc|/usr/etc/asciidoc|' a2x asciidoc.py
-    install -d $PKG/usr/man/man1
-    install -d $PKG/usr/share/vim/{syntax,ftdetect}
-    install -d $PKG/usr/etc/asciidoc/{filters,docbook-xsl,stylesheets,javascripts,images/icons/callouts}
-    install -m 0755 asciidoc.py -D $PKG/usr/bin/asciidoc
-    install -m 0755 a2x $PKG/usr/bin
-    install doc/*.1 $PKG/usr/man/man1
-    install -m 644 *.conf $PKG/usr/etc/asciidoc
-    install filters/*.py $PKG/usr/etc/asciidoc/filters
-    install -m 644 filters/*.conf $PKG/usr/etc/asciidoc/filters
-    install -m 644 docbook-xsl/*.xsl $PKG/usr/etc/asciidoc/docbook-xsl
-    install -m 644 stylesheets/*.css $PKG/usr/etc/asciidoc/stylesheets
-    install -m 644 javascripts/*.js $PKG/usr/etc/asciidoc/javascripts
-    install -m 644 images/icons/callouts/* $PKG/usr/etc/asciidoc/images/icons/callouts
-    install -m 644 images/icons/*.png $PKG/usr/etc/asciidoc/images/icons
-    install -m 644 vim/syntax/asciidoc.vim $PKG/usr/share/vim/syntax/asciidoc.vim
-    install -m 644 vim/ftdetect/asciidoc_filetype.vim $PKG/usr/share/vim/ftdetect/asciidoc_filetype.vim
+    CONFDIR=$PKG/usr/etc/asciidoc
+    BINDIR=$PKG/usr/bin
+    MANDIR=$PKG/usr/man
+    VIM_CONFDIR=$PKG/usr/share/vim
+
+    install -d $CONFDIR/filters \
+        $CONFDIR/docbook-xsl \
+        $CONFDIR/dblatex \
+        $CONFDIR/stylesheets \
+        $CONFDIR/javascripts \
+        $CONFDIR/images/icons/callouts
+    install -d $MANDIR/man1
+    install -D asciidoc.py $BINDIR/asciidoc
+    install a2x $BINDIR/a2x
+    install doc/*.1 $MANDIR/man1
+
+    install -m 644 *.conf $CONFDIR
+    install filters/*.py $CONFDIR/filters
+    install -m 644 filters/*.conf $CONFDIR/filters
+    install -m 644 docbook-xsl/*.xsl $CONFDIR/docbook-xsl
+    install -m 644 dblatex/*.xsl $CONFDIR/dblatex
+    install -m 644 dblatex/*.sty $CONFDIR/dblatex
+    install -m 644 stylesheets/*.css $CONFDIR/stylesheets
+    install -m 644 javascripts/*.js $CONFDIR/javascripts
+    install -m 644 images/icons/callouts/* $CONFDIR/images/icons/callouts
+    install -m 644 images/icons/*.png $CONFDIR/images/icons
+    install -d $VIM_CONFDIR/syntax
+    install -m 644 vim/syntax/asciidoc.vim \
+        $VIM_CONFDIR/syntax/asciidoc.vim
+    install -d $VIM_CONFDIR/ftdetect
+    install -m 644 vim/ftdetect/asciidoc_filetype.vim \
+        $VIM_CONFDIR/ftdetect/asciidoc_filetype.vim
 }
diff --git a/asciidoc/README b/asciidoc/README
index fdeaa4bed..5308952a3 100644
--- a/asciidoc/README
+++ b/asciidoc/README
@@ -2,7 +2,7 @@ README for asciidoc
 
 REQUIREMENTS
 
-    For the full functionality of a2x wrapper, install: libxslt(opt), lynx(contrib), fop(n/a), docbook-xsl(gnome).
+    For the full functionality of a2x wrapper, install: libxslt(opt), lynx(contrib), fop(n/a), docbook-xsl(gnome) etc.
 Install source-highlight(contrib) for embedded source highlighting inside asciidoc generated documents.
 For further information refer to
 http://www.methods.co.nz/asciidoc/a2x.1.html or a2x manpage