Received: by mail.netbsd.org (Postfix, from userid 605) id 2644784D39; Sat, 15 Aug 2020 21:48:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 9EE1784D25 for ; Sat, 15 Aug 2020 21:48:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id UUbDsHI_RyEC for ; Sat, 15 Aug 2020 21:48:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8A58184D22 for ; Sat, 15 Aug 2020 21:48:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 7D075FB28; Sat, 15 Aug 2020 21:48:34 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159752811433830" MIME-Version: 1.0 Date: Sat, 15 Aug 2020 21:48:34 +0000 From: "Ryosuke Moro" Subject: CVS commit: pkgsrc/fonts/harfbuzz To: pkgsrc-changes@NetBSD.org Reply-To: szptvlfn@netbsd.org X-Mailer: log_accum Message-Id: <20200815214834.7D075FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_159752811433830 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: szptvlfn Date: Sat Aug 15 21:48:34 UTC 2020 Modified Files: pkgsrc/fonts/harfbuzz: Makefile PLIST options.mk Log Message: move gtk-doc into options.mk To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 pkgsrc/fonts/harfbuzz/Makefile cvs rdiff -u -r1.42 -r1.43 pkgsrc/fonts/harfbuzz/PLIST cvs rdiff -u -r1.6 -r1.7 pkgsrc/fonts/harfbuzz/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_159752811433830 Content-Disposition: inline Content-Length: 13350 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/fonts/harfbuzz/Makefile diff -u pkgsrc/fonts/harfbuzz/Makefile:1.133 pkgsrc/fonts/harfbuzz/Makefile:1.134 --- pkgsrc/fonts/harfbuzz/Makefile:1.133 Sat Aug 15 09:49:44 2020 +++ pkgsrc/fonts/harfbuzz/Makefile Sat Aug 15 21:48:34 2020 @@ -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" Index: pkgsrc/fonts/harfbuzz/PLIST diff -u pkgsrc/fonts/harfbuzz/PLIST:1.42 pkgsrc/fonts/harfbuzz/PLIST:1.43 --- pkgsrc/fonts/harfbuzz/PLIST:1.42 Sat Aug 15 09:49:44 2020 +++ pkgsrc/fonts/harfbuzz/PLIST Sat Aug 15 21:48:34 2020 @@ -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 Index: pkgsrc/fonts/harfbuzz/options.mk diff -u pkgsrc/fonts/harfbuzz/options.mk:1.6 pkgsrc/fonts/harfbuzz/options.mk:1.7 --- pkgsrc/fonts/harfbuzz/options.mk:1.6 Sun Aug 9 00:53:12 2020 +++ pkgsrc/fonts/harfbuzz/options.mk Sat Aug 15 21:48:34 2020 @@ -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" --_----------=_159752811433830--