CVS commit: pkgsrc/security/libsecret

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Jun  7 18:00:18 UTC 2022

Modified Files:
        pkgsrc/security/libsecret: Makefile PLIST
Removed Files:
        pkgsrc/security/libsecret: options.mk

Log Message:
libsecret: remove introspection option, enabling it by default

It was default-on, but this commit also makes gobject-introspection
a build dependency, so bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/security/libsecret/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/libsecret/PLIST
cvs rdiff -u -r1.1 -r0 pkgsrc/security/libsecret/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/security/libsecret/Makefile
diff -u pkgsrc/security/libsecret/Makefile:1.28 pkgsrc/security/libsecret/Makefile:1.29
--- pkgsrc/security/libsecret/Makefile:1.28     Wed Mar 30 10:02:26 2022
+++ pkgsrc/security/libsecret/Makefile  Tue Jun  7 18:00:18 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2022/03/30 10:02:26 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2022/06/07 18:00:18 wiz Exp $
 
 DISTNAME=      libsecret-0.20.4
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    security gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/libsecret/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -25,8 +25,8 @@ PKGCONFIG_OVERRIDE+=  libsecret/libsecret
 
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.44.0
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_DEPMETHOD.vala?=     build
+BUILDLINK_DEPMETHOD.gobject-introspection=     build
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../lang/vala/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
-.include "options.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/libsecret/PLIST
diff -u pkgsrc/security/libsecret/PLIST:1.9 pkgsrc/security/libsecret/PLIST:1.10
--- pkgsrc/security/libsecret/PLIST:1.9 Sun Nov 22 11:34:32 2020
+++ pkgsrc/security/libsecret/PLIST     Tue Jun  7 18:00:18 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2020/11/22 11:34:32 nia Exp $
+@comment $NetBSD: PLIST,v 1.10 2022/06/07 18:00:18 wiz Exp $
 bin/secret-tool
 include/libsecret-1/libsecret/secret-attributes.h
 include/libsecret-1/libsecret/secret-backend.h
@@ -16,12 +16,12 @@ include/libsecret-1/libsecret/secret-typ
 include/libsecret-1/libsecret/secret-value.h
 include/libsecret-1/libsecret/secret-version.h
 include/libsecret-1/libsecret/secret.h
-${PLIST.introspection}lib/girepository-1.0/Secret-1.typelib
+lib/girepository-1.0/Secret-1.typelib
 lib/libsecret-1.la
 lib/pkgconfig/libsecret-1.pc
 lib/pkgconfig/libsecret-unstable.pc
 man/man1/secret-tool.1
-${PLIST.introspection}share/gir-1.0/Secret-1.gir
+share/gir-1.0/Secret-1.gir
 share/gtk-doc/html/libsecret-1/SecretCollection.html
 share/gtk-doc/html/libsecret-1/SecretItem.html
 share/gtk-doc/html/libsecret-1/SecretPrompt.html