CVS commit: pkgsrc/www

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

Module Name:    pkgsrc
Committed By:   martin
Date:           Thu Dec  1 14:27:21 UTC 2016

Modified Files:
        pkgsrc/www/webkit24-gtk: Makefile.common PLIST options.mk
        pkgsrc/www/webkit24-gtk3: PLIST

Log Message:
Make introspection optional


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/webkit24-gtk/Makefile.common
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/webkit24-gtk/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/webkit24-gtk/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/webkit24-gtk3/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/webkit24-gtk/Makefile.common
diff -u pkgsrc/www/webkit24-gtk/Makefile.common:1.6 pkgsrc/www/webkit24-gtk/Makefile.common:1.7
--- pkgsrc/www/webkit24-gtk/Makefile.common:1.6 Sat Jul  9 13:04:16 2016
+++ pkgsrc/www/webkit24-gtk/Makefile.common     Thu Dec  1 14:27:21 2016
@@ -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 @@ CPPFLAGS+=           -DUSE_SYSTEM_MALLOC
 
 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"

Index: pkgsrc/www/webkit24-gtk/PLIST
diff -u pkgsrc/www/webkit24-gtk/PLIST:1.2 pkgsrc/www/webkit24-gtk/PLIST:1.3
--- pkgsrc/www/webkit24-gtk/PLIST:1.2   Tue Mar 15 18:47:28 2016
+++ pkgsrc/www/webkit24-gtk/PLIST       Thu Dec  1 14:27:21 2016
@@ -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/WebKitDO
 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

Index: pkgsrc/www/webkit24-gtk/options.mk
diff -u pkgsrc/www/webkit24-gtk/options.mk:1.1 pkgsrc/www/webkit24-gtk/options.mk:1.2
--- pkgsrc/www/webkit24-gtk/options.mk:1.1      Sun Jul 12 00:37:47 2015
+++ pkgsrc/www/webkit24-gtk/options.mk  Thu Dec  1 14:27:21 2016
@@ -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 @@ CONFIGURE_ARGS+=     --enable-spellcheck
 .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

Index: pkgsrc/www/webkit24-gtk3/PLIST
diff -u pkgsrc/www/webkit24-gtk3/PLIST:1.2 pkgsrc/www/webkit24-gtk3/PLIST:1.3
--- pkgsrc/www/webkit24-gtk3/PLIST:1.2  Tue Mar 15 18:47:28 2016
+++ pkgsrc/www/webkit24-gtk3/PLIST      Thu Dec  1 14:27:21 2016
@@ -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/WebKitDO
 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