CVS commit: pkgsrc/x11/eekboard

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun 28 11:40:47 UTC 2022

Modified Files:
        pkgsrc/x11/eekboard: Makefile PLIST options.mk

Log Message:
eekboard: Remove introspection option.

https://marc.info/?l=pkgsrc-users&m=165444158600671&w=2


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 pkgsrc/x11/eekboard/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/eekboard/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/eekboard/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/x11/eekboard/Makefile
diff -u pkgsrc/x11/eekboard/Makefile:1.68 pkgsrc/x11/eekboard/Makefile:1.69
--- pkgsrc/x11/eekboard/Makefile:1.68   Mon Apr 18 19:10:12 2022
+++ pkgsrc/x11/eekboard/Makefile        Tue Jun 28 11:40:47 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2022/04/18 19:10:12 adam Exp $
+# $NetBSD: Makefile,v 1.69 2022/06/28 11:40:47 nia Exp $
 
 DISTNAME=      eekboard-1.0.8
 PKGREVISION=   37
@@ -17,6 +17,8 @@ USE_LIBTOOL=          yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake pkg-config intltool msgfmt msgmerge xgettext
 
+CONFIGURE_ARGS+=       --enable-introspection=yes
+
 WRKSRC=                ${WRKDIR}/${DISTNAME}
 
 PKGCONFIG_OVERRIDE+=   eek/eek-0.90.pc.in
@@ -43,6 +45,8 @@ TEST_TARGET=          check
 .include "../../devel/at-spi2-core/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_DEPMETHOD.gobject-introspection=     build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libcroco/buildlink3.mk"

Index: pkgsrc/x11/eekboard/PLIST
diff -u pkgsrc/x11/eekboard/PLIST:1.3 pkgsrc/x11/eekboard/PLIST:1.4
--- pkgsrc/x11/eekboard/PLIST:1.3       Wed Oct 23 12:27:26 2013
+++ pkgsrc/x11/eekboard/PLIST   Tue Jun 28 11:40:47 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/10/23 12:27:26 obache Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/06/28 11:40:47 nia Exp $
 bin/eekboard
 bin/eekboard-server
 include/eek-0.90/eek/eek-container.h
@@ -29,10 +29,10 @@ include/eekboard-0.90/eekboard/eekboard-
 include/eekboard-0.90/eekboard/eekboard-context.h
 include/eekboard-0.90/eekboard/eekboard-service.h
 include/eekboard-0.90/eekboard/eekboard-xklutil.h
-${PLIST.introspection}lib/girepository-1.0/Eek-0.90.typelib
-${PLIST.introspection}lib/girepository-1.0/EekGtk-0.90.typelib
-${PLIST.introspection}lib/girepository-1.0/EekXkl-0.90.typelib
-${PLIST.introspection}lib/girepository-1.0/Eekboard-0.90.typelib
+lib/girepository-1.0/Eek-0.90.typelib
+lib/girepository-1.0/EekGtk-0.90.typelib
+lib/girepository-1.0/EekXkl-0.90.typelib
+lib/girepository-1.0/Eekboard-0.90.typelib
 lib/libeek-gtk.la
 lib/libeek-xkl.la
 lib/libeek.la
@@ -77,10 +77,10 @@ share/eekboard/keyboards/symbols/zh-bopo
 share/eekboard/preferences-dialog.ui
 share/eekboard/themes/default.css
 share/examples/eekboard/xdg/autostart/eekboard-autostart.desktop
-${PLIST.introspection}share/gir-1.0/Eek-0.90.gir
-${PLIST.introspection}share/gir-1.0/EekGtk-0.90.gir
-${PLIST.introspection}share/gir-1.0/EekXkl-0.90.gir
-${PLIST.introspection}share/gir-1.0/Eekboard-0.90.gir
+share/gir-1.0/Eek-0.90.gir
+share/gir-1.0/EekGtk-0.90.gir
+share/gir-1.0/EekXkl-0.90.gir
+share/gir-1.0/Eekboard-0.90.gir
 share/glib-2.0/schemas/org.fedorahosted.eekboard.gschema.xml
 share/gtk-doc/html/eek/EekContainer.html
 share/gtk-doc/html/eek/EekElement.html

Index: pkgsrc/x11/eekboard/options.mk
diff -u pkgsrc/x11/eekboard/options.mk:1.6 pkgsrc/x11/eekboard/options.mk:1.7
--- pkgsrc/x11/eekboard/options.mk:1.6  Tue Nov 25 09:59:11 2014
+++ pkgsrc/x11/eekboard/options.mk      Tue Jun 28 11:40:47 2022
@@ -1,22 +1,13 @@
-# $NetBSD: options.mk,v 1.6 2014/11/25 09:59:11 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2022/06/28 11:40:47 nia Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.eekboard
-PKG_SUPPORTED_OPTIONS= introspection vala xtest libcanberra
-PKG_SUGGESTED_OPTIONS= introspection vala xtest
+PKG_SUPPORTED_OPTIONS= vala xtest libcanberra
+PKG_SUGGESTED_OPTIONS= vala xtest
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   introspection vala
-
-.if !empty(PKG_OPTIONS:Mintrospection)
-PLIST.introspection=   yes
-BUILDLINK_DEPMETHOD.gobject-introspection=     build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-introspection=yes
-.else
-CONFIGURE_ARGS+=       --enable-introspection=no
-.endif
+PLIST_VARS+=   vala
 
 .if !empty(PKG_OPTIONS:Mvala)
 PLIST.vala=    yes