26 files changed, 143 insertions, 86 deletions

diff --git a/x11-wm/ccsm/Makefile b/x11-wm/ccsm/Makefile
index 3e96e892bded..49b939e96950 100644
--- a/x11-wm/ccsm/Makefile
+++ b/x11-wm/ccsm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ccsm
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.8.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
diff --git a/x11-wm/ccsm/distinfo b/x11-wm/ccsm/distinfo
index b4c0373c4e29..11bdaaa1e91f 100644
--- a/x11-wm/ccsm/distinfo
+++ b/x11-wm/ccsm/distinfo
@@ -1,3 +1,3 @@
-MD5 (ccsm-0.8.2.tar.bz2) = c9773ec2e6ab9184c39756a365a9cd00
-SHA256 (ccsm-0.8.2.tar.bz2) = 82ad62fc29327151503a15ebf73a51aebf7ac2464037a697d530d915c73a52bd
-SIZE (ccsm-0.8.2.tar.bz2) = 471887
+MD5 (ccsm-0.8.4.tar.bz2) = 6bad7a02a91cc8fc9c4c48f83e91c08c
+SHA256 (ccsm-0.8.4.tar.bz2) = 46b9da032cf29e71aec0823799861d926937ad41f4edea3be718ac6a8532c16d
+SIZE (ccsm-0.8.4.tar.bz2) = 475864
diff --git a/x11-wm/ccsm/pkg-plist b/x11-wm/ccsm/pkg-plist
index 5c7aa7044bd3..8d79e06cc0c5 100644
--- a/x11-wm/ccsm/pkg-plist
+++ b/x11-wm/ccsm/pkg-plist
@@ -140,42 +140,49 @@ share/ccsm/icons/hicolor/scalable/apps/plugin-staticswitcher.svg
 share/ccsm/icons/hicolor/icon-theme.cache
 share/ccsm/images/modifier.png
 share/ccsm/images/display.png
-share/locale/de/LC_MESSAGES/ccsm.mo
-share/locale/el/LC_MESSAGES/ccsm.mo
-share/locale/fr/LC_MESSAGES/ccsm.mo
-share/locale/gu/LC_MESSAGES/ccsm.mo
-share/locale/it/LC_MESSAGES/ccsm.mo
-share/locale/sv/LC_MESSAGES/ccsm.mo
 share/locale/ar/LC_MESSAGES/ccsm.mo
+share/locale/as/LC_MESSAGES/ccsm.mo
+share/locale/be/LC_MESSAGES/ccsm.mo
+share/locale/bg/LC_MESSAGES/ccsm.mo
 share/locale/bn/LC_MESSAGES/ccsm.mo
+share/locale/bn_IN/LC_MESSAGES/ccsm.mo
 share/locale/ca/LC_MESSAGES/ccsm.mo
-share/locale/gl/LC_MESSAGES/ccsm.mo
-share/locale/id/LC_MESSAGES/ccsm.mo
-share/locale/nb/LC_MESSAGES/ccsm.mo
-share/locale/nl/LC_MESSAGES/ccsm.mo
-share/locale/pl/LC_MESSAGES/ccsm.mo
-share/locale/pt/LC_MESSAGES/ccsm.mo
-share/locale/pt_BR/LC_MESSAGES/ccsm.mo
-share/locale/sk/LC_MESSAGES/ccsm.mo
-share/locale/tr/LC_MESSAGES/ccsm.mo
-share/locale/wo/LC_MESSAGES/ccsm.mo
 share/locale/cs/LC_MESSAGES/ccsm.mo
+share/locale/da/LC_MESSAGES/ccsm.mo
+share/locale/de/LC_MESSAGES/ccsm.mo
+share/locale/el/LC_MESSAGES/ccsm.mo
 share/locale/en_GB/LC_MESSAGES/ccsm.mo
 share/locale/es/LC_MESSAGES/ccsm.mo
 share/locale/eu/LC_MESSAGES/ccsm.mo
+share/locale/fa/LC_MESSAGES/ccsm.mo
 share/locale/fi/LC_MESSAGES/ccsm.mo
+share/locale/fr/LC_MESSAGES/ccsm.mo
+share/locale/gl/LC_MESSAGES/ccsm.mo
+share/locale/gu/LC_MESSAGES/ccsm.mo
 share/locale/he/LC_MESSAGES/ccsm.mo
 share/locale/hi/LC_MESSAGES/ccsm.mo
 share/locale/hr/LC_MESSAGES/ccsm.mo
 share/locale/hu/LC_MESSAGES/ccsm.mo
+share/locale/id/LC_MESSAGES/ccsm.mo
+share/locale/it/LC_MESSAGES/ccsm.mo
 share/locale/ja/LC_MESSAGES/ccsm.mo
 share/locale/ko/LC_MESSAGES/ccsm.mo
+share/locale/md/LC_MESSAGES/ccsm.mo
+share/locale/ml_IN/LC_MESSAGES/ccsm.mo
+share/locale/nb/LC_MESSAGES/ccsm.mo
+share/locale/nl/LC_MESSAGES/ccsm.mo
 share/locale/or/LC_MESSAGES/ccsm.mo
 share/locale/pa/LC_MESSAGES/ccsm.mo
+share/locale/pl/LC_MESSAGES/ccsm.mo
+share/locale/pt/LC_MESSAGES/ccsm.mo
+share/locale/pt_BR/LC_MESSAGES/ccsm.mo
 share/locale/ru/LC_MESSAGES/ccsm.mo
-share/locale/md/LC_MESSAGES/ccsm.mo
-share/locale/bn_IN/LC_MESSAGES/ccsm.mo
+share/locale/sk/LC_MESSAGES/ccsm.mo
+share/locale/sv/LC_MESSAGES/ccsm.mo
+share/locale/tr/LC_MESSAGES/ccsm.mo
+share/locale/wo/LC_MESSAGES/ccsm.mo
 share/locale/zh_CN/LC_MESSAGES/ccsm.mo
+share/locale/zh_HK/LC_MESSAGES/ccsm.mo
 @dirrm share/ccsm/icons/hicolor/scalable/categories
 @dirrm share/ccsm/icons/hicolor/scalable/apps
 @dirrm share/ccsm/icons/hicolor/scalable
@@ -191,6 +198,8 @@ share/locale/zh_CN/LC_MESSAGES/ccsm.mo
 @dirrmtry share/applications
 @dirrmtry share/locale/md/LC_MESSAGES
 @dirrmtry share/locale/md
+@dirrmtry share/locale/ml_IN/LC_MESSAGES
+@dirrmtry share/locale/ml_IN
 @dirrmtry share/locale/wo/LC_MESSAGES
 @dirrmtry share/locale/wo
 
diff --git a/x11-wm/compiz-fusion/Makefile b/x11-wm/compiz-fusion/Makefile
index e94c3c107df7..44391b816370 100644
--- a/x11-wm/compiz-fusion/Makefile
+++ b/x11-wm/compiz-fusion/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	compiz-fusion
-PORTVERSION=	0.8.2
-#PORTREVISION=	0
+PORTVERSION=	0.8.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile
index 57aa739cdf0f..fc43e2b1157e 100644
--- a/x11-wm/compiz-plugins-extra/Makefile
+++ b/x11-wm/compiz-plugins-extra/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	compiz-plugins-extra
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.8.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
diff --git a/x11-wm/compiz-plugins-extra/distinfo b/x11-wm/compiz-plugins-extra/distinfo
index 4063cdbc3e1f..15d18db3fbb6 100644
--- a/x11-wm/compiz-plugins-extra/distinfo
+++ b/x11-wm/compiz-plugins-extra/distinfo
@@ -1,3 +1,3 @@
-MD5 (compiz-plugins-extra-0.8.2.tar.bz2) = 5ac96f1a0e32ccf4dd378454089fa347
-SHA256 (compiz-plugins-extra-0.8.2.tar.bz2) = 4f99f6b6a1abd5bd480b9e9f025ef8f75270fa46dd80a03e902bc297d61e0ab2
-SIZE (compiz-plugins-extra-0.8.2.tar.bz2) = 2624166
+MD5 (compiz-plugins-extra-0.8.4.tar.bz2) = b40c3058c30a58bdc46631d5a47323d8
+SHA256 (compiz-plugins-extra-0.8.4.tar.bz2) = a874903d07eb54c3bf210a322275a972cef7f47ccf4c2d2e307c31d73c57d952
+SIZE (compiz-plugins-extra-0.8.4.tar.bz2) = 2678694
diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index 0ff6c1f8929b..36626bb8da84 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	compiz-plugins-main
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.8.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
@@ -35,6 +34,7 @@ GCONF_SCHEMAS=	compiz-animation.schemas \
 		compiz-expo.schemas \
 		compiz-ezoom.schemas \
 		compiz-imgjpeg.schemas \
+		compiz-kdecompat.schemas \
 		compiz-mag.schemas \
 		compiz-mousepoll.schemas \
 		compiz-neg.schemas \
@@ -51,6 +51,7 @@ GCONF_SCHEMAS=	compiz-animation.schemas \
 		compiz-winrules.schemas \
 		compiz-workarounds.schemas \
 		compiz-scaleaddon.schemas \
+		compiz-titleinfo.schemas \
 		compiz-vpswitch.schemas \
 		compiz-shift.schemas
 
diff --git a/x11-wm/compiz-plugins-main/distinfo b/x11-wm/compiz-plugins-main/distinfo
index ca07659fe47a..9953e81c37d5 100644
--- a/x11-wm/compiz-plugins-main/distinfo
+++ b/x11-wm/compiz-plugins-main/distinfo
@@ -1,3 +1,3 @@
-MD5 (compiz-plugins-main-0.8.2.tar.bz2) = 089402b0b933ba96e8ad7138d957c470
-SHA256 (compiz-plugins-main-0.8.2.tar.bz2) = d1c71500d4b84ac3a3767f0eb498bbfe22b8abcac8bc71dac6c7696de493ff1e
-SIZE (compiz-plugins-main-0.8.2.tar.bz2) = 1169127
+MD5 (compiz-plugins-main-0.8.4.tar.bz2) = 7ac2b073d421a871b4d9f0741dde9164
+SHA256 (compiz-plugins-main-0.8.4.tar.bz2) = 1ea757880a3793e9a01603839b4a2efe5fab4efee0a96101d772dc25422f8aee
+SIZE (compiz-plugins-main-0.8.4.tar.bz2) = 1221256
diff --git a/x11-wm/compiz-plugins-main/pkg-plist b/x11-wm/compiz-plugins-main/pkg-plist
index 2e9a00cbd96e..c41732b99942 100644
--- a/x11-wm/compiz-plugins-main/pkg-plist
+++ b/x11-wm/compiz-plugins-main/pkg-plist
@@ -17,6 +17,9 @@ lib/compiz/libezoom.a
 lib/compiz/libimgjpeg.so
 lib/compiz/libimgjpeg.la
 lib/compiz/libimgjpeg.a
+lib/compiz/libkdecompat.so
+lib/compiz/libkdecompat.la
+lib/compiz/libkdecompat.a
 lib/compiz/libmag.so
 lib/compiz/libmag.la
 lib/compiz/libmag.a
@@ -56,6 +59,9 @@ lib/compiz/libtext.a
 lib/compiz/libthumbnail.so
 lib/compiz/libthumbnail.la
 lib/compiz/libthumbnail.a
+lib/compiz/libtitleinfo.so
+lib/compiz/libtitleinfo.la
+lib/compiz/libtitleinfo.a
 lib/compiz/libwall.so
 lib/compiz/libwall.la
 lib/compiz/libwall.a
@@ -108,6 +114,7 @@ share/compiz/colorfilter.xml
 share/compiz/expo.xml
 share/compiz/ezoom.xml
 share/compiz/imgjpeg.xml
+share/compiz/kdecompat.xml
 share/compiz/mag.xml
 share/compiz/mousepoll.xml
 share/compiz/neg.xml
@@ -120,6 +127,7 @@ share/compiz/snap.xml
 share/compiz/staticswitcher.xml
 share/compiz/text.xml
 share/compiz/thumbnail.xml
+share/compiz/titleinfo.xml
 share/compiz/wall.xml
 share/compiz/winrules.xml
 share/compiz/workarounds.xml
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index 471197736be3..c873735e5c46 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	compiz-plugins-unsupported
-PORTVERSION=	0.8.2
-PORTREVISION=	2
+PORTVERSION=	0.8.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
diff --git a/x11-wm/compiz-plugins-unsupported/distinfo b/x11-wm/compiz-plugins-unsupported/distinfo
index 7dca61e08aa7..4dd1a9affd57 100644
--- a/x11-wm/compiz-plugins-unsupported/distinfo
+++ b/x11-wm/compiz-plugins-unsupported/distinfo
@@ -1,3 +1,3 @@
-MD5 (compiz-plugins-unsupported-0.8.2.tar.bz2) = 3f824a0eee6ea1907337bdddb55f0228
-SHA256 (compiz-plugins-unsupported-0.8.2.tar.bz2) = 943d1ad6a1e4a92a518087c4b5ba44e91c5e2b9bc254dbfcc4adefe3dc42157b
-SIZE (compiz-plugins-unsupported-0.8.2.tar.bz2) = 1051912
+MD5 (compiz-plugins-unsupported-0.8.4.tar.bz2) = 73c7d70040cd4fd48ea29677b0f2f21e
+SHA256 (compiz-plugins-unsupported-0.8.4.tar.bz2) = 50b6aec773e72d5c0e2de801b83d323feb17d2399cc632a49d6641c888dd1006
+SIZE (compiz-plugins-unsupported-0.8.4.tar.bz2) = 1152247
diff --git a/x11-wm/compiz-plugins-unsupported/files/patch-src_elements_Makefile.in b/x11-wm/compiz-plugins-unsupported/files/patch-src_elements_Makefile.in
new file mode 100644
index 000000000000..cea56270cc39
--- /dev/null
+++ b/x11-wm/compiz-plugins-unsupported/files/patch-src_elements_Makefile.in
@@ -0,0 +1,18 @@
+--- src/elements/Makefile.in.orig	2009-11-03 08:45:02.000000000 -0600
++++ src/elements/Makefile.in	2009-11-03 08:45:51.000000000 -0600
+@@ -247,12 +247,12 @@
+ 
+ BUILT_SOURCES = $(nodist_libelements_la_SOURCES)
+ INCLUDES = \
+-	@COMPIZ_CFLAGS@                  \
++	-I$(top_srcdir)/include             \
++	@COMPIZ_CFLAGS@                     \
+ 	-DDATADIR='"$(compdatadir)"'        \
+ 	-DLIBDIR='"$(libdir)"'              \
+ 	-DLOCALEDIR="\"@datadir@/locale\""  \
+-	-DIMAGEDIR='"$(imagedir)"'          \
+-	-I$(top_srcdir)/include
++	-DIMAGEDIR='"$(imagedir)"'
+ 
+ moduledir = $(plugindir)
+ module_LTLIBRARIES = libelements.la
diff --git a/x11-wm/compiz-plugins-unsupported/pkg-plist b/x11-wm/compiz-plugins-unsupported/pkg-plist
index 422d854bfce5..07629b383b23 100644
--- a/x11-wm/compiz-plugins-unsupported/pkg-plist
+++ b/x11-wm/compiz-plugins-unsupported/pkg-plist
@@ -57,7 +57,16 @@ share/compiz/fakeargb.xml
 share/compiz/mswitch.xml
 share/compiz/snow.xml
 share/compiz/tile.xml
+share/compiz/autumn1.png
+share/compiz/autumn2.png
+share/compiz/bubbles1.png
+share/compiz/bubbles2.png
+share/compiz/fireflies1.svg
+share/compiz/fireflies2.svg
+share/compiz/snow1.png
+share/compiz/snow2.png
 share/compiz/snowflake.png
+share/compiz/stars1.png
 @dirrmtry share/locale/pl_PL/LC_MESSAGES
 @dirrmtry share/locale/pl_PL
 @dirrmtry include/compiz
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 0689520579b3..21aee193de13 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	compiz
-PORTVERSION=	0.8.2
-PORTREVISION=	2
+PORTVERSION=	0.8.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
@@ -63,6 +62,7 @@ GCONF_SCHEMAS=	gwd.schemas \
 		compiz-wobbly.schemas \
 		compiz-zoom.schemas
 
+CONFIGURE_ARGS=	--disable-kde4
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
diff --git a/x11-wm/compiz/distinfo b/x11-wm/compiz/distinfo
index 39f18386df8b..1c961e449698 100644
--- a/x11-wm/compiz/distinfo
+++ b/x11-wm/compiz/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/app/compiz-0.8.2.tar.bz2) = c161975eb0fe8deac7be8d99408a80fc
-SHA256 (xorg/app/compiz-0.8.2.tar.bz2) = f526050f0e0b81dda5a7fc5f28c0b7fd879a77a2676f7303b10dbdda9dc3b0a8
-SIZE (xorg/app/compiz-0.8.2.tar.bz2) = 1086003
+MD5 (xorg/app/compiz-0.8.4.tar.bz2) = 03fa78ce0c464f3a413b2a3b74f09559
+SHA256 (xorg/app/compiz-0.8.4.tar.bz2) = b02bf0d2ad3ddf5dbf82ff3eb3174f3f9336bde1c5dffd44cfc007fb7e2fe924
+SIZE (xorg/app/compiz-0.8.4.tar.bz2) = 1131583
diff --git a/x11-wm/compizconfig-backend-gconf/Makefile b/x11-wm/compizconfig-backend-gconf/Makefile
index 69134ef381b7..d6d8bdb54b9c 100644
--- a/x11-wm/compizconfig-backend-gconf/Makefile
+++ b/x11-wm/compizconfig-backend-gconf/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	compizconfig-backend-gconf
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.8.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
diff --git a/x11-wm/compizconfig-backend-gconf/distinfo b/x11-wm/compizconfig-backend-gconf/distinfo
index 4fb9773a5eaa..692e181337eb 100644
--- a/x11-wm/compizconfig-backend-gconf/distinfo
+++ b/x11-wm/compizconfig-backend-gconf/distinfo
@@ -1,3 +1,3 @@
-MD5 (compizconfig-backend-gconf-0.8.2.tar.bz2) = 4be4ef08e811713277077ba89934c332
-SHA256 (compizconfig-backend-gconf-0.8.2.tar.bz2) = e57f4e6cf467b348ce68f3c3b92553788e4d0db97b078dd94052c3e0a941ae5d
-SIZE (compizconfig-backend-gconf-0.8.2.tar.bz2) = 244444
+MD5 (compizconfig-backend-gconf-0.8.4.tar.bz2) = 3149b45d1099c26735f3b6a91d946b1b
+SHA256 (compizconfig-backend-gconf-0.8.4.tar.bz2) = 7231df49f6b530d72e2a21c3249ac4718cfe0c485d1317ac29d4e56c4b1b2e87
+SIZE (compizconfig-backend-gconf-0.8.4.tar.bz2) = 244419
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index bb527377b1a2..219a998258a0 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	compizconfig-python
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.8.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
diff --git a/x11-wm/compizconfig-python/distinfo b/x11-wm/compizconfig-python/distinfo
index 97d1c576e60a..48c392387130 100644
--- a/x11-wm/compizconfig-python/distinfo
+++ b/x11-wm/compizconfig-python/distinfo
@@ -1,3 +1,3 @@
-MD5 (compizconfig-python-0.8.2.tar.bz2) = 7c6e8cbbbf629fb99ff7570d117355fb
-SHA256 (compizconfig-python-0.8.2.tar.bz2) = 600360cd1303517052510fe51876abdeae872247d24e045a08719258bad7e82c
-SIZE (compizconfig-python-0.8.2.tar.bz2) = 269566
+MD5 (compizconfig-python-0.8.4.tar.bz2) = 702f83f63ce5dc3c6c1d27e07fb62fc3
+SHA256 (compizconfig-python-0.8.4.tar.bz2) = 6734ae35ee69d081f35f98a89cd3bccb411a4db7c5b35fbd226270d95ac76f5a
+SIZE (compizconfig-python-0.8.4.tar.bz2) = 269812
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index 8f27d0fb9125..9ce2b2976b5b 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	emerald
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.8.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
diff --git a/x11-wm/emerald/distinfo b/x11-wm/emerald/distinfo
index f10b7a8fbc96..0d9794cdaac8 100644
--- a/x11-wm/emerald/distinfo
+++ b/x11-wm/emerald/distinfo
@@ -1,3 +1,3 @@
-MD5 (emerald-0.8.2.tar.bz2) = d25bd51f7b7bca075c84fe3a00cbc88a
-SHA256 (emerald-0.8.2.tar.bz2) = 1b17308fe1708a3d1a5d2b379ec8fe1c3d8bfd3fd87cffdcc4a0298e27e50f39
-SIZE (emerald-0.8.2.tar.bz2) = 524512
+MD5 (emerald-0.8.4.tar.bz2) = e92fbe8252ea393206d98ed6ae9af4ec
+SHA256 (emerald-0.8.4.tar.bz2) = 7ed5009a739219c61c26176f738ba5264e93557f353fdf9fc480c73fe8b05e26
+SIZE (emerald-0.8.4.tar.bz2) = 525316
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index 526a3b66373b..6c19a5e3f991 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libcompizconfig
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.8.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
diff --git a/x11-wm/libcompizconfig/distinfo b/x11-wm/libcompizconfig/distinfo
index a3082b33ec6e..97f214631c4a 100644
--- a/x11-wm/libcompizconfig/distinfo
+++ b/x11-wm/libcompizconfig/distinfo
@@ -1,3 +1,3 @@
-MD5 (libcompizconfig-0.8.2.tar.bz2) = 551ab49ab7f542f4a969e54bcfb7a485
-SHA256 (libcompizconfig-0.8.2.tar.bz2) = a373432c6bb80df4ef086b9ef82ac7cd70078a3040f6d06992980189b1bcc87b
-SIZE (libcompizconfig-0.8.2.tar.bz2) = 316234
+MD5 (libcompizconfig-0.8.4.tar.bz2) = 723e076722370c35c47c2ab2ae445422
+SHA256 (libcompizconfig-0.8.4.tar.bz2) = 41313e935f1beb3375367bded72d97de60e7aabf1129620be53a7fc1aca0b029
+SIZE (libcompizconfig-0.8.4.tar.bz2) = 315858
diff --git a/x11-wm/simple-ccsm/Makefile b/x11-wm/simple-ccsm/Makefile
index d56062880b68..4bf97707f2b4 100644
--- a/x11-wm/simple-ccsm/Makefile
+++ b/x11-wm/simple-ccsm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	simple-ccsm
-PORTVERSION=	0.8.2
-PORTREVISION=	1
+PORTVERSION=	0.8.4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
diff --git a/x11-wm/simple-ccsm/distinfo b/x11-wm/simple-ccsm/distinfo
index 8cdc03c4797f..99af84cc42d1 100644
--- a/x11-wm/simple-ccsm/distinfo
+++ b/x11-wm/simple-ccsm/distinfo
@@ -1,3 +1,3 @@
-MD5 (simple-ccsm-0.8.2.tar.bz2) = 974b04deec62242744cc389a4c97acb3
-SHA256 (simple-ccsm-0.8.2.tar.bz2) = 60955f5fa841669e2ee7b0cef20156f600582e86f6cb70c1395b023f5d7ba282
-SIZE (simple-ccsm-0.8.2.tar.bz2) = 56555
+MD5 (simple-ccsm-0.8.4.tar.bz2) = 8d9225e28676cca5d4722aa1808d882f
+SHA256 (simple-ccsm-0.8.4.tar.bz2) = 15b24408be48f1e3c69735362dd65ea6b3ddded80e63b87ec40268e2f0f652a3
+SIZE (simple-ccsm-0.8.4.tar.bz2) = 62423
diff --git a/x11-wm/simple-ccsm/pkg-plist b/x11-wm/simple-ccsm/pkg-plist
index 5e62a0153141..1be3ebc876de 100644
--- a/x11-wm/simple-ccsm/pkg-plist
+++ b/x11-wm/simple-ccsm/pkg-plist
@@ -1,41 +1,62 @@
 @comment $FreeBSD$
 bin/simple-ccsm
+share/applications/simple-ccsm.desktop
+share/simple-ccsm/simple-ccsm.glade
+share/simple-ccsm/profiles/Ultimate.profile
+share/simple-ccsm/profiles/Advanced.profile
+share/simple-ccsm/profiles/Medium.profile
+share/simple-ccsm/profiles/Minimal.profile
+share/simple-ccsm/images/star.svg
+share/simple-ccsm/images/star.png
+share/simple-ccsm/images/star_dark.png
+share/simple-ccsm/images/star_dark.svg
+share/icons/hicolor/16x16/apps/simple-ccsm.png
+share/icons/hicolor/24x24/apps/simple-ccsm.png
+share/icons/hicolor/32x32/apps/simple-ccsm.svg
+share/icons/hicolor/32x32/apps/simple-ccsm.png
+share/icons/hicolor/22x22/apps/simple-ccsm.svg
+share/icons/hicolor/22x22/apps/simple-ccsm.png
+share/locale/bg/LC_MESSAGES/simple-ccsm.mo
+share/locale/bn/LC_MESSAGES/simple-ccsm.mo
+share/locale/bn_IN/LC_MESSAGES/simple-ccsm.mo
 share/locale/ca/LC_MESSAGES/simple-ccsm.mo
+share/locale/cs/LC_MESSAGES/simple-ccsm.mo
+share/locale/da/LC_MESSAGES/simple-ccsm.mo
 share/locale/de/LC_MESSAGES/simple-ccsm.mo
 share/locale/el/LC_MESSAGES/simple-ccsm.mo
+share/locale/en_GB/LC_MESSAGES/simple-ccsm.mo
 share/locale/es/LC_MESSAGES/simple-ccsm.mo
 share/locale/eu/LC_MESSAGES/simple-ccsm.mo
 share/locale/fi/LC_MESSAGES/simple-ccsm.mo
 share/locale/fr/LC_MESSAGES/simple-ccsm.mo
 share/locale/gl/LC_MESSAGES/simple-ccsm.mo
+share/locale/gu/LC_MESSAGES/simple-ccsm.mo
+share/locale/hi/LC_MESSAGES/simple-ccsm.mo
 share/locale/hu/LC_MESSAGES/simple-ccsm.mo
 share/locale/it/LC_MESSAGES/simple-ccsm.mo
 share/locale/ja/LC_MESSAGES/simple-ccsm.mo
+share/locale/ko/LC_MESSAGES/simple-ccsm.mo
+share/locale/ml_IN/LC_MESSAGES/simple-ccsm.mo
 share/locale/nb/LC_MESSAGES/simple-ccsm.mo
+share/locale/nb_NO/LC_MESSAGES/simple-ccsm.mo
+share/locale/nl/LC_MESSAGES/simple-ccsm.mo
+share/locale/or/LC_MESSAGES/simple-ccsm.mo
+share/locale/pa/LC_MESSAGES/simple-ccsm.mo
 share/locale/pl/LC_MESSAGES/simple-ccsm.mo
 share/locale/pt/LC_MESSAGES/simple-ccsm.mo
+share/locale/pt_BR/LC_MESSAGES/simple-ccsm.mo
 share/locale/ru/LC_MESSAGES/simple-ccsm.mo
 share/locale/sk/LC_MESSAGES/simple-ccsm.mo
+share/locale/sv/LC_MESSAGES/simple-ccsm.mo
 share/locale/tr/LC_MESSAGES/simple-ccsm.mo
 share/locale/zh_CN/LC_MESSAGES/simple-ccsm.mo
-share/applications/simple-ccsm.desktop
-share/simple-ccsm/simple-ccsm.glade
-share/simple-ccsm/profiles/Ultimate.profile
-share/simple-ccsm/profiles/Advanced.profile
-share/simple-ccsm/profiles/Medium.profile
-share/simple-ccsm/profiles/Minimal.profile
-share/simple-ccsm/images/star.svg
-share/simple-ccsm/images/star.png
-share/simple-ccsm/images/star_dark.png
-share/simple-ccsm/images/star_dark.svg
-share/icons/hicolor/16x16/apps/simple-ccsm.png
-share/icons/hicolor/24x24/apps/simple-ccsm.png
-share/icons/hicolor/32x32/apps/simple-ccsm.svg
-share/icons/hicolor/32x32/apps/simple-ccsm.png
-share/icons/hicolor/22x22/apps/simple-ccsm.svg
-share/icons/hicolor/22x22/apps/simple-ccsm.png
+share/locale/zh_TW/LC_MESSAGES/simple-ccsm.mo
 @dirrmtry share/simple-ccsm/profiles
 @dirrmtry share/simple-ccsm/images
 @dirrmtry share/simple-ccsm
 @dirrmtry share/applications
+@dirrmtry share/locale/ml_IN/LC_MESSAGES
+@dirrmtry share/locale/ml_IN
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO