From 728929b7099aad3e10a4d7252746a57caee11378 Mon Sep 17 00:00:00 2001
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Fri, 23 Jan 2015 22:50:49 +0000
Subject: Switch ports depending on docbook* through a directory name to a
 package name, as a directory name can't be attributed to a package

---
 databases/postgresql91-docs/Makefile  | 2 +-
 devel/buildtool-doc/Makefile          | 2 +-
 devel/eggdbus/Makefile                | 2 +-
 devel/git/Makefile                    | 2 +-
 devel/libhid/Makefile                 | 2 +-
 devel/libxs/Makefile                  | 2 +-
 editors/scribes/Makefile              | 2 +-
 games/3omns/Makefile                  | 2 +-
 graphics/colord/Makefile              | 2 +-
 graphics/giflib/Makefile              | 2 +-
 graphics/gnome-color-manager/Makefile | 2 +-
 graphics/liblqr-1/Makefile            | 2 +-
 lang/ghc/Makefile                     | 2 +-
 lang/ghc/bsd.cabal.mk                 | 2 +-
 mail/dbmail/Makefile                  | 2 +-
 math/qtiplot-doc/Makefile             | 2 +-
 net/nmsg/Makefile                     | 2 +-
 ports-mgmt/packagekit/Makefile        | 2 +-
 print/system-config-printer/Makefile  | 2 +-
 sysutils/gnome-power-manager/Makefile | 2 +-
 sysutils/policykit/Makefile           | 2 +-
 sysutils/polkit/Makefile              | 2 +-
 sysutils/upower/Makefile              | 4 ++--
 textproc/db2latex/Makefile            | 2 +-
 textproc/dblatex/Makefile             | 2 +-
 textproc/docbook-to-man/Makefile      | 2 +-
 textproc/docbook-utils/Makefile       | 6 +++---
 textproc/docbook/Makefile             | 2 +-
 textproc/gnome-doc-utils/Makefile     | 2 +-
 textproc/gtk-doc/Makefile             | 4 ++--
 textproc/jrefentry/Makefile           | 2 +-
 textproc/po4a/Makefile                | 2 +-
 textproc/rarian/Makefile              | 4 ++--
 textproc/scrollkeeper/Makefile        | 4 ++--
 textproc/sgmlformat/Makefile          | 6 ++----
 textproc/xmlto/Makefile               | 4 ++--
 x11-wm/awesome/Makefile               | 2 +-
 x11-wm/compton/Makefile               | 2 +-
 x11/kdelibs4/Makefile                 | 4 ++--
 39 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/databases/postgresql91-docs/Makefile b/databases/postgresql91-docs/Makefile
index c2c3fd30f24f..27f85ca7c219 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:${PORTSDIR}/textproc/docbook-sgml
+		docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
 
 do-build:
 	${MAKE_CMD} -C ${WRKSRC} html
diff --git a/devel/buildtool-doc/Makefile b/devel/buildtool-doc/Makefile
index 5a72b53d0056..8d80f60eec4f 100644
--- a/devel/buildtool-doc/Makefile
+++ b/devel/buildtool-doc/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Buildtool User's and Developer's manuals
 BUILD_DEPENDS=	${BUILDTOOL}:${PORTSDIR}/devel/buildtool \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		xmlcatalog:${PORTSDIR}/textproc/libxml2 \
-		${DOCBOOK_XML}:${PORTSDIR}/textproc/docbook-xml \
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
 		${DOCBOOK_XSL}:${PORTSDIR}/textproc/docbook-xsl
 
 BUILDTOOL=	${LOCALBASE}/bin/buildtool
diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile
index db71b0b3977e..3c4749781075 100644
--- a/devel/eggdbus/Makefile
+++ b/devel/eggdbus/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS=	--localstatedir=/var
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
+BUILD_DEPENDS+=	docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \
     		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 8da1bb9bffd3..b0b10642106f 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -156,7 +156,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:${PORTSDIR}/textproc/docbook-xml
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 .else
 PLIST_SUB+=	CONTRIB="@comment "
 .endif
diff --git a/devel/libhid/Makefile b/devel/libhid/Makefile
index 6367d1ed6384..c81261841553 100644
--- a/devel/libhid/Makefile
+++ b/devel/libhid/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	ntarmos@cs.uoi.gr
 COMMENT=	User-space HID access library written in C
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \
+		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/bin/swig1.3:${PORTSDIR}/devel/swig13
 
 GNU_CONFIGURE=	yes
diff --git a/devel/libxs/Makefile b/devel/libxs/Makefile
index ba3d66568abe..7610f9c1c8b9 100644
--- a/devel/libxs/Makefile
+++ b/devel/libxs/Makefile
@@ -35,7 +35,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:${PORTSDIR}/textproc/docbook-xml
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 
 .else
 CONFIGURE_ARGS+=	--without-documentation
diff --git a/editors/scribes/Makefile b/editors/scribes/Makefile
index fc4e4f78e161..00bd26a00d7d 100644
--- a/editors/scribes/Makefile
+++ b/editors/scribes/Makefile
@@ -18,7 +18,7 @@ BROKEN=		Uses unknown GNOME component pygnomeextras
 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:${PORTSDIR}/textproc/docbook-xml \
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
 		yelp:${PORTSDIR}/x11/yelp
 
 USES=		desktop-file-utils gettext gmake python shebangfix tar:bzip2
diff --git a/games/3omns/Makefile b/games/3omns/Makefile
index d12eadd4fff6..2efce3af37c4 100644
--- a/games/3omns/Makefile
+++ b/games/3omns/Makefile
@@ -17,7 +17,7 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \
 		asciidoc:${PORTSDIR}/textproc/asciidoc \
-		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml \
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
 LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index ece9b621f9e6..f6723d9e4419 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:${PORTSDIR}/textproc/docbook-sgml
+		docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
 PLIST_SUB+=	MAN=""
 .else
 PLIST_SUB+=	MAN="@comment "
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 7cc4bda656d9..2ee68cf77893 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -24,7 +24,7 @@ INSTALL_TARGET=	install-strip
 
 .if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto \
-	${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 .endif
 
 post-patch:
diff --git a/graphics/gnome-color-manager/Makefile b/graphics/gnome-color-manager/Makefile
index c51692990674..2f04d1b27c8d 100644
--- a/graphics/gnome-color-manager/Makefile
+++ b/graphics/gnome-color-manager/Makefile
@@ -12,7 +12,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:${PORTSDIR}/textproc/docbook-sgml
+		docbook-sgml>0:${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/graphics/liblqr-1/Makefile b/graphics/liblqr-1/Makefile
index e2191b4ada02..b652138214da 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:${PORTSDIR}/textproc/docbook-xml
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 PLIST_SUB=	HTMLDOCS=""
 .else
 PLIST_SUB=	HTMLDOCS="@comment "
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 33ee9631a938..e3729aaef194 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -200,7 +200,7 @@ CONFIGURE_ENV+=	PATH=${SLAVES_PREFIX}/bin:${PATH}
 
 .endif # MBOOTH
 
-BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \
+BUILD_DEPENDS+=	docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
 .endif
 
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index 0985865f190c..54a829aea9cd 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -169,7 +169,7 @@ HADDOCK_OPTS+=		--hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.c
 .endif
 
 .if defined(XMLDOCS)
-BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \
+BUILD_DEPENDS+=	docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
 
 USES+=		gmake
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index c0f78cd018c9..f23748d66e3b 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
 		libevent.so:${PORTSDIR}/devel/libevent2
 BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
 		xmlto:${PORTSDIR}/textproc/xmlto \
-		${LOCALBASE}/share/sgml/docbook/4.5:${PORTSDIR}/textproc/docbook-sgml
+		docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
 
 CONFLICTS=	dbmail22-[0-9]*
 
diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile
index d59914eeaca2..7d3989925beb 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:${PORTSDIR}/textproc/docbook-xml \
+		docbook-xml>0:${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/net/nmsg/Makefile b/net/nmsg/Makefile
index aa1a8dae80f1..1a9511d5e12e 100644
--- a/net/nmsg/Makefile
+++ b/net/nmsg/Makefile
@@ -36,7 +36,7 @@ DOXYGEN_ALL_TARGET=	html-local
 DOCBOOK_XML=	${LOCALBASE}/share/xml/docbook/4.2
 DOCBOOK_XSL_NS=	${LOCALBASE}/share/doc/docbook-xsl-ns/html/docbook.css.source.html
 MANPAGES_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-			${DOCBOOK_XML}:${PORTSDIR}/textproc/docbook-xml \
+			docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
 			${DOCBOOK_XSL_NS}:${PORTSDIR}/textproc/docbook-xsl-ns
 MANPAGES_CONFIGURE_WITH=	xsltproc
 
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index afb4753f0df7..b9a3113db324 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -46,7 +46,7 @@ PORTS_DESC=Use portupgrade for management, dummy if disabled
 .include <bsd.port.options.mk>
 
 . if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
+BUILD_DEPENDS+=	docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 PLIST_SUB+=	MAN=''
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index d9f15fc899ac..0327482bdeeb 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -12,7 +12,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:${PORTSDIR}/textproc/docbook-xml
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 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/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index 2250792f09e8..74bc5cf8622e 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -30,7 +30,7 @@ OPTIONS_DEFINE=	MANPAGES
 
 .if ${PORT_OPTIONS:MMANPAGES} || defined(PACKAGE_BUILDING)
 BUILD_DEPENDS+=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
-		${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml
+		docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
 PLIST_SUB+=	MAN=""
 .else
 PLIST_SUB+=	MAN="@comment "
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
index 32ae70c29434..a0ac1c326dab 100644
--- a/sysutils/policykit/Makefile
+++ b/sysutils/policykit/Makefile
@@ -38,7 +38,7 @@ OPTIONS_DEFAULT=MANPAGES
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS=	${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
+BUILD_DEPENDS=	docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \
 		${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 a0d58d6696b1..b6a4c43e4a3b 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -35,7 +35,7 @@ OPTIONS_DEFINE=	MANPAGES
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
+BUILD_DEPENDS+=	docbook-sgml>0:${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 b50aa50e818f..4ffe583bbae3 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -34,8 +34,8 @@ OPTIONS_DEFAULT=MANPAGES
 OPTIONS_SUB=	yes
 MANPAGES_CONFIGURE_ENABLE=	man-pages
 MANPAGES_BUILD_DEPENDS= \
-	${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
-	${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml \
+	docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \
+	docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
 	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 MANPAGES_USE=	GNOME=libxslt:build
 
diff --git a/textproc/db2latex/Makefile b/textproc/db2latex/Makefile
index 7e9eaa62be82..549750f5d771 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:${PORTSDIR}/textproc/docbook-xml \
+		docbook-xml>0:${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 81e412c065ff..dd241698a966 100644
--- a/textproc/dblatex/Makefile
+++ b/textproc/dblatex/Makefile
@@ -12,7 +12,7 @@ COMMENT=	DocBook to LaTeX/ConTeXt Publishing
 
 BUILD_DEPENDS=	${LOCALBASE}/share/texmf-dist/tex/generic/ifxetex/ifxetex.sty:${PORTSDIR}/print/texlive-texmf
 RUN_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 
 USES=		tar:bzip2 python:2
 USE_PYTHON=	distutils autoplist
diff --git a/textproc/docbook-to-man/Makefile b/textproc/docbook-to-man/Makefile
index 5bcd43d2135e..d672d3c50450 100644
--- a/textproc/docbook-to-man/Makefile
+++ b/textproc/docbook-to-man/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DocBook SGML DTD into nroff/troff -man macros converter
 
-RUN_DEPENDS=	${LOCALBASE}/share/sgml/docbook:${PORTSDIR}/textproc/docbook
+RUN_DEPENDS=	docbook>0:${PORTSDIR}/textproc/docbook
 
 USES=		imake
 XFREE86_HTML_MAN=	no
diff --git a/textproc/docbook-utils/Makefile b/textproc/docbook-utils/Makefile
index 3cbaae2c150c..ebdf82794969 100644
--- a/textproc/docbook-utils/Makefile
+++ b/textproc/docbook-utils/Makefile
@@ -11,10 +11,10 @@ MASTER_SITE_SUBDIR=	docbook-tools/new-trials/SOURCES
 MAINTAINER=	gabor@FreeBSD.org
 COMMENT=	Generates various output formats from DocBook SGML documents
 
-BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-sgml \
-		${LOCALBASE}/share/sgml/docbook/dsssl:${PORTSDIR}/textproc/dsssl-docbook-modular \
+BUILD_DEPENDS+=	docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml \
+		dsssl-docbook-modular>0:${PORTSDIR}/textproc/dsssl-docbook-modular \
 		nsgmls:${PORTSDIR}/textproc/jade
-RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/dsssl:${PORTSDIR}/textproc/dsssl-docbook-modular \
+RUN_DEPENDS+=	dsssl-docbook-modular>0:${PORTSDIR}/textproc/dsssl-docbook-modular \
 		nsgmls:${PORTSDIR}/textproc/jade \
 		sgmlspl:${PORTSDIR}/textproc/p5-SGMLSpm \
 		lynx:${PORTSDIR}/www/lynx
diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index de2043a266a2..53222449def2 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Meta-port for the different versions of the DocBook DTD
 
 RUN_DEPENDS=	${LOCALBASE}/share/sgml/docbook/catalog:${PORTSDIR}/textproc/docbook-sgml \
 		${LOCALBASE}/share/xml/docbook/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
-		${LOCALBASE}/share/xml/sdocbook/1.1:${PORTSDIR}/textproc/sdocbook-xml
+		sdocbook-xml>0:${PORTSDIR}/textproc/sdocbook-xml
 
 NO_BUILD=	yes
 NO_INSTALL=	yes
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index aad694b284a6..687316673aa9 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -15,7 +15,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:${PORTSDIR}/textproc/docbook-xml
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 
 USES=		gettext-tools:build,run gmake pathfix pkgconfig python:2 tar:xz
 USE_GNOME=	libxslt intlhack
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 3bae921d415c..82f54e4dac90 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -12,11 +12,11 @@ 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 \
+		docbook-xml>0:${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}:${PORTSDIR}/textproc/docbook-xml \
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
 		${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 f8570d304070..5b48b68edf50 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:${PORTSDIR}/textproc/docbook-xml
+RUN_DEPENDS=	docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 
 NO_BUILD=	yes
 
diff --git a/textproc/po4a/Makefile b/textproc/po4a/Makefile
index e79f30904a8e..045f50962d2d 100644
--- a/textproc/po4a/Makefile
+++ b/textproc/po4a/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	p5-Term-ReadKey>=2.30:${PORTSDIR}/devel/p5-Term-ReadKey \
 		p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext \
 		jade>=0:${PORTSDIR}/textproc/jade \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${LOCALBASE}/share/xsl/docbook:${PORTSDIR}/textproc/docbook-xsl
+		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gettext perl5
diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
index 2fd9ce50aa5c..58a81053c201 100644
--- a/textproc/rarian/Makefile
+++ b/textproc/rarian/Makefile
@@ -12,12 +12,12 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	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}:${PORTSDIR}/textproc/docbook-xml \
+    		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
 		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}:${PORTSDIR}/textproc/docbook-xml
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 
 DOCBOOK_VERSION=4.2
 
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index afe30cb3ec91..2930919a5efd 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -15,10 +15,10 @@ COMMENT=	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}:${PORTSDIR}/textproc/docbook-xml
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 RUN_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 
 DOCBOOK_VERSION=4.2
 
diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile
index b419a0aca6d1..2bb30cc9f0b9 100644
--- a/textproc/sgmlformat/Makefile
+++ b/textproc/sgmlformat/Makefile
@@ -29,10 +29,8 @@ RUN_DEPENDS=	onsgmls:${PORTSDIR}/textproc/openjade
 .else
 RUN_DEPENDS=	nsgmls:${PORTSDIR}/textproc/jade
 .endif
-RUN_DEPENDS+=	${LOCALBASE}/share/sgml/linuxdoc:${PORTSDIR}/textproc/linuxdoc \
-		${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml
-# Above depending on docbook-4.1 file is just for workaround.  We need
-# some of docbook DTDs, but not all.
+RUN_DEPENDS+=	linuxdoc>0:${PORTSDIR}/textproc/linuxdoc \
+		docbook-sgml>0:${PORTSDIR}/textproc/docbook-sgml
 
 .if defined(WITH_OPENJADE)
 post-patch:
diff --git a/textproc/xmlto/Makefile b/textproc/xmlto/Makefile
index f4720e3d5427..d8894bb7dd04 100644
--- a/textproc/xmlto/Makefile
+++ b/textproc/xmlto/Makefile
@@ -23,10 +23,10 @@ BUILD_DEPENDS=	${BASH_CMD}:${PORTSDIR}/shells/bash \
 		${GETOPT_CMD}:${PORTSDIR}/misc/getopt \
 		xmllint:${PORTSDIR}/textproc/libxml2 \
 		xsltproc:${PORTSDIR}/textproc/libxslt \
-		${XSL_DIR}:${PORTSDIR}/textproc/docbook-xsl \
+		docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl \
 		paperconf:${PORTSDIR}/print/libpaper \
 		w3m:${PORTSDIR}/www/w3m \
-		${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml
+		docbook-xml>0:${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 e8947858da1a..6080d3819d5d 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -19,7 +19,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:${PORTSDIR}/textproc/docbook-xml
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml
 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 212c706177aa..2383c0e1818a 100644
--- a/x11-wm/compton/Makefile
+++ b/x11-wm/compton/Makefile
@@ -62,7 +62,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:${PORTSDIR}/textproc/docbook-xml \
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
 		${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 bdab6cdf907a..67bbdb7143c4 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -26,12 +26,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:${PORTSDIR}/textproc/docbook-xml \
+BUILD_DEPENDS=	docbook-xml>0:${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:${PORTSDIR}/textproc/docbook-xml \
+		docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \
 		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 
 USE_GNOME=	libxml2 libxslt
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0