- Update to 8.6.6

While I'm here:

- Use ETCDIR
- Make it preserve configuration files

PR:		ports/170655
Submitted by:	Sebastian Chmielewski <chmielsster@gmail.com>
Approved by:	tabthorpe (mentor)

4 files changed, 218 insertions, 100 deletions

diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile
index 5cc61cff4dee..63e20e3046d6 100644
--- a/textproc/asciidoc/Makefile
+++ b/textproc/asciidoc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asciidoc
-PORTVERSION=	8.6.4
+PORTVERSION=	8.6.6
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
@@ -21,8 +21,31 @@ MAKE_ENV=	INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 GNU_CONFIGURE=	yes
 MAN1=		a2x.1 asciidoc.1
 
+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 \
+		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
 
+post-patch:
+.for f in ${CONFFILES}
+	@cd ${WRKSRC} && ${MV} ${f} ${f}.sample
+.endfor
+
+post-install:
+.for f in ${CONFFILES}
+	@if [ ! -f ${ETCDIR}/${f} ]; then \
+		${CP} -p ${ETCDIR}/${f}.sample ${ETCDIR}/${f} ; \
+	fi
+.endfor
+
 .include <bsd.port.mk>
diff --git a/textproc/asciidoc/distinfo b/textproc/asciidoc/distinfo
index 1a772a134a11..a3c23e8fc742 100644
--- a/textproc/asciidoc/distinfo
+++ b/textproc/asciidoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asciidoc-8.6.4.tar.gz) = 6b405c0366ae432e1984b117e15c95f0935a617c90fe0a448aa03fece3927f8a
-SIZE (asciidoc-8.6.4.tar.gz) = 853136
+SHA256 (asciidoc-8.6.6.tar.gz) = 9d54c11716e4309ff4d942cf6a6d9745d6a28754ff1de01efed0dc659457ac71
+SIZE (asciidoc-8.6.6.tar.gz) = 881704
diff --git a/textproc/asciidoc/files/patch-Makefile.in b/textproc/asciidoc/files/patch-Makefile.in
index 4cf362d057ab..a6ae05a3b7c6 100644
--- a/textproc/asciidoc/files/patch-Makefile.in
+++ b/textproc/asciidoc/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	2009-05-08 23:41:23.568145042 +0200
-+++ Makefile.in	2009-05-08 23:41:57.495396294 +0200
+--- 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 @@
  
  .NOTPARALLEL:
@@ -10,7 +10,46 @@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
  SED = @SED@
  
-@@ -90,7 +87,7 @@
+@@ -32,32 +29,32 @@
+ manp = $(patsubst %1.txt,%1,$(wildcard doc/*.1.txt))
+ manpdir = $(mandir)/man1
+ 
+-conf = $(wildcard *.conf)
++conf = $(wildcard *.conf.sample)
+ confdir = $(ASCIIDOCCONF)
+ 
+ filtersdir = $(ASCIIDOCCONF)/filters
+ 
+ codefilter = filters/code/code-filter.py
+ codefilterdir = $(filtersdir)/code
+-codefilterconf = filters/code/code-filter.conf
++codefilterconf = filters/code/code-filter.conf.sample
+ codefilterconfdir = $(filtersdir)/code
+ 
+ graphvizfilter = filters/graphviz/graphviz2png.py
+ graphvizfilterdir = $(filtersdir)/graphviz
+-graphvizfilterconf = filters/graphviz/graphviz-filter.conf
++graphvizfilterconf = filters/graphviz/graphviz-filter.conf.sample
+ graphvizfilterconfdir = $(filtersdir)/graphviz
+ 
+ musicfilter = filters/music/music2png.py
+ musicfilterdir = $(filtersdir)/music
+-musicfilterconf = filters/music/music-filter.conf
++musicfilterconf = filters/music/music-filter.conf.sample
+ musicfilterconfdir = $(filtersdir)/music
+ 
+-sourcefilterconf = filters/source/source-highlight-filter.conf
++sourcefilterconf = filters/source/source-highlight-filter.conf.sample
+ sourcefilterconfdir = $(filtersdir)/source
+ 
+ latexfilter = filters/latex/latex2png.py
+ latexfilterdir = $(filtersdir)/latex
+-latexfilterconf = filters/latex/latex-filter.conf
++latexfilterconf = filters/latex/latex-filter.conf.sample
+ latexfilterconfdir = $(filtersdir)/latex
+ 
+ themesdir = $(ASCIIDOCCONF)/themes
+@@ -103,7 +100,7 @@
  	$(INSTALL) -d $(DESTDIR)/$($@)
  
  $(PROGTARGETS): % : %dir
@@ -19,9 +58,9 @@
  
  $(DATATARGETS): % : %dir
  	$(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
-@@ -147,7 +144,7 @@
+@@ -166,7 +163,7 @@
+ build: fixconfpath $(manp)
  
- build: fixconfpath
  
 -install: all $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim
 +install: all $(PROGTARGETS) $(DATATARGETS) progsymlink
diff --git a/textproc/asciidoc/pkg-plist b/textproc/asciidoc/pkg-plist
index 07a6762020e3..274208d17854 100644
--- a/textproc/asciidoc/pkg-plist
+++ b/textproc/asciidoc/pkg-plist
@@ -2,95 +2,151 @@ bin/a2x
 bin/a2x.py
 bin/asciidoc
 bin/asciidoc.py
-etc/asciidoc/asciidoc.conf
-etc/asciidoc/dblatex/asciidoc-dblatex.sty
-etc/asciidoc/dblatex/asciidoc-dblatex.xsl
-etc/asciidoc/docbook-xsl/chunked.xsl
-etc/asciidoc/docbook-xsl/common.xsl
-etc/asciidoc/docbook-xsl/epub.xsl
-etc/asciidoc/docbook-xsl/fo.xsl
-etc/asciidoc/docbook-xsl/htmlhelp.xsl
-etc/asciidoc/docbook-xsl/manpage.xsl
-etc/asciidoc/docbook-xsl/text.xsl
-etc/asciidoc/docbook-xsl/xhtml.xsl
-etc/asciidoc/docbook45.conf
-etc/asciidoc/filters/code/code-filter.conf
-etc/asciidoc/filters/code/code-filter.py
-etc/asciidoc/filters/graphviz/graphviz-filter.conf
-etc/asciidoc/filters/graphviz/graphviz2png.py
-etc/asciidoc/filters/latex/latex-filter.conf
-etc/asciidoc/filters/latex/latex2png.py
-etc/asciidoc/filters/music/music-filter.conf
-etc/asciidoc/filters/music/music2png.py
-etc/asciidoc/filters/source/source-highlight-filter.conf
-etc/asciidoc/help.conf
-etc/asciidoc/html4.conf
-etc/asciidoc/images/icons/README
-etc/asciidoc/images/icons/callouts/1.png
-etc/asciidoc/images/icons/callouts/10.png
-etc/asciidoc/images/icons/callouts/11.png
-etc/asciidoc/images/icons/callouts/12.png
-etc/asciidoc/images/icons/callouts/13.png
-etc/asciidoc/images/icons/callouts/14.png
-etc/asciidoc/images/icons/callouts/15.png
-etc/asciidoc/images/icons/callouts/2.png
-etc/asciidoc/images/icons/callouts/3.png
-etc/asciidoc/images/icons/callouts/4.png
-etc/asciidoc/images/icons/callouts/5.png
-etc/asciidoc/images/icons/callouts/6.png
-etc/asciidoc/images/icons/callouts/7.png
-etc/asciidoc/images/icons/callouts/8.png
-etc/asciidoc/images/icons/callouts/9.png
-etc/asciidoc/images/icons/caution.png
-etc/asciidoc/images/icons/example.png
-etc/asciidoc/images/icons/home.png
-etc/asciidoc/images/icons/important.png
-etc/asciidoc/images/icons/next.png
-etc/asciidoc/images/icons/note.png
-etc/asciidoc/images/icons/prev.png
-etc/asciidoc/images/icons/tip.png
-etc/asciidoc/images/icons/up.png
-etc/asciidoc/images/icons/warning.png
-etc/asciidoc/javascripts/ASCIIMathML.js
-etc/asciidoc/javascripts/LaTeXMathML.js
-etc/asciidoc/javascripts/asciidoc-xhtml11.js
-etc/asciidoc/javascripts/slidy.js
-etc/asciidoc/javascripts/toc.js
-etc/asciidoc/lang-de.conf
-etc/asciidoc/lang-en.conf
-etc/asciidoc/lang-es.conf
-etc/asciidoc/lang-fr.conf
-etc/asciidoc/lang-hu.conf
-etc/asciidoc/lang-it.conf
-etc/asciidoc/lang-pt-BR.conf
-etc/asciidoc/lang-ru.conf
-etc/asciidoc/lang-uk.conf
-etc/asciidoc/latex.conf
-etc/asciidoc/slidy.conf
-etc/asciidoc/stylesheets/docbook-xsl.css
-etc/asciidoc/stylesheets/pygments.css
-etc/asciidoc/stylesheets/slidy.css
-etc/asciidoc/stylesheets/volnitsky.css
-etc/asciidoc/stylesheets/volnitsky-manpage.css
-etc/asciidoc/stylesheets/volnitsky-quirks.css
-etc/asciidoc/stylesheets/xhtml11-manpage.css
-etc/asciidoc/stylesheets/xhtml11-quirks.css
-etc/asciidoc/stylesheets/xhtml11.css
-etc/asciidoc/text.conf
-etc/asciidoc/wordpress.conf
-etc/asciidoc/xhtml11-quirks.conf
-etc/asciidoc/xhtml11.conf
-@dirrm etc/asciidoc/dblatex
-@dirrm etc/asciidoc/docbook-xsl
-@dirrm etc/asciidoc/filters/code
-@dirrm etc/asciidoc/filters/graphviz
-@dirrm etc/asciidoc/filters/latex
-@dirrm etc/asciidoc/filters/music
-@dirrm etc/asciidoc/filters/source
-@dirrm etc/asciidoc/filters
-@dirrm etc/asciidoc/images/icons/callouts
-@dirrm etc/asciidoc/images/icons
-@dirrm etc/asciidoc/images
-@dirrm etc/asciidoc/javascripts
-@dirrm etc/asciidoc/stylesheets
-@dirrm etc/asciidoc
+@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%%/dblatex/asciidoc-dblatex.sty
+%%ETCDIR%%/dblatex/asciidoc-dblatex.xsl
+%%ETCDIR%%/docbook-xsl/chunked.xsl
+%%ETCDIR%%/docbook-xsl/common.xsl
+%%ETCDIR%%/docbook-xsl/epub.xsl
+%%ETCDIR%%/docbook-xsl/fo.xsl
+%%ETCDIR%%/docbook-xsl/htmlhelp.xsl
+%%ETCDIR%%/docbook-xsl/manpage.xsl
+%%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
+@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.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/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/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/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
+@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
+@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
+@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
+%%ETCDIR%%/images/icons/README
+%%ETCDIR%%/images/icons/callouts/1.png
+%%ETCDIR%%/images/icons/callouts/10.png
+%%ETCDIR%%/images/icons/callouts/11.png
+%%ETCDIR%%/images/icons/callouts/12.png
+%%ETCDIR%%/images/icons/callouts/13.png
+%%ETCDIR%%/images/icons/callouts/14.png
+%%ETCDIR%%/images/icons/callouts/15.png
+%%ETCDIR%%/images/icons/callouts/2.png
+%%ETCDIR%%/images/icons/callouts/3.png
+%%ETCDIR%%/images/icons/callouts/4.png
+%%ETCDIR%%/images/icons/callouts/5.png
+%%ETCDIR%%/images/icons/callouts/6.png
+%%ETCDIR%%/images/icons/callouts/7.png
+%%ETCDIR%%/images/icons/callouts/8.png
+%%ETCDIR%%/images/icons/callouts/9.png
+%%ETCDIR%%/images/icons/caution.png
+%%ETCDIR%%/images/icons/example.png
+%%ETCDIR%%/images/icons/home.png
+%%ETCDIR%%/images/icons/important.png
+%%ETCDIR%%/images/icons/next.png
+%%ETCDIR%%/images/icons/note.png
+%%ETCDIR%%/images/icons/prev.png
+%%ETCDIR%%/images/icons/tip.png
+%%ETCDIR%%/images/icons/up.png
+%%ETCDIR%%/images/icons/warning.png
+%%ETCDIR%%/javascripts/ASCIIMathML.js
+%%ETCDIR%%/javascripts/LaTeXMathML.js
+%%ETCDIR%%/javascripts/asciidoc.js
+%%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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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%%/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
+@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
+@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
+@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%%