CVS commit: pkgsrc/devel/atk

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Fri Apr 12 19:40:42 UTC 2024

Modified Files:
        pkgsrc/devel/atk: Makefile PLIST
Added Files:
        pkgsrc/devel/atk: options.mk

Log Message:
devel/atk: Make introspection an option.

Suggested only on native builds.  No change to native builds, but
default off on cross builds which gobject-introspection breaks.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/devel/atk/Makefile
cvs rdiff -u -r1.47 -r1.48 pkgsrc/devel/atk/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/atk/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/devel/atk/Makefile
diff -u pkgsrc/devel/atk/Makefile:1.108 pkgsrc/devel/atk/Makefile:1.109
--- pkgsrc/devel/atk/Makefile:1.108     Mon Aug 14 05:24:04 2023
+++ pkgsrc/devel/atk/Makefile   Fri Apr 12 19:40:41 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2023/08/14 05:24:04 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2024/04/12 19:40:41 riastradh Exp $
 
 DISTNAME=      atk-2.38.0
 PKGREVISION=   1
@@ -21,10 +21,10 @@ MAKE_ENV+=                  LD_LIBRARY_PATH=${WRKSRC}/o
 
 PYTHON_FOR_BUILD_ONLY= tool
 
+.include "options.mk"
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.38.0
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_DEPMETHOD.gobject-introspection:= build
-.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/atk/PLIST
diff -u pkgsrc/devel/atk/PLIST:1.47 pkgsrc/devel/atk/PLIST:1.48
--- pkgsrc/devel/atk/PLIST:1.47 Wed Nov 23 10:59:11 2022
+++ pkgsrc/devel/atk/PLIST      Fri Apr 12 19:40:41 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.47 2022/11/23 10:59:11 adam Exp $
+@comment $NetBSD: PLIST,v 1.48 2024/04/12 19:40:41 riastradh Exp $
 include/atk-1.0/atk/atk-autocleanups.h
 include/atk-1.0/atk/atk-enum-types.h
 include/atk-1.0/atk/atk.h
@@ -34,12 +34,12 @@ include/atk-1.0/atk/atkutil.h
 include/atk-1.0/atk/atkvalue.h
 include/atk-1.0/atk/atkversion.h
 include/atk-1.0/atk/atkwindow.h
-lib/girepository-1.0/Atk-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/Atk-1.0.typelib
 lib/libatk-1.0.so
 lib/libatk-1.0.so.0
 lib/libatk-1.0.so.0.23809.1
 lib/pkgconfig/atk.pc
-share/gir-1.0/Atk-1.0.gir
+${PLIST.introspection}share/gir-1.0/Atk-1.0.gir
 share/locale/af/LC_MESSAGES/atk10.mo
 share/locale/am/LC_MESSAGES/atk10.mo
 share/locale/an/LC_MESSAGES/atk10.mo

Added files:

Index: pkgsrc/devel/atk/options.mk
diff -u /dev/null pkgsrc/devel/atk/options.mk:1.1
--- /dev/null   Fri Apr 12 19:40:42 2024
+++ pkgsrc/devel/atk/options.mk Fri Apr 12 19:40:41 2024
@@ -0,0 +1,18 @@
+#      $NetBSD: options.mk,v 1.1 2024/04/12 19:40:41 riastradh Exp $
+#
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.atk
+PKG_SUPPORTED_OPTIONS= introspection
+PKG_SUGGESTED_OPTIONS= ${${USE_CROSS_COMPILE:tl} == "yes":?:introspection}
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=           introspection
+.if !empty(PKG_OPTIONS:Mintrospection)
+PLIST.introspection=   yes
+MESON_ARGS+=           -Dintrospection=true
+BUILDLINK_DEPMETHOD.gobject-introspection:= build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.else
+MESON_ARGS+=           -Dintrospection=false
+.endif