Add convenience meta-pkg "pkgsrc-guide-tools-1.0", with runtime

dependencies on the tools used to build doc/guide.  doc/guide still uses
BUILD_DEPENDS on the tools (so that it's still possible to build for
certain output types with minimal dependencies); it does not depend on
the meta-pkg.

2 files changed, 49 insertions, 24 deletions

diff --git a/doc/guide/Makefile b/doc/guide/Makefile
index 29009222e30..75dfc71af12 100644
--- a/doc/guide/Makefile
+++ b/doc/guide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/10/07 12:14:26 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2005/11/03 01:57:15 tv Exp $
 #
 
 DISTNAME=		htdocs-share-20050727
@@ -31,34 +31,17 @@ HTDOCSDIR?=		../../../htdocs
 BUILD_DEFS+=		OUTPUTS
 OUTPUTS?=		lint html html-split ascii pdf
 
+.if defined(OUTPUTS)
+.  if !empty(OUTPUTS:Mascii)
 # the html is needed to build the ascii version.
-.if !empty(OUTPUTS:Mascii)
 OUTPUTS+=		html
-.endif
+.  endif
 
-# html output
-BUILD_DEPENDS+=		docbook>=4.0:../../textproc/docbook
-BUILD_DEPENDS+=		docbook-xml>=4.0:../../textproc/docbook-xml
-BUILD_DEPENDS+=		docbook-xsl>=1.62.4:../../textproc/docbook-xsl
-BUILD_DEPENDS+=		dsssl-docbook-modular>=1.54:../../textproc/dsssl-docbook-modular
-BUILD_DEPENDS+=		opensp>=1.5:../../textproc/opensp
-BUILD_DEPENDS+=		libxslt>=1.0.30:../../textproc/libxslt
-
-.if !empty(OUTPUTS:Mhtml*)
-BUILD_DEPENDS+=		tidy>=20021108:../../www/tidy
+# only override the Makefile.common default if it is explicitly set
+_GUIDE_OUTPUTS=		${OUTPUTS}
 .endif
 
-.if !empty(OUTPUTS:Mascii)
-BUILD_DEPENDS+=		w3m>=0.4:../../www/w3m
-.endif
-
-.if !empty(OUTPUTS:Mps) || !empty(OUTPUTS:Mpdf)
-BUILD_DEPENDS+=		openjade>=1.3.2:../../textproc/openjade
-BUILD_DEPENDS+=		tex-jadetex>=3.13:../../print/tex-jadetex
-USE_GHOSTSCRIPT=	build
-GHOSTSCRIPT_REQD=	7.05
-.  include "../../mk/ghostscript.mk"
-.endif
+.include "Makefile.common"
 
 pre-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/doc/guide/Makefile.common b/doc/guide/Makefile.common
new file mode 100644
index 00000000000..672a221bcdc
--- /dev/null
+++ b/doc/guide/Makefile.common
@@ -0,0 +1,42 @@
+# $NetBSD: Makefile.common,v 1.1 2005/11/03 01:57:15 tv Exp $
+#
+# This is included by doc/guide and meta-pkgs/pkgsrc-guide-tools.
+#
+# Because the outputs are configurable, this functions as a build-time
+# dependency in doc/guide (customized to the desired output types),
+# and a runtime dependency in meta-pkgs/pkgsrc-guide-tools (depending
+# on all possible output tools).
+#
+
+_GUIDE_DEPTYPE?=	build
+_GUIDE_OUTPUTS?=	lint html html-split ascii pdf
+
+# html output
+_GUIDE_DEPENDS+=	docbook>=4.0:../../textproc/docbook
+_GUIDE_DEPENDS+=	docbook-xml>=4.0:../../textproc/docbook-xml
+_GUIDE_DEPENDS+=	docbook-xsl>=1.62.4:../../textproc/docbook-xsl
+_GUIDE_DEPENDS+=	dsssl-docbook-modular>=1.54:../../textproc/dsssl-docbook-modular
+_GUIDE_DEPENDS+=	opensp>=1.5:../../textproc/opensp
+_GUIDE_DEPENDS+=	libxslt>=1.0.30:../../textproc/libxslt
+
+.if !empty(_GUIDE_OUTPUTS:Mhtml*)
+_GUIDE_DEPENDS+=	tidy>=20021108:../../www/tidy
+.endif
+
+.if !empty(_GUIDE_OUTPUTS:Mascii)
+_GUIDE_DEPENDS+=	w3m>=0.4:../../www/w3m
+.endif
+
+.if !empty(_GUIDE_OUTPUTS:Mps) || !empty(_GUIDE_OUTPUTS:Mpdf)
+_GUIDE_DEPENDS+=	openjade>=1.3.2:../../textproc/openjade
+_GUIDE_DEPENDS+=	tex-jadetex>=3.13:../../print/tex-jadetex
+USE_GHOSTSCRIPT?=	${_GUIDE_DEPTYPE}
+GHOSTSCRIPT_REQD=	7.05
+.  include "../../mk/ghostscript.mk"
+.endif
+
+.if ${_GUIDE_DEPTYPE} == "run"
+DEPENDS+=		${_GUIDE_DEPENDS}
+.else
+BUILD_DEPENDS+=		${_GUIDE_DEPENDS}
+.endif