3 files changed, 118 insertions, 116 deletions

diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 6f37b67647f2..26178018d419 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	compiz
-PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTVERSION=	0.6.2
+#PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 MAINTAINER=	rnoland@2hip.net
@@ -68,17 +68,15 @@ OPTIONS=	RSVG "Enable librsvg2 support" on \
 		METACITY "Enable Metacity support" on \
 		GNOME "Enable Gnome support" on \
 		DBUS "Enable DBUS support" on \
-		FUSEFS "Enable fusefs support" off
-
-# No KDE support for now...
-CONFIGURE_ARGS=	--disable-kde
+		FUSEFS "Enable fusefs support" off \
+		KDE "Enable KDE support" off
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libpng|libpng12|' ${WRKSRC}/configure
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_RSVG)
+.if !defined(WITHOUT_RSVG)
 CONFIGURE_ARGS+=	--enable-librsvg
 USE_GNOME+=		librsvg2
 PLIST_SUB+=		RSVG=""
@@ -87,7 +85,7 @@ CONFIGURE_ARGS+=	--disable-librsvg
 PLIST_SUB+=		RSVG="@comment "
 .endif
 
-.if defined(WITH_METACITY) || defined(WITH_GTK) || defined(WITH_GNOME)
+.if !defined(WITHOUT_GTK)
 CONFIGURE_ARGS+=	--enable-gtk
 USE_GNOME+=	 glib20 libwnck
 PLIST_SUB+=	GTK=""
@@ -96,14 +94,14 @@ CONFIGURE_ARGS+=	--disable-gtk
 PLIST_SUB+=	GTK="@comment "
 .endif
 
-.if defined(WITH_METACITY) || defined(WITH_GNOME)
+.if !defined(WITHOUT_METACITY) && !defined(WITHOUT_GNOME) && !defined(WITHOUT_GTK)
 CONFIGURE_ARGS+=	--enable-metacity
 USE_GNOME+=	metacity
 .else
 CONFIGURE_ARGS+=	--disable-metacity
 .endif
 
-.if defined(WITH_GNOME)
+.if !defined(WITHOUT_GNOME) && !defined(WITHOUT_GTK)
 CONFIGURE_ARGS+=	--enable-gnome \
 			--enable-gnome-keybindings
 USE_GNOME+=	 gnomecontrolcenter2
@@ -120,11 +118,11 @@ CONFIGURE_ARGS+=	--disable-gnome \
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
-.if defined(WITH_DBUS)
+.if !defined(WITHOUT_DBUS)
 CONFIGURE_ARGS+=	--enable-dbus
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-1.pc:${PORTSDIR}/devel/dbus
-.if defined(WITH_GTK) || defined(WITH_GNOME)
+.if !defined(WITHOUT_GTK) && !defined(WITHOUT_GNOME)
 CONFIGURE_ARGS+=	--enable-dbus-glib
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
@@ -145,4 +143,15 @@ CONFIGURE_ARGS+=	--disable-fuse
 PLIST_SUB+=		FUSEFS="@comment "
 .endif
 
+.if defined(WITH_KDE)
+USE_KDEBASE_VER=	3
+CONFIGURE_ARGS+=	--enable-kde
+PLIST_SUB+=	KDE=""
+# allow bsd.kde.mk to be included after bsd.port.mk
+.include "${PORTSDIR}/Mk/bsd.kde.mk"
+.else
+CONFIGURE_ARGS+=	--disable-kde
+PLIST_SUB+=	KDE="@comment "
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/x11-wm/compiz/distinfo b/x11-wm/compiz/distinfo
index c5f87b3312c5..83acf05f961e 100644
--- a/x11-wm/compiz/distinfo
+++ b/x11-wm/compiz/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/compiz-0.5.2.tar.gz) = 7a38a921359573fb57d53e057f481f08
-SHA256 (xorg/app/compiz-0.5.2.tar.gz) = e1cc3f3bd144d32d0ebd1e505a7ea7727fb0246f36e5fcea53b808e27adf197c
-SIZE (xorg/app/compiz-0.5.2.tar.gz) = 1778046
+MD5 (xorg/app/compiz-0.6.2.tar.gz) = 7e6edfdbf0dc46b135313440edae7a53
+SHA256 (xorg/app/compiz-0.6.2.tar.gz) = 89efc2daefd79d28e2421902a6d890145df29e804bf8508773ea5a6eedb53224
+SIZE (xorg/app/compiz-0.6.2.tar.gz) = 1784471
diff --git a/x11-wm/compiz/pkg-plist b/x11-wm/compiz/pkg-plist
index b934c8257f72..7404a7d99162 100644
--- a/x11-wm/compiz/pkg-plist
+++ b/x11-wm/compiz/pkg-plist
@@ -1,113 +1,114 @@
 @comment $FreeBSD$
 bin/compiz
 %%GTK%%bin/gtk-window-decorator
+%%KDE%%bin/kde-window-decorator
 include/compiz/compiz.h
 include/compiz/cube.h
 include/compiz/decoration.h
 include/compiz/scale.h
-lib/libdecoration.so.0
-lib/libdecoration.so
-lib/libdecoration.la
-lib/libdecoration.a
-lib/compiz/libgconf.so
-lib/compiz/libgconf.la
-lib/compiz/libgconf.a
-lib/compiz/libglib.so
-lib/compiz/libglib.la
-lib/compiz/libglib.a
-lib/compiz/libdecoration.so
-lib/compiz/libdecoration.la
+lib/compiz/libannotate.a
+lib/compiz/libannotate.la
+lib/compiz/libannotate.so
+lib/compiz/libblur.a
+lib/compiz/libblur.la
+lib/compiz/libblur.so
+lib/compiz/libclone.a
+lib/compiz/libclone.la
+lib/compiz/libclone.so
+lib/compiz/libcube.a
+lib/compiz/libcube.la
+lib/compiz/libcube.so
+%%DBUS%%lib/compiz/libdbus.a
+%%DBUS%%lib/compiz/libdbus.la
+%%DBUS%%lib/compiz/libdbus.so
 lib/compiz/libdecoration.a
-lib/compiz/libwobbly.so
-lib/compiz/libwobbly.la
-lib/compiz/libwobbly.a
-lib/compiz/libfade.so
-lib/compiz/libfade.la
+lib/compiz/libdecoration.la
+lib/compiz/libdecoration.so
 lib/compiz/libfade.a
-%%FUSEFS%%lib/compiz/libfs.so
-%%FUSEFS%%lib/compiz/libfs.la
+lib/compiz/libfade.la
+lib/compiz/libfade.so
 %%FUSEFS%%lib/compiz/libfs.a
-lib/compiz/libminimize.so
-lib/compiz/libminimize.la
+%%FUSEFS%%lib/compiz/libfs.la
+%%FUSEFS%%lib/compiz/libfs.so
+lib/compiz/libgconf.a
+lib/compiz/libgconf.la
+lib/compiz/libgconf.so
+lib/compiz/libglib.a
+lib/compiz/libglib.la
+lib/compiz/libglib.so
+lib/compiz/libini.a
+lib/compiz/libini.la
+lib/compiz/libini.so
 lib/compiz/libminimize.a
-lib/compiz/libcube.so
-lib/compiz/libcube.la
-lib/compiz/libcube.a
-lib/compiz/librotate.so
-lib/compiz/librotate.la
-lib/compiz/librotate.a
-lib/compiz/libzoom.so
-lib/compiz/libzoom.la
-lib/compiz/libzoom.a
-lib/compiz/libscale.so
-lib/compiz/libscale.la
-lib/compiz/libscale.a
-lib/compiz/libmove.so
-lib/compiz/libmove.la
+lib/compiz/libminimize.la
+lib/compiz/libminimize.so
 lib/compiz/libmove.a
-lib/compiz/libresize.so
-lib/compiz/libresize.la
-lib/compiz/libresize.a
-lib/compiz/libplace.so
-lib/compiz/libplace.la
+lib/compiz/libmove.la
+lib/compiz/libmove.so
 lib/compiz/libplace.a
-%%DBUS%%lib/compiz/libdbus.so
-%%DBUS%%lib/compiz/libdbus.la
-%%DBUS%%lib/compiz/libdbus.a
-lib/compiz/libswitcher.so
-lib/compiz/libswitcher.la
-lib/compiz/libswitcher.a
-lib/compiz/libwater.so
-lib/compiz/libwater.la
-lib/compiz/libwater.a
-lib/compiz/libscreenshot.so
-lib/compiz/libscreenshot.la
-lib/compiz/libscreenshot.a
-lib/compiz/libplane.so
-lib/compiz/libplane.la
+lib/compiz/libplace.la
+lib/compiz/libplace.so
 lib/compiz/libplane.a
-lib/compiz/libclone.so
-lib/compiz/libclone.la
-lib/compiz/libclone.a
-lib/compiz/libpng.so
-lib/compiz/libpng.la
+lib/compiz/libplane.la
+lib/compiz/libplane.so
 lib/compiz/libpng.a
-lib/compiz/libblur.so
-lib/compiz/libblur.la
-lib/compiz/libblur.a
-lib/compiz/libregex.so
-lib/compiz/libregex.la
+lib/compiz/libpng.la
+lib/compiz/libpng.so
 lib/compiz/libregex.a
-lib/compiz/libvideo.so
-lib/compiz/libvideo.la
-lib/compiz/libvideo.a
-lib/compiz/libini.so
-lib/compiz/libini.la
-lib/compiz/libini.a
-%%RSVG%%lib/compiz/libsvg.so
-%%RSVG%%lib/compiz/libsvg.la
+lib/compiz/libregex.la
+lib/compiz/libregex.so
+lib/compiz/libresize.a
+lib/compiz/libresize.la
+lib/compiz/libresize.so
+lib/compiz/librotate.a
+lib/compiz/librotate.la
+lib/compiz/librotate.so
+lib/compiz/libscale.a
+lib/compiz/libscale.la
+lib/compiz/libscale.so
+lib/compiz/libscreenshot.a
+lib/compiz/libscreenshot.la
+lib/compiz/libscreenshot.so
 %%RSVG%%lib/compiz/libsvg.a
-lib/compiz/libannotate.so
-lib/compiz/libannotate.la
-lib/compiz/libannotate.a
-libdata/pkgconfig/compiz.pc
+%%RSVG%%lib/compiz/libsvg.la
+%%RSVG%%lib/compiz/libsvg.so
+lib/compiz/libswitcher.a
+lib/compiz/libswitcher.la
+lib/compiz/libswitcher.so
+lib/compiz/libvideo.a
+lib/compiz/libvideo.la
+lib/compiz/libvideo.so
+lib/compiz/libwater.a
+lib/compiz/libwater.la
+lib/compiz/libwater.so
+lib/compiz/libwobbly.a
+lib/compiz/libwobbly.la
+lib/compiz/libwobbly.so
+lib/compiz/libzoom.a
+lib/compiz/libzoom.la
+lib/compiz/libzoom.so
+lib/libdecoration.a
+lib/libdecoration.la
+lib/libdecoration.so
+lib/libdecoration.so.0
 libdata/pkgconfig/compiz-cube.pc
-libdata/pkgconfig/compiz-scale.pc
 libdata/pkgconfig/compiz-gconf.pc
+libdata/pkgconfig/compiz-scale.pc
+libdata/pkgconfig/compiz.pc
 libdata/pkgconfig/libdecoration.pc
-%%DATADIR%%/icon.png
-%%DATADIR%%/freedesktop.png
-%%DATADIR%%/core.xml
 %%DATADIR%%/annotate.xml
 %%DATADIR%%/blur.xml
 %%DATADIR%%/clone.xml
+%%DATADIR%%/core.xml
 %%DATADIR%%/cube.xml
 %%DATADIR%%/dbus.xml
 %%DATADIR%%/decoration.xml
 %%DATADIR%%/fade.xml
+%%DATADIR%%/freedesktop.png
 %%DATADIR%%/fs.xml
 %%DATADIR%%/gconf.xml
 %%DATADIR%%/glib.xml
+%%DATADIR%%/icon.png
 %%DATADIR%%/ini.xml
 %%DATADIR%%/inotify.xml
 %%DATADIR%%/minimize.xml
@@ -119,6 +120,7 @@ libdata/pkgconfig/libdecoration.pc
 %%DATADIR%%/resize.xml
 %%DATADIR%%/rotate.xml
 %%DATADIR%%/scale.xml
+%%DATADIR%%/schemas.xslt
 %%DATADIR%%/screenshot.xml
 %%DATADIR%%/svg.xml
 %%DATADIR%%/switcher.xml
@@ -126,15 +128,14 @@ libdata/pkgconfig/libdecoration.pc
 %%DATADIR%%/water.xml
 %%DATADIR%%/wobbly.xml
 %%DATADIR%%/zoom.xml
-%%DATADIR%%/schemas.xslt
 %%GNOME%%@cwd %%WINDOWSETTINGSDATADIR%%
 %%GNOME%%share/gnome/wm-properties/compiz.desktop
 %%GNOME%%share/gnome-control-center/keybindings/50-compiz-desktop-key.xml
 %%GNOME%%share/gnome-control-center/keybindings/50-compiz-key.xml
 %%GNOME%%@cwd %%WINDOWSETTINGSLIBDIR%%
-%%GNOME%%window-manager-settings/libcompiz.so
-%%GNOME%%window-manager-settings/libcompiz.la
 %%GNOME%%window-manager-settings/libcompiz.a
+%%GNOME%%window-manager-settings/libcompiz.la
+%%GNOME%%window-manager-settings/libcompiz.so
 %%GNOME%%@cwd
 share/locale/af/LC_MESSAGES/compiz.mo
 share/locale/ar/LC_MESSAGES/compiz.mo
@@ -148,6 +149,7 @@ share/locale/da/LC_MESSAGES/compiz.mo
 share/locale/de/LC_MESSAGES/compiz.mo
 share/locale/el/LC_MESSAGES/compiz.mo
 share/locale/en_GB/LC_MESSAGES/compiz.mo
+share/locale/en_US/LC_MESSAGES/compiz.mo
 share/locale/es/LC_MESSAGES/compiz.mo
 share/locale/et/LC_MESSAGES/compiz.mo
 share/locale/fi/LC_MESSAGES/compiz.mo
@@ -162,9 +164,12 @@ share/locale/id/LC_MESSAGES/compiz.mo
 share/locale/it/LC_MESSAGES/compiz.mo
 share/locale/ja/LC_MESSAGES/compiz.mo
 share/locale/ka/LC_MESSAGES/compiz.mo
+share/locale/km/LC_MESSAGES/compiz.mo
 share/locale/ko/LC_MESSAGES/compiz.mo
+share/locale/lo/LC_MESSAGES/compiz.mo
 share/locale/lt/LC_MESSAGES/compiz.mo
 share/locale/mk/LC_MESSAGES/compiz.mo
+share/locale/mr/LC_MESSAGES/compiz.mo
 share/locale/nb/LC_MESSAGES/compiz.mo
 share/locale/nl/LC_MESSAGES/compiz.mo
 share/locale/pa/LC_MESSAGES/compiz.mo
@@ -181,26 +186,14 @@ share/locale/ta/LC_MESSAGES/compiz.mo
 share/locale/tr/LC_MESSAGES/compiz.mo
 share/locale/uk/LC_MESSAGES/compiz.mo
 share/locale/vi/LC_MESSAGES/compiz.mo
+share/locale/xh/LC_MESSAGES/compiz.mo
 share/locale/zh_CN/LC_MESSAGES/compiz.mo
 share/locale/zh_TW/LC_MESSAGES/compiz.mo
-share/locale/en_US/LC_MESSAGES/compiz.mo
-share/locale/km/LC_MESSAGES/compiz.mo
-share/locale/lo/LC_MESSAGES/compiz.mo
-share/locale/mr/LC_MESSAGES/compiz.mo
-share/locale/xh/LC_MESSAGES/compiz.mo
 share/locale/zu/LC_MESSAGES/compiz.mo
-@dirrmtry share/locale/lo/LC_MESSAGES
-@dirrmtry share/locale/lo
 @dirrmtry share/locale/en_US/LC_MESSAGES
 @dirrmtry share/locale/en_US
-@dirrmtry share/locale/km/LC_MESSAGES
-@dirrmtry share/locale/km
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/zu/LC_MESSAGES
-@dirrmtry share/locale/zu
-@dirrmtry %%DATADIR%%
-@dirrmtry lib/compiz
-@dirrmtry include/compiz
+@dirrmtry share/locale/lo/LC_MESSAGES
+@dirrmtry share/locale/lo
+@dirrm %%DATADIR%%
+@dirrm lib/compiz
+@dirrm include/compiz