From owner-svn-ports-head@FreeBSD.ORG Tue Feb 18 14:50:42 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 75D35D72; Tue, 18 Feb 2014 14:50:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5ED411CF9; Tue, 18 Feb 2014 14:50:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1IEog0S093632; Tue, 18 Feb 2014 14:50:42 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1IEoZef093589; Tue, 18 Feb 2014 14:50:35 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402181450.s1IEoZef093589@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 18 Feb 2014 14:50:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344900 - in head: databases/postgresql91-docs devel/buildtool-doc devel/eggdbus devel/git devel/libxs editors/scribes graphics/colord graphics/liblqr-1 graphics/passepartout mail/dbmai... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Feb 2014 14:50:42 -0000 Author: mat Date: Tue Feb 18 14:50:34 2014 New Revision: 344900 URL: http://svnweb.freebsd.org/changeset/ports/344900 QAT: https://qat.redports.org/buildarchive/r344900/ Log: Chase docbook cleanup dependencies. Sponsored by: Absolight Modified: head/databases/postgresql91-docs/Makefile head/devel/buildtool-doc/Makefile head/devel/eggdbus/Makefile head/devel/git/Makefile head/devel/libxs/Makefile head/editors/scribes/Makefile head/graphics/colord/Makefile head/graphics/liblqr-1/Makefile head/graphics/passepartout/Makefile head/mail/dbmail/Makefile head/math/qtiplot-doc/Makefile head/ports-mgmt/packagekit/Makefile head/print/system-config-printer/Makefile head/science/g3data/Makefile head/sysutils/gnome-power-manager/Makefile head/sysutils/policykit/Makefile head/sysutils/polkit/Makefile head/sysutils/upower/Makefile head/textproc/db2latex/Makefile head/textproc/dblatex/Makefile head/textproc/docproj/Makefile head/textproc/gnome-doc-utils/Makefile head/textproc/gtk-doc/Makefile head/textproc/jrefentry/Makefile head/textproc/mate-doc-utils/Makefile head/textproc/publican/Makefile head/textproc/rarian/Makefile head/textproc/scrollkeeper/Makefile head/textproc/sgmlformat/Makefile head/textproc/slides/Makefile head/textproc/xmlto/Makefile head/x11-wm/awesome/Makefile head/x11-wm/compton/Makefile head/x11/kdelibs4/Makefile Modified: head/databases/postgresql91-docs/Makefile ============================================================================== --- head/databases/postgresql91-docs/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/databases/postgresql91-docs/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -27,7 +27,7 @@ BUILD_DEPENDS+= onsgmls:${PORTSDIR}/text openjade:${PORTSDIR}/textproc/openjade \ ${sgmldir}/iso8879/catalog:${PORTSDIR}/textproc/iso8879 \ ${dbdir}/dsssl/modular/catalog:${PORTSDIR}/textproc/dsssl-docbook-modular \ - ${dbdir}/4.2/docbook.dtd:${PORTSDIR}/textproc/docbook-420 + ${dbdir}/4.2:${PORTSDIR}/textproc/docbook-420 NO_STAGE= yes do-build: Modified: head/devel/buildtool-doc/Makefile ============================================================================== --- head/devel/buildtool-doc/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/devel/buildtool-doc/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -23,7 +23,7 @@ BUILDTOOL= ${LOCALBASE}/bin/buildtool CONFIGURE_ARGS= --prefix=${PREFIX} --dir-doc=${DOCSDIR} \ --dir-html=${DOCSDIR} -DOCBOOK_XML= ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd +DOCBOOK_XML= ${LOCALBASE}/share/xml/docbook/4.2 DOCBOOK_XSL= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl DOCS= CHANGES COPYING PEOPLE README README.bt Modified: head/devel/eggdbus/Makefile ============================================================================== --- head/devel/eggdbus/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/devel/eggdbus/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -25,7 +25,7 @@ LDFLAGS+= -L${LOCALBASE}/lib .if defined(NO_INSTALL_MANPAGES) CONFIGURE_ARGS+=--disable-man-pages .else -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-410 \ xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl Modified: head/devel/git/Makefile ============================================================================== --- head/devel/git/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/devel/git/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -329,7 +329,7 @@ IGNORE= using GITWEB support requires PE PLIST_SUB+= CONTRIB="" BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto \ asciidoc:${PORTSDIR}/textproc/asciidoc \ - ${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450 + ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450 MAN1+= git-subtree.1 .else PLIST_SUB+= CONTRIB="@comment " Modified: head/devel/libxs/Makefile ============================================================================== --- head/devel/libxs/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/devel/libxs/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --enable-debug .if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \ xmlto:${PORTSDIR}/textproc/xmlto \ - ${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450 + ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450 MAN3= \ xs_bind.3 \ Modified: head/editors/scribes/Makefile ============================================================================== --- head/editors/scribes/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/editors/scribes/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -15,7 +15,7 @@ LICENSE= GPLv2 BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \ ${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg \ - ${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450 \ + ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450 \ yelp:${PORTSDIR}/x11/yelp USE_BZIP2= yes Modified: head/graphics/colord/Makefile ============================================================================== --- head/graphics/colord/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/graphics/colord/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -47,7 +47,7 @@ NO_STAGE= yes .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-410 MAN1= cd-create-profile.1 cd-fix-profile.1 colormgr.1 .endif Modified: head/graphics/liblqr-1/Makefile ============================================================================== --- head/graphics/liblqr-1/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/graphics/liblqr-1/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -35,7 +35,7 @@ SUB_LIST= PORTSDIR=${PORTSDIR} .if ${PORT_OPTIONS:MHTMLDOCS} BUILD_DEPENDS+= ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \ - ${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450 + ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450 PLIST_SUB= HTMLDOCS="" .else PLIST_SUB= HTMLDOCS="@comment " Modified: head/graphics/passepartout/Makefile ============================================================================== --- head/graphics/passepartout/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/graphics/passepartout/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -14,7 +14,7 @@ COMMENT= DTP application for X BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ 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-410 LIB_DEPENDS= xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26 \ gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26 RUN_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt Modified: head/mail/dbmail/Makefile ============================================================================== --- head/mail/dbmail/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/mail/dbmail/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -19,7 +19,7 @@ LIB_DEPENDS= libgmime-2.6.so:${PORTSDIR} BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \ xmlto:${PORTSDIR}/textproc/xmlto \ - ${LOCALBASE}/share/sgml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-450 + ${LOCALBASE}/share/sgml/docbook/4.5:${PORTSDIR}/textproc/docbook-450 CONFLICTS= dbmail-2.* dbmail22-[0-9]* Modified: head/math/qtiplot-doc/Makefile ============================================================================== --- head/math/qtiplot-doc/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/math/qtiplot-doc/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -11,7 +11,7 @@ MAINTAINER= makc@FreeBSD.org COMMENT= The QtiPlot Handbook BUILD_DEPENDS= docbook2html:${PORTSDIR}/textproc/docbook-utils \ - ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \ + ${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \ ${LOCALBASE}/share/sgml/docbook/dsssl/modular/html/docbook.dsl:${PORTSDIR}/textproc/dsssl-docbook-modular Modified: head/ports-mgmt/packagekit/Makefile ============================================================================== --- head/ports-mgmt/packagekit/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/ports-mgmt/packagekit/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -51,7 +51,7 @@ NO_STAGE= yes .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-410 \ xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl MAN1= pkcon.1 pkmon.1 pkgenpack.1 pk-debuginfo-install.1 Modified: head/print/system-config-printer/Makefile ============================================================================== --- head/print/system-config-printer/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/print/system-config-printer/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -11,7 +11,7 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= CUPS configuration Gtk+2.0 GUI BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto \ - ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk + ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \ ${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-curl \ Modified: head/science/g3data/Makefile ============================================================================== --- head/science/g3data/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/science/g3data/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -12,7 +12,7 @@ COMMENT= Utility for extracting data fro BUILD_DEPENDS= nsgmls:${PORTSDIR}/textproc/jade \ ${LOCALBASE}/share/sgml/docbook/utils-0.6.14/helpers/docbook2man-spec.pl:${PORTSDIR}/textproc/docbook-utils \ - ${LOCALBASE}/share/sgml/docbook/4.1/dtd/docbook.dtd:${PORTSDIR}/textproc/docbook-410 + ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410 USES= pkgconfig USE_GNOME= gtk20 Modified: head/sysutils/gnome-power-manager/Makefile ============================================================================== --- head/sysutils/gnome-power-manager/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/sysutils/gnome-power-manager/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -38,7 +38,7 @@ GCONF_SCHEMAS= gnome-power-manager.schem .if !defined(NO_INSTALL_MANPAGES) 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-410 MAN1= gnome-power-manager.1 gnome-power-preferences.1 \ gnome-power-statistics.1 .endif Modified: head/sysutils/policykit/Makefile ============================================================================== --- head/sysutils/policykit/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/sysutils/policykit/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -40,7 +40,7 @@ NO_STAGE= yes .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-410 \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl USE_GNOME+= libxslt:build Modified: head/sysutils/polkit/Makefile ============================================================================== --- head/sysutils/polkit/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/sysutils/polkit/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -40,7 +40,7 @@ NO_STAGE= yes .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-410 \ xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl Modified: head/sysutils/upower/Makefile ============================================================================== --- head/sysutils/upower/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/sysutils/upower/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -34,8 +34,8 @@ LDFLAGS+= -L${LOCALBASE}/lib .if defined(NO_INSTALL_MANPAGES) CONFIGURE_ARGS+=--disable-man-pages .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-410 \ + ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk \ xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl MAN1= upower.1 Modified: head/textproc/db2latex/Makefile ============================================================================== --- head/textproc/db2latex/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/textproc/db2latex/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -12,7 +12,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= DocBook to LaTeX XSL stylesheets RUN_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ - ${LOCALBASE}/share/xml/docbook/4.2/docbook.cat:${PORTSDIR}/textproc/docbook-xml \ + ${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/VERSION:${PORTSDIR}/textproc/docbook-xsl NO_BUILD= yes Modified: head/textproc/dblatex/Makefile ============================================================================== --- head/textproc/dblatex/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/textproc/dblatex/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -12,7 +12,7 @@ COMMENT= DocBook to LaTeX/ConTeXt Publis BUILD_DEPENDS= ${LOCALBASE}/share/texmf-local/tex/latex/ifxetex/ifxetex.sty:${PORTSDIR}/print/ifxetex RUN_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ - ${LOCALBASE}/share/xml/docbook/4.2/docbook.cat:${PORTSDIR}/textproc/docbook-xml + ${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml USE_BZIP2= yes USE_TEX= tex Modified: head/textproc/docproj/Makefile ============================================================================== --- head/textproc/docproj/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/textproc/docproj/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -23,7 +23,7 @@ RUN_DEPENDS= links:${PORTSDIR}/www/links ${LOCALBASE}/share/xml/dtd/xhtml/xhtml.soc:${PORTSDIR}/textproc/xhtml \ docbook-xsl-ns>=1.78.1_4:${PORTSDIR}/textproc/docbook-xsl-ns \ ${LOCALBASE}/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl:${PORTSDIR}/textproc/iso-schematron-xslt \ - ${LOCALBASE}/share/xml/docbook/5.0/dtd/docbook.dtd:${PORTSDIR}/textproc/docbook-500 \ + ${LOCALBASE}/share/xml/docbook/5.0:${PORTSDIR}/textproc/docbook-500 \ ${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent \ p5-XML-Parser>=2.41:${PORTSDIR}/textproc/p5-XML-Parser \ zip:${PORTSDIR}/archivers/zip Modified: head/textproc/gnome-doc-utils/Makefile ============================================================================== --- head/textproc/gnome-doc-utils/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/textproc/gnome-doc-utils/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -15,8 +15,8 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSD gawk:${PORTSDIR}/lang/gawk 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-430 \ + ${LOCALBASE}/share/xml/docbook/4.4:${PORTSDIR}/textproc/docbook-xml-440 USE_XZ= yes MAKE_JOBS_UNSAFE=yes Modified: head/textproc/gtk-doc/Makefile ============================================================================== --- head/textproc/gtk-doc/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/textproc/gtk-doc/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -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-sk \ ${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-sk \ ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \ rarian-sk-config:${PORTSDIR}/textproc/rarian Modified: head/textproc/jrefentry/Makefile ============================================================================== --- head/textproc/jrefentry/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/textproc/jrefentry/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -10,7 +10,7 @@ MASTER_SITES= SF/docbook/OldFiles MAINTAINER= ports@FreeBSD.org COMMENT= DocBook XML JRefEntry DTD -RUN_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2/docbook.cat:${PORTSDIR}/textproc/docbook-xml +RUN_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml NO_BUILD= yes Modified: head/textproc/mate-doc-utils/Makefile ============================================================================== --- head/textproc/mate-doc-utils/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/textproc/mate-doc-utils/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -13,8 +13,8 @@ COMMENT= MATE doc utils BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \ ${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \ - ${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-430 \ + ${LOCALBASE}/share/xml/docbook/4.4:${PORTSDIR}/textproc/docbook-xml-440 \ xml2po:${PORTSDIR}/textproc/gnome-doc-utils PORTSCOUT= limitw:1,even Modified: head/textproc/publican/Makefile ============================================================================== --- head/textproc/publican/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/textproc/publican/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -53,7 +53,7 @@ BUILD_DEPENDS= \ p5-XML-LibXSLT>=1.67:${PORTSDIR}/textproc/p5-XML-LibXSLT \ p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \ p5-XML-TreeBuilder>=4.0:${PORTSDIR}/textproc/p5-XML-TreeBuilder \ - ${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450 \ + ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450 \ ${LOCALBASE}/share/sgml/docbook/4.2:${PORTSDIR}/textproc/docbook-420 \ ${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \ librsvg2>=2.0:${PORTSDIR}/graphics/librsvg2 \ Modified: head/textproc/rarian/Makefile ============================================================================== --- head/textproc/rarian/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/textproc/rarian/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -11,14 +11,14 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= An OMF help system based on the Freedesktop specification BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \ - ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/catalog.xml:${PORTSDIR}/textproc/docbook-xml \ - ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk \ + ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml \ + ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk \ bash:${PORTSDIR}/shells/bash RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ ${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt \ ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \ - ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/catalog.xml:${PORTSDIR}/textproc/docbook-xml \ - ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk + ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml \ + ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk DOCBOOK_VERSION=4.2 Modified: head/textproc/scrollkeeper/Makefile ============================================================================== --- head/textproc/scrollkeeper/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/textproc/scrollkeeper/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -15,12 +15,12 @@ COMMENT= An Open Document Cataloging Pro BUILD_DEPENDS= intltool-extract:${PORTSDIR}/textproc/intltool \ ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \ - ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/catalog.xml:${PORTSDIR}/textproc/docbook-xml \ - ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk + ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml \ + ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk RUN_DEPENDS= intltool-extract:${PORTSDIR}/textproc/intltool \ ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \ - ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/catalog.xml:${PORTSDIR}/textproc/docbook-xml \ - ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk + ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml \ + ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk DOCBOOK_VERSION=4.2 Modified: head/textproc/sgmlformat/Makefile ============================================================================== --- head/textproc/sgmlformat/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/textproc/sgmlformat/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -34,7 +34,7 @@ RUN_DEPENDS= onsgmls:${PORTSDIR}/textpro RUN_DEPENDS= nsgmls:${PORTSDIR}/textproc/jade .endif RUN_DEPENDS+= ${LOCALBASE}/share/sgml/linuxdoc:${PORTSDIR}/textproc/linuxdoc \ - ${LOCALBASE}/share/sgml/docbook/4.1/dtd/docbook.dtd:${PORTSDIR}/textproc/docbook-410 + ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410 # Above depending on docbook-4.1 file is just for workaround. We need # some of docbook DTDs, but not all. Modified: head/textproc/slides/Makefile ============================================================================== --- head/textproc/slides/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/textproc/slides/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -12,7 +12,7 @@ COMMENT= Doctype and stylesheets for mak BUILD_DEPENDS= xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr RUN_DEPENDS= ${LOCALBASE}/share/xsl/docbook/catalog:${PORTSDIR}/textproc/docbook-xsl -RUN_DEPENDS+= ${LOCALBASE}/share/xml/docbook/4.3/catalog.xml:${PORTSDIR}/textproc/docbook-xml-430 +RUN_DEPENDS+= ${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml-430 XMLDIR= ${LOCALBASE}/share/xml INSTDIR= share/xsl/slides Modified: head/textproc/xmlto/Makefile ============================================================================== --- head/textproc/xmlto/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/textproc/xmlto/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -26,7 +26,7 @@ BUILD_DEPENDS= ${BASH_CMD}:${PORTSDIR}/s ${XSL_DIR}:${PORTSDIR}/textproc/docbook-xsl \ paperconf:${PORTSDIR}/print/libpaper \ w3m:${PORTSDIR}/www/w3m \ - ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml + ${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml RUN_DEPENDS:= ${BUILD_DEPENDS} SUB_FILES= pkg-message Modified: head/x11-wm/awesome/Makefile ============================================================================== --- head/x11-wm/awesome/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/x11-wm/awesome/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -20,7 +20,7 @@ BUILD_DEPENDS= asciidoc:${PORTSDIR}/text xcb-util>=0.3.8:${PORTSDIR}/x11/xcb-util \ xproto>=7.0.11:${PORTSDIR}/x11/xproto \ ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:${PORTSDIR}/devel/lua-lgi \ - ${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450 + ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450 RUN_DEPENDS= ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:${PORTSDIR}/devel/lua-lgi LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libev.so:${PORTSDIR}/devel/libev \ Modified: head/x11-wm/compton/Makefile ============================================================================== --- head/x11-wm/compton/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/x11-wm/compton/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -61,7 +61,7 @@ MAKE_ARGS+= NO_DBUS=yes .if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS= a2x:${PORTSDIR}/textproc/asciidoc \ xsltproc:${PORTSDIR}/textproc/libxslt \ - ${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml-450 \ + ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450 \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl MAKE_ARGS+= DOCDIR=${DOCSDIR} MANDIR=${MANPREFIX}/man/man1 ALL_TARGET+= docs Modified: head/x11/kdelibs4/Makefile ============================================================================== --- head/x11/kdelibs4/Makefile Tue Feb 18 14:44:17 2014 (r344899) +++ head/x11/kdelibs4/Makefile Tue Feb 18 14:50:34 2014 (r344900) @@ -25,12 +25,12 @@ LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/gr libdbusmenu-qt.so:${PORTSDIR}/devel/libdbusmenu-qt \ libgrantlee_gui.so:${PORTSDIR}/devel/grantlee -BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \ +BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ xauth:${PORTSDIR}/x11/xauth \ - ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \ + ${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml \ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl USE_XZ= yes