Update MC-ports to GNOME 3.12.

Dragons beware! Although most of them should be sleeping.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19571 df743ca5-7f9a-e211-a948-0013205c9059

13 files changed, 142 insertions, 76 deletions

diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 078014a99..14c5bc7f3 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -3,7 +3,7 @@
 #    $MCom$
 
 PORTNAME=	gtk-doc
-PORTVERSION=	1.18
+PORTVERSION=	1.20
 CATEGORIES=	textproc
 MASTER_SITES=	GNOME
 
@@ -11,6 +11,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Code documentation system, originally for GTK+
 
 BUILD_DEPENDS=	jade:${PORTSDIR}/textproc/jade \
+		itstool:${PORTSDIR}/textproc/itstool \
 		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
 		rarian-sk-config:${PORTSDIR}/textproc/rarian
@@ -25,12 +26,10 @@ CATALOG_DIR=		${PREFIX}/share/sgml/${PORTNAME}
 XMLCATMGR=		${LOCALBASE}/bin/xmlcatmgr
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
-USE_XZ=		yes
-GNU_CONFIGURE=	yes
+USES=		gmake pathfix perl5 pkgconfig tar:xz
+USE_GNOME=	gnomeprefix libxslt
 USE_PYTHON=	yes
-USES=		gmake pathfix perl5 pkgconfig
-USE_GNOME=	gnomeprefix libxslt gnomedocutils
-INSTALLS_OMF=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
 
 PLIST_SUB=	XMLCATMGR=${XMLCATMGR} \
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
index e5a1075ce..7f27222c5 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtk-doc-1.18.tar.xz) = 785b591c561be1c8206f0d2575dc63558ea6199c3afe49cbc4efde94a6629a20
-SIZE (gtk-doc-1.18.tar.xz) = 637936
+SHA256 (gtk-doc-1.20.tar.xz) = 3e6ecf134dbf92a74c24d79848fea3a48e59ab95408a38c6405905d95a293011
+SIZE (gtk-doc-1.20.tar.xz) = 643892
diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist
index 905715452..05c4ad1be 100644
--- a/textproc/gtk-doc/pkg-plist
+++ b/textproc/gtk-doc/pkg-plist
@@ -13,19 +13,6 @@ bin/gtkdoc-scanobj
 bin/gtkdocize
 libdata/pkgconfig/gtk-doc.pc
 share/aclocal/gtk-doc.m4
-share/gnome/help/gtk-doc-manual/C/fdl-appendix.xml
-share/gnome/help/gtk-doc-manual/C/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/bn_IN/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/de/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/el/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/en_GB/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/es/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/fr/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/gu/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/sl/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/sv/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/ta/gtk-doc-manual.xml
-share/gnome/help/gtk-doc-manual/te/gtk-doc-manual.xml
 %%DATADIR%%/data/devhelp2.xsl
 %%DATADIR%%/data/gtk-doc.dcl
 %%DATADIR%%/data/gtk-doc.dsl
@@ -36,40 +23,74 @@ share/gnome/help/gtk-doc-manual/te/gtk-doc-manual.xml
 %%DATADIR%%/data/gtk-doc.xsl
 %%DATADIR%%/data/gtkdoc-common.pl
 %%DATADIR%%/data/home.png
+%%DATADIR%%/data/left-insensitive.png
 %%DATADIR%%/data/left.png
+%%DATADIR%%/data/right-insensitive.png
 %%DATADIR%%/data/right.png
 %%DATADIR%%/data/style.css
+%%DATADIR%%/data/up-insensitive.png
 %%DATADIR%%/data/up.png
 %%DATADIR%%/data/version-greater-or-equal.xsl
-share/omf/gtk-doc-manual/gtk-doc-manual-C.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-bn_IN.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-de.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-el.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-en_GB.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-es.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-fr.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-gu.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-sl.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-sv.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-ta.omf
-share/omf/gtk-doc-manual/gtk-doc-manual-te.omf
+share/help/C/gtk-doc-manual/fdl-appendix.xml
+share/help/C/gtk-doc-manual/index.docbook
+share/help/bn_IN/gtk-doc-manual/fdl-appendix.xml
+share/help/bn_IN/gtk-doc-manual/index.docbook
+share/help/de/gtk-doc-manual/fdl-appendix.xml
+share/help/de/gtk-doc-manual/index.docbook
+share/help/el/gtk-doc-manual/fdl-appendix.xml
+share/help/el/gtk-doc-manual/index.docbook
+share/help/en_GB/gtk-doc-manual/fdl-appendix.xml
+share/help/en_GB/gtk-doc-manual/index.docbook
+share/help/es/gtk-doc-manual/fdl-appendix.xml
+share/help/es/gtk-doc-manual/index.docbook
+share/help/fr/gtk-doc-manual/fdl-appendix.xml
+share/help/fr/gtk-doc-manual/index.docbook
+share/help/gu/gtk-doc-manual/fdl-appendix.xml
+share/help/gu/gtk-doc-manual/index.docbook
+share/help/pt_BR/gtk-doc-manual/fdl-appendix.xml
+share/help/pt_BR/gtk-doc-manual/index.docbook
+share/help/sl/gtk-doc-manual/fdl-appendix.xml
+share/help/sl/gtk-doc-manual/index.docbook
+share/help/sv/gtk-doc-manual/fdl-appendix.xml
+share/help/sv/gtk-doc-manual/index.docbook
+share/help/ta/gtk-doc-manual/fdl-appendix.xml
+share/help/ta/gtk-doc-manual/index.docbook
+share/help/te/gtk-doc-manual/fdl-appendix.xml
+share/help/te/gtk-doc-manual/index.docbook
+share/help/zh_CN/gtk-doc-manual/fdl-appendix.xml
+share/help/zh_CN/gtk-doc-manual/index.docbook
 @unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG %%CATALOG_DIR%%/gtk-doc.cat
 share/sgml/gtk-doc/gtk-doc.cat
 @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%CATALOG_DIR%%/gtk-doc.cat
 @dirrm share/sgml/gtk-doc
-@dirrm share/omf/gtk-doc-manual
+@dirrmtry share/help/zh_CN/gtk-doc-manual
+@dirrmtry share/help/zh_CN
+@dirrmtry share/help/te/gtk-doc-manual
+@dirrmtry share/help/te
+@dirrmtry share/help/ta/gtk-doc-manual
+@dirrmtry share/help/ta
+@dirrmtry share/help/sv/gtk-doc-manual
+@dirrmtry share/help/sv
+@dirrmtry share/help/sl/gtk-doc-manual
+@dirrmtry share/help/sl
+@dirrmtry share/help/pt_BR/gtk-doc-manual
+@dirrmtry share/help/pt_BR
+@dirrmtry share/help/gu/gtk-doc-manual
+@dirrmtry share/help/gu
+@dirrmtry share/help/fr/gtk-doc-manual
+@dirrmtry share/help/fr
+@dirrmtry share/help/es/gtk-doc-manual
+@dirrmtry share/help/es
+@dirrmtry share/help/en_GB/gtk-doc-manual
+@dirrmtry share/help/en_GB
+@dirrmtry share/help/el/gtk-doc-manual
+@dirrmtry share/help/el
+@dirrmtry share/help/de/gtk-doc-manual
+@dirrmtry share/help/de
+@dirrmtry share/help/bn_IN/gtk-doc-manual
+@dirrmtry share/help/bn_IN
+@dirrmtry share/help/C/gtk-doc-manual
+@dirrmtry share/help/C
+@dirrmtry share/help
 @dirrm %%DATADIR%%/data
 @dirrm %%DATADIR%%
-@dirrm share/gnome/help/gtk-doc-manual/te
-@dirrm share/gnome/help/gtk-doc-manual/ta
-@dirrm share/gnome/help/gtk-doc-manual/sv
-@dirrm share/gnome/help/gtk-doc-manual/sl
-@dirrm share/gnome/help/gtk-doc-manual/gu
-@dirrm share/gnome/help/gtk-doc-manual/fr
-@dirrm share/gnome/help/gtk-doc-manual/es
-@dirrm share/gnome/help/gtk-doc-manual/en_GB
-@dirrm share/gnome/help/gtk-doc-manual/el
-@dirrm share/gnome/help/gtk-doc-manual/de
-@dirrm share/gnome/help/gtk-doc-manual/bn_IN
-@dirrm share/gnome/help/gtk-doc-manual/C
-@dirrm share/gnome/help/gtk-doc-manual
diff --git a/textproc/itstool/Makefile b/textproc/itstool/Makefile
new file mode 100644
index 000000000..d835d5e32
--- /dev/null
+++ b/textproc/itstool/Makefile
@@ -0,0 +1,27 @@
+# Created by: Koop Mast <kwm@FreeBSD.org>
+# $FreeBSD$
+#   $MCom$
+
+PORTNAME=	itstool
+PORTVERSION=	2.0.2
+PORTREVISION=	1
+CATEGORIES=	textproc
+MASTER_SITES=	http://files.itstool.org/itstool/
+
+MAINTAINER=	kwm@FreeBSD.org
+COMMENT=	Make XML documents translatable through po files
+
+LICENSE=	GPLv3
+
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+
+USES=		tar:bzip2
+USE_PYTHON_RUN=	2
+GNU_CONFIGURE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|@PYTHON@|${PYTHON_CMD}|g' \
+		${WRKSRC}/itstool.in
+
+.include <bsd.port.mk>
diff --git a/textproc/itstool/distinfo b/textproc/itstool/distinfo
new file mode 100644
index 000000000..38ebb2a15
--- /dev/null
+++ b/textproc/itstool/distinfo
@@ -0,0 +1,2 @@
+SHA256 (itstool-2.0.2.tar.bz2) = bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a
+SIZE (itstool-2.0.2.tar.bz2) = 96748
diff --git a/textproc/itstool/pkg-descr b/textproc/itstool/pkg-descr
new file mode 100644
index 000000000..31eae323d
--- /dev/null
+++ b/textproc/itstool/pkg-descr
@@ -0,0 +1,19 @@
+ITS Tool allows you to translate your XML documents with PO files, using rules
+from the W3C Internationalization Tag Set (ITS) to determine what to translate
+and how to separate it into PO file messages.
+
+PO files are the standard translation format for GNU and other Unix-like
+systems. They present translatable information as discrete messages, allowing
+each message to be translated independently. In contrast to whole-page
+translation, translating with a message-based format like PO means you can
+easily track changes to the source document down to the paragraph. When new
+strings are added or existing strings are modified, you only need to update
+the corresponding messages.
+
+ITS Tool is designed to make XML documents translatable through PO files by
+applying standard ITS rules, as well as extension rules specific to ITS Tool.
+ITS also provides an industry standard way for authors to override translation
+information in their documents, such as whether a particular element should be
+translated.
+
+WWW: http://itstool.org/
diff --git a/textproc/itstool/pkg-plist b/textproc/itstool/pkg-plist
new file mode 100644
index 000000000..d9d065660
--- /dev/null
+++ b/textproc/itstool/pkg-plist
@@ -0,0 +1,10 @@
+bin/itstool
+man/man1/itstool.1.gz
+%%DATADIR%%/its/docbook.its
+%%DATADIR%%/its/docbook5.its
+%%DATADIR%%/its/its.its
+%%DATADIR%%/its/mallard.its
+%%DATADIR%%/its/ttml.its
+%%DATADIR%%/its/xhtml.its
+@dirrm %%DATADIR%%/its
+@dirrm %%DATADIR%%
diff --git a/textproc/yelp-tools/Makefile b/textproc/yelp-tools/Makefile
index db6fe35fc..1a1424a75 100644
--- a/textproc/yelp-tools/Makefile
+++ b/textproc/yelp-tools/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	yelp-tools
-PORTVERSION=	3.6.1
+PORTVERSION=	3.12.1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -11,11 +11,10 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Utilities to help manage documentation for Yelp and the web
 
-BUILD_DEPENDS=	yelp-xsl>=3.1.5:${PORTSDIR}/textproc/yelp-xsl \
+BUILD_DEPENDS=	yelp-xsl>=0:${PORTSDIR}/textproc/yelp-xsl \
 		itstool:${PORTSDIR}/textproc/itstool
 
-USES=		gettext gmake pathfix pkgconfig
-USE_XZ=		yes
+USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix intlhack libxml2 libxslt
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/textproc/yelp-tools/distinfo b/textproc/yelp-tools/distinfo
index 17cec244e..1b4192515 100644
--- a/textproc/yelp-tools/distinfo
+++ b/textproc/yelp-tools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/yelp-tools-3.6.1.tar.xz) = 5226e8245bb87f10e485aa65f5bf18d9e4fb5ef82f2e3c3734dd91bdf6f5c19a
-SIZE (gnome3/yelp-tools-3.6.1.tar.xz) = 196812
+SHA256 (gnome3/yelp-tools-3.12.1.tar.xz) = 7a5370d7adbec3b6e6b7b5e7e5ed966cb99c797907a186b94b93c184e97f0172
+SIZE (gnome3/yelp-tools-3.12.1.tar.xz) = 202816
diff --git a/textproc/yelp-tools/pkg-plist b/textproc/yelp-tools/pkg-plist
index 50598fe9c..1370a0399 100644
--- a/textproc/yelp-tools/pkg-plist
+++ b/textproc/yelp-tools/pkg-plist
@@ -5,10 +5,13 @@ share/aclocal/yelp.m4
 share/yelp-tools/templates/task.page
 share/yelp-tools/xslt/comments.xsl
 share/yelp-tools/xslt/mal-epub.xsl
+share/yelp-tools/xslt/mal-files.xsl
+share/yelp-tools/xslt/mal-license.xsl
 share/yelp-tools/xslt/mal-ncx.xsl
 share/yelp-tools/xslt/mal-opf.xsl
 share/yelp-tools/xslt/mal-rng.xsl
 share/yelp-tools/xslt/mal-status.xsl
+share/yelp-tools/xslt/media.xsl
 @dirrm share/yelp-tools/xslt
 @dirrm share/yelp-tools/templates
 @dirrm share/yelp-tools
diff --git a/textproc/yelp-xsl/Makefile b/textproc/yelp-xsl/Makefile
index dcf026718..5709a01ad 100644
--- a/textproc/yelp-xsl/Makefile
+++ b/textproc/yelp-xsl/Makefile
@@ -3,7 +3,7 @@
 #   $MCom$
 
 PORTNAME=	yelp-xsl
-PORTVERSION=	3.6.1
+PORTVERSION=	3.12.0
 CATEGORIES=	textproc gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -13,8 +13,7 @@ COMMENT=	DocBook XSLT stylesheets for yelp
 
 BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool
 
-USE_XZ=		yes
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_GNOME=	gnomeprefix intlhack libxml2 libxslt
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/textproc/yelp-xsl/distinfo b/textproc/yelp-xsl/distinfo
index b1557f748..c7ecc79c6 100644
--- a/textproc/yelp-xsl/distinfo
+++ b/textproc/yelp-xsl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/yelp-xsl-3.6.1.tar.xz) = 9cac9770d6ace354f3e56a2e60933bb0cd894a4263a3bf1db6e8900f86f8cdd6
-SIZE (gnome3/yelp-xsl-3.6.1.tar.xz) = 589500
+SHA256 (gnome3/yelp-xsl-3.12.0.tar.xz) = dd0b8af338b1cdae50444273d7c761e3f511224421487311103edc95a4493656
+SIZE (gnome3/yelp-xsl-3.12.0.tar.xz) = 564456
diff --git a/textproc/yelp-xsl/pkg-plist b/textproc/yelp-xsl/pkg-plist
index 9f03dcd61..f7955544d 100644
--- a/textproc/yelp-xsl/pkg-plist
+++ b/textproc/yelp-xsl/pkg-plist
@@ -9,18 +9,11 @@ share/yelp-xsl/icons/hicolor/48x48/status/yelp-note-important.png
 share/yelp-xsl/icons/hicolor/48x48/status/yelp-note-tip.png
 share/yelp-xsl/icons/hicolor/48x48/status/yelp-note-warning.png
 share/yelp-xsl/icons/hicolor/48x48/status/yelp-note.png
-share/yelp-xsl/icons/hicolor/48x48/status/yelp-quote-00AB.png
-share/yelp-xsl/icons/hicolor/48x48/status/yelp-quote-00BB.png
-share/yelp-xsl/icons/hicolor/48x48/status/yelp-quote-201C.png
-share/yelp-xsl/icons/hicolor/48x48/status/yelp-quote-201D.png
-share/yelp-xsl/icons/hicolor/48x48/status/yelp-quote-201E.png
 share/yelp-xsl/icons/hicolor/scalable/status/yelp-note-bug.svg
 share/yelp-xsl/icons/hicolor/scalable/status/yelp-note-important.svg
 share/yelp-xsl/icons/hicolor/scalable/status/yelp-note-tip.svg
 share/yelp-xsl/icons/hicolor/scalable/status/yelp-note-warning.svg
 share/yelp-xsl/icons/hicolor/scalable/status/yelp-note.svg
-share/yelp-xsl/icons/hicolor/watermarks/yelp-code-python.png
-share/yelp-xsl/icons/hicolor/watermarks/yelp-code.png
 share/yelp-xsl/js/jquery.js
 share/yelp-xsl/js/jquery.syntax.brush.apache.js
 share/yelp-xsl/js/jquery.syntax.brush.applescript.js
@@ -61,15 +54,16 @@ share/yelp-xsl/js/jquery.syntax.core.js
 share/yelp-xsl/js/jquery.syntax.js
 share/yelp-xsl/js/jquery.syntax.layout.yelp.js
 share/yelp-xsl/xslt/common/color.xsl
-share/yelp-xsl/xslt/common/domains/yelp-xsl.xml
 share/yelp-xsl/xslt/common/html.xsl
 share/yelp-xsl/xslt/common/icons.xsl
-share/yelp-xsl/xslt/common/l10n.xsl
 share/yelp-xsl/xslt/common/l10n-numbers.xsl
+share/yelp-xsl/xslt/common/l10n.xsl
 share/yelp-xsl/xslt/common/ttml.xsl
 share/yelp-xsl/xslt/common/utils.xsl
+share/yelp-xsl/xslt/common/domains/yelp-xsl.xml
 share/yelp-xsl/xslt/docbook/common/db-chunk.xsl
 share/yelp-xsl/xslt/docbook/common/db-common.xsl
+share/yelp-xsl/xslt/docbook/common/db-profile.xsl
 share/yelp-xsl/xslt/docbook/common/db-title.xsl
 share/yelp-xsl/xslt/docbook/common/db-xref.xsl
 share/yelp-xsl/xslt/docbook/html/db2html-bibliography.xsl
@@ -87,6 +81,7 @@ share/yelp-xsl/xslt/docbook/html/db2html-inline.xsl
 share/yelp-xsl/xslt/docbook/html/db2html-l10n.xsl
 share/yelp-xsl/xslt/docbook/html/db2html-links.xsl
 share/yelp-xsl/xslt/docbook/html/db2html-list.xsl
+share/yelp-xsl/xslt/docbook/html/db2html-math.xsl
 share/yelp-xsl/xslt/docbook/html/db2html-media.xsl
 share/yelp-xsl/xslt/docbook/html/db2html-refentry.xsl
 share/yelp-xsl/xslt/docbook/html/db2html-suppressed.xsl
@@ -94,12 +89,6 @@ share/yelp-xsl/xslt/docbook/html/db2html-table.xsl
 share/yelp-xsl/xslt/docbook/html/db2html-xref.xsl
 share/yelp-xsl/xslt/docbook/html/db2html.xsl
 share/yelp-xsl/xslt/docbook/html/db2xhtml.xsl
-share/yelp-xsl/xslt/docbook/omf/db2omf.xsl
-share/yelp-xsl/xslt/docbook/utils/chunks.xsl
-share/yelp-xsl/xslt/docbook/utils/credits.xsl
-share/yelp-xsl/xslt/docbook/utils/figures.xsl
-share/yelp-xsl/xslt/docbook/utils/graphics.xsl
-share/yelp-xsl/xslt/docbook/utils/ids.xsl
 share/yelp-xsl/xslt/mallard/cache/mal-cache.xsl
 share/yelp-xsl/xslt/mallard/common/mal-gloss.xsl
 share/yelp-xsl/xslt/mallard/common/mal-if.xsl
@@ -112,6 +101,7 @@ share/yelp-xsl/xslt/mallard/html/mal2html-gloss.xsl
 share/yelp-xsl/xslt/mallard/html/mal2html-inline.xsl
 share/yelp-xsl/xslt/mallard/html/mal2html-links.xsl
 share/yelp-xsl/xslt/mallard/html/mal2html-list.xsl
+share/yelp-xsl/xslt/mallard/html/mal2html-math.xsl
 share/yelp-xsl/xslt/mallard/html/mal2html-media.xsl
 share/yelp-xsl/xslt/mallard/html/mal2html-page.xsl
 share/yelp-xsl/xslt/mallard/html/mal2html-svg.xsl
@@ -123,8 +113,6 @@ share/yelp-xsl/xslt/mallard/html/mal2xhtml.xsl
 @dirrm share/yelp-xsl/xslt/mallard/common
 @dirrm share/yelp-xsl/xslt/mallard/cache
 @dirrm share/yelp-xsl/xslt/mallard
-@dirrm share/yelp-xsl/xslt/docbook/utils
-@dirrm share/yelp-xsl/xslt/docbook/omf
 @dirrm share/yelp-xsl/xslt/docbook/html
 @dirrm share/yelp-xsl/xslt/docbook/common
 @dirrm share/yelp-xsl/xslt/docbook
@@ -132,7 +120,6 @@ share/yelp-xsl/xslt/mallard/html/mal2xhtml.xsl
 @dirrm share/yelp-xsl/xslt/common
 @dirrm share/yelp-xsl/xslt
 @dirrm share/yelp-xsl/js
-@dirrm share/yelp-xsl/icons/hicolor/watermarks
 @dirrm share/yelp-xsl/icons/hicolor/scalable/status
 @dirrm share/yelp-xsl/icons/hicolor/scalable
 @dirrm share/yelp-xsl/icons/hicolor/48x48/status