diff options
34 files changed, 45 insertions, 45 deletions
diff --git a/databases/postgresql91-docs/Makefile b/databases/postgresql91-docs/Makefile index d5b356d0c043..d13263835ee8 100644 --- a/databases/postgresql91-docs/Makefile +++ b/databases/postgresql91-docs/Makefile @@ -27,7 +27,7 @@ BUILD_DEPENDS+= onsgmls:${PORTSDIR}/textproc/opensp \ 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: diff --git a/devel/buildtool-doc/Makefile b/devel/buildtool-doc/Makefile index 2fb48a580ccc..cd45c35f993c 100644 --- a/devel/buildtool-doc/Makefile +++ b/devel/buildtool-doc/Makefile @@ -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 diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile index 9bd253c6ab9a..d86b438dc52d 100644 --- a/devel/eggdbus/Makefile +++ b/devel/eggdbus/Makefile @@ -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 diff --git a/devel/git/Makefile b/devel/git/Makefile index 5c8cda0f2888..ed35a8847051 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -329,7 +329,7 @@ IGNORE= using GITWEB support requires PERL support 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 " diff --git a/devel/libxs/Makefile b/devel/libxs/Makefile index 94cbfa610187..ad8016d45ff7 100644 --- a/devel/libxs/Makefile +++ b/devel/libxs/Makefile @@ -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 \ diff --git a/editors/scribes/Makefile b/editors/scribes/Makefile index 38fb8021ae8d..3c7a65df1e33 100644 --- a/editors/scribes/Makefile +++ b/editors/scribes/Makefile @@ -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 diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile index c2990f785fa2..268ee8e74d1a 100644 --- a/graphics/colord/Makefile +++ b/graphics/colord/Makefile @@ -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 diff --git a/graphics/liblqr-1/Makefile b/graphics/liblqr-1/Makefile index 4b24ac839937..07f3f5ae5620 100644 --- a/graphics/liblqr-1/Makefile +++ b/graphics/liblqr-1/Makefile @@ -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 " diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile index d3800c87cdf9..4332e47a5a90 100644 --- a/graphics/passepartout/Makefile +++ b/graphics/passepartout/Makefile @@ -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 diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile index ba93137138fe..811676d95bb2 100644 --- a/mail/dbmail/Makefile +++ b/mail/dbmail/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \ 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]* diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile index 9d8bb2c7ba48..bf87004b75e9 100644 --- a/math/qtiplot-doc/Makefile +++ b/math/qtiplot-doc/Makefile @@ -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 diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile index 35da7395deed..0842f75fba78 100644 --- a/ports-mgmt/packagekit/Makefile +++ b/ports-mgmt/packagekit/Makefile @@ -51,7 +51,7 @@ NO_STAGE= yes .include <bsd.port.options.mk> . 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 diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile index 86ab797be906..ad4c8d91b032 100644 --- a/print/system-config-printer/Makefile +++ b/print/system-config-printer/Makefile @@ -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 \ diff --git a/science/g3data/Makefile b/science/g3data/Makefile index e2ad4d19985b..8bed3858cb1b 100644 --- a/science/g3data/Makefile +++ b/science/g3data/Makefile @@ -12,7 +12,7 @@ COMMENT= Utility for extracting data from graphs 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 diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile index 36c12180ee18..f03215af2e15 100644 --- a/sysutils/gnome-power-manager/Makefile +++ b/sysutils/gnome-power-manager/Makefile @@ -38,7 +38,7 @@ GCONF_SCHEMAS= gnome-power-manager.schemas .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 diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile index 1f40492e31e0..46b35ee8c56a 100644 --- a/sysutils/policykit/Makefile +++ b/sysutils/policykit/Makefile @@ -40,7 +40,7 @@ NO_STAGE= yes .include <bsd.port.options.mk> .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 diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile index 021f6e8fbf4a..26fb07e53f63 100644 --- a/sysutils/polkit/Makefile +++ b/sysutils/polkit/Makefile @@ -40,7 +40,7 @@ NO_STAGE= yes .include <bsd.port.options.mk> .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 diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile index ab74f845d956..71aa1c0132fc 100644 --- a/sysutils/upower/Makefile +++ b/sysutils/upower/Makefile @@ -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 diff --git a/textproc/db2latex/Makefile b/textproc/db2latex/Makefile index 2ecefe0fa94d..7e9eaa62be82 100644 --- a/textproc/db2latex/Makefile +++ b/textproc/db2latex/Makefile @@ -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 diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile index 4728eb373447..4db4ac3628af 100644 --- a/textproc/dblatex/Makefile +++ b/textproc/dblatex/Makefile @@ -12,7 +12,7 @@ COMMENT= DocBook to LaTeX/ConTeXt Publishing 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 diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile index 36654cb37ad2..28a967e562bf 100644 --- a/textproc/docproj/Makefile +++ b/textproc/docproj/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= links:${PORTSDIR}/www/links1 \ ${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 diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile index 3c5691c42768..d0a04f28c1e4 100644 --- a/textproc/gnome-doc-utils/Makefile +++ b/textproc/gnome-doc-utils/Makefile @@ -15,8 +15,8 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \ 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 diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile index 7e75e62a6980..9f73df550943 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-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 diff --git a/textproc/jrefentry/Makefile b/textproc/jrefentry/Makefile index b0aa1278e94c..a5bb2a8abe5c 100644 --- a/textproc/jrefentry/Makefile +++ b/textproc/jrefentry/Makefile @@ -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 diff --git a/textproc/mate-doc-utils/Makefile b/textproc/mate-doc-utils/Makefile index ab8e6b47b6a8..477175d92b04 100644 --- a/textproc/mate-doc-utils/Makefile +++ b/textproc/mate-doc-utils/Makefile @@ -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 diff --git a/textproc/publican/Makefile b/textproc/publican/Makefile index f77c6c9e966d..b1c9cbf32d89 100644 --- a/textproc/publican/Makefile +++ b/textproc/publican/Makefile @@ -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 \ diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile index 6c60be2c7783..d803b9a12a1e 100644 --- a/textproc/rarian/Makefile +++ b/textproc/rarian/Makefile @@ -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 diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index bd971e306526..6365e9b95037 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -15,12 +15,12 @@ COMMENT= An Open Document Cataloging Project 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 diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile index 9c0908f8c482..c61a49e8bd41 100644 --- a/textproc/sgmlformat/Makefile +++ b/textproc/sgmlformat/Makefile @@ -34,7 +34,7 @@ RUN_DEPENDS= onsgmls:${PORTSDIR}/textproc/openjade 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. diff --git a/textproc/slides/Makefile b/textproc/slides/Makefile index 12cbfa9bc04e..d6e1beed900c 100644 --- a/textproc/slides/Makefile +++ b/textproc/slides/Makefile @@ -12,7 +12,7 @@ COMMENT= Doctype and stylesheets for making slides 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 diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile index 21758318f52e..e0062ddc13d8 100644 --- a/textproc/xmlto/Makefile +++ b/textproc/xmlto/Makefile @@ -26,7 +26,7 @@ BUILD_DEPENDS= ${BASH_CMD}:${PORTSDIR}/shells/bash \ ${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 diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile index 8b165386c45b..1e947b21df28 100644 --- a/x11-wm/awesome/Makefile +++ b/x11-wm/awesome/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \ 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 \ diff --git a/x11-wm/compton/Makefile b/x11-wm/compton/Makefile index d3e516034848..63b02ec0a38b 100644 --- a/x11-wm/compton/Makefile +++ b/x11-wm/compton/Makefile @@ -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 diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 457be6084ba9..038352e407e6 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -25,12 +25,12 @@ LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ 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 |