[pkgsrc/trunk]: pkgsrc/www Make introspection optional

[martin <martin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2bca3ee6afed
branches:  trunk
changeset: 355426:2bca3ee6afed
user:      martin <martin%pkgsrc.org@localhost>
date:      Thu Dec 01 14:27:21 2016 +0000

description:
Make introspection optional

diffstat:

 www/webkit24-gtk/Makefile.common |   6 +-----
 www/webkit24-gtk/PLIST           |  10 +++++-----
 www/webkit24-gtk/options.mk      |  21 ++++++++++++++++++---
 www/webkit24-gtk3/PLIST          |  10 +++++-----
 4 files changed, 29 insertions(+), 18 deletions(-)

diffs (111 lines):

diff -r d95eed983d2d -r 2bca3ee6afed www/webkit24-gtk/Makefile.common
--- a/www/webkit24-gtk/Makefile.common  Thu Dec 01 12:51:12 2016 +0000
+++ b/www/webkit24-gtk/Makefile.common  Thu Dec 01 14:27:21 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2016/07/09 13:04:16 wiz Exp $
+# $NetBSD: Makefile.common,v 1.7 2016/12/01 14:27:21 martin Exp $
 # used by www/webkit24-gtk/Makefile
 # used by www/webkit24-gtk3/Makefile
 
@@ -76,10 +76,6 @@
 
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.32.1
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.5
-BUILDLINK_DEPMETHOD.gobject-introspection+=    build
-.include "../../devel/gobject-introspection/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-introspection
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/flex/buildlink3.mk"
diff -r d95eed983d2d -r 2bca3ee6afed www/webkit24-gtk/PLIST
--- a/www/webkit24-gtk/PLIST    Thu Dec 01 12:51:12 2016 +0000
+++ b/www/webkit24-gtk/PLIST    Thu Dec 01 14:27:21 2016 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/03/15 18:47:28 leot Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/12/01 14:27:21 martin Exp $
 bin/jsc-1
 include/webkitgtk-1.0/JavaScriptCore/JSBase.h
 include/webkitgtk-1.0/JavaScriptCore/JSContextRef.h
@@ -251,14 +251,14 @@
 include/webkitgtk-1.0/webkitdom/WebKitDOMXPathResult.h
 include/webkitgtk-1.0/webkitdom/webkitdom.h
 include/webkitgtk-1.0/webkitdom/webkitdomdefines.h
-lib/girepository-1.0/JavaScriptCore-1.0.typelib
-lib/girepository-1.0/WebKit-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-1.0.typelib
+${PLIST.introspection}lib/girepository-1.0/WebKit-1.0.typelib
 lib/libjavascriptcoregtk-1.0.la
 lib/libwebkitgtk-1.0.la
 lib/pkgconfig/javascriptcoregtk-1.0.pc
 lib/pkgconfig/webkit-1.0.pc
-share/gir-1.0/JavaScriptCore-1.0.gir
-share/gir-1.0/WebKit-1.0.gir
+${PLIST.introspection}share/gir-1.0/JavaScriptCore-1.0.gir
+${PLIST.introspection}share/gir-1.0/WebKit-1.0.gir
 share/gtk-doc/html/webkitdomgtk/WebKitDOMAttr.html
 share/gtk-doc/html/webkitdomgtk/WebKitDOMAudioTrack.html
 share/gtk-doc/html/webkitdomgtk/WebKitDOMAudioTrackList.html
diff -r d95eed983d2d -r 2bca3ee6afed www/webkit24-gtk/options.mk
--- a/www/webkit24-gtk/options.mk       Thu Dec 01 12:51:12 2016 +0000
+++ b/www/webkit24-gtk/options.mk       Thu Dec 01 14:27:21 2016 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2015/07/12 00:37:47 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2016/12/01 14:27:21 martin Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.webkit-gtk
-PKG_SUPPORTED_OPTIONS= debug enchant opengl webkit-jit
-PKG_SUGGESTED_OPTIONS= enchant opengl
+PKG_SUPPORTED_OPTIONS= debug enchant opengl webkit-jit introspection
+PKG_SUGGESTED_OPTIONS= enchant opengl introspection
+
+PLIST_VARS=    introspection
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -64,3 +66,16 @@
 .else
 CONFIGURE_ARGS+=       --disable-spellcheck
 .endif
+
+#
+# Introspection
+#
+.if !empty(PKG_OPTIONS:Mintrospection)
+PLIST.introspection    = yes
+BUILDLINK_API_DEPENDS.gobject-introspection+=  gobject-introspection>=0.9.5
+BUILDLINK_DEPMETHOD.gobject-introspection+=    build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-introspection
+.else
+CONFIGURE_ARGS+=       --disable-introspection
+.endif
diff -r d95eed983d2d -r 2bca3ee6afed www/webkit24-gtk3/PLIST
--- a/www/webkit24-gtk3/PLIST   Thu Dec 01 12:51:12 2016 +0000
+++ b/www/webkit24-gtk3/PLIST   Thu Dec 01 14:27:21 2016 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/03/15 18:47:28 leot Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/12/01 14:27:21 martin Exp $
 bin/jsc-3
 include/webkitgtk-3.0/JavaScriptCore/JSBase.h
 include/webkitgtk-3.0/JavaScriptCore/JSContextRef.h
@@ -251,14 +251,14 @@
 include/webkitgtk-3.0/webkitdom/WebKitDOMXPathResult.h
 include/webkitgtk-3.0/webkitdom/webkitdom.h
 include/webkitgtk-3.0/webkitdom/webkitdomdefines.h
-lib/girepository-1.0/JavaScriptCore-3.0.typelib
-lib/girepository-1.0/WebKit-3.0.typelib
+${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-3.0.typelib
+${PLIST.introspection}lib/girepository-1.0/WebKit-3.0.typelib
 lib/libjavascriptcoregtk-3.0.la
 lib/libwebkitgtk-3.0.la
 lib/pkgconfig/javascriptcoregtk-3.0.pc
 lib/pkgconfig/webkitgtk-3.0.pc
-share/gir-1.0/JavaScriptCore-3.0.gir
-share/gir-1.0/WebKit-3.0.gir
+${PLIST.introspection}share/gir-1.0/JavaScriptCore-3.0.gir
+${PLIST.introspection}share/gir-1.0/WebKit-3.0.gir
 share/locale/ar/LC_MESSAGES/WebKitGTK-3.0.mo
 share/locale/as/LC_MESSAGES/WebKitGTK-3.0.mo
 share/locale/bg/LC_MESSAGES/WebKitGTK-3.0.mo