CVS commit: pkgsrc/geography/libchamplain012

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun 28 11:07:13 UTC 2022

Modified Files:
        pkgsrc/geography/libchamplain012: Makefile PLIST
Removed Files:
        pkgsrc/geography/libchamplain012: options.mk

Log Message:
libchamplain012: Remove introspection option. The option is broken
because while this package was switched to build with Meson the option
still assumes autotools.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/geography/libchamplain012/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/geography/libchamplain012/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/geography/libchamplain012/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/geography/libchamplain012/Makefile
diff -u pkgsrc/geography/libchamplain012/Makefile:1.39 pkgsrc/geography/libchamplain012/Makefile:1.40
--- pkgsrc/geography/libchamplain012/Makefile:1.39      Mon Apr 18 19:09:51 2022
+++ pkgsrc/geography/libchamplain012/Makefile   Tue Jun 28 11:07:13 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2022/04/18 19:09:51 adam Exp $
+# $NetBSD: Makefile,v 1.40 2022/06/28 11:07:13 nia Exp $
 
 DISTNAME=      libchamplain-0.12.20
 PKGNAME=       ${DISTNAME:S/ain/ain012/}
@@ -21,13 +21,11 @@ PKGCONFIG_OVERRIDE+=                output/meson-priva
 
 PYTHON_FOR_BUILD_ONLY= tool
 
-# TODO:
-# add vala option?
-.include "options.mk"
-
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/meson/build.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection+=    build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../geography/libmemphis02/buildlink3.mk"
 .include "../../graphics/clutter-gtk/buildlink3.mk"
 .include "../../graphics/clutter/buildlink3.mk"

Index: pkgsrc/geography/libchamplain012/PLIST
diff -u pkgsrc/geography/libchamplain012/PLIST:1.4 pkgsrc/geography/libchamplain012/PLIST:1.5
--- pkgsrc/geography/libchamplain012/PLIST:1.4  Mon Apr 19 16:15:36 2021
+++ pkgsrc/geography/libchamplain012/PLIST      Tue Jun 28 11:07:13 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2021/04/19 16:15:36 cirnatdan Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/06/28 11:07:13 nia Exp $
 include/champlain-0.12/champlain-gtk/champlain-gtk.h
 include/champlain-0.12/champlain-gtk/gtk-champlain-embed.h
 include/champlain-0.12/champlain/champlain-adjustment.h
@@ -40,8 +40,8 @@ include/champlain-0.12/champlain/champla
 include/champlain-0.12/champlain/champlain-view.h
 include/champlain-0.12/champlain/champlain-viewport.h
 include/champlain-0.12/champlain/champlain.h
-${PLIST.introspection}lib/girepository-1.0/Champlain-0.12.typelib
-${PLIST.introspection}lib/girepository-1.0/GtkChamplain-0.12.typelib
+lib/girepository-1.0/Champlain-0.12.typelib
+lib/girepository-1.0/GtkChamplain-0.12.typelib
 lib/libchamplain-0.12.so
 lib/libchamplain-0.12.so.0
 lib/libchamplain-0.12.so.0.11.10
@@ -50,5 +50,5 @@ lib/libchamplain-gtk-0.12.so.0
 lib/libchamplain-gtk-0.12.so.0.11.10
 lib/pkgconfig/champlain-0.12.pc
 lib/pkgconfig/champlain-gtk-0.12.pc
-${PLIST.introspection}share/gir-1.0/Champlain-0.12.gir
-${PLIST.introspection}share/gir-1.0/GtkChamplain-0.12.gir
+share/gir-1.0/Champlain-0.12.gir
+share/gir-1.0/GtkChamplain-0.12.gir