CVS commit: pkgsrc

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Apr 13 00:48:58 UTC 2024

Modified Files:
        pkgsrc/fonts/harfbuzz: options.mk
        pkgsrc/graphics/librsvg-c: Makefile
        pkgsrc/inputmethod/input-pad: options.mk
        pkgsrc/x11/gtksourceview3: Makefile

Log Message:
Make `introspection' option suggestion conditional on native builds.

gobject-introspection is hopelessly hostile to cross-builds.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/fonts/harfbuzz/options.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/librsvg-c/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/inputmethod/input-pad/options.mk
cvs rdiff -u -r1.70 -r1.71 pkgsrc/x11/gtksourceview3/Makefile

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/options.mk
diff -u pkgsrc/fonts/harfbuzz/options.mk:1.15 pkgsrc/fonts/harfbuzz/options.mk:1.16
--- pkgsrc/fonts/harfbuzz/options.mk:1.15       Sat Jan 27 09:58:18 2024
+++ pkgsrc/fonts/harfbuzz/options.mk    Sat Apr 13 00:48:57 2024
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.15 2024/01/27 09:58:18 wiz Exp $
+# $NetBSD: options.mk,v 1.16 2024/04/13 00:48:57 riastradh Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.harfbuzz
 PKG_SUPPORTED_OPTIONS+=        doc introspection
-PKG_SUGGESTED_OPTIONS= doc introspection
+PKG_SUGGESTED_OPTIONS= doc
+
+PKG_SUGGESTED_OPTIONS+=        ${${USE_CROSS_COMPILE:tl} == "yes":?:introspection}
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/graphics/librsvg-c/Makefile
diff -u pkgsrc/graphics/librsvg-c/Makefile:1.21 pkgsrc/graphics/librsvg-c/Makefile:1.22
--- pkgsrc/graphics/librsvg-c/Makefile:1.21     Sun Apr  7 07:34:16 2024
+++ pkgsrc/graphics/librsvg-c/Makefile  Sat Apr 13 00:48:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2024/04/07 07:34:16 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2024/04/13 00:48:57 riastradh Exp $
 
 DISTNAME=      librsvg-2.40.21
 PKGREVISION=   17
@@ -28,7 +28,7 @@ CONFIGURE_ARGS.Darwin+=       --disable-Bsymbo
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.librsvg
 PKG_SUPPORTED_OPTIONS= introspection
-PKG_SUGGESTED_OPTIONS= introspection
+PKG_SUGGESTED_OPTIONS= ${${USE_CROSS_COMPILE:tl} == "yes":?:introspection}
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=   introspection

Index: pkgsrc/inputmethod/input-pad/options.mk
diff -u pkgsrc/inputmethod/input-pad/options.mk:1.5 pkgsrc/inputmethod/input-pad/options.mk:1.6
--- pkgsrc/inputmethod/input-pad/options.mk:1.5 Sat Dec  7 11:32:31 2013
+++ pkgsrc/inputmethod/input-pad/options.mk     Sat Apr 13 00:48:57 2024
@@ -1,9 +1,11 @@
-# $NetBSD: options.mk,v 1.5 2013/12/07 11:32:31 obache Exp $
+# $NetBSD: options.mk,v 1.6 2024/04/13 00:48:57 riastradh Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.input-pad
 PKG_SUPPORTED_OPTIONS= eekboard introspection xtest
-PKG_SUGGESTED_OPTIONS= introspection xtest
+PKG_SUGGESTED_OPTIONS= xtest
+
+PKG_SUGGESTED_OPTIONS+=        ${${USE_CROSS_COMPILE:tl} == "yes":?:introspection}
 
 .include "../../mk/bsd.options.mk"
 

Index: pkgsrc/x11/gtksourceview3/Makefile
diff -u pkgsrc/x11/gtksourceview3/Makefile:1.70 pkgsrc/x11/gtksourceview3/Makefile:1.71
--- pkgsrc/x11/gtksourceview3/Makefile:1.70     Sun Apr  7 07:35:20 2024
+++ pkgsrc/x11/gtksourceview3/Makefile  Sat Apr 13 00:48:57 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2024/04/07 07:35:20 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2024/04/13 00:48:57 riastradh Exp $
 
 DISTNAME=      gtksourceview-3.24.11
 PKGNAME=       ${DISTNAME:S/gtksourceview/gtksourceview3/}
@@ -24,7 +24,7 @@ PKGCONFIG_OVERRIDE+=  gtksourceview-3.0.p
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtksourceview3
 PKG_SUPPORTED_OPTIONS= introspection
-PKG_SUGGESTED_OPTIONS= introspection
+PKG_SUGGESTED_OPTIONS= ${${USE_CROSS_COMPILE:tl} == "yes":?:introspection}
 PLIST_VARS+=           introspection
 
 .include "../../mk/bsd.options.mk"