CVS commit: pkgsrc/wm/compiz

["Dan Cirnat" <cirnatdan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cirnatdan
Date:           Tue Mar 30 14:45:36 UTC 2021

Modified Files:
        pkgsrc/wm/compiz: Makefile PLIST buildlink3.mk options.mk

Log Message:
compiz: Remove broken PKG_OPTION "gnome"

"gnome" option depends on wm/metacity, which is gone.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/wm/compiz/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/wm/compiz/PLIST
cvs rdiff -u -r1.67 -r1.68 pkgsrc/wm/compiz/buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/wm/compiz/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/wm/compiz/Makefile
diff -u pkgsrc/wm/compiz/Makefile:1.133 pkgsrc/wm/compiz/Makefile:1.134
--- pkgsrc/wm/compiz/Makefile:1.133     Fri Jan  1 08:24:58 2021
+++ pkgsrc/wm/compiz/Makefile   Tue Mar 30 14:45:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.133 2021/01/01 08:24:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.134 2021/03/30 14:45:36 cirnatdan Exp $
 #
 
 PKGVER=                0.8.8
@@ -17,6 +17,7 @@ USE_TOOLS+=           gmake intltool msgfmt msgme
 USE_PKGLOCALEDIR=      yes
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
+CONFIGURE_ARGS+=       --disable-gnome --disable-gnome-keybindings
 
 COMPIZ_GCONF_SCHEMAS+=         compiz-annotate.schemas
 COMPIZ_GCONF_SCHEMAS+=         compiz-blur.schemas

Index: pkgsrc/wm/compiz/PLIST
diff -u pkgsrc/wm/compiz/PLIST:1.13 pkgsrc/wm/compiz/PLIST:1.14
--- pkgsrc/wm/compiz/PLIST:1.13 Tue Sep 26 07:01:55 2017
+++ pkgsrc/wm/compiz/PLIST      Tue Mar 30 14:45:36 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2017/09/26 07:01:55 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2021/03/30 14:45:36 cirnatdan Exp $
 bin/compiz
 bin/gtk-window-decorator
 include/compiz/compiz-common.h
@@ -31,7 +31,6 @@ lib/compiz/libresize.la
 lib/compiz/librotate.la
 lib/compiz/libscale.la
 lib/compiz/libscreenshot.la
-${PLIST.gnome}lib/compiz/libsvg.la
 lib/compiz/libswitcher.la
 lib/compiz/libvideo.la
 lib/compiz/libwater.la
@@ -43,8 +42,6 @@ lib/pkgconfig/compiz-gconf.pc
 lib/pkgconfig/compiz-scale.pc
 lib/pkgconfig/compiz.pc
 lib/pkgconfig/libdecoration.pc
-${PLIST.gnome}lib/window-manager-settings/libcompiz.la
-${PLIST.gnome}share/applications/compiz.desktop
 share/compiz/annotate.xml
 share/compiz/blur.xml
 share/compiz/clone.xml
@@ -114,9 +111,6 @@ share/gconf/schemas/compiz-water.schemas
 share/gconf/schemas/compiz-wobbly.schemas
 share/gconf/schemas/compiz-zoom.schemas
 share/gconf/schemas/gwd.schemas
-${PLIST.gnome}share/gnome-control-center/keybindings/50-compiz-desktop-key.xml
-${PLIST.gnome}share/gnome-control-center/keybindings/50-compiz-key.xml
-${PLIST.gnome}share/gnome/wm-properties/compiz-wm.desktop
 ${PLIST.kde}share/kde/config.kcfg/compiz-annotate.kcfg
 ${PLIST.kde}share/kde/config.kcfg/compiz-blur.kcfg
 ${PLIST.kde}share/kde/config.kcfg/compiz-clone.kcfg

Index: pkgsrc/wm/compiz/buildlink3.mk
diff -u pkgsrc/wm/compiz/buildlink3.mk:1.67 pkgsrc/wm/compiz/buildlink3.mk:1.68
--- pkgsrc/wm/compiz/buildlink3.mk:1.67 Thu Nov  5 09:07:12 2020
+++ pkgsrc/wm/compiz/buildlink3.mk      Tue Mar 30 14:45:36 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.67 2020/11/05 09:07:12 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.68 2021/03/30 14:45:36 cirnatdan Exp $
 
 BUILDLINK_TREE+=       compiz
 
@@ -16,12 +16,6 @@ pkgbase := compiz
 #.include "../../filesystems/fuse/buildlink3.mk"
 #.endif
 
-.if !empty(PKG_BUILD_OPTIONS.compiz:Mgnome)
-.include "../../x11/gnome-desktop/buildlink3.mk"
-.include "../../x11/gnome-control-center/buildlink3.mk"
-.include "../../graphics/librsvg/buildlink3.mk"
-.endif
-
 # XXX NLS is supposed to be optional, but it doens't appear to be.
 #.if !empty(PKG_BUILD_OPTIONS.compiz:Mnls)
 #.include "../../devel/gettext-lib/buildlink3.mk"

Index: pkgsrc/wm/compiz/options.mk
diff -u pkgsrc/wm/compiz/options.mk:1.5 pkgsrc/wm/compiz/options.mk:1.6
--- pkgsrc/wm/compiz/options.mk:1.5     Fri Aug  3 21:17:47 2018
+++ pkgsrc/wm/compiz/options.mk Tue Mar 30 14:45:36 2021
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.5 2018/08/03 21:17:47 minskim Exp $
+# $NetBSD: options.mk,v 1.6 2021/03/30 14:45:36 cirnatdan Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.compiz
-PKG_SUPPORTED_OPTIONS= fuse gnome inotify kde4
-PLIST_VARS+=           gnome inotify kde
+PKG_SUPPORTED_OPTIONS= fuse inotify kde4
+PLIST_VARS+=           inotify kde
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -20,21 +20,6 @@ CONFIGURE_ARGS+=     --enable-fuse
 CONFIGURE_ARGS+=       --disable-fuse
 .endif
 
-.if !empty(PKG_OPTIONS:Mgnome)
-CONFIGURE_ARGS+=       --enable-librsvg
-PLIST.gnome=           yes
-BUILDLINK_DEPMETHOD.gnome-desktop=     build
-.include "../../x11/gnome-desktop/buildlink3.mk"
-BUILDLINK_DEPMETHOD.gnome-control-center=      build
-.include "../../x11/gnome-control-center/buildlink3.mk"
-BUILDLINK_DEPMETHOD.metacity=  build
-.include "../../wm/metacity/buildlink3.mk"
-BUILDLINK_DEPMETHOD.librsvg=   build
-.include "../../graphics/librsvg/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-gnome --disable-gnome-keybindings
-.endif
-
 .if !empty(PKG_OPTIONS:Minotify)
 .include "../../devel/libinotify/buildlink3.mk"
 PLIST.inotify=         yes