CVS commit: pkgsrc/security/libsecret

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Thu Dec  1 12:51:12 UTC 2016

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

Log Message:
Make introspection optional


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/libsecret/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/libsecret/PLIST
cvs rdiff -u -r0 -r1.1 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.9 pkgsrc/security/libsecret/Makefile:1.10
--- pkgsrc/security/libsecret/Makefile:1.9      Wed Aug 13 13:19:14 2014
+++ pkgsrc/security/libsecret/Makefile  Thu Dec  1 12:51:12 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/08/13 13:19:14 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/12/01 12:51:12 martin Exp $
 
 DISTNAME=      libsecret-0.18
 CATEGORIES=    security gnome
@@ -23,6 +23,6 @@ PKGCONFIG_OVERRIDE+=  libsecret/libsecret
 
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.38.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/gobject-introspection/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.4 pkgsrc/security/libsecret/PLIST:1.5
--- pkgsrc/security/libsecret/PLIST:1.4 Wed Mar 12 10:17:57 2014
+++ pkgsrc/security/libsecret/PLIST     Thu Dec  1 12:51:12 2016
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/03/12 10:17:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/12/01 12:51:12 martin Exp $
 bin/secret-tool
 include/libsecret-1/libsecret/secret-attributes.h
 include/libsecret-1/libsecret/secret-collection.h
@@ -13,12 +13,12 @@ include/libsecret-1/libsecret/secret-ser
 include/libsecret-1/libsecret/secret-types.h
 include/libsecret-1/libsecret/secret-value.h
 include/libsecret-1/libsecret/secret.h
-lib/girepository-1.0/Secret-1.typelib
+${PLIST.introspection}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
-share/gir-1.0/Secret-1.gir
+${PLIST.introspection}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

Added files:

Index: pkgsrc/security/libsecret/options.mk
diff -u /dev/null pkgsrc/security/libsecret/options.mk:1.1
--- /dev/null   Thu Dec  1 12:51:12 2016
+++ pkgsrc/security/libsecret/options.mk        Thu Dec  1 12:51:12 2016
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2016/12/01 12:51:12 martin Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.libsecret
+PKG_SUPPORTED_OPTIONS= introspection
+PKG_SUGGESTED_OPTIONS= introspection
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=   introspection
+.if !empty(PKG_OPTIONS:Mintrospection)
+.include "../../devel/gobject-introspection/buildlink3.mk"
+PLIST.introspection=yes
+.else
+CONFIGURE_ARGS+=--disable-introspection
+.endif