- Update to version 8.6.8

- Add LICENSE
- Update pkg-descr

PR:           ports/170170
Submitted by: KATO Tsuguru <tkato432 _at_ yahoo.com>
Approved by:  beat (mentor)
Feature safe: yes

5 files changed, 97 insertions, 83 deletions

diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 63e20e3046d6..66bab50dc53d 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -6,35 +6,34 @@
 #
 
 PORTNAME=	asciidoc
-PORTVERSION=	8.6.6
+PORTVERSION=	8.6.8
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A text document format for writing short documents and man pages
 
+LICENSE=	GPLv2 MIT
+LICENSE_COMB=	multi
+
 USE_PYTHON=	2.5+
 USE_GMAKE=	yes
-MAKE_ENV=	INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_SCRIPT="${INSTALL_SCRIPT}" INSTALL_DATA="${INSTALL_DATA}"
-
 GNU_CONFIGURE=	yes
+
 MAN1=		a2x.1 asciidoc.1
 
-CONFFILES=	asciidoc.conf docbook45.conf filters/code/code-filter.conf \
+CONFFILES=	asciidoc.conf docbook45.conf \
+		filters/code/code-filter.conf \
 		filters/graphviz/graphviz-filter.conf \
 		filters/latex/latex-filter.conf \
 		filters/music/music-filter.conf \
 		filters/source/source-highlight-filter.conf \
-		help.conf html4.conf html5.conf lang-de.conf lang-en.conf \
-		lang-es.conf lang-fr.conf lang-hu.conf lang-it.conf \
-		lang-nl.conf lang-pt-BR.conf lang-ru.conf lang-uk.conf \
+		help.conf html4.conf html5.conf \
+		lang-de.conf lang-el.conf lang-en.conf lang-es.conf \
+		lang-fr.conf lang-hu.conf lang-it.conf lang-nl.conf \
+		lang-pt-BR.conf lang-ru.conf lang-uk.conf \
 		latex.conf slidy.conf text.conf wordpress.conf \
-		xhtml11-quirks.conf xhtml11.conf
-
-# a future improvement to this port is to also install the vim syntax
-# highlighing mode which is currently disabled by being patched away in
-# Makefile.in
+		xhtml11.conf xhtml11-quirks.conf
 
 post-patch:
 .for f in ${CONFFILES}
diff --git a/textproc/asciidoc/distinfo b/textproc/asciidoc/distinfo
index a3c23e8fc742..20f1dc1ce156 100644
--- a/textproc/asciidoc/distinfo
+++ b/textproc/asciidoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asciidoc-8.6.6.tar.gz) = 9d54c11716e4309ff4d942cf6a6d9745d6a28754ff1de01efed0dc659457ac71
-SIZE (asciidoc-8.6.6.tar.gz) = 881704
+SHA256 (asciidoc-8.6.8.tar.gz) = ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4
+SIZE (asciidoc-8.6.8.tar.gz) = 900422
diff --git a/textproc/asciidoc/files/patch-Makefile.in b/textproc/asciidoc/files/patch-Makefile.in
index a6ae05a3b7c6..a200634319c7 100644
--- a/textproc/asciidoc/files/patch-Makefile.in
+++ b/textproc/asciidoc/files/patch-Makefile.in
@@ -1,16 +1,21 @@
---- Makefile.in.orig	2011-05-30 22:54:30.000000000 +0200
-+++ Makefile.in	2012-08-17 14:22:11.031409140 +0200
-@@ -4,9 +4,6 @@
- 
+--- Makefile.in.orig	2011-05-31 05:54:30.000000000 +0900
++++ Makefile.in	2012-08-18 21:30:48.000000000 +0900
+@@ -5,7 +5,7 @@
  .NOTPARALLEL:
  
--INSTALL = @INSTALL@
+ INSTALL = @INSTALL@
 -INSTALL_PROG = @INSTALL_PROGRAM@
--INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROG = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
  SED = @SED@
+@@ -27,37 +27,37 @@
+ prog = asciidoc.py a2x.py
+ progdir = $(bindir)
+ 
+-vimdir = @sysconfdir@/vim
++vimdir = @datadir@/vim/vimfiles
  
-@@ -32,32 +29,32 @@
  manp = $(patsubst %1.txt,%1,$(wildcard doc/*.1.txt))
  manpdir = $(mandir)/man1
  
@@ -49,21 +54,23 @@
  latexfilterconfdir = $(filtersdir)/latex
  
  themesdir = $(ASCIIDOCCONF)/themes
-@@ -103,7 +100,7 @@
- 	$(INSTALL) -d $(DESTDIR)/$($@)
- 
- $(PROGTARGETS): % : %dir
--	$(INSTALL_PROG) $($@) $(DESTDIR)/$($<)/
-+	$(INSTALL_SCRIPT) $($@) $(DESTDIR)/$($<)/
- 
- $(DATATARGETS): % : %dir
- 	$(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
-@@ -166,7 +163,7 @@
- build: fixconfpath $(manp)
- 
- 
--install: all $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim
-+install: all $(PROGTARGETS) $(DATATARGETS) progsymlink
- 
- uninstall: uninstall-vim
- 	rm -f $(DESTDIR)/$(progdir)/asciidoc
+@@ -145,8 +145,7 @@
+ 	done
+ 
+ install-vim:
+-	@for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
+-		if ! test -d $$d; then continue; fi ; \
++	@for d in $(DESTDIR)/$(vimdir); do \
+ 		echo "installing Vim files in $$d" ; \
+ 		$(INSTALL) -d $$d/syntax ; \
+ 		$(INSTALL_DATA) vim/syntax/asciidoc.vim $$d/syntax ; \
+@@ -155,8 +154,7 @@
+ 	done
+ 
+ uninstall-vim:
+-	@for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
+-		if ! test -d $$d; then continue; fi ; \
++	@for d in $(DESTDIR)/$(vimdir); do \
+ 		echo "uninstalling Vim files in $$d" ; \
+ 		rm -f $$d/syntax/asciidoc.vim ; \
+ 		rm -f $$d/ftdetect/asciidoc_filetype.vim ; \
diff --git a/textproc/asciidoc/pkg-descr b/textproc/asciidoc/pkg-descr
index 238bd4bd1bda..81b3e7c1adaf 100644
--- a/textproc/asciidoc/pkg-descr
+++ b/textproc/asciidoc/pkg-descr
@@ -2,6 +2,4 @@ AsciiDoc is a text document format for writing short documents, articles, books
 and UNIX man pages. AsciiDoc files can be translated to HTML and DocBook
 markups using the asciidoc(1) command.
 
-This port currently does not install the VIM syntax highlighting mode.
-
 WWW: http://www.methods.co.nz/asciidoc/
diff --git a/textproc/asciidoc/pkg-plist b/textproc/asciidoc/pkg-plist
index 274208d17854..9455289d8f51 100644
--- a/textproc/asciidoc/pkg-plist
+++ b/textproc/asciidoc/pkg-plist
@@ -3,8 +3,8 @@ bin/a2x.py
 bin/asciidoc
 bin/asciidoc.py
 @unexec if cmp -s %D/%%ETCDIR%%/asciidoc.conf.sample %D/%%ETCDIR%%/asciidoc.conf; then rm -f %D/%%ETCDIR%%/asciidoc.conf; fi
-%%ETCDIR%%/asciidoc.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/asciidoc.conf ] ; then cp -p %D/%F %B/asciidoc.conf; fi
+%%ETCDIR%%/asciidoc.conf.sample
 %%ETCDIR%%/dblatex/asciidoc-dblatex.sty
 %%ETCDIR%%/dblatex/asciidoc-dblatex.xsl
 %%ETCDIR%%/docbook-xsl/chunked.xsl
@@ -16,33 +16,33 @@ bin/asciidoc.py
 %%ETCDIR%%/docbook-xsl/text.xsl
 %%ETCDIR%%/docbook-xsl/xhtml.xsl
 @unexec if cmp -s %D/%%ETCDIR%%/docbook45.conf.sample %D/%%ETCDIR%%/docbook45.conf; then rm -f %D/%%ETCDIR%%/docbook45.conf; fi
-%%ETCDIR%%/docbook45.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/docbook45.conf ] ; then cp -p %D/%F %B/docbook45.conf; fi
+%%ETCDIR%%/docbook45.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/filters/code/code-filter.conf.sample %D/%%ETCDIR%%/filters/code/code-filter.conf; then rm -f %D/%%ETCDIR%%/filters/code/code-filter.conf; fi
-%%ETCDIR%%/filters/code/code-filter.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/filters/code/code-filter.conf ] ; then cp -p %D/%F %B/code-filter.conf; fi
+%%ETCDIR%%/filters/code/code-filter.conf.sample
 %%ETCDIR%%/filters/code/code-filter.py
 @unexec if cmp -s %D/%%ETCDIR%%/filters/graphviz/graphviz-filter.conf.sample %D/%%ETCDIR%%/filters/graphviz/graphviz-filter.conf; then rm -f %D/%%ETCDIR%%/filters/graphviz/graphviz-filter.conf; fi
-%%ETCDIR%%/filters/graphviz/graphviz-filter.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/filters/graphviz/graphviz-filter.conf ] ; then cp -p %D/%F %B/graphviz-filter.conf; fi
+%%ETCDIR%%/filters/graphviz/graphviz-filter.conf.sample
 %%ETCDIR%%/filters/graphviz/graphviz2png.py
 @unexec if cmp -s %D/%%ETCDIR%%/filters/latex/latex-filter.conf.sample %D/%%ETCDIR%%/filters/latex/latex-filter.conf; then rm -f %D/%%ETCDIR%%/filters/latex/latex-filter.conf; fi
-%%ETCDIR%%/filters/latex/latex-filter.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/filters/latex/latex-filter.conf ] ; then cp -p %D/%F %B/latex-filter.conf; fi
+%%ETCDIR%%/filters/latex/latex-filter.conf.sample
 %%ETCDIR%%/filters/latex/latex2png.py
 @unexec if cmp -s %D/%%ETCDIR%%/filters/music/music-filter.conf.sample %D/%%ETCDIR%%/filters/music/music-filter.conf; then rm -f %D/%%ETCDIR%%/filters/music/music-filter.conf; fi
-%%ETCDIR%%/filters/music/music-filter.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/filters/music/music-filter.conf ] ; then cp -p %D/%F %B/music-filter.conf; fi
+%%ETCDIR%%/filters/music/music-filter.conf.sample
 %%ETCDIR%%/filters/music/music2png.py
 @unexec if cmp -s %D/%%ETCDIR%%/filters/source/source-highlight-filter.conf.sample %D/%%ETCDIR%%/filters/source/source-highlight-filter.conf; then rm -f %D/%%ETCDIR%%/filters/source/source-highlight-filter.conf; fi
-%%ETCDIR%%/filters/source/source-highlight-filter.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/filters/source/source-highlight-filter.conf ] ; then cp -p %D/%F %B/source-highlight-filter.conf; fi
+%%ETCDIR%%/filters/source/source-highlight-filter.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/help.conf.sample %D/%%ETCDIR%%/help.conf; then rm -f %D/%%ETCDIR%%/help.conf; fi
-%%ETCDIR%%/help.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/help.conf ] ; then cp -p %D/%F %B/help.conf; fi
+%%ETCDIR%%/help.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/html4.conf.sample %D/%%ETCDIR%%/html4.conf; then rm -f %D/%%ETCDIR%%/html4.conf; fi
-%%ETCDIR%%/html4.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/html4.conf ] ; then cp -p %D/%F %B/html4.conf; fi
+%%ETCDIR%%/html4.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/html5.conf.sample %D/%%ETCDIR%%/html5.conf; then rm -f %D/%%ETCDIR%%/html5.conf; fi
 %%ETCDIR%%/html5.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/html5.conf ] ; then cp -p %D/%F %B/html5.conf; fi
@@ -78,75 +78,85 @@ bin/asciidoc.py
 %%ETCDIR%%/javascripts/slidy.js
 %%ETCDIR%%/javascripts/toc.js
 @unexec if cmp -s %D/%%ETCDIR%%/lang-de.conf.sample %D/%%ETCDIR%%/lang-de.conf; then rm -f %D/%%ETCDIR%%/lang-de.conf; fi
-%%ETCDIR%%/lang-de.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/lang-de.conf ] ; then cp -p %D/%F %B/lang-de.conf; fi
+%%ETCDIR%%/lang-de.conf.sample
+@unexec if cmp -s %D/%%ETCDIR%%/lang-el.conf.sample %D/%%ETCDIR%%/lang-el.conf; then rm -f %D/%%ETCDIR%%/lang-el.conf; fi
+@exec if [ ! -f %D/%%ETCDIR%%/lang-el.conf ] ; then cp -p %D/%F %B/lang-el.conf; fi
+%%ETCDIR%%/lang-el.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/lang-en.conf.sample %D/%%ETCDIR%%/lang-en.conf; then rm -f %D/%%ETCDIR%%/lang-en.conf; fi
-%%ETCDIR%%/lang-en.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/lang-en.conf ] ; then cp -p %D/%F %B/lang-en.conf; fi
+%%ETCDIR%%/lang-en.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/lang-es.conf.sample %D/%%ETCDIR%%/lang-es.conf; then rm -f %D/%%ETCDIR%%/lang-es.conf; fi
-%%ETCDIR%%/lang-es.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/lang-es.conf ] ; then cp -p %D/%F %B/lang-es.conf; fi
+%%ETCDIR%%/lang-es.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/lang-fr.conf.sample %D/%%ETCDIR%%/lang-fr.conf; then rm -f %D/%%ETCDIR%%/lang-fr.conf; fi
-%%ETCDIR%%/lang-fr.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/lang-fr.conf ] ; then cp -p %D/%F %B/lang-fr.conf; fi
+%%ETCDIR%%/lang-fr.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/lang-hu.conf.sample %D/%%ETCDIR%%/lang-hu.conf; then rm -f %D/%%ETCDIR%%/lang-hu.conf; fi
-%%ETCDIR%%/lang-hu.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/lang-hu.conf ] ; then cp -p %D/%F %B/lang-hu.conf; fi
+%%ETCDIR%%/lang-hu.conf.sample
+
 @unexec if cmp -s %D/%%ETCDIR%%/lang-it.conf.sample %D/%%ETCDIR%%/lang-it.conf; then rm -f %D/%%ETCDIR%%/lang-it.conf; fi
-%%ETCDIR%%/lang-it.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/lang-it.conf ] ; then cp -p %D/%F %B/lang-it.conf; fi
+%%ETCDIR%%/lang-it.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/lang-nl.conf.sample %D/%%ETCDIR%%/lang-nl.conf; then rm -f %D/%%ETCDIR%%/lang-nl.conf; fi
-%%ETCDIR%%/lang-nl.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/lang-nl.conf ] ; then cp -p %D/%F %B/lang-nl.conf; fi
+%%ETCDIR%%/lang-nl.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/lang-pt-BR.conf.sample %D/%%ETCDIR%%/lang-pt-BR.conf; then rm -f %D/%%ETCDIR%%/lang-pt-BR.conf; fi
-%%ETCDIR%%/lang-pt-BR.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/lang-pt-BR.conf ] ; then cp -p %D/%F %B/lang-pt-BR.conf; fi
+%%ETCDIR%%/lang-pt-BR.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/lang-ru.conf.sample %D/%%ETCDIR%%/lang-ru.conf; then rm -f %D/%%ETCDIR%%/lang-ru.conf; fi
-%%ETCDIR%%/lang-ru.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/lang-ru.conf ] ; then cp -p %D/%F %B/lang-ru.conf; fi
+%%ETCDIR%%/lang-ru.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/lang-uk.conf.sample %D/%%ETCDIR%%/lang-uk.conf; then rm -f %D/%%ETCDIR%%/lang-uk.conf; fi
-%%ETCDIR%%/lang-uk.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/lang-uk.conf ] ; then cp -p %D/%F %B/lang-uk.conf; fi
+%%ETCDIR%%/lang-uk.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/latex.conf.sample %D/%%ETCDIR%%/latex.conf; then rm -f %D/%%ETCDIR%%/latex.conf; fi
-%%ETCDIR%%/latex.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/latex.conf ] ; then cp -p %D/%F %B/latex.conf; fi
+%%ETCDIR%%/latex.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/slidy.conf.sample %D/%%ETCDIR%%/slidy.conf; then rm -f %D/%%ETCDIR%%/slidy.conf; fi
-%%ETCDIR%%/slidy.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/slidy.conf ] ; then cp -p %D/%F %B/slidy.conf; fi
+%%ETCDIR%%/slidy.conf.sample
 %%ETCDIR%%/stylesheets/asciidoc.css
 %%ETCDIR%%/stylesheets/docbook-xsl.css
 %%ETCDIR%%/stylesheets/pygments.css
 %%ETCDIR%%/stylesheets/slidy.css
 %%ETCDIR%%/stylesheets/toc2.css
 %%ETCDIR%%/stylesheets/xhtml11-quirks.css
-%%ETCDIR%%/themes/flask/flask.css
-%%ETCDIR%%/themes/volnitsky/volnitsky.css
 @unexec if cmp -s %D/%%ETCDIR%%/text.conf.sample %D/%%ETCDIR%%/text.conf; then rm -f %D/%%ETCDIR%%/text.conf; fi
-%%ETCDIR%%/text.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/text.conf ] ; then cp -p %D/%F %B/text.conf; fi
+%%ETCDIR%%/text.conf.sample
+%%ETCDIR%%/themes/flask/flask.css
+%%ETCDIR%%/themes/volnitsky/volnitsky.css
 @unexec if cmp -s %D/%%ETCDIR%%/wordpress.conf.sample %D/%%ETCDIR%%/wordpress.conf; then rm -f %D/%%ETCDIR%%/wordpress.conf; fi
-%%ETCDIR%%/wordpress.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/wordpress.conf ] ; then cp -p %D/%F %B/wordpress.conf; fi
-@unexec if cmp -s %D/%%ETCDIR%%/xhtml11-quirks.conf.sample %D/%%ETCDIR%%/xhtml11-quirks.conf; then rm -f %D/%%ETCDIR%%/xhtml11-quirks.conf; fi
-%%ETCDIR%%/xhtml11-quirks.conf.sample
-@exec if [ ! -f %D/%%ETCDIR%%/xhtml11-quirks.conf ] ; then cp -p %D/%F %B/xhtml11-quirks.conf; fi
+%%ETCDIR%%/wordpress.conf.sample
 @unexec if cmp -s %D/%%ETCDIR%%/xhtml11.conf.sample %D/%%ETCDIR%%/xhtml11.conf; then rm -f %D/%%ETCDIR%%/xhtml11.conf; fi
 %%ETCDIR%%/xhtml11.conf.sample
 @exec if [ ! -f %D/%%ETCDIR%%/xhtml11.conf ] ; then cp -p %D/%F %B/xhtml11.conf; fi
-@dirrm %%ETCDIR%%/dblatex
-@dirrm %%ETCDIR%%/docbook-xsl
-@dirrmtry %%ETCDIR%%/filters/code
-@dirrmtry %%ETCDIR%%/filters/graphviz
-@dirrmtry %%ETCDIR%%/filters/latex
-@dirrmtry %%ETCDIR%%/filters/music
-@dirrmtry %%ETCDIR%%/filters/source
-@dirrmtry %%ETCDIR%%/filters
+@unexec if cmp -s %D/%%ETCDIR%%/xhtml11-quirks.conf.sample %D/%%ETCDIR%%/xhtml11-quirks.conf; then rm -f %D/%%ETCDIR%%/xhtml11-quirks.conf; fi
+@exec if [ ! -f %D/%%ETCDIR%%/xhtml11-quirks.conf ] ; then cp -p %D/%F %B/xhtml11-quirks.conf; fi
+%%ETCDIR%%/xhtml11-quirks.conf.sample
+share/vim/vimfiles/ftdetect/asciidoc_filetype.vim
+share/vim/vimfiles/syntax/asciidoc.vim
+@dirrmtry share/vim/vimfiles/syntax
+@dirrmtry share/vim/vimfiles/ftdetect
+@dirrmtry share/vim/vimfiles
+@dirrmtry share/vim
+@dirrm %%ETCDIR%%/themes/volnitsky
+@dirrm %%ETCDIR%%/themes/flask
+@dirrm %%ETCDIR%%/themes
+@dirrm %%ETCDIR%%/stylesheets
+@dirrm %%ETCDIR%%/javascripts
 @dirrm %%ETCDIR%%/images/icons/callouts
 @dirrm %%ETCDIR%%/images/icons
 @dirrm %%ETCDIR%%/images
-@dirrm %%ETCDIR%%/javascripts
-@dirrm %%ETCDIR%%/stylesheets
-@dirrm %%ETCDIR%%/themes/flask
-@dirrm %%ETCDIR%%/themes/volnitsky
-@dirrm %%ETCDIR%%/themes
+@dirrmtry %%ETCDIR%%/filters/source
+@dirrmtry %%ETCDIR%%/filters/music
+@dirrmtry %%ETCDIR%%/filters/latex
+@dirrmtry %%ETCDIR%%/filters/graphviz
+@dirrmtry %%ETCDIR%%/filters/code
+@dirrmtry %%ETCDIR%%/filters
+@dirrm %%ETCDIR%%/docbook-xsl
+@dirrm %%ETCDIR%%/dblatex
 @dirrmtry %%ETCDIR%%