update xfce4 to 4.4.2

Approved by:    portmgr (linimon)
Security:       CVE-2007-6531, CVE-2007-6532

17 files changed, 41 insertions, 171 deletions

diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 0f7d6f68f75b..899533b6ff44 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xfce4-desktop
-PORTVERSION=	4.4.1
-PORTREVISION=	1
+PORTVERSION=	4.4.2
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DISTNAME=	xfdesktop-${PORTVERSION}
diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo
index 51b2422c061b..f75c42263c28 100644
--- a/x11-wm/xfce4-desktop/distinfo
+++ b/x11-wm/xfce4-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfdesktop-4.4.1.tar.bz2) = 7cbebc8e895eb19ee735e520ea48d03b
-SHA256 (xfce4/xfdesktop-4.4.1.tar.bz2) = abf8c93af0df9d6ec730917e02c57783546c40b8be091a74a5160bbf59ee4a80
-SIZE (xfce4/xfdesktop-4.4.1.tar.bz2) = 3067577
+MD5 (xfce4/xfdesktop-4.4.2.tar.bz2) = 694601234e74903d0fccba064f411e0c
+SHA256 (xfce4/xfdesktop-4.4.2.tar.bz2) = 7e50c13e45b1424924c49dd1e9daa6c16881ee57ac21e4e2c6f20c0eec227cdb
+SIZE (xfce4/xfdesktop-4.4.2.tar.bz2) = 3047839
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index 2669095a3f50..64cf727a31e1 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -10,6 +10,7 @@ etc/xdg/xfce4/desktop/xfce-registered-categories.xml.he
 etc/xdg/xfce4/desktop/xfce-registered-categories.xml.hu
 etc/xdg/xfce4/desktop/xfce-registered-categories.xml.it
 etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ja
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nb_NO
 etc/xdg/xfce4/desktop/xfce-registered-categories.xml.nl
 etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pl
 etc/xdg/xfce4/desktop/xfce-registered-categories.xml.pt_BR
@@ -37,6 +38,7 @@ etc/xdg/xfce4/desktop/menu.xml.hu
 etc/xdg/xfce4/desktop/menu.xml.it
 etc/xdg/xfce4/desktop/menu.xml.ja
 etc/xdg/xfce4/desktop/menu.xml.ko
+etc/xdg/xfce4/desktop/menu.xml.nb_NO
 etc/xdg/xfce4/desktop/menu.xml.nl
 etc/xdg/xfce4/desktop/menu.xml.pa
 etc/xdg/xfce4/desktop/menu.xml.pl
@@ -68,6 +70,7 @@ share/icons/hicolor/48x48/apps/xfce4-backdrop.png
 share/icons/hicolor/48x48/apps/xfce4-menueditor.png
 share/icons/hicolor/scalable/apps/xfce4-backdrop.svg
 share/icons/hicolor/scalable/apps/xfce4-menueditor.svg
+share/locale/am/LC_MESSAGES/xfdesktop.mo
 share/locale/ar/LC_MESSAGES/xfdesktop.mo
 share/locale/az/LC_MESSAGES/xfdesktop.mo
 share/locale/be/LC_MESSAGES/xfdesktop.mo
@@ -98,6 +101,7 @@ share/locale/ja/LC_MESSAGES/xfdesktop.mo
 share/locale/ka/LC_MESSAGES/xfdesktop.mo
 share/locale/ko/LC_MESSAGES/xfdesktop.mo
 share/locale/lt/LC_MESSAGES/xfdesktop.mo
+share/locale/lv/LC_MESSAGES/xfdesktop.mo
 share/locale/mk/LC_MESSAGES/xfdesktop.mo
 share/locale/mr/LC_MESSAGES/xfdesktop.mo
 share/locale/ms/LC_MESSAGES/xfdesktop.mo
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 1f8a729c3871..13c5bd4c08da 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xfce4-panel
-PORTVERSION=	4.4.1
-PORTREVISION=	1
+PORTVERSION=	4.4.2
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index c34515a6f357..c65ac3019c10 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-panel-4.4.1.tar.bz2) = 56b3137c190dd722dd5109be03901feb
-SHA256 (xfce4/xfce4-panel-4.4.1.tar.bz2) = a84cfc376b1c15f941177d5189668694db365591a4132cbd4d1ac5c7da3f43fa
-SIZE (xfce4/xfce4-panel-4.4.1.tar.bz2) = 767669
+MD5 (xfce4/xfce4-panel-4.4.2.tar.bz2) = 8f26b32c442bf9926f98f285a3c251dd
+SHA256 (xfce4/xfce4-panel-4.4.2.tar.bz2) = ddabfb0ccf04366820efdeb7c640ee3a648a55e51b5177c9861a5ab896e96ddd
+SIZE (xfce4/xfce4-panel-4.4.2.tar.bz2) = 757724
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index e48fca17a90e..e88e8dab73aa 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -78,6 +78,7 @@ share/icons/hicolor/48x48/apps/xfce-mouse.png
 share/icons/hicolor/48x48/apps/xfce4-iconbox.png
 share/icons/hicolor/48x48/apps/xfce4-panel.png
 share/icons/hicolor/48x48/apps/xfce4-taskbar.png
+share/locale/am/LC_MESSAGES/xfce4-panel.mo
 share/locale/ar/LC_MESSAGES/xfce4-panel.mo
 share/locale/az/LC_MESSAGES/xfce4-panel.mo
 share/locale/be/LC_MESSAGES/xfce4-panel.mo
@@ -108,6 +109,7 @@ share/locale/ja/LC_MESSAGES/xfce4-panel.mo
 share/locale/ka/LC_MESSAGES/xfce4-panel.mo
 share/locale/ko/LC_MESSAGES/xfce4-panel.mo
 share/locale/lt/LC_MESSAGES/xfce4-panel.mo
+share/locale/lv/LC_MESSAGES/xfce4-panel.mo
 share/locale/mk/LC_MESSAGES/xfce4-panel.mo
 share/locale/mr/LC_MESSAGES/xfce4-panel.mo
 share/locale/ms/LC_MESSAGES/xfce4-panel.mo
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 1d61029cecd5..dbbedc03231f 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xfce4-session
-PORTVERSION=	4.4.1
-PORTREVISION=	1
+PORTVERSION=	4.4.2
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
@@ -15,9 +15,6 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Session manager for the Xfce 4 desktop environment
 
-BUILD_DEPENDS=	iceauth:${X_CLIENTS_PORT}
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS= yes
 USE_BZIP2=	yes
@@ -30,4 +27,14 @@ USE_XLIB=	yes
 
 MAN1=		xfce4-session.1 xfce4-session-logout.1
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM:L} != xorg
+BUILD_DEPENDS+=	iceauth:${X_CLIENTS_PORT}
+.else
+BUILD_DEPENDS+=	iceauth:${PORTSDIR}/x11/iceauth
+.endif
+
+RUN_DEPENDS=	${BUILD_DEPENDS}
+
+.include <bsd.port.post.mk>
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index 354fde648341..00e0b62f5550 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-session-4.4.1.tar.bz2) = 82c31aef2856e30ebc09d2911e9b96ee
-SHA256 (xfce4/xfce4-session-4.4.1.tar.bz2) = cab5f28173944b4c99c36570405b84f730ece80c51eaa1b01e6726c29b158065
-SIZE (xfce4/xfce4-session-4.4.1.tar.bz2) = 1289278
+MD5 (xfce4/xfce4-session-4.4.2.tar.bz2) = 4c3d1acb8ce37ea4dd55d82aeb38e9e7
+SHA256 (xfce4/xfce4-session-4.4.2.tar.bz2) = 7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6
+SIZE (xfce4/xfce4-session-4.4.2.tar.bz2) = 1252395
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index 3ac5bf25e892..e5fd69760aaf 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -41,6 +41,7 @@ share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
 share/icons/hicolor/72x72/apps/xfsm-trash-normal.png
 share/icons/hicolor/scalable/apps/xfce4-session.svg
 share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
+share/locale/am/LC_MESSAGES/xfce4-session.mo
 share/locale/ar/LC_MESSAGES/xfce4-session.mo
 share/locale/az/LC_MESSAGES/xfce4-session.mo
 share/locale/be/LC_MESSAGES/xfce4-session.mo
@@ -69,6 +70,7 @@ share/locale/ja/LC_MESSAGES/xfce4-session.mo
 share/locale/ka/LC_MESSAGES/xfce4-session.mo
 share/locale/ko/LC_MESSAGES/xfce4-session.mo
 share/locale/lt/LC_MESSAGES/xfce4-session.mo
+share/locale/lv/LC_MESSAGES/xfce4-session.mo
 share/locale/mk/LC_MESSAGES/xfce4-session.mo
 share/locale/mr/LC_MESSAGES/xfce4-session.mo
 share/locale/ms/LC_MESSAGES/xfce4-session.mo
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 73e4a7223b62..a4afb916d742 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xfce4-wm
-PORTVERSION=	4.4.1
-PORTREVISION=	2
+PORTVERSION=	4.4.2
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DISTNAME=	xfwm4-${PORTVERSION}
diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo
index 20f57eb8d5ff..9b9c1711ecb0 100644
--- a/x11-wm/xfce4-wm/distinfo
+++ b/x11-wm/xfce4-wm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfwm4-4.4.1.tar.bz2) = c531edad76c909001acccc02936404f2
-SHA256 (xfce4/xfwm4-4.4.1.tar.bz2) = 4c7def1dfe4fe723dfd2728187d70b96682896649461507d230906aafffc0475
-SIZE (xfce4/xfwm4-4.4.1.tar.bz2) = 1645973
+MD5 (xfce4/xfwm4-4.4.2.tar.bz2) = 21da77e50b07e72bba784bf3418ca067
+SHA256 (xfce4/xfwm4-4.4.2.tar.bz2) = 710120122bc4acaaecdb0646656c5aa92f1d44c4c81d1a6775688abab04cca0a
+SIZE (xfce4/xfwm4-4.4.2.tar.bz2) = 1548533
diff --git a/x11-wm/xfce4-wm/files/patch-client.c b/x11-wm/xfce4-wm/files/patch-client.c
deleted file mode 100644
index 337570fccaf1..000000000000
--- a/x11-wm/xfce4-wm/files/patch-client.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/client.c.orig	2007-04-02 21:48:20.000000000 +0200
-+++ src/client.c	2007-10-25 22:26:36.000000000 +0200
-@@ -4868,21 +4868,19 @@
- 
-     if (passdata.c)
-     {
--        GdkPixbuf *icon;
--
-         TRACE ("entering cycle loop");
-         passdata.wireframe = wireframeCreate (passdata.c);
--        icon = getAppIcon (display_info, passdata.c->window, 32, 32);
-         passdata.tabwin = tabwinCreate (passdata.c->screen_info->gscr, c,
-                                         passdata.c, passdata.cycle_range,
-                                         screen_info->params->cycle_workspaces);
-         eventFilterPush (display_info->xfilter, clientCycleEventFilter, &passdata);
-         gtk_main ();
-         eventFilterPop (display_info->xfilter);
--        wireframeDelete (screen_info, passdata.wireframe);
-         TRACE ("leaving cycle loop");
-         tabwinDestroy (passdata.tabwin);
-         g_free (passdata.tabwin);
-+        wireframeDelete (screen_info, passdata.wireframe);
-+        updateXserverTime (display_info);
-     }
- 
-     if (passdata.c)
diff --git a/x11-wm/xfce4-wm/files/patch-display.c b/x11-wm/xfce4-wm/files/patch-display.c
deleted file mode 100644
index ccb01816167a..000000000000
--- a/x11-wm/xfce4-wm/files/patch-display.c
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/display.c.orig	2007-04-02 21:32:01.000000000 +0200
-+++ src/display.c	2007-10-25 22:26:36.000000000 +0200
-@@ -178,6 +178,19 @@
-                           FALSE, display_info->atoms) != 0);
- }
- 
-+static void
-+myDisplayCreateTimestampWin (DisplayInfo *display_info)
-+{
-+    XSetWindowAttributes attributes;
-+
-+    attributes.event_mask = PropertyChangeMask;
-+    attributes.override_redirect = TRUE;
-+    display_info->timestamp_win = 
-+        XCreateWindow (display_info->dpy, DefaultRootWindow (display_info->dpy),
-+                       -100, -100, 10, 10, 0, 0, CopyFromParent, CopyFromParent,
-+                       CWEventMask | CWOverrideRedirect, &attributes);
-+}
-+
- DisplayInfo *
- myDisplayInit (GdkDisplay *gdisplay)
- {
-@@ -309,6 +322,8 @@
-     display->resize_cursor[CORNER_COUNT + SIDE_BOTTOM] =
-         XCreateFontCursor (display->dpy, XC_bottom_side);
- 
-+    myDisplayCreateTimestampWin (display);
-+
-     display->xfilter = NULL;
-     display->screens = NULL;
-     display->clients = NULL;
-@@ -340,6 +355,8 @@
-     display->move_cursor = None;
-     XFreeCursor (display->dpy, display->root_cursor);
-     display->root_cursor = None;
-+    XDestroyWindow (display->dpy, display->timestamp_win);
-+    display->timestamp_win = None;
- 
-     if (display->hostname)
-     {
diff --git a/x11-wm/xfce4-wm/files/patch-display.h b/x11-wm/xfce4-wm/files/patch-display.h
deleted file mode 100644
index a893a3069628..000000000000
--- a/x11-wm/xfce4-wm/files/patch-display.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/display.h.orig	2007-04-02 21:32:01.000000000 +0200
-+++ src/display.h	2007-10-25 22:26:36.000000000 +0200
-@@ -226,6 +226,7 @@
-     gboolean quit;
-     gboolean reload;
- 
-+    Window timestamp_win;
-     Cursor busy_cursor;
-     Cursor move_cursor;
-     Cursor root_cursor;
diff --git a/x11-wm/xfce4-wm/files/patch-hint.c b/x11-wm/xfce4-wm/files/patch-hint.c
deleted file mode 100644
index fbdc0ada8324..000000000000
--- a/x11-wm/xfce4-wm/files/patch-hint.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/hints.c.orig	2007-03-11 14:44:43.000000000 +0100
-+++ src/hints.c	2007-10-25 22:26:36.000000000 +0200
-@@ -1167,27 +1167,18 @@
-     return setXAtomManagerOwner(display_info, display_info->atoms[atom_id], root, w);
- }
- 
--
--static Bool
--checkPropEvent (Display *display, XEvent *xevent, XPointer arg)
-+void
-+updateXserverTime (DisplayInfo *display_info)
- {
--    DisplayInfo *display_info;
-     ScreenInfo *screen_info;
-+    char c = '\0';
- 
--    display_info = (DisplayInfo *) arg;
--    g_return_val_if_fail (display_info, FALSE);
--
--    screen_info = myDisplayGetDefaultScreen (display_info);
--    g_return_val_if_fail (screen_info, FALSE);
-+    g_return_if_fail (display_info);
- 
--    if ((xevent->type == PropertyNotify) &&
--        (xevent->xproperty.window == screen_info->xfwm4_win) &&
--        (xevent->xproperty.atom == display_info->atoms[XFWM4_TIMESTAMP_PROP]))
--    {
--        return TRUE;
--    }
--
--    return FALSE;
-+    XChangeProperty (display_info->dpy, display_info->timestamp_win,
-+                     display_info->atoms[XFWM4_TIMESTAMP_PROP],
-+                     display_info->atoms[XFWM4_TIMESTAMP_PROP],
-+                     8, PropModeReplace, (unsigned char *) &c, 1);
- }
- 
- Time
-@@ -1196,7 +1187,6 @@
-     ScreenInfo *screen_info;
-     XEvent xevent;
-     Time timestamp;
--    char c = '\0';
- 
-     g_return_val_if_fail (display_info, (Time) CurrentTime);
-     timestamp = myDisplayGetCurrentTime (display_info);
-@@ -1206,12 +1196,8 @@
-         g_return_val_if_fail (screen_info,  (Time) CurrentTime);
- 
-         TRACE ("getXServerTime: Using X server roundtrip");
--        XChangeProperty (display_info->dpy, screen_info->xfwm4_win, 
--                         display_info->atoms[XFWM4_TIMESTAMP_PROP],
--                         display_info->atoms[XFWM4_TIMESTAMP_PROP],
--                         8, PropModeReplace, (unsigned char *) &c, 1);
--        XIfEvent (display_info->dpy, &xevent, checkPropEvent, (XPointer) display_info);
--
-+        updateXserverTime (display_info);
-+        XWindowEvent (display_info->dpy, display_info->timestamp_win, PropertyChangeMask, &xevent);
-         timestamp = (Time) myDisplayUpdateCurrentTime (display_info, &xevent);
-     }
- 
diff --git a/x11-wm/xfce4-wm/files/patch-hint.h b/x11-wm/xfce4-wm/files/patch-hint.h
deleted file mode 100644
index fd7931597545..000000000000
--- a/x11-wm/xfce4-wm/files/patch-hint.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/hints.h.orig	2007-03-11 14:44:43.000000000 +0100
-+++ src/hints.h	2007-10-25 22:26:36.000000000 +0200
-@@ -269,6 +269,7 @@
-                                                                  int, 
-                                                                  Window , 
-                                                                  Window);
-+void                     updateXserverTime                      (DisplayInfo *);
- Time                     getXServerTime                         (DisplayInfo *);
- 
- #ifdef ENABLE_KDE_SYSTRAY_PROXY
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index d53111852df4..b7b06345a9db 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -17,6 +17,7 @@ share/icons/hicolor/48x48/apps/xfwm4.png
 share/icons/hicolor/scalable/apps/wmtweaks.svg
 share/icons/hicolor/scalable/apps/xfce4-workspaces.svg
 share/icons/hicolor/scalable/apps/xfwm4.svg
+share/locale/am/LC_MESSAGES/xfwm4.mo
 share/locale/ar/LC_MESSAGES/xfwm4.mo
 share/locale/az/LC_MESSAGES/xfwm4.mo
 share/locale/be/LC_MESSAGES/xfwm4.mo
@@ -46,6 +47,7 @@ share/locale/ja/LC_MESSAGES/xfwm4.mo
 share/locale/ka/LC_MESSAGES/xfwm4.mo
 share/locale/ko/LC_MESSAGES/xfwm4.mo
 share/locale/lt/LC_MESSAGES/xfwm4.mo
+share/locale/lv/LC_MESSAGES/xfwm4.mo
 share/locale/mk/LC_MESSAGES/xfwm4.mo
 share/locale/mr/LC_MESSAGES/xfwm4.mo
 share/locale/ms/LC_MESSAGES/xfwm4.mo