From 5f6c0eb1bf8aea48fa8837556c9eb9d3352b4bf9 Mon Sep 17 00:00:00 2001 From: kwm Date: Sun, 2 Mar 2014 22:41:42 +0000 Subject: Chase docbook shuffle. Reminded by: Beeblebrox git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19009 df743ca5-7f9a-e211-a948-0013205c9059 --- graphics/colord/Makefile | 2 +- graphics/gnome-color-manager/Makefile | 2 +- ports-mgmt/packagekit/Makefile | 2 +- sysutils/gnome-power-manager/Makefile | 2 +- sysutils/polkit/Makefile | 2 +- sysutils/upower/Makefile | 4 ++-- textproc/gnome-doc-utils/Makefile | 3 +-- textproc/gtk-doc/Makefile | 4 ++-- 8 files changed, 10 insertions(+), 11 deletions(-) diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile index 0d1728795..c84eadecc 100644 --- a/graphics/colord/Makefile +++ b/graphics/colord/Makefile @@ -46,7 +46,7 @@ OPTIONS_DEFINE= MANPAGES .if ${PORT_OPTIONS:MMANPAGES} BUILD_DEPENDS+= docbook2html:${PORTSDIR}/textproc/docbook-utils \ - ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 + ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml PLIST_SUB+= MAN="" .else PLIST_SUB+= MAN="@comment " diff --git a/graphics/gnome-color-manager/Makefile b/graphics/gnome-color-manager/Makefile index eefb59f8f..9bd802dd8 100644 --- a/graphics/gnome-color-manager/Makefile +++ b/graphics/gnome-color-manager/Makefile @@ -13,7 +13,7 @@ COMMENT= Session framework for the GNOME desktop to manage color profiles BUILD_DEPENDS= docbook2man:${PORTSDIR}/textproc/docbook-utils \ itstool:${PORTSDIR}/textproc/itstool \ - ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 + ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml LIB_DEPENDS= liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libcolord.so:${PORTSDIR}/graphics/colord \ libcolord-gtk.so:${PORTSDIR}/graphics/colord-gtk \ diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile index c25fcc995..eaecd540f 100644 --- a/ports-mgmt/packagekit/Makefile +++ b/ports-mgmt/packagekit/Makefile @@ -40,7 +40,7 @@ OPTIONS_DEFINE= MANPAGES .include .if ${PORT_OPTIONS:MMANPAGES} || defined(PACKAGE_BUILDING) -BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \ +BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl USE_GNOME+= libxslt:build PLIST_SUB+= MAN="" diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile index d45185cba..3b87c4ac0 100644 --- a/sysutils/gnome-power-manager/Makefile +++ b/sysutils/gnome-power-manager/Makefile @@ -32,7 +32,7 @@ OPTIONS_DEFINE= MANPAGES .if ${PORT_OPTIONS:MMANPAGES} || defined(PACKAGE_BUILDING) BUILD_DEPENDS+= docbook2html:${PORTSDIR}/textproc/docbook-utils \ - ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 + ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml PLIST_SUB+= MAN="" .else PLIST_SUB+= MAN="@comment " diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile index 52317997c..50ccc3e44 100644 --- a/sysutils/polkit/Makefile +++ b/sysutils/polkit/Makefile @@ -34,7 +34,7 @@ OPTIONS_DEFINE= MANPAGES .include .if ${PORT_OPTIONS:MMANPAGES} -BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \ +BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl USE_GNOME+= libxslt:build diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile index 5c55ebaeb..d62c4c195 100644 --- a/sysutils/upower/Makefile +++ b/sysutils/upower/Makefile @@ -32,8 +32,8 @@ CONFIGURE_ENV= GTKDOC="false" CONFIGURE_ARGS+=--disable-man-pages PLIST_SUB+= MAN="@comment " .else -BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \ - ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk \ +BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \ + ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl USE_GNOME+= libxslt:build PLIST_SUB+= MAN="" diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index 727bd27a0..72cbe1b5e 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -14,8 +14,7 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \ ${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \ ${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \ - ${LOCALBASE}/share/xml/docbook/4.3/catalog.xml:${PORTSDIR}/textproc/docbook-xml-430 \ - ${LOCALBASE}/share/xml/docbook/4.4/catalog.xml:${PORTSDIR}/textproc/docbook-xml-440 + ${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml USE_XZ= yes MAKE_JOBS_UNSAFE=yes diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile index 7deb787d7..078014a99 100644 --- a/textproc/gtk-doc/Makefile +++ b/textproc/gtk-doc/Makefile @@ -11,11 +11,11 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Code documentation system, originally for GTK+ BUILD_DEPENDS= jade:${PORTSDIR}/textproc/jade \ - ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \ + ${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 RUN_DEPENDS= jade:${PORTSDIR}/textproc/jade \ - ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \ + ${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 -- cgit v1.2.3