move gtk-doc into options.mk

3 files changed, 108 insertions, 104 deletions

diff --git a/fonts/harfbuzz/Makefile b/fonts/harfbuzz/Makefile
index 6aaa4372ed5..e73e2f9b8ea 100644
--- a/fonts/harfbuzz/Makefile
+++ b/fonts/harfbuzz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2020/08/15 09:49:44 tnn Exp $
+# $NetBSD: Makefile,v 1.134 2020/08/15 21:48:34 szptvlfn Exp $
 
 DISTNAME=	harfbuzz-2.7.1
 CATEGORIES=	fonts
@@ -79,5 +79,4 @@ REPLACE_PYTHON+=	src/*.py
 # graphite2 support breaks graphics/librsvg-c
 .include "../../graphics/graphite2/buildlink3.mk"
 .endif
-.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/harfbuzz/PLIST b/fonts/harfbuzz/PLIST
index bdc011863ea..8af24b5c234 100644
--- a/fonts/harfbuzz/PLIST
+++ b/fonts/harfbuzz/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.42 2020/08/15 09:49:44 tnn Exp $
+@comment $NetBSD: PLIST,v 1.43 2020/08/15 21:48:34 szptvlfn Exp $
 bin/hb-ot-shape-closure
 bin/hb-shape
 bin/hb-subset
@@ -56,100 +56,100 @@ lib/pkgconfig/harfbuzz-gobject.pc
 ${PLIST.icu}lib/pkgconfig/harfbuzz-icu.pc
 lib/pkgconfig/harfbuzz-subset.pc
 lib/pkgconfig/harfbuzz.pc
-share/gtk-doc/html/harfbuzz/HarfBuzz.png
-share/gtk-doc/html/harfbuzz/HarfBuzz.svg
-share/gtk-doc/html/harfbuzz/a-clustering-example-for-levels-0-and-1.html
-share/gtk-doc/html/harfbuzz/aat-shaping.html
-share/gtk-doc/html/harfbuzz/adding-text-to-the-buffer.html
-share/gtk-doc/html/harfbuzz/annotation-glossary.html
-share/gtk-doc/html/harfbuzz/api-index-full.html
-share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html
-share/gtk-doc/html/harfbuzz/building.html
-share/gtk-doc/html/harfbuzz/ch01s03.html
-share/gtk-doc/html/harfbuzz/ch03s02.html
-share/gtk-doc/html/harfbuzz/ch03s03.html
-share/gtk-doc/html/harfbuzz/ch12.html
-share/gtk-doc/html/harfbuzz/ch13.html
-share/gtk-doc/html/harfbuzz/ch14.html
-share/gtk-doc/html/harfbuzz/ch15.html
-share/gtk-doc/html/harfbuzz/clusters.html
-share/gtk-doc/html/harfbuzz/complex-scripts.html
-share/gtk-doc/html/harfbuzz/customizing-unicode-functions.html
-share/gtk-doc/html/harfbuzz/fonts-and-faces-custom-functions.html
-share/gtk-doc/html/harfbuzz/fonts-and-faces-native-opentype.html
-share/gtk-doc/html/harfbuzz/fonts-and-faces-variable.html
-share/gtk-doc/html/harfbuzz/fonts-and-faces.html
-share/gtk-doc/html/harfbuzz/getting-started.html
-share/gtk-doc/html/harfbuzz/graphite-shaping.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-aat-layout.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-blob.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-buffer.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-common.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-coretext.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-deprecated.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-face.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-font.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-ft.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-glib.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-gobject.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-graphite2.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-icu.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-map.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-color.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-font.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-layout.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-math.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-name.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-shape.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-var.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-set.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape-plan.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-unicode.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-uniscribe.html
-share/gtk-doc/html/harfbuzz/harfbuzz-hb-version.html
-share/gtk-doc/html/harfbuzz/harfbuzz.devhelp2
-share/gtk-doc/html/harfbuzz/home.png
-share/gtk-doc/html/harfbuzz/index.html
-share/gtk-doc/html/harfbuzz/install-harfbuzz.html
-share/gtk-doc/html/harfbuzz/integration-coretext.html
-share/gtk-doc/html/harfbuzz/integration-freetype.html
-share/gtk-doc/html/harfbuzz/integration-icu.html
-share/gtk-doc/html/harfbuzz/integration-python.html
-share/gtk-doc/html/harfbuzz/integration-uniscribe.html
-share/gtk-doc/html/harfbuzz/integration.html
-share/gtk-doc/html/harfbuzz/left-insensitive.png
-share/gtk-doc/html/harfbuzz/left.png
-share/gtk-doc/html/harfbuzz/level-2.html
-share/gtk-doc/html/harfbuzz/object-model-blobs.html
-share/gtk-doc/html/harfbuzz/object-model-lifecycle.html
-share/gtk-doc/html/harfbuzz/object-model-object-types.html
-share/gtk-doc/html/harfbuzz/object-model-user-data.html
-share/gtk-doc/html/harfbuzz/object-model.html
-share/gtk-doc/html/harfbuzz/opentype-shaping-models.html
-share/gtk-doc/html/harfbuzz/pt01.html
-share/gtk-doc/html/harfbuzz/pt02.html
-share/gtk-doc/html/harfbuzz/reordering-in-levels-0-and-1.html
-share/gtk-doc/html/harfbuzz/right-insensitive.png
-share/gtk-doc/html/harfbuzz/right.png
-share/gtk-doc/html/harfbuzz/setting-buffer-properties.html
-share/gtk-doc/html/harfbuzz/shaping-and-shape-plans.html
-share/gtk-doc/html/harfbuzz/shaping-concepts.html
-share/gtk-doc/html/harfbuzz/shaping-opentype-features.html
-share/gtk-doc/html/harfbuzz/shaping-operations.html
-share/gtk-doc/html/harfbuzz/shaping-plans-and-caching.html
-share/gtk-doc/html/harfbuzz/shaping-shaper-selection.html
-share/gtk-doc/html/harfbuzz/style.css
-share/gtk-doc/html/harfbuzz/text-runs.html
-share/gtk-doc/html/harfbuzz/the-distinction-between-levels-0-and-1.html
-share/gtk-doc/html/harfbuzz/unicode-character-categories.html
-share/gtk-doc/html/harfbuzz/up-insensitive.png
-share/gtk-doc/html/harfbuzz/up.png
-share/gtk-doc/html/harfbuzz/utilities-common-types-apis.html
-share/gtk-doc/html/harfbuzz/utilities-ucdn.html
-share/gtk-doc/html/harfbuzz/utilities.html
-share/gtk-doc/html/harfbuzz/what-harfbuzz-doesnt-do.html
-share/gtk-doc/html/harfbuzz/what-is-harfbuzz.html
-share/gtk-doc/html/harfbuzz/why-do-i-need-a-shaping-engine.html
-share/gtk-doc/html/harfbuzz/why-is-it-called-harfbuzz.html
-share/gtk-doc/html/harfbuzz/working-with-harfbuzz-clusters.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/HarfBuzz.png
+${PLIST.doc}share/gtk-doc/html/harfbuzz/HarfBuzz.svg
+${PLIST.doc}share/gtk-doc/html/harfbuzz/a-clustering-example-for-levels-0-and-1.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/aat-shaping.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/adding-text-to-the-buffer.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/annotation-glossary.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/api-index-full.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/buffers-language-script-and-direction.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/building.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/ch01s03.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/ch03s02.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/ch03s03.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/ch12.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/ch13.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/ch14.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/ch15.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/clusters.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/complex-scripts.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/customizing-unicode-functions.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/fonts-and-faces-custom-functions.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/fonts-and-faces-native-opentype.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/fonts-and-faces-variable.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/fonts-and-faces.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/getting-started.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/graphite-shaping.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-aat-layout.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-blob.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-buffer.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-common.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-coretext.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-deprecated.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-face.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-font.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-ft.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-glib.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-gobject.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-graphite2.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-icu.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-map.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-color.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-font.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-layout.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-math.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-name.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-shape.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-ot-var.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-set.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape-plan.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-shape.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-unicode.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-uniscribe.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz-hb-version.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/harfbuzz.devhelp2
+${PLIST.doc}share/gtk-doc/html/harfbuzz/home.png
+${PLIST.doc}share/gtk-doc/html/harfbuzz/index.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/install-harfbuzz.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/integration-coretext.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/integration-freetype.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/integration-icu.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/integration-python.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/integration-uniscribe.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/integration.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/left-insensitive.png
+${PLIST.doc}share/gtk-doc/html/harfbuzz/left.png
+${PLIST.doc}share/gtk-doc/html/harfbuzz/level-2.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/object-model-blobs.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/object-model-lifecycle.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/object-model-object-types.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/object-model-user-data.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/object-model.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/opentype-shaping-models.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/pt01.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/pt02.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/reordering-in-levels-0-and-1.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/right-insensitive.png
+${PLIST.doc}share/gtk-doc/html/harfbuzz/right.png
+${PLIST.doc}share/gtk-doc/html/harfbuzz/setting-buffer-properties.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/shaping-and-shape-plans.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/shaping-concepts.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/shaping-opentype-features.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/shaping-operations.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/shaping-plans-and-caching.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/shaping-shaper-selection.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/style.css
+${PLIST.doc}share/gtk-doc/html/harfbuzz/text-runs.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/the-distinction-between-levels-0-and-1.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/unicode-character-categories.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/up-insensitive.png
+${PLIST.doc}share/gtk-doc/html/harfbuzz/up.png
+${PLIST.doc}share/gtk-doc/html/harfbuzz/utilities-common-types-apis.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/utilities-ucdn.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/utilities.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/what-harfbuzz-doesnt-do.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/what-is-harfbuzz.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/why-do-i-need-a-shaping-engine.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/why-is-it-called-harfbuzz.html
+${PLIST.doc}share/gtk-doc/html/harfbuzz/working-with-harfbuzz-clusters.html
diff --git a/fonts/harfbuzz/options.mk b/fonts/harfbuzz/options.mk
index 97a66a4d610..ff9ac813d8b 100644
--- a/fonts/harfbuzz/options.mk
+++ b/fonts/harfbuzz/options.mk
@@ -1,12 +1,17 @@
-# $NetBSD: options.mk,v 1.6 2020/08/09 00:53:12 joerg Exp $
+# $NetBSD: options.mk,v 1.7 2020/08/15 21:48:34 szptvlfn Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.harfbuzz
-PKG_SUPPORTED_OPTIONS+=	icu
-PKG_SUGGESTED_OPTIONS=	icu
+PKG_SUPPORTED_OPTIONS+=	doc icu
+PKG_SUGGESTED_OPTIONS=	doc icu
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		icu
+PLIST_VARS+=		doc icu
+
+.if !empty(PKG_OPTIONS:Mdoc)
+.include "../../textproc/gtk-doc/buildlink3.mk"
+PLIST.doc=	yes
+.endif
 
 .if !empty(PKG_OPTIONS:Micu)
 .include "../../textproc/icu/buildlink3.mk"