3 files changed, 60 insertions, 178 deletions

diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 92c0d262bc45..eaa0805fb279 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	xfce4-panel
-PORTVERSION=	4.0.6
-PORTREVISION=	1
+PORTVERSION=	4.2.0
+PORTREVISION=	0
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	ftp://ftp.berlios.de/pub/xfce-goodies/${PORTVERSION}/ \
-		http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
+		http://spuriousinterrupt.org/projects/xfce4/files/mirror/xfce-${PORTVERSION}/ \
+		http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	oliver@FreeBSD.org
@@ -20,13 +21,13 @@ BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
-		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
+		xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
-USE_INC_LIBTOOL_VER=15
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index c84a142aba41..041193b53be6 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,2 +1,2 @@
-MD5 (xfce4/xfce4-panel-4.0.6.tar.gz) = c93c010195a8e5fc04bc1295418acbb4
-SIZE(xfce4/xfce4-panel-4.0.6.tar.gz) = 1277648
+MD5 (xfce4/xfce4-panel-4.2.0.tar.gz) = 92a3ccf964939034b786917a69cd0ba6
+SIZE(xfce4/xfce4-panel-4.2.0.tar.gz) = 871179
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index 207a6ecc323a..862e234b70c5 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -1,13 +1,24 @@
 bin/xfce4-panel
-etc/xfce4/xfce4rc
-etc/xfce4/xfce4rc.ar
-etc/xfce4/xfce4rc.az
-etc/xfce4/xfce4rc.ca
-etc/xfce4/xfce4rc.fr
-etc/xfce4/xfce4rc.hu
-etc/xfce4/xfce4rc.it
-etc/xfce4/xfce4rc.nl
-etc/xfce4/xfce4rc.vi
+etc/xdg/xfce4/panel/contents.xml
+etc/xdg/xfce4/panel/contents.xml.ar
+etc/xdg/xfce4/panel/contents.xml.az
+etc/xdg/xfce4/panel/contents.xml.ca
+etc/xdg/xfce4/panel/contents.xml.eu
+etc/xdg/xfce4/panel/contents.xml.fr
+etc/xdg/xfce4/panel/contents.xml.he
+etc/xdg/xfce4/panel/contents.xml.hu
+etc/xdg/xfce4/panel/contents.xml.it
+etc/xdg/xfce4/panel/contents.xml.ko
+etc/xdg/xfce4/panel/contents.xml.lt
+etc/xdg/xfce4/panel/contents.xml.ms
+etc/xdg/xfce4/panel/contents.xml.nl
+etc/xdg/xfce4/panel/contents.xml.ro
+etc/xdg/xfce4/panel/contents.xml.ru
+etc/xdg/xfce4/panel/contents.xml.sk
+etc/xdg/xfce4/panel/contents.xml.tr
+etc/xdg/xfce4/panel/contents.xml.vi
+etc/xdg/xfce4/panel/contents.xml.zh_TW
+include/xfce4/panel/add-control-dialog.h
 include/xfce4/panel/controls.h
 include/xfce4/panel/global.h
 include/xfce4/panel/icons.h
@@ -18,34 +29,51 @@ include/xfce4/panel/item_dialog.h
 include/xfce4/panel/plugins.h
 include/xfce4/panel/xfce_support.h
 include/xfce4/panel/xfce.h
-lib/xfce4/mcs-plugins/libxfce4settings.la
 lib/xfce4/mcs-plugins/libxfce4settings.so
-lib/xfce4/panel-plugins/libclock.la
 lib/xfce4/panel-plugins/libclock.so
-lib/xfce4/panel-plugins/libmailcheck.la
 lib/xfce4/panel-plugins/libmailcheck.so
-lib/xfce4/panel-plugins/libpager.la
 lib/xfce4/panel-plugins/libpager.so
-lib/xfce4/panel-plugins/libseparator.la
 lib/xfce4/panel-plugins/libseparator.so
-lib/xfce4/panel-plugins/libswitcher.la
 lib/xfce4/panel-plugins/libswitcher.so
-lib/xfce4/panel-plugins/libsystembuttons.la
 lib/xfce4/panel-plugins/libsystembuttons.so
 libdata/pkgconfig/xfce4-panel-1.0.pc
+share/icons/hicolor/16x16/apps/xfce-system-exit.png
+share/icons/hicolor/16x16/apps/xfce-system-info.png
+share/icons/hicolor/16x16/apps/xfce-system-lock.png
+share/icons/hicolor/16x16/apps/xfce-system-settings.png
+share/icons/hicolor/48x48/apps/xfce4-panel.png
+share/icons/hicolor/48x48/apps/xfce-edit.png
+share/icons/hicolor/48x48/apps/xfce-filemanager.png
+share/icons/hicolor/48x48/apps/xfce-games.png
+share/icons/hicolor/48x48/apps/xfce-graphics.png
+share/icons/hicolor/48x48/apps/xfce-internet.png
+share/icons/hicolor/48x48/apps/xfce-mail.png
+share/icons/hicolor/48x48/apps/xfce-man.png
+share/icons/hicolor/48x48/apps/xfce-multimedia.png
+share/icons/hicolor/48x48/apps/xfce-printer.png
+share/icons/hicolor/48x48/apps/xfce-schedule.png
+share/icons/hicolor/48x48/apps/xfce-sound.png
+share/icons/hicolor/48x48/apps/xfce-terminal.png
+share/icons/hicolor/48x48/apps/xfce-unknown.png
+share/icons/hicolor/48x48/apps/xfce-utils.png
+share/applications/xfce-panel-settings.desktop
 share/locale/ar/LC_MESSAGES/xfce4-panel.mo
 share/locale/az/LC_MESSAGES/xfce4-panel.mo
+share/locale/be/LC_MESSAGES/xfce4-panel.mo
 share/locale/bg/LC_MESSAGES/xfce4-panel.mo
 share/locale/ca/LC_MESSAGES/xfce4-panel.mo
 share/locale/cs/LC_MESSAGES/xfce4-panel.mo
 share/locale/de/LC_MESSAGES/xfce4-panel.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
 share/locale/es/LC_MESSAGES/xfce4-panel.mo
 share/locale/es_MX/LC_MESSAGES/xfce4-panel.mo
 share/locale/et/LC_MESSAGES/xfce4-panel.mo
 share/locale/eu/LC_MESSAGES/xfce4-panel.mo
-share/locale/fa_IR/LC_MESSAGES/xfce4-panel.mo
+share/locale/fa/LC_MESSAGES/xfce4-panel.mo
 share/locale/fi/LC_MESSAGES/xfce4-panel.mo
 share/locale/fr/LC_MESSAGES/xfce4-panel.mo
+share/locale/gu/LC_MESSAGES/xfce4-panel.mo
+share/locale/he/LC_MESSAGES/xfce4-panel.mo
 share/locale/hi/LC_MESSAGES/xfce4-panel.mo
 share/locale/hu/LC_MESSAGES/xfce4-panel.mo
 share/locale/it/LC_MESSAGES/xfce4-panel.mo
@@ -53,19 +81,22 @@ share/locale/ja/LC_MESSAGES/xfce4-panel.mo
 share/locale/ko/LC_MESSAGES/xfce4-panel.mo
 share/locale/lt/LC_MESSAGES/xfce4-panel.mo
 share/locale/ms/LC_MESSAGES/xfce4-panel.mo
+share/locale/nb_NO/LC_MESSAGES/xfce4-panel.mo
 share/locale/nl/LC_MESSAGES/xfce4-panel.mo
-share/locale/no/LC_MESSAGES/xfce4-panel.mo
+share/locale/pa/LC_MESSAGES/xfce4-panel.mo
 share/locale/pl/LC_MESSAGES/xfce4-panel.mo
 share/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo
 share/locale/pt_PT/LC_MESSAGES/xfce4-panel.mo
+share/locale/ro/LC_MESSAGES/xfce4-panel.mo
 share/locale/ru/LC_MESSAGES/xfce4-panel.mo
+share/locale/sk/LC_MESSAGES/xfce4-panel.mo
 share/locale/sv/LC_MESSAGES/xfce4-panel.mo
 share/locale/ta/LC_MESSAGES/xfce4-panel.mo
 share/locale/tr/LC_MESSAGES/xfce4-panel.mo
-share/locale/uk/LC_MESSAGES/xfce4-panel.mo
 share/locale/vi/LC_MESSAGES/xfce4-panel.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
+share/xfce4/doc/C/images/add-item-dialog.png
 share/xfce4/doc/C/images/clock-properties.png
 share/xfce4/doc/C/images/default_panel.png
 share/xfce4/doc/C/images/handle-popup.png
@@ -74,151 +105,10 @@ share/xfce4/doc/C/images/launcher-properties.png
 share/xfce4/doc/C/images/mailcheck-properties.png
 share/xfce4/doc/C/images/menuitem-properties.png
 share/xfce4/doc/C/images/nooptions-properties.png
+share/xfce4/doc/C/images/pager-properties.png
 share/xfce4/doc/C/images/panel-settings.png
 share/xfce4/doc/C/images/systembuttons-properties.png
 share/xfce4/doc/C/xfce4-panel.html
-share/xfce4/doc/fr/images/clock-properties.png
-share/xfce4/doc/fr/images/default_panel.png
-share/xfce4/doc/fr/images/handle-popup.png
-share/xfce4/doc/fr/images/item-popup.png
-share/xfce4/doc/fr/images/launcher-properties.png
-share/xfce4/doc/fr/images/mailcheck-properties.png
-share/xfce4/doc/fr/images/menuitem-properties.png
-share/xfce4/doc/fr/images/nooptions-properties.png
-share/xfce4/doc/fr/images/panel-settings.png
-share/xfce4/doc/fr/images/systembuttons-properties.png
-share/xfce4/doc/fr/xfce4-panel.html
-share/xfce4/themes/Crystal/README
-share/xfce4/themes/Crystal/edit.png
-share/xfce4/themes/Crystal/file1.png
-share/xfce4/themes/Crystal/file2.png
-share/xfce4/themes/Crystal/games.png
-share/xfce4/themes/Crystal/man.png
-share/xfce4/themes/Crystal/miniinfo.png
-share/xfce4/themes/Crystal/minilock.png
-share/xfce4/themes/Crystal/minipalet.png
-share/xfce4/themes/Crystal/minipower.png
-share/xfce4/themes/Crystal/multimedia.png
-share/xfce4/themes/Crystal/network.png
-share/xfce4/themes/Crystal/newmail.png
-share/xfce4/themes/Crystal/nomail.png
-share/xfce4/themes/Crystal/oldmail.png
-share/xfce4/themes/Crystal/paint.png
-share/xfce4/themes/Crystal/print.png
-share/xfce4/themes/Crystal/schedule.png
-share/xfce4/themes/Crystal/sound.png
-share/xfce4/themes/Crystal/terminal.png
-share/xfce4/themes/Crystal/trash_empty.png
-share/xfce4/themes/Crystal/trash_full.png
-share/xfce4/themes/Crystal/unknown.png
-share/xfce4/themes/Curve/README
-share/xfce4/themes/Curve/edit.png
-share/xfce4/themes/Curve/file1.png
-share/xfce4/themes/Curve/file2.png
-share/xfce4/themes/Curve/games.png
-share/xfce4/themes/Curve/man.png
-share/xfce4/themes/Curve/miniinfo.png
-share/xfce4/themes/Curve/minilock.png
-share/xfce4/themes/Curve/minipalet.png
-share/xfce4/themes/Curve/minipower.png
-share/xfce4/themes/Curve/multimedia.png
-share/xfce4/themes/Curve/network.png
-share/xfce4/themes/Curve/newmail.png
-share/xfce4/themes/Curve/nomail.png
-share/xfce4/themes/Curve/oldmail.png
-share/xfce4/themes/Curve/paint.png
-share/xfce4/themes/Curve/print.png
-share/xfce4/themes/Curve/schedule.png
-share/xfce4/themes/Curve/sound.png
-share/xfce4/themes/Curve/terminal.png
-share/xfce4/themes/Curve/trash_empty.png
-share/xfce4/themes/Curve/trash_full.png
-share/xfce4/themes/Curve/unknown.png
-share/xfce4/themes/FreeIcons/README
-share/xfce4/themes/FreeIcons/edit.png
-share/xfce4/themes/FreeIcons/file1.png
-share/xfce4/themes/FreeIcons/file2.png
-share/xfce4/themes/FreeIcons/games.png
-share/xfce4/themes/FreeIcons/man.png
-share/xfce4/themes/FreeIcons/miniinfo.png
-share/xfce4/themes/FreeIcons/minilock.png
-share/xfce4/themes/FreeIcons/minipalet.png
-share/xfce4/themes/FreeIcons/minipower.png
-share/xfce4/themes/FreeIcons/multimedia.png
-share/xfce4/themes/FreeIcons/network.png
-share/xfce4/themes/FreeIcons/newmail.png
-share/xfce4/themes/FreeIcons/nomail.png
-share/xfce4/themes/FreeIcons/oldmail.png
-share/xfce4/themes/FreeIcons/paint.png
-share/xfce4/themes/FreeIcons/print.png
-share/xfce4/themes/FreeIcons/schedule.png
-share/xfce4/themes/FreeIcons/sound.png
-share/xfce4/themes/FreeIcons/terminal.png
-share/xfce4/themes/FreeIcons/unknown.png
-share/xfce4/themes/Gnome/edit.png
-share/xfce4/themes/Gnome/file1.png
-share/xfce4/themes/Gnome/file2.png
-share/xfce4/themes/Gnome/games.png
-share/xfce4/themes/Gnome/man.png
-share/xfce4/themes/Gnome/miniinfo.png
-share/xfce4/themes/Gnome/minilock.png
-share/xfce4/themes/Gnome/minipalet.png
-share/xfce4/themes/Gnome/minipower.png
-share/xfce4/themes/Gnome/multimedia.png
-share/xfce4/themes/Gnome/network.png
-share/xfce4/themes/Gnome/paint.png
-share/xfce4/themes/Gnome/print.png
-share/xfce4/themes/Gnome/schedule.png
-share/xfce4/themes/Gnome/sound.png
-share/xfce4/themes/Gnome/terminal.png
-share/xfce4/themes/Gnome/trash_empty.png
-share/xfce4/themes/Gnome/trash_full.png
-share/xfce4/themes/Gnome/unknown.png
-share/xfce4/themes/Noia/README
-share/xfce4/themes/Noia/edit.png
-share/xfce4/themes/Noia/file1.png
-share/xfce4/themes/Noia/file2.png
-share/xfce4/themes/Noia/games.png
-share/xfce4/themes/Noia/man.png
-share/xfce4/themes/Noia/miniinfo.png
-share/xfce4/themes/Noia/minilock.png
-share/xfce4/themes/Noia/minipalet.png
-share/xfce4/themes/Noia/minipower.png
-share/xfce4/themes/Noia/multimedia.png
-share/xfce4/themes/Noia/network.png
-share/xfce4/themes/Noia/newmail.png
-share/xfce4/themes/Noia/nomail.png
-share/xfce4/themes/Noia/oldmail.png
-share/xfce4/themes/Noia/paint.png
-share/xfce4/themes/Noia/print.png
-share/xfce4/themes/Noia/schedule.png
-share/xfce4/themes/Noia/sound.png
-share/xfce4/themes/Noia/terminal.png
-share/xfce4/themes/Noia/trash_empty.png
-share/xfce4/themes/Noia/trash_full.png
-share/xfce4/themes/Noia/unknown.png
-share/xfce4/themes/XFce/edit.xpm
-share/xfce4/themes/XFce/file1.xpm
-share/xfce4/themes/XFce/file2.xpm
-share/xfce4/themes/XFce/games.xpm
-share/xfce4/themes/XFce/man.xpm
-share/xfce4/themes/XFce/miniinfo.xpm
-share/xfce4/themes/XFce/minilock.xpm
-share/xfce4/themes/XFce/minipalet.xpm
-share/xfce4/themes/XFce/minipower.xpm
-share/xfce4/themes/XFce/multimedia.xpm
-share/xfce4/themes/XFce/network.xpm
-share/xfce4/themes/XFce/newmail.xpm
-share/xfce4/themes/XFce/nomail.xpm
-share/xfce4/themes/XFce/oldmail.xpm
-share/xfce4/themes/XFce/paint.xpm
-share/xfce4/themes/XFce/print.xpm
-share/xfce4/themes/XFce/schedule.xpm
-share/xfce4/themes/XFce/sound.xpm
-share/xfce4/themes/XFce/terminal.xpm
-share/xfce4/themes/XFce/trash_empty.xpm
-share/xfce4/themes/XFce/trash_full.xpm
-share/xfce4/themes/XFce/unknown.xpm
 @unexec rmdir %D/etc/xfce4 2>/dev/null || true
 @dirrm include/xfce4/panel
 @unexec rmdir %D/include/xfce4 2>/dev/null || true
@@ -228,14 +118,5 @@ share/xfce4/themes/XFce/unknown.xpm
 @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C/images 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc/C 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr/images 2>/dev/null || true
-@unexec rmdir %D/share/xfce4/doc/fr 2>/dev/null || true
 @unexec rmdir %D/share/xfce4/doc 2>/dev/null || true
-@dirrm share/xfce4/themes/Crystal
-@dirrm share/xfce4/themes/Curve
-@dirrm share/xfce4/themes/FreeIcons
-@dirrm share/xfce4/themes/Noia
-@dirrm share/xfce4/themes/Gnome
-@dirrm share/xfce4/themes/XFce
-@unexec rmdir %D/share/xfce4/themes 2>/dev/null || true
 @unexec rmdir %D/share/xfce4 2>/dev/null || true