Switch ports depending on docbook* through a directory name to a package name,

as a directory name can't be attributed to a package

13 files changed, 20 insertions, 22 deletions

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