CVS commit: pkgsrc/www

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun 28 11:26:24 UTC 2022

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

Log Message:
webkit24-gtk: Remove introspection option.

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


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/www/webkit24-gtk/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/webkit24-gtk/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/webkit24-gtk/options.mk
cvs rdiff -u -r1.3 -r1.4 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.21 pkgsrc/www/webkit24-gtk/Makefile.common:1.22
--- pkgsrc/www/webkit24-gtk/Makefile.common:1.21        Sat Apr  3 10:19:03 2021
+++ pkgsrc/www/webkit24-gtk/Makefile.common     Tue Jun 28 11:26:24 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2021/04/03 10:19:03 cirnatdan Exp $
+# $NetBSD: Makefile.common,v 1.22 2022/06/28 11:26:24 nia Exp $
 # used by www/webkit24-gtk/Makefile
 # used by www/webkit24-gtk3/Makefile
 
@@ -37,6 +37,8 @@ CONFIGURE_ARGS+=      --enable-x11-target \
                        --disable-geolocation \
                        --disable-gtk-doc-html
 
+CONFIGURE_ARGS+=       --enable-introspection
+
 .include "../../mk/compiler.mk"
 .if (!empty(PKGSRC_COMPILER:Mgcc) && !empty(_USE_PKGSRC_GCC:M[yY][eE][sS]))
 BUILDLINK_TRANSFORM+=  rm:-D_FORTIFY_SOURCE=2
@@ -90,6 +92,9 @@ CXXFLAGS+=    -DGLIB_VERSION_MIN_REQUIRED=G
 .include "../../mk/atomic64.mk"
 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"
 .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.3 pkgsrc/www/webkit24-gtk/PLIST:1.4
--- pkgsrc/www/webkit24-gtk/PLIST:1.3   Thu Dec  1 14:27:21 2016
+++ pkgsrc/www/webkit24-gtk/PLIST       Tue Jun 28 11:26:24 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/12/01 14:27:21 martin Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/06/28 11:26:24 nia 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
-${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-1.0.typelib
-${PLIST.introspection}lib/girepository-1.0/WebKit-1.0.typelib
+lib/girepository-1.0/JavaScriptCore-1.0.typelib
+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
-${PLIST.introspection}share/gir-1.0/JavaScriptCore-1.0.gir
-${PLIST.introspection}share/gir-1.0/WebKit-1.0.gir
+share/gir-1.0/JavaScriptCore-1.0.gir
+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.4 pkgsrc/www/webkit24-gtk/options.mk:1.5
--- pkgsrc/www/webkit24-gtk/options.mk:1.4      Sun Nov 10 21:44:38 2019
+++ pkgsrc/www/webkit24-gtk/options.mk  Tue Jun 28 11:26:24 2022
@@ -1,11 +1,9 @@
-# $NetBSD: options.mk,v 1.4 2019/11/10 21:44:38 nia Exp $
+# $NetBSD: options.mk,v 1.5 2022/06/28 11:26:24 nia Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.webkit-gtk
-PKG_SUPPORTED_OPTIONS= debug enchant opengl webkit-jit introspection
-PKG_SUGGESTED_OPTIONS= enchant opengl introspection
-
-PLIST_VARS=    introspection
+PKG_SUPPORTED_OPTIONS= debug enchant opengl webkit-jit
+PKG_SUGGESTED_OPTIONS= enchant opengl
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -67,16 +65,3 @@ 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.3 pkgsrc/www/webkit24-gtk3/PLIST:1.4
--- pkgsrc/www/webkit24-gtk3/PLIST:1.3  Thu Dec  1 14:27:21 2016
+++ pkgsrc/www/webkit24-gtk3/PLIST      Tue Jun 28 11:26:24 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/12/01 14:27:21 martin Exp $
+@comment $NetBSD: PLIST,v 1.4 2022/06/28 11:26:24 nia 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
-${PLIST.introspection}lib/girepository-1.0/JavaScriptCore-3.0.typelib
-${PLIST.introspection}lib/girepository-1.0/WebKit-3.0.typelib
+lib/girepository-1.0/JavaScriptCore-3.0.typelib
+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
-${PLIST.introspection}share/gir-1.0/JavaScriptCore-3.0.gir
-${PLIST.introspection}share/gir-1.0/WebKit-3.0.gir
+share/gir-1.0/JavaScriptCore-3.0.gir
+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