CVS commit: pkgsrc/sysutils/xfce4-thunar

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun 28 11:43:52 UTC 2022

Modified Files:
        pkgsrc/sysutils/xfce4-thunar: Makefile PLIST options.mk

Log Message:
xfce4-thunar: Remove introspection option.

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


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 pkgsrc/sysutils/xfce4-thunar/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/sysutils/xfce4-thunar/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/xfce4-thunar/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/sysutils/xfce4-thunar/Makefile
diff -u pkgsrc/sysutils/xfce4-thunar/Makefile:1.80 pkgsrc/sysutils/xfce4-thunar/Makefile:1.81
--- pkgsrc/sysutils/xfce4-thunar/Makefile:1.80  Sun Apr 10 02:28:39 2022
+++ pkgsrc/sysutils/xfce4-thunar/Makefile       Tue Jun 28 11:43:52 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2022/04/10 02:28:39 gutteridge Exp $
+# $NetBSD: Makefile,v 1.81 2022/06/28 11:43:52 nia Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -23,6 +23,7 @@ CONF_FILES=   ${EGDIR}/uca.xml ${PKG_SYSCO
 
 .include "options.mk"
 
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/buildlink3.mk"

Index: pkgsrc/sysutils/xfce4-thunar/PLIST
diff -u pkgsrc/sysutils/xfce4-thunar/PLIST:1.21 pkgsrc/sysutils/xfce4-thunar/PLIST:1.22
--- pkgsrc/sysutils/xfce4-thunar/PLIST:1.21     Tue Nov 30 14:46:14 2021
+++ pkgsrc/sysutils/xfce4-thunar/PLIST  Tue Jun 28 11:43:52 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2021/11/30 14:46:14 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.22 2022/06/28 11:43:52 nia Exp $
 bin/thunar
 bin/thunar-settings
 include/thunarx-3/thunarx/thunarx-config.h
@@ -16,7 +16,7 @@ include/thunarx-3/thunarx/thunarx-rename
 include/thunarx-3/thunarx/thunarx-renamer.h
 include/thunarx-3/thunarx/thunarx.h
 lib/Thunar/thunar-sendto-email
-${PLIST.introspection}lib/girepository-1.0/Thunarx-3.0.typelib
+lib/girepository-1.0/Thunarx-3.0.typelib
 lib/libthunarx-3.la
 lib/pkgconfig/thunarx-3.pc
 lib/systemd/user/thunar.service
@@ -35,7 +35,7 @@ share/dbus-1/services/org.xfce.Thunar.Fi
 share/dbus-1/services/org.xfce.Thunar.service
 share/doc/thunar/README.gtkrc
 share/examples/xfce4/Thunar/uca.xml
-${PLIST.introspection}share/gir-1.0/Thunarx-3.0.gir
+share/gir-1.0/Thunarx-3.0.gir
 share/gtk-doc/html/thunarx/ThunarxFileInfo.html
 share/gtk-doc/html/thunarx/ThunarxMenu.html
 share/gtk-doc/html/thunarx/ThunarxMenuItem.html

Index: pkgsrc/sysutils/xfce4-thunar/options.mk
diff -u pkgsrc/sysutils/xfce4-thunar/options.mk:1.5 pkgsrc/sysutils/xfce4-thunar/options.mk:1.6
--- pkgsrc/sysutils/xfce4-thunar/options.mk:1.5 Sat Jun 23 20:27:38 2018
+++ pkgsrc/sysutils/xfce4-thunar/options.mk     Tue Jun 28 11:43:52 2022
@@ -1,10 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2018/06/23 20:27:38 youri Exp $
+# $NetBSD: options.mk,v 1.6 2022/06/28 11:43:52 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.xfce4-thunar
-PKG_SUPPORTED_OPTIONS= gvfs introspection
-PKG_SUGGESTED_OPTIONS= gvfs introspection
-
-PLIST_VARS+=   introspection
+PKG_SUPPORTED_OPTIONS= gvfs
+PKG_SUGGESTED_OPTIONS= gvfs
 
 .include "../../mk/bsd.options.mk"
 
@@ -12,9 +10,3 @@ PLIST_VARS+=  introspection
 .if !empty(PKG_OPTIONS:Mgvfs)
 DEPENDS+=      gvfs-[0-9]*:../../sysutils/gvfs
 .endif
-
-# for GObject introspection support in thunarx
-.if !empty(PKG_OPTIONS:Mintrospection)
-PLIST.introspection=   yes
-.include "../../devel/gobject-introspection/buildlink3.mk"
-.endif