CVS commit: pkgsrc/fonts/harfbuzz

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Aug  9 00:53:12 UTC 2020

Modified Files:
        pkgsrc/fonts/harfbuzz: Makefile options.mk

Log Message:
Fix ICU option. Disable benchmarking as it requires git and external
downloads. Require gtk-doc for documentation to match PLIST.


To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 pkgsrc/fonts/harfbuzz/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/fonts/harfbuzz/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/fonts/harfbuzz/Makefile
diff -u pkgsrc/fonts/harfbuzz/Makefile:1.131 pkgsrc/fonts/harfbuzz/Makefile:1.132
--- pkgsrc/fonts/harfbuzz/Makefile:1.131        Sat Aug  8 19:11:13 2020
+++ pkgsrc/fonts/harfbuzz/Makefile      Sun Aug  9 00:53:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.131 2020/08/08 19:11:13 nia Exp $
+# $NetBSD: Makefile,v 1.132 2020/08/09 00:53:12 joerg Exp $
 
 DISTNAME=      harfbuzz-2.7.0
 CATEGORIES=    fonts
@@ -24,6 +24,7 @@ MESON_ARGS+=  -Dcairo=disabled
 MESON_ARGS+=   -Dfontconfig=disabled
 
 MESON_ARGS+=   -Dintrospection=disabled
+MESON_ARGS+=   -Dbenchmark=disabled
 
 PLIST_VARS+=           graphite2
 .if ${LIBRSVG_TYPE} == "rust"
@@ -66,6 +67,7 @@ PLIST.coretext=               yes
 .endif
 
 PYTHON_FOR_BUILD_ONLY= tool
+REPLACE_PYTHON+=       src/*.py
 
 .include "../../devel/meson/build.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -77,4 +79,5 @@ PYTHON_FOR_BUILD_ONLY=        tool
 # 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/options.mk
diff -u pkgsrc/fonts/harfbuzz/options.mk:1.5 pkgsrc/fonts/harfbuzz/options.mk:1.6
--- pkgsrc/fonts/harfbuzz/options.mk:1.5        Sat Aug  8 19:11:13 2020
+++ pkgsrc/fonts/harfbuzz/options.mk    Sun Aug  9 00:53:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2020/08/08 19:11:13 nia Exp $
+# $NetBSD: options.mk,v 1.6 2020/08/09 00:53:12 joerg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.harfbuzz
 PKG_SUPPORTED_OPTIONS+=        icu
@@ -11,6 +11,7 @@ PLIST_VARS+=          icu
 .if !empty(PKG_OPTIONS:Micu)
 .include "../../textproc/icu/buildlink3.mk"
 MESON_ARGS+=   -Dicu=enabled
+PLIST.icu=             yes
 .else
 MESON_ARGS+=   -Dicu=disabled
 .endif