8 files changed, 108 insertions, 66 deletions

diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index edeb2e98d887..cc93a20add05 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfce4-panel
-PORTVERSION=	4.8.5
+PORTVERSION=	4.8.6
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/xfce/${PORTNAME}/${PORTVERSION:R}
@@ -32,7 +32,6 @@ USE_PERL5=	yes
 USE_XFCE=	configenv garcon libexo libmenu libutil xfconf
 USE_XORG=	x11 sm
 
-CONFIGURE_ARGS=	--enable-gtk-doc-html=no
 CONFIGURE_ENV+=	ac_cv_prog_AWK="${AWK}"
 
 OPTIONS=	NLS	"Enable Native Language Support" 	on \
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index e58bbaffd822..2fda6629cb1c 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-panel-4.8.5.tar.bz2) = df8379a18d337481b847cf232eec907a927287917788e7b730deef4a535deada
-SIZE (xfce4/xfce4-panel-4.8.5.tar.bz2) = 1262756
+SHA256 (xfce4/xfce4-panel-4.8.6.tar.bz2) = 66f1266a1242ee5ecada995a4a584dd9802aa24456759b40b0c29227c39bed03
+SIZE (xfce4/xfce4-panel-4.8.6.tar.bz2) = 1290803
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index c5c9ccb39bf2..3866050d11f2 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -183,6 +183,7 @@ share/icons/hicolor/scalable/apps/xfce4-panel.svg
 %%NLS%%share/locale/sq/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/te/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/xfce4-panel.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/xfce4-panel.mo
@@ -211,6 +212,8 @@ share/xfce4/panel/plugins/windowmenu.desktop
 %%NLS%%@dirrmtry share/locale/ur
 %%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/te
 %%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/si
 %%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 3be7b6aea945..90d5089340aa 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfce4-wm
-PORTVERSION=	4.8.1
+PORTVERSION=	4.8.2
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/xfwm4/${PORTVERSION:R}
@@ -16,15 +16,24 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce 4 window manager
 
-CONFIGURE_ARGS=	--enable-xinerama
+DOCSDIR=	${PREFIX}/share/doc/xfwm4
+
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck
+
+CONFIGURE_ARGS=	--enable-xsync \
+		--enable-render \
+		--enable-randr \
+		--disable-kde-systray
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 intltool intlhack pkgconfig
+USE_GNOME=	gnomehack gtk20 intltool intlhack pkgconfig desktopfileutils
 USE_LDCONFIG=	yes
-USE_XFCE=	configenv libutil libgui panel xfconf
+USE_XFCE=	configenv libmenu libutil xfconf
+USE_XORG=	x11 sm xext xrandr xrender
 
 OPTIONS=	COMPOSITE	"Support the experimental X11 Composite extension"	on \
 		STARTUP 	"Enable startup notification support"			on \
@@ -53,4 +62,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|\(#define ShapeInput 2\);|\1|' \
 		${WRKSRC}/src/frame.c
 
+post-install:
+	@-update-desktop-database
+
 .include <bsd.port.post.mk>
diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo
index 6f361cf6a10a..b0cdd89fd010 100644
--- a/x11-wm/xfce4-wm/distinfo
+++ b/x11-wm/xfce4-wm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfwm4-4.8.1.tar.bz2) = 6a3cbf6c92a0cc3bcaf7cf2565c35beae6354768ec26b4d616a3c2544a8f8499
-SIZE (xfce4/xfwm4-4.8.1.tar.bz2) = 1886443
+SHA256 (xfce4/xfwm4-4.8.2.tar.bz2) = 6db2a6148d63d45699dbf6403fb227f8cbd529dcec7ee0827342940c442b0747
+SIZE (xfce4/xfwm4-4.8.2.tar.bz2) = 1936231
diff --git a/x11-wm/xfce4-wm/files/patch-doc_manual_images_Makefile.in b/x11-wm/xfce4-wm/files/patch-doc_manual_images_Makefile.in
new file mode 100644
index 000000000000..5ae27be6c555
--- /dev/null
+++ b/x11-wm/xfce4-wm/files/patch-doc_manual_images_Makefile.in
@@ -0,0 +1,18 @@
+--- doc/manual/images/Makefile.in.orig	2011-09-23 19:17:31.000000000 +0200
++++ doc/manual/images/Makefile.in	2011-09-23 19:18:01.000000000 +0200
+@@ -319,7 +319,6 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = \
+-	fr \
+ 	it
+ 
+ imagesdir = $(docdir)/html/C/images
+@@ -328,7 +327,6 @@
+ 	workspace_margins.png \
+ 	titlebar.png \
+ 	misc_wm_prefs.png \
+-	Makefile.am \
+ 	keyboard_shortcuts.png \
+ 	focus.png \
+ 	decoration_style.png \
diff --git a/x11-wm/xfce4-wm/files/patch-doc_manual_images_it_Makefile.in b/x11-wm/xfce4-wm/files/patch-doc_manual_images_it_Makefile.in
new file mode 100644
index 000000000000..1c481046aa38
--- /dev/null
+++ b/x11-wm/xfce4-wm/files/patch-doc_manual_images_it_Makefile.in
@@ -0,0 +1,10 @@
+--- doc/manual/images/it/Makefile.in.orig	2011-09-22 21:12:44.000000000 +0200
++++ doc/manual/images/it/Makefile.in	2011-09-23 19:12:24.000000000 +0200
+@@ -284,7 +284,6 @@
+ 	workspace_margins.png \
+ 	titlebar.png \
+ 	misc_wm_prefs.png \
+-	Makefile.am \
+ 	keyboard_shortcuts.png \
+ 	focus.png \
+ 	decoration_style.png \
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index b50f78c4f4a6..334423893bd7 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -6,46 +6,41 @@ lib/xfce4/xfwm4/helper-dialog
 share/applications/xfce-wm-settings.desktop
 share/applications/xfce-wmtweaks-settings.desktop
 share/applications/xfce-workspaces-settings.desktop
-share/doc/xfwm4/html/C/images/Makefile.am
-share/doc/xfwm4/html/C/images/compose_shortcut.png
-share/doc/xfwm4/html/C/images/decoration_style.png
-share/doc/xfwm4/html/C/images/focus.png
-share/doc/xfwm4/html/C/images/keyboard_shortcuts.png
-share/doc/xfwm4/html/C/images/misc_wm_prefs.png
-share/doc/xfwm4/html/C/images/titlebar.png
-share/doc/xfwm4/html/C/images/workspace_margins.png
-share/doc/xfwm4/html/C/images/xfwm_workspaces.png
-share/doc/xfwm4/html/C/index.html
-share/doc/xfwm4/html/da/images
-share/doc/xfwm4/html/da/index.html
-share/doc/xfwm4/html/el/images
-share/doc/xfwm4/html/el/index.html
-share/doc/xfwm4/html/fr/images/Makefile.am
-share/doc/xfwm4/html/fr/images/compose_shortcut.png
-share/doc/xfwm4/html/fr/images/decoration_style.png
-share/doc/xfwm4/html/fr/images/focus.png
-share/doc/xfwm4/html/fr/images/keyboard_shortcuts.png
-share/doc/xfwm4/html/fr/images/misc_wm_prefs.png
-share/doc/xfwm4/html/fr/images/titlebar.png
-share/doc/xfwm4/html/fr/images/workspace_margins.png
-share/doc/xfwm4/html/fr/images/xfwm_workspaces.png
-share/doc/xfwm4/html/gl/images
-share/doc/xfwm4/html/gl/index.html
-share/doc/xfwm4/html/it/images/Makefile.am
-share/doc/xfwm4/html/it/images/compose_shortcut.png
-share/doc/xfwm4/html/it/images/decoration_style.png
-share/doc/xfwm4/html/it/images/focus.png
-share/doc/xfwm4/html/it/images/keyboard_shortcuts.png
-share/doc/xfwm4/html/it/images/misc_wm_prefs.png
-share/doc/xfwm4/html/it/images/titlebar.png
-share/doc/xfwm4/html/it/images/workspace_margins.png
-share/doc/xfwm4/html/it/images/xfwm_workspaces.png
-share/doc/xfwm4/html/it/index.html
-share/doc/xfwm4/html/sv/images
-share/doc/xfwm4/html/sv/index.html
-share/doc/xfwm4/html/ug/images
-share/doc/xfwm4/html/ug/index.html
-share/doc/xfwm4/html/xfwm4.css
+%%DOCSDIR%%/html/C/images/compose_shortcut.png
+%%DOCSDIR%%/html/C/images/decoration_style.png
+%%DOCSDIR%%/html/C/images/focus.png
+%%DOCSDIR%%/html/C/images/keyboard_shortcuts.png
+%%DOCSDIR%%/html/C/images/misc_wm_prefs.png
+%%DOCSDIR%%/html/C/images/titlebar.png
+%%DOCSDIR%%/html/C/images/workspace_margins.png
+%%DOCSDIR%%/html/C/images/xfwm_workspaces.png
+%%DOCSDIR%%/html/C/index.html
+%%DOCSDIR%%/html/da/images
+%%DOCSDIR%%/html/da/index.html
+%%DOCSDIR%%/html/el/images
+%%DOCSDIR%%/html/el/index.html
+%%DOCSDIR%%/html/gl/images
+%%DOCSDIR%%/html/gl/index.html
+%%DOCSDIR%%/html/it/images/compose_shortcut.png
+%%DOCSDIR%%/html/it/images/decoration_style.png
+%%DOCSDIR%%/html/it/images/focus.png
+%%DOCSDIR%%/html/it/images/keyboard_shortcuts.png
+%%DOCSDIR%%/html/it/images/misc_wm_prefs.png
+%%DOCSDIR%%/html/it/images/titlebar.png
+%%DOCSDIR%%/html/it/images/workspace_margins.png
+%%DOCSDIR%%/html/it/images/xfwm_workspaces.png
+%%DOCSDIR%%/html/it/index.html
+%%DOCSDIR%%/html/ru/images
+%%DOCSDIR%%/html/ru/index.html
+%%DOCSDIR%%/html/sv/images
+%%DOCSDIR%%/html/sv/index.html
+%%DOCSDIR%%/html/tr/images
+%%DOCSDIR%%/html/tr/index.html
+%%DOCSDIR%%/html/ug/images
+%%DOCSDIR%%/html/ug/index.html
+%%DOCSDIR%%/html/zh_CN/images
+%%DOCSDIR%%/html/zh_CN/index.html
+%%DOCSDIR%%/html/xfwm4.css
 share/icons/hicolor/48x48/apps/wmtweaks.png
 share/icons/hicolor/48x48/apps/xfce4-workspaces.png
 share/icons/hicolor/48x48/apps/xfwm4.png
@@ -105,6 +100,7 @@ share/locale/sk/LC_MESSAGES/xfwm4.mo
 share/locale/sq/LC_MESSAGES/xfwm4.mo
 share/locale/sv/LC_MESSAGES/xfwm4.mo
 share/locale/ta/LC_MESSAGES/xfwm4.mo
+share/locale/te/LC_MESSAGES/xfwm4.mo
 share/locale/tr/LC_MESSAGES/xfwm4.mo
 share/locale/ug/LC_MESSAGES/xfwm4.mo
 share/locale/uk/LC_MESSAGES/xfwm4.mo
@@ -1496,13 +1492,15 @@ share/xfwm4/defaults
 @dirrm share/themes/Default
 @dirrm share/themes/Daloa/xfwm4
 @dirrm share/themes/Daloa
-@dirrm share/themes
+@dirrmtry share/themes
 @dirrmtry share/locale/ur_PK/LC_MESSAGES
 @dirrmtry share/locale/ur_PK
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/mr/LC_MESSAGES
@@ -1515,19 +1513,21 @@ share/xfwm4/defaults
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
-@dirrm share/doc/xfwm4/html/ug
-@dirrm share/doc/xfwm4/html/sv
-@dirrm share/doc/xfwm4/html/it/images
-@dirrm share/doc/xfwm4/html/it
-@dirrm share/doc/xfwm4/html/gl
-@dirrm share/doc/xfwm4/html/el
-@dirrm share/doc/xfwm4/html/fr/images
-@dirrm share/doc/xfwm4/html/fr
-@dirrm share/doc/xfwm4/html/da
-@dirrm share/doc/xfwm4/html/C/images
-@dirrm share/doc/xfwm4/html/C
-@dirrm share/doc/xfwm4/html
-@dirrm share/doc/xfwm4
-@dirrmtry share/applications
+@dirrm %%DOCSDIR%%/html/zh_CN
+@dirrm %%DOCSDIR%%/html/ug
+@dirrm %%DOCSDIR%%/html/tr
+@dirrm %%DOCSDIR%%/html/sv
+@dirrm %%DOCSDIR%%/html/ru
+@dirrm %%DOCSDIR%%/html/it/images
+@dirrm %%DOCSDIR%%/html/it
+@dirrm %%DOCSDIR%%/html/gl
+@dirrm %%DOCSDIR%%/html/el
+@dirrm %%DOCSDIR%%/html/da
+@dirrm %%DOCSDIR%%/html/C/images
+@dirrm %%DOCSDIR%%/html/C
+@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%
 @dirrm lib/xfce4/xfwm4
-@dirrm lib/xfce4
+@dirrmtry lib/xfce4
+@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true