CVS commit: pkgsrc/wm/compiz

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Sep 26 07:01:55 UTC 2017

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

Log Message:
compiz: remove kde3 support.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/wm/compiz/PLIST
cvs rdiff -u -r1.3 -r1.4 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/PLIST
diff -u pkgsrc/wm/compiz/PLIST:1.12 pkgsrc/wm/compiz/PLIST:1.13
--- pkgsrc/wm/compiz/PLIST:1.12 Sun Jun 30 20:30:09 2013
+++ pkgsrc/wm/compiz/PLIST      Tue Sep 26 07:01:55 2017
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.12 2013/06/30 20:30:09 rodent Exp $
+@comment $NetBSD: PLIST,v 1.13 2017/09/26 07:01:55 wiz Exp $
 bin/compiz
 bin/gtk-window-decorator
-${PLIST.kde3}bin/kde-window-decorator
 include/compiz/compiz-common.h
 include/compiz/compiz-core.h
 include/compiz/compiz-cube.h
@@ -22,7 +21,6 @@ lib/compiz/libglib.la
 lib/compiz/libgnomecompat.la
 lib/compiz/libini.la
 ${PLIST.inotify}lib/compiz/libinotify.la
-${PLIST.kde3}lib/compiz/libkconfig.la
 lib/compiz/libminimize.la
 lib/compiz/libmove.la
 lib/compiz/libobs.la
@@ -42,7 +40,6 @@ lib/compiz/libzoom.la
 lib/libdecoration.la
 lib/pkgconfig/compiz-cube.pc
 lib/pkgconfig/compiz-gconf.pc
-${PLIST.kde3}lib/pkgconfig/compiz-kconfig.pc
 lib/pkgconfig/compiz-scale.pc
 lib/pkgconfig/compiz.pc
 lib/pkgconfig/libdecoration.pc
@@ -67,7 +64,6 @@ share/compiz/ini.xml
 share/compiz/inotify.xml
 ${PLIST.kde}share/compiz/kcfg.xslt
 share/compiz/kconfig.xml
-${PLIST.kde3}share/compiz/kconfig.xslt
 share/compiz/minimize.xml
 share/compiz/move.xml
 share/compiz/obs.xml
@@ -136,7 +132,6 @@ ${PLIST.kde}share/kde/config.kcfg/compiz
 ${PLIST.kde}share/kde/config.kcfg/compiz-gnomecompat.kcfg
 ${PLIST.kde}share/kde/config.kcfg/compiz-ini.kcfg
 ${PLIST.kde}share/kde/config.kcfg/compiz-inotify.kcfg
-${PLIST.kde3}share/kde/config.kcfg/compiz-kconfig.kcfg
 ${PLIST.kde}share/kde/config.kcfg/compiz-minimize.kcfg
 ${PLIST.kde}share/kde/config.kcfg/compiz-move.kcfg
 ${PLIST.kde}share/kde/config.kcfg/compiz-obs.kcfg

Index: pkgsrc/wm/compiz/options.mk
diff -u pkgsrc/wm/compiz/options.mk:1.3 pkgsrc/wm/compiz/options.mk:1.4
--- pkgsrc/wm/compiz/options.mk:1.3     Wed Jul 17 08:39:59 2013
+++ pkgsrc/wm/compiz/options.mk Tue Sep 26 07:01:55 2017
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2013/07/17 08:39:59 jperkin Exp $
+# $NetBSD: options.mk,v 1.4 2017/09/26 07:01:55 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.compiz
-PKG_SUPPORTED_OPTIONS= fuse gnome inotify kde3 kde4
-PLIST_VARS+=           gnome inotify kde kde3
+PKG_SUPPORTED_OPTIONS= fuse gnome inotify kde4
+PLIST_VARS+=           gnome inotify kde
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -42,18 +42,6 @@ PLIST.inotify=               yes
 CONFIGURE_ARGS+=       --disable-inotify
 .endif
 
-.if !empty(PKG_OPTIONS:Mkde3)
-# XXX This option is broken on NetBSD 6.0.1/amd64 + pkgsrc-current
-.include "../../x11/kdebase3/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
-.include "../../sysutils/dbus-qt3/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-kconfig
-PLIST.kde=             yes
-PLIST.kde3=            yes
-.else
-CONFIGURE_ARGS+=       --disable-kde --disable-kconfig
-.endif
-
 .if !empty(PKG_OPTIONS:Mkde4)
 # XXX This option is broken on NetBSD 6.0.1/amd64 + pkgsrc-current
 .include "../../x11/kde-workspace4/buildlink3.mk"