aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/xfce4-mixer/Makefile36
-rw-r--r--audio/xfce4-mixer/distinfo6
-rw-r--r--audio/xfce4-mixer/pkg-descr2
-rw-r--r--audio/xfce4-mixer/pkg-plist54
-rw-r--r--deskutils/xfce4-calendar/Makefile37
-rw-r--r--deskutils/xfce4-calendar/distinfo3
-rw-r--r--deskutils/xfce4-calendar/pkg-descr5
-rw-r--r--deskutils/xfce4-calendar/pkg-plist93
-rw-r--r--deskutils/xfce4-notes-plugin/Makefile25
-rw-r--r--deskutils/xfce4-notes-plugin/distinfo9
-rw-r--r--deskutils/xfce4-notes-plugin/files/patch-configure21
-rw-r--r--deskutils/xfce4-notes-plugin/pkg-descr2
-rw-r--r--deskutils/xfce4-notes-plugin/pkg-plist27
-rw-r--r--deskutils/xfce4-taskbar-plugin/Makefile29
-rw-r--r--deskutils/xfce4-taskbar-plugin/distinfo3
-rw-r--r--deskutils/xfce4-taskbar-plugin/pkg-descr6
-rw-r--r--deskutils/xfce4-taskbar-plugin/pkg-plist4
-rw-r--r--deskutils/xfce4-windowlist-plugin/Makefile31
-rw-r--r--deskutils/xfce4-windowlist-plugin/distinfo3
-rw-r--r--deskutils/xfce4-windowlist-plugin/pkg-descr12
-rw-r--r--deskutils/xfce4-windowlist-plugin/pkg-plist4
-rw-r--r--deskutils/xfce4-xkb-plugin/Makefile24
-rw-r--r--deskutils/xfce4-xkb-plugin/distinfo6
-rw-r--r--deskutils/xfce4-xkb-plugin/files/patch-panel-plugin::xkb.c15
-rw-r--r--deskutils/xfce4-xkb-plugin/pkg-descr2
-rw-r--r--deskutils/xfce4-xkb-plugin/pkg-plist24
-rw-r--r--games/xfce4-toys/Makefile36
-rw-r--r--games/xfce4-toys/distinfo3
-rw-r--r--games/xfce4-toys/pkg-descr4
-rw-r--r--games/xfce4-toys/pkg-plist113
-rw-r--r--misc/xfce4-appfinder/Makefile23
-rw-r--r--misc/xfce4-appfinder/distinfo6
-rw-r--r--misc/xfce4-appfinder/pkg-plist59
-rw-r--r--misc/xfce4-iconbox/Makefile34
-rw-r--r--misc/xfce4-iconbox/distinfo3
-rw-r--r--misc/xfce4-iconbox/pkg-descr4
-rw-r--r--misc/xfce4-iconbox/pkg-plist84
-rw-r--r--misc/xfce4-weather-plugin/Makefile27
-rw-r--r--misc/xfce4-weather-plugin/distinfo9
-rw-r--r--misc/xfce4-weather-plugin/files/patch-http_client.h7
-rw-r--r--misc/xfce4-weather-plugin/pkg-descr2
-rw-r--r--misc/xfce4-weather-plugin/pkg-plist32
-rw-r--r--misc/xfce4-wm-themes/Makefile18
-rw-r--r--misc/xfce4-wm-themes/distinfo6
-rw-r--r--misc/xfce4-wm-themes/pkg-descr2
-rw-r--r--misc/xfce4-wm-themes/pkg-plist814
-rw-r--r--multimedia/xfce4-media/Makefile46
-rw-r--r--multimedia/xfce4-media/files/patch-src_xfmedia-xine.c20
-rw-r--r--multimedia/xfce4-xmms-controller-plugin/Makefile7
-rw-r--r--multimedia/xfce4-xmms-plugin/Makefile45
-rw-r--r--multimedia/xfce4-xmms-plugin/distinfo6
-rw-r--r--multimedia/xfce4-xmms-plugin/pkg-descr2
-rw-r--r--multimedia/xfce4-xmms-plugin/pkg-plist43
-rw-r--r--print/xfce4-print/Makefile36
-rw-r--r--print/xfce4-print/distinfo6
-rw-r--r--print/xfce4-print/pkg-descr2
-rw-r--r--print/xfce4-print/pkg-plist93
-rw-r--r--sysutils/xfce4-battery-plugin/Makefile23
-rw-r--r--sysutils/xfce4-battery-plugin/distinfo6
-rw-r--r--sysutils/xfce4-battery-plugin/files/patch-configure21
-rw-r--r--sysutils/xfce4-battery-plugin/files/patch-panel-plugin::Makefile.in13
-rw-r--r--sysutils/xfce4-battery-plugin/files/patch-panel-plugin::battmon.c18
-rw-r--r--sysutils/xfce4-battery-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-battery-plugin/pkg-plist22
-rw-r--r--sysutils/xfce4-cpugraph-plugin/Makefile29
-rw-r--r--sysutils/xfce4-cpugraph-plugin/distinfo9
-rw-r--r--sysutils/xfce4-cpugraph-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-cpugraph-plugin/pkg-plist10
-rw-r--r--sysutils/xfce4-fsguard-plugin/Makefile24
-rw-r--r--sysutils/xfce4-fsguard-plugin/distinfo9
-rw-r--r--sysutils/xfce4-fsguard-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-fsguard-plugin/pkg-plist17
-rw-r--r--sysutils/xfce4-genmon-plugin/Makefile29
-rw-r--r--sysutils/xfce4-genmon-plugin/distinfo6
-rw-r--r--sysutils/xfce4-genmon-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-genmon-plugin/pkg-plist10
-rw-r--r--sysutils/xfce4-mcs-manager/Makefile29
-rw-r--r--sysutils/xfce4-mcs-manager/distinfo6
-rw-r--r--sysutils/xfce4-mcs-manager/pkg-descr2
-rw-r--r--sysutils/xfce4-mcs-manager/pkg-plist65
-rw-r--r--sysutils/xfce4-mcs-plugins/Makefile32
-rw-r--r--sysutils/xfce4-mcs-plugins/distinfo6
-rw-r--r--sysutils/xfce4-mcs-plugins/pkg-descr2
-rw-r--r--sysutils/xfce4-mcs-plugins/pkg-plist63
-rw-r--r--sysutils/xfce4-minicmd-plugin/Makefile19
-rw-r--r--sysutils/xfce4-minicmd-plugin/distinfo6
-rw-r--r--sysutils/xfce4-minicmd-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-minicmd-plugin/pkg-plist5
-rw-r--r--sysutils/xfce4-netload-plugin/Makefile25
-rw-r--r--sysutils/xfce4-netload-plugin/distinfo6
-rw-r--r--sysutils/xfce4-netload-plugin/files/patch-panel-plugin-Makefile.in6
-rw-r--r--sysutils/xfce4-netload-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-netload-plugin/pkg-plist17
-rw-r--r--sysutils/xfce4-showdesktop-plugin/Makefile30
-rw-r--r--sysutils/xfce4-showdesktop-plugin/distinfo3
-rw-r--r--sysutils/xfce4-showdesktop-plugin/files/patch-configure21
-rw-r--r--sysutils/xfce4-showdesktop-plugin/files/patch-panel-plugin::showdesktop.c17
-rw-r--r--sysutils/xfce4-showdesktop-plugin/pkg-descr4
-rw-r--r--sysutils/xfce4-showdesktop-plugin/pkg-plist5
-rw-r--r--sysutils/xfce4-systemload-plugin/Makefile24
-rw-r--r--sysutils/xfce4-systemload-plugin/distinfo6
-rw-r--r--sysutils/xfce4-systemload-plugin/files/patch-configure11
-rw-r--r--sysutils/xfce4-systemload-plugin/pkg-descr2
-rw-r--r--sysutils/xfce4-systemload-plugin/pkg-plist26
-rw-r--r--sysutils/xfce4-utils/Makefile43
-rw-r--r--sysutils/xfce4-utils/distinfo6
-rw-r--r--sysutils/xfce4-utils/pkg-descr2
-rw-r--r--sysutils/xfce4-utils/pkg-plist148
-rw-r--r--sysutils/xfce4-wavelan-plugin/Makefile8
-rw-r--r--sysutils/xfce4-wavelan-plugin/pkg-descr2
-rw-r--r--x11-clocks/xfce4-datetime-plugin/Makefile30
-rw-r--r--x11-clocks/xfce4-datetime-plugin/distinfo3
-rw-r--r--x11-clocks/xfce4-datetime-plugin/pkg-descr4
-rw-r--r--x11-clocks/xfce4-datetime-plugin/pkg-plist3
-rw-r--r--x11-fm/xfce4-fm/Makefile50
-rw-r--r--x11-fm/xfce4-fm/distinfo3
-rw-r--r--x11-fm/xfce4-fm/files/patch-libs-tubo.c15
-rw-r--r--x11-fm/xfce4-fm/pkg-descr3
-rw-r--r--x11-fm/xfce4-fm/pkg-plist364
-rw-r--r--x11-themes/gtk-xfce-engine/Makefile17
-rw-r--r--x11-themes/gtk-xfce-engine/distinfo6
-rw-r--r--x11-themes/gtk-xfce-engine/pkg-descr4
-rw-r--r--x11-themes/gtk-xfce-engine/pkg-plist15
-rw-r--r--x11-themes/xfce4-icon-theme/Makefile24
-rw-r--r--x11-themes/xfce4-icon-theme/distinfo6
-rw-r--r--x11-themes/xfce4-icon-theme/pkg-descr2
-rw-r--r--x11-themes/xfce4-icon-theme/pkg-plist407
-rw-r--r--x11-toolkits/libxfce4gui/Makefile36
-rw-r--r--x11-toolkits/libxfce4gui/distinfo6
-rw-r--r--x11-toolkits/libxfce4gui/pkg-descr2
-rw-r--r--x11-toolkits/libxfce4gui/pkg-plist48
-rw-r--r--x11-wm/xfce4-desktop/Makefile47
-rw-r--r--x11-wm/xfce4-desktop/distinfo6
-rw-r--r--x11-wm/xfce4-desktop/pkg-descr2
-rw-r--r--x11-wm/xfce4-desktop/pkg-plist86
-rw-r--r--x11-wm/xfce4-panel/Makefile53
-rw-r--r--x11-wm/xfce4-panel/distinfo6
-rw-r--r--x11-wm/xfce4-panel/pkg-descr2
-rw-r--r--x11-wm/xfce4-panel/pkg-plist240
-rw-r--r--x11-wm/xfce4-session/Makefile36
-rw-r--r--x11-wm/xfce4-session/distinfo6
-rw-r--r--x11-wm/xfce4-session/pkg-plist75
-rw-r--r--x11-wm/xfce4-systray/Makefile33
-rw-r--r--x11-wm/xfce4-systray/distinfo3
-rw-r--r--x11-wm/xfce4-systray/pkg-descr3
-rw-r--r--x11-wm/xfce4-systray/pkg-plist5
-rw-r--r--x11-wm/xfce4-wm/Makefile48
-rw-r--r--x11-wm/xfce4-wm/distinfo6
-rw-r--r--x11-wm/xfce4-wm/pkg-descr2
-rw-r--r--x11-wm/xfce4-wm/pkg-plist1418
-rw-r--r--x11-wm/xfce4/Makefile20
-rw-r--r--x11-wm/xfce4/bsd.xfce.mk36
-rw-r--r--x11-wm/xfce4/pkg-descr2
-rw-r--r--x11/Terminal/Makefile46
-rw-r--r--x11/Terminal/distinfo6
-rw-r--r--x11/Terminal/pkg-descr2
-rw-r--r--x11/Terminal/pkg-plist93
-rw-r--r--x11/libexo/Makefile51
-rw-r--r--x11/libexo/distinfo9
-rw-r--r--x11/libexo/pkg-descr2
-rw-r--r--x11/libexo/pkg-plist220
-rw-r--r--x11/libxfce4mcs/Makefile38
-rw-r--r--x11/libxfce4mcs/distinfo6
-rw-r--r--x11/libxfce4mcs/pkg-descr2
-rw-r--r--x11/libxfce4mcs/pkg-plist7
-rw-r--r--x11/libxfce4util/Makefile22
-rw-r--r--x11/libxfce4util/distinfo6
-rw-r--r--x11/libxfce4util/pkg-descr2
-rw-r--r--x11/libxfce4util/pkg-plist34
-rw-r--r--x11/xfce4-clipman-plugin/Makefile26
-rw-r--r--x11/xfce4-clipman-plugin/distinfo6
-rw-r--r--x11/xfce4-clipman-plugin/pkg-descr2
-rw-r--r--x11/xfce4-clipman-plugin/pkg-plist21
-rw-r--r--x11/xfce4-taskmanager/Makefile21
-rw-r--r--x11/xfce4-taskmanager/distinfo6
-rw-r--r--x11/xfce4-taskmanager/files/patch-aclocal.m419
-rw-r--r--x11/xfce4-taskmanager/files/patch-src-functions.c53
-rw-r--r--x11/xfce4-taskmanager/files/patch-src-gui.c32
-rw-r--r--x11/xfce4-taskmanager/pkg-descr5
-rw-r--r--x11/xfce4-taskmanager/pkg-plist13
-rw-r--r--x11/xfce4-trigger-launcher/Makefile32
-rw-r--r--x11/xfce4-trigger-launcher/distinfo3
-rw-r--r--x11/xfce4-trigger-launcher/pkg-descr10
-rw-r--r--x11/xfce4-trigger-launcher/pkg-plist5
184 files changed, 3580 insertions, 3383 deletions
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 09341bbed873..141551678775 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -6,35 +6,23 @@
#
PORTNAME= xfce4-mixer
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= 4.4.0
CATEGORIES= audio xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 volume mixer module for xfce4-panel
-BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
- xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- xml2.5:${PORTSDIR}/textproc/libxml2 \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
- xfce4mcs-client.2:${PORTSDIR}/x11/libxfce4mcs
-RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
- xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GETTEXT= yes
-USE_GNOME= gtk20
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
- CPPFLAGS=-I${LOCALBASE}/include \
- LIBS=-L${LOCALBASE}/lib
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack libxml2 pkgconfig
+USE_XFCE= configenv libgui libmcs libutil mcsmanager panel
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
index a01747951095..ab1534c314dc 100644
--- a/audio/xfce4-mixer/distinfo
+++ b/audio/xfce4-mixer/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-mixer-4.2.3.tar.gz) = b57fd602b3612fb84a92b124f3468511
-SHA256 (xfce4/xfce4-mixer-4.2.3.tar.gz) = 9a3f9145520f9650b11f7ee4155d80976295baf0b6ed87be8a8466debed7e4e9
-SIZE (xfce4/xfce4-mixer-4.2.3.tar.gz) = 614377
+MD5 (xfce4/xfce4-mixer-4.4.0.tar.bz2) = 195e52cfe7913ca0b97d20a7ca26bde7
+SHA256 (xfce4/xfce4-mixer-4.4.0.tar.bz2) = 8ea1382470fa9375496799941e4def4c27a7d7d8c5cf4e9a5e13883e5ec1739d
+SIZE (xfce4/xfce4-mixer-4.4.0.tar.bz2) = 467548
diff --git a/audio/xfce4-mixer/pkg-descr b/audio/xfce4-mixer/pkg-descr
index 0fc68b76df48..a85005aa1cac 100644
--- a/audio/xfce4-mixer/pkg-descr
+++ b/audio/xfce4-mixer/pkg-descr
@@ -1,3 +1,3 @@
XFce 4 volume control mixer module for xfce4-panel.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/audio/xfce4-mixer/pkg-plist b/audio/xfce4-mixer/pkg-plist
index b68db9eadb9a..546f933d4a0e 100644
--- a/audio/xfce4-mixer/pkg-plist
+++ b/audio/xfce4-mixer/pkg-plist
@@ -4,11 +4,9 @@ lib/xfce4/modules/libxfce4mixer.so
lib/xfce4/modules/libxfce4mixer.so.0
lib/xfce4/mcs-plugins/sound_settings.la
lib/xfce4/mcs-plugins/sound_settings.so
-lib/xfce4/panel-plugins/libmixer.la
-lib/xfce4/panel-plugins/libmixer.so
+libexec/xfce4/panel-plugins/xfce4-mixer-plugin
share/applications/xfce-mixer-settings.desktop
share/icons/hicolor/48x48/apps/xfce4-mixer.png
-share/locale/af/LC_MESSAGES/xfce4-mixer.mo
share/locale/ar/LC_MESSAGES/xfce4-mixer.mo
share/locale/az/LC_MESSAGES/xfce4-mixer.mo
share/locale/be/LC_MESSAGES/xfce4-mixer.mo
@@ -16,8 +14,8 @@ share/locale/bg/LC_MESSAGES/xfce4-mixer.mo
share/locale/bn_IN/LC_MESSAGES/xfce4-mixer.mo
share/locale/ca/LC_MESSAGES/xfce4-mixer.mo
share/locale/cs/LC_MESSAGES/xfce4-mixer.mo
-share/locale/da/LC_MESSAGES/xfce4-mixer.mo
share/locale/de/LC_MESSAGES/xfce4-mixer.mo
+share/locale/dz/LC_MESSAGES/xfce4-mixer.mo
share/locale/el/LC_MESSAGES/xfce4-mixer.mo
share/locale/en_GB/LC_MESSAGES/xfce4-mixer.mo
share/locale/es/LC_MESSAGES/xfce4-mixer.mo
@@ -27,6 +25,7 @@ share/locale/eu/LC_MESSAGES/xfce4-mixer.mo
share/locale/fa/LC_MESSAGES/xfce4-mixer.mo
share/locale/fi/LC_MESSAGES/xfce4-mixer.mo
share/locale/fr/LC_MESSAGES/xfce4-mixer.mo
+share/locale/gl/LC_MESSAGES/xfce4-mixer.mo
share/locale/gu/LC_MESSAGES/xfce4-mixer.mo
share/locale/he/LC_MESSAGES/xfce4-mixer.mo
share/locale/hi/LC_MESSAGES/xfce4-mixer.mo
@@ -34,9 +33,10 @@ share/locale/hu/LC_MESSAGES/xfce4-mixer.mo
share/locale/hy/LC_MESSAGES/xfce4-mixer.mo
share/locale/it/LC_MESSAGES/xfce4-mixer.mo
share/locale/ja/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ka/LC_MESSAGES/xfce4-mixer.mo
share/locale/ko/LC_MESSAGES/xfce4-mixer.mo
-share/locale/ku/LC_MESSAGES/xfce4-mixer.mo
share/locale/lt/LC_MESSAGES/xfce4-mixer.mo
+share/locale/mk/LC_MESSAGES/xfce4-mixer.mo
share/locale/mr/LC_MESSAGES/xfce4-mixer.mo
share/locale/ms/LC_MESSAGES/xfce4-mixer.mo
share/locale/nb_NO/LC_MESSAGES/xfce4-mixer.mo
@@ -48,7 +48,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce4-mixer.mo
share/locale/ro/LC_MESSAGES/xfce4-mixer.mo
share/locale/ru/LC_MESSAGES/xfce4-mixer.mo
share/locale/sk/LC_MESSAGES/xfce4-mixer.mo
-share/locale/sl/LC_MESSAGES/xfce4-mixer.mo
share/locale/sv/LC_MESSAGES/xfce4-mixer.mo
share/locale/ta/LC_MESSAGES/xfce4-mixer.mo
share/locale/tr/LC_MESSAGES/xfce4-mixer.mo
@@ -56,43 +55,18 @@ share/locale/uk/LC_MESSAGES/xfce4-mixer.mo
share/locale/vi/LC_MESSAGES/xfce4-mixer.mo
share/locale/zh_CN/LC_MESSAGES/xfce4-mixer.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
+share/xfce4/panel-plugins/xfce4-mixer.desktop
@dirrmtry lib/xfce4/modules
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4/panel-plugins
@dirrmtry lib/xfce4
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
diff --git a/deskutils/xfce4-calendar/Makefile b/deskutils/xfce4-calendar/Makefile
deleted file mode 100644
index fb10a498bdad..000000000000
--- a/deskutils/xfce4-calendar/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for: xfce4-calendar
-# Date created: 2003-01-14
-# Whom: Matt Lancereau <matt@rimasec.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME= xfce4-calendar
-PORTVERSION= 4.2.3
-PORTREVISION= 4
-CATEGORIES= deskutils xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
-DISTNAME= xfcalendar-${PORTVERSION}
-DIST_SUBDIR= xfce4
-
-MAINTAINER= oliver@FreeBSD.org
-COMMENT= A calendar application to manage your time with XFce 4
-
-BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- dbh-4.5.4:${PORTSDIR}/databases/dbh
-
-USE_GNOME= gtk20 libxml2
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
- CPPFLAGS=-I${LOCALBASE}/include \
- LIBS=-L${LOCALBASE}/lib
-
-post-patch:
- @${REINPLACE_CMD} 's|dbh-1\.0|dbh|g' ${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/deskutils/xfce4-calendar/distinfo b/deskutils/xfce4-calendar/distinfo
deleted file mode 100644
index 7c7169369c4a..000000000000
--- a/deskutils/xfce4-calendar/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xfcalendar-4.2.3.tar.gz) = d2e2c8e010cca708295aeaf621086205
-SHA256 (xfce4/xfcalendar-4.2.3.tar.gz) = ad8d141d23f48736180d3913a0600d1733d71a341fd1889e69f727a998cfa0a3
-SIZE (xfce4/xfcalendar-4.2.3.tar.gz) = 470490
diff --git a/deskutils/xfce4-calendar/pkg-descr b/deskutils/xfce4-calendar/pkg-descr
deleted file mode 100644
index 100f04679439..000000000000
--- a/deskutils/xfce4-calendar/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-A calendar application to manage your time with XFce 4.
-
-Author: Mickael Graf <korbinus@linux.se>
-
-WWW: http://www.xfce.org/
diff --git a/deskutils/xfce4-calendar/pkg-plist b/deskutils/xfce4-calendar/pkg-plist
deleted file mode 100644
index c82b525d489b..000000000000
--- a/deskutils/xfce4-calendar/pkg-plist
+++ /dev/null
@@ -1,93 +0,0 @@
-bin/xfcalendar
-lib/xfce4/mcs-plugins/xfcalendar_plugin.a
-lib/xfce4/mcs-plugins/xfcalendar_plugin.la
-lib/xfce4/mcs-plugins/xfcalendar_plugin.so
-share/applications/xfcalendar.desktop
-share/applications/xfce-xfcalendar-settings.desktop
-share/icons/hicolor/48x48/apps/xfcalendar.png
-share/icons/hicolor/scalable/apps/xfcalendar.svg
-share/locale/af/LC_MESSAGES/xfcalendar.mo
-share/locale/ar/LC_MESSAGES/xfcalendar.mo
-share/locale/az/LC_MESSAGES/xfcalendar.mo
-share/locale/be/LC_MESSAGES/xfcalendar.mo
-share/locale/bg/LC_MESSAGES/xfcalendar.mo
-share/locale/bn_IN/LC_MESSAGES/xfcalendar.mo
-share/locale/ca/LC_MESSAGES/xfcalendar.mo
-share/locale/cs/LC_MESSAGES/xfcalendar.mo
-share/locale/da/LC_MESSAGES/xfcalendar.mo
-share/locale/de/LC_MESSAGES/xfcalendar.mo
-share/locale/el/LC_MESSAGES/xfcalendar.mo
-share/locale/en_GB/LC_MESSAGES/xfcalendar.mo
-share/locale/eo/LC_MESSAGES/xfcalendar.mo
-share/locale/es/LC_MESSAGES/xfcalendar.mo
-share/locale/et/LC_MESSAGES/xfcalendar.mo
-share/locale/eu/LC_MESSAGES/xfcalendar.mo
-share/locale/fa/LC_MESSAGES/xfcalendar.mo
-share/locale/fi/LC_MESSAGES/xfcalendar.mo
-share/locale/fr/LC_MESSAGES/xfcalendar.mo
-share/locale/gu/LC_MESSAGES/xfcalendar.mo
-share/locale/he/LC_MESSAGES/xfcalendar.mo
-share/locale/hi/LC_MESSAGES/xfcalendar.mo
-share/locale/hu/LC_MESSAGES/xfcalendar.mo
-share/locale/hy/LC_MESSAGES/xfcalendar.mo
-share/locale/it/LC_MESSAGES/xfcalendar.mo
-share/locale/ja/LC_MESSAGES/xfcalendar.mo
-share/locale/ko/LC_MESSAGES/xfcalendar.mo
-share/locale/ku/LC_MESSAGES/xfcalendar.mo
-share/locale/lt/LC_MESSAGES/xfcalendar.mo
-share/locale/mr/LC_MESSAGES/xfcalendar.mo
-share/locale/ms/LC_MESSAGES/xfcalendar.mo
-share/locale/nl/LC_MESSAGES/xfcalendar.mo
-share/locale/nb_NO/LC_MESSAGES/xfcalendar.mo
-share/locale/pa/LC_MESSAGES/xfcalendar.mo
-share/locale/pl/LC_MESSAGES/xfcalendar.mo
-share/locale/pt_BR/LC_MESSAGES/xfcalendar.mo
-share/locale/pt_PT/LC_MESSAGES/xfcalendar.mo
-share/locale/ro/LC_MESSAGES/xfcalendar.mo
-share/locale/ru/LC_MESSAGES/xfcalendar.mo
-share/locale/sk/LC_MESSAGES/xfcalendar.mo
-share/locale/sl/LC_MESSAGES/xfcalendar.mo
-share/locale/sv/LC_MESSAGES/xfcalendar.mo
-share/locale/ta/LC_MESSAGES/xfcalendar.mo
-share/locale/tr/LC_MESSAGES/xfcalendar.mo
-share/locale/uk/LC_MESSAGES/xfcalendar.mo
-share/locale/vi/LC_MESSAGES/xfcalendar.mo
-share/locale/zh_CN/LC_MESSAGES/xfcalendar.mo
-share/locale/zh_TW/LC_MESSAGES/xfcalendar.mo
-@dirrmtry lib/xfce4/mcs-plugins
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 1be7b2a693a0..592379d2ff0d 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -6,23 +6,24 @@
#
PORTNAME= xfce4-notes-plugin
-PORTVERSION= 0.9.7
-PORTREVISION= 8
+PORTVERSION= 1.4.1
CATEGORIES= deskutils xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
+PATCH_SITES= http://people.freebsd.org/~oliver/xfce/
+PATCHFILES= gcc295-xfce4-notes-plugin.patch
MAINTAINER= thorsten.greiner@web.de
COMMENT= Sticky notes panel plugin for XFce4
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME= gtk20 libxml2
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv libgui libutil panel
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/deskutils/xfce4-notes-plugin/distinfo b/deskutils/xfce4-notes-plugin/distinfo
index 4c2d1ed78aeb..f406e7e92925 100644
--- a/deskutils/xfce4-notes-plugin/distinfo
+++ b/deskutils/xfce4-notes-plugin/distinfo
@@ -1,3 +1,6 @@
-MD5 (xfce4/xfce4-notes-plugin-0.9.7.tar.gz) = d043d4f5b00b4a7f3d5107b65d81de8e
-SHA256 (xfce4/xfce4-notes-plugin-0.9.7.tar.gz) = c86290c6058ce22e56794028ca2b9b3e03063073f4b39a85c967a0d20e236e8f
-SIZE (xfce4/xfce4-notes-plugin-0.9.7.tar.gz) = 326290
+MD5 (xfce4/xfce4-notes-plugin-1.4.1.tar.bz2) = 6f20d84bf3aadd6c974f226c04f33050
+SHA256 (xfce4/xfce4-notes-plugin-1.4.1.tar.bz2) = 7683bb239fea66cd03895504d9311608b00a3e024a568465e84fe52adb35860e
+SIZE (xfce4/xfce4-notes-plugin-1.4.1.tar.bz2) = 157811
+MD5 (xfce4/gcc295-xfce4-notes-plugin.patch) = 415d28a7a121d8df6dcf18a9ce35343d
+SHA256 (xfce4/gcc295-xfce4-notes-plugin.patch) = a0c213dd93f493fd68a85116cff76aa039f7631c1f14e36305679d82e7b3ba7b
+SIZE (xfce4/gcc295-xfce4-notes-plugin.patch) = 1188
diff --git a/deskutils/xfce4-notes-plugin/files/patch-configure b/deskutils/xfce4-notes-plugin/files/patch-configure
deleted file mode 100644
index 53b00d19c534..000000000000
--- a/deskutils/xfce4-notes-plugin/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig Sun Oct 5 02:45:14 2003
-+++ configure Mon Oct 6 20:22:50 2003
-@@ -19530,7 +19530,8 @@
-
-
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool13/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -19824,7 +19825,7 @@
-
- echo "$as_me:$LINENO: checking where to install panel plugins" >&5
- echo $ECHO_N "checking where to install panel plugins... $ECHO_C" >&6
-- XFCE4_PANEL_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir xfce4-panel-1.0`
-+ XFCE4_PANEL_PLUGINSDIR=${prefix}/lib/xfce4/panel-plugins
-
- echo "$as_me:$LINENO: result: $XFCE4_PANEL_PLUGINSDIR" >&5
- echo "${ECHO_T}$XFCE4_PANEL_PLUGINSDIR" >&6
diff --git a/deskutils/xfce4-notes-plugin/pkg-descr b/deskutils/xfce4-notes-plugin/pkg-descr
index b81ce3efe202..a83a3c336c62 100644
--- a/deskutils/xfce4-notes-plugin/pkg-descr
+++ b/deskutils/xfce4-notes-plugin/pkg-descr
@@ -1,3 +1,3 @@
A sticky notes panel plugin for XFce4.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/deskutils/xfce4-notes-plugin/pkg-plist b/deskutils/xfce4-notes-plugin/pkg-plist
index 88a5c98e1089..1f405ebcc41a 100644
--- a/deskutils/xfce4-notes-plugin/pkg-plist
+++ b/deskutils/xfce4-notes-plugin/pkg-plist
@@ -1,8 +1,21 @@
-lib/xfce4/panel-plugins/libnotes.a
-lib/xfce4/panel-plugins/libnotes.la
-lib/xfce4/panel-plugins/libnotes.so
-share/xfce4/notes/note.png
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4
-@dirrmtry share/xfce4/notes
+bin/xfce4-popup-notes
+libexec/xfce4/panel-plugins/xfce4-notes-plugin
+share/icons/hicolor/16x16/apps/xfce4-notes-plugin.png
+share/icons/hicolor/22x22/apps/xfce4-notes-plugin.png
+share/icons/hicolor/24x24/apps/xfce4-notes-plugin.png
+share/icons/hicolor/32x32/apps/xfce4-notes-plugin.png
+share/icons/hicolor/scalable/apps/xfce4-notes-plugin.svg
+share/locale/ca/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-notes-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-notes-plugin.mo
+share/xfce4/panel-plugins/xfce4-notes-plugin.desktop
+@dirrmtry share/xfce4/panel-plugins
@dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
diff --git a/deskutils/xfce4-taskbar-plugin/Makefile b/deskutils/xfce4-taskbar-plugin/Makefile
deleted file mode 100644
index 6bb37b59d619..000000000000
--- a/deskutils/xfce4-taskbar-plugin/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for: xfce4-taskbar-plugin
-# Date created: 2003-04-26
-# Whom: Matt Lancereau <matt@rimasec.net>
-#
-# $FreeBSD$
-# $MCom: ports/deskutils/xfce4-taskbar-plugin/Makefile,v 1.1 2006/10/02 20:05:39 ahze Exp $
-
-PORTNAME= xfce4-taskbar-plugin
-PORTVERSION= 0.2.2
-PORTREVISION= 4
-CATEGORIES= deskutils xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
-DISTNAME= xfce4-taskbar-plugin-${PORTVERSION}
-DIST_SUBDIR= xfce4
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= A taskbar plugin for xfce4-panel
-
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME= gtk20 libxml2
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-
-.include <bsd.port.mk>
diff --git a/deskutils/xfce4-taskbar-plugin/distinfo b/deskutils/xfce4-taskbar-plugin/distinfo
deleted file mode 100644
index d7f7edc5b3e7..000000000000
--- a/deskutils/xfce4-taskbar-plugin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xfce4-taskbar-plugin-0.2.2.tar.gz) = 06ad356d728cadd8e78a12ec86235593
-SHA256 (xfce4/xfce4-taskbar-plugin-0.2.2.tar.gz) = 5fadc8f7d07a5520e6cfb8b1a423374455d6d5a9db2e01f7784344bee2e0abad
-SIZE (xfce4/xfce4-taskbar-plugin-0.2.2.tar.gz) = 304546
diff --git a/deskutils/xfce4-taskbar-plugin/pkg-descr b/deskutils/xfce4-taskbar-plugin/pkg-descr
deleted file mode 100644
index 7958d26ff545..000000000000
--- a/deskutils/xfce4-taskbar-plugin/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-xfce4-taskbar-plugin is a taskbar plugin for the xfce4-panel.
-The size of the taskbar can be changed via the properties dialog.
-
-Author: Andre Lerche <a.lerche@gmx.net>
-
-WWW: http://xfce-goodies.berlios.de/
diff --git a/deskutils/xfce4-taskbar-plugin/pkg-plist b/deskutils/xfce4-taskbar-plugin/pkg-plist
deleted file mode 100644
index 51a4e477d1bf..000000000000
--- a/deskutils/xfce4-taskbar-plugin/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/xfce4/panel-plugins/libtaskbar.a
-lib/xfce4/panel-plugins/libtaskbar.la
-lib/xfce4/panel-plugins/libtaskbar.so
-@dirrmtry lib/xfce4/panel-plugins
diff --git a/deskutils/xfce4-windowlist-plugin/Makefile b/deskutils/xfce4-windowlist-plugin/Makefile
deleted file mode 100644
index a254b553c19c..000000000000
--- a/deskutils/xfce4-windowlist-plugin/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for: xfce4-windowlist-plugin
-# Date created: 2003-04-26
-# Whom: Matt Lancereau <matt@rimasec.net>
-#
-# $FreeBSD$
-# $MCom: ports/deskutils/xfce4-windowlist-plugin/Makefile,v 1.1 2006/10/02 20:06:45 ahze Exp $
-
-PORTNAME= xfce4-windowlist-plugin
-PORTVERSION= 0.1.0
-PORTREVISION= 5
-CATEGORIES= deskutils xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
-DISTNAME= xfce4-windowlist-plugin-${PORTVERSION}
-DIST_SUBDIR= xfce4
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= A windowlist plugin for xfce4-panel
-
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME= gtk20 libxml2
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-
-.include <bsd.port.mk>
diff --git a/deskutils/xfce4-windowlist-plugin/distinfo b/deskutils/xfce4-windowlist-plugin/distinfo
deleted file mode 100644
index 43d789bbfbd8..000000000000
--- a/deskutils/xfce4-windowlist-plugin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xfce4-windowlist-plugin-0.1.0.tar.gz) = 29b1a752003734c0b8171200dfafb733
-SHA256 (xfce4/xfce4-windowlist-plugin-0.1.0.tar.gz) = da4f7c412528aff2e7d0edc63cb347ee6651134feb1192431f9955c6f11276e3
-SIZE (xfce4/xfce4-windowlist-plugin-0.1.0.tar.gz) = 301770
diff --git a/deskutils/xfce4-windowlist-plugin/pkg-descr b/deskutils/xfce4-windowlist-plugin/pkg-descr
deleted file mode 100644
index afbb48e1b9e4..000000000000
--- a/deskutils/xfce4-windowlist-plugin/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-xfce4-windowlist-plugin is a windowlist plugin for the xfce4-panel.
-
-The menubutton shows the icon of the active window.
-
-Leftclick on the menubutton pops up a configurable window
-list (windows on the current workspace or all windows).
-Leftclick on the window list activates the selected window,
-rightclick pops up a window action menu.
-
-Author: Andre Lerche <a.lerche@gmx.net>
-
-WWW: http://xfce-goodies.berlios.de/
diff --git a/deskutils/xfce4-windowlist-plugin/pkg-plist b/deskutils/xfce4-windowlist-plugin/pkg-plist
deleted file mode 100644
index a690b4f8129a..000000000000
--- a/deskutils/xfce4-windowlist-plugin/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/xfce4/panel-plugins/libwindowlist.so
-lib/xfce4/panel-plugins/libwindowlist.la
-lib/xfce4/panel-plugins/libwindowlist.a
-@dirrmtry lib/xfce4/panel-plugins
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 8b289e58a8b0..baf3557ca751 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -6,28 +6,22 @@
#
PORTNAME= xfce4-xkb-plugin
-PORTVERSION= 0.3.5
+PORTVERSION= 0.4.3
CATEGORIES= deskutils xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
MAINTAINER= des@FreeBSD.org
COMMENT= Keyboard layout switching plugin for XFce4
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME= gtk20 libxml2
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv panel
+USE_XLIB= yes
.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN= does not compile
-.endif
-
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
.include <bsd.port.post.mk>
diff --git a/deskutils/xfce4-xkb-plugin/distinfo b/deskutils/xfce4-xkb-plugin/distinfo
index 073afdc3ea2f..33e2d8120bed 100644
--- a/deskutils/xfce4-xkb-plugin/distinfo
+++ b/deskutils/xfce4-xkb-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-xkb-plugin-0.3.5.tar.gz) = 0c92dd17579e102b40289c4bc83c5505
-SHA256 (xfce4/xfce4-xkb-plugin-0.3.5.tar.gz) = 769d4b337200b2dead8fc23d4fb394bacde551cb07a504acc68e160891cd8c18
-SIZE (xfce4/xfce4-xkb-plugin-0.3.5.tar.gz) = 353851
+MD5 (xfce4/xfce4-xkb-plugin-0.4.3.tar.bz2) = e0375158339672f49c9e48a8b4669592
+SHA256 (xfce4/xfce4-xkb-plugin-0.4.3.tar.bz2) = e72983cf53450caa0a755838b61e867b599f2302d08d3ad28662ed6391152f7e
+SIZE (xfce4/xfce4-xkb-plugin-0.4.3.tar.bz2) = 231843
diff --git a/deskutils/xfce4-xkb-plugin/files/patch-panel-plugin::xkb.c b/deskutils/xfce4-xkb-plugin/files/patch-panel-plugin::xkb.c
deleted file mode 100644
index 7d72d7b174c1..000000000000
--- a/deskutils/xfce4-xkb-plugin/files/patch-panel-plugin::xkb.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- panel-plugin/xkb.c.orig Wed Jun 30 11:46:49 2004
-+++ panel-plugin/xkb.c Sun Feb 6 12:51:04 2005
-@@ -264,12 +264,12 @@
- char *group;
-
- group = strdup(get_symbol_name_by_res_no(current_group_xkb_no));
-+ to_lower(group);
- strcpy(filename, FLAGSDIR);
- strcat(filename, "/");
- strcat(filename, group);
- strcat(filename, ".png");
-- to_lower(filename);
-
- free(group);
-
diff --git a/deskutils/xfce4-xkb-plugin/pkg-descr b/deskutils/xfce4-xkb-plugin/pkg-descr
index 9b7a77210aad..a879e01abe9d 100644
--- a/deskutils/xfce4-xkb-plugin/pkg-descr
+++ b/deskutils/xfce4-xkb-plugin/pkg-descr
@@ -9,4 +9,4 @@ This plugin is used along with the XKB extension. For now the keyboard
layouts cannot be configured from the plugin itself, they should be
set in the XF86Config file or some other way (e.g. setxkbmap).
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
diff --git a/deskutils/xfce4-xkb-plugin/pkg-plist b/deskutils/xfce4-xkb-plugin/pkg-plist
index cecce9621b1c..3433f87c2ddd 100644
--- a/deskutils/xfce4-xkb-plugin/pkg-plist
+++ b/deskutils/xfce4-xkb-plugin/pkg-plist
@@ -1,6 +1,18 @@
-lib/xfce4/panel-plugins/libxkb.a
-lib/xfce4/panel-plugins/libxkb.la
-lib/xfce4/panel-plugins/libxkb.so
+libexec/xfce4/panel-plugins/xfce4-xkb-plugin
+share/locale/bg/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ru/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ca/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/el/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/ja/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-xkb-plugin.mo
+share/xfce4/panel-plugins/xkb-plugin.desktop
share/xfce4/xkb/flags/ae.png
share/xfce4/xkb/flags/am.png
share/xfce4/xkb/flags/ar.png
@@ -21,12 +33,12 @@ share/xfce4/xkb/flags/dk.png
share/xfce4/xkb/flags/dz.png
share/xfce4/xkb/flags/ee.png
share/xfce4/xkb/flags/eg.png
-share/xfce4/xkb/flags/el.png
share/xfce4/xkb/flags/es.png
share/xfce4/xkb/flags/eu.png
share/xfce4/xkb/flags/fi.png
share/xfce4/xkb/flags/fr.png
share/xfce4/xkb/flags/ge.png
+share/xfce4/xkb/flags/gr.png
share/xfce4/xkb/flags/hr.png
share/xfce4/xkb/flags/hu.png
share/xfce4/xkb/flags/il.png
@@ -75,6 +87,10 @@ share/xfce4/xkb/flags/uy.png
share/xfce4/xkb/flags/vn.png
share/xfce4/xkb/flags/ye.png
share/xfce4/xkb/flags/yu.png
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
@dirrm share/xfce4/xkb/flags
@dirrm share/xfce4/xkb
@dirrmtry share/xfce4
diff --git a/games/xfce4-toys/Makefile b/games/xfce4-toys/Makefile
deleted file mode 100644
index 82c6e0758c79..000000000000
--- a/games/xfce4-toys/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# New ports collection makefile for: xfce4-toys
-# Date created: 7 July 2003
-# Whom: James Earl <jdearl@telus.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME= xfce4-toys
-PORTVERSION= 4.2.3
-PORTREVISION= 2
-CATEGORIES= games xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
-DIST_SUBDIR= xfce4
-
-MAINTAINER= oliver@FreeBSD.org
-COMMENT= Toys for the XFce 4 panel
-
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- xml2.5:${PORTSDIR}/textproc/libxml2 \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GETTEXT= yes
-USE_GNOME= gtk20
-GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
- CPPFLAGS=-I${LOCALBASE}/include \
- LIBS=-L${LOCALBASE}/lib
-
-.include <bsd.port.mk>
diff --git a/games/xfce4-toys/distinfo b/games/xfce4-toys/distinfo
deleted file mode 100644
index 354728828b20..000000000000
--- a/games/xfce4-toys/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xfce4-toys-4.2.3.tar.gz) = 1f3a42deff65dda6a9ad656e1ed4249b
-SHA256 (xfce4/xfce4-toys-4.2.3.tar.gz) = 0bf83d45546902dcd421bf865da177b1bbd00a48d892b5467419c27820ec1bad
-SIZE (xfce4/xfce4-toys-4.2.3.tar.gz) = 431027
diff --git a/games/xfce4-toys/pkg-descr b/games/xfce4-toys/pkg-descr
deleted file mode 100644
index 47e2f20f2aa7..000000000000
--- a/games/xfce4-toys/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Toys for the XFce 4 panel. Less serious utilities and additions for the
-panel. Currently includes a tips dialog, and an xeyes implementation.
-
-WWW: http://www.xfce.org
diff --git a/games/xfce4-toys/pkg-plist b/games/xfce4-toys/pkg-plist
deleted file mode 100644
index cf5e3fed9a4a..000000000000
--- a/games/xfce4-toys/pkg-plist
+++ /dev/null
@@ -1,113 +0,0 @@
-bin/xfce4-tips
-lib/xfce4/panel-plugins/libeyes.a
-lib/xfce4/panel-plugins/libeyes.la
-lib/xfce4/panel-plugins/libeyes.so
-share/locale/af/LC_MESSAGES/xfce4-toys.mo
-share/locale/ar/LC_MESSAGES/xfce4-toys.mo
-share/locale/az/LC_MESSAGES/xfce4-toys.mo
-share/locale/be/LC_MESSAGES/xfce4-toys.mo
-share/locale/bg/LC_MESSAGES/xfce4-toys.mo
-share/locale/bn_IN/LC_MESSAGES/xfce4-toys.mo
-share/locale/ca/LC_MESSAGES/xfce4-toys.mo
-share/locale/cs/LC_MESSAGES/xfce4-toys.mo
-share/locale/da/LC_MESSAGES/xfce4-toys.mo
-share/locale/de/LC_MESSAGES/xfce4-toys.mo
-share/locale/el/LC_MESSAGES/xfce4-toys.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-toys.mo
-share/locale/eo/LC_MESSAGES/xfce4-toys.mo
-share/locale/es/LC_MESSAGES/xfce4-toys.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-toys.mo
-share/locale/et/LC_MESSAGES/xfce4-toys.mo
-share/locale/eu/LC_MESSAGES/xfce4-toys.mo
-share/locale/fa/LC_MESSAGES/xfce4-toys.mo
-share/locale/fi/LC_MESSAGES/xfce4-toys.mo
-share/locale/fr/LC_MESSAGES/xfce4-toys.mo
-share/locale/gu/LC_MESSAGES/xfce4-toys.mo
-share/locale/he/LC_MESSAGES/xfce4-toys.mo
-share/locale/hi/LC_MESSAGES/xfce4-toys.mo
-share/locale/hu/LC_MESSAGES/xfce4-toys.mo
-share/locale/it/LC_MESSAGES/xfce4-toys.mo
-share/locale/ja/LC_MESSAGES/xfce4-toys.mo
-share/locale/ko/LC_MESSAGES/xfce4-toys.mo
-share/locale/ku/LC_MESSAGES/xfce4-toys.mo
-share/locale/lt/LC_MESSAGES/xfce4-toys.mo
-share/locale/mr/LC_MESSAGES/xfce4-toys.mo
-share/locale/ms/LC_MESSAGES/xfce4-toys.mo
-share/locale/nb_NO/LC_MESSAGES/xfce4-toys.mo
-share/locale/nl/LC_MESSAGES/xfce4-toys.mo
-share/locale/pa/LC_MESSAGES/xfce4-toys.mo
-share/locale/pl/LC_MESSAGES/xfce4-toys.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-toys.mo
-share/locale/pt_PT/LC_MESSAGES/xfce4-toys.mo
-share/locale/ro/LC_MESSAGES/xfce4-toys.mo
-share/locale/ru/LC_MESSAGES/xfce4-toys.mo
-share/locale/sk/LC_MESSAGES/xfce4-toys.mo
-share/locale/sl/LC_MESSAGES/xfce4-toys.mo
-share/locale/sv/LC_MESSAGES/xfce4-toys.mo
-share/locale/ta/LC_MESSAGES/xfce4-toys.mo
-share/locale/tr/LC_MESSAGES/xfce4-toys.mo
-share/locale/uk/LC_MESSAGES/xfce4-toys.mo
-share/locale/vi/LC_MESSAGES/xfce4-toys.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-toys.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-toys.mo
-share/xfce4/eyes/themes/Bizarre/Bizarre-eye.png
-share/xfce4/eyes/themes/Bizarre/Bizarre-pupil.png
-share/xfce4/eyes/themes/Bizarre/config
-share/xfce4/eyes/themes/Bloodshot/Bloodshot-eye.png
-share/xfce4/eyes/themes/Bloodshot/Bloodshot-pupil.png
-share/xfce4/eyes/themes/Bloodshot/config
-share/xfce4/eyes/themes/Default/Default-eye.png
-share/xfce4/eyes/themes/Default/Default-pupil.png
-share/xfce4/eyes/themes/Default/config
-share/xfce4/eyes/themes/Default-tiny/Default-tiny-eye.png
-share/xfce4/eyes/themes/Default-tiny/Default-tiny-pupil.png
-share/xfce4/eyes/themes/Default-tiny/config
-share/xfce4/eyes/themes/Horrid/Horrid-eye.png
-share/xfce4/eyes/themes/Horrid/Horrid-pupil.png
-share/xfce4/eyes/themes/Horrid/config
-share/xfce4/tips/tips
-share/xfce4/tips/tips.dat
-@dirrm share/xfce4/eyes/themes/Bizarre
-@dirrm share/xfce4/eyes/themes/Bloodshot
-@dirrm share/xfce4/eyes/themes/Default
-@dirrm share/xfce4/eyes/themes/Default-tiny
-@dirrm share/xfce4/eyes/themes/Horrid
-@dirrm share/xfce4/eyes/themes
-@dirrm share/xfce4/eyes
-@dirrm share/xfce4/tips
-@dirrmtry share/xfce4
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index d4164a1d5740..3d01dfeb28b0 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -6,22 +6,23 @@
#
PORTNAME= xfce4-appfinder
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= 4.4.0
CATEGORIES= misc xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= Find application in the system supporting Desktop entry format
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv libgui
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/misc/xfce4-appfinder/distinfo b/misc/xfce4-appfinder/distinfo
index 313e892e5488..6268d044c674 100644
--- a/misc/xfce4-appfinder/distinfo
+++ b/misc/xfce4-appfinder/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-appfinder-4.2.3.tar.gz) = fa6b9dd74114cb28c7352dd0e4592ce2
-SHA256 (xfce4/xfce4-appfinder-4.2.3.tar.gz) = 2eece086758c463cd91a3145dcc414687c913d0e3473d10dbd996129dd4a3875
-SIZE (xfce4/xfce4-appfinder-4.2.3.tar.gz) = 691872
+MD5 (xfce4/xfce4-appfinder-4.4.0.tar.bz2) = 43538217a5502425d738ea8419521b9a
+SHA256 (xfce4/xfce4-appfinder-4.4.0.tar.bz2) = 576283258539de35ddb2a52240f13270e9accc1e149fd2e6b835795762baf687
+SIZE (xfce4/xfce4-appfinder-4.4.0.tar.bz2) = 370222
diff --git a/misc/xfce4-appfinder/pkg-plist b/misc/xfce4-appfinder/pkg-plist
index d3ed37db40fa..9b219b19fcbd 100644
--- a/misc/xfce4-appfinder/pkg-plist
+++ b/misc/xfce4-appfinder/pkg-plist
@@ -1,6 +1,47 @@
bin/xfce4-appfinder
share/applications/xfce4-appfinder.desktop
-share/pixmaps/xfce4-appfinder.png
+share/icons/hicolor/48x48/apps/xfce4-appfinder.png
+share/locale/de/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/dz/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/en_GB/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/eo/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/es/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/es_MX/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/et/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/eu/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/fa/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/fr/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/gu/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/he/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/hu/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/it/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/ja/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/ka/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/lt/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/mk/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/nl/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/pa/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/pt_PT/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/ru/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/sv/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/tr/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/be/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/ca/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/cs/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/el/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/fi/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/gl/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/ko/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/pl/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/ro/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/sk/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/uk/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/zh_CN/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/mr/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/bn_IN/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/hy/LC_MESSAGES/xfce4-appfinder.mo
share/xfce4/doc/C/images/appfinder-handle-popup.png
share/xfce4/doc/C/images/appfinder-item-popup.png
share/xfce4/doc/C/images/default_appfinder.png
@@ -9,17 +50,19 @@ share/xfce4/doc/fr/images/appfinder-handle-popup.png
share/xfce4/doc/fr/images/appfinder-item-popup.png
share/xfce4/doc/fr/images/default_appfinder.png
share/xfce4/doc/fr/xfce4-appfinder.html
-share/xfce4/doc/he/images/appfinder-handle-popup.png
-share/xfce4/doc/he/images/appfinder-item-popup.png
-share/xfce4/doc/he/images/default_appfinder.png
-share/xfce4/doc/he/xfce4-appfinder.html
@dirrmtry share/applications
-@dirrmtry share/pixmaps
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/he/images
-@dirrmtry share/xfce4/doc/he
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4
+@dirrmtry share/icons
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
deleted file mode 100644
index c4df2b634ce4..000000000000
--- a/misc/xfce4-iconbox/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# New ports collection makefile for: xfce4-iconbox
-# Date created: 7 June 2003
-# Whom: James Earl <jdearl@telus.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME= xfce4-iconbox
-PORTVERSION= 4.2.3
-PORTREVISION= 2
-CATEGORIES= misc xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
-DIST_SUBDIR= xfce4
-
-MAINTAINER= oliver@FreeBSD.org
-COMMENT= XFce 4 icon box, an alternative taskbar
-
-BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-
-USE_GETTEXT= yes
-USE_GNOME= gtk20
-GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${X11BASE}/lib" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
- LIBS=-L${LOCALBASE}/lib
-
-.include <bsd.port.mk>
diff --git a/misc/xfce4-iconbox/distinfo b/misc/xfce4-iconbox/distinfo
deleted file mode 100644
index 2b01d4f48fd2..000000000000
--- a/misc/xfce4-iconbox/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xfce4-iconbox-4.2.3.tar.gz) = cfd9b7383932fd9e404d79921c9e61d6
-SHA256 (xfce4/xfce4-iconbox-4.2.3.tar.gz) = 9616a60e37830f5cc6dbcf2d051ea313854c8fa44aacfd82f6ce71093d6f6c0a
-SIZE (xfce4/xfce4-iconbox-4.2.3.tar.gz) = 424341
diff --git a/misc/xfce4-iconbox/pkg-descr b/misc/xfce4-iconbox/pkg-descr
deleted file mode 100644
index 883c4847644d..000000000000
--- a/misc/xfce4-iconbox/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-XFce 4 icon box (Lil' Star - IconBox) is an alternative for the taskbar
-provided in the xfce-utils module.
-
-WWW: http://www.xfce.org
diff --git a/misc/xfce4-iconbox/pkg-plist b/misc/xfce4-iconbox/pkg-plist
deleted file mode 100644
index 1d171066b84c..000000000000
--- a/misc/xfce4-iconbox/pkg-plist
+++ /dev/null
@@ -1,84 +0,0 @@
-bin/xfce4-iconbox
-lib/xfce4/mcs-plugins/xfce4-iconbox_settings.a
-lib/xfce4/mcs-plugins/xfce4-iconbox_settings.la
-lib/xfce4/mcs-plugins/xfce4-iconbox_settings.so
-share/applications/xfce-iconbox-settings.desktop
-share/icons/hicolor/48x48/apps/xfce4-iconbox.png
-share/icons/hicolor/scalable/apps/xfce4-iconbox.svg
-share/locale/af/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ar/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/az/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/be/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/bg/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/bn_IN/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ca/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/cs/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/da/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/de/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/el/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/es/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/et/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/eu/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/fa/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/fi/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/fr/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/gu/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/he/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/hi/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/hu/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/it/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ja/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ko/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ku/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/lt/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ms/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/nl/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/nb_NO/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/pa/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/pl/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/pt_PT/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ro/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ru/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/sk/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/sv/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/ta/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/tr/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/uk/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/vi/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-iconbox.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-iconbox.mo
-@dirrmtry lib/xfce4/mcs-plugins
-@dirrmtry lib/xfce4
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 38402259a4ee..f887051f23db 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -6,24 +6,23 @@
#
PORTNAME= xfce4-weather-plugin
-PORTVERSION= 0.4.9
-PORTREVISION= 4
+PORTVERSION= 0.6.0
CATEGORIES= misc xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+DIST_SUBDIR= xfce4
MAINTAINER= filippo.natali@gmail.com
COMMENT= XFce 4 weather module for xfce4-panel
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- xml2.5:${PORTSDIR}/textproc/libxml2 \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME= gtk20
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget glib20 gtk20 intltool intlhack libxml2 pkgconfig
+USE_XFCE= configenv libgui libutil panel
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/misc/xfce4-weather-plugin/distinfo b/misc/xfce4-weather-plugin/distinfo
index 178d6efa5af4..e2f4a7f413fb 100644
--- a/misc/xfce4-weather-plugin/distinfo
+++ b/misc/xfce4-weather-plugin/distinfo
@@ -1,3 +1,6 @@
-MD5 (xfce4-weather-plugin-0.4.9.tar.gz) = 1d5ba253c8eae5a9ad5e3d7002a0dae0
-SHA256 (xfce4-weather-plugin-0.4.9.tar.gz) = c82044a943f3b43bf0b973c4859a3061e963c8ebd7e61e03342e646523fac669
-SIZE (xfce4-weather-plugin-0.4.9.tar.gz) = 642215
+MD5 (xfce4/xfce4-weather-plugin-0.6.0.tar.bz2) = 6d7ed190950b2cc99c70b9481169f9fa
+SHA256 (xfce4/xfce4-weather-plugin-0.6.0.tar.bz2) = 6dc0f306773273f98ee592e29c366ee9cb37830608d81c60d8ebf5f4b10c6f45
+SIZE (xfce4/xfce4-weather-plugin-0.6.0.tar.bz2) = 537194
+MD5 (xfce4/gcc295-xfce4-weather-plugin-2.patch) = 491a8e97c5fcce7e1e76e7febd346383
+SHA256 (xfce4/gcc295-xfce4-weather-plugin-2.patch) = 82b0cd11de9c5ae9e0ec6c9d7c1bff9dc2073f25face888c427a550d27dfbbc4
+SIZE (xfce4/gcc295-xfce4-weather-plugin-2.patch) = 1186
diff --git a/misc/xfce4-weather-plugin/files/patch-http_client.h b/misc/xfce4-weather-plugin/files/patch-http_client.h
deleted file mode 100644
index ff1d483fa79d..000000000000
--- a/misc/xfce4-weather-plugin/files/patch-http_client.h
+++ /dev/null
@@ -1,7 +0,0 @@
---- panel-plugin/http_client.h.orig Mon Apr 19 16:15:44 2004
-+++ panel-plugin/http_client.h Mon Jun 7 15:52:19 2004
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netdb.h>
- #include <netinet/in.h>
diff --git a/misc/xfce4-weather-plugin/pkg-descr b/misc/xfce4-weather-plugin/pkg-descr
index 537ed8869e9e..8b45ee75ed3d 100644
--- a/misc/xfce4-weather-plugin/pkg-descr
+++ b/misc/xfce4-weather-plugin/pkg-descr
@@ -2,4 +2,4 @@ XFce 4 weather module for xfce4-panel. It displays weather situation
and forecasts.
Author: Bob Schlaermann <blackhole@atreidis.nl.eu.org>
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin
diff --git a/misc/xfce4-weather-plugin/pkg-plist b/misc/xfce4-weather-plugin/pkg-plist
index 2efe89a211f5..2894d1f08517 100644
--- a/misc/xfce4-weather-plugin/pkg-plist
+++ b/misc/xfce4-weather-plugin/pkg-plist
@@ -1,6 +1,18 @@
-lib/xfce4/panel-plugins/libweather.a
-lib/xfce4/panel-plugins/libweather.la
-lib/xfce4/panel-plugins/libweather.so
+libexec/xfce4/panel-plugins/xfce4-weather-plugin
+share/icons/hicolor/48x48/apps/xfce4-weather.png
+share/locale/ca/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/fi/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/sk/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-weather-plugin.mo
+share/xfce4/weather/icons/liquid/0.png
share/xfce4/weather/icons/liquid/1.png
share/xfce4/weather/icons/liquid/10.png
share/xfce4/weather/icons/liquid/11.png
@@ -40,7 +52,6 @@ share/xfce4/weather/icons/liquid/41.png
share/xfce4/weather/icons/liquid/42.png
share/xfce4/weather/icons/liquid/43.png
share/xfce4/weather/icons/liquid/44.png
-share/xfce4/weather/icons/liquid/-.png
share/xfce4/weather/icons/liquid/45.png
share/xfce4/weather/icons/liquid/46.png
share/xfce4/weather/icons/liquid/47.png
@@ -49,9 +60,12 @@ share/xfce4/weather/icons/liquid/6.png
share/xfce4/weather/icons/liquid/7.png
share/xfce4/weather/icons/liquid/8.png
share/xfce4/weather/icons/liquid/9.png
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4
-@dirrmtry share/xfce4/weather/icons/liquid
-@dirrmtry share/xfce4/weather/icons
-@dirrmtry share/xfce4/weather
+share/xfce4/weather/icons/liquid/99.png
+share/xfce4/panel-plugins/weather.desktop
+@dirrmtry share/xfce4/panel-plugins
+@dirrm share/xfce4/weather/icons/liquid
+@dirrm share/xfce4/weather/icons
+@dirrm share/xfce4/weather
@dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
diff --git a/misc/xfce4-wm-themes/Makefile b/misc/xfce4-wm-themes/Makefile
index 074241282ff0..a638eaadbbf6 100644
--- a/misc/xfce4-wm-themes/Makefile
+++ b/misc/xfce4-wm-themes/Makefile
@@ -6,13 +6,9 @@
#
PORTNAME= xfce4-wm-themes
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= 4.4.0
CATEGORIES= misc xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DISTNAME= xfwm4-themes-${PORTVERSION}
DIST_SUBDIR= xfce4
@@ -20,8 +16,10 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 window decoration themes for xfwm4
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GNOME= gnometarget
-NO_BUILD= yes
-
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/misc/xfce4-wm-themes/distinfo b/misc/xfce4-wm-themes/distinfo
index ddc9b28971a6..1840f9666afb 100644
--- a/misc/xfce4-wm-themes/distinfo
+++ b/misc/xfce4-wm-themes/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfwm4-themes-4.2.3.tar.gz) = 98dbf2f80f30206ca1bcaff9358bedfd
-SHA256 (xfce4/xfwm4-themes-4.2.3.tar.gz) = e0360145a4c66aa30ad971bdaf18f6ea4a00e549ecd7adab40c121b346b0e1bc
-SIZE (xfce4/xfwm4-themes-4.2.3.tar.gz) = 880645
+MD5 (xfce4/xfwm4-themes-4.4.0.tar.bz2) = be42fc573181d8f7c0d4ac10d1c8940c
+SHA256 (xfce4/xfwm4-themes-4.4.0.tar.bz2) = 6db9fd1f823d3c0d78a51bbc3d24905f6bac4a7049a9354a089336c3eda57f61
+SIZE (xfce4/xfwm4-themes-4.4.0.tar.bz2) = 495825
diff --git a/misc/xfce4-wm-themes/pkg-descr b/misc/xfce4-wm-themes/pkg-descr
index 92307f88277f..649379a3880d 100644
--- a/misc/xfce4-wm-themes/pkg-descr
+++ b/misc/xfce4-wm-themes/pkg-descr
@@ -1,4 +1,4 @@
XFce 4 window decoration themes for xfwm4. Currently there are 55
themes included.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/misc/xfce4-wm-themes/pkg-plist b/misc/xfce4-wm-themes/pkg-plist
index e96a35dace48..2b85c7d182ee 100644
--- a/misc/xfce4-wm-themes/pkg-plist
+++ b/misc/xfce4-wm-themes/pkg-plist
@@ -848,50 +848,6 @@ share/themes/Curve/xfwm4/top-left-active.xpm
share/themes/Curve/xfwm4/top-left-inactive.xpm
share/themes/Curve/xfwm4/top-right-active.xpm
share/themes/Curve/xfwm4/top-right-inactive.xpm
-share/themes/Eazel-blue/xfwm4/README
-share/themes/Eazel-blue/xfwm4/bottom-active.xpm
-share/themes/Eazel-blue/xfwm4/bottom-inactive.xpm
-share/themes/Eazel-blue/xfwm4/bottom-left-active.xpm
-share/themes/Eazel-blue/xfwm4/bottom-left-inactive.xpm
-share/themes/Eazel-blue/xfwm4/bottom-right-active.xpm
-share/themes/Eazel-blue/xfwm4/bottom-right-inactive.xpm
-share/themes/Eazel-blue/xfwm4/close-active.xpm
-share/themes/Eazel-blue/xfwm4/close-inactive.xpm
-share/themes/Eazel-blue/xfwm4/close-pressed.xpm
-share/themes/Eazel-blue/xfwm4/hide-active.xpm
-share/themes/Eazel-blue/xfwm4/hide-inactive.xpm
-share/themes/Eazel-blue/xfwm4/hide-pressed.xpm
-share/themes/Eazel-blue/xfwm4/left-active.xpm
-share/themes/Eazel-blue/xfwm4/left-inactive.xpm
-share/themes/Eazel-blue/xfwm4/maximize-active.xpm
-share/themes/Eazel-blue/xfwm4/maximize-inactive.xpm
-share/themes/Eazel-blue/xfwm4/maximize-pressed.xpm
-share/themes/Eazel-blue/xfwm4/menu-active.xpm
-share/themes/Eazel-blue/xfwm4/menu-inactive.xpm
-share/themes/Eazel-blue/xfwm4/menu-pressed.xpm
-share/themes/Eazel-blue/xfwm4/right-active.xpm
-share/themes/Eazel-blue/xfwm4/right-inactive.xpm
-share/themes/Eazel-blue/xfwm4/shade-active.xpm
-share/themes/Eazel-blue/xfwm4/shade-inactive.xpm
-share/themes/Eazel-blue/xfwm4/shade-pressed.xpm
-share/themes/Eazel-blue/xfwm4/stick-active.xpm
-share/themes/Eazel-blue/xfwm4/stick-inactive.xpm
-share/themes/Eazel-blue/xfwm4/stick-pressed.xpm
-share/themes/Eazel-blue/xfwm4/themerc
-share/themes/Eazel-blue/xfwm4/title-1-active.xpm
-share/themes/Eazel-blue/xfwm4/title-1-inactive.xpm
-share/themes/Eazel-blue/xfwm4/title-2-active.xpm
-share/themes/Eazel-blue/xfwm4/title-2-inactive.xpm
-share/themes/Eazel-blue/xfwm4/title-3-active.xpm
-share/themes/Eazel-blue/xfwm4/title-3-inactive.xpm
-share/themes/Eazel-blue/xfwm4/title-4-active.xpm
-share/themes/Eazel-blue/xfwm4/title-4-inactive.xpm
-share/themes/Eazel-blue/xfwm4/title-5-active.xpm
-share/themes/Eazel-blue/xfwm4/title-5-inactive.xpm
-share/themes/Eazel-blue/xfwm4/top-left-active.xpm
-share/themes/Eazel-blue/xfwm4/top-left-inactive.xpm
-share/themes/Eazel-blue/xfwm4/top-right-active.xpm
-share/themes/Eazel-blue/xfwm4/top-right-inactive.xpm
share/themes/Defcon-IV/xfwm4/README
share/themes/Defcon-IV/xfwm4/bottom-active.xpm
share/themes/Defcon-IV/xfwm4/bottom-inactive.xpm
@@ -945,6 +901,50 @@ share/themes/Defcon-IV/xfwm4/top-left-active.xpm
share/themes/Defcon-IV/xfwm4/top-left-inactive.xpm
share/themes/Defcon-IV/xfwm4/top-right-active.xpm
share/themes/Defcon-IV/xfwm4/top-right-inactive.xpm
+share/themes/Eazel-blue/xfwm4/README
+share/themes/Eazel-blue/xfwm4/bottom-active.xpm
+share/themes/Eazel-blue/xfwm4/bottom-inactive.xpm
+share/themes/Eazel-blue/xfwm4/bottom-left-active.xpm
+share/themes/Eazel-blue/xfwm4/bottom-left-inactive.xpm
+share/themes/Eazel-blue/xfwm4/bottom-right-active.xpm
+share/themes/Eazel-blue/xfwm4/bottom-right-inactive.xpm
+share/themes/Eazel-blue/xfwm4/close-active.xpm
+share/themes/Eazel-blue/xfwm4/close-inactive.xpm
+share/themes/Eazel-blue/xfwm4/close-pressed.xpm
+share/themes/Eazel-blue/xfwm4/hide-active.xpm
+share/themes/Eazel-blue/xfwm4/hide-inactive.xpm
+share/themes/Eazel-blue/xfwm4/hide-pressed.xpm
+share/themes/Eazel-blue/xfwm4/left-active.xpm
+share/themes/Eazel-blue/xfwm4/left-inactive.xpm
+share/themes/Eazel-blue/xfwm4/maximize-active.xpm
+share/themes/Eazel-blue/xfwm4/maximize-inactive.xpm
+share/themes/Eazel-blue/xfwm4/maximize-pressed.xpm
+share/themes/Eazel-blue/xfwm4/menu-active.xpm
+share/themes/Eazel-blue/xfwm4/menu-inactive.xpm
+share/themes/Eazel-blue/xfwm4/menu-pressed.xpm
+share/themes/Eazel-blue/xfwm4/right-active.xpm
+share/themes/Eazel-blue/xfwm4/right-inactive.xpm
+share/themes/Eazel-blue/xfwm4/shade-active.xpm
+share/themes/Eazel-blue/xfwm4/shade-inactive.xpm
+share/themes/Eazel-blue/xfwm4/shade-pressed.xpm
+share/themes/Eazel-blue/xfwm4/stick-active.xpm
+share/themes/Eazel-blue/xfwm4/stick-inactive.xpm
+share/themes/Eazel-blue/xfwm4/stick-pressed.xpm
+share/themes/Eazel-blue/xfwm4/themerc
+share/themes/Eazel-blue/xfwm4/title-1-active.xpm
+share/themes/Eazel-blue/xfwm4/title-1-inactive.xpm
+share/themes/Eazel-blue/xfwm4/title-2-active.xpm
+share/themes/Eazel-blue/xfwm4/title-2-inactive.xpm
+share/themes/Eazel-blue/xfwm4/title-3-active.xpm
+share/themes/Eazel-blue/xfwm4/title-3-inactive.xpm
+share/themes/Eazel-blue/xfwm4/title-4-active.xpm
+share/themes/Eazel-blue/xfwm4/title-4-inactive.xpm
+share/themes/Eazel-blue/xfwm4/title-5-active.xpm
+share/themes/Eazel-blue/xfwm4/title-5-inactive.xpm
+share/themes/Eazel-blue/xfwm4/top-left-active.xpm
+share/themes/Eazel-blue/xfwm4/top-left-inactive.xpm
+share/themes/Eazel-blue/xfwm4/top-right-active.xpm
+share/themes/Eazel-blue/xfwm4/top-right-inactive.xpm
share/themes/Elberg/xfwm4/README
share/themes/Elberg/xfwm4/bottom-active.xpm
share/themes/Elberg/xfwm4/bottom-inactive.xpm
@@ -1628,7 +1628,7 @@ share/themes/Kindaker/xfwm4/top-left-active.xpm
share/themes/Kindaker/xfwm4/top-left-inactive.xpm
share/themes/Kindaker/xfwm4/top-right-active.xpm
share/themes/Kindaker/xfwm4/top-right-inactive.xpm
-share/themes/Kleanux/xfwm4/themerc
+share/themes/Kleanux/xfwm4/README
share/themes/Kleanux/xfwm4/bottom-active.xpm
share/themes/Kleanux/xfwm4/bottom-inactive.xpm
share/themes/Kleanux/xfwm4/bottom-left-active.xpm
@@ -1650,9 +1650,9 @@ share/themes/Kleanux/xfwm4/maximize-pressed.xpm
share/themes/Kleanux/xfwm4/menu-active.xpm
share/themes/Kleanux/xfwm4/menu-inactive.xpm
share/themes/Kleanux/xfwm4/menu-pressed.xpm
-share/themes/Kleanux/xfwm4/README
share/themes/Kleanux/xfwm4/right-active.xpm
share/themes/Kleanux/xfwm4/right-inactive.xpm
+share/themes/Kleanux/xfwm4/themerc
share/themes/Kleanux/xfwm4/title-1-active.xpm
share/themes/Kleanux/xfwm4/title-1-inactive.xpm
share/themes/Kleanux/xfwm4/title-2-active.xpm
@@ -1662,8 +1662,8 @@ share/themes/Kleanux/xfwm4/title-3-inactive.xpm
share/themes/Kleanux/xfwm4/title-4-active.xpm
share/themes/Kleanux/xfwm4/title-4-inactive.xpm
share/themes/Kleanux/xfwm4/title-5-active.xpm
-share/themes/Kleanux/xfwm4/top-left-active.xpm
share/themes/Kleanux/xfwm4/title-5-inactive.xpm
+share/themes/Kleanux/xfwm4/top-left-active.xpm
share/themes/Kleanux/xfwm4/top-left-inactive.xpm
share/themes/Kleanux/xfwm4/top-right-active.xpm
share/themes/Kleanux/xfwm4/top-right-inactive.xpm
@@ -1705,50 +1705,6 @@ share/themes/Koynacity/xfwm4/top-left-active.xpm
share/themes/Koynacity/xfwm4/top-left-inactive.xpm
share/themes/Koynacity/xfwm4/top-right-active.xpm
share/themes/Koynacity/xfwm4/top-right-inactive.xpm
-share/themes/Linea/xfwm4/README
-share/themes/Linea/xfwm4/bottom-active.xpm
-share/themes/Linea/xfwm4/bottom-inactive.xpm
-share/themes/Linea/xfwm4/bottom-left-active.xpm
-share/themes/Linea/xfwm4/bottom-left-inactive.xpm
-share/themes/Linea/xfwm4/bottom-right-active.xpm
-share/themes/Linea/xfwm4/bottom-right-inactive.xpm
-share/themes/Linea/xfwm4/close-active.xpm
-share/themes/Linea/xfwm4/close-inactive.xpm
-share/themes/Linea/xfwm4/close-pressed.xpm
-share/themes/Linea/xfwm4/hide-active.xpm
-share/themes/Linea/xfwm4/hide-inactive.xpm
-share/themes/Linea/xfwm4/hide-pressed.xpm
-share/themes/Linea/xfwm4/left-active.xpm
-share/themes/Linea/xfwm4/left-inactive.xpm
-share/themes/Linea/xfwm4/maximize-active.xpm
-share/themes/Linea/xfwm4/maximize-inactive.xpm
-share/themes/Linea/xfwm4/maximize-pressed.xpm
-share/themes/Linea/xfwm4/menu-active.xpm
-share/themes/Linea/xfwm4/menu-inactive.xpm
-share/themes/Linea/xfwm4/menu-pressed.xpm
-share/themes/Linea/xfwm4/right-active.xpm
-share/themes/Linea/xfwm4/right-inactive.xpm
-share/themes/Linea/xfwm4/shade-active.xpm
-share/themes/Linea/xfwm4/shade-inactive.xpm
-share/themes/Linea/xfwm4/shade-pressed.xpm
-share/themes/Linea/xfwm4/stick-active.xpm
-share/themes/Linea/xfwm4/stick-inactive.xpm
-share/themes/Linea/xfwm4/stick-pressed.xpm
-share/themes/Linea/xfwm4/themerc
-share/themes/Linea/xfwm4/title-1-active.xpm
-share/themes/Linea/xfwm4/title-1-inactive.xpm
-share/themes/Linea/xfwm4/title-2-active.xpm
-share/themes/Linea/xfwm4/title-2-inactive.xpm
-share/themes/Linea/xfwm4/title-3-active.xpm
-share/themes/Linea/xfwm4/title-3-inactive.xpm
-share/themes/Linea/xfwm4/title-4-active.xpm
-share/themes/Linea/xfwm4/title-4-inactive.xpm
-share/themes/Linea/xfwm4/title-5-active.xpm
-share/themes/Linea/xfwm4/title-5-inactive.xpm
-share/themes/Linea/xfwm4/top-left-active.xpm
-share/themes/Linea/xfwm4/top-left-inactive.xpm
-share/themes/Linea/xfwm4/top-right-active.xpm
-share/themes/Linea/xfwm4/top-right-inactive.xpm
share/themes/LineArt/xfwm4/README
share/themes/LineArt/xfwm4/bottom-active.xpm
share/themes/LineArt/xfwm4/bottom-inactive.xpm
@@ -1803,6 +1759,50 @@ share/themes/LineArt/xfwm4/top-left-active.xpm
share/themes/LineArt/xfwm4/top-left-inactive.xpm
share/themes/LineArt/xfwm4/top-right-active.xpm
share/themes/LineArt/xfwm4/top-right-inactive.xpm
+share/themes/Linea/xfwm4/README
+share/themes/Linea/xfwm4/bottom-active.xpm
+share/themes/Linea/xfwm4/bottom-inactive.xpm
+share/themes/Linea/xfwm4/bottom-left-active.xpm
+share/themes/Linea/xfwm4/bottom-left-inactive.xpm
+share/themes/Linea/xfwm4/bottom-right-active.xpm
+share/themes/Linea/xfwm4/bottom-right-inactive.xpm
+share/themes/Linea/xfwm4/close-active.xpm
+share/themes/Linea/xfwm4/close-inactive.xpm
+share/themes/Linea/xfwm4/close-pressed.xpm
+share/themes/Linea/xfwm4/hide-active.xpm
+share/themes/Linea/xfwm4/hide-inactive.xpm
+share/themes/Linea/xfwm4/hide-pressed.xpm
+share/themes/Linea/xfwm4/left-active.xpm
+share/themes/Linea/xfwm4/left-inactive.xpm
+share/themes/Linea/xfwm4/maximize-active.xpm
+share/themes/Linea/xfwm4/maximize-inactive.xpm
+share/themes/Linea/xfwm4/maximize-pressed.xpm
+share/themes/Linea/xfwm4/menu-active.xpm
+share/themes/Linea/xfwm4/menu-inactive.xpm
+share/themes/Linea/xfwm4/menu-pressed.xpm
+share/themes/Linea/xfwm4/right-active.xpm
+share/themes/Linea/xfwm4/right-inactive.xpm
+share/themes/Linea/xfwm4/shade-active.xpm
+share/themes/Linea/xfwm4/shade-inactive.xpm
+share/themes/Linea/xfwm4/shade-pressed.xpm
+share/themes/Linea/xfwm4/stick-active.xpm
+share/themes/Linea/xfwm4/stick-inactive.xpm
+share/themes/Linea/xfwm4/stick-pressed.xpm
+share/themes/Linea/xfwm4/themerc
+share/themes/Linea/xfwm4/title-1-active.xpm
+share/themes/Linea/xfwm4/title-1-inactive.xpm
+share/themes/Linea/xfwm4/title-2-active.xpm
+share/themes/Linea/xfwm4/title-2-inactive.xpm
+share/themes/Linea/xfwm4/title-3-active.xpm
+share/themes/Linea/xfwm4/title-3-inactive.xpm
+share/themes/Linea/xfwm4/title-4-active.xpm
+share/themes/Linea/xfwm4/title-4-inactive.xpm
+share/themes/Linea/xfwm4/title-5-active.xpm
+share/themes/Linea/xfwm4/title-5-inactive.xpm
+share/themes/Linea/xfwm4/top-left-active.xpm
+share/themes/Linea/xfwm4/top-left-inactive.xpm
+share/themes/Linea/xfwm4/top-right-active.xpm
+share/themes/Linea/xfwm4/top-right-inactive.xpm
share/themes/Meenee/xfwm4/README
share/themes/Meenee/xfwm4/bottom-active.xpm
share/themes/Meenee/xfwm4/bottom-inactive.xpm
@@ -1870,16 +1870,16 @@ share/themes/Metabox/xfwm4/left-active.xpm
share/themes/Metabox/xfwm4/left-inactive.xpm
share/themes/Metabox/xfwm4/maximize-active.png
share/themes/Metabox/xfwm4/maximize-active.xpm
+share/themes/Metabox/xfwm4/maximize-inactive.png
+share/themes/Metabox/xfwm4/maximize-inactive.xpm
+share/themes/Metabox/xfwm4/maximize-pressed.png
+share/themes/Metabox/xfwm4/maximize-pressed.xpm
share/themes/Metabox/xfwm4/maximize-toggled-active.png
share/themes/Metabox/xfwm4/maximize-toggled-active.xpm
share/themes/Metabox/xfwm4/maximize-toggled-inactive.png
share/themes/Metabox/xfwm4/maximize-toggled-inactive.xpm
share/themes/Metabox/xfwm4/maximize-toggled-pressed.png
share/themes/Metabox/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Metabox/xfwm4/maximize-inactive.png
-share/themes/Metabox/xfwm4/maximize-inactive.xpm
-share/themes/Metabox/xfwm4/maximize-pressed.png
-share/themes/Metabox/xfwm4/maximize-pressed.xpm
share/themes/Metabox/xfwm4/menu-active.png
share/themes/Metabox/xfwm4/menu-active.xpm
share/themes/Metabox/xfwm4/menu-inactive.png
@@ -2275,6 +2275,65 @@ share/themes/Ops/xfwm4/top-left-active.xpm
share/themes/Ops/xfwm4/top-left-inactive.xpm
share/themes/Ops/xfwm4/top-right-active.xpm
share/themes/Ops/xfwm4/top-right-inactive.xpm
+share/themes/Opta/xfwm4/README
+share/themes/Opta/xfwm4/bottom-active.xpm
+share/themes/Opta/xfwm4/bottom-inactive.xpm
+share/themes/Opta/xfwm4/bottom-left-active.xpm
+share/themes/Opta/xfwm4/bottom-left-inactive.xpm
+share/themes/Opta/xfwm4/bottom-right-active.xpm
+share/themes/Opta/xfwm4/bottom-right-inactive.xpm
+share/themes/Opta/xfwm4/close-active.xpm
+share/themes/Opta/xfwm4/close-inactive.xpm
+share/themes/Opta/xfwm4/close-pressed.xpm
+share/themes/Opta/xfwm4/hide-active.xpm
+share/themes/Opta/xfwm4/hide-inactive.xpm
+share/themes/Opta/xfwm4/hide-pressed.xpm
+share/themes/Opta/xfwm4/left-active.xpm
+share/themes/Opta/xfwm4/left-inactive.xpm
+share/themes/Opta/xfwm4/maximize-active.xpm
+share/themes/Opta/xfwm4/maximize-inactive.xpm
+share/themes/Opta/xfwm4/maximize-pressed.xpm
+share/themes/Opta/xfwm4/maximize-toggled-active.xpm
+share/themes/Opta/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Opta/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Opta/xfwm4/menu-active.xpm
+share/themes/Opta/xfwm4/menu-inactive.xpm
+share/themes/Opta/xfwm4/menu-pressed.xpm
+share/themes/Opta/xfwm4/right-active.xpm
+share/themes/Opta/xfwm4/right-inactive.xpm
+share/themes/Opta/xfwm4/shade-active.xpm
+share/themes/Opta/xfwm4/shade-inactive.xpm
+share/themes/Opta/xfwm4/shade-pressed.xpm
+share/themes/Opta/xfwm4/shade-toggled-active.xpm
+share/themes/Opta/xfwm4/shade-toggled-inactive.xpm
+share/themes/Opta/xfwm4/shade-toggled-pressed.xpm
+share/themes/Opta/xfwm4/stick-active.xpm
+share/themes/Opta/xfwm4/stick-inactive.xpm
+share/themes/Opta/xfwm4/stick-pressed.xpm
+share/themes/Opta/xfwm4/stick-toggled-active.xpm
+share/themes/Opta/xfwm4/stick-toggled-inactive.xpm
+share/themes/Opta/xfwm4/stick-toggled-pressed.xpm
+share/themes/Opta/xfwm4/themerc
+share/themes/Opta/xfwm4/title-1-active.xpm
+share/themes/Opta/xfwm4/title-1-inactive.xpm
+share/themes/Opta/xfwm4/title-2-active.png
+share/themes/Opta/xfwm4/title-2-active.xpm
+share/themes/Opta/xfwm4/title-2-inactive.png
+share/themes/Opta/xfwm4/title-2-inactive.xpm
+share/themes/Opta/xfwm4/title-3-active.png
+share/themes/Opta/xfwm4/title-3-active.xpm
+share/themes/Opta/xfwm4/title-3-inactive.png
+share/themes/Opta/xfwm4/title-3-inactive.xpm
+share/themes/Opta/xfwm4/title-4-active.png
+share/themes/Opta/xfwm4/title-4-active.xpm
+share/themes/Opta/xfwm4/title-4-inactive.png
+share/themes/Opta/xfwm4/title-4-inactive.xpm
+share/themes/Opta/xfwm4/title-5-active.xpm
+share/themes/Opta/xfwm4/title-5-inactive.xpm
+share/themes/Opta/xfwm4/top-left-active.xpm
+share/themes/Opta/xfwm4/top-left-inactive.xpm
+share/themes/Opta/xfwm4/top-right-active.xpm
+share/themes/Opta/xfwm4/top-right-inactive.xpm
share/themes/Oroborus/xfwm4/README
share/themes/Oroborus/xfwm4/bottom-active.xpm
share/themes/Oroborus/xfwm4/bottom-inactive.xpm
@@ -2693,10 +2752,10 @@ share/themes/Redmond/xfwm4/hide-pressed.xpm
share/themes/Redmond/xfwm4/left-active.xpm
share/themes/Redmond/xfwm4/left-inactive.xpm
share/themes/Redmond/xfwm4/maximize-active.xpm
-share/themes/Redmond/xfwm4/maximize-toggled-active.xpm
share/themes/Redmond/xfwm4/maximize-inactive.xpm
-share/themes/Redmond/xfwm4/maximize-toggled-inactive.xpm
share/themes/Redmond/xfwm4/maximize-pressed.xpm
+share/themes/Redmond/xfwm4/maximize-toggled-active.xpm
+share/themes/Redmond/xfwm4/maximize-toggled-inactive.xpm
share/themes/Redmond/xfwm4/maximize-toggled-pressed.xpm
share/themes/Redmond/xfwm4/menu-active.xpm
share/themes/Redmond/xfwm4/menu-inactive.xpm
@@ -2724,50 +2783,6 @@ share/themes/Redmond/xfwm4/top-left-active.xpm
share/themes/Redmond/xfwm4/top-left-inactive.xpm
share/themes/Redmond/xfwm4/top-right-active.xpm
share/themes/Redmond/xfwm4/top-right-inactive.xpm
-share/themes/Retro/xfwm4/README
-share/themes/Retro/xfwm4/bottom-active.xpm
-share/themes/Retro/xfwm4/bottom-inactive.xpm
-share/themes/Retro/xfwm4/bottom-left-active.xpm
-share/themes/Retro/xfwm4/bottom-left-inactive.xpm
-share/themes/Retro/xfwm4/bottom-right-active.xpm
-share/themes/Retro/xfwm4/bottom-right-inactive.xpm
-share/themes/Retro/xfwm4/close-active.xpm
-share/themes/Retro/xfwm4/close-inactive.xpm
-share/themes/Retro/xfwm4/close-pressed.xpm
-share/themes/Retro/xfwm4/hide-active.xpm
-share/themes/Retro/xfwm4/hide-inactive.xpm
-share/themes/Retro/xfwm4/hide-pressed.xpm
-share/themes/Retro/xfwm4/left-active.xpm
-share/themes/Retro/xfwm4/left-inactive.xpm
-share/themes/Retro/xfwm4/maximize-active.xpm
-share/themes/Retro/xfwm4/maximize-inactive.xpm
-share/themes/Retro/xfwm4/maximize-pressed.xpm
-share/themes/Retro/xfwm4/menu-active.xpm
-share/themes/Retro/xfwm4/menu-inactive.xpm
-share/themes/Retro/xfwm4/menu-pressed.xpm
-share/themes/Retro/xfwm4/right-active.xpm
-share/themes/Retro/xfwm4/right-inactive.xpm
-share/themes/Retro/xfwm4/shade-active.xpm
-share/themes/Retro/xfwm4/shade-inactive.xpm
-share/themes/Retro/xfwm4/shade-pressed.xpm
-share/themes/Retro/xfwm4/stick-active.xpm
-share/themes/Retro/xfwm4/stick-inactive.xpm
-share/themes/Retro/xfwm4/stick-pressed.xpm
-share/themes/Retro/xfwm4/themerc
-share/themes/Retro/xfwm4/title-1-active.xpm
-share/themes/Retro/xfwm4/title-1-inactive.xpm
-share/themes/Retro/xfwm4/title-2-active.xpm
-share/themes/Retro/xfwm4/title-2-inactive.xpm
-share/themes/Retro/xfwm4/title-3-active.xpm
-share/themes/Retro/xfwm4/title-3-inactive.xpm
-share/themes/Retro/xfwm4/title-4-active.xpm
-share/themes/Retro/xfwm4/title-4-inactive.xpm
-share/themes/Retro/xfwm4/title-5-active.xpm
-share/themes/Retro/xfwm4/title-5-inactive.xpm
-share/themes/Retro/xfwm4/top-left-active.xpm
-share/themes/Retro/xfwm4/top-left-inactive.xpm
-share/themes/Retro/xfwm4/top-right-active.xpm
-share/themes/Retro/xfwm4/top-right-inactive.xpm
share/themes/RedmondXP/xfwm4/README
share/themes/RedmondXP/xfwm4/bottom-active.png
share/themes/RedmondXP/xfwm4/bottom-active.xpm
@@ -2811,8 +2826,11 @@ share/themes/RedmondXP/xfwm4/maximize-toggled-inactive.png
share/themes/RedmondXP/xfwm4/maximize-toggled-inactive.xpm
share/themes/RedmondXP/xfwm4/maximize-toggled-pressed.png
share/themes/RedmondXP/xfwm4/maximize-toggled-pressed.xpm
+share/themes/RedmondXP/xfwm4/menu-active.png
share/themes/RedmondXP/xfwm4/menu-active.xpm
+share/themes/RedmondXP/xfwm4/menu-inactive.png
share/themes/RedmondXP/xfwm4/menu-inactive.xpm
+share/themes/RedmondXP/xfwm4/menu-pressed.png
share/themes/RedmondXP/xfwm4/menu-pressed.xpm
share/themes/RedmondXP/xfwm4/right-active.png
share/themes/RedmondXP/xfwm4/right-active.xpm
@@ -2847,6 +2865,50 @@ share/themes/RedmondXP/xfwm4/top-right-active.png
share/themes/RedmondXP/xfwm4/top-right-active.xpm
share/themes/RedmondXP/xfwm4/top-right-inactive.png
share/themes/RedmondXP/xfwm4/top-right-inactive.xpm
+share/themes/Retro/xfwm4/README
+share/themes/Retro/xfwm4/bottom-active.xpm
+share/themes/Retro/xfwm4/bottom-inactive.xpm
+share/themes/Retro/xfwm4/bottom-left-active.xpm
+share/themes/Retro/xfwm4/bottom-left-inactive.xpm
+share/themes/Retro/xfwm4/bottom-right-active.xpm
+share/themes/Retro/xfwm4/bottom-right-inactive.xpm
+share/themes/Retro/xfwm4/close-active.xpm
+share/themes/Retro/xfwm4/close-inactive.xpm
+share/themes/Retro/xfwm4/close-pressed.xpm
+share/themes/Retro/xfwm4/hide-active.xpm
+share/themes/Retro/xfwm4/hide-inactive.xpm
+share/themes/Retro/xfwm4/hide-pressed.xpm
+share/themes/Retro/xfwm4/left-active.xpm
+share/themes/Retro/xfwm4/left-inactive.xpm
+share/themes/Retro/xfwm4/maximize-active.xpm
+share/themes/Retro/xfwm4/maximize-inactive.xpm
+share/themes/Retro/xfwm4/maximize-pressed.xpm
+share/themes/Retro/xfwm4/menu-active.xpm
+share/themes/Retro/xfwm4/menu-inactive.xpm
+share/themes/Retro/xfwm4/menu-pressed.xpm
+share/themes/Retro/xfwm4/right-active.xpm
+share/themes/Retro/xfwm4/right-inactive.xpm
+share/themes/Retro/xfwm4/shade-active.xpm
+share/themes/Retro/xfwm4/shade-inactive.xpm
+share/themes/Retro/xfwm4/shade-pressed.xpm
+share/themes/Retro/xfwm4/stick-active.xpm
+share/themes/Retro/xfwm4/stick-inactive.xpm
+share/themes/Retro/xfwm4/stick-pressed.xpm
+share/themes/Retro/xfwm4/themerc
+share/themes/Retro/xfwm4/title-1-active.xpm
+share/themes/Retro/xfwm4/title-1-inactive.xpm
+share/themes/Retro/xfwm4/title-2-active.xpm
+share/themes/Retro/xfwm4/title-2-inactive.xpm
+share/themes/Retro/xfwm4/title-3-active.xpm
+share/themes/Retro/xfwm4/title-3-inactive.xpm
+share/themes/Retro/xfwm4/title-4-active.xpm
+share/themes/Retro/xfwm4/title-4-inactive.xpm
+share/themes/Retro/xfwm4/title-5-active.xpm
+share/themes/Retro/xfwm4/title-5-inactive.xpm
+share/themes/Retro/xfwm4/top-left-active.xpm
+share/themes/Retro/xfwm4/top-left-inactive.xpm
+share/themes/Retro/xfwm4/top-right-active.xpm
+share/themes/Retro/xfwm4/top-right-inactive.xpm
share/themes/Silverado/xfwm4/README
share/themes/Silverado/xfwm4/bottom-active.xpm
share/themes/Silverado/xfwm4/bottom-inactive.xpm
@@ -3070,8 +3132,111 @@ share/themes/Smoothwall/xfwm4/top-left-active.xpm
share/themes/Smoothwall/xfwm4/top-left-inactive.xpm
share/themes/Smoothwall/xfwm4/top-right-active.xpm
share/themes/Smoothwall/xfwm4/top-right-inactive.xpm
+share/themes/Symphony/xfwm4/README
+share/themes/Symphony/xfwm4/bottom-active.png
+share/themes/Symphony/xfwm4/bottom-active.xpm
+share/themes/Symphony/xfwm4/bottom-inactive.png
+share/themes/Symphony/xfwm4/bottom-inactive.xpm
+share/themes/Symphony/xfwm4/bottom-left-active.png
+share/themes/Symphony/xfwm4/bottom-left-active.xpm
+share/themes/Symphony/xfwm4/bottom-left-inactive.png
+share/themes/Symphony/xfwm4/bottom-left-inactive.xpm
+share/themes/Symphony/xfwm4/bottom-right-active.png
+share/themes/Symphony/xfwm4/bottom-right-active.xpm
+share/themes/Symphony/xfwm4/bottom-right-inactive.png
+share/themes/Symphony/xfwm4/bottom-right-inactive.xpm
+share/themes/Symphony/xfwm4/close-active.png
+share/themes/Symphony/xfwm4/close-active.xpm
+share/themes/Symphony/xfwm4/close-inactive.png
+share/themes/Symphony/xfwm4/close-inactive.xpm
+share/themes/Symphony/xfwm4/close-pressed.png
+share/themes/Symphony/xfwm4/close-pressed.xpm
+share/themes/Symphony/xfwm4/hide-active.png
+share/themes/Symphony/xfwm4/hide-active.xpm
+share/themes/Symphony/xfwm4/hide-inactive.png
+share/themes/Symphony/xfwm4/hide-inactive.xpm
+share/themes/Symphony/xfwm4/hide-pressed.png
+share/themes/Symphony/xfwm4/hide-pressed.xpm
+share/themes/Symphony/xfwm4/left-active.png
+share/themes/Symphony/xfwm4/left-active.xpm
+share/themes/Symphony/xfwm4/left-inactive.png
+share/themes/Symphony/xfwm4/left-inactive.xpm
+share/themes/Symphony/xfwm4/maximize-active.png
+share/themes/Symphony/xfwm4/maximize-active.xpm
+share/themes/Symphony/xfwm4/maximize-inactive.png
+share/themes/Symphony/xfwm4/maximize-inactive.xpm
+share/themes/Symphony/xfwm4/maximize-pressed.png
+share/themes/Symphony/xfwm4/maximize-pressed.xpm
+share/themes/Symphony/xfwm4/maximize-toggled-active.png
+share/themes/Symphony/xfwm4/maximize-toggled-active.xpm
+share/themes/Symphony/xfwm4/maximize-toggled-inactive.png
+share/themes/Symphony/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Symphony/xfwm4/maximize-toggled-pressed.png
+share/themes/Symphony/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Symphony/xfwm4/menu-active.png
+share/themes/Symphony/xfwm4/menu-active.xpm
+share/themes/Symphony/xfwm4/menu-inactive.png
+share/themes/Symphony/xfwm4/menu-inactive.xpm
+share/themes/Symphony/xfwm4/menu-pressed.png
+share/themes/Symphony/xfwm4/menu-pressed.xpm
+share/themes/Symphony/xfwm4/right-active.png
+share/themes/Symphony/xfwm4/right-active.xpm
+share/themes/Symphony/xfwm4/right-inactive.png
+share/themes/Symphony/xfwm4/right-inactive.xpm
+share/themes/Symphony/xfwm4/shade-active.png
+share/themes/Symphony/xfwm4/shade-active.xpm
+share/themes/Symphony/xfwm4/shade-inactive.png
+share/themes/Symphony/xfwm4/shade-inactive.xpm
+share/themes/Symphony/xfwm4/shade-pressed.png
+share/themes/Symphony/xfwm4/shade-pressed.xpm
+share/themes/Symphony/xfwm4/shade-toggled-active.png
+share/themes/Symphony/xfwm4/shade-toggled-active.xpm
+share/themes/Symphony/xfwm4/shade-toggled-inactive.png
+share/themes/Symphony/xfwm4/shade-toggled-inactive.xpm
+share/themes/Symphony/xfwm4/shade-toggled-pressed.png
+share/themes/Symphony/xfwm4/shade-toggled-pressed.xpm
+share/themes/Symphony/xfwm4/stick-active.png
+share/themes/Symphony/xfwm4/stick-active.xpm
+share/themes/Symphony/xfwm4/stick-inactive.png
+share/themes/Symphony/xfwm4/stick-inactive.xpm
+share/themes/Symphony/xfwm4/stick-pressed.png
+share/themes/Symphony/xfwm4/stick-pressed.xpm
+share/themes/Symphony/xfwm4/stick-toggled-active.png
+share/themes/Symphony/xfwm4/stick-toggled-active.xpm
+share/themes/Symphony/xfwm4/stick-toggled-inactive.png
+share/themes/Symphony/xfwm4/stick-toggled-inactive.xpm
+share/themes/Symphony/xfwm4/stick-toggled-pressed.png
+share/themes/Symphony/xfwm4/stick-toggled-pressed.xpm
+share/themes/Symphony/xfwm4/themerc
+share/themes/Symphony/xfwm4/title-1-active.png
+share/themes/Symphony/xfwm4/title-1-active.xpm
+share/themes/Symphony/xfwm4/title-1-inactive.png
+share/themes/Symphony/xfwm4/title-1-inactive.xpm
+share/themes/Symphony/xfwm4/title-2-active.png
+share/themes/Symphony/xfwm4/title-2-active.xpm
+share/themes/Symphony/xfwm4/title-2-inactive.png
+share/themes/Symphony/xfwm4/title-2-inactive.xpm
+share/themes/Symphony/xfwm4/title-3-active.png
+share/themes/Symphony/xfwm4/title-3-active.xpm
+share/themes/Symphony/xfwm4/title-3-inactive.png
+share/themes/Symphony/xfwm4/title-3-inactive.xpm
+share/themes/Symphony/xfwm4/title-4-active.png
+share/themes/Symphony/xfwm4/title-4-active.xpm
+share/themes/Symphony/xfwm4/title-4-inactive.png
+share/themes/Symphony/xfwm4/title-4-inactive.xpm
+share/themes/Symphony/xfwm4/title-5-active.png
+share/themes/Symphony/xfwm4/title-5-active.xpm
+share/themes/Symphony/xfwm4/title-5-inactive.png
+share/themes/Symphony/xfwm4/title-5-inactive.xpm
+share/themes/Symphony/xfwm4/top-left-active.png
+share/themes/Symphony/xfwm4/top-left-active.xpm
+share/themes/Symphony/xfwm4/top-left-inactive.png
+share/themes/Symphony/xfwm4/top-left-inactive.xpm
+share/themes/Symphony/xfwm4/top-right-active.png
+share/themes/Symphony/xfwm4/top-right-active.xpm
+share/themes/Symphony/xfwm4/top-right-inactive.png
+share/themes/Symphony/xfwm4/top-right-inactive.xpm
share/themes/Synthetic/xfwm4/README
-share/themes/Synthetic/xfwm4/themerc
share/themes/Synthetic/xfwm4/bottom-active.xpm
share/themes/Synthetic/xfwm4/bottom-inactive.xpm
share/themes/Synthetic/xfwm4/bottom-left-active.xpm
@@ -3109,6 +3274,7 @@ share/themes/Synthetic/xfwm4/stick-pressed.xpm
share/themes/Synthetic/xfwm4/stick-toggled-active.xpm
share/themes/Synthetic/xfwm4/stick-toggled-inactive.xpm
share/themes/Synthetic/xfwm4/stick-toggled-pressed.xpm
+share/themes/Synthetic/xfwm4/themerc
share/themes/Synthetic/xfwm4/title-1-active.xpm
share/themes/Synthetic/xfwm4/title-1-inactive.xpm
share/themes/Synthetic/xfwm4/title-2-active.xpm
@@ -3123,6 +3289,50 @@ share/themes/Synthetic/xfwm4/top-left-active.xpm
share/themes/Synthetic/xfwm4/top-left-inactive.xpm
share/themes/Synthetic/xfwm4/top-right-active.xpm
share/themes/Synthetic/xfwm4/top-right-inactive.xpm
+share/themes/TUX/xfwm4/README
+share/themes/TUX/xfwm4/bottom-active.xpm
+share/themes/TUX/xfwm4/bottom-inactive.xpm
+share/themes/TUX/xfwm4/bottom-left-active.xpm
+share/themes/TUX/xfwm4/bottom-left-inactive.xpm
+share/themes/TUX/xfwm4/bottom-right-active.xpm
+share/themes/TUX/xfwm4/bottom-right-inactive.xpm
+share/themes/TUX/xfwm4/close-active.xpm
+share/themes/TUX/xfwm4/close-inactive.xpm
+share/themes/TUX/xfwm4/close-pressed.xpm
+share/themes/TUX/xfwm4/hide-active.xpm
+share/themes/TUX/xfwm4/hide-inactive.xpm
+share/themes/TUX/xfwm4/hide-pressed.xpm
+share/themes/TUX/xfwm4/left-active.xpm
+share/themes/TUX/xfwm4/left-inactive.xpm
+share/themes/TUX/xfwm4/maximize-active.xpm
+share/themes/TUX/xfwm4/maximize-inactive.xpm
+share/themes/TUX/xfwm4/maximize-pressed.xpm
+share/themes/TUX/xfwm4/menu-active.xpm
+share/themes/TUX/xfwm4/menu-inactive.xpm
+share/themes/TUX/xfwm4/menu-pressed.xpm
+share/themes/TUX/xfwm4/right-active.xpm
+share/themes/TUX/xfwm4/right-inactive.xpm
+share/themes/TUX/xfwm4/shade-active.xpm
+share/themes/TUX/xfwm4/shade-inactive.xpm
+share/themes/TUX/xfwm4/shade-pressed.xpm
+share/themes/TUX/xfwm4/stick-active.xpm
+share/themes/TUX/xfwm4/stick-inactive.xpm
+share/themes/TUX/xfwm4/stick-pressed.xpm
+share/themes/TUX/xfwm4/themerc
+share/themes/TUX/xfwm4/title-1-active.xpm
+share/themes/TUX/xfwm4/title-1-inactive.xpm
+share/themes/TUX/xfwm4/title-2-active.xpm
+share/themes/TUX/xfwm4/title-2-inactive.xpm
+share/themes/TUX/xfwm4/title-3-active.xpm
+share/themes/TUX/xfwm4/title-3-inactive.xpm
+share/themes/TUX/xfwm4/title-4-active.xpm
+share/themes/TUX/xfwm4/title-4-inactive.xpm
+share/themes/TUX/xfwm4/title-5-active.xpm
+share/themes/TUX/xfwm4/title-5-inactive.xpm
+share/themes/TUX/xfwm4/top-left-active.xpm
+share/themes/TUX/xfwm4/top-left-inactive.xpm
+share/themes/TUX/xfwm4/top-right-active.xpm
+share/themes/TUX/xfwm4/top-right-inactive.xpm
share/themes/Tabs/xfwm4/README
share/themes/Tabs/xfwm4/bottom-active.xpm
share/themes/Tabs/xfwm4/bottom-inactive.xpm
@@ -3167,50 +3377,6 @@ share/themes/Tabs/xfwm4/top-left-active.xpm
share/themes/Tabs/xfwm4/top-left-inactive.xpm
share/themes/Tabs/xfwm4/top-right-active.xpm
share/themes/Tabs/xfwm4/top-right-inactive.xpm
-share/themes/Tgc/xfwm4/README
-share/themes/Tgc/xfwm4/bottom-active.xpm
-share/themes/Tgc/xfwm4/bottom-inactive.xpm
-share/themes/Tgc/xfwm4/bottom-left-active.xpm
-share/themes/Tgc/xfwm4/bottom-left-inactive.xpm
-share/themes/Tgc/xfwm4/bottom-right-active.xpm
-share/themes/Tgc/xfwm4/bottom-right-inactive.xpm
-share/themes/Tgc/xfwm4/close-active.xpm
-share/themes/Tgc/xfwm4/close-inactive.xpm
-share/themes/Tgc/xfwm4/close-pressed.xpm
-share/themes/Tgc/xfwm4/hide-active.xpm
-share/themes/Tgc/xfwm4/hide-inactive.xpm
-share/themes/Tgc/xfwm4/hide-pressed.xpm
-share/themes/Tgc/xfwm4/left-active.xpm
-share/themes/Tgc/xfwm4/left-inactive.xpm
-share/themes/Tgc/xfwm4/maximize-active.xpm
-share/themes/Tgc/xfwm4/maximize-inactive.xpm
-share/themes/Tgc/xfwm4/maximize-pressed.xpm
-share/themes/Tgc/xfwm4/menu-active.xpm
-share/themes/Tgc/xfwm4/menu-inactive.xpm
-share/themes/Tgc/xfwm4/menu-pressed.xpm
-share/themes/Tgc/xfwm4/right-active.xpm
-share/themes/Tgc/xfwm4/right-inactive.xpm
-share/themes/Tgc/xfwm4/shade-active.xpm
-share/themes/Tgc/xfwm4/shade-inactive.xpm
-share/themes/Tgc/xfwm4/shade-pressed.xpm
-share/themes/Tgc/xfwm4/stick-active.xpm
-share/themes/Tgc/xfwm4/stick-inactive.xpm
-share/themes/Tgc/xfwm4/stick-pressed.xpm
-share/themes/Tgc/xfwm4/themerc
-share/themes/Tgc/xfwm4/title-1-active.xpm
-share/themes/Tgc/xfwm4/title-1-inactive.xpm
-share/themes/Tgc/xfwm4/title-2-active.xpm
-share/themes/Tgc/xfwm4/title-2-inactive.xpm
-share/themes/Tgc/xfwm4/title-3-active.xpm
-share/themes/Tgc/xfwm4/title-3-inactive.xpm
-share/themes/Tgc/xfwm4/title-4-active.xpm
-share/themes/Tgc/xfwm4/title-4-inactive.xpm
-share/themes/Tgc/xfwm4/title-5-active.xpm
-share/themes/Tgc/xfwm4/title-5-inactive.xpm
-share/themes/Tgc/xfwm4/top-left-active.xpm
-share/themes/Tgc/xfwm4/top-left-inactive.xpm
-share/themes/Tgc/xfwm4/top-right-active.xpm
-share/themes/Tgc/xfwm4/top-right-inactive.xpm
share/themes/Tgc-large/xfwm4/README
share/themes/Tgc-large/xfwm4/bottom-active.xpm
share/themes/Tgc-large/xfwm4/bottom-inactive.xpm
@@ -3264,6 +3430,59 @@ share/themes/Tgc-large/xfwm4/top-left-active.xpm
share/themes/Tgc-large/xfwm4/top-left-inactive.xpm
share/themes/Tgc-large/xfwm4/top-right-active.xpm
share/themes/Tgc-large/xfwm4/top-right-inactive.xpm
+share/themes/Tgc/xfwm4/README
+share/themes/Tgc/xfwm4/bottom-active.xpm
+share/themes/Tgc/xfwm4/bottom-inactive.xpm
+share/themes/Tgc/xfwm4/bottom-left-active.xpm
+share/themes/Tgc/xfwm4/bottom-left-inactive.xpm
+share/themes/Tgc/xfwm4/bottom-right-active.xpm
+share/themes/Tgc/xfwm4/bottom-right-inactive.xpm
+share/themes/Tgc/xfwm4/close-active.xpm
+share/themes/Tgc/xfwm4/close-inactive.xpm
+share/themes/Tgc/xfwm4/close-pressed.xpm
+share/themes/Tgc/xfwm4/hide-active.xpm
+share/themes/Tgc/xfwm4/hide-inactive.xpm
+share/themes/Tgc/xfwm4/hide-pressed.xpm
+share/themes/Tgc/xfwm4/left-active.xpm
+share/themes/Tgc/xfwm4/left-inactive.xpm
+share/themes/Tgc/xfwm4/maximize-active.xpm
+share/themes/Tgc/xfwm4/maximize-inactive.xpm
+share/themes/Tgc/xfwm4/maximize-pressed.xpm
+share/themes/Tgc/xfwm4/maximize-toggled-active.xpm
+share/themes/Tgc/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Tgc/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Tgc/xfwm4/menu-active.xpm
+share/themes/Tgc/xfwm4/menu-inactive.xpm
+share/themes/Tgc/xfwm4/menu-pressed.xpm
+share/themes/Tgc/xfwm4/right-active.xpm
+share/themes/Tgc/xfwm4/right-inactive.xpm
+share/themes/Tgc/xfwm4/shade-active.xpm
+share/themes/Tgc/xfwm4/shade-inactive.xpm
+share/themes/Tgc/xfwm4/shade-pressed.xpm
+share/themes/Tgc/xfwm4/shade-toggled-active.xpm
+share/themes/Tgc/xfwm4/shade-toggled-inactive.xpm
+share/themes/Tgc/xfwm4/shade-toggled-pressed.xpm
+share/themes/Tgc/xfwm4/stick-active.xpm
+share/themes/Tgc/xfwm4/stick-inactive.xpm
+share/themes/Tgc/xfwm4/stick-pressed.xpm
+share/themes/Tgc/xfwm4/stick-toggled-active.xpm
+share/themes/Tgc/xfwm4/stick-toggled-inactive.xpm
+share/themes/Tgc/xfwm4/stick-toggled-pressed.xpm
+share/themes/Tgc/xfwm4/themerc
+share/themes/Tgc/xfwm4/title-1-active.xpm
+share/themes/Tgc/xfwm4/title-1-inactive.xpm
+share/themes/Tgc/xfwm4/title-2-active.xpm
+share/themes/Tgc/xfwm4/title-2-inactive.xpm
+share/themes/Tgc/xfwm4/title-3-active.xpm
+share/themes/Tgc/xfwm4/title-3-inactive.xpm
+share/themes/Tgc/xfwm4/title-4-active.xpm
+share/themes/Tgc/xfwm4/title-4-inactive.xpm
+share/themes/Tgc/xfwm4/title-5-active.xpm
+share/themes/Tgc/xfwm4/title-5-inactive.xpm
+share/themes/Tgc/xfwm4/top-left-active.xpm
+share/themes/Tgc/xfwm4/top-left-inactive.xpm
+share/themes/Tgc/xfwm4/top-right-active.xpm
+share/themes/Tgc/xfwm4/top-right-inactive.xpm
share/themes/Today/xfwm4/README
share/themes/Today/xfwm4/bottom-active.xpm
share/themes/Today/xfwm4/bottom-inactive.xpm
@@ -3499,50 +3718,6 @@ share/themes/Tubular/xfwm4/top-left-active.xpm
share/themes/Tubular/xfwm4/top-left-inactive.xpm
share/themes/Tubular/xfwm4/top-right-active.xpm
share/themes/Tubular/xfwm4/top-right-inactive.xpm
-share/themes/TUX/xfwm4/README
-share/themes/TUX/xfwm4/bottom-active.xpm
-share/themes/TUX/xfwm4/bottom-inactive.xpm
-share/themes/TUX/xfwm4/bottom-left-active.xpm
-share/themes/TUX/xfwm4/bottom-left-inactive.xpm
-share/themes/TUX/xfwm4/bottom-right-active.xpm
-share/themes/TUX/xfwm4/bottom-right-inactive.xpm
-share/themes/TUX/xfwm4/close-active.xpm
-share/themes/TUX/xfwm4/close-inactive.xpm
-share/themes/TUX/xfwm4/close-pressed.xpm
-share/themes/TUX/xfwm4/hide-active.xpm
-share/themes/TUX/xfwm4/hide-inactive.xpm
-share/themes/TUX/xfwm4/hide-pressed.xpm
-share/themes/TUX/xfwm4/left-active.xpm
-share/themes/TUX/xfwm4/left-inactive.xpm
-share/themes/TUX/xfwm4/maximize-active.xpm
-share/themes/TUX/xfwm4/maximize-inactive.xpm
-share/themes/TUX/xfwm4/maximize-pressed.xpm
-share/themes/TUX/xfwm4/menu-active.xpm
-share/themes/TUX/xfwm4/menu-inactive.xpm
-share/themes/TUX/xfwm4/menu-pressed.xpm
-share/themes/TUX/xfwm4/right-active.xpm
-share/themes/TUX/xfwm4/right-inactive.xpm
-share/themes/TUX/xfwm4/shade-active.xpm
-share/themes/TUX/xfwm4/shade-inactive.xpm
-share/themes/TUX/xfwm4/shade-pressed.xpm
-share/themes/TUX/xfwm4/stick-active.xpm
-share/themes/TUX/xfwm4/stick-inactive.xpm
-share/themes/TUX/xfwm4/stick-pressed.xpm
-share/themes/TUX/xfwm4/title-1-active.xpm
-share/themes/TUX/xfwm4/title-1-inactive.xpm
-share/themes/TUX/xfwm4/title-2-active.xpm
-share/themes/TUX/xfwm4/title-2-inactive.xpm
-share/themes/TUX/xfwm4/title-3-active.xpm
-share/themes/TUX/xfwm4/title-4-active.xpm
-share/themes/TUX/xfwm4/title-3-inactive.xpm
-share/themes/TUX/xfwm4/title-4-inactive.xpm
-share/themes/TUX/xfwm4/title-5-active.xpm
-share/themes/TUX/xfwm4/title-5-inactive.xpm
-share/themes/TUX/xfwm4/themerc
-share/themes/TUX/xfwm4/top-left-active.xpm
-share/themes/TUX/xfwm4/top-left-inactive.xpm
-share/themes/TUX/xfwm4/top-right-active.xpm
-share/themes/TUX/xfwm4/top-right-inactive.xpm
share/themes/Variation/xfwm4/README
share/themes/Variation/xfwm4/bottom-active.xpm
share/themes/Variation/xfwm4/bottom-inactive.xpm
@@ -3587,6 +3762,177 @@ share/themes/Variation/xfwm4/top-left-active.xpm
share/themes/Variation/xfwm4/top-left-inactive.xpm
share/themes/Variation/xfwm4/top-right-active.xpm
share/themes/Variation/xfwm4/top-right-inactive.xpm
+share/themes/Waza/xfwm4/README
+share/themes/Waza/xfwm4/bottom-active.xpm
+share/themes/Waza/xfwm4/bottom-inactive.xpm
+share/themes/Waza/xfwm4/bottom-left-active.xpm
+share/themes/Waza/xfwm4/bottom-left-inactive.xpm
+share/themes/Waza/xfwm4/bottom-right-active.xpm
+share/themes/Waza/xfwm4/bottom-right-inactive.xpm
+share/themes/Waza/xfwm4/close-active.png
+share/themes/Waza/xfwm4/close-active.xpm
+share/themes/Waza/xfwm4/close-inactive.png
+share/themes/Waza/xfwm4/close-inactive.xpm
+share/themes/Waza/xfwm4/close-pressed.png
+share/themes/Waza/xfwm4/close-pressed.xpm
+share/themes/Waza/xfwm4/hide-active.png
+share/themes/Waza/xfwm4/hide-active.xpm
+share/themes/Waza/xfwm4/hide-inactive.png
+share/themes/Waza/xfwm4/hide-inactive.xpm
+share/themes/Waza/xfwm4/hide-pressed.png
+share/themes/Waza/xfwm4/hide-pressed.xpm
+share/themes/Waza/xfwm4/left-active.xpm
+share/themes/Waza/xfwm4/left-inactive.xpm
+share/themes/Waza/xfwm4/maximize-active.png
+share/themes/Waza/xfwm4/maximize-active.xpm
+share/themes/Waza/xfwm4/maximize-inactive.png
+share/themes/Waza/xfwm4/maximize-inactive.xpm
+share/themes/Waza/xfwm4/maximize-pressed.png
+share/themes/Waza/xfwm4/maximize-pressed.xpm
+share/themes/Waza/xfwm4/maximize-toggled-active.png
+share/themes/Waza/xfwm4/maximize-toggled-active.xpm
+share/themes/Waza/xfwm4/maximize-toggled-inactive.png
+share/themes/Waza/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Waza/xfwm4/maximize-toggled-pressed.png
+share/themes/Waza/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Waza/xfwm4/menu-active.png
+share/themes/Waza/xfwm4/menu-active.xpm
+share/themes/Waza/xfwm4/menu-inactive.png
+share/themes/Waza/xfwm4/menu-inactive.xpm
+share/themes/Waza/xfwm4/menu-pressed.png
+share/themes/Waza/xfwm4/menu-pressed.xpm
+share/themes/Waza/xfwm4/right-active.xpm
+share/themes/Waza/xfwm4/right-inactive.xpm
+share/themes/Waza/xfwm4/shade-active.png
+share/themes/Waza/xfwm4/shade-active.xpm
+share/themes/Waza/xfwm4/shade-inactive.png
+share/themes/Waza/xfwm4/shade-inactive.xpm
+share/themes/Waza/xfwm4/shade-pressed.png
+share/themes/Waza/xfwm4/shade-pressed.xpm
+share/themes/Waza/xfwm4/shade-toggled-active.png
+share/themes/Waza/xfwm4/shade-toggled-active.xpm
+share/themes/Waza/xfwm4/shade-toggled-inactive.png
+share/themes/Waza/xfwm4/shade-toggled-inactive.xpm
+share/themes/Waza/xfwm4/shade-toggled-pressed.png
+share/themes/Waza/xfwm4/shade-toggled-pressed.xpm
+share/themes/Waza/xfwm4/stick-active.png
+share/themes/Waza/xfwm4/stick-active.xpm
+share/themes/Waza/xfwm4/stick-inactive.png
+share/themes/Waza/xfwm4/stick-inactive.xpm
+share/themes/Waza/xfwm4/stick-pressed.png
+share/themes/Waza/xfwm4/stick-pressed.xpm
+share/themes/Waza/xfwm4/stick-toggled-active.png
+share/themes/Waza/xfwm4/stick-toggled-active.xpm
+share/themes/Waza/xfwm4/stick-toggled-inactive.png
+share/themes/Waza/xfwm4/stick-toggled-inactive.xpm
+share/themes/Waza/xfwm4/stick-toggled-pressed.png
+share/themes/Waza/xfwm4/stick-toggled-pressed.xpm
+share/themes/Waza/xfwm4/themerc
+share/themes/Waza/xfwm4/title-1-active.png
+share/themes/Waza/xfwm4/title-1-active.xpm
+share/themes/Waza/xfwm4/title-1-inactive.png
+share/themes/Waza/xfwm4/title-1-inactive.xpm
+share/themes/Waza/xfwm4/title-2-active.png
+share/themes/Waza/xfwm4/title-2-active.xpm
+share/themes/Waza/xfwm4/title-2-inactive.png
+share/themes/Waza/xfwm4/title-2-inactive.xpm
+share/themes/Waza/xfwm4/title-3-active.png
+share/themes/Waza/xfwm4/title-3-active.xpm
+share/themes/Waza/xfwm4/title-3-inactive.png
+share/themes/Waza/xfwm4/title-3-inactive.xpm
+share/themes/Waza/xfwm4/title-4-active.png
+share/themes/Waza/xfwm4/title-4-active.xpm
+share/themes/Waza/xfwm4/title-4-inactive.png
+share/themes/Waza/xfwm4/title-4-inactive.xpm
+share/themes/Waza/xfwm4/title-5-active.png
+share/themes/Waza/xfwm4/title-5-active.xpm
+share/themes/Waza/xfwm4/title-5-inactive.png
+share/themes/Waza/xfwm4/title-5-inactive.xpm
+share/themes/Waza/xfwm4/top-left-active.png
+share/themes/Waza/xfwm4/top-left-active.xpm
+share/themes/Waza/xfwm4/top-left-inactive.png
+share/themes/Waza/xfwm4/top-left-inactive.xpm
+share/themes/Waza/xfwm4/top-right-active.png
+share/themes/Waza/xfwm4/top-right-active.xpm
+share/themes/Waza/xfwm4/top-right-inactive.png
+share/themes/Waza/xfwm4/top-right-inactive.xpm
+share/themes/Wildbush/xfwm4/README
+share/themes/Wildbush/xfwm4/bottom-active.png
+share/themes/Wildbush/xfwm4/bottom-active.xpm
+share/themes/Wildbush/xfwm4/bottom-inactive.png
+share/themes/Wildbush/xfwm4/bottom-inactive.xpm
+share/themes/Wildbush/xfwm4/bottom-left-active.png
+share/themes/Wildbush/xfwm4/bottom-left-active.xpm
+share/themes/Wildbush/xfwm4/bottom-left-inactive.png
+share/themes/Wildbush/xfwm4/bottom-left-inactive.xpm
+share/themes/Wildbush/xfwm4/bottom-right-active.png
+share/themes/Wildbush/xfwm4/bottom-right-active.xpm
+share/themes/Wildbush/xfwm4/bottom-right-inactive.png
+share/themes/Wildbush/xfwm4/bottom-right-inactive.xpm
+share/themes/Wildbush/xfwm4/close-active.xpm
+share/themes/Wildbush/xfwm4/close-inactive.xpm
+share/themes/Wildbush/xfwm4/close-pressed.xpm
+share/themes/Wildbush/xfwm4/hide-active.xpm
+share/themes/Wildbush/xfwm4/hide-inactive.xpm
+share/themes/Wildbush/xfwm4/hide-pressed.xpm
+share/themes/Wildbush/xfwm4/left-active.png
+share/themes/Wildbush/xfwm4/left-active.xpm
+share/themes/Wildbush/xfwm4/left-inactive.png
+share/themes/Wildbush/xfwm4/left-inactive.xpm
+share/themes/Wildbush/xfwm4/maximize-active.xpm
+share/themes/Wildbush/xfwm4/maximize-inactive.xpm
+share/themes/Wildbush/xfwm4/maximize-pressed.xpm
+share/themes/Wildbush/xfwm4/maximize-toggled-active.xpm
+share/themes/Wildbush/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Wildbush/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Wildbush/xfwm4/menu-active.xpm
+share/themes/Wildbush/xfwm4/menu-inactive.xpm
+share/themes/Wildbush/xfwm4/menu-pressed.xpm
+share/themes/Wildbush/xfwm4/right-active.png
+share/themes/Wildbush/xfwm4/right-active.xpm
+share/themes/Wildbush/xfwm4/right-inactive.png
+share/themes/Wildbush/xfwm4/right-inactive.xpm
+share/themes/Wildbush/xfwm4/shade-active.xpm
+share/themes/Wildbush/xfwm4/shade-inactive.xpm
+share/themes/Wildbush/xfwm4/shade-pressed.xpm
+share/themes/Wildbush/xfwm4/shade-toggled-active.xpm
+share/themes/Wildbush/xfwm4/shade-toggled-inactive.xpm
+share/themes/Wildbush/xfwm4/shade-toggled-pressed.xpm
+share/themes/Wildbush/xfwm4/stick-active.xpm
+share/themes/Wildbush/xfwm4/stick-inactive.xpm
+share/themes/Wildbush/xfwm4/stick-pressed.xpm
+share/themes/Wildbush/xfwm4/stick-toggled-active.xpm
+share/themes/Wildbush/xfwm4/stick-toggled-inactive.xpm
+share/themes/Wildbush/xfwm4/stick-toggled-pressed.xpm
+share/themes/Wildbush/xfwm4/themerc
+share/themes/Wildbush/xfwm4/title-1-active.png
+share/themes/Wildbush/xfwm4/title-1-active.xpm
+share/themes/Wildbush/xfwm4/title-1-inactive.png
+share/themes/Wildbush/xfwm4/title-1-inactive.xpm
+share/themes/Wildbush/xfwm4/title-2-active.png
+share/themes/Wildbush/xfwm4/title-2-active.xpm
+share/themes/Wildbush/xfwm4/title-2-inactive.png
+share/themes/Wildbush/xfwm4/title-2-inactive.xpm
+share/themes/Wildbush/xfwm4/title-3-active.png
+share/themes/Wildbush/xfwm4/title-3-active.xpm
+share/themes/Wildbush/xfwm4/title-3-inactive.png
+share/themes/Wildbush/xfwm4/title-3-inactive.xpm
+share/themes/Wildbush/xfwm4/title-4-active.png
+share/themes/Wildbush/xfwm4/title-4-active.xpm
+share/themes/Wildbush/xfwm4/title-4-inactive.png
+share/themes/Wildbush/xfwm4/title-4-inactive.xpm
+share/themes/Wildbush/xfwm4/title-5-active.png
+share/themes/Wildbush/xfwm4/title-5-active.xpm
+share/themes/Wildbush/xfwm4/title-5-inactive.png
+share/themes/Wildbush/xfwm4/title-5-inactive.xpm
+share/themes/Wildbush/xfwm4/top-left-active.png
+share/themes/Wildbush/xfwm4/top-left-active.xpm
+share/themes/Wildbush/xfwm4/top-left-inactive.png
+share/themes/Wildbush/xfwm4/top-left-inactive.xpm
+share/themes/Wildbush/xfwm4/top-right-active.png
+share/themes/Wildbush/xfwm4/top-right-active.xpm
+share/themes/Wildbush/xfwm4/top-right-inactive.png
+share/themes/Wildbush/xfwm4/top-right-inactive.xpm
share/themes/Xfce/xfwm4/README
share/themes/Xfce/xfwm4/bottom-active.xpm
share/themes/Xfce/xfwm4/bottom-inactive.xpm
@@ -3731,6 +4077,8 @@ share/themes/Xfce/xfwm4/top-right-inactive.xpm
@dirrmtry share/themes/Next
@dirrm share/themes/Ops/xfwm4
@dirrmtry share/themes/Ops
+@dirrm share/themes/Opta/xfwm4
+@dirrmtry share/themes/Opta
@dirrm share/themes/Oroborus/xfwm4
@dirrmtry share/themes/Oroborus
@dirrm share/themes/Perl/xfwm4
@@ -3765,6 +4113,8 @@ share/themes/Xfce/xfwm4/top-right-inactive.xpm
@dirrmtry share/themes/Smallscreen
@dirrm share/themes/Smoothwall/xfwm4
@dirrmtry share/themes/Smoothwall
+@dirrm share/themes/Symphony/xfwm4
+@dirrmtry share/themes/Symphony
@dirrm share/themes/Synthetic/xfwm4
@dirrmtry share/themes/Synthetic
@dirrm share/themes/TUX/xfwm4
@@ -3787,6 +4137,10 @@ share/themes/Xfce/xfwm4/top-right-inactive.xpm
@dirrmtry share/themes/Tubular
@dirrm share/themes/Variation/xfwm4
@dirrmtry share/themes/Variation
+@dirrm share/themes/Waza/xfwm4
+@dirrmtry share/themes/Waza
+@dirrm share/themes/Wildbush/xfwm4
+@dirrmtry share/themes/Wildbush
@dirrm share/themes/Xfce/xfwm4
@dirrmtry share/themes/Xfce
@dirrmtry share/themes
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 89293e15336e..48d31c8479d3 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -16,46 +16,50 @@ DIST_SUBDIR= xfce4
MAINTAINER= r.c.ladan@gmail.com
COMMENT= Lightweight media player for Xfce4 based on the xine engine
-LIB_DEPENDS= xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
- xine.16:${PORTSDIR}/multimedia/libxine \
- exo-0.3.0:${PORTSDIR}/x11/libexo
-
-OPTIONS= TAGLIB "Enable metadata editing" off \
- DBUS "Enable remote control support" off
+LIB_DEPENDS= xine.16:${PORTSDIR}/multimedia/libxine \
+ exo-0.3:${PORTSDIR}/x11/libexo
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
USE_BZIP2= yes
+USE_GCC= 3.4+
USE_GETOPT_LONG=yes
USE_GETTEXT= yes
-#NLS is hardcoded to "yes" in source, so no WITHOUT_NLS
USE_GMAKE= yes
-USE_GNOME= libxml2 intlhack
+USE_GNOME= glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv libexo libgui libutilpanel
USE_XLIB= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-USE_LDCONFIG= yes
-INSTALLS_ICONS= yes
+OPTIONS= TAGLIB "Enable metadata editing" off \
+ DBUS "Enable D-BUS support" on \
+ STARTUP "Enable startup notification support" on
.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
.if defined(WITH_TAGLIB)
LIB_DEPENDS+= tag.5:${PORTSDIR}/audio/taglib
-CONFIGURE_ARGS+= --with-taglib
+CONFIGURE_ARGS+=--with-taglib
.else
-CONFIGURE_ARGS+= --without-taglib
+CONFIGURE_ARGS+=--without-taglib
.endif
-.if defined(WITH_DBUS)
+.if !defined(WITHOUT_DBUS)
LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-CONFIGURE_ARGS+= --enable-dbus
+CONFIGURE_ARGS+=--enable-dbus
+.else
+CONFIGURE_ARGS+=--disable-dbus
+.endif
+
+.if !defined(WITHOUT_STARTUP)
+LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+CONFIGURE_ARGS+=--enable-startup-notification
.else
-CONFIGURE_ARGS+= --disable-dbus
+CONFIGURE_ARGS+=--disable-startup-notification
.endif
post-patch:
- @${REINPLACE_CMD} -e "s|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g" \
- ${WRKSRC}/xfmedia/Makefile.in
+ @${REINPLACE_CMD} -e "s|xfmedia_remote_LDADD = |&@LIBXFCEGUI4_LIBS@|" \
+ ${WRKSRC}/src/Makefile.in
.include <bsd.port.post.mk>
diff --git a/multimedia/xfce4-media/files/patch-src_xfmedia-xine.c b/multimedia/xfce4-media/files/patch-src_xfmedia-xine.c
new file mode 100644
index 000000000000..fc68d41e27c7
--- /dev/null
+++ b/multimedia/xfce4-media/files/patch-src_xfmedia-xine.c
@@ -0,0 +1,20 @@
+--- src/xfmedia-xine.c.orig Thu Nov 30 17:49:55 2006
++++ src/xfmedia-xine.c Thu Nov 30 17:50:48 2006
+@@ -38,14 +38,14 @@
+ #ifdef HAVE_MATH_H
+ #include <math.h>
+ #endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+-#endif
+-#ifdef HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+ #endif
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
diff --git a/multimedia/xfce4-xmms-controller-plugin/Makefile b/multimedia/xfce4-xmms-controller-plugin/Makefile
index 98e594372878..8c246d2ee1a3 100644
--- a/multimedia/xfce4-xmms-controller-plugin/Makefile
+++ b/multimedia/xfce4-xmms-controller-plugin/Makefile
@@ -16,11 +16,10 @@ MAINTAINER= robin.schoonover@gmail.com
COMMENT= XMMS controller plugin for the xfce4 panel
BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- xmms.4:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+RUN_DEPENDS= ${BUILD_DEPENDS}
+LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
+IGNORE= Does not support xfce 4.4
USE_GNOME= gtk20
INSTALLS_SHLIB= yes
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index b4b29f178815..95a3843109b0 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -6,31 +6,36 @@
#
PORTNAME= xfce4-xmms-plugin
-PORTVERSION= 0.3.1
-PORTREVISION= 1
+PORTVERSION= 0.4.2
CATEGORIES= multimedia audio xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/ \
- http://download2.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
MAINTAINER= jfb@minet.net
COMMENT= XFce 4 xmms control plugin for xfce4-panel
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
- xmms-config:${PORTSDIR}/multimedia/xmms
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- xml2.5:${PORTSDIR}/textproc/libxml2 \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
- xmms:${PORTSDIR}/multimedia/xmms
-
-USE_BZIP2= yes
-USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
- CPPFLAGS=-I${LOCALBASE}/include \
- LIBS=-L${LOCALBASE}/lib
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pango pkgconfig
+USE_XFCE= configenv libgui libutil panel
+USE_XLIB= yes
+
+OPTIONS= BEEP "Use Beep media player instead of xmms" off
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+
+.if defined(WITH_BEEP)
+LIB_DEPENDS= beep.2:${PORTSDIR}/multimedia/beep-media-player
+CONFIGURE_ARGS+=--with-player=beep
+.else
+LIB_DEPENDS= xmms.4:${PORTSDIR}/multimedia/xmms
+CONFIGURE_ARGS+=--with-player=xmms
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|== x|= x|g' ${WRKSRC}/configure
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/xfce4-xmms-plugin/distinfo b/multimedia/xfce4-xmms-plugin/distinfo
index cf8eec1fbbe3..bebf19d94a35 100644
--- a/multimedia/xfce4-xmms-plugin/distinfo
+++ b/multimedia/xfce4-xmms-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-xmms-plugin-0.3.1.tar.bz2) = 0dac8795b192383c13b1d5cd072b754a
-SHA256 (xfce4/xfce4-xmms-plugin-0.3.1.tar.bz2) = bd01bd8b9075835f067fb46080a30ae047f60733b5009dc7a0f0cf4c9b5d0a1f
-SIZE (xfce4/xfce4-xmms-plugin-0.3.1.tar.bz2) = 518730
+MD5 (xfce4/xfce4-xmms-plugin-0.4.2.tar.bz2) = d621fa744d534c17590848dc34884824
+SHA256 (xfce4/xfce4-xmms-plugin-0.4.2.tar.bz2) = e851f0e24e17ac12a7865952fce7caa788d4b5bf116c6b1a57bafccd0b329efa
+SIZE (xfce4/xfce4-xmms-plugin-0.4.2.tar.bz2) = 361752
diff --git a/multimedia/xfce4-xmms-plugin/pkg-descr b/multimedia/xfce4-xmms-plugin/pkg-descr
index 8dccb3584125..61e85c363d4b 100644
--- a/multimedia/xfce4-xmms-plugin/pkg-descr
+++ b/multimedia/xfce4-xmms-plugin/pkg-descr
@@ -1,4 +1,4 @@
XFce 4 XMMS control module for xfce4-panel.
Author: Patrick van Staveren <pvanstav@cs.wmich.edu>
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-xmms-plugin
diff --git a/multimedia/xfce4-xmms-plugin/pkg-plist b/multimedia/xfce4-xmms-plugin/pkg-plist
index 54c513600da8..d68e4be2272b 100644
--- a/multimedia/xfce4-xmms-plugin/pkg-plist
+++ b/multimedia/xfce4-xmms-plugin/pkg-plist
@@ -1,23 +1,24 @@
-lib/xfce4/panel-plugins/libxmms_plugin.a
-lib/xfce4/panel-plugins/libxmms_plugin.la
-lib/xfce4/panel-plugins/libxmms_plugin.so
+libexec/xfce4/panel-plugins/xfce4-xmms-plugin
+share/locale/cs/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/de/LC_MESSAGES/xfce4-xmms-plugin.mo
-share/locale/ko/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/ja/LC_MESSAGES/xfce4-xmms-plugin.mo
share/locale/lt/LC_MESSAGES/xfce4-xmms-plugin.mo
-share/xfce4/xmms-plugin/xmms-plugin-menu-eject.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-icon.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-next.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-pause.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-play.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-prev.png
-share/xfce4/xmms-plugin/xmms-plugin-menu-stop.png
-share/xfce4/xmms-plugin/xmms-plugin-next.png
-share/xfce4/xmms-plugin/xmms-plugin-pause.png
-share/xfce4/xmms-plugin/xmms-plugin-play.png
-share/xfce4/xmms-plugin/xmms-plugin-prev.png
-share/xfce4/xmms-plugin/xmms-plugin-stop.png
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4
-@dirrm share/xfce4/xmms-plugin
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
+share/locale/tr/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/vi/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-xmms-plugin.mo
+share/xfce4/panel-plugins/xfce4-xmms-plugin.desktop
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-prev.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-play.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-pause.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-stop.png
+share/xfce4/xfce4-xmms-plugin/xmms-plugin-next.png
+@dirrm share/xfce4/xfce4-xmms-plugin
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
+
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 77804d185461..98c4ed2ff559 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -6,37 +6,31 @@
#
PORTNAME= xfce4-print
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= 4.4.0
CATEGORIES= print xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DISTNAME= xfprint-${PORTVERSION}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 graphical frontend for printing
-BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- xfce4mcs-client.2:${PORTSDIR}/x11/libxfce4mcs
-RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-
-USE_GETTEXT= yes
-USE_GNOME= gtk20
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
- CPPFLAGS=-I${LOCALBASE}/include \
- LIBS=-L${LOCALBASE}/lib
-OPTIONS= LPR "Use lpr as printing system" on\
- CUPS "Use cups as printing system" off
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_LDCONFIG= yes
+USE_XFCE= configenv libgui libmcs libutil mcsmanager
+USE_XLIB= yes
+
+OPTIONS= LPR "Use lpr as printing system" on \
+ CUPS "Use cups as printing system" off \
+ LETTER "Use letter paper format instead of A4" off
.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
.if defined(WITH_CUPS)
CONFIGURE_ARGS+=--enable-cups
diff --git a/print/xfce4-print/distinfo b/print/xfce4-print/distinfo
index 0e6f45972cb1..879ae4ee6b8d 100644
--- a/print/xfce4-print/distinfo
+++ b/print/xfce4-print/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfprint-4.2.3.tar.gz) = 64c983a6d7778cbd5d6c93ee1dbbd3f9
-SHA256 (xfce4/xfprint-4.2.3.tar.gz) = f0b815f526ce4a7117217d7b45c4bcf1599df5ed94ff1c1e3974087ca9297398
-SIZE (xfce4/xfprint-4.2.3.tar.gz) = 1169874
+MD5 (xfce4/xfprint-4.4.0.tar.bz2) = 4b6d8f5381e73e912abddf2fdbf9888f
+SHA256 (xfce4/xfprint-4.4.0.tar.bz2) = a7843194252411674e3ab30d7ac20c4c11ff2ab279bd5a6565685be1db4c85f9
+SIZE (xfce4/xfprint-4.4.0.tar.bz2) = 873477
diff --git a/print/xfce4-print/pkg-descr b/print/xfce4-print/pkg-descr
index 8fe54f54402d..4d969bbde10f 100644
--- a/print/xfce4-print/pkg-descr
+++ b/print/xfce4-print/pkg-descr
@@ -1,4 +1,4 @@
XFce 4 print dialog. Provides a graphical frontend for printing. Includes
xfprint4 and xfprint-manager.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/print/xfce4-print/pkg-plist b/print/xfce4-print/pkg-plist
index 304354469591..ce1201fb0779 100644
--- a/print/xfce4-print/pkg-plist
+++ b/print/xfce4-print/pkg-plist
@@ -1,5 +1,16 @@
-bin/xfprint-manager
+bin/xfprint4-manager
bin/xfprint4
+include/xfce4/libxfprint/common.h
+include/xfce4/libxfprint/job.h
+include/xfce4/libxfprint/libxfprint.h
+include/xfce4/libxfprint/printer.h
+include/xfce4/libxfprint/printer-list-window.h
+include/xfce4/libxfprint/printer-queue-window.h
+include/xfce4/libxfprint/printing-system.h
+lib/libxfprint.so.0
+lib/libxfprint.so
+lib/libxfprint.la
+lib/libxfprint.a
lib/xfce4/mcs-plugins/xfprint_plugin.a
lib/xfce4/mcs-plugins/xfprint_plugin.la
lib/xfce4/mcs-plugins/xfprint_plugin.so
@@ -9,12 +20,28 @@ lib/xfce4/mcs-plugins/xfprint_plugin.so
%%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.a
%%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.la
%%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.so
+libdata/pkgconfig/xfprint-1.0.pc
share/applications/xfprint.desktop
share/applications/xfprint-manager.desktop
share/applications/xfce-xfprint-settings.desktop
-share/icons/hicolor/scalable/apps/xfprint.svg
-share/icons/hicolor/48x48/apps/xfprint.png
-share/locale/af/LC_MESSAGES/xfprint.mo
+share/gtk-doc/html/libxfprint
+share/gtk-doc/html/libxfprint/PrinterListWindow.html
+share/gtk-doc/html/libxfprint/PrinterQueueWindow.html
+share/gtk-doc/html/libxfprint/PrintingSystem.html
+share/gtk-doc/html/libxfprint/ch01.html
+share/gtk-doc/html/libxfprint/home.png
+share/gtk-doc/html/libxfprint/index.html
+share/gtk-doc/html/libxfprint/index.sgml
+share/gtk-doc/html/libxfprint/left.png
+share/gtk-doc/html/libxfprint/libxfprint-Job.html
+share/gtk-doc/html/libxfprint/libxfprint-Printer.html
+share/gtk-doc/html/libxfprint/libxfprint.devhelp
+share/gtk-doc/html/libxfprint/right.png
+share/gtk-doc/html/libxfprint/style.css
+share/gtk-doc/html/libxfprint/up.png
+share/icons/hicolor/24x24/devices/printer.png
+share/icons/hicolor/48x48/devices/printer.png
+share/icons/hicolor/scalable/devices/printer.svg
share/locale/ar/LC_MESSAGES/xfprint.mo
share/locale/az/LC_MESSAGES/xfprint.mo
share/locale/be/LC_MESSAGES/xfprint.mo
@@ -23,6 +50,7 @@ share/locale/bn_IN/LC_MESSAGES/xfprint.mo
share/locale/ca/LC_MESSAGES/xfprint.mo
share/locale/cs/LC_MESSAGES/xfprint.mo
share/locale/de/LC_MESSAGES/xfprint.mo
+share/locale/dz/LC_MESSAGES/xfprint.mo
share/locale/el/LC_MESSAGES/xfprint.mo
share/locale/en_GB/LC_MESSAGES/xfprint.mo
share/locale/es/LC_MESSAGES/xfprint.mo
@@ -32,15 +60,17 @@ share/locale/eu/LC_MESSAGES/xfprint.mo
share/locale/fa/LC_MESSAGES/xfprint.mo
share/locale/fi/LC_MESSAGES/xfprint.mo
share/locale/fr/LC_MESSAGES/xfprint.mo
+share/locale/gl/LC_MESSAGES/xfprint.mo
share/locale/gu/LC_MESSAGES/xfprint.mo
share/locale/he/LC_MESSAGES/xfprint.mo
share/locale/hi/LC_MESSAGES/xfprint.mo
share/locale/hu/LC_MESSAGES/xfprint.mo
share/locale/it/LC_MESSAGES/xfprint.mo
share/locale/ja/LC_MESSAGES/xfprint.mo
+share/locale/ka/LC_MESSAGES/xfprint.mo
share/locale/ko/LC_MESSAGES/xfprint.mo
-share/locale/ku/LC_MESSAGES/xfprint.mo
share/locale/lt/LC_MESSAGES/xfprint.mo
+share/locale/mk/LC_MESSAGES/xfprint.mo
share/locale/mr/LC_MESSAGES/xfprint.mo
share/locale/ms/LC_MESSAGES/xfprint.mo
share/locale/nl/LC_MESSAGES/xfprint.mo
@@ -51,7 +81,6 @@ share/locale/pt_PT/LC_MESSAGES/xfprint.mo
share/locale/ro/LC_MESSAGES/xfprint.mo
share/locale/ru/LC_MESSAGES/xfprint.mo
share/locale/sk/LC_MESSAGES/xfprint.mo
-share/locale/sl/LC_MESSAGES/xfprint.mo
share/locale/sv/LC_MESSAGES/xfprint.mo
share/locale/ta/LC_MESSAGES/xfprint.mo
share/locale/tr/LC_MESSAGES/xfprint.mo
@@ -77,56 +106,22 @@ share/xfce4/doc/fr/images/xfprint_prettyprinting.png
share/xfce4/doc/fr/images/xfprint_sheets.png
share/xfce4/doc/fr/images/xfprint_virtualpages.png
share/xfce4/doc/fr/xfprint.html
-share/xfce4/doc/he/images/xfprint_headings.png
-share/xfce4/doc/he/images/xfprint_input.png
-share/xfce4/doc/he/images/xfprint-manager.png
-share/xfce4/doc/he/images/xfprint-manager-queue.png
-share/xfce4/doc/he/images/xfprint_mcs_plugin.png
-share/xfce4/doc/he/images/xfprint_prettyprinting.png
-share/xfce4/doc/he/images/xfprint_sheets.png
-share/xfce4/doc/he/images/xfprint_virtualpages.png
-share/xfce4/doc/he/xfprint.html
+@dirrm include/xfce4/libxfprint
+@dirrmtry include/xfce4
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4/xfprint-plugins
@dirrmtry lib/xfce4
@dirrmtry share/applications
+@dirrm share/gtk-doc/html/libxfprint
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/he/images
-@dirrmtry share/xfce4/doc/he
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 91a3b0ee85fb..ee5b17675590 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -6,26 +6,27 @@
#
PORTNAME= xfce4-battery-plugin
-PORTVERSION= 0.2.0
-PORTREVISION= 9
+PORTVERSION= 0.5.0
CATEGORIES= sysutils xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
MAINTAINER= thorsten.greiner@web.de
COMMENT= Battery monitor panel plugin for XFce4
BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
- xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+RUN_DEPENDS= ${BUILD_DEPENDS}
ONLY_FOR_ARCHS= i386
-USE_GNOME= gtk20
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv panel
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-battery-plugin/distinfo b/sysutils/xfce4-battery-plugin/distinfo
index c53e6803f93f..0cfa6f422f9c 100644
--- a/sysutils/xfce4-battery-plugin/distinfo
+++ b/sysutils/xfce4-battery-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-battery-plugin-0.2.0.tar.gz) = ad6cbb65b356342bf1b474b612beadf4
-SHA256 (xfce4/xfce4-battery-plugin-0.2.0.tar.gz) = 2a8a78cdafc1c8f538de4e46d4da76811c38656f1c07b7130dac16329d2f4da8
-SIZE (xfce4/xfce4-battery-plugin-0.2.0.tar.gz) = 339010
+MD5 (xfce4/xfce4-battery-plugin-0.5.0.tar.bz2) = c1d923bb90b79087ca7044bcc24bab5a
+SHA256 (xfce4/xfce4-battery-plugin-0.5.0.tar.bz2) = 4428f2fe1f5f28e6cc711278fd9c5c90f325cf0c5298f98a5d60940116cbcef8
+SIZE (xfce4/xfce4-battery-plugin-0.5.0.tar.bz2) = 222269
diff --git a/sysutils/xfce4-battery-plugin/files/patch-configure b/sysutils/xfce4-battery-plugin/files/patch-configure
deleted file mode 100644
index 20507a42bf52..000000000000
--- a/sysutils/xfce4-battery-plugin/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig Sat Aug 9 04:05:09 2003
-+++ configure Fri Sep 12 23:28:29 2003
-@@ -19273,7 +19273,8 @@
-
-
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool13/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -19651,7 +19652,7 @@
-
- echo "$as_me:$LINENO: checking where to install panel plugins" >&5
- echo $ECHO_N "checking where to install panel plugins... $ECHO_C" >&6
-- XFCE4_PANEL_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir xfce4-panel-1.0`
-+ XFCE4_PANEL_PLUGINSDIR=${prefix}/lib/xfce4/panel-plugins
-
- echo "$as_me:$LINENO: result: $XFCE4_PANEL_PLUGINSDIR" >&5
- echo "${ECHO_T}$XFCE4_PANEL_PLUGINSDIR" >&6
diff --git a/sysutils/xfce4-battery-plugin/files/patch-panel-plugin::Makefile.in b/sysutils/xfce4-battery-plugin/files/patch-panel-plugin::Makefile.in
deleted file mode 100644
index db6ffeabf9cf..000000000000
--- a/sysutils/xfce4-battery-plugin/files/patch-panel-plugin::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- panel-plugin/Makefile.in.orig Fri Aug 1 12:37:32 2003
-+++ panel-plugin/Makefile.in Fri Aug 1 12:38:09 2003
-@@ -209,8 +209,8 @@
- @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- f="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
-- $(LIBTOOL) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
-+ echo " $(LIBTOOL) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f"; \
-+ $(LIBTOOL) $(LIBTOOLFLAGS) --mode=install $(pluginLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(plugindir)/$$f; \
- else :; fi; \
- done
-
diff --git a/sysutils/xfce4-battery-plugin/files/patch-panel-plugin::battmon.c b/sysutils/xfce4-battery-plugin/files/patch-panel-plugin::battmon.c
deleted file mode 100644
index b6ac06a7275f..000000000000
--- a/sysutils/xfce4-battery-plugin/files/patch-panel-plugin::battmon.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- panel-plugin/battmon.c.orig Sat Feb 11 23:43:01 2006
-+++ panel-plugin/battmon.c Sat Feb 11 23:43:07 2006
-@@ -33,6 +33,7 @@
-
- #ifdef __FreeBSD__
- #include <machine/apm_bios.h>
-+#define APMDEVICE "/dev/apm"
- #elif __OpenBSD__
- #include <sys/param.h>
- #include <machine/apmvar.h>
-@@ -362,6 +363,7 @@
-
-
- if(charge < 0) charge = 0;
-+ if(charge > 100) charge = 100;
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(battmon->battstatus), charge / 100.0);
-
- if(battmon->options.display_label){
diff --git a/sysutils/xfce4-battery-plugin/pkg-descr b/sysutils/xfce4-battery-plugin/pkg-descr
index f5b9e493f4da..cfaa0e46e1ec 100644
--- a/sysutils/xfce4-battery-plugin/pkg-descr
+++ b/sysutils/xfce4-battery-plugin/pkg-descr
@@ -1,3 +1,3 @@
Battery monitor panel plugin for XFce4.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/sysutils/xfce4-battery-plugin/pkg-plist b/sysutils/xfce4-battery-plugin/pkg-plist
index 50ff0c07c809..5d5b1bcd075c 100644
--- a/sysutils/xfce4-battery-plugin/pkg-plist
+++ b/sysutils/xfce4-battery-plugin/pkg-plist
@@ -1,5 +1,17 @@
-lib/xfce4/panel-plugins/libbattmon.a
-lib/xfce4/panel-plugins/libbattmon.la
-lib/xfce4/panel-plugins/libbattmon.so
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4
+libexec/xfce4/panel-plugins/xfce4-battery-plugin
+share/icons/hicolor/16x16/devices/battery.png
+share/icons/hicolor/22x22/devices/battery.png
+share/icons/hicolor/24x24/devices/battery.png
+share/icons/hicolor/32x32/devices/battery.png
+share/icons/hicolor/scalable/devices/battery.svg
+share/locale/ca/LC_MESSAGES/xfce4-battery-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-battery-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-battery-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-battery-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-battery-plugin.mo
+share/xfce4/panel-plugins/battmon.desktop
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
+
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 7658b4045156..5b111dd9e103 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -6,27 +6,24 @@
#
PORTNAME= xfce4-cpugraph-plugin
-PORTVERSION= 0.2.2
-PORTREVISION= 5
+PORTVERSION= 0.3
CATEGORIES= sysutils xfce
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= xfce-goodies
+MASTER_SITES= ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
DIST_SUBDIR= xfce4
+PATCH_SITES= http://people.freebsd.org/~oliver/xfce/
+PATCHFILES= gcc295-xfce4-cpugraph-plugin.patch
MAINTAINER= r.c.ladan@gmail.com
COMMENT= XFce4 systemload plugin with multiple CPU display modes
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GCC= 3.4
-USE_GNOME= gtk20 libxml2
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv panel
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-cpugraph-plugin/distinfo b/sysutils/xfce4-cpugraph-plugin/distinfo
index f3c1eed0d1df..8188e626e311 100644
--- a/sysutils/xfce4-cpugraph-plugin/distinfo
+++ b/sysutils/xfce4-cpugraph-plugin/distinfo
@@ -1,3 +1,6 @@
-MD5 (xfce4/xfce4-cpugraph-plugin-0.2.2.tar.gz) = bde4c578ef469aade3f6b58a9bde8ec6
-SHA256 (xfce4/xfce4-cpugraph-plugin-0.2.2.tar.gz) = 0ae06f7510d1eead31dcbdbd79865dafbab68eb828fb9c910788bdc2cf0a207e
-SIZE (xfce4/xfce4-cpugraph-plugin-0.2.2.tar.gz) = 210953
+MD5 (xfce4/xfce4-cpugraph-plugin-0.3.tar.bz2) = 1a559fe013c8a1b0098ef6f3054bd2fe
+SHA256 (xfce4/xfce4-cpugraph-plugin-0.3.tar.bz2) = bc17d94c29ec32f74b79e8b5e39db8bac7732f815ee13ee82bd90ed4e9426640
+SIZE (xfce4/xfce4-cpugraph-plugin-0.3.tar.bz2) = 164064
+MD5 (xfce4/gcc295-xfce4-cpugraph-plugin.patch) = fe0d16789651650995aca9c80110fbf7
+SHA256 (xfce4/gcc295-xfce4-cpugraph-plugin.patch) = 86d1a82bf02581cd2c148f18eadae48df2da3fd6dcb4cfa5e1d1047c6e44b2a4
+SIZE (xfce4/gcc295-xfce4-cpugraph-plugin.patch) = 373
diff --git a/sysutils/xfce4-cpugraph-plugin/pkg-descr b/sysutils/xfce4-cpugraph-plugin/pkg-descr
index df5013a7a4a9..96aaa2022806 100644
--- a/sysutils/xfce4-cpugraph-plugin/pkg-descr
+++ b/sysutils/xfce4-cpugraph-plugin/pkg-descr
@@ -4,4 +4,4 @@ of the system. The colors and the size of the plugin are customizable.
Author: Alexander Nordfelth <alex.nordfelth@telia.com>
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin
diff --git a/sysutils/xfce4-cpugraph-plugin/pkg-plist b/sysutils/xfce4-cpugraph-plugin/pkg-plist
index 29101aaeca09..3814b25cf7eb 100644
--- a/sysutils/xfce4-cpugraph-plugin/pkg-plist
+++ b/sysutils/xfce4-cpugraph-plugin/pkg-plist
@@ -1,4 +1,6 @@
-lib/xfce4/panel-plugins/libcpugraph.so
-lib/xfce4/panel-plugins/libcpugraph.la
-lib/xfce4/panel-plugins/libcpugraph.a
-@dirrmtry lib/xfce4/panel-plugins
+libexec/xfce4/panel-plugins/xfce4-cpugraph-plugin
+share/xfce4/panel-plugins/cpugraph.desktop
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 55c97fdbfdb0..42005dc65980 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -6,27 +6,27 @@
#
PORTNAME= xfce4-fsguard-plugin
-PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTVERSION= 0.3.0
CATEGORIES= sysutils xfce
MASTER_SITES= http://download.berlios.de/xfce-goodies/ \
http://ftp.lug.udel.edu/pub/NetBSD/packages/distfiles/ \
http://ftp.citkit.ru/pub/NetBSD/packages/distfiles/ \
${MASTER_SITES_NETBSD}
DIST_SUBDIR= xfce4
+PATCH_SITES= http://people.freebsd.org/~oliver/xfce/
+PATCHFILES= gcc295-xfce4-fsguard-plugin.patch
MAINTAINER= jfb@minet.net
COMMENT= XFce4 panel plugin to check a mountpoint for free disk space
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- xml2.5:${PORTSDIR}/textproc/libxml2 \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME= gtk20
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+INSTALLS_ICONS= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv panel
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-fsguard-plugin/distinfo b/sysutils/xfce4-fsguard-plugin/distinfo
index 6c4e01c59cc0..fcf2a086a53f 100644
--- a/sysutils/xfce4-fsguard-plugin/distinfo
+++ b/sysutils/xfce4-fsguard-plugin/distinfo
@@ -1,3 +1,6 @@
-MD5 (xfce4/xfce4-fsguard-plugin-0.2.1.tar.gz) = 6fa6c2b734ee8d4c0a5901f6d704b6c9
-SHA256 (xfce4/xfce4-fsguard-plugin-0.2.1.tar.gz) = c3250ce091a164e37413a962f99755beb7c517c0ab29201c4335cd43537479a4
-SIZE (xfce4/xfce4-fsguard-plugin-0.2.1.tar.gz) = 339959
+MD5 (xfce4/xfce4-fsguard-plugin-0.3.0.tar.gz) = 59a73ec4cdcfcc46aa6900ce15cfe725
+SHA256 (xfce4/xfce4-fsguard-plugin-0.3.0.tar.gz) = c11bb58e89a8f55fdb7557300a43233abd6131cc5cc9b3402fbc398e21300201
+SIZE (xfce4/xfce4-fsguard-plugin-0.3.0.tar.gz) = 158953
+MD5 (xfce4/gcc295-xfce4-fsguard-plugin.patch) = 5e4c5b1cc472a2e68297b6f1de61d165
+SHA256 (xfce4/gcc295-xfce4-fsguard-plugin.patch) = 670c5f72b21cc75316b0bda981767a24a291e6246c7b9ac88a03c774d1915f43
+SIZE (xfce4/gcc295-xfce4-fsguard-plugin.patch) = 491
diff --git a/sysutils/xfce4-fsguard-plugin/pkg-descr b/sysutils/xfce4-fsguard-plugin/pkg-descr
index 6d6e0d56fe8e..f0526e7a887d 100644
--- a/sysutils/xfce4-fsguard-plugin/pkg-descr
+++ b/sysutils/xfce4-fsguard-plugin/pkg-descr
@@ -7,4 +7,4 @@ If you left-click on its icon, it opens the
mountpoint directory in the file manager.
Author: Andre Lerche <a.lerche@gmx.net>
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin
diff --git a/sysutils/xfce4-fsguard-plugin/pkg-plist b/sysutils/xfce4-fsguard-plugin/pkg-plist
index dcae113035d8..8587585879e2 100644
--- a/sysutils/xfce4-fsguard-plugin/pkg-plist
+++ b/sysutils/xfce4-fsguard-plugin/pkg-plist
@@ -1,5 +1,14 @@
@comment $FreeBSD$
-lib/xfce4/panel-plugins/libfsguard.a
-lib/xfce4/panel-plugins/libfsguard.la
-lib/xfce4/panel-plugins/libfsguard.so
-@dirrmtry lib/xfce4/panel-plugins
+libexec/xfce4/panel-plugins/xfce4-fsguard-plugin
+share/icons/hicolor/48x48/apps/xfce-fsguard.png
+share/locale/de/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-fsguard-plugin.mo
+share/xfce4/panel-plugins/fsguard.desktop
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index d8ee434f6f14..69469c865b74 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -3,27 +3,26 @@
# Whom: Matt Lancereau <ports@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/xfce4-genmon-plugin/Makefile,v 1.1 2006/10/02 20:33:19 ahze Exp $
+#
PORTNAME= xfce4-genmon-plugin
-PORTVERSION= 1.1
-PORTREVISION= 3
+PORTVERSION= 2.0
CATEGORIES= sysutils xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
DIST_SUBDIR= xfce4
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= freebsd@unixfreunde.de
COMMENT= Generic Monitor XFce4 panel plugin
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME= gtk20 libxml2
+#USE_AUTOTOOLS= aclocal:19 autoheader:259 automake:19 autoconf:259
GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv panel
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-genmon-plugin/distinfo b/sysutils/xfce4-genmon-plugin/distinfo
index 7bd92c9e3b87..1e27c31ede0f 100644
--- a/sysutils/xfce4-genmon-plugin/distinfo
+++ b/sysutils/xfce4-genmon-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-genmon-plugin-1.1.tar.gz) = 130be5e17d4ae41f86bbb952adb6a95d
-SHA256 (xfce4/xfce4-genmon-plugin-1.1.tar.gz) = be43ef66dd753a151301c475c1b0b85c36702a8e17ac4008d118c973052e2a28
-SIZE (xfce4/xfce4-genmon-plugin-1.1.tar.gz) = 229388
+MD5 (xfce4/xfce4-genmon-plugin-2.0.tar.bz2) = ecf5f2dab90733abc81e7ef4a4146620
+SHA256 (xfce4/xfce4-genmon-plugin-2.0.tar.bz2) = 291a2be7958fbfd3bc6b02defad963c7725a59b7fdf02e106abb9e5d62d1a091
+SIZE (xfce4/xfce4-genmon-plugin-2.0.tar.bz2) = 171190
diff --git a/sysutils/xfce4-genmon-plugin/pkg-descr b/sysutils/xfce4-genmon-plugin/pkg-descr
index 896780449070..e48cf066c05a 100644
--- a/sysutils/xfce4-genmon-plugin/pkg-descr
+++ b/sysutils/xfce4-genmon-plugin/pkg-descr
@@ -3,4 +3,4 @@ captures its output and displays it as a string into the panel.
Author: Roger Seguin <roger_seguin@msn.com>
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin
diff --git a/sysutils/xfce4-genmon-plugin/pkg-plist b/sysutils/xfce4-genmon-plugin/pkg-plist
index b3cceee20e4f..7779c38ce0a0 100644
--- a/sysutils/xfce4-genmon-plugin/pkg-plist
+++ b/sysutils/xfce4-genmon-plugin/pkg-plist
@@ -1,4 +1,6 @@
-lib/xfce4/panel-plugins/libgenmon.a
-lib/xfce4/panel-plugins/libgenmon.la
-lib/xfce4/panel-plugins/libgenmon.so
-@dirrmtry lib/xfce4/panel-plugins
+libexec/xfce4/panel-plugins/xfce4-genmon-plugin
+share/xfce4/panel-plugins/genmon.desktop
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
diff --git a/sysutils/xfce4-mcs-manager/Makefile b/sysutils/xfce4-mcs-manager/Makefile
index a240aff02c25..6821ee13e321 100644
--- a/sysutils/xfce4-mcs-manager/Makefile
+++ b/sysutils/xfce4-mcs-manager/Makefile
@@ -6,29 +6,24 @@
#
PORTNAME= xfce4-mcs-manager
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= 4.4.0
CATEGORIES= sysutils xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DISTNAME= xfce-mcs-manager-${PORTVERSION}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 settings manager
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- xfce4mcs-manager.2:${PORTSDIR}/x11/libxfce4mcs
-
-USE_GETTEXT= yes
-USE_GNOME= glib20 gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
- CPPFLAGS=-I${LOCALBASE}/include \
- LIBS=-L${LOCALBASE}/lib
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv libgui libmcs
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-mcs-manager/distinfo b/sysutils/xfce4-mcs-manager/distinfo
index 4551db6d5e1e..ca877412c5a1 100644
--- a/sysutils/xfce4-mcs-manager/distinfo
+++ b/sysutils/xfce4-mcs-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce-mcs-manager-4.2.3.tar.gz) = 029e7cc2b20a3de5f908483b4253f492
-SHA256 (xfce4/xfce-mcs-manager-4.2.3.tar.gz) = 9bc1d715ee77a3d910214dd2fe6f537ee39960177f869a781361535a8d9a1828
-SIZE (xfce4/xfce-mcs-manager-4.2.3.tar.gz) = 764330
+MD5 (xfce4/xfce-mcs-manager-4.4.0.tar.bz2) = 12be1f5676799a4210d3883c7b4b7294
+SHA256 (xfce4/xfce-mcs-manager-4.4.0.tar.bz2) = 2499dc521feaba0594ecbdfa2ddf4f8a286fb3d58ca82855a2e161800ddd231e
+SIZE (xfce4/xfce-mcs-manager-4.4.0.tar.bz2) = 611521
diff --git a/sysutils/xfce4-mcs-manager/pkg-descr b/sysutils/xfce4-mcs-manager/pkg-descr
index b7cb5f8338fb..1fde509533dd 100644
--- a/sysutils/xfce4-mcs-manager/pkg-descr
+++ b/sysutils/xfce4-mcs-manager/pkg-descr
@@ -1,4 +1,4 @@
XFce 4 settings manager provides a control center for settings manager
plugins that are provided by other modules.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/sysutils/xfce4-mcs-manager/pkg-plist b/sysutils/xfce4-mcs-manager/pkg-plist
index cfb9f5505029..4f6412517642 100644
--- a/sysutils/xfce4-mcs-manager/pkg-plist
+++ b/sysutils/xfce4-mcs-manager/pkg-plist
@@ -4,7 +4,6 @@ include/xfce4/xfce-mcs-manager/manager-plugin.h
libdata/pkgconfig/xfce-mcs-manager.pc
share/applications/xfce-settings-manager.desktop
share/icons/hicolor/48x48/apps/xfce4-settings.png
-share/locale/af/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ar/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/az/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/be/LC_MESSAGES/xfce-mcs-manager.mo
@@ -12,8 +11,8 @@ share/locale/bg/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/bn_IN/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ca/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/cs/LC_MESSAGES/xfce-mcs-manager.mo
-share/locale/da/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/de/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/dz/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/el/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/en_GB/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/eo/LC_MESSAGES/xfce-mcs-manager.mo
@@ -24,15 +23,17 @@ share/locale/eu/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/fa/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/fi/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/fr/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/gl/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/gu/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/he/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/hi/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/hu/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/it/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ja/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/ka/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ko/LC_MESSAGES/xfce-mcs-manager.mo
-share/locale/ku/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/lt/LC_MESSAGES/xfce-mcs-manager.mo
+share/locale/mk/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/mr/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ms/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/nb_NO/LC_MESSAGES/xfce-mcs-manager.mo
@@ -44,7 +45,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ro/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ru/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/sk/LC_MESSAGES/xfce-mcs-manager.mo
-share/locale/sl/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/sv/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/ta/LC_MESSAGES/xfce-mcs-manager.mo
share/locale/tr/LC_MESSAGES/xfce-mcs-manager.mo
@@ -61,53 +61,30 @@ share/xfce4/doc/fr/images/smgr_from_panel.png
share/xfce4/doc/fr/images/smgr_from_root_menu.png
share/xfce4/doc/fr/images/smgr_from_setup_button.png
share/xfce4/doc/fr/xfce-mcs-manager.html
-share/xfce4/doc/he/images/settings_manager.png
-share/xfce4/doc/he/images/smgr_from_root_menu.png
-share/xfce4/doc/he/images/smgr_from_setup_button.png
-share/xfce4/doc/he/xfce-mcs-manager.html
+share/xfce4/doc/it/images/settings_manager.png
+share/xfce4/doc/it/images/smgr_from_panel.png
+share/xfce4/doc/it/images/smgr_from_root_menu.png
+share/xfce4/doc/it/images/smgr_from_setup_button.png
+share/xfce4/doc/it/xfce-mcs-manager.html
@dirrm include/xfce4/xfce-mcs-manager
@dirrmtry include/xfce4
@dirrmtry share/applications
@dirrmtry share/icons/hicolor
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/he/images
-@dirrmtry share/xfce4/doc/he
+@dirrmtry share/xfce4/doc/it/images
+@dirrmtry share/xfce4/doc/it
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index d50718280974..a1b1c8697718 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -3,33 +3,27 @@
# Whom: James Earl <jdearl@telus.net>
#
# $FreeBSD$
-#
PORTNAME= xfce4-mcs-plugins
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= 4.4.0
CATEGORIES= sysutils xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DISTNAME= xfce-mcs-plugins-${PORTVERSION}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 settings manager plugins
-BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-
-USE_GETTEXT= yes
-USE_GNOME= gtk20
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${X11BASE}/lib" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
- LIBS=-L${LOCALBASE}/lib
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+# remove panel dependency when xfce-filemanager.png issue got resolved upstream
+USE_XFCE= configenv libgui mcsmanager panel
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-mcs-plugins/distinfo b/sysutils/xfce4-mcs-plugins/distinfo
index 28ab1ffdca68..9fa340c2b83a 100644
--- a/sysutils/xfce4-mcs-plugins/distinfo
+++ b/sysutils/xfce4-mcs-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce-mcs-plugins-4.2.3.tar.gz) = cdd1ca3ff7610a45658aa801b91da8dc
-SHA256 (xfce4/xfce-mcs-plugins-4.2.3.tar.gz) = 57dffc6ac2d44a8feb11e30f4a12810ab3a22b436b38ea873d3706a62caea169
-SIZE (xfce4/xfce-mcs-plugins-4.2.3.tar.gz) = 1009785
+MD5 (xfce4/xfce-mcs-plugins-4.4.0.tar.bz2) = 95213345e3ccd224a30b2be01e9c06b9
+SHA256 (xfce4/xfce-mcs-plugins-4.4.0.tar.bz2) = 844d139946a417f17e0d88da7c5bb548cf2ef1f4438ae58e051890b765db1fc4
+SIZE (xfce4/xfce-mcs-plugins-4.4.0.tar.bz2) = 850632
diff --git a/sysutils/xfce4-mcs-plugins/pkg-descr b/sysutils/xfce4-mcs-plugins/pkg-descr
index f91e5addd65c..1738bc0347b5 100644
--- a/sysutils/xfce4-mcs-plugins/pkg-descr
+++ b/sysutils/xfce4-mcs-plugins/pkg-descr
@@ -2,4 +2,4 @@ XFce 4 settings manager plugins. The plugins provide settings dialogs
for general items that are not part of a package, e.g. GTK settings,
mouse settings and keyboard settings.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/sysutils/xfce4-mcs-plugins/pkg-plist b/sysutils/xfce4-mcs-plugins/pkg-plist
index ba7285dd4bc0..15474232a67d 100644
--- a/sysutils/xfce4-mcs-plugins/pkg-plist
+++ b/sysutils/xfce4-mcs-plugins/pkg-plist
@@ -1,6 +1,9 @@
lib/xfce4/mcs-plugins/display_plugin.a
lib/xfce4/mcs-plugins/display_plugin.la
lib/xfce4/mcs-plugins/display_plugin.so
+lib/xfce4/mcs-plugins/fm_plugin.a
+lib/xfce4/mcs-plugins/fm_plugin.la
+lib/xfce4/mcs-plugins/fm_plugin.so
lib/xfce4/mcs-plugins/keyboard_plugin.a
lib/xfce4/mcs-plugins/keyboard_plugin.la
lib/xfce4/mcs-plugins/keyboard_plugin.so
@@ -25,7 +28,6 @@ share/icons/hicolor/scalable/apps/xfce4-display.svg
share/icons/hicolor/scalable/apps/xfce4-keyboard.svg
share/icons/hicolor/scalable/apps/xfce4-mouse.svg
share/icons/hicolor/scalable/apps/xfce4-ui.svg
-share/locale/af/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ar/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/az/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/bg/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -33,8 +35,8 @@ share/locale/be/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/bn_IN/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ca/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/cs/LC_MESSAGES/xfce-mcs-plugins.mo
-share/locale/da/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/de/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/dz/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/el/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/en_GB/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/eo/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -45,15 +47,17 @@ share/locale/eu/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/fa/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/fi/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/fr/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/gl/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/gu/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/he/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/hi/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/hu/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/it/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ja/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/ka/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ko/LC_MESSAGES/xfce-mcs-plugins.mo
-share/locale/ku/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/lt/LC_MESSAGES/xfce-mcs-plugins.mo
+share/locale/mk/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/mr/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ms/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/nl/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -64,7 +68,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ro/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ru/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/sk/LC_MESSAGES/xfce-mcs-plugins.mo
-share/locale/sl/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/sv/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/ta/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/tr/LC_MESSAGES/xfce-mcs-plugins.mo
@@ -72,6 +75,7 @@ share/locale/uk/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/vi/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/zh_CN/LC_MESSAGES/xfce-mcs-plugins.mo
share/locale/zh_TW/LC_MESSAGES/xfce-mcs-plugins.mo
+share/xfce-mcs-plugins/shortcuts/default.xml
share/xfce4/doc/C/images/display_preferences.png
share/xfce4/doc/C/images/font_selection.png
share/xfce4/doc/C/images/keyboard_settings.png
@@ -85,14 +89,19 @@ share/xfce4/doc/fr/images/keyboard_settings.png
share/xfce4/doc/fr/images/mouse_settings.png
share/xfce4/doc/fr/images/user_interface_settings.png
share/xfce4/doc/fr/xfce-mcs-plugins.html
-share/xfce4/doc/he/images/display_preferences.png
-share/xfce4/doc/he/images/font_selection.png
-share/xfce4/doc/he/images/keyboard_settings.png
-share/xfce4/doc/he/images/mouse_settings.png
-share/xfce4/doc/he/images/user_interface_settings.png
-share/xfce4/doc/he/xfce-mcs-plugins.html
+share/xfce4/doc/it/images/font_selection.png
+share/xfce4/doc/it/images/keyboard_settings.png
+share/xfce4/doc/it/images/mouse_settings.png
+share/xfce4/doc/it/images/user_interface_settings.png
+share/xfce4/doc/it/xfce-mcs-plugins.html
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrm share/xfce-mcs-plugins/shortcuts
+@dirrm share/xfce-mcs-plugins
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@@ -101,35 +110,5 @@ share/xfce4/doc/he/xfce-mcs-plugins.html
@dirrmtry share/xfce4/doc/he
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index 14e17358af1f..d99c613bffc9 100644
--- a/sysutils/xfce4-minicmd-plugin/Makefile
+++ b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -6,19 +6,22 @@
#
PORTNAME= xfce4-minicmd-plugin
-PORTVERSION= 0.3.0
-PORTREVISION= 1
+PORTVERSION= 0.4
CATEGORIES= sysutils xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
DIST_SUBDIR= xfce4
MAINTAINER= demon@FreeBSD.org
COMMENT= Displays a mini-command line on the xfce4-panel
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv panel
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-minicmd-plugin/distinfo b/sysutils/xfce4-minicmd-plugin/distinfo
index 57f7ff1b1c2a..932e99f6bee6 100644
--- a/sysutils/xfce4-minicmd-plugin/distinfo
+++ b/sysutils/xfce4-minicmd-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-minicmd-plugin-0.3.0.tar.gz) = fe52a8ed8451ed41366d5b4abb2dbf9e
-SHA256 (xfce4/xfce4-minicmd-plugin-0.3.0.tar.gz) = 2d4e3709d015d00965047998429071f6940746ccd69c3a7637e74c1d72ce948c
-SIZE (xfce4/xfce4-minicmd-plugin-0.3.0.tar.gz) = 329376
+MD5 (xfce4/xfce4-minicmd-plugin-0.4.tar.bz2) = 8739e1b25432b2866efa078551c444fc
+SHA256 (xfce4/xfce4-minicmd-plugin-0.4.tar.bz2) = 6783a22725240984c45eef1ff34c28a65cf16a4fc90fa58ef3df60cbe1923951
+SIZE (xfce4/xfce4-minicmd-plugin-0.4.tar.bz2) = 326565
diff --git a/sysutils/xfce4-minicmd-plugin/pkg-descr b/sysutils/xfce4-minicmd-plugin/pkg-descr
index 183683a1ca0c..c510215e398a 100644
--- a/sysutils/xfce4-minicmd-plugin/pkg-descr
+++ b/sysutils/xfce4-minicmd-plugin/pkg-descr
@@ -1,3 +1,5 @@
Displays a mini-command line on the xfce4-panel. Uses the same history file as
xfrun4. Use <Up> and <Down> to scroll through history. <Enter> executes the
command and <Ctrl>-<Enter> executes the command in a terminal.
+
+WWW: http://www.xfce.org/
diff --git a/sysutils/xfce4-minicmd-plugin/pkg-plist b/sysutils/xfce4-minicmd-plugin/pkg-plist
index 11e3dcabb4d1..7fb9426edf79 100644
--- a/sysutils/xfce4-minicmd-plugin/pkg-plist
+++ b/sysutils/xfce4-minicmd-plugin/pkg-plist
@@ -1,3 +1,8 @@
lib/xfce4/panel-plugins/libminicmd.a
lib/xfce4/panel-plugins/libminicmd.la
lib/xfce4/panel-plugins/libminicmd.so
+share/xfce4/panel-plugins/minicmd.desktop
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index e7b7d079cf54..eb6efa440a43 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -6,25 +6,22 @@
#
PORTNAME= xfce4-netload-plugin
-PORTVERSION= 0.3.2
-PORTREVISION= 2
+PORTVERSION= 0.4
CATEGORIES= sysutils xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
DIST_SUBDIR= xfce4
MAINTAINER= demon@FreeBSD.org
COMMENT= Network Load plugin for XFce4
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
- xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_BZIP2= yes
-USE_GNOME= gtk20
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv panel
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-netload-plugin/distinfo b/sysutils/xfce4-netload-plugin/distinfo
index 368e7191bd2e..90e07296cd92 100644
--- a/sysutils/xfce4-netload-plugin/distinfo
+++ b/sysutils/xfce4-netload-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-netload-plugin-0.3.2.tar.bz2) = 755dcc170fb33274378c7b110cf21f56
-SHA256 (xfce4/xfce4-netload-plugin-0.3.2.tar.bz2) = 580c8dd3fcfa52cce732bb371bd914fe99e3cfa47b157416ccd883909f3958c3
-SIZE (xfce4/xfce4-netload-plugin-0.3.2.tar.bz2) = 241002
+MD5 (xfce4/xfce4-netload-plugin-0.4.tar.bz2) = 7f085d86493b48a0275cde678e32380e
+SHA256 (xfce4/xfce4-netload-plugin-0.4.tar.bz2) = ba96f609c719e070bab413da875a3a38f1bc0e8b42f4784c68ad1144daa83135
+SIZE (xfce4/xfce4-netload-plugin-0.4.tar.bz2) = 127496
diff --git a/sysutils/xfce4-netload-plugin/files/patch-panel-plugin-Makefile.in b/sysutils/xfce4-netload-plugin/files/patch-panel-plugin-Makefile.in
deleted file mode 100644
index e590c9863f57..000000000000
--- a/sysutils/xfce4-netload-plugin/files/patch-panel-plugin-Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
---- panel-plugin/Makefile.in.orig Tue May 17 10:47:05 2005
-+++ panel-plugin/Makefile.in Sun Jan 22 13:27:40 2006
-@@ -229,3 +229,2 @@
- libnetload_la_LIBADD = \
-- @LIBGTOP_LIBS@ \
- @SOLLIBS@ \
diff --git a/sysutils/xfce4-netload-plugin/pkg-descr b/sysutils/xfce4-netload-plugin/pkg-descr
index 7d5c6002c425..b713ae647ace 100644
--- a/sysutils/xfce4-netload-plugin/pkg-descr
+++ b/sysutils/xfce4-netload-plugin/pkg-descr
@@ -1,3 +1,3 @@
Network Load plugin for XFce4.
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin
diff --git a/sysutils/xfce4-netload-plugin/pkg-plist b/sysutils/xfce4-netload-plugin/pkg-plist
index a8ecf2867b71..cfbba3912d8b 100644
--- a/sysutils/xfce4-netload-plugin/pkg-plist
+++ b/sysutils/xfce4-netload-plugin/pkg-plist
@@ -1,4 +1,13 @@
-lib/xfce4/panel-plugins/libnetload.a
-lib/xfce4/panel-plugins/libnetload.la
-lib/xfce4/panel-plugins/libnetload.so
-@dirrmtry lib/xfce4/panel-plugins
+libexec/xfce4/panel-plugins/xfce4-netload-plugin
+share/locale/de/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/ca/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-netload-plugin.mo
+share/locale/uk/LC_MESSAGES/xfce4-netload-plugin.mo
+share/xfce4/panel-plugins/netload.desktop
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
diff --git a/sysutils/xfce4-showdesktop-plugin/Makefile b/sysutils/xfce4-showdesktop-plugin/Makefile
deleted file mode 100644
index 3db5601a1fd0..000000000000
--- a/sysutils/xfce4-showdesktop-plugin/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for: xfce-showdesktop-plugin
-# Date created: 04 August 2003
-# Whom: Thorsten Greiner <thorsten.greiner@web.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME= xfce4-showdesktop-plugin
-PORTVERSION= 0.3.0
-PORTREVISION= 8
-CATEGORIES= sysutils xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
-DIST_SUBDIR= xfce4
-
-MAINTAINER= thorsten.greiner@web.de
-COMMENT= Xfce 4 Plugin to minimize/unminimize all windows
-
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
- xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_GNOME= gtk20
-GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-
-.include <bsd.port.mk>
diff --git a/sysutils/xfce4-showdesktop-plugin/distinfo b/sysutils/xfce4-showdesktop-plugin/distinfo
deleted file mode 100644
index ada0426a7491..000000000000
--- a/sysutils/xfce4-showdesktop-plugin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xfce4-showdesktop-plugin-0.3.0.tar.gz) = b57ee27a30302f036bce64ce03a5e14c
-SHA256 (xfce4/xfce4-showdesktop-plugin-0.3.0.tar.gz) = 3102cdac4e37878976ec9a83702e0d11a602b1bc5d988f450bb2396b59e12ac3
-SIZE (xfce4/xfce4-showdesktop-plugin-0.3.0.tar.gz) = 367286
diff --git a/sysutils/xfce4-showdesktop-plugin/files/patch-configure b/sysutils/xfce4-showdesktop-plugin/files/patch-configure
deleted file mode 100644
index 927b970a84f0..000000000000
--- a/sysutils/xfce4-showdesktop-plugin/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig Mon Aug 4 21:43:10 2003
-+++ configure Mon Aug 4 21:44:17 2003
-@@ -19318,7 +19318,8 @@
-
-
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool13/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -19612,7 +19613,7 @@
-
- echo "$as_me:$LINENO: checking where to install panel plugins" >&5
- echo $ECHO_N "checking where to install panel plugins... $ECHO_C" >&6
-- XFCE4_PANEL_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir xfce4-panel-1.0`
-+ XFCE4_PANEL_PLUGINSDIR=${prefix}/lib/xfce4/panel-plugins
-
- echo "$as_me:$LINENO: result: $XFCE4_PANEL_PLUGINSDIR" >&5
- echo "${ECHO_T}$XFCE4_PANEL_PLUGINSDIR" >&6
diff --git a/sysutils/xfce4-showdesktop-plugin/files/patch-panel-plugin::showdesktop.c b/sysutils/xfce4-showdesktop-plugin/files/patch-panel-plugin::showdesktop.c
deleted file mode 100644
index f8221bbeaaf0..000000000000
--- a/sysutils/xfce4-showdesktop-plugin/files/patch-panel-plugin::showdesktop.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$FreeBSD$
-
---- panel-plugin/showdesktop.c.orig Wed Nov 5 12:06:04 2003
-+++ panel-plugin/showdesktop.c Sat Jan 10 11:21:40 2004
-@@ -225,10 +225,11 @@
- static void
- plugin_free (Control *ctrl)
- {
-+ gui *plugin;
- g_return_if_fail (ctrl != NULL);
- g_return_if_fail (ctrl->data != NULL);
-
-- gui *plugin = ctrl->data;
-+ plugin = ctrl->data;
- g_free(plugin);
- }
-
diff --git a/sysutils/xfce4-showdesktop-plugin/pkg-descr b/sysutils/xfce4-showdesktop-plugin/pkg-descr
deleted file mode 100644
index 025181e94d14..000000000000
--- a/sysutils/xfce4-showdesktop-plugin/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a little XFCE Plugin, to minimize and unminimize all windows on the
-current workspace.
-
-WWW: http://www.xfce.org
diff --git a/sysutils/xfce4-showdesktop-plugin/pkg-plist b/sysutils/xfce4-showdesktop-plugin/pkg-plist
deleted file mode 100644
index 14aafe9d8cac..000000000000
--- a/sysutils/xfce4-showdesktop-plugin/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xfce4/panel-plugins/libshowdesktop.a
-lib/xfce4/panel-plugins/libshowdesktop.la
-lib/xfce4/panel-plugins/libshowdesktop.so
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index b12e5df04504..f5ffc533845f 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -6,24 +6,22 @@
#
PORTNAME= xfce4-systemload-plugin
-PORTVERSION= 0.3.4
-PORTREVISION= 6
+PORTVERSION= 0.4.2
CATEGORIES= sysutils xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
MAINTAINER= thorsten.greiner@web.de
COMMENT= System Load plugin for XFce4
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
- xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME= gtk20
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv panel
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-systemload-plugin/distinfo b/sysutils/xfce4-systemload-plugin/distinfo
index 07c9b75948e2..596381b9c0f6 100644
--- a/sysutils/xfce4-systemload-plugin/distinfo
+++ b/sysutils/xfce4-systemload-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-systemload-plugin-0.3.4.tar.gz) = e9feb00af63e9953d9e690c145cc087e
-SHA256 (xfce4/xfce4-systemload-plugin-0.3.4.tar.gz) = c7e7d29f7a9735eb224f94a8baeb161022983ed294e01c618606714823956735
-SIZE (xfce4/xfce4-systemload-plugin-0.3.4.tar.gz) = 219362
+MD5 (xfce4/xfce4-systemload-plugin-0.4.2.tar.bz2) = cc5777bb1621704927513eb8eef5f07c
+SHA256 (xfce4/xfce4-systemload-plugin-0.4.2.tar.bz2) = 0ca193fd7a21403566b452e42951e5ab816dcc69cfcca816b245da00f41ffc55
+SIZE (xfce4/xfce4-systemload-plugin-0.4.2.tar.bz2) = 184575
diff --git a/sysutils/xfce4-systemload-plugin/files/patch-configure b/sysutils/xfce4-systemload-plugin/files/patch-configure
deleted file mode 100644
index 32a52a34ab9d..000000000000
--- a/sysutils/xfce4-systemload-plugin/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Wed Jul 23 22:20:56 2003
-+++ configure Fri Aug 1 12:56:48 2003
-@@ -19567,7 +19568,7 @@
-
- echo "$as_me:$LINENO: checking where to install panel plugins" >&5
- echo $ECHO_N "checking where to install panel plugins... $ECHO_C" >&6
-- XFCE4_PANEL_PLUGINSDIR=`$PKG_CONFIG --variable=pluginsdir xfce4-panel-1.0`
-+ XFCE4_PANEL_PLUGINSDIR=${prefix}/lib/xfce4/panel-plugins
-
- echo "$as_me:$LINENO: result: $XFCE4_PANEL_PLUGINSDIR" >&5
- echo "${ECHO_T}$XFCE4_PANEL_PLUGINSDIR" >&6
diff --git a/sysutils/xfce4-systemload-plugin/pkg-descr b/sysutils/xfce4-systemload-plugin/pkg-descr
index bcb49c69b4b8..40f5a6da297c 100644
--- a/sysutils/xfce4-systemload-plugin/pkg-descr
+++ b/sysutils/xfce4-systemload-plugin/pkg-descr
@@ -1,4 +1,4 @@
System Load plugin for XFce4.
Author: Riccardo Persichetti <riccardo.persichetti@tin.it>
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin
diff --git a/sysutils/xfce4-systemload-plugin/pkg-plist b/sysutils/xfce4-systemload-plugin/pkg-plist
index bb54a79ca642..2bfb734a65eb 100644
--- a/sysutils/xfce4-systemload-plugin/pkg-plist
+++ b/sysutils/xfce4-systemload-plugin/pkg-plist
@@ -1,4 +1,22 @@
-lib/xfce4/panel-plugins/libsystemload.a
-lib/xfce4/panel-plugins/libsystemload.la
-lib/xfce4/panel-plugins/libsystemload.so
-@dirrmtry lib/xfce4/panel-plugins
+libexec/xfce4/panel-plugins/xfce4-systemload-plugin
+share/locale/ca/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/gl/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/ko/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/lt/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/nl/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/sv/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/uk/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/vi/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-systemload-plugin.mo
+share/xfce4/panel-plugins/systemload.desktop
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index a86a82d1ede8..376912feb84a 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -6,31 +6,36 @@
#
PORTNAME= xfce4-utils
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= 4.4.0
CATEGORIES= sysutils xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DISTNAME= xfce-utils-${PORTVERSION}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 essential utilities and scripts
-BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-
-USE_GETTEXT= yes
-USE_GNOME= gtk20
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${X11BASE}/lib" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
- LIBS=-L${LOCALBASE}/lib
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv libgui libmcs libutil mcsmanager panel
+USE_XLIB= yes
+
+OPTIONS= DBUS "Enable D-BUS support" on
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+
+.if !defined(WITHOUT_DBUS)
+LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+CONFIGURE_ARGS+=--enable-dbus
+PLIST_SUB+= WITH_DBUS=""
+.else
+CONFIGURE_ARGS+=--disable-dbus
+PLIST_SUB+= WITH_DBUS="@comment "
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-utils/distinfo b/sysutils/xfce4-utils/distinfo
index 4b78bcd0fead..920d7e9daf63 100644
--- a/sysutils/xfce4-utils/distinfo
+++ b/sysutils/xfce4-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce-utils-4.2.3.tar.gz) = 8028266d03c5bae7c7ccbddd6656ea97
-SHA256 (xfce4/xfce-utils-4.2.3.tar.gz) = 64ce3cb12a05fe1a4173baf18748b44af8c282d8b93849a39ab1a1174af438aa
-SIZE (xfce4/xfce-utils-4.2.3.tar.gz) = 1303388
+MD5 (xfce4/xfce-utils-4.4.0.tar.bz2) = e90a98cf6de0610170c39a4eae36ad8f
+SHA256 (xfce4/xfce-utils-4.4.0.tar.bz2) = 37ab42beaeea0d846920ec805213fcf8987bd74ac1f78153493ae9af3d5b2441
+SIZE (xfce4/xfce-utils-4.4.0.tar.bz2) = 559900
diff --git a/sysutils/xfce4-utils/pkg-descr b/sysutils/xfce4-utils/pkg-descr
index 4ea459efb9df..51194531a825 100644
--- a/sysutils/xfce4-utils/pkg-descr
+++ b/sysutils/xfce4-utils/pkg-descr
@@ -2,4 +2,4 @@ XFce 4 essential utilities and scripts. Provides a taskbar, an about
dialog, a run dialog, and several important scripts that are used by
other packages including the panel. Also contains the user guide.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/sysutils/xfce4-utils/pkg-plist b/sysutils/xfce4-utils/pkg-plist
index b91838a57283..8dd38734dc5a 100644
--- a/sysutils/xfce4-utils/pkg-plist
+++ b/sysutils/xfce4-utils/pkg-plist
@@ -1,19 +1,14 @@
bin/startxfce4
+bin/xfbrowser4
bin/xfce4-about
bin/xfhelp4
bin/xflock4
bin/xfmountdev4
bin/xfrun4
-bin/xftaskbar4
bin/xfterm4
etc/xdg/xfce4/xinitrc
-lib/xfce4/mcs-plugins/xftaskbar_plugin.a
-lib/xfce4/mcs-plugins/xftaskbar_plugin.la
-lib/xfce4/mcs-plugins/xftaskbar_plugin.so
-share/applications/xfce-taskbar-settings.desktop
+%%WITH_DBUS%%share/dbus-1/services/org.xfce.RunDialog.service
share/icons/hicolor/48x48/apps/xfce4-logo.png
-share/icons/hicolor/48x48/apps/xfce4-taskbar.png
-share/icons/hicolor/scalable/apps/xfce4-taskbar.svg
share/locale/af/LC_MESSAGES/xfce-utils.mo
share/locale/ar/LC_MESSAGES/xfce-utils.mo
share/locale/az/LC_MESSAGES/xfce-utils.mo
@@ -22,8 +17,8 @@ share/locale/bg/LC_MESSAGES/xfce-utils.mo
share/locale/bn_IN/LC_MESSAGES/xfce-utils.mo
share/locale/ca/LC_MESSAGES/xfce-utils.mo
share/locale/cs/LC_MESSAGES/xfce-utils.mo
-share/locale/da/LC_MESSAGES/xfce-utils.mo
share/locale/de/LC_MESSAGES/xfce-utils.mo
+share/locale/dz/LC_MESSAGES/xfce-utils.mo
share/locale/el/LC_MESSAGES/xfce-utils.mo
share/locale/en_GB/LC_MESSAGES/xfce-utils.mo
share/locale/eo/LC_MESSAGES/xfce-utils.mo
@@ -34,6 +29,7 @@ share/locale/eu/LC_MESSAGES/xfce-utils.mo
share/locale/fa/LC_MESSAGES/xfce-utils.mo
share/locale/fi/LC_MESSAGES/xfce-utils.mo
share/locale/fr/LC_MESSAGES/xfce-utils.mo
+share/locale/gl/LC_MESSAGES/xfce-utils.mo
share/locale/gu/LC_MESSAGES/xfce-utils.mo
share/locale/he/LC_MESSAGES/xfce-utils.mo
share/locale/hi/LC_MESSAGES/xfce-utils.mo
@@ -41,9 +37,10 @@ share/locale/hu/LC_MESSAGES/xfce-utils.mo
share/locale/hy/LC_MESSAGES/xfce-utils.mo
share/locale/it/LC_MESSAGES/xfce-utils.mo
share/locale/ja/LC_MESSAGES/xfce-utils.mo
+share/locale/ka/LC_MESSAGES/xfce-utils.mo
share/locale/ko/LC_MESSAGES/xfce-utils.mo
-share/locale/ku/LC_MESSAGES/xfce-utils.mo
share/locale/lt/LC_MESSAGES/xfce-utils.mo
+share/locale/mk/LC_MESSAGES/xfce-utils.mo
share/locale/mr/LC_MESSAGES/xfce-utils.mo
share/locale/ms/LC_MESSAGES/xfce-utils.mo
share/locale/nl/LC_MESSAGES/xfce-utils.mo
@@ -54,7 +51,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce-utils.mo
share/locale/ro/LC_MESSAGES/xfce-utils.mo
share/locale/ru/LC_MESSAGES/xfce-utils.mo
share/locale/sk/LC_MESSAGES/xfce-utils.mo
-share/locale/sl/LC_MESSAGES/xfce-utils.mo
share/locale/sv/LC_MESSAGES/xfce-utils.mo
share/locale/ta/LC_MESSAGES/xfce-utils.mo
share/locale/tr/LC_MESSAGES/xfce-utils.mo
@@ -63,71 +59,20 @@ share/locale/vi/LC_MESSAGES/xfce-utils.mo
share/locale/zh_CN/LC_MESSAGES/xfce-utils.mo
share/locale/zh_TW/LC_MESSAGES/xfce-utils.mo
share/xfce4/AUTHORS
-share/xfce4/AUTHORS.az
-share/xfce4/AUTHORS.ca
-share/xfce4/AUTHORS.de
-share/xfce4/AUTHORS.es
-share/xfce4/AUTHORS.eu
-share/xfce4/AUTHORS.fi
-share/xfce4/AUTHORS.fr
-share/xfce4/AUTHORS.he
-share/xfce4/AUTHORS.html
-share/xfce4/AUTHORS.html.az
-share/xfce4/AUTHORS.html.ca
-share/xfce4/AUTHORS.html.de
-share/xfce4/AUTHORS.html.es
-share/xfce4/AUTHORS.html.eu
-share/xfce4/AUTHORS.html.fi
-share/xfce4/AUTHORS.html.fr
-share/xfce4/AUTHORS.html.it
-share/xfce4/AUTHORS.html.ja
-share/xfce4/AUTHORS.html.lt
-share/xfce4/AUTHORS.html.ro
-share/xfce4/AUTHORS.html.ru
-share/xfce4/AUTHORS.html.sk
-share/xfce4/AUTHORS.html.vi
-share/xfce4/AUTHORS.html.zh_TW
-share/xfce4/AUTHORS.it
-share/xfce4/AUTHORS.ja
-share/xfce4/AUTHORS.lt
-share/xfce4/AUTHORS.ro
-share/xfce4/AUTHORS.ru
-share/xfce4/AUTHORS.uk
-share/xfce4/AUTHORS.sk
-share/xfce4/AUTHORS.vi
-share/xfce4/AUTHORS.zh_TW
share/xfce4/COPYING
-share/xfce4/COPYING.html
-share/xfce4/COPYING.vi
share/xfce4/BSD
-share/xfce4/BSD.html
share/xfce4/GPL
-share/xfce4/GPL.html
share/xfce4/INFO
share/xfce4/INFO.ca
share/xfce4/INFO.es
share/xfce4/INFO.fi
share/xfce4/INFO.fr
-share/xfce4/INFO.html
-share/xfce4/INFO.html.ca
-share/xfce4/INFO.html.de
-share/xfce4/INFO.html.es
-share/xfce4/INFO.html.fi
-share/xfce4/INFO.html.fr
-share/xfce4/INFO.html.it
-share/xfce4/INFO.html.ja
-share/xfce4/INFO.html.lt
-share/xfce4/INFO.html.ro
-share/xfce4/INFO.html.ru
share/xfce4/INFO.it
share/xfce4/INFO.ja
-share/xfce4/INFO.lt
-share/xfce4/INFO.ro
share/xfce4/INFO.ru
share/xfce4/INFO.uk
share/xfce4/INFO.vi
share/xfce4/LGPL
-share/xfce4/LGPL.html
share/xfce4/doc/C/index.html
share/xfce4/doc/C/images/about-dialog.png
share/xfce4/doc/C/images/run-dialog.png
@@ -145,85 +90,28 @@ share/xfce4/doc/C/xfce4-copyright.html
share/xfce4/doc/C/xfce4-use.html
share/xfce4/doc/C/xfce4-install.html
share/xfce4/doc/fr/index.html
-share/xfce4/doc/fr/images/default-session.png
-share/xfce4/doc/fr/images/link_xfce.jpg
-share/xfce4/doc/fr/images/about-dialog.png
-share/xfce4/doc/fr/images/run-dialog.png
-share/xfce4/doc/fr/images/taskbar_settings.png
-share/xfce4/doc/fr/BSD.html
-share/xfce4/doc/fr/GPL.html
-share/xfce4/doc/fr/LGPL.html
-share/xfce4/doc/fr/xfce4-user-guide.html
-share/xfce4/doc/fr/xfce4-intro.html
-share/xfce4/doc/fr/xfce4-copyright.html
-share/xfce4/doc/fr/xfce4-components.html
-share/xfce4/doc/fr/xfce4-use.html
-share/xfce4/doc/fr/xfce4-install.html
-share/xfce4/doc/fr/xfce-utils.html
-share/xfce4/doc/he/images/default-session.png
-share/xfce4/doc/he/images/link_xfce.jpg
-share/xfce4/doc/he/images/about-dialog.png
-share/xfce4/doc/he/images/run-dialog.png
-share/xfce4/doc/he/images/taskbar_settings.png
-share/xfce4/doc/he/index.html
-share/xfce4/doc/he/BSD.html
-share/xfce4/doc/he/GPL.html
-share/xfce4/doc/he/LGPL.html
-share/xfce4/doc/he/xfce4-user-guide.html
-share/xfce4/doc/he/xfce4-intro.html
-share/xfce4/doc/he/xfce4-copyright.html
-share/xfce4/doc/he/xfce4-components.html
-share/xfce4/doc/he/xfce4-use.html
-share/xfce4/doc/he/xfce4-install.html
-share/xfce4/doc/he/xfce-utils.html
+share/xfce4/doc/it/index.html
share/xfce4/doc/xfce.css
+share/xfce4/doc/xfce-chunk.css
share/xfce4/doc/xfce-mouse.png
-share/xfce4/doc/xfce-rtl.css
@dirrmtry etc/xdg/xfce4
@dirrmtry etc/xdg
@dirrmtry etc/xfce4
-@dirrmtry lib/xfce4/mcs-plugins
-@dirrmtry lib/xfce4
@dirrmtry share/applications
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
-@dirrmtry share/xfce4/doc/fr/images
@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/he/images
-@dirrmtry share/xfce4/doc/he
+@dirrmtry share/xfce4/doc/it
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index 32f8f8cad235..a1b504d96084 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -16,13 +16,11 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Displays various information about a WaveLAN device
BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
- xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+RUN_DEPENDS= ${BUILD_DEPENDS}
+IGNORE= Does not support xfce 4.4
USE_GNOME= gtk20
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
.include <bsd.port.mk>
diff --git a/sysutils/xfce4-wavelan-plugin/pkg-descr b/sysutils/xfce4-wavelan-plugin/pkg-descr
index d2a7db88c0a0..6a121bed05cb 100644
--- a/sysutils/xfce4-wavelan-plugin/pkg-descr
+++ b/sysutils/xfce4-wavelan-plugin/pkg-descr
@@ -6,4 +6,4 @@ Displays various information about a WaveLAN device:
* Signal quality (current quality of the carrier signal)
* Network name (current SSID of the WaveLAN network)
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
deleted file mode 100644
index 64504157606e..000000000000
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for: xfce4-datetime-plugin
-# Date created: 2003-10-31
-# Whom: Matt Lancereau <matt@rimasec.net>
-#
-# $FreeBSD$
-# $MCom: ports/x11-clocks/xfce4-datetime-plugin/Makefile,v 1.1 2006/10/02 20:46:24 ahze Exp $
-
-PORTNAME= xfce4-datetime-plugin
-PORTVERSION= 0.3.1
-PORTREVISION= 4
-CATEGORIES= x11-clocks xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
-DIST_SUBDIR= xfce4
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= XFce 4 additional clock module which also shows date
-
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- xml2.5:${PORTSDIR}/textproc/libxml2 \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME= gtk20
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-
-.include <bsd.port.mk>
diff --git a/x11-clocks/xfce4-datetime-plugin/distinfo b/x11-clocks/xfce4-datetime-plugin/distinfo
deleted file mode 100644
index 82ff670ed0a0..000000000000
--- a/x11-clocks/xfce4-datetime-plugin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xfce4-datetime-plugin-0.3.1.tar.gz) = 92b7ebee7f0c8074f5cf590f77f676f2
-SHA256 (xfce4/xfce4-datetime-plugin-0.3.1.tar.gz) = 6421c027d1610cc5ac4fed79ad4fc840986474df152812c31bbd0c942e573c23
-SIZE (xfce4/xfce4-datetime-plugin-0.3.1.tar.gz) = 311941
diff --git a/x11-clocks/xfce4-datetime-plugin/pkg-descr b/x11-clocks/xfce4-datetime-plugin/pkg-descr
deleted file mode 100644
index 1ec85e842c81..000000000000
--- a/x11-clocks/xfce4-datetime-plugin/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-XFce 4 additional clock module which also shows date.
-You can change font for display.
-
-WWW: http://xfce-goodies.berlios.de/
diff --git a/x11-clocks/xfce4-datetime-plugin/pkg-plist b/x11-clocks/xfce4-datetime-plugin/pkg-plist
deleted file mode 100644
index fa60784c4331..000000000000
--- a/x11-clocks/xfce4-datetime-plugin/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/xfce4/panel-plugins/libdatetime.la
-lib/xfce4/panel-plugins/libdatetime.so
-@dirrmtry lib/xfce4/panel-plugins
diff --git a/x11-fm/xfce4-fm/Makefile b/x11-fm/xfce4-fm/Makefile
deleted file mode 100644
index 5895a9c2602a..000000000000
--- a/x11-fm/xfce4-fm/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# New ports collection makefile for: xffm
-# Date created: 7 June 2003
-# Whom: James Earl <jdearl@telus.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME= xfce4-fm
-PORTVERSION= 4.2.3
-PORTREVISION= 3
-CATEGORIES= x11-fm xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
-DISTNAME= xffm-${PORTVERSION}
-DIST_SUBDIR= xfce4
-
-MAINTAINER= oliver@FreeBSD.org
-COMMENT= XFce 4 file manager
-
-BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS= dbh-4.5.4:${PORTSDIR}/databases/dbh \
- xml2.5:${PORTSDIR}/textproc/libxml2 \
- xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-
-USE_GETTEXT= yes
-USE_GNOME= gtk20 gnomehack
-USE_XPM= yes
-GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
- CPPFLAGS=-I${LOCALBASE}/include \
- LIBS=-L${LOCALBASE}/lib
-
-MAN1= fgr.1
-
-.if defined(WITH_LIBRSVG)
-USE_GNOME+= librsvg2
-CONFIGURE_ARGS+=--enable-librsvg
-.else
-CONFIGURE_ARGS+=--disable-librsvg
-.endif
-
-post-patch:
- @${REINPLACE_CMD} 's|dbh-1\.0|dbh|g' ${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/x11-fm/xfce4-fm/distinfo b/x11-fm/xfce4-fm/distinfo
deleted file mode 100644
index 1e2280a4b049..000000000000
--- a/x11-fm/xfce4-fm/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xffm-4.2.3.tar.gz) = 5d2a990bb725b6720db93f34dd91a731
-SHA256 (xfce4/xffm-4.2.3.tar.gz) = 791a05a2fd695508ff6b3fd3e0e2be66de28a3d0bf86ee22e14126992d7aef21
-SIZE (xfce4/xffm-4.2.3.tar.gz) = 5117799
diff --git a/x11-fm/xfce4-fm/files/patch-libs-tubo.c b/x11-fm/xfce4-fm/files/patch-libs-tubo.c
deleted file mode 100644
index 07daa7eb8a7e..000000000000
--- a/x11-fm/xfce4-fm/files/patch-libs-tubo.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libs/tubo.c.orig Sat Oct 8 11:33:42 2005
-+++ libs/tubo.c Sat Oct 8 11:34:37 2005
-@@ -296,9 +296,12 @@
- printf("tubowait...\n");
- #endif
- #ifdef __FreeBSD__
-+#include <osreldate.h>
-+#if __FreeBSD_version < 503000
- /* This apparently does the bug workaround for wait failure
- * on FreeBSD 5.1: */
- if (kill(PID,SIGCONT) == 0) return TRUE;
-+#endif
- #endif
- #ifdef HYPER_DEBUG
- printf("tubowait...dead...\n");
diff --git a/x11-fm/xfce4-fm/pkg-descr b/x11-fm/xfce4-fm/pkg-descr
deleted file mode 100644
index b6f18390032f..000000000000
--- a/x11-fm/xfce4-fm/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-XFce 4 file manager. Features samba network share support.
-
-WWW: http://www.xfce.org
diff --git a/x11-fm/xfce4-fm/pkg-plist b/x11-fm/xfce4-fm/pkg-plist
deleted file mode 100644
index e90c4f059b53..000000000000
--- a/x11-fm/xfce4-fm/pkg-plist
+++ /dev/null
@@ -1,364 +0,0 @@
-bin/fgr
-bin/scramble
-bin/xfbook
-bin/xfbook4
-bin/xfdiff4
-bin/xffrequent
-bin/xffrequent4
-bin/xffstab
-bin/xffstab4
-bin/xfglob4
-bin/xfmime-edit
-bin/xfrecent
-bin/xfrecent4
-bin/xfsamba4
-bin/xftrash4
-bin/xftree4
-bin/xffm
-lib/libxffm_actions.la
-lib/libxffm_actions.so
-lib/libxffm_actions.so.1
-lib/libxffm_basic.la
-lib/libxffm_basic.so
-lib/libxffm_basic.so.1
-lib/libxffm_calls.la
-lib/libxffm_calls.so
-lib/libxffm_calls.so.1
-lib/libxffm_cpy.la
-lib/libxffm_cpy.so
-lib/libxffm_cpy.so.1
-lib/libxffm_on_demand.la
-lib/libxffm_on_demand.so
-lib/libxffm_on_demand.so.1
-lib/libxffm_secondary.la
-lib/libxffm_secondary.so
-lib/libxffm_secondary.so.1
-lib/libxffm_tubo.la
-lib/libxffm_tubo.so
-lib/libxffm_tubo.so.1
-lib/xfce4/mcs-plugins/libxffmsettings.la
-lib/xfce4/mcs-plugins/libxffmsettings.so
-lib/xfce4/xffm/libxffm_book.la
-lib/xfce4/xffm/libxffm_book.so
-lib/xfce4/xffm/libxffm_book.so.1
-lib/xfce4/xffm/libxffm_fstab.la
-lib/xfce4/xffm/libxffm_fstab.so
-lib/xfce4/xffm/libxffm_fstab.so.1
-lib/xfce4/xffm/libxffm_prop.la
-lib/xfce4/xffm/libxffm_prop.so
-lib/xfce4/xffm/libxffm_prop.so.1
-lib/xfce4/xffm/libxffm_recent.la
-lib/xfce4/xffm/libxffm_recent.so
-lib/xfce4/xffm/libxffm_recent.so.1
-lib/xfce4/xffm/libxffm_find.la
-lib/xfce4/xffm/libxffm_find.so
-lib/xfce4/xffm/libxffm_find.so.1
-lib/xfce4/xffm/libxffm_smb.la
-lib/xfce4/xffm/libxffm_smb.so
-lib/xfce4/xffm/libxffm_smb.so.1
-lib/xfce4/xffm/libxffm_trash.la
-lib/xfce4/xffm/libxffm_trash.so
-lib/xfce4/xffm/libxffm_trash.so.1
-libdata/pkgconfig/xffm-1.0.pc
-share/applications/Xffm.desktop
-share/applications/Xfsamba.desktop
-share/applications/Xftree.desktop
-share/applications/Xfglob.desktop
-share/applications/Xfdiff.desktop
-share/applications/Xfbook.desktop
-share/applications/Xffstab.desktop
-share/applications/Xfmime_edit.desktop
-share/applications/xfce-filemanager-settings.desktop
-share/icons/hicolor/48x48/stock/generic/xfdiff.png
-share/icons/hicolor/48x48/stock/generic/xffm_icon.xpm
-share/icons/hicolor/48x48/stock/generic/ubu_head.jpg
-share/icons/hicolor/48x48/stock/generic/comp1.xpm
-share/icons/hicolor/48x48/stock/generic/new_win.xpm
-share/icons/hicolor/48x48/stock/generic/b-book-open.png
-share/icons/hicolor/48x48/stock/generic/b-book-closed.png
-share/icons/hicolor/48x48/stock/generic/b-home.png
-share/icons/hicolor/48x48/stock/generic/b-find.png
-share/icons/hicolor/48x48/stock/generic/b-frequent.png
-share/icons/hicolor/48x48/stock/generic/b-fstab.png
-share/icons/hicolor/48x48/stock/generic/b-network.png
-share/icons/hicolor/48x48/stock/generic/b-recent.png
-share/icons/hicolor/48x48/stock/generic/b-trash.png
-share/icons/hicolor/48x48/stock/generic/b-xffm_icon.png
-share/icons/hicolor/48x48/stock/generic/c-gid.png
-share/icons/hicolor/48x48/stock/generic/c-mode.png
-share/icons/hicolor/48x48/stock/generic/c-name.png
-share/icons/hicolor/48x48/stock/generic/c-size.png
-share/icons/hicolor/48x48/stock/generic/c-time.png
-share/icons/hicolor/48x48/stock/generic/c-uid.png
-share/icons/hicolor/48x48/stock/generic/d-application.png
-share/icons/hicolor/48x48/stock/generic/d-audio.png
-share/icons/hicolor/48x48/stock/generic/d-bomb.png
-share/icons/hicolor/48x48/stock/generic/d-exec.png
-share/icons/hicolor/48x48/stock/generic/d-file.png
-share/icons/hicolor/48x48/stock/generic/d-help.png
-share/icons/hicolor/48x48/stock/generic/d-image.png
-share/icons/hicolor/48x48/stock/generic/d-message.png
-share/icons/hicolor/48x48/stock/generic/d-model.png
-share/icons/hicolor/48x48/stock/generic/d-multipart.png
-share/icons/hicolor/48x48/stock/generic/d-no-access.png
-share/icons/hicolor/48x48/stock/generic/d-pirate.png
-share/icons/hicolor/48x48/stock/generic/d-symlink-broken.png
-share/icons/hicolor/48x48/stock/generic/d-symlink.png
-share/icons/hicolor/48x48/stock/generic/d-txt.png
-share/icons/hicolor/48x48/stock/generic/d-video.png
-share/icons/hicolor/48x48/stock/generic/d-waste_basket_empty.png
-share/icons/hicolor/48x48/stock/generic/d-waste_basket_full.png
-share/icons/hicolor/48x48/stock/generic/d-xfce.png
-share/icons/hicolor/48x48/stock/generic/dir-open.png
-share/icons/hicolor/48x48/stock/generic/dir-closed.png
-share/icons/hicolor/48x48/stock/generic/f-cdrom.png
-share/icons/hicolor/48x48/stock/generic/f-disk.png
-share/icons/hicolor/48x48/stock/generic/f-dvd.png
-share/icons/hicolor/48x48/stock/generic/f-floppy.png
-share/icons/hicolor/48x48/stock/generic/f-memory.png
-share/icons/hicolor/48x48/stock/generic/f-netdisk.png
-share/icons/hicolor/48x48/stock/generic/go-back.png
-share/icons/hicolor/48x48/stock/generic/go-forward.png
-share/icons/hicolor/48x48/stock/generic/go-home.png
-share/icons/hicolor/48x48/stock/generic/go-jump.png
-share/icons/hicolor/48x48/stock/generic/go-start.png
-share/icons/hicolor/48x48/stock/generic/go-up.png
-share/icons/hicolor/48x48/stock/generic/downarrow.png
-share/icons/hicolor/48x48/stock/generic/t-preferences.png
-share/icons/hicolor/48x48/stock/generic/t-xfmime-edit.png
-share/icons/hicolor/48x48/stock/generic/t-exec.png
-share/icons/hicolor/48x48/stock/generic/t-find.png
-share/icons/hicolor/48x48/stock/generic/t-new-directory.png
-share/icons/hicolor/48x48/stock/generic/t-new-file.png
-share/icons/hicolor/48x48/stock/generic/t-quit.png
-share/icons/hicolor/48x48/stock/generic/t-reload.png
-share/icons/hicolor/48x48/stock/generic/t-terminal.png
-share/icons/hicolor/48x48/stock/generic/t-xfce-setting-show.png
-share/icons/hicolor/48x48/stock/generic/a-apply.png
-share/icons/hicolor/48x48/stock/generic/t-xfdiff.png
-share/icons/hicolor/48x48/stock/generic/t-zoom-in.png
-share/icons/hicolor/48x48/stock/generic/t-zoom-out.png
-share/icons/hicolor/48x48/stock/generic/t-zoom-view.png
-share/icons/hicolor/48x48/stock/generic/a-info.png
-share/icons/hicolor/48x48/stock/generic/a-pause.png
-share/icons/hicolor/48x48/stock/generic/a-question.png
-share/icons/hicolor/48x48/stock/generic/a-stop.png
-share/icons/hicolor/48x48/stock/generic/a-clear.png
-share/icons/hicolor/48x48/stock/generic/a-next.png
-share/icons/hicolor/48x48/stock/generic/a-prev.png
-share/icons/hicolor/48x48/stock/generic/a-quit.png
-share/icons/hicolor/48x48/stock/generic/a-refresh.png
-share/icons/hicolor/48x48/stock/generic/a-open.png
-share/icons/hicolor/48x48/stock/generic/a-convert.png
-share/icons/hicolor/48x48/stock/generic/p-unknown.png
-share/icons/hicolor/48x48/stock/generic/p-edit.png
-share/icons/hicolor/48x48/stock/generic/p-file1.png
-share/icons/hicolor/48x48/stock/generic/p-file2.png
-share/icons/hicolor/48x48/stock/generic/p-games.png
-share/icons/hicolor/48x48/stock/generic/p-man.png
-share/icons/hicolor/48x48/stock/generic/p-multimedia.png
-share/icons/hicolor/48x48/stock/generic/p-network.png
-share/icons/hicolor/48x48/stock/generic/p-paint.png
-share/icons/hicolor/48x48/stock/generic/p-print.png
-share/icons/hicolor/48x48/stock/generic/p-schedule.png
-share/icons/hicolor/48x48/stock/generic/p-sound.png
-share/icons/hicolor/48x48/stock/generic/p-terminal.png
-share/icons/hicolor/48x48/stock/generic/p-newmail.png
-share/icons/hicolor/48x48/stock/generic/p-nomail.png
-share/icons/hicolor/48x48/stock/generic/p-oldmail.png
-share/icons/hicolor/48x48/stock/generic/t-pastelink.png
-share/locale/af/LC_MESSAGES/xffm.mo
-share/locale/ar/LC_MESSAGES/xffm.mo
-share/locale/az/LC_MESSAGES/xffm.mo
-share/locale/bg/LC_MESSAGES/xffm.mo
-share/locale/bn_IN/LC_MESSAGES/xffm.mo
-share/locale/ca/LC_MESSAGES/xffm.mo
-share/locale/cs/LC_MESSAGES/xffm.mo
-share/locale/de/LC_MESSAGES/xffm.mo
-share/locale/en_GB/LC_MESSAGES/xffm.mo
-share/locale/es/LC_MESSAGES/xffm.mo
-share/locale/es_MX/LC_MESSAGES/xffm.mo
-share/locale/et/LC_MESSAGES/xffm.mo
-share/locale/eu/LC_MESSAGES/xffm.mo
-share/locale/fa/LC_MESSAGES/xffm.mo
-share/locale/fi/LC_MESSAGES/xffm.mo
-share/locale/fr/LC_MESSAGES/xffm.mo
-share/locale/gu/LC_MESSAGES/xffm.mo
-share/locale/he/LC_MESSAGES/xffm.mo
-share/locale/hi/LC_MESSAGES/xffm.mo
-share/locale/hu/LC_MESSAGES/xffm.mo
-share/locale/it/LC_MESSAGES/xffm.mo
-share/locale/ja/LC_MESSAGES/xffm.mo
-share/locale/ko/LC_MESSAGES/xffm.mo
-share/locale/ku/LC_MESSAGES/xffm.mo
-share/locale/lt/LC_MESSAGES/xffm.mo
-share/locale/mr/LC_MESSAGES/xffm.mo
-share/locale/ms/LC_MESSAGES/xffm.mo
-share/locale/nb_NO/LC_MESSAGES/xffm.mo
-share/locale/nl/LC_MESSAGES/xffm.mo
-share/locale/pa/LC_MESSAGES/xffm.mo
-share/locale/pl/LC_MESSAGES/xffm.mo
-share/locale/pt_BR/LC_MESSAGES/xffm.mo
-share/locale/pt_PT/LC_MESSAGES/xffm.mo
-share/locale/sk/LC_MESSAGES/xffm.mo
-share/locale/sl/LC_MESSAGES/xffm.mo
-share/locale/sv/LC_MESSAGES/xffm.mo
-share/locale/ta/LC_MESSAGES/xffm.mo
-share/locale/tr/LC_MESSAGES/xffm.mo
-share/locale/uk/LC_MESSAGES/xffm.mo
-share/locale/vi/LC_MESSAGES/xffm.mo
-share/locale/zh_CN/LC_MESSAGES/xffm.mo
-share/locale/zh_TW/LC_MESSAGES/xffm.mo
-share/xfce4/doc/C/images/book_popup.png
-share/xfce4/doc/C/images/column_titles_popup.png
-share/xfce4/doc/C/images/diagnostics_window.png
-share/xfce4/doc/C/images/directory_popup.png
-share/xfce4/doc/C/images/directory_popup_unmount.png
-share/xfce4/doc/C/images/file_popup.png
-share/xfce4/doc/C/images/file_subpopup.png
-share/xfce4/doc/C/images/filter_box.png
-share/xfce4/doc/C/images/frequent_popup.png
-share/xfce4/doc/C/images/fstab_popup_mount.png
-share/xfce4/doc/C/images/fstab_popup_unmount.png
-share/xfce4/doc/C/images/go_menu.png
-share/xfce4/doc/C/images/hide_show_buttons.png
-share/xfce4/doc/C/images/icon_title_smartbutton.png
-share/xfce4/doc/C/images/main_menu.png
-share/xfce4/doc/C/images/mcs-plugin.png
-share/xfce4/doc/C/images/netfile_popup.png
-share/xfce4/doc/C/images/netshare_popup.png
-share/xfce4/doc/C/images/open_menu.png
-share/xfce4/doc/C/images/options_menu.png
-share/xfce4/doc/C/images/preferences_menu.png
-share/xfce4/doc/C/images/recent_popup.png
-share/xfce4/doc/C/images/sidebar_filesubmenu.png
-share/xfce4/doc/C/images/sidebar_go.png
-share/xfce4/doc/C/images/sidebar_multiple_select.png
-share/xfce4/doc/C/images/sidebar_open.png
-share/xfce4/doc/C/images/sidebar_options.png
-share/xfce4/doc/C/images/sidebar_paste.png
-share/xfce4/doc/C/images/sidebar_tools.png
-share/xfce4/doc/C/images/sort_subpopup.png
-share/xfce4/doc/C/images/t_main_menu.png
-share/xfce4/doc/C/images/tools_menu.png
-share/xfce4/doc/C/images/trash_popup.png
-share/xfce4/doc/C/images/xffm_default.png
-share/xfce4/doc/C/xffm.html
-share/xfce4/doc/fr/images/book_popup.png
-share/xfce4/doc/fr/images/column_titles_popup.png
-share/xfce4/doc/fr/images/diagnostics_window.png
-share/xfce4/doc/fr/images/directory_popup.png
-share/xfce4/doc/fr/images/directory_popup_unmount.png
-share/xfce4/doc/fr/images/file_popup.png
-share/xfce4/doc/fr/images/file_subpopup.png
-share/xfce4/doc/fr/images/filter_box.png
-share/xfce4/doc/fr/images/frequent_popup.png
-share/xfce4/doc/fr/images/fstab_popup_mount.png
-share/xfce4/doc/fr/images/go_menu.png
-share/xfce4/doc/fr/images/hide_show_buttons.png
-share/xfce4/doc/fr/images/icon_title_smartbutton.png
-share/xfce4/doc/fr/images/main_menu.png
-share/xfce4/doc/fr/images/mcs-plugin.png
-share/xfce4/doc/fr/images/netfile_popup.png
-share/xfce4/doc/fr/images/open_menu.png
-share/xfce4/doc/fr/images/options_menu.png
-share/xfce4/doc/fr/images/preferences_menu.png
-share/xfce4/doc/fr/images/recent_popup.png
-share/xfce4/doc/fr/images/sidebar_filesubmenu.png
-share/xfce4/doc/fr/images/sidebar_go.png
-share/xfce4/doc/fr/images/sidebar_multiple_select.png
-share/xfce4/doc/fr/images/sidebar_open.png
-share/xfce4/doc/fr/images/sidebar_options.png
-share/xfce4/doc/fr/images/sidebar_paste.png
-share/xfce4/doc/fr/images/sidebar_tools.png
-share/xfce4/doc/fr/images/sort_subpopup.png
-share/xfce4/doc/fr/images/tools_menu.png
-share/xfce4/doc/fr/images/trash_popup.png
-share/xfce4/doc/fr/images/xffm_default.png
-share/xfce4/doc/fr/xffm.html
-share/xfce4/doc/he/images/book_popup.png
-share/xfce4/doc/he/images/column_titles_popup.png
-share/xfce4/doc/he/images/diagnostics_window.png
-share/xfce4/doc/he/images/directory_popup.png
-share/xfce4/doc/he/images/directory_popup_unmount.png
-share/xfce4/doc/he/images/file_popup.png
-share/xfce4/doc/he/images/file_subpopup.png
-share/xfce4/doc/he/images/filter_box.png
-share/xfce4/doc/he/images/frequent_popup.png
-share/xfce4/doc/he/images/fstab_popup_mount.png
-share/xfce4/doc/he/images/go_menu.png
-share/xfce4/doc/he/images/hide_show_buttons.png
-share/xfce4/doc/he/images/icon_title_smartbutton.png
-share/xfce4/doc/he/images/main_menu.png
-share/xfce4/doc/he/images/mcs-plugin.png
-share/xfce4/doc/he/images/netfile_popup.png
-share/xfce4/doc/he/images/netshare_popup.png
-share/xfce4/doc/he/images/open_menu.png
-share/xfce4/doc/he/images/options_menu.png
-share/xfce4/doc/he/images/preferences_menu.png
-share/xfce4/doc/he/images/recent_popup.png
-share/xfce4/doc/he/images/sidebar_filesubmenu.png
-share/xfce4/doc/he/images/sidebar_go.png
-share/xfce4/doc/he/images/sidebar_multiple_select.png
-share/xfce4/doc/he/images/sidebar_open.png
-share/xfce4/doc/he/images/sidebar_options.png
-share/xfce4/doc/he/images/sidebar_paste.png
-share/xfce4/doc/he/images/sidebar_tools.png
-share/xfce4/doc/he/images/sort_subpopup.png
-share/xfce4/doc/he/images/tools_menu.png
-share/xfce4/doc/he/images/trash_popup.png
-share/xfce4/doc/he/images/xffm_default.png
-share/xfce4/doc/he/xffm.html
-share/xfce4/xffm/AUTHORS
-share/xfce4/xffm/AUTHORS.vi
-share/xfce4/xffm/xffm.spec
-share/xfce4/xffm/xffm.spec.in
-@dirrm lib/xfce4/xffm
-@dirrmtry lib/xfce4/mcs-plugins
-@dirrmtry lib/xfce4
-@dirrmtry share/applications
-@dirrmtry share/icons/hicolor/48x48/stock/generic
-@dirrmtry share/icons/hicolor/48x48/stock
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrmtry share/xfce4/doc/C/images
-@dirrmtry share/xfce4/doc/C
-@dirrmtry share/xfce4/doc/fr/images
-@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/he/images
-@dirrmtry share/xfce4/doc/he
-@dirrmtry share/xfce4/doc
-@dirrmtry share/xfce4/mime
-@dirrm share/xfce4/xffm
-@dirrmtry share/xfce4
-@dirrm share/xffm/pixmaps
-@dirrm share/xffm
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index dd2aca3509d7..a4797576d4aa 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -6,17 +6,20 @@
#
PORTNAME= gtk-xfce-engine
-PORTVERSION= 2.2.8
-PORTREVISION= 2
+PORTVERSION= 2.4.0
CATEGORIES= x11-themes xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-4.2.3.2/src/ \
- http://www.ca-us.xfce.org/archive/xfce-4.2.3.2/src/ \
- http://www.p0llux.be/xfce/xfce-4.2.3.2/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
+DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= An XFCE engine for GTK 2.0
-USE_GNOME= gnomehack gtk20
GNU_CONFIGURE= yes
+USE_BZIP2= yes
+USE_GNOME= glib20 gnomehack gtk20 pkgconfig
+USE_XLIB= yes
-.include <bsd.port.mk>
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-themes/gtk-xfce-engine/distinfo b/x11-themes/gtk-xfce-engine/distinfo
index f3fcf318f392..796f3fe29a57 100644
--- a/x11-themes/gtk-xfce-engine/distinfo
+++ b/x11-themes/gtk-xfce-engine/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-xfce-engine-2.2.8.tar.gz) = 430251478bc15ca6f4b71bdaf16cce5e
-SHA256 (gtk-xfce-engine-2.2.8.tar.gz) = 31a2d0b8b426683cf2611bab653e5fd0ca72661a6c8a6461e61a321e6a3dc420
-SIZE (gtk-xfce-engine-2.2.8.tar.gz) = 391386
+MD5 (xfce4/gtk-xfce-engine-2.4.0.tar.bz2) = 54676606e99cbec638f7f22ddea2872a
+SHA256 (xfce4/gtk-xfce-engine-2.4.0.tar.bz2) = 6841ec9efb29675c0134dc5c273a779b14f2daebb117b2078be547db4effaafb
+SIZE (xfce4/gtk-xfce-engine-2.4.0.tar.bz2) = 245746
diff --git a/x11-themes/gtk-xfce-engine/pkg-descr b/x11-themes/gtk-xfce-engine/pkg-descr
index 06863f74433c..1fc2e16620fd 100644
--- a/x11-themes/gtk-xfce-engine/pkg-descr
+++ b/x11-themes/gtk-xfce-engine/pkg-descr
@@ -1,3 +1,3 @@
-An XFCE engine for GTK 2.0.
+An XFCE engine for GTK 2.
-WWW: http://sourceforge.net/projects/xfce/
+WWW: http://www.xfce4.org/
diff --git a/x11-themes/gtk-xfce-engine/pkg-plist b/x11-themes/gtk-xfce-engine/pkg-plist
index e95c286d757d..de504497af05 100644
--- a/x11-themes/gtk-xfce-engine/pkg-plist
+++ b/x11-themes/gtk-xfce-engine/pkg-plist
@@ -3,6 +3,9 @@ lib/gtk-2.0/%%GTK2_VERSION%%/engines/libxfce.so
share/themes/Xfce-4.0/gtk-2.0/gtkrc
share/themes/Xfce-4.0/ICON.png
share/themes/Xfce-4.0/README.html
+share/themes/Xfce-4.2/gtk-2.0/gtkrc
+share/themes/Xfce-4.2/ICON.png
+share/themes/Xfce-4.2/README.html
share/themes/Xfce-b5/ICON.png
share/themes/Xfce-b5/README.html
share/themes/Xfce-b5/gtk-2.0/gtkrc
@@ -30,6 +33,9 @@ share/themes/Xfce-kolors/gtk-2.0/gtkrc
share/themes/Xfce-light/ICON.png
share/themes/Xfce-light/README.html
share/themes/Xfce-light/gtk-2.0/gtkrc
+share/themes/Xfce-orange/ICON.png
+share/themes/Xfce-orange/README.html
+share/themes/Xfce-orange/gtk-2.0/gtkrc
share/themes/Xfce-redmondxp/ICON.png
share/themes/Xfce-redmondxp/README.html
share/themes/Xfce-redmondxp/gtk-2.0/gtkrc
@@ -50,6 +56,8 @@ share/themes/Xfce/README.html
share/themes/Xfce/gtk-2.0/gtkrc
@dirrm share/themes/Xfce-4.0/gtk-2.0
@dirrm share/themes/Xfce-4.0
+@dirrm share/themes/Xfce-4.2/gtk-2.0
+@dirrm share/themes/Xfce-4.2
@dirrm share/themes/Xfce/gtk-2.0
@dirrmtry share/themes/Xfce
@dirrm share/themes/Xfce-cadmium/gtk-2.0
@@ -68,6 +76,8 @@ share/themes/Xfce/gtk-2.0/gtkrc
@dirrm share/themes/Xfce-saltlake
@dirrm share/themes/Xfce-redmondxp/gtk-2.0
@dirrm share/themes/Xfce-redmondxp
+@dirrm share/themes/Xfce-orange/gtk-2.0
+@dirrm share/themes/Xfce-orange
@dirrm share/themes/Xfce-light/gtk-2.0
@dirrm share/themes/Xfce-light
@dirrm share/themes/Xfce-kolors/gtk-2.0
@@ -80,3 +90,8 @@ share/themes/Xfce/gtk-2.0/gtkrc
@dirrm share/themes/Xfce-basic
@dirrm share/themes/Xfce-b5/gtk-2.0
@dirrm share/themes/Xfce-b5
+@dirrmtry lib/gtk-2.0/2.4.0/engines
+@dirrmtry lib/gtk-2.0/2.4.0
+@dirrmtry lib/gtk-2.0
+@dirrmtry share/themes
+
diff --git a/x11-themes/xfce4-icon-theme/Makefile b/x11-themes/xfce4-icon-theme/Makefile
index ad995ab33be4..66b955437be5 100644
--- a/x11-themes/xfce4-icon-theme/Makefile
+++ b/x11-themes/xfce4-icon-theme/Makefile
@@ -6,24 +6,24 @@
#
PORTNAME= xfce4-icon-theme
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= 4.4.0
CATEGORIES= x11-themes xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= Icon themes for XFce 4
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-
-WANT_GNOME= yes
INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnometarget intltool intlhack
+USE_XFCE= configenv
+USE_XLIB= yes
+WANT_GNOME= yes
-NO_BUILD= yes
-
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-themes/xfce4-icon-theme/distinfo b/x11-themes/xfce4-icon-theme/distinfo
index 699d9f717f22..254a5e35844d 100644
--- a/x11-themes/xfce4-icon-theme/distinfo
+++ b/x11-themes/xfce4-icon-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-icon-theme-4.2.3.tar.gz) = 484ff5a740de326d107ca34d16f161d3
-SHA256 (xfce4/xfce4-icon-theme-4.2.3.tar.gz) = c1b0b207fb8ee8d5851959b89aa33fb5f16d8355500e5f495b12a3446114f796
-SIZE (xfce4/xfce4-icon-theme-4.2.3.tar.gz) = 1560798
+MD5 (xfce4/xfce4-icon-theme-4.4.0.tar.bz2) = 69cf43b167e93e89a8c504d5d18e1142
+SHA256 (xfce4/xfce4-icon-theme-4.4.0.tar.bz2) = 08cd9e3347100868a4475bc48bd4a1b7fd8050634e7135dc3ff44feadd419faf
+SIZE (xfce4/xfce4-icon-theme-4.4.0.tar.bz2) = 1797689
diff --git a/x11-themes/xfce4-icon-theme/pkg-descr b/x11-themes/xfce4-icon-theme/pkg-descr
index 31ccbcd068f7..5f758c9c30d0 100644
--- a/x11-themes/xfce4-icon-theme/pkg-descr
+++ b/x11-themes/xfce4-icon-theme/pkg-descr
@@ -1,3 +1,3 @@
Icon themes for XFce 4.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/x11-themes/xfce4-icon-theme/pkg-plist b/x11-themes/xfce4-icon-theme/pkg-plist
index 6c08ea6be645..270af645957c 100644
--- a/x11-themes/xfce4-icon-theme/pkg-plist
+++ b/x11-themes/xfce4-icon-theme/pkg-plist
@@ -1,3 +1,4 @@
+libdata/pkgconfig/xfce4-icon-theme-1.0.pc
share/icons/Rodent/48x48/apps/applets-screenshooter.png
share/icons/Rodent/48x48/apps/bluefish-icon.png
share/icons/Rodent/48x48/apps/digikam.png
@@ -18,11 +19,13 @@ share/icons/Rodent/48x48/apps/gnome-graphics.png
share/icons/Rodent/48x48/apps/gnome-help.png
share/icons/Rodent/48x48/apps/gnome-info.png
share/icons/Rodent/48x48/apps/gnome-joystick.png
+share/icons/Rodent/48x48/apps/gnome-library.png
share/icons/Rodent/48x48/apps/gnome-lockscreen.png
share/icons/Rodent/48x48/apps/gnome-logout.png
share/icons/Rodent/48x48/apps/gnome-media-player-icon.png
share/icons/Rodent/48x48/apps/gnome-multimedia.png
share/icons/Rodent/48x48/apps/gnome-other.png
+share/icons/Rodent/48x48/apps/gnome-package.png
share/icons/Rodent/48x48/apps/gnome-pdf.png
share/icons/Rodent/48x48/apps/gnome-searchtool.png
share/icons/Rodent/48x48/apps/gnome-settings.png
@@ -111,6 +114,10 @@ share/icons/Rodent/48x48/emblems/emblem-sound.png
share/icons/Rodent/48x48/emblems/emblem-symbolic-link.png
share/icons/Rodent/48x48/emblems/emblem-urgent.png
share/icons/Rodent/48x48/emblems/emblem-web.png
+share/icons/Rodent/48x48/filesystems/blockdevice.png
+share/icons/Rodent/48x48/filesystems/chardevice.png
+share/icons/Rodent/48x48/filesystems/core.png
+share/icons/Rodent/48x48/filesystems/directory.png
share/icons/Rodent/48x48/filesystems/gnome-fs-blockdev.png
share/icons/Rodent/48x48/filesystems/gnome-fs-client.png
share/icons/Rodent/48x48/filesystems/gnome-fs-desktop.png
@@ -134,9 +141,106 @@ share/icons/Rodent/48x48/filesystems/mime-inode:chardevice.png
share/icons/Rodent/48x48/filesystems/mime-inode:core.png
share/icons/Rodent/48x48/filesystems/mime-inode:directory.png
share/icons/Rodent/48x48/filesystems/mime-inode:mount-point.png
+share/icons/Rodent/48x48/filesystems/mount-point.png
share/icons/Rodent/48x48/filesystems/network_fs.png
share/icons/Rodent/48x48/filesystems/open_folder.png
-share/icons/Rodent/48x48/mimetypes/gnome-library.png
+share/icons/Rodent/48x48/filesystems/user-home.png
+share/icons/Rodent/48x48/mimetypes/application-msword.png
+share/icons/Rodent/48x48/mimetypes/application-octet-stream.png
+share/icons/Rodent/48x48/mimetypes/application-ogg.png
+share/icons/Rodent/48x48/mimetypes/application-pdf.png
+share/icons/Rodent/48x48/mimetypes/application-pgp-encrypted.png
+share/icons/Rodent/48x48/mimetypes/application-pgp-keys.png
+share/icons/Rodent/48x48/mimetypes/application-pgp.png
+share/icons/Rodent/48x48/mimetypes/application-postscript.png
+share/icons/Rodent/48x48/mimetypes/application-qif.png
+share/icons/Rodent/48x48/mimetypes/application-rhythmbox-effect.png
+share/icons/Rodent/48x48/mimetypes/application-rhythmbox-playlist.png
+share/icons/Rodent/48x48/mimetypes/application-rtf.png
+share/icons/Rodent/48x48/mimetypes/application-smil.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.ms-excel.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.ms-powerpoint.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.ms-word.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.rn-realmedia.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.stardivision.calc.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.stardivision.chart.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.stardivision.impress.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.stardivision.writer.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.sun.xml.calc.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.sun.xml.chart.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.sun.xml.draw.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.sun.xml.impress.png
+share/icons/Rodent/48x48/mimetypes/application-vnd.sun.xml.writer.png
+share/icons/Rodent/48x48/mimetypes/application-x-abiword.png
+share/icons/Rodent/48x48/mimetypes/application-x-archive.png
+share/icons/Rodent/48x48/mimetypes/application-x-arj.png
+share/icons/Rodent/48x48/mimetypes/application-x-blender.png
+share/icons/Rodent/48x48/mimetypes/application-x-bzip-compressed-tar.png
+share/icons/Rodent/48x48/mimetypes/application-x-bzip.png
+share/icons/Rodent/48x48/mimetypes/application-x-cd-image.png
+share/icons/Rodent/48x48/mimetypes/application-x-compress.png
+share/icons/Rodent/48x48/mimetypes/application-x-compressed-tar.png
+share/icons/Rodent/48x48/mimetypes/application-x-cpio-compressed.png
+share/icons/Rodent/48x48/mimetypes/application-x-cpio.png
+share/icons/Rodent/48x48/mimetypes/application-x-deb.png
+share/icons/Rodent/48x48/mimetypes/application-x-desktop.png
+share/icons/Rodent/48x48/mimetypes/application-x-dia-diagram.png
+share/icons/Rodent/48x48/mimetypes/application-x-dvi.png
+share/icons/Rodent/48x48/mimetypes/application-x-executable.png
+share/icons/Rodent/48x48/mimetypes/application-x-font-asm.png
+share/icons/Rodent/48x48/mimetypes/application-x-font-bdf.png
+share/icons/Rodent/48x48/mimetypes/application-x-font-linux-psf.png
+share/icons/Rodent/48x48/mimetypes/application-x-font-pcf.png
+share/icons/Rodent/48x48/mimetypes/application-x-font-ttf.png
+share/icons/Rodent/48x48/mimetypes/application-x-gettext-translation.png
+share/icons/Rodent/48x48/mimetypes/application-x-glade.png
+share/icons/Rodent/48x48/mimetypes/application-x-gnucash.png
+share/icons/Rodent/48x48/mimetypes/application-x-gnumeric.png
+share/icons/Rodent/48x48/mimetypes/application-x-gtktalog.png
+share/icons/Rodent/48x48/mimetypes/application-x-gzip.png
+share/icons/Rodent/48x48/mimetypes/application-x-kde-app-info.png
+share/icons/Rodent/48x48/mimetypes/application-x-killustrator.png
+share/icons/Rodent/48x48/mimetypes/application-x-kpresenter.png
+share/icons/Rodent/48x48/mimetypes/application-x-kspread.png
+share/icons/Rodent/48x48/mimetypes/application-x-kword.png
+share/icons/Rodent/48x48/mimetypes/application-x-lha.png
+share/icons/Rodent/48x48/mimetypes/application-x-object.png
+share/icons/Rodent/48x48/mimetypes/application-x-perl.png
+share/icons/Rodent/48x48/mimetypes/application-x-php.png
+share/icons/Rodent/48x48/mimetypes/application-x-python-bytecode.png
+share/icons/Rodent/48x48/mimetypes/application-x-python.png
+share/icons/Rodent/48x48/mimetypes/application-x-qw.png
+share/icons/Rodent/48x48/mimetypes/application-x-rar.png
+share/icons/Rodent/48x48/mimetypes/application-x-reject.png
+share/icons/Rodent/48x48/mimetypes/application-x-rpm.png
+share/icons/Rodent/48x48/mimetypes/application-x-share-library-la.png
+share/icons/Rodent/48x48/mimetypes/application-x-sharedlib.png
+share/icons/Rodent/48x48/mimetypes/application-x-shellscript.png
+share/icons/Rodent/48x48/mimetypes/application-x-shockwave-flash.png
+share/icons/Rodent/48x48/mimetypes/application-x-smil.png
+share/icons/Rodent/48x48/mimetypes/application-x-tar.png
+share/icons/Rodent/48x48/mimetypes/application-x-tex.png
+share/icons/Rodent/48x48/mimetypes/application-x-trash.png
+share/icons/Rodent/48x48/mimetypes/application-zip.png
+share/icons/Rodent/48x48/mimetypes/application.png
+share/icons/Rodent/48x48/mimetypes/audio-ac3.png
+share/icons/Rodent/48x48/mimetypes/audio-basic.png
+share/icons/Rodent/48x48/mimetypes/audio-midi.png
+share/icons/Rodent/48x48/mimetypes/audio-x-aiff.png
+share/icons/Rodent/48x48/mimetypes/audio-x-it.png
+share/icons/Rodent/48x48/mimetypes/audio-x-midi.png
+share/icons/Rodent/48x48/mimetypes/audio-x-mod.png
+share/icons/Rodent/48x48/mimetypes/audio-x-mp3.png
+share/icons/Rodent/48x48/mimetypes/audio-x-mpegurl.png
+share/icons/Rodent/48x48/mimetypes/audio-x-pn-realaudio.png
+share/icons/Rodent/48x48/mimetypes/audio-x-s3m.png
+share/icons/Rodent/48x48/mimetypes/audio-x-stm.png
+share/icons/Rodent/48x48/mimetypes/audio-x-ulaw.png
+share/icons/Rodent/48x48/mimetypes/audio-x-voc.png
+share/icons/Rodent/48x48/mimetypes/audio-x-wav.png
+share/icons/Rodent/48x48/mimetypes/audio-x-xi.png
+share/icons/Rodent/48x48/mimetypes/audio-x-xm.png
+share/icons/Rodent/48x48/mimetypes/audio.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-msword.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-octet-stream.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-ogg.png
@@ -152,6 +256,7 @@ share/icons/Rodent/48x48/mimetypes/gnome-mime-application-rtf.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-smil.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-vnd.ms-excel.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png
+share/icons/Rodent/48x48/mimetypes/gnome-mime-application-vnd.ms-word.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-vnd.rn-realmedia.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-vnd.stardivision.calc.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-application-vnd.stardivision.chart.png
@@ -237,6 +342,7 @@ share/icons/Rodent/48x48/mimetypes/gnome-mime-image-gif.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-image-ief.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-image-jpeg.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-image-png.png
+share/icons/Rodent/48x48/mimetypes/gnome-mime-image-svg+xml.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-image-svg.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-image-tiff.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-image-x-3ds.png
@@ -300,7 +406,31 @@ share/icons/Rodent/48x48/mimetypes/gnome-mime-x-directory-smb-server.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-x-directory-smb-share.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-x-directory-smb-workgroup.png
share/icons/Rodent/48x48/mimetypes/gnome-mime-x-font-afm.png
-share/icons/Rodent/48x48/mimetypes/gnome-package.png
+share/icons/Rodent/48x48/mimetypes/gnome-mime-x-gdesklets-display.png
+share/icons/Rodent/48x48/mimetypes/image-bmp.png
+share/icons/Rodent/48x48/mimetypes/image-gif.png
+share/icons/Rodent/48x48/mimetypes/image-ief.png
+share/icons/Rodent/48x48/mimetypes/image-jpeg.png
+share/icons/Rodent/48x48/mimetypes/image-png.png
+share/icons/Rodent/48x48/mimetypes/image-svg+xml.png
+share/icons/Rodent/48x48/mimetypes/image-svg.png
+share/icons/Rodent/48x48/mimetypes/image-tiff.png
+share/icons/Rodent/48x48/mimetypes/image-x-3ds.png
+share/icons/Rodent/48x48/mimetypes/image-x-applix-graphic.png
+share/icons/Rodent/48x48/mimetypes/image-x-cmu-raster.png
+share/icons/Rodent/48x48/mimetypes/image-x-portable-anymap.png
+share/icons/Rodent/48x48/mimetypes/image-x-portable-bitmap.png
+share/icons/Rodent/48x48/mimetypes/image-x-portable-greymap.png
+share/icons/Rodent/48x48/mimetypes/image-x-portable-pixmap.png
+share/icons/Rodent/48x48/mimetypes/image-x-psd.png
+share/icons/Rodent/48x48/mimetypes/image-x-rgb.png
+share/icons/Rodent/48x48/mimetypes/image-x-tga.png
+share/icons/Rodent/48x48/mimetypes/image-x-xbitmap.png
+share/icons/Rodent/48x48/mimetypes/image-x-xcf.png
+share/icons/Rodent/48x48/mimetypes/image-x-xfig.png
+share/icons/Rodent/48x48/mimetypes/image-x-xpixmap.png
+share/icons/Rodent/48x48/mimetypes/image-x-xwindowdum.png
+share/icons/Rodent/48x48/mimetypes/image.png
share/icons/Rodent/48x48/mimetypes/mime-application.png
share/icons/Rodent/48x48/mimetypes/mime-application:msword.png
share/icons/Rodent/48x48/mimetypes/mime-application:octet-stream.png
@@ -317,6 +447,7 @@ share/icons/Rodent/48x48/mimetypes/mime-application:rtf.png
share/icons/Rodent/48x48/mimetypes/mime-application:smil.png
share/icons/Rodent/48x48/mimetypes/mime-application:vnd.ms-excel.png
share/icons/Rodent/48x48/mimetypes/mime-application:vnd.ms-powerpoint.png
+share/icons/Rodent/48x48/mimetypes/mime-application:vnd.ms-word.png
share/icons/Rodent/48x48/mimetypes/mime-application:vnd.rn-realmedia.png
share/icons/Rodent/48x48/mimetypes/mime-application:vnd.stardivision.calc.png
share/icons/Rodent/48x48/mimetypes/mime-application:vnd.stardivision.chart.png
@@ -402,6 +533,7 @@ share/icons/Rodent/48x48/mimetypes/mime-image:gif.png
share/icons/Rodent/48x48/mimetypes/mime-image:ief.png
share/icons/Rodent/48x48/mimetypes/mime-image:jpeg.png
share/icons/Rodent/48x48/mimetypes/mime-image:png.png
+share/icons/Rodent/48x48/mimetypes/mime-image:svg+xml.png
share/icons/Rodent/48x48/mimetypes/mime-image:svg.png
share/icons/Rodent/48x48/mimetypes/mime-image:tiff.png
share/icons/Rodent/48x48/mimetypes/mime-image:x-3ds.png
@@ -464,19 +596,78 @@ share/icons/Rodent/48x48/mimetypes/mime-x:directory-smb-server.png
share/icons/Rodent/48x48/mimetypes/mime-x:directory-smb-share.png
share/icons/Rodent/48x48/mimetypes/mime-x:directory-smb-workgroup.png
share/icons/Rodent/48x48/mimetypes/mime-x:font-afm.png
-share/icons/Rodent/48x48/mimetypes/stock_run.png
+share/icons/Rodent/48x48/mimetypes/mime-x:gdesklets-display.png
+share/icons/Rodent/48x48/mimetypes/text-css.png
+share/icons/Rodent/48x48/mimetypes/text-html.png
+share/icons/Rodent/48x48/mimetypes/text-sgml.png
+share/icons/Rodent/48x48/mimetypes/text-x-authors.png
+share/icons/Rodent/48x48/mimetypes/text-x-c++.png
+share/icons/Rodent/48x48/mimetypes/text-x-c++src.png
+share/icons/Rodent/48x48/mimetypes/text-x-c-header.png
+share/icons/Rodent/48x48/mimetypes/text-x-c.png
+share/icons/Rodent/48x48/mimetypes/text-x-chdr.png
+share/icons/Rodent/48x48/mimetypes/text-x-copying.png
+share/icons/Rodent/48x48/mimetypes/text-x-credits.png
+share/icons/Rodent/48x48/mimetypes/text-x-csh.png
+share/icons/Rodent/48x48/mimetypes/text-x-csharp.png
+share/icons/Rodent/48x48/mimetypes/text-x-csrc.png
+share/icons/Rodent/48x48/mimetypes/text-x-gettext-translation.png
+share/icons/Rodent/48x48/mimetypes/text-x-haskell.png
+share/icons/Rodent/48x48/mimetypes/text-x-install.png
+share/icons/Rodent/48x48/mimetypes/text-x-java.png
+share/icons/Rodent/48x48/mimetypes/text-x-literate-haskell.png
+share/icons/Rodent/48x48/mimetypes/text-x-log.png
+share/icons/Rodent/48x48/mimetypes/text-x-lyx.png
+share/icons/Rodent/48x48/mimetypes/text-x-makefile.png
+share/icons/Rodent/48x48/mimetypes/text-x-patch.png
+share/icons/Rodent/48x48/mimetypes/text-x-readme.png
+share/icons/Rodent/48x48/mimetypes/text-x-scheme.png
+share/icons/Rodent/48x48/mimetypes/text-x-sh.png
+share/icons/Rodent/48x48/mimetypes/text-x-tex.png
+share/icons/Rodent/48x48/mimetypes/text-x-troff-man.png
+share/icons/Rodent/48x48/mimetypes/text-x-vcalendar.png
+share/icons/Rodent/48x48/mimetypes/text-x-vcard.png
+share/icons/Rodent/48x48/mimetypes/text-x-xslt.png
+share/icons/Rodent/48x48/mimetypes/text-x-zsh.png
+share/icons/Rodent/48x48/mimetypes/text-xml.png
+share/icons/Rodent/48x48/mimetypes/text.png
+share/icons/Rodent/48x48/mimetypes/video-mpeg.png
+share/icons/Rodent/48x48/mimetypes/video-quicktime.png
+share/icons/Rodent/48x48/mimetypes/video-x-ms-asf.png
+share/icons/Rodent/48x48/mimetypes/video-x-ms-wmv.png
+share/icons/Rodent/48x48/mimetypes/video-x-msvideo.png
+share/icons/Rodent/48x48/mimetypes/video.png
+share/icons/Rodent/48x48/mimetypes/x-directory-nfs-server.png
+share/icons/Rodent/48x48/mimetypes/x-directory-smb-server.png
+share/icons/Rodent/48x48/mimetypes/x-directory-smb-share.png
+share/icons/Rodent/48x48/mimetypes/x-directory-smb-workgroup.png
+share/icons/Rodent/48x48/mimetypes/x-font-afm.png
share/icons/Rodent/48x48/mimetypes/x-gdesklets-display.png
+share/icons/Rodent/48x48/misc/arrow.png
share/icons/Rodent/48x48/misc/calc.png
share/icons/Rodent/48x48/misc/debian.png
share/icons/Rodent/48x48/misc/f-memory.png
share/icons/Rodent/48x48/misc/firewall.png
share/icons/Rodent/48x48/misc/fs-win.png
+share/icons/Rodent/48x48/misc/icon_view.png
+share/icons/Rodent/48x48/misc/menueditor.png
share/icons/Rodent/48x48/misc/money.png
share/icons/Rodent/48x48/misc/news.png
share/icons/Rodent/48x48/misc/notes.png
share/icons/Rodent/48x48/misc/root_terminal.png
+share/icons/Rodent/48x48/misc/run.png
+share/icons/Rodent/48x48/misc/settings.png
+share/icons/Rodent/48x48/misc/sm.png
+share/icons/Rodent/48x48/misc/sound.png
+share/icons/Rodent/48x48/misc/tabwin.png
+share/icons/Rodent/48x48/misc/taskbar.png
+share/icons/Rodent/48x48/misc/taskmanager.png
+share/icons/Rodent/48x48/misc/ui.png
share/icons/Rodent/48x48/misc/usb_key.png
share/icons/Rodent/48x48/misc/webcam.png
+share/icons/Rodent/48x48/misc/wksp.png
+share/icons/Rodent/48x48/misc/wm.png
+share/icons/Rodent/48x48/misc/xfce4-appfinder.png
share/icons/Rodent/48x48/stock/media-backward.png
share/icons/Rodent/48x48/stock/media-eject.png
share/icons/Rodent/48x48/stock/media-forward.png
@@ -485,6 +676,7 @@ share/icons/Rodent/48x48/stock/media-pause.png
share/icons/Rodent/48x48/stock/media-play.png
share/icons/Rodent/48x48/stock/media-prev.png
share/icons/Rodent/48x48/stock/media-record.png
+share/icons/Rodent/48x48/stock/media-shuffle.png
share/icons/Rodent/48x48/stock/media-stop.png
share/icons/Rodent/48x48/stock/rox-select.png
share/icons/Rodent/48x48/stock/rox-show-details.png
@@ -523,9 +715,14 @@ share/icons/Rodent/48x48/stock/stock_edit.png
share/icons/Rodent/48x48/stock/stock_epiphany-bookmark-page.png
share/icons/Rodent/48x48/stock/stock_execute.png
share/icons/Rodent/48x48/stock/stock_export.png
+share/icons/Rodent/48x48/stock/stock_file-properties.png
share/icons/Rodent/48x48/stock/stock_find-and-replace.png
share/icons/Rodent/48x48/stock/stock_find.png
share/icons/Rodent/48x48/stock/stock_floppy.png
+share/icons/Rodent/48x48/stock/stock_folder-copy.png
+share/icons/Rodent/48x48/stock/stock_folder-move.png
+share/icons/Rodent/48x48/stock/stock_folder-properties.png
+share/icons/Rodent/48x48/stock/stock_folder.png
share/icons/Rodent/48x48/stock/stock_fullscreen.png
share/icons/Rodent/48x48/stock/stock_go-back.png
share/icons/Rodent/48x48/stock/stock_go-down.png
@@ -559,12 +756,14 @@ share/icons/Rodent/48x48/stock/stock_mic.png
share/icons/Rodent/48x48/stock/stock_missing-image.png
share/icons/Rodent/48x48/stock/stock_multimedia.png
share/icons/Rodent/48x48/stock/stock_network.png
+share/icons/Rodent/48x48/stock/stock_new-dir.png
share/icons/Rodent/48x48/stock/stock_new-tab.png
share/icons/Rodent/48x48/stock/stock_new.png
share/icons/Rodent/48x48/stock/stock_no.png
share/icons/Rodent/48x48/stock/stock_ok.png
share/icons/Rodent/48x48/stock/stock_open.png
share/icons/Rodent/48x48/stock/stock_paste.png
+share/icons/Rodent/48x48/stock/stock_pastelink.png
share/icons/Rodent/48x48/stock/stock_preferences.png
share/icons/Rodent/48x48/stock/stock_print-preview.png
share/icons/Rodent/48x48/stock/stock_print.png
@@ -573,6 +772,7 @@ share/icons/Rodent/48x48/stock/stock_quit.png
share/icons/Rodent/48x48/stock/stock_redo.png
share/icons/Rodent/48x48/stock/stock_refresh.png
share/icons/Rodent/48x48/stock/stock_remove.png
+share/icons/Rodent/48x48/stock/stock_repeat.png
share/icons/Rodent/48x48/stock/stock_reset.png
share/icons/Rodent/48x48/stock/stock_revert-to-saved.png
share/icons/Rodent/48x48/stock/stock_run.png
@@ -626,11 +826,13 @@ share/icons/Rodent/scalable/apps/gnome-graphics.svg
share/icons/Rodent/scalable/apps/gnome-help.svg
share/icons/Rodent/scalable/apps/gnome-info.svg
share/icons/Rodent/scalable/apps/gnome-joystick.svg
+share/icons/Rodent/scalable/apps/gnome-library.svg
share/icons/Rodent/scalable/apps/gnome-lockscreen.svg
share/icons/Rodent/scalable/apps/gnome-logout.svg
share/icons/Rodent/scalable/apps/gnome-media-player-icon.svg
share/icons/Rodent/scalable/apps/gnome-multimedia.svg
share/icons/Rodent/scalable/apps/gnome-other.svg
+share/icons/Rodent/scalable/apps/gnome-package.svg
share/icons/Rodent/scalable/apps/gnome-pdf.svg
share/icons/Rodent/scalable/apps/gnome-searchtool.svg
share/icons/Rodent/scalable/apps/gnome-settings.svg
@@ -719,6 +921,10 @@ share/icons/Rodent/scalable/emblems/emblem-sound.svg
share/icons/Rodent/scalable/emblems/emblem-symbolic-link.svg
share/icons/Rodent/scalable/emblems/emblem-urgent.svg
share/icons/Rodent/scalable/emblems/emblem-web.svg
+share/icons/Rodent/scalable/filesystems/blockdevice.svg
+share/icons/Rodent/scalable/filesystems/chardevice.svg
+share/icons/Rodent/scalable/filesystems/core.svg
+share/icons/Rodent/scalable/filesystems/directory.svg
share/icons/Rodent/scalable/filesystems/gnome-fs-blockdev.svg
share/icons/Rodent/scalable/filesystems/gnome-fs-client.svg
share/icons/Rodent/scalable/filesystems/gnome-fs-desktop.svg
@@ -742,9 +948,106 @@ share/icons/Rodent/scalable/filesystems/mime-inode:chardevice.svg
share/icons/Rodent/scalable/filesystems/mime-inode:core.svg
share/icons/Rodent/scalable/filesystems/mime-inode:directory.svg
share/icons/Rodent/scalable/filesystems/mime-inode:mount-point.svg
+share/icons/Rodent/scalable/filesystems/mount-point.svg
share/icons/Rodent/scalable/filesystems/network_fs.svg
share/icons/Rodent/scalable/filesystems/open_folder.svg
-share/icons/Rodent/scalable/mimetypes/gnome-library.svg
+share/icons/Rodent/scalable/filesystems/user-home.svg
+share/icons/Rodent/scalable/mimetypes/application-msword.svg
+share/icons/Rodent/scalable/mimetypes/application-octet-stream.svg
+share/icons/Rodent/scalable/mimetypes/application-ogg.svg
+share/icons/Rodent/scalable/mimetypes/application-pdf.svg
+share/icons/Rodent/scalable/mimetypes/application-pgp-encrypted.svg
+share/icons/Rodent/scalable/mimetypes/application-pgp-keys.svg
+share/icons/Rodent/scalable/mimetypes/application-pgp.svg
+share/icons/Rodent/scalable/mimetypes/application-postscript.svg
+share/icons/Rodent/scalable/mimetypes/application-qif.svg
+share/icons/Rodent/scalable/mimetypes/application-rhythmbox-effect.svg
+share/icons/Rodent/scalable/mimetypes/application-rhythmbox-playlist.svg
+share/icons/Rodent/scalable/mimetypes/application-rtf.svg
+share/icons/Rodent/scalable/mimetypes/application-smil.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.ms-excel.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.ms-powerpoint.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.ms-word.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.rn-realmedia.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.stardivision.calc.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.stardivision.chart.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.stardivision.impress.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.stardivision.writer.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.sun.xml.calc.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.sun.xml.chart.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.sun.xml.draw.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.sun.xml.impress.svg
+share/icons/Rodent/scalable/mimetypes/application-vnd.sun.xml.writer.svg
+share/icons/Rodent/scalable/mimetypes/application-x-abiword.svg
+share/icons/Rodent/scalable/mimetypes/application-x-archive.svg
+share/icons/Rodent/scalable/mimetypes/application-x-arj.svg
+share/icons/Rodent/scalable/mimetypes/application-x-blender.svg
+share/icons/Rodent/scalable/mimetypes/application-x-bzip-compressed-tar.svg
+share/icons/Rodent/scalable/mimetypes/application-x-bzip.svg
+share/icons/Rodent/scalable/mimetypes/application-x-cd-image.svg
+share/icons/Rodent/scalable/mimetypes/application-x-compress.svg
+share/icons/Rodent/scalable/mimetypes/application-x-compressed-tar.svg
+share/icons/Rodent/scalable/mimetypes/application-x-cpio-compressed.svg
+share/icons/Rodent/scalable/mimetypes/application-x-cpio.svg
+share/icons/Rodent/scalable/mimetypes/application-x-deb.svg
+share/icons/Rodent/scalable/mimetypes/application-x-desktop.svg
+share/icons/Rodent/scalable/mimetypes/application-x-dia-diagram.svg
+share/icons/Rodent/scalable/mimetypes/application-x-dvi.svg
+share/icons/Rodent/scalable/mimetypes/application-x-executable.svg
+share/icons/Rodent/scalable/mimetypes/application-x-font-asm.svg
+share/icons/Rodent/scalable/mimetypes/application-x-font-bdf.svg
+share/icons/Rodent/scalable/mimetypes/application-x-font-linux-psf.svg
+share/icons/Rodent/scalable/mimetypes/application-x-font-pcf.svg
+share/icons/Rodent/scalable/mimetypes/application-x-font-ttf.svg
+share/icons/Rodent/scalable/mimetypes/application-x-gettext-translation.svg
+share/icons/Rodent/scalable/mimetypes/application-x-glade.svg
+share/icons/Rodent/scalable/mimetypes/application-x-gnucash.svg
+share/icons/Rodent/scalable/mimetypes/application-x-gnumeric.svg
+share/icons/Rodent/scalable/mimetypes/application-x-gtktalog.svg
+share/icons/Rodent/scalable/mimetypes/application-x-gzip.svg
+share/icons/Rodent/scalable/mimetypes/application-x-kde-app-info.svg
+share/icons/Rodent/scalable/mimetypes/application-x-killustrator.svg
+share/icons/Rodent/scalable/mimetypes/application-x-kpresenter.svg
+share/icons/Rodent/scalable/mimetypes/application-x-kspread.svg
+share/icons/Rodent/scalable/mimetypes/application-x-kword.svg
+share/icons/Rodent/scalable/mimetypes/application-x-lha.svg
+share/icons/Rodent/scalable/mimetypes/application-x-object.svg
+share/icons/Rodent/scalable/mimetypes/application-x-perl.svg
+share/icons/Rodent/scalable/mimetypes/application-x-php.svg
+share/icons/Rodent/scalable/mimetypes/application-x-python-bytecode.svg
+share/icons/Rodent/scalable/mimetypes/application-x-python.svg
+share/icons/Rodent/scalable/mimetypes/application-x-qw.svg
+share/icons/Rodent/scalable/mimetypes/application-x-rar.svg
+share/icons/Rodent/scalable/mimetypes/application-x-reject.svg
+share/icons/Rodent/scalable/mimetypes/application-x-rpm.svg
+share/icons/Rodent/scalable/mimetypes/application-x-share-library-la.svg
+share/icons/Rodent/scalable/mimetypes/application-x-sharedlib.svg
+share/icons/Rodent/scalable/mimetypes/application-x-shellscript.svg
+share/icons/Rodent/scalable/mimetypes/application-x-shockwave-flash.svg
+share/icons/Rodent/scalable/mimetypes/application-x-smil.svg
+share/icons/Rodent/scalable/mimetypes/application-x-tar.svg
+share/icons/Rodent/scalable/mimetypes/application-x-tex.svg
+share/icons/Rodent/scalable/mimetypes/application-x-trash.svg
+share/icons/Rodent/scalable/mimetypes/application-zip.svg
+share/icons/Rodent/scalable/mimetypes/application.svg
+share/icons/Rodent/scalable/mimetypes/audio-ac3.svg
+share/icons/Rodent/scalable/mimetypes/audio-basic.svg
+share/icons/Rodent/scalable/mimetypes/audio-midi.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-aiff.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-it.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-midi.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-mod.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-mp3.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-mpegurl.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-pn-realaudio.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-s3m.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-stm.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-ulaw.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-voc.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-wav.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-xi.svg
+share/icons/Rodent/scalable/mimetypes/audio-x-xm.svg
+share/icons/Rodent/scalable/mimetypes/audio.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-msword.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-octet-stream.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-ogg.svg
@@ -760,6 +1063,7 @@ share/icons/Rodent/scalable/mimetypes/gnome-mime-application-rtf.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-smil.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-vnd.ms-excel.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-vnd.ms-powerpoint.svg
+share/icons/Rodent/scalable/mimetypes/gnome-mime-application-vnd.ms-word.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-vnd.rn-realmedia.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-vnd.stardivision.calc.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-application-vnd.stardivision.chart.svg
@@ -845,6 +1149,7 @@ share/icons/Rodent/scalable/mimetypes/gnome-mime-image-gif.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-image-ief.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-image-jpeg.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-image-png.svg
+share/icons/Rodent/scalable/mimetypes/gnome-mime-image-svg+xml.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-image-svg.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-image-tiff.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-image-x-3ds.svg
@@ -908,7 +1213,31 @@ share/icons/Rodent/scalable/mimetypes/gnome-mime-x-directory-smb-server.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-x-directory-smb-share.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-x-directory-smb-workgroup.svg
share/icons/Rodent/scalable/mimetypes/gnome-mime-x-font-afm.svg
-share/icons/Rodent/scalable/mimetypes/gnome-package.svg
+share/icons/Rodent/scalable/mimetypes/gnome-mime-x-gdesklets-display.svg
+share/icons/Rodent/scalable/mimetypes/image-bmp.svg
+share/icons/Rodent/scalable/mimetypes/image-gif.svg
+share/icons/Rodent/scalable/mimetypes/image-ief.svg
+share/icons/Rodent/scalable/mimetypes/image-jpeg.svg
+share/icons/Rodent/scalable/mimetypes/image-png.svg
+share/icons/Rodent/scalable/mimetypes/image-svg+xml.svg
+share/icons/Rodent/scalable/mimetypes/image-svg.svg
+share/icons/Rodent/scalable/mimetypes/image-tiff.svg
+share/icons/Rodent/scalable/mimetypes/image-x-3ds.svg
+share/icons/Rodent/scalable/mimetypes/image-x-applix-graphic.svg
+share/icons/Rodent/scalable/mimetypes/image-x-cmu-raster.svg
+share/icons/Rodent/scalable/mimetypes/image-x-portable-anymap.svg
+share/icons/Rodent/scalable/mimetypes/image-x-portable-bitmap.svg
+share/icons/Rodent/scalable/mimetypes/image-x-portable-greymap.svg
+share/icons/Rodent/scalable/mimetypes/image-x-portable-pixmap.svg
+share/icons/Rodent/scalable/mimetypes/image-x-psd.svg
+share/icons/Rodent/scalable/mimetypes/image-x-rgb.svg
+share/icons/Rodent/scalable/mimetypes/image-x-tga.svg
+share/icons/Rodent/scalable/mimetypes/image-x-xbitmap.svg
+share/icons/Rodent/scalable/mimetypes/image-x-xcf.svg
+share/icons/Rodent/scalable/mimetypes/image-x-xfig.svg
+share/icons/Rodent/scalable/mimetypes/image-x-xpixmap.svg
+share/icons/Rodent/scalable/mimetypes/image-x-xwindowdum.svg
+share/icons/Rodent/scalable/mimetypes/image.svg
share/icons/Rodent/scalable/mimetypes/mime-application.svg
share/icons/Rodent/scalable/mimetypes/mime-application:msword.svg
share/icons/Rodent/scalable/mimetypes/mime-application:octet-stream.svg
@@ -925,6 +1254,7 @@ share/icons/Rodent/scalable/mimetypes/mime-application:rtf.svg
share/icons/Rodent/scalable/mimetypes/mime-application:smil.svg
share/icons/Rodent/scalable/mimetypes/mime-application:vnd.ms-excel.svg
share/icons/Rodent/scalable/mimetypes/mime-application:vnd.ms-powerpoint.svg
+share/icons/Rodent/scalable/mimetypes/mime-application:vnd.ms-word.svg
share/icons/Rodent/scalable/mimetypes/mime-application:vnd.rn-realmedia.svg
share/icons/Rodent/scalable/mimetypes/mime-application:vnd.stardivision.calc.svg
share/icons/Rodent/scalable/mimetypes/mime-application:vnd.stardivision.chart.svg
@@ -1010,6 +1340,7 @@ share/icons/Rodent/scalable/mimetypes/mime-image:gif.svg
share/icons/Rodent/scalable/mimetypes/mime-image:ief.svg
share/icons/Rodent/scalable/mimetypes/mime-image:jpeg.svg
share/icons/Rodent/scalable/mimetypes/mime-image:png.svg
+share/icons/Rodent/scalable/mimetypes/mime-image:svg+xml.svg
share/icons/Rodent/scalable/mimetypes/mime-image:svg.svg
share/icons/Rodent/scalable/mimetypes/mime-image:tiff.svg
share/icons/Rodent/scalable/mimetypes/mime-image:x-3ds.svg
@@ -1072,19 +1403,76 @@ share/icons/Rodent/scalable/mimetypes/mime-x:directory-smb-server.svg
share/icons/Rodent/scalable/mimetypes/mime-x:directory-smb-share.svg
share/icons/Rodent/scalable/mimetypes/mime-x:directory-smb-workgroup.svg
share/icons/Rodent/scalable/mimetypes/mime-x:font-afm.svg
-share/icons/Rodent/scalable/mimetypes/stock_run.svg
+share/icons/Rodent/scalable/mimetypes/mime-x:gdesklets-display.svg
+share/icons/Rodent/scalable/mimetypes/text-css.svg
+share/icons/Rodent/scalable/mimetypes/text-html.svg
+share/icons/Rodent/scalable/mimetypes/text-sgml.svg
+share/icons/Rodent/scalable/mimetypes/text-x-authors.svg
+share/icons/Rodent/scalable/mimetypes/text-x-c++.svg
+share/icons/Rodent/scalable/mimetypes/text-x-c++src.svg
+share/icons/Rodent/scalable/mimetypes/text-x-c-header.svg
+share/icons/Rodent/scalable/mimetypes/text-x-c.svg
+share/icons/Rodent/scalable/mimetypes/text-x-chdr.svg
+share/icons/Rodent/scalable/mimetypes/text-x-copying.svg
+share/icons/Rodent/scalable/mimetypes/text-x-credits.svg
+share/icons/Rodent/scalable/mimetypes/text-x-csh.svg
+share/icons/Rodent/scalable/mimetypes/text-x-csharp.svg
+share/icons/Rodent/scalable/mimetypes/text-x-csrc.svg
+share/icons/Rodent/scalable/mimetypes/text-x-gettext-translation.svg
+share/icons/Rodent/scalable/mimetypes/text-x-haskell.svg
+share/icons/Rodent/scalable/mimetypes/text-x-install.svg
+share/icons/Rodent/scalable/mimetypes/text-x-java.svg
+share/icons/Rodent/scalable/mimetypes/text-x-literate-haskell.svg
+share/icons/Rodent/scalable/mimetypes/text-x-log.svg
+share/icons/Rodent/scalable/mimetypes/text-x-lyx.svg
+share/icons/Rodent/scalable/mimetypes/text-x-makefile.svg
+share/icons/Rodent/scalable/mimetypes/text-x-patch.svg
+share/icons/Rodent/scalable/mimetypes/text-x-readme.svg
+share/icons/Rodent/scalable/mimetypes/text-x-scheme.svg
+share/icons/Rodent/scalable/mimetypes/text-x-sh.svg
+share/icons/Rodent/scalable/mimetypes/text-x-tex.svg
+share/icons/Rodent/scalable/mimetypes/text-x-troff-man.svg
+share/icons/Rodent/scalable/mimetypes/text-x-vcalendar.svg
+share/icons/Rodent/scalable/mimetypes/text-x-vcard.svg
+share/icons/Rodent/scalable/mimetypes/text-x-xslt.svg
+share/icons/Rodent/scalable/mimetypes/text-x-zsh.svg
+share/icons/Rodent/scalable/mimetypes/text-xml.svg
+share/icons/Rodent/scalable/mimetypes/text.svg
+share/icons/Rodent/scalable/mimetypes/video-mpeg.svg
+share/icons/Rodent/scalable/mimetypes/video-quicktime.svg
+share/icons/Rodent/scalable/mimetypes/video-x-ms-asf.svg
+share/icons/Rodent/scalable/mimetypes/video-x-ms-wmv.svg
+share/icons/Rodent/scalable/mimetypes/video-x-msvideo.svg
+share/icons/Rodent/scalable/mimetypes/video.svg
+share/icons/Rodent/scalable/mimetypes/x-directory-nfs-server.svg
+share/icons/Rodent/scalable/mimetypes/x-directory-smb-server.svg
+share/icons/Rodent/scalable/mimetypes/x-directory-smb-share.svg
+share/icons/Rodent/scalable/mimetypes/x-directory-smb-workgroup.svg
+share/icons/Rodent/scalable/mimetypes/x-font-afm.svg
share/icons/Rodent/scalable/mimetypes/x-gdesklets-display.svg
share/icons/Rodent/scalable/misc/calc.svg
share/icons/Rodent/scalable/misc/debian.svg
share/icons/Rodent/scalable/misc/f-memory.svg
share/icons/Rodent/scalable/misc/firewall.svg
share/icons/Rodent/scalable/misc/fs-win.svg
+share/icons/Rodent/scalable/misc/icon_view.svg
share/icons/Rodent/scalable/misc/money.svg
share/icons/Rodent/scalable/misc/news.svg
share/icons/Rodent/scalable/misc/notes.svg
share/icons/Rodent/scalable/misc/root_terminal.svg
+share/icons/Rodent/scalable/misc/run.svg
+share/icons/Rodent/scalable/misc/settings.svg
+share/icons/Rodent/scalable/misc/sm.svg
+share/icons/Rodent/scalable/misc/sound.svg
+share/icons/Rodent/scalable/misc/tabwin.svg
+share/icons/Rodent/scalable/misc/taskbar.svg
+share/icons/Rodent/scalable/misc/taskmanager.svg
+share/icons/Rodent/scalable/misc/ui.svg
share/icons/Rodent/scalable/misc/usb_key.svg
share/icons/Rodent/scalable/misc/webcam.svg
+share/icons/Rodent/scalable/misc/wksp.svg
+share/icons/Rodent/scalable/misc/wm.svg
+share/icons/Rodent/scalable/misc/xfce4-appfinder.svg
share/icons/Rodent/scalable/stock/m-font.svg
share/icons/Rodent/scalable/stock/m-lock.svg
share/icons/Rodent/scalable/stock/m-spreadsheet.svg
@@ -1096,6 +1484,7 @@ share/icons/Rodent/scalable/stock/media-pause.svg
share/icons/Rodent/scalable/stock/media-play.svg
share/icons/Rodent/scalable/stock/media-prev.svg
share/icons/Rodent/scalable/stock/media-record.svg
+share/icons/Rodent/scalable/stock/media-shuffle.svg
share/icons/Rodent/scalable/stock/media-stop.svg
share/icons/Rodent/scalable/stock/rox-select.svg
share/icons/Rodent/scalable/stock/rox-show-details.svg
@@ -1133,9 +1522,14 @@ share/icons/Rodent/scalable/stock/stock_edit.svg
share/icons/Rodent/scalable/stock/stock_epiphany-bookmark-page.svg
share/icons/Rodent/scalable/stock/stock_execute.svg
share/icons/Rodent/scalable/stock/stock_export.svg
+share/icons/Rodent/scalable/stock/stock_file-properties.svg
share/icons/Rodent/scalable/stock/stock_find-and-replace.svg
share/icons/Rodent/scalable/stock/stock_find.svg
share/icons/Rodent/scalable/stock/stock_floppy.svg
+share/icons/Rodent/scalable/stock/stock_folder-copy.svg
+share/icons/Rodent/scalable/stock/stock_folder-move.svg
+share/icons/Rodent/scalable/stock/stock_folder-properties.svg
+share/icons/Rodent/scalable/stock/stock_folder.svg
share/icons/Rodent/scalable/stock/stock_fullscreen.svg
share/icons/Rodent/scalable/stock/stock_go-back.svg
share/icons/Rodent/scalable/stock/stock_go-down.svg
@@ -1183,6 +1577,7 @@ share/icons/Rodent/scalable/stock/stock_quit.svg
share/icons/Rodent/scalable/stock/stock_redo.svg
share/icons/Rodent/scalable/stock/stock_refresh.svg
share/icons/Rodent/scalable/stock/stock_remove.svg
+share/icons/Rodent/scalable/stock/stock_repeat.svg
share/icons/Rodent/scalable/stock/stock_reset.svg
share/icons/Rodent/scalable/stock/stock_revert-to-saved.svg
share/icons/Rodent/scalable/stock/stock_run.svg
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index a7726e9d95b0..2096bdba7d4e 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -6,38 +6,36 @@
#
PORTNAME= libxfce4gui
-PORTVERSION= 4.2.3
-PORTREVISION= 3
+PORTVERSION= 4.4.0
CATEGORIES= x11-toolkits xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DISTNAME= libxfcegui4-${PORTVERSION}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 widget library required by xfce4 and xfwm4
-LIB_DEPENDS= dbh-4.5.4:${PORTSDIR}/databases/dbh \
- xfce4util.1:${PORTSDIR}/x11/libxfce4util
-
-USE_GNOME= gtk20 gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -L${X11BASE}/lib" \
- CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include"
-CONFIGURE_ARGS= --enable-xinerama
-INSTALLS_SHLIB= yes
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_LDCONFIG= yes
+USE_XFCE= libutil
+USE_XLIB= yes
+
+OPTIONS= GTKDOC "install the library documentation" off
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
.if defined(WITH_GTKDOC)
BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc
CONFIGURE_ARGS+=--enable-gtk-doc
+PLIST_SUB+= GTK_DOC=""
.else
CONFIGURE_ARGS+=--disable-gtk-doc
+PLIST_SUB+= GTK_DOC="@comment "
.endif
-post-patch:
- @${REINPLACE_CMD} 's|dbh-1\.0|dbh|g' ${WRKSRC}/configure
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/libxfce4gui/distinfo b/x11-toolkits/libxfce4gui/distinfo
index fc1e5276e58f..5b48be95610f 100644
--- a/x11-toolkits/libxfce4gui/distinfo
+++ b/x11-toolkits/libxfce4gui/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfcegui4-4.2.3.tar.gz) = 5d2bae78c5ef66e914ae7a930bbdeb57
-SHA256 (xfce4/libxfcegui4-4.2.3.tar.gz) = 655c8c8657c16cf4fb9400722beb1a65841c0851e27a138c08b1908d5e254142
-SIZE (xfce4/libxfcegui4-4.2.3.tar.gz) = 883443
+MD5 (xfce4/libxfcegui4-4.4.0.tar.bz2) = 130cf67881f79c4f6ec4881a1d0d588f
+SHA256 (xfce4/libxfcegui4-4.4.0.tar.bz2) = 80abd4d3d21825d8cea362f13dc03a53cec902dd20b908afd8a1d7da7640dac1
+SIZE (xfce4/libxfcegui4-4.4.0.tar.bz2) = 562299
diff --git a/x11-toolkits/libxfce4gui/pkg-descr b/x11-toolkits/libxfce4gui/pkg-descr
index cf3114a65506..115d30694072 100644
--- a/x11-toolkits/libxfce4gui/pkg-descr
+++ b/x11-toolkits/libxfce4gui/pkg-descr
@@ -1,3 +1,3 @@
XFce 4 widget library required by the xfce4 and xfwm4 modules.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/x11-toolkits/libxfce4gui/pkg-plist b/x11-toolkits/libxfce4gui/pkg-plist
index 955e67e9475f..73ec3dce5b5c 100644
--- a/x11-toolkits/libxfce4gui/pkg-plist
+++ b/x11-toolkits/libxfce4gui/pkg-plist
@@ -1,6 +1,7 @@
include/xfce4/libxfcegui4/dialogs.h
include/xfce4/libxfcegui4/gtk_style.h
include/xfce4/libxfcegui4/gtktoxevent.h
+include/xfce4/libxfcegui4/gui-enum-types.h
include/xfce4/libxfcegui4/icons.h
include/xfce4/libxfcegui4/libnetk.h
include/xfce4/libxfcegui4/libxfcegui4.h
@@ -36,42 +37,25 @@ include/xfce4/libxfcegui4/xfce-exec.h
include/xfce4/libxfcegui4/xfce-filechooser.h
include/xfce4/libxfcegui4/xfce-gdk-extensions.h
include/xfce4/libxfcegui4/xfce-gtk-extensions.h
+include/xfce4/libxfcegui4/xfce-heading.h
include/xfce4/libxfcegui4/xfce-icontheme.h
+include/xfce4/libxfcegui4/xfce-startup-notification.h
+include/xfce4/libxfcegui4/xfce-titled-dialog.h
+include/xfce4/libxfcegui4/xfce-widget-helpers.h
include/xfce4/libxfcegui4/netk-class-group.h
include/xfce4/libxfcegui4/netk-window-action-menu.h
include/xfce4/libxfcegui4/xinerama.h
-include/xfce4/xfce4-modules/constants.h
-include/xfce4/xfce4-modules/mime_icons.h
-include/xfce4/xfce4-modules/combo.h
-include/xfce4/xfce4-modules/mime.h
lib/libxfcegui4.a
lib/libxfcegui4.la
lib/libxfcegui4.so
-lib/libxfcegui4.so.3
-lib/xfce4/modules/libxfce4_combo.a
-lib/xfce4/modules/libxfce4_combo.la
-lib/xfce4/modules/libxfce4_combo.so
-lib/xfce4/modules/libxfce4_combo.so.0
-lib/xfce4/modules/libxfce4_mime.a
-lib/xfce4/modules/libxfce4_mime.la
-lib/xfce4/modules/libxfce4_mime.so
-lib/xfce4/modules/libxfce4_mime.so.0
-lib/xfce4/modules/libxfce4_mime_icons.a
-lib/xfce4/modules/libxfce4_mime_icons.la
-lib/xfce4/modules/libxfce4_mime_icons.so
-lib/xfce4/modules/libxfce4_mime_icons.so.0
+lib/libxfcegui4.so.6
libdata/pkgconfig/libxfcegui4-1.0.pc
-share/xfce4/mime/applications.xml
-share/xfce4/mime/freedesktop.org.xml
-share/xfce4/mime/gnome.mime.xml
-share/xfce4/mime/hicolor.mime.xml
-share/xfce4/mime/types.xml
-share/xfce4/mime/xfce.org.xml
-share/xfce4/xfce-svg-test.svg
share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html
share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html
share/gtk-doc/html/libxfcegui4/XfceFramebox.html
+share/gtk-doc/html/libxfcegui4/XfceHeading.html
share/gtk-doc/html/libxfcegui4/XfceIconTheme.html
+share/gtk-doc/html/libxfcegui4/XfceTitledDialog.html
share/gtk-doc/html/libxfcegui4/home.png
share/gtk-doc/html/libxfcegui4/index.html
share/gtk-doc/html/libxfcegui4/index.sgml
@@ -88,8 +72,22 @@ share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html
share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp
share/gtk-doc/html/libxfcegui4/reference.html
share/gtk-doc/html/libxfcegui4/right.png
+share/gtk-doc/html/libxfcegui4/style.css
share/gtk-doc/html/libxfcegui4/up.png
-share/xfce4/hicolor-index.theme
+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-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/icons/hicolor/scalable/apps/xfce-filemanager.svg
@dirrm include/xfce4/libxfcegui4
@dirrmtry include/xfce4/xfce4-modules
@dirrmtry include/xfce4
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index af8b84304df6..77356c75e8f6 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -6,41 +6,44 @@
#
PORTNAME= xfce4-desktop
-PORTVERSION= 4.2.3
-PORTREVISION= 3
+PORTVERSION= 4.4.0
CATEGORIES= x11-wm xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DISTNAME= xfdesktop-${PORTVERSION}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 desktop background manager and root menu
-BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
- xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
- xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
- xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-USE_GETTEXT= yes
-USE_GNOME= gtk20
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${X11BASE}/lib" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
- LIBS=-L${LOCALBASE}/lib
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= glib20 gnometarget gtk20 intltool intlhack pkgconfig
+USE_LDCONFIG= yes
+USE_XFCE= configenv libgui libmcs libutil mcsmanager panel
+USE_XLIB= yes
+
+OPTIONS= THUNAR "Enable thunar support" on
MAN1= xfdesktop.1
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_THUNAR)
+CONFIGURE_ARGS+=--enable-thunar-vfs --enable-thunarx --enable-exo
+USE_XFCE+= libexo thunar
+.else
+CONFIGURE_ARGS+=--disable-thunar-vfs --disable-thunarx --disable-exo
+.endif
+
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+
post-patch:
@${REINPLACE_CMD} -e 's|builtin\(.*\)"quit"|app\1"xfce4-session-logout"|g' \
${WRKSRC}/menu.xml*
- @${REINPLACE_CMD} -e 's|G_INLINE_FUNC||g' ${WRKSRC}/src/xfce-desktop.c
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo
index c6c79c1300fb..b8becc6f0bf1 100644
--- a/x11-wm/xfce4-desktop/distinfo
+++ b/x11-wm/xfce4-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfdesktop-4.2.3.tar.gz) = 0be57a574a654625d61281411fb6be55
-SHA256 (xfce4/xfdesktop-4.2.3.tar.gz) = 5e0ede22e6c9441ba3642580c1768995069e8de1536013b65f9394b32152d1e6
-SIZE (xfce4/xfdesktop-4.2.3.tar.gz) = 3169283
+MD5 (xfce4/xfdesktop-4.4.0.tar.bz2) = a1c93d228924b5daf151f698114021d3
+SHA256 (xfce4/xfdesktop-4.4.0.tar.bz2) = f6837480d87b61827e25d47ed1ca92565f975a8dff89ab950aefb1fb392fd34b
+SIZE (xfce4/xfdesktop-4.4.0.tar.bz2) = 3150198
diff --git a/x11-wm/xfce4-desktop/pkg-descr b/x11-wm/xfce4-desktop/pkg-descr
index 7e445c91d21a..424b0d24ca11 100644
--- a/x11-wm/xfce4-desktop/pkg-descr
+++ b/x11-wm/xfce4-desktop/pkg-descr
@@ -3,4 +3,4 @@ and provides a root window menu. The module also provides two settings
manager dialogs that allow you to change the background and change the
number of workspaces.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index e3fe67b7fc38..9b91764a4883 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -1,6 +1,8 @@
bin/xfce4-menueditor
+bin/xfce4-popup-menu
bin/xfdesktop
etc/xdg/xfce4/desktop/xfce-registered-categories.xml
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.ca
etc/xdg/xfce4/desktop/xfce-registered-categories.xml.cs
etc/xdg/xfce4/desktop/xfce-registered-categories.xml.eu
etc/xdg/xfce4/desktop/xfce-registered-categories.xml.fi
@@ -24,6 +26,7 @@ etc/xdg/xfce4/desktop/menu.xml.de
etc/xdg/xfce4/desktop/menu.xml.el
etc/xdg/xfce4/desktop/menu.xml.es
etc/xdg/xfce4/desktop/menu.xml.et
+etc/xdg/xfce4/desktop/menu.xml.eu
etc/xdg/xfce4/desktop/menu.xml.fi
etc/xdg/xfce4/desktop/menu.xml.fr
etc/xdg/xfce4/desktop/menu.xml.he
@@ -40,15 +43,17 @@ etc/xdg/xfce4/desktop/menu.xml.sv
etc/xdg/xfce4/desktop/menu.xml.uk
etc/xdg/xfce4/desktop/menu.xml.vi
etc/xdg/xfce4/desktop/menu.xml.zh_TW
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.de
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.el
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.es
+etc/xdg/xfce4/desktop/xfce-registered-categories.xml.fr
lib/xfce4/mcs-plugins/backdrop_settings.a
lib/xfce4/mcs-plugins/backdrop_settings.la
lib/xfce4/mcs-plugins/backdrop_settings.so
lib/xfce4/modules/xfce4_desktop_menu.a
lib/xfce4/modules/xfce4_desktop_menu.la
lib/xfce4/modules/xfce4_desktop_menu.so
-lib/xfce4/panel-plugins/libdesktopmenu.a
-lib/xfce4/panel-plugins/libdesktopmenu.la
-lib/xfce4/panel-plugins/libdesktopmenu.so
+libexec/xfce4/panel-plugins/xfce4-menu-plugin
share/applications/xfce-backdrop-settings.desktop
share/applications/xfce-menueditor.desktop
share/icons/hicolor/32x32/apps/xfce4-backdrop.png
@@ -57,7 +62,6 @@ 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/af/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
@@ -65,8 +69,8 @@ share/locale/bg/LC_MESSAGES/xfdesktop.mo
share/locale/bn_IN/LC_MESSAGES/xfdesktop.mo
share/locale/ca/LC_MESSAGES/xfdesktop.mo
share/locale/cs/LC_MESSAGES/xfdesktop.mo
-share/locale/da/LC_MESSAGES/xfdesktop.mo
share/locale/de/LC_MESSAGES/xfdesktop.mo
+share/locale/dz/LC_MESSAGES/xfdesktop.mo
share/locale/el/LC_MESSAGES/xfdesktop.mo
share/locale/en_GB/LC_MESSAGES/xfdesktop.mo
share/locale/eo/LC_MESSAGES/xfdesktop.mo
@@ -77,6 +81,7 @@ share/locale/eu/LC_MESSAGES/xfdesktop.mo
share/locale/fa/LC_MESSAGES/xfdesktop.mo
share/locale/fi/LC_MESSAGES/xfdesktop.mo
share/locale/fr/LC_MESSAGES/xfdesktop.mo
+share/locale/gl/LC_MESSAGES/xfdesktop.mo
share/locale/gu/LC_MESSAGES/xfdesktop.mo
share/locale/he/LC_MESSAGES/xfdesktop.mo
share/locale/hi/LC_MESSAGES/xfdesktop.mo
@@ -84,9 +89,10 @@ share/locale/hu/LC_MESSAGES/xfdesktop.mo
share/locale/hy/LC_MESSAGES/xfdesktop.mo
share/locale/it/LC_MESSAGES/xfdesktop.mo
share/locale/ja/LC_MESSAGES/xfdesktop.mo
+share/locale/ka/LC_MESSAGES/xfdesktop.mo
share/locale/ko/LC_MESSAGES/xfdesktop.mo
-share/locale/ku/LC_MESSAGES/xfdesktop.mo
share/locale/lt/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
share/locale/nb_NO/LC_MESSAGES/xfdesktop.mo
@@ -98,7 +104,6 @@ share/locale/pt_PT/LC_MESSAGES/xfdesktop.mo
share/locale/ro/LC_MESSAGES/xfdesktop.mo
share/locale/ru/LC_MESSAGES/xfdesktop.mo
share/locale/sk/LC_MESSAGES/xfdesktop.mo
-share/locale/sl/LC_MESSAGES/xfdesktop.mo
share/locale/sv/LC_MESSAGES/xfdesktop.mo
share/locale/ta/LC_MESSAGES/xfdesktop.mo
share/locale/tr/LC_MESSAGES/xfdesktop.mo
@@ -106,6 +111,8 @@ share/locale/uk/LC_MESSAGES/xfdesktop.mo
share/locale/vi/LC_MESSAGES/xfdesktop.mo
share/locale/zh_CN/LC_MESSAGES/xfdesktop.mo
share/locale/zh_TW/LC_MESSAGES/xfdesktop.mo
+share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png
+share/pixmaps/xfce4/xfdesktop/text-selection-frame.png
share/pixmaps/xfce4_xicon.png
share/pixmaps/xfce4_xicon1.png
share/pixmaps/xfce4_xicon2.png
@@ -123,10 +130,10 @@ share/xfce4/backdrops/xfce-turbulence.png
share/xfce4/doc/C/images/root_menu.png
share/xfce4/doc/C/images/root_menu2.png
share/xfce4/doc/C/images/select_bg_color.png
+share/xfce4/doc/C/images/xfdesktop-appearance-tab.png
+share/xfce4/doc/C/images/xfdesktop-behavior-tab.png
share/xfce4/doc/C/images/xfdesktop-editor.png
-share/xfce4/doc/C/images/xfdesktop-background.png
share/xfce4/doc/C/images/xfdesktop-list.png
-share/xfce4/doc/C/images/xfdesktop-menu-tab.png
share/xfce4/doc/C/xfdesktop.html
share/xfce4/doc/fr/images/root_menu2.png
share/xfce4/doc/fr/images/root_menu.png
@@ -136,64 +143,35 @@ share/xfce4/doc/fr/images/xfdesktop-editor.png
share/xfce4/doc/fr/images/xfdesktop-menu-tab.png
share/xfce4/doc/fr/images/xfdesktop-list.png
share/xfce4/doc/fr/xfdesktop.html
-share/xfce4/doc/he/images/root_menu2.png
-share/xfce4/doc/he/images/root_menu.png
-share/xfce4/doc/he/images/select_bg_color.png
-share/xfce4/doc/he/images/xfdesktop-background.png
-share/xfce4/doc/he/images/xfdesktop-editor.png
-share/xfce4/doc/he/images/xfdesktop-menu-tab.png
-share/xfce4/doc/he/images/xfdesktop-list.png
-share/xfce4/doc/he/xfdesktop.html
+share/xfce4/panel-plugins/xfce4-menu.desktop
+share/xfce4-menueditor/xfce4-menueditor.ui
@dirrm etc/xdg/xfce4/desktop
-@dirrmtry share/pixmaps
@dirrmtry share/applications
@dirrmtry etc/xdg/xfce4
@dirrmtry etc/xdg
@dirrmtry etc/xfce4
@dirrmtry lib/xfce4/mcs-plugins
+@dirrmtry lib/xfce4/modules
@dirrmtry lib/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrm share/xfce4/backdrops
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/he/images
-@dirrmtry share/xfce4/doc/he
@dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4/panel-plugins
@dirrmtry share/xfce4
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
+@dirrm share/xfce4-menueditor
@dirrmtry share/locale/nb_NO/LC_MESSAGES
@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
+@dirrmtry share/pixmaps/xfdesktop
+@dirrmtry share/pixmaps/xfce4/xfdesktop
+@dirrmtry share/pixmaps/xfce4
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 305d22aa7196..5f4918658c99 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -6,31 +6,44 @@
#
PORTNAME= xfce4-panel
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= 4.4.0
CATEGORIES= x11-wm xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 panel module
-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.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-
-USE_GETTEXT= yes
-USE_GNOME= gtk20 gnomehack
GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${X11BASE}/lib" \
- CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
- LIBS=-L${LOCALBASE}/lib
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_LDCONFIG= yes
+USE_XFCE= configenv libgui libmcs libutil mcsmanager
+USE_XLIB= yes
+
+OPTIONS= GTKDOC "install the library documentation" off \
+ STARTUP "Enable startup notification support" on
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+
+.if defined(WITH_GTKDOC)
+BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc
+CONFIGURE_ARGS+=--enable-gtk-doc
+PLIST_SUB+= GTK_DOC=""
+.else
+CONFIGURE_ARGS+=--disable-gtk-doc
+PLIST_SUB+= GTK_DOC="@comment "
+.endif
+
+.if !defined(WITHOUT_STARTUP)
+LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+CONFIGURE_ARGS+=--enable-startup-notification
+.else
+CONFIGURE_ARGS+=--disable-startup-notification
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index 2d89182c9b9c..68f11b89fac5 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-panel-4.2.3.tar.gz) = 3027c4601f208d290a988befed66a49f
-SHA256 (xfce4/xfce4-panel-4.2.3.tar.gz) = cac07e51513ea3f1cf298b2be7dd9500bb81aae3806aaff64de8c15e19003262
-SIZE (xfce4/xfce4-panel-4.2.3.tar.gz) = 1395852
+MD5 (xfce4/xfce4-panel-4.4.0.tar.bz2) = c46925d2df393dba8f16979ba87d4776
+SHA256 (xfce4/xfce4-panel-4.4.0.tar.bz2) = 28ab25d6933f40ac19a4b6c2b41374360193b8300ad14853fb4ca78d5c152926
+SIZE (xfce4/xfce4-panel-4.4.0.tar.bz2) = 818534
diff --git a/x11-wm/xfce4-panel/pkg-descr b/x11-wm/xfce4-panel/pkg-descr
index a97aa4e52311..a08bc3b5ed10 100644
--- a/x11-wm/xfce4-panel/pkg-descr
+++ b/x11-wm/xfce4-panel/pkg-descr
@@ -1,4 +1,4 @@
The XFce 4 panel provides program launchers, a workspace switcher, a clock,
subpanels and more.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index deca268261b4..533ba7173110 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -1,77 +1,82 @@
+bin/xfce4-iconbox
bin/xfce4-panel
-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.da
-etc/xdg/xfce4/panel/contents.xml.el
-etc/xdg/xfce4/panel/contents.xml.eu
-etc/xdg/xfce4/panel/contents.xml.fi
-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.ja
-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.pl
-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.sv
-etc/xdg/xfce4/panel/contents.xml.tr
-etc/xdg/xfce4/panel/contents.xml.vi
-etc/xdg/xfce4/panel/contents.xml.zh_CN
-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
-include/xfce4/panel/main.h
-include/xfce4/panel/panel.h
-include/xfce4/panel/item.h
-include/xfce4/panel/item_dialog.h
-include/xfce4/panel/plugins.h
-include/xfce4/panel/xfce_support.h
-include/xfce4/panel/xfce.h
+bin/xfce4-popup-windowlist
+bin/xftaskbar4
+etc/xdg/xfce4/panel/clock-14.rc
+etc/xdg/xfce4/panel/launcher-10.rc
+etc/xdg/xfce4/panel/launcher-7.rc
+etc/xdg/xfce4/panel/launcher-8.rc
+etc/xdg/xfce4/panel/launcher-9.rc
+etc/xdg/xfce4/panel/panels.xml
+etc/xdg/xfce4/panel/systray-4.rc
+etc/xdg/xfce4/panel/xfce4-menu-5.rc
+include/xfce4/libxfce4panel/xfce-arrow-button.h
+include/xfce4/libxfce4panel/xfce-hvbox.h
+include/xfce4/libxfce4panel/xfce-itembar.h
+include/xfce4/libxfce4panel/xfce-panel-convenience.h
+include/xfce4/libxfce4panel/xfce-panel-enum-types.h
+include/xfce4/libxfce4panel/xfce-panel-enums.h
+include/xfce4/libxfce4panel/xfce-panel-external-plugin.h
+include/xfce4/libxfce4panel/xfce-panel-internal-plugin.h
+include/xfce4/libxfce4panel/xfce-panel-macros.h
+include/xfce4/libxfce4panel/xfce-panel-plugin-iface.h
+include/xfce4/libxfce4panel/xfce-panel-plugin.h
+include/xfce4/libxfce4panel/xfce-panel-window.h
+lib/libxfce4panel.la
+lib/libxfce4panel.so
+lib/libxfce4panel.so.2
lib/xfce4/mcs-plugins/libxfce4settings.la
lib/xfce4/mcs-plugins/libxfce4settings.so
+lib/xfce4/panel-plugins/libactions.la
+lib/xfce4/panel-plugins/libactions.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/libiconbox.la
+lib/xfce4/panel-plugins/libiconbox.so
+lib/xfce4/panel-plugins/liblauncher.la
+lib/xfce4/panel-plugins/liblauncher.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
+lib/xfce4/panel-plugins/libshowdesktop.la
+lib/xfce4/panel-plugins/libshowdesktop.so
+lib/xfce4/panel-plugins/libsystray.la
+lib/xfce4/panel-plugins/libsystray.so
+lib/xfce4/panel-plugins/libtasklist.la
+lib/xfce4/panel-plugins/libtasklist.so
+lib/xfce4/panel-plugins/libwindowlist.la
+lib/xfce4/panel-plugins/libwindowlist.so
+libdata/pkgconfig/libxfce4panel-1.0.pc
+share/applications/xfce4-panel-manager.desktop
+share/gtk-doc/html/libxfce4panel/XfceArrowButton.html
+share/gtk-doc/html/libxfce4panel/XfceExternalPanelPlugin.html
+share/gtk-doc/html/libxfce4panel/XfceHVBox.html
+share/gtk-doc/html/libxfce4panel/XfceInternalPanelPlugin.html
+share/gtk-doc/html/libxfce4panel/XfceItembar.html
+share/gtk-doc/html/libxfce4panel/XfcePanelPlugin.html
+share/gtk-doc/html/libxfce4panel/XfcePanelWindow.html
+share/gtk-doc/html/libxfce4panel/ch01.html
+share/gtk-doc/html/libxfce4panel/home.png
+share/gtk-doc/html/libxfce4panel/index.html
+share/gtk-doc/html/libxfce4panel/index.sgml
+share/gtk-doc/html/libxfce4panel/left.png
+share/gtk-doc/html/libxfce4panel/libxfce4panel-Convenience-Functions.html
+share/gtk-doc/html/libxfce4panel/libxfce4panel-Standard-Enumerations.html
+share/gtk-doc/html/libxfce4panel/libxfce4panel-Writing-Plugins.html
+share/gtk-doc/html/libxfce4panel/libxfce4panel.devhelp
+share/gtk-doc/html/libxfce4panel/right.png
+share/gtk-doc/html/libxfce4panel/style.css
+share/gtk-doc/html/libxfce4panel/up.png
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/af/LC_MESSAGES/xfce4-panel.mo
+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/ar/LC_MESSAGES/xfce4-panel.mo
share/locale/az/LC_MESSAGES/xfce4-panel.mo
share/locale/be/LC_MESSAGES/xfce4-panel.mo
@@ -79,8 +84,8 @@ share/locale/bg/LC_MESSAGES/xfce4-panel.mo
share/locale/bn_IN/LC_MESSAGES/xfce4-panel.mo
share/locale/ca/LC_MESSAGES/xfce4-panel.mo
share/locale/cs/LC_MESSAGES/xfce4-panel.mo
-share/locale/da/LC_MESSAGES/xfce4-panel.mo
share/locale/de/LC_MESSAGES/xfce4-panel.mo
+share/locale/dz/LC_MESSAGES/xfce4-panel.mo
share/locale/el/LC_MESSAGES/xfce4-panel.mo
share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
share/locale/eo/LC_MESSAGES/xfce4-panel.mo
@@ -91,6 +96,7 @@ share/locale/eu/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/gl/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
@@ -98,9 +104,10 @@ share/locale/hu/LC_MESSAGES/xfce4-panel.mo
share/locale/hy/LC_MESSAGES/xfce4-panel.mo
share/locale/it/LC_MESSAGES/xfce4-panel.mo
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/ku/LC_MESSAGES/xfce4-panel.mo
share/locale/lt/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
share/locale/nb_NO/LC_MESSAGES/xfce4-panel.mo
@@ -112,7 +119,6 @@ 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/sl/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
@@ -120,96 +126,46 @@ 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
-share/xfce4/doc/C/images/item-popup.png
-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/images/default_top_panel.png
+share/xfce4/doc/C/images/default_bottom_panel.png
+share/xfce4/doc/C/images/item_popup.png
+share/xfce4/doc/C/images/add_item_dialog.png
+share/xfce4/doc/C/images/launcher_properties.png
+share/xfce4/doc/C/images/panel_manager.png
share/xfce4/doc/C/xfce4-panel.html
-share/xfce4/doc/fr/images/add-item-dialog.png
-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/pager-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/doc/he/images/add-item-dialog.png
-share/xfce4/doc/he/images/clock-properties.png
-share/xfce4/doc/he/images/default_panel.png
-share/xfce4/doc/he/images/handle-popup.png
-share/xfce4/doc/he/images/item-popup.png
-share/xfce4/doc/he/images/launcher-properties.png
-share/xfce4/doc/he/images/mailcheck-properties.png
-share/xfce4/doc/he/images/menuitem-properties.png
-share/xfce4/doc/he/images/nooptions-properties.png
-share/xfce4/doc/he/images/pager-properties.png
-share/xfce4/doc/he/images/panel-settings.png
-share/xfce4/doc/he/images/systembuttons-properties.png
-share/xfce4/doc/he/xfce4-panel.html
+share/xfce4/panel-plugins/actions.desktop
+share/xfce4/panel-plugins/clock.desktop
+share/xfce4/panel-plugins/iconbox.desktop
+share/xfce4/panel-plugins/launcher.desktop
+share/xfce4/panel-plugins/pager.desktop
+share/xfce4/panel-plugins/separator.desktop
+share/xfce4/panel-plugins/showdesktop.desktop
+share/xfce4/panel-plugins/systray.desktop
+share/xfce4/panel-plugins/tasklist.desktop
+share/xfce4/panel-plugins/windowlist.desktop
@dirrm etc/xdg/xfce4/panel
@dirrmtry etc/xdg/xfce4
@dirrmtry etc/xdg
-@dirrmtry etc/xfce4
-@dirrm include/xfce4/panel
+@dirrm include/xfce4/libxfce4panel
@dirrmtry include/xfce4
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4/panel-plugins
@dirrmtry lib/xfce4
-@dirrmtry share/applications
+@dirrm share/gtk-doc/html/libxfce4panel
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
-@dirrmtry share/xfce4/doc/fr/images
-@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/he/images
-@dirrmtry share/xfce4/doc/he
@dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4/panel-plugins
@dirrmtry share/xfce4
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 6b5ca6b94258..000d1af44840 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -6,35 +6,29 @@
#
PORTNAME= xfce4-session
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= 4.4.0
CATEGORIES= x11-wm xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= Session manager for the Xfce 4 desktop environment
-BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
- iceauth:${X_CLIENTS_PORT}
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
- iceauth:${X_CLIENTS_PORT}
+BUILD_DEPENDS= iceauth:${X_CLIENTS_PORT}
+RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_GETTEXT= yes
-USE_GNOME= gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB= yes
-
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include \
- -L${LOCALBASE}/lib -I${X11BASE}/include \
- -L${X11BASE}/lib"
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_LDCONFIG= yes
+USE_XFCE= configenv libgui libmcs libutil mcsmanager
+USE_XLIB= yes
MAN1= xfce4-session.1 xfce4-session-logout.1
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index 4597063025ef..b72f0c819ab7 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-session-4.2.3.tar.gz) = e3685ace007f065eadbd7acce6fa61e8
-SHA256 (xfce4/xfce4-session-4.2.3.tar.gz) = cbf5f6b8d68c0d29f503b805a2143d73b6192f96ce3d667c38521db16f09ca8b
-SIZE (xfce4/xfce4-session-4.2.3.tar.gz) = 1629362
+MD5 (xfce4/xfce4-session-4.4.0.tar.bz2) = 03132946280bae3107101e02fbad0ba8
+SHA256 (xfce4/xfce4-session-4.4.0.tar.bz2) = ebaa5c338a2264dbb3fc3c2f51c4f870c660df0141368c47178771d0c0c53be2
+SIZE (xfce4/xfce4-session-4.4.0.tar.bz2) = 1328917
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index 0ceaecfa6233..3ac5bf25e892 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -1,5 +1,8 @@
+bin/xfce4-autostart-editor
bin/xfce4-session
bin/xfce4-session-logout
+bin/xfce4-tips
+etc/xdg/autostart/xfce4-tips-autostart.desktop
etc/xdg/xfce4-session/xfce4-session.rc
include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-engine.h
include/xfce4/xfce4-session-4.2/libxfsm/xfsm-splash-rc.h
@@ -26,6 +29,7 @@ lib/xfce4/splash/engines/libsimple.so
libexec/balou-export-theme
libexec/balou-install-theme
libexec/xfsm-shutdown-helper
+share/applications/xfce4-autostart-editor.desktop
share/applications/xfce-session-settings.desktop
share/applications/xfce-splash-settings.desktop
share/icons/hicolor/128x128/apps/xfce4-session.png
@@ -37,15 +41,14 @@ 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/af/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
share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo
share/locale/ca/LC_MESSAGES/xfce4-session.mo
share/locale/cs/LC_MESSAGES/xfce4-session.mo
-share/locale/da/LC_MESSAGES/xfce4-session.mo
share/locale/de/LC_MESSAGES/xfce4-session.mo
+share/locale/dz/LC_MESSAGES/xfce4-session.mo
share/locale/el/LC_MESSAGES/xfce4-session.mo
share/locale/en_GB/LC_MESSAGES/xfce4-session.mo
share/locale/eo/LC_MESSAGES/xfce4-session.mo
@@ -56,15 +59,17 @@ share/locale/eu/LC_MESSAGES/xfce4-session.mo
share/locale/fa/LC_MESSAGES/xfce4-session.mo
share/locale/fi/LC_MESSAGES/xfce4-session.mo
share/locale/fr/LC_MESSAGES/xfce4-session.mo
+share/locale/gl/LC_MESSAGES/xfce4-session.mo
share/locale/gu/LC_MESSAGES/xfce4-session.mo
share/locale/he/LC_MESSAGES/xfce4-session.mo
share/locale/hi/LC_MESSAGES/xfce4-session.mo
share/locale/hu/LC_MESSAGES/xfce4-session.mo
share/locale/it/LC_MESSAGES/xfce4-session.mo
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/ku/LC_MESSAGES/xfce4-session.mo
share/locale/lt/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
share/locale/nb_NO/LC_MESSAGES/xfce4-session.mo
@@ -76,7 +81,6 @@ share/locale/pt_PT/LC_MESSAGES/xfce4-session.mo
share/locale/ro/LC_MESSAGES/xfce4-session.mo
share/locale/ru/LC_MESSAGES/xfce4-session.mo
share/locale/sk/LC_MESSAGES/xfce4-session.mo
-share/locale/sl/LC_MESSAGES/xfce4-session.mo
share/locale/sv/LC_MESSAGES/xfce4-session.mo
share/locale/ta/LC_MESSAGES/xfce4-session.mo
share/locale/tr/LC_MESSAGES/xfce4-session.mo
@@ -94,16 +98,25 @@ share/xfce4/doc/fr/images/xfsm-advanced.png
share/xfce4/doc/fr/images/xfsm-general.png
share/xfce4/doc/fr/images/xfsm-splash.png
share/xfce4/doc/fr/xfce4-session.html
-share/xfce4/doc/he/images/xfsm-advanced.png
-share/xfce4/doc/he/images/xfsm-general.png
-share/xfce4/doc/he/images/xfsm-splash.png
-share/xfce4/doc/he/xfce4-session.html
+share/xfce4/tips/tips
+share/xfce4/tips/tips.dat
+share/icons/hicolor/48x48/apps/xfsm-logout.png
+share/icons/hicolor/48x48/apps/xfsm-reboot.png
+@dirrm etc/xdg/autostart
@dirrm etc/xdg/xfce4-session
@dirrmtry etc/xdg
@dirrm include/xfce4/xfce4-session-4.2/libxfsm
@dirrm include/xfce4/xfce4-session-4.2
@dirrmtry include/xfce4
@dirrmtry share/applications
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
@dirrm share/themes/Default/balou
@dirrmtry share/themes/Default
@dirrmtry share/themes
@@ -111,46 +124,20 @@ share/xfce4/doc/he/xfce4-session.html
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/he/images
-@dirrmtry share/xfce4/doc/he
@dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4/tips
@dirrmtry share/xfce4
@dirrmtry lib/xfce4/splash/engines
@dirrmtry lib/xfce4/splash
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4
@dirrmtry lib/pkgconfig
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/72x72/apps
+@dirrmtry share/icons/hicolor/72x72
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+
diff --git a/x11-wm/xfce4-systray/Makefile b/x11-wm/xfce4-systray/Makefile
deleted file mode 100644
index e30ba32867f4..000000000000
--- a/x11-wm/xfce4-systray/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# New ports collection makefile for: xfce4-systray
-# Date created: 3 July 2003
-# Whom: James Earl <jdearl@telus.net>
-#
-# $FreeBSD$
-#
-
-PORTNAME= xfce4-systray
-PORTVERSION= 4.2.3
-PORTREVISION= 2
-CATEGORIES= x11-wm xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
-DIST_SUBDIR= xfce4
-
-MAINTAINER= oliver@FreeBSD.org
-COMMENT= XFce 4 system tray module for xfce4-panel
-
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- xml2.5:${PORTSDIR}/textproc/libxml2 \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME= gtk20
-GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-
-.include <bsd.port.mk>
diff --git a/x11-wm/xfce4-systray/distinfo b/x11-wm/xfce4-systray/distinfo
deleted file mode 100644
index 61ea05177e03..000000000000
--- a/x11-wm/xfce4-systray/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xfce4-systray-4.2.3.tar.gz) = e55fbdecbee9b414c703d47988c5135c
-SHA256 (xfce4/xfce4-systray-4.2.3.tar.gz) = 7ac887e9348e535d4d4c3d4f5edcc90e51f309afdab3d697995d1d17e737fd76
-SIZE (xfce4/xfce4-systray-4.2.3.tar.gz) = 320138
diff --git a/x11-wm/xfce4-systray/pkg-descr b/x11-wm/xfce4-systray/pkg-descr
deleted file mode 100644
index c9fccc44882e..000000000000
--- a/x11-wm/xfce4-systray/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-XFce 4 system tray or notification area for xfce4-panel.
-
-WWW: http://www.xfce.org
diff --git a/x11-wm/xfce4-systray/pkg-plist b/x11-wm/xfce4-systray/pkg-plist
deleted file mode 100644
index f9cf3d39e609..000000000000
--- a/x11-wm/xfce4-systray/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xfce4/panel-plugins/libsystray.a
-lib/xfce4/panel-plugins/libsystray.la
-lib/xfce4/panel-plugins/libsystray.so
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index d45df4530426..9ed122d67af8 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -6,41 +6,43 @@
#
PORTNAME= xfce4-wm
-PORTVERSION= 4.2.3.2
-PORTREVISION= 2
+PORTVERSION= 4.4.0
CATEGORIES= x11-wm xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DISTNAME= xfwm4-${PORTVERSION}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 window manager
-BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
- xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
-RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-
-USE_GETTEXT= yes
-USE_GNOME= gtk20
-USE_XPM= yes
-GNU_CONFIGURE= yes
-INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --enable-xinerama
-CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
- CPPFLAGS=-I${LOCALBASE}/include \
- LIBS=-L${LOCALBASE}/lib
+GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_LDCONFIG= yes
+USE_XFCE= configenv libmcs libutil libgui mcsmanager panel
+USE_XLIB= yes
-OPTIONS= COMPOSITE "Support the experimental X11 Composite extension" off
+OPTIONS= COMPOSITE "Support the experimental X11 Composite extension" on \
+ STARTUP "Enable startup notification support" on
.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+
+.if !defined(WITHOUT_COMPOSITE)
+CONFIGURE_ARGS+=--enable-compositor
+.else
+CONFIGURE_ARGS+=--disable-compositor
+.endif
-.if defined(WITH_COMPOSITE)
-CONFIGURE_ARGS+= --enable-compositor
+.if !defined(WITHOUT_STARTUP)
+LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+CONFIGURE_ARGS+=--enable-startup-notification
+.else
+CONFIGURE_ARGS+=--disable-startup-notification
.endif
.include <bsd.port.post.mk>
diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo
index 93a4184632e4..d6ce51295a25 100644
--- a/x11-wm/xfce4-wm/distinfo
+++ b/x11-wm/xfce4-wm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfwm4-4.2.3.2.tar.gz) = d73e89c50179ccb438c076b3b71d59a4
-SHA256 (xfce4/xfwm4-4.2.3.2.tar.gz) = 018628d7c5ef10d947cb0228ca4ed7527aebf9ea54eb6db49091a7b8f61c2b86
-SIZE (xfce4/xfwm4-4.2.3.2.tar.gz) = 1759179
+MD5 (xfce4/xfwm4-4.4.0.tar.bz2) = 8bb7231a20b30bfc1936b0facb9f072c
+SHA256 (xfce4/xfwm4-4.4.0.tar.bz2) = 096b67e4002ecdadca60e01b67821d3898597c240adc4c204d2ee2b40db0b179
+SIZE (xfce4/xfwm4-4.4.0.tar.bz2) = 1674325
diff --git a/x11-wm/xfce4-wm/pkg-descr b/x11-wm/xfce4-wm/pkg-descr
index 9a1551720537..fd2ccdedf4d2 100644
--- a/x11-wm/xfce4-wm/pkg-descr
+++ b/x11-wm/xfce4-wm/pkg-descr
@@ -1,3 +1,3 @@
XFce 4 window manager originally based on Oroborus.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index df0a759b7edf..b73db72bf02c 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -1,4 +1,7 @@
bin/xfwm4
+lib/xfce4/mcs-plugins/wmtweaks_plugin.a
+lib/xfce4/mcs-plugins/wmtweaks_plugin.la
+lib/xfce4/mcs-plugins/wmtweaks_plugin.so
lib/xfce4/mcs-plugins/workspaces_plugin.a
lib/xfce4/mcs-plugins/workspaces_plugin.la
lib/xfce4/mcs-plugins/workspaces_plugin.so
@@ -6,21 +9,23 @@ lib/xfce4/mcs-plugins/xfwm4_plugin.a
lib/xfce4/mcs-plugins/xfwm4_plugin.la
lib/xfce4/mcs-plugins/xfwm4_plugin.so
share/applications/xfce-wm-settings.desktop
+share/applications/xfce-wmtweaks-settings.desktop
share/applications/xfce-workspaces-settings.desktop
-share/icons/hicolor/48x48/apps/xfce4-keys.png
+share/icons/hicolor/48x48/apps/wmtweaks.png
share/icons/hicolor/48x48/apps/xfce4-workspaces.png
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/af/LC_MESSAGES/xfwm4.mo
-share/locale/az/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
share/locale/bg/LC_MESSAGES/xfwm4.mo
share/locale/bn_IN/LC_MESSAGES/xfwm4.mo
share/locale/ca/LC_MESSAGES/xfwm4.mo
share/locale/cs/LC_MESSAGES/xfwm4.mo
share/locale/de/LC_MESSAGES/xfwm4.mo
+share/locale/dz/LC_MESSAGES/xfwm4.mo
share/locale/el/LC_MESSAGES/xfwm4.mo
share/locale/en_GB/LC_MESSAGES/xfwm4.mo
share/locale/eo/LC_MESSAGES/xfwm4.mo
@@ -31,15 +36,17 @@ share/locale/eu/LC_MESSAGES/xfwm4.mo
share/locale/fa/LC_MESSAGES/xfwm4.mo
share/locale/fi/LC_MESSAGES/xfwm4.mo
share/locale/fr/LC_MESSAGES/xfwm4.mo
+share/locale/gl/LC_MESSAGES/xfwm4.mo
share/locale/gu/LC_MESSAGES/xfwm4.mo
share/locale/he/LC_MESSAGES/xfwm4.mo
share/locale/hi/LC_MESSAGES/xfwm4.mo
share/locale/hu/LC_MESSAGES/xfwm4.mo
share/locale/it/LC_MESSAGES/xfwm4.mo
share/locale/ja/LC_MESSAGES/xfwm4.mo
+share/locale/ka/LC_MESSAGES/xfwm4.mo
share/locale/ko/LC_MESSAGES/xfwm4.mo
-share/locale/ku/LC_MESSAGES/xfwm4.mo
share/locale/lt/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
share/locale/nb_NO/LC_MESSAGES/xfwm4.mo
@@ -51,7 +58,6 @@ share/locale/pt_PT/LC_MESSAGES/xfwm4.mo
share/locale/ro/LC_MESSAGES/xfwm4.mo
share/locale/ru/LC_MESSAGES/xfwm4.mo
share/locale/sk/LC_MESSAGES/xfwm4.mo
-share/locale/sl/LC_MESSAGES/xfwm4.mo
share/locale/sv/LC_MESSAGES/xfwm4.mo
share/locale/ta/LC_MESSAGES/xfwm4.mo
share/locale/tr/LC_MESSAGES/xfwm4.mo
@@ -59,8 +65,250 @@ share/locale/uk/LC_MESSAGES/xfwm4.mo
share/locale/vi/LC_MESSAGES/xfwm4.mo
share/locale/zh_CN/LC_MESSAGES/xfwm4.mo
share/locale/zh_TW/LC_MESSAGES/xfwm4.mo
+share/themes/Daloa/xfwm4/README
+share/themes/Daloa/xfwm4/bottom-active.png
+share/themes/Daloa/xfwm4/bottom-active.xpm
+share/themes/Daloa/xfwm4/bottom-inactive.png
+share/themes/Daloa/xfwm4/bottom-inactive.xpm
+share/themes/Daloa/xfwm4/bottom-left-active.png
+share/themes/Daloa/xfwm4/bottom-left-active.xpm
+share/themes/Daloa/xfwm4/bottom-left-inactive.png
+share/themes/Daloa/xfwm4/bottom-left-inactive.xpm
+share/themes/Daloa/xfwm4/bottom-right-active.png
+share/themes/Daloa/xfwm4/bottom-right-active.xpm
+share/themes/Daloa/xfwm4/bottom-right-inactive.png
+share/themes/Daloa/xfwm4/bottom-right-inactive.xpm
+share/themes/Daloa/xfwm4/close-active.png
+share/themes/Daloa/xfwm4/close-active.xpm
+share/themes/Daloa/xfwm4/close-inactive.png
+share/themes/Daloa/xfwm4/close-inactive.xpm
+share/themes/Daloa/xfwm4/close-pressed.png
+share/themes/Daloa/xfwm4/close-pressed.xpm
+share/themes/Daloa/xfwm4/hide-active.png
+share/themes/Daloa/xfwm4/hide-active.xpm
+share/themes/Daloa/xfwm4/hide-inactive.png
+share/themes/Daloa/xfwm4/hide-inactive.xpm
+share/themes/Daloa/xfwm4/hide-pressed.png
+share/themes/Daloa/xfwm4/hide-pressed.xpm
+share/themes/Daloa/xfwm4/left-active.png
+share/themes/Daloa/xfwm4/left-active.xpm
+share/themes/Daloa/xfwm4/left-inactive.png
+share/themes/Daloa/xfwm4/left-inactive.xpm
+share/themes/Daloa/xfwm4/maximize-active.png
+share/themes/Daloa/xfwm4/maximize-active.xpm
+share/themes/Daloa/xfwm4/maximize-inactive.png
+share/themes/Daloa/xfwm4/maximize-inactive.xpm
+share/themes/Daloa/xfwm4/maximize-pressed.png
+share/themes/Daloa/xfwm4/maximize-pressed.xpm
+share/themes/Daloa/xfwm4/maximize-toggled-active.png
+share/themes/Daloa/xfwm4/maximize-toggled-active.xpm
+share/themes/Daloa/xfwm4/maximize-toggled-inactive.png
+share/themes/Daloa/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Daloa/xfwm4/maximize-toggled-pressed.png
+share/themes/Daloa/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Daloa/xfwm4/menu-active.png
+share/themes/Daloa/xfwm4/menu-active.xpm
+share/themes/Daloa/xfwm4/menu-inactive.png
+share/themes/Daloa/xfwm4/menu-inactive.xpm
+share/themes/Daloa/xfwm4/menu-pressed.png
+share/themes/Daloa/xfwm4/menu-pressed.xpm
+share/themes/Daloa/xfwm4/right-active.png
+share/themes/Daloa/xfwm4/right-active.xpm
+share/themes/Daloa/xfwm4/right-inactive.png
+share/themes/Daloa/xfwm4/right-inactive.xpm
+share/themes/Daloa/xfwm4/shade-active.png
+share/themes/Daloa/xfwm4/shade-active.xpm
+share/themes/Daloa/xfwm4/shade-inactive.png
+share/themes/Daloa/xfwm4/shade-inactive.xpm
+share/themes/Daloa/xfwm4/shade-pressed.png
+share/themes/Daloa/xfwm4/shade-pressed.xpm
+share/themes/Daloa/xfwm4/shade-toggled-active.png
+share/themes/Daloa/xfwm4/shade-toggled-active.xpm
+share/themes/Daloa/xfwm4/shade-toggled-inactive.png
+share/themes/Daloa/xfwm4/shade-toggled-inactive.xpm
+share/themes/Daloa/xfwm4/shade-toggled-pressed.png
+share/themes/Daloa/xfwm4/shade-toggled-pressed.xpm
+share/themes/Daloa/xfwm4/stick-active.png
+share/themes/Daloa/xfwm4/stick-active.xpm
+share/themes/Daloa/xfwm4/stick-inactive.png
+share/themes/Daloa/xfwm4/stick-inactive.xpm
+share/themes/Daloa/xfwm4/stick-pressed.png
+share/themes/Daloa/xfwm4/stick-pressed.xpm
+share/themes/Daloa/xfwm4/stick-toggled-active.png
+share/themes/Daloa/xfwm4/stick-toggled-active.xpm
+share/themes/Daloa/xfwm4/stick-toggled-inactive.png
+share/themes/Daloa/xfwm4/stick-toggled-inactive.xpm
+share/themes/Daloa/xfwm4/stick-toggled-pressed.png
+share/themes/Daloa/xfwm4/stick-toggled-pressed.xpm
+share/themes/Daloa/xfwm4/themerc
+share/themes/Daloa/xfwm4/title-1-active.png
+share/themes/Daloa/xfwm4/title-1-active.xpm
+share/themes/Daloa/xfwm4/title-1-inactive.png
+share/themes/Daloa/xfwm4/title-1-inactive.xpm
+share/themes/Daloa/xfwm4/title-2-active.png
+share/themes/Daloa/xfwm4/title-2-active.xpm
+share/themes/Daloa/xfwm4/title-2-inactive.png
+share/themes/Daloa/xfwm4/title-2-inactive.xpm
+share/themes/Daloa/xfwm4/title-3-active.png
+share/themes/Daloa/xfwm4/title-3-active.xpm
+share/themes/Daloa/xfwm4/title-3-inactive.png
+share/themes/Daloa/xfwm4/title-3-inactive.xpm
+share/themes/Daloa/xfwm4/title-4-active.png
+share/themes/Daloa/xfwm4/title-4-active.xpm
+share/themes/Daloa/xfwm4/title-4-inactive.png
+share/themes/Daloa/xfwm4/title-4-inactive.xpm
+share/themes/Daloa/xfwm4/title-5-active.png
+share/themes/Daloa/xfwm4/title-5-active.xpm
+share/themes/Daloa/xfwm4/title-5-inactive.png
+share/themes/Daloa/xfwm4/title-5-inactive.xpm
+share/themes/Daloa/xfwm4/top-left-active.png
+share/themes/Daloa/xfwm4/top-left-active.xpm
+share/themes/Daloa/xfwm4/top-left-inactive.png
+share/themes/Daloa/xfwm4/top-left-inactive.xpm
+share/themes/Daloa/xfwm4/top-right-active.png
+share/themes/Daloa/xfwm4/top-right-active.xpm
+share/themes/Daloa/xfwm4/top-right-inactive.png
+share/themes/Daloa/xfwm4/top-right-inactive.xpm
+share/themes/Default-4.0/xfwm4/README
+share/themes/Default-4.0/xfwm4/bottom-active.xpm
+share/themes/Default-4.0/xfwm4/bottom-inactive.xpm
+share/themes/Default-4.0/xfwm4/bottom-left-active.xpm
+share/themes/Default-4.0/xfwm4/bottom-left-inactive.xpm
+share/themes/Default-4.0/xfwm4/bottom-right-active.xpm
+share/themes/Default-4.0/xfwm4/bottom-right-inactive.xpm
+share/themes/Default-4.0/xfwm4/close-active.xpm
+share/themes/Default-4.0/xfwm4/close-inactive.xpm
+share/themes/Default-4.0/xfwm4/close-pressed.xpm
+share/themes/Default-4.0/xfwm4/hide-active.xpm
+share/themes/Default-4.0/xfwm4/hide-inactive.xpm
+share/themes/Default-4.0/xfwm4/hide-pressed.xpm
+share/themes/Default-4.0/xfwm4/left-active.xpm
+share/themes/Default-4.0/xfwm4/left-inactive.xpm
+share/themes/Default-4.0/xfwm4/maximize-active.xpm
+share/themes/Default-4.0/xfwm4/maximize-inactive.xpm
+share/themes/Default-4.0/xfwm4/maximize-pressed.xpm
+share/themes/Default-4.0/xfwm4/maximize-toggled-active.xpm
+share/themes/Default-4.0/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Default-4.0/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Default-4.0/xfwm4/menu-active.xpm
+share/themes/Default-4.0/xfwm4/menu-inactive.xpm
+share/themes/Default-4.0/xfwm4/menu-pressed.xpm
+share/themes/Default-4.0/xfwm4/right-active.xpm
+share/themes/Default-4.0/xfwm4/right-inactive.xpm
+share/themes/Default-4.0/xfwm4/shade-active.xpm
+share/themes/Default-4.0/xfwm4/shade-inactive.xpm
+share/themes/Default-4.0/xfwm4/shade-pressed.xpm
+share/themes/Default-4.0/xfwm4/shade-toggled-active.xpm
+share/themes/Default-4.0/xfwm4/shade-toggled-inactive.xpm
+share/themes/Default-4.0/xfwm4/shade-toggled-pressed.xpm
+share/themes/Default-4.0/xfwm4/stick-active.xpm
+share/themes/Default-4.0/xfwm4/stick-inactive.xpm
+share/themes/Default-4.0/xfwm4/stick-pressed.xpm
+share/themes/Default-4.0/xfwm4/stick-toggled-active.xpm
+share/themes/Default-4.0/xfwm4/stick-toggled-inactive.xpm
+share/themes/Default-4.0/xfwm4/stick-toggled-pressed.xpm
+share/themes/Default-4.0/xfwm4/themerc
+share/themes/Default-4.0/xfwm4/title-1-active.xpm
+share/themes/Default-4.0/xfwm4/title-1-inactive.xpm
+share/themes/Default-4.0/xfwm4/title-2-active.xpm
+share/themes/Default-4.0/xfwm4/title-2-inactive.xpm
+share/themes/Default-4.0/xfwm4/title-3-active.xpm
+share/themes/Default-4.0/xfwm4/title-3-inactive.xpm
+share/themes/Default-4.0/xfwm4/title-4-active.xpm
+share/themes/Default-4.0/xfwm4/title-4-inactive.xpm
+share/themes/Default-4.0/xfwm4/title-5-active.xpm
+share/themes/Default-4.0/xfwm4/title-5-inactive.xpm
+share/themes/Default-4.0/xfwm4/top-left-active.xpm
+share/themes/Default-4.0/xfwm4/top-left-inactive.xpm
+share/themes/Default-4.0/xfwm4/top-right-active.xpm
+share/themes/Default-4.0/xfwm4/top-right-inactive.xpm
+share/themes/Default-4.2/xfwm4/README
+share/themes/Default-4.2/xfwm4/bottom-active.png
+share/themes/Default-4.2/xfwm4/bottom-active.xpm
+share/themes/Default-4.2/xfwm4/bottom-inactive.png
+share/themes/Default-4.2/xfwm4/bottom-inactive.xpm
+share/themes/Default-4.2/xfwm4/bottom-left-active.png
+share/themes/Default-4.2/xfwm4/bottom-left-active.xpm
+share/themes/Default-4.2/xfwm4/bottom-left-inactive.png
+share/themes/Default-4.2/xfwm4/bottom-left-inactive.xpm
+share/themes/Default-4.2/xfwm4/bottom-right-active.png
+share/themes/Default-4.2/xfwm4/bottom-right-active.xpm
+share/themes/Default-4.2/xfwm4/bottom-right-inactive.png
+share/themes/Default-4.2/xfwm4/bottom-right-inactive.xpm
+share/themes/Default-4.2/xfwm4/close-active.xpm
+share/themes/Default-4.2/xfwm4/close-inactive.xpm
+share/themes/Default-4.2/xfwm4/close-pressed.png
+share/themes/Default-4.2/xfwm4/close-pressed.xpm
+share/themes/Default-4.2/xfwm4/hide-active.xpm
+share/themes/Default-4.2/xfwm4/hide-inactive.xpm
+share/themes/Default-4.2/xfwm4/hide-pressed.png
+share/themes/Default-4.2/xfwm4/hide-pressed.xpm
+share/themes/Default-4.2/xfwm4/left-active.png
+share/themes/Default-4.2/xfwm4/left-active.xpm
+share/themes/Default-4.2/xfwm4/left-inactive.png
+share/themes/Default-4.2/xfwm4/left-inactive.xpm
+share/themes/Default-4.2/xfwm4/maximize-active.xpm
+share/themes/Default-4.2/xfwm4/maximize-inactive.xpm
+share/themes/Default-4.2/xfwm4/maximize-pressed.png
+share/themes/Default-4.2/xfwm4/maximize-pressed.xpm
+share/themes/Default-4.2/xfwm4/maximize-toggled-active.xpm
+share/themes/Default-4.2/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Default-4.2/xfwm4/maximize-toggled-pressed.png
+share/themes/Default-4.2/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Default-4.2/xfwm4/menu-active.xpm
+share/themes/Default-4.2/xfwm4/menu-inactive.xpm
+share/themes/Default-4.2/xfwm4/menu-pressed.png
+share/themes/Default-4.2/xfwm4/menu-pressed.xpm
+share/themes/Default-4.2/xfwm4/right-active.png
+share/themes/Default-4.2/xfwm4/right-active.xpm
+share/themes/Default-4.2/xfwm4/right-inactive.png
+share/themes/Default-4.2/xfwm4/right-inactive.xpm
+share/themes/Default-4.2/xfwm4/shade-active.xpm
+share/themes/Default-4.2/xfwm4/shade-inactive.xpm
+share/themes/Default-4.2/xfwm4/shade-pressed.png
+share/themes/Default-4.2/xfwm4/shade-pressed.xpm
+share/themes/Default-4.2/xfwm4/shade-toggled-active.xpm
+share/themes/Default-4.2/xfwm4/shade-toggled-inactive.xpm
+share/themes/Default-4.2/xfwm4/shade-toggled-pressed.png
+share/themes/Default-4.2/xfwm4/shade-toggled-pressed.xpm
+share/themes/Default-4.2/xfwm4/stick-active.xpm
+share/themes/Default-4.2/xfwm4/stick-inactive.xpm
+share/themes/Default-4.2/xfwm4/stick-pressed.png
+share/themes/Default-4.2/xfwm4/stick-pressed.xpm
+share/themes/Default-4.2/xfwm4/stick-toggled-active.xpm
+share/themes/Default-4.2/xfwm4/stick-toggled-inactive.xpm
+share/themes/Default-4.2/xfwm4/stick-toggled-pressed.png
+share/themes/Default-4.2/xfwm4/stick-toggled-pressed.xpm
+share/themes/Default-4.2/xfwm4/themerc
+share/themes/Default-4.2/xfwm4/title-1-active.png
+share/themes/Default-4.2/xfwm4/title-1-active.xpm
+share/themes/Default-4.2/xfwm4/title-1-inactive.png
+share/themes/Default-4.2/xfwm4/title-1-inactive.xpm
+share/themes/Default-4.2/xfwm4/title-2-active.png
+share/themes/Default-4.2/xfwm4/title-2-active.xpm
+share/themes/Default-4.2/xfwm4/title-2-inactive.png
+share/themes/Default-4.2/xfwm4/title-2-inactive.xpm
+share/themes/Default-4.2/xfwm4/title-3-active.png
+share/themes/Default-4.2/xfwm4/title-3-active.xpm
+share/themes/Default-4.2/xfwm4/title-3-inactive.png
+share/themes/Default-4.2/xfwm4/title-3-inactive.xpm
+share/themes/Default-4.2/xfwm4/title-4-active.png
+share/themes/Default-4.2/xfwm4/title-4-active.xpm
+share/themes/Default-4.2/xfwm4/title-4-inactive.png
+share/themes/Default-4.2/xfwm4/title-4-inactive.xpm
+share/themes/Default-4.2/xfwm4/title-5-active.png
+share/themes/Default-4.2/xfwm4/title-5-active.xpm
+share/themes/Default-4.2/xfwm4/title-5-inactive.png
+share/themes/Default-4.2/xfwm4/title-5-inactive.xpm
+share/themes/Default-4.2/xfwm4/top-left-active.png
+share/themes/Default-4.2/xfwm4/top-left-active.xpm
+share/themes/Default-4.2/xfwm4/top-left-inactive.png
+share/themes/Default-4.2/xfwm4/top-left-inactive.xpm
+share/themes/Default-4.2/xfwm4/top-right-active.png
+share/themes/Default-4.2/xfwm4/top-right-active.xpm
+share/themes/Default-4.2/xfwm4/top-right-inactive.png
+share/themes/Default-4.2/xfwm4/top-right-inactive.xpm
share/themes/Default/xfwm4/README
-share/themes/Default/xfwm4/themerc
share/themes/Default/xfwm4/bottom-active.png
share/themes/Default/xfwm4/bottom-active.xpm
share/themes/Default/xfwm4/bottom-inactive.png
@@ -73,27 +321,38 @@ share/themes/Default/xfwm4/bottom-right-active.png
share/themes/Default/xfwm4/bottom-right-active.xpm
share/themes/Default/xfwm4/bottom-right-inactive.png
share/themes/Default/xfwm4/bottom-right-inactive.xpm
+share/themes/Default/xfwm4/close-active.png
share/themes/Default/xfwm4/close-active.xpm
+share/themes/Default/xfwm4/close-inactive.png
share/themes/Default/xfwm4/close-inactive.xpm
share/themes/Default/xfwm4/close-pressed.png
share/themes/Default/xfwm4/close-pressed.xpm
+share/themes/Default/xfwm4/hide-active.png
share/themes/Default/xfwm4/hide-active.xpm
+share/themes/Default/xfwm4/hide-inactive.png
share/themes/Default/xfwm4/hide-inactive.xpm
share/themes/Default/xfwm4/hide-pressed.png
share/themes/Default/xfwm4/hide-pressed.xpm
+share/themes/Default/xfwm4/keythemerc
share/themes/Default/xfwm4/left-active.png
share/themes/Default/xfwm4/left-active.xpm
share/themes/Default/xfwm4/left-inactive.png
share/themes/Default/xfwm4/left-inactive.xpm
+share/themes/Default/xfwm4/maximize-active.png
share/themes/Default/xfwm4/maximize-active.xpm
+share/themes/Default/xfwm4/maximize-inactive.png
share/themes/Default/xfwm4/maximize-inactive.xpm
share/themes/Default/xfwm4/maximize-pressed.png
share/themes/Default/xfwm4/maximize-pressed.xpm
+share/themes/Default/xfwm4/maximize-toggled-active.png
share/themes/Default/xfwm4/maximize-toggled-active.xpm
+share/themes/Default/xfwm4/maximize-toggled-inactive.png
share/themes/Default/xfwm4/maximize-toggled-inactive.xpm
share/themes/Default/xfwm4/maximize-toggled-pressed.png
share/themes/Default/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Default/xfwm4/menu-active.png
share/themes/Default/xfwm4/menu-active.xpm
+share/themes/Default/xfwm4/menu-inactive.png
share/themes/Default/xfwm4/menu-inactive.xpm
share/themes/Default/xfwm4/menu-pressed.png
share/themes/Default/xfwm4/menu-pressed.xpm
@@ -101,22 +360,31 @@ share/themes/Default/xfwm4/right-active.png
share/themes/Default/xfwm4/right-active.xpm
share/themes/Default/xfwm4/right-inactive.png
share/themes/Default/xfwm4/right-inactive.xpm
+share/themes/Default/xfwm4/shade-active.png
share/themes/Default/xfwm4/shade-active.xpm
+share/themes/Default/xfwm4/shade-inactive.png
share/themes/Default/xfwm4/shade-inactive.xpm
share/themes/Default/xfwm4/shade-pressed.png
share/themes/Default/xfwm4/shade-pressed.xpm
+share/themes/Default/xfwm4/shade-toggled-active.png
share/themes/Default/xfwm4/shade-toggled-active.xpm
+share/themes/Default/xfwm4/shade-toggled-inactive.png
share/themes/Default/xfwm4/shade-toggled-inactive.xpm
share/themes/Default/xfwm4/shade-toggled-pressed.png
share/themes/Default/xfwm4/shade-toggled-pressed.xpm
+share/themes/Default/xfwm4/stick-active.png
share/themes/Default/xfwm4/stick-active.xpm
+share/themes/Default/xfwm4/stick-inactive.png
share/themes/Default/xfwm4/stick-inactive.xpm
share/themes/Default/xfwm4/stick-pressed.png
share/themes/Default/xfwm4/stick-pressed.xpm
+share/themes/Default/xfwm4/stick-toggled-active.png
share/themes/Default/xfwm4/stick-toggled-active.xpm
+share/themes/Default/xfwm4/stick-toggled-inactive.png
share/themes/Default/xfwm4/stick-toggled-inactive.xpm
share/themes/Default/xfwm4/stick-toggled-pressed.png
share/themes/Default/xfwm4/stick-toggled-pressed.xpm
+share/themes/Default/xfwm4/themerc
share/themes/Default/xfwm4/title-1-active.png
share/themes/Default/xfwm4/title-1-active.xpm
share/themes/Default/xfwm4/title-1-inactive.png
@@ -145,196 +413,526 @@ share/themes/Default/xfwm4/top-right-active.png
share/themes/Default/xfwm4/top-right-active.xpm
share/themes/Default/xfwm4/top-right-inactive.png
share/themes/Default/xfwm4/top-right-inactive.xpm
-share/themes/Default/xfwm4/keythemerc
-share/themes/Default-4.0/xfwm4/README
-share/themes/Default-4.0/xfwm4/themerc
-share/themes/Default-4.0/xfwm4/bottom-active.xpm
-share/themes/Default-4.0/xfwm4/bottom-inactive.xpm
-share/themes/Default-4.0/xfwm4/bottom-left-active.xpm
-share/themes/Default-4.0/xfwm4/bottom-left-inactive.xpm
-share/themes/Default-4.0/xfwm4/bottom-right-active.xpm
-share/themes/Default-4.0/xfwm4/bottom-right-inactive.xpm
-share/themes/Default-4.0/xfwm4/close-active.xpm
-share/themes/Default-4.0/xfwm4/close-inactive.xpm
-share/themes/Default-4.0/xfwm4/close-pressed.xpm
-share/themes/Default-4.0/xfwm4/hide-active.xpm
-share/themes/Default-4.0/xfwm4/hide-inactive.xpm
-share/themes/Default-4.0/xfwm4/hide-pressed.xpm
-share/themes/Default-4.0/xfwm4/left-active.xpm
-share/themes/Default-4.0/xfwm4/left-inactive.xpm
-share/themes/Default-4.0/xfwm4/maximize-active.xpm
-share/themes/Default-4.0/xfwm4/maximize-inactive.xpm
-share/themes/Default-4.0/xfwm4/maximize-pressed.xpm
-share/themes/Default-4.0/xfwm4/maximize-toggled-active.xpm
-share/themes/Default-4.0/xfwm4/maximize-toggled-inactive.xpm
-share/themes/Default-4.0/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Default-4.0/xfwm4/menu-active.xpm
-share/themes/Default-4.0/xfwm4/menu-inactive.xpm
-share/themes/Default-4.0/xfwm4/menu-pressed.xpm
-share/themes/Default-4.0/xfwm4/right-active.xpm
-share/themes/Default-4.0/xfwm4/right-inactive.xpm
-share/themes/Default-4.0/xfwm4/shade-active.xpm
-share/themes/Default-4.0/xfwm4/shade-inactive.xpm
-share/themes/Default-4.0/xfwm4/shade-pressed.xpm
-share/themes/Default-4.0/xfwm4/shade-toggled-active.xpm
-share/themes/Default-4.0/xfwm4/shade-toggled-inactive.xpm
-share/themes/Default-4.0/xfwm4/shade-toggled-pressed.xpm
-share/themes/Default-4.0/xfwm4/stick-active.xpm
-share/themes/Default-4.0/xfwm4/stick-inactive.xpm
-share/themes/Default-4.0/xfwm4/stick-pressed.xpm
-share/themes/Default-4.0/xfwm4/stick-toggled-active.xpm
-share/themes/Default-4.0/xfwm4/stick-toggled-inactive.xpm
-share/themes/Default-4.0/xfwm4/stick-toggled-pressed.xpm
-share/themes/Default-4.0/xfwm4/title-1-active.xpm
-share/themes/Default-4.0/xfwm4/title-1-inactive.xpm
-share/themes/Default-4.0/xfwm4/title-2-active.xpm
-share/themes/Default-4.0/xfwm4/title-2-inactive.xpm
-share/themes/Default-4.0/xfwm4/title-3-active.xpm
-share/themes/Default-4.0/xfwm4/title-3-inactive.xpm
-share/themes/Default-4.0/xfwm4/title-4-active.xpm
-share/themes/Default-4.0/xfwm4/title-4-inactive.xpm
-share/themes/Default-4.0/xfwm4/title-5-active.xpm
-share/themes/Default-4.0/xfwm4/title-5-inactive.xpm
-share/themes/Default-4.0/xfwm4/top-left-active.xpm
-share/themes/Default-4.0/xfwm4/top-left-inactive.xpm
-share/themes/Default-4.0/xfwm4/top-right-active.xpm
-share/themes/Default-4.0/xfwm4/top-right-inactive.xpm
-share/themes/Opta/xfwm4/README
-share/themes/Opta/xfwm4/themerc
-share/themes/Opta/xfwm4/bottom-active.xpm
-share/themes/Opta/xfwm4/bottom-inactive.xpm
-share/themes/Opta/xfwm4/bottom-left-active.xpm
-share/themes/Opta/xfwm4/bottom-left-inactive.xpm
-share/themes/Opta/xfwm4/bottom-right-active.xpm
-share/themes/Opta/xfwm4/bottom-right-inactive.xpm
-share/themes/Opta/xfwm4/close-active.xpm
-share/themes/Opta/xfwm4/close-inactive.xpm
-share/themes/Opta/xfwm4/close-pressed.xpm
-share/themes/Opta/xfwm4/hide-active.xpm
-share/themes/Opta/xfwm4/hide-inactive.xpm
-share/themes/Opta/xfwm4/hide-pressed.xpm
-share/themes/Opta/xfwm4/left-active.xpm
-share/themes/Opta/xfwm4/left-inactive.xpm
-share/themes/Opta/xfwm4/maximize-active.xpm
-share/themes/Opta/xfwm4/maximize-inactive.xpm
-share/themes/Opta/xfwm4/maximize-pressed.xpm
-share/themes/Opta/xfwm4/maximize-toggled-active.xpm
-share/themes/Opta/xfwm4/maximize-toggled-inactive.xpm
-share/themes/Opta/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Opta/xfwm4/menu-active.xpm
-share/themes/Opta/xfwm4/menu-inactive.xpm
-share/themes/Opta/xfwm4/menu-pressed.xpm
-share/themes/Opta/xfwm4/right-active.xpm
-share/themes/Opta/xfwm4/right-inactive.xpm
-share/themes/Opta/xfwm4/shade-active.xpm
-share/themes/Opta/xfwm4/shade-inactive.xpm
-share/themes/Opta/xfwm4/shade-pressed.xpm
-share/themes/Opta/xfwm4/shade-toggled-active.xpm
-share/themes/Opta/xfwm4/shade-toggled-inactive.xpm
-share/themes/Opta/xfwm4/shade-toggled-pressed.xpm
-share/themes/Opta/xfwm4/stick-active.xpm
-share/themes/Opta/xfwm4/stick-inactive.xpm
-share/themes/Opta/xfwm4/stick-pressed.xpm
-share/themes/Opta/xfwm4/stick-toggled-active.xpm
-share/themes/Opta/xfwm4/stick-toggled-inactive.xpm
-share/themes/Opta/xfwm4/stick-toggled-pressed.xpm
-share/themes/Opta/xfwm4/title-1-active.xpm
-share/themes/Opta/xfwm4/title-1-inactive.xpm
-share/themes/Opta/xfwm4/title-2-active.xpm
-share/themes/Opta/xfwm4/title-2-active.png
-share/themes/Opta/xfwm4/title-2-inactive.xpm
-share/themes/Opta/xfwm4/title-2-inactive.png
-share/themes/Opta/xfwm4/title-3-active.xpm
-share/themes/Opta/xfwm4/title-3-active.png
-share/themes/Opta/xfwm4/title-3-inactive.xpm
-share/themes/Opta/xfwm4/title-3-inactive.png
-share/themes/Opta/xfwm4/title-4-active.xpm
-share/themes/Opta/xfwm4/title-4-active.png
-share/themes/Opta/xfwm4/title-4-inactive.xpm
-share/themes/Opta/xfwm4/title-4-inactive.png
-share/themes/Opta/xfwm4/title-5-active.xpm
-share/themes/Opta/xfwm4/title-5-inactive.xpm
-share/themes/Opta/xfwm4/top-left-active.xpm
-share/themes/Opta/xfwm4/top-left-inactive.xpm
-share/themes/Opta/xfwm4/top-right-active.xpm
-share/themes/Opta/xfwm4/top-right-inactive.xpm
-share/themes/Symphony/xfwm4/README
-share/themes/Symphony/xfwm4/themerc
-share/themes/Symphony/xfwm4/bottom-active.png
-share/themes/Symphony/xfwm4/bottom-active.xpm
-share/themes/Symphony/xfwm4/bottom-inactive.png
-share/themes/Symphony/xfwm4/bottom-inactive.xpm
-share/themes/Symphony/xfwm4/bottom-left-active.png
-share/themes/Symphony/xfwm4/bottom-left-active.xpm
-share/themes/Symphony/xfwm4/bottom-left-inactive.png
-share/themes/Symphony/xfwm4/bottom-left-inactive.xpm
-share/themes/Symphony/xfwm4/bottom-right-active.png
-share/themes/Symphony/xfwm4/bottom-right-active.xpm
-share/themes/Symphony/xfwm4/bottom-right-inactive.png
-share/themes/Symphony/xfwm4/bottom-right-inactive.xpm
-share/themes/Symphony/xfwm4/close-active.xpm
-share/themes/Symphony/xfwm4/close-inactive.xpm
-share/themes/Symphony/xfwm4/close-pressed.xpm
-share/themes/Symphony/xfwm4/hide-active.xpm
-share/themes/Symphony/xfwm4/hide-inactive.xpm
-share/themes/Symphony/xfwm4/hide-pressed.xpm
-share/themes/Symphony/xfwm4/left-active.png
-share/themes/Symphony/xfwm4/left-active.xpm
-share/themes/Symphony/xfwm4/left-inactive.png
-share/themes/Symphony/xfwm4/left-inactive.xpm
-share/themes/Symphony/xfwm4/maximize-active.xpm
-share/themes/Symphony/xfwm4/maximize-inactive.xpm
-share/themes/Symphony/xfwm4/maximize-pressed.xpm
-share/themes/Symphony/xfwm4/maximize-toggled-active.xpm
-share/themes/Symphony/xfwm4/maximize-toggled-inactive.xpm
-share/themes/Symphony/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Symphony/xfwm4/menu-active.xpm
-share/themes/Symphony/xfwm4/menu-inactive.xpm
-share/themes/Symphony/xfwm4/menu-pressed.xpm
-share/themes/Symphony/xfwm4/right-active.png
-share/themes/Symphony/xfwm4/right-active.xpm
-share/themes/Symphony/xfwm4/right-inactive.png
-share/themes/Symphony/xfwm4/right-inactive.xpm
-share/themes/Symphony/xfwm4/shade-active.xpm
-share/themes/Symphony/xfwm4/shade-inactive.xpm
-share/themes/Symphony/xfwm4/shade-pressed.xpm
-share/themes/Symphony/xfwm4/shade-toggled-active.xpm
-share/themes/Symphony/xfwm4/shade-toggled-inactive.xpm
-share/themes/Symphony/xfwm4/shade-toggled-pressed.xpm
-share/themes/Symphony/xfwm4/stick-active.xpm
-share/themes/Symphony/xfwm4/stick-inactive.xpm
-share/themes/Symphony/xfwm4/stick-pressed.xpm
-share/themes/Symphony/xfwm4/stick-toggled-active.xpm
-share/themes/Symphony/xfwm4/stick-toggled-inactive.xpm
-share/themes/Symphony/xfwm4/stick-toggled-pressed.xpm
-share/themes/Symphony/xfwm4/title-1-active.png
-share/themes/Symphony/xfwm4/title-1-active.xpm
-share/themes/Symphony/xfwm4/title-1-inactive.png
-share/themes/Symphony/xfwm4/title-1-inactive.xpm
-share/themes/Symphony/xfwm4/title-2-active.png
-share/themes/Symphony/xfwm4/title-2-active.xpm
-share/themes/Symphony/xfwm4/title-2-inactive.png
-share/themes/Symphony/xfwm4/title-2-inactive.xpm
-share/themes/Symphony/xfwm4/title-3-active.png
-share/themes/Symphony/xfwm4/title-3-active.xpm
-share/themes/Symphony/xfwm4/title-3-inactive.png
-share/themes/Symphony/xfwm4/title-3-inactive.xpm
-share/themes/Symphony/xfwm4/title-4-active.png
-share/themes/Symphony/xfwm4/title-4-active.xpm
-share/themes/Symphony/xfwm4/title-4-inactive.png
-share/themes/Symphony/xfwm4/title-4-inactive.xpm
-share/themes/Symphony/xfwm4/title-5-active.png
-share/themes/Symphony/xfwm4/title-5-active.xpm
-share/themes/Symphony/xfwm4/title-5-inactive.png
-share/themes/Symphony/xfwm4/title-5-inactive.xpm
-share/themes/Symphony/xfwm4/top-left-active.png
-share/themes/Symphony/xfwm4/top-left-active.xpm
-share/themes/Symphony/xfwm4/top-left-inactive.png
-share/themes/Symphony/xfwm4/top-left-inactive.xpm
-share/themes/Symphony/xfwm4/top-right-active.png
-share/themes/Symphony/xfwm4/top-right-active.xpm
-share/themes/Symphony/xfwm4/top-right-inactive.png
-share/themes/Symphony/xfwm4/top-right-inactive.xpm
+share/themes/Katiola/xfwm4/README
+share/themes/Katiola/xfwm4/bottom-active.png
+share/themes/Katiola/xfwm4/bottom-active.xpm
+share/themes/Katiola/xfwm4/bottom-inactive.png
+share/themes/Katiola/xfwm4/bottom-inactive.xpm
+share/themes/Katiola/xfwm4/bottom-left-active.png
+share/themes/Katiola/xfwm4/bottom-left-active.xpm
+share/themes/Katiola/xfwm4/bottom-left-inactive.png
+share/themes/Katiola/xfwm4/bottom-left-inactive.xpm
+share/themes/Katiola/xfwm4/bottom-right-active.png
+share/themes/Katiola/xfwm4/bottom-right-active.xpm
+share/themes/Katiola/xfwm4/bottom-right-inactive.png
+share/themes/Katiola/xfwm4/bottom-right-inactive.xpm
+share/themes/Katiola/xfwm4/close-active.png
+share/themes/Katiola/xfwm4/close-active.xpm
+share/themes/Katiola/xfwm4/close-inactive.png
+share/themes/Katiola/xfwm4/close-inactive.xpm
+share/themes/Katiola/xfwm4/close-pressed.png
+share/themes/Katiola/xfwm4/close-pressed.xpm
+share/themes/Katiola/xfwm4/hide-active.png
+share/themes/Katiola/xfwm4/hide-active.xpm
+share/themes/Katiola/xfwm4/hide-inactive.png
+share/themes/Katiola/xfwm4/hide-inactive.xpm
+share/themes/Katiola/xfwm4/hide-pressed.png
+share/themes/Katiola/xfwm4/hide-pressed.xpm
+share/themes/Katiola/xfwm4/left-active.png
+share/themes/Katiola/xfwm4/left-active.xpm
+share/themes/Katiola/xfwm4/left-inactive.png
+share/themes/Katiola/xfwm4/left-inactive.xpm
+share/themes/Katiola/xfwm4/maximize-active.png
+share/themes/Katiola/xfwm4/maximize-active.xpm
+share/themes/Katiola/xfwm4/maximize-inactive.png
+share/themes/Katiola/xfwm4/maximize-inactive.xpm
+share/themes/Katiola/xfwm4/maximize-pressed.png
+share/themes/Katiola/xfwm4/maximize-pressed.xpm
+share/themes/Katiola/xfwm4/maximize-toggled-active.png
+share/themes/Katiola/xfwm4/maximize-toggled-active.xpm
+share/themes/Katiola/xfwm4/maximize-toggled-inactive.png
+share/themes/Katiola/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Katiola/xfwm4/maximize-toggled-pressed.png
+share/themes/Katiola/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Katiola/xfwm4/menu-active.png
+share/themes/Katiola/xfwm4/menu-active.xpm
+share/themes/Katiola/xfwm4/menu-inactive.png
+share/themes/Katiola/xfwm4/menu-inactive.xpm
+share/themes/Katiola/xfwm4/menu-pressed.png
+share/themes/Katiola/xfwm4/menu-pressed.xpm
+share/themes/Katiola/xfwm4/right-active.png
+share/themes/Katiola/xfwm4/right-active.xpm
+share/themes/Katiola/xfwm4/right-inactive.png
+share/themes/Katiola/xfwm4/right-inactive.xpm
+share/themes/Katiola/xfwm4/shade-active.png
+share/themes/Katiola/xfwm4/shade-active.xpm
+share/themes/Katiola/xfwm4/shade-inactive.png
+share/themes/Katiola/xfwm4/shade-inactive.xpm
+share/themes/Katiola/xfwm4/shade-pressed.png
+share/themes/Katiola/xfwm4/shade-pressed.xpm
+share/themes/Katiola/xfwm4/shade-toggled-active.png
+share/themes/Katiola/xfwm4/shade-toggled-active.xpm
+share/themes/Katiola/xfwm4/shade-toggled-inactive.png
+share/themes/Katiola/xfwm4/shade-toggled-inactive.xpm
+share/themes/Katiola/xfwm4/shade-toggled-pressed.png
+share/themes/Katiola/xfwm4/shade-toggled-pressed.xpm
+share/themes/Katiola/xfwm4/stick-active.png
+share/themes/Katiola/xfwm4/stick-active.xpm
+share/themes/Katiola/xfwm4/stick-inactive.png
+share/themes/Katiola/xfwm4/stick-inactive.xpm
+share/themes/Katiola/xfwm4/stick-pressed.png
+share/themes/Katiola/xfwm4/stick-pressed.xpm
+share/themes/Katiola/xfwm4/stick-toggled-active.png
+share/themes/Katiola/xfwm4/stick-toggled-active.xpm
+share/themes/Katiola/xfwm4/stick-toggled-inactive.png
+share/themes/Katiola/xfwm4/stick-toggled-inactive.xpm
+share/themes/Katiola/xfwm4/stick-toggled-pressed.png
+share/themes/Katiola/xfwm4/stick-toggled-pressed.xpm
+share/themes/Katiola/xfwm4/themerc
+share/themes/Katiola/xfwm4/title-1-active.png
+share/themes/Katiola/xfwm4/title-1-active.xpm
+share/themes/Katiola/xfwm4/title-1-inactive.png
+share/themes/Katiola/xfwm4/title-1-inactive.xpm
+share/themes/Katiola/xfwm4/title-2-active.png
+share/themes/Katiola/xfwm4/title-2-active.xpm
+share/themes/Katiola/xfwm4/title-2-inactive.png
+share/themes/Katiola/xfwm4/title-2-inactive.xpm
+share/themes/Katiola/xfwm4/title-3-active.png
+share/themes/Katiola/xfwm4/title-3-active.xpm
+share/themes/Katiola/xfwm4/title-3-inactive.png
+share/themes/Katiola/xfwm4/title-3-inactive.xpm
+share/themes/Katiola/xfwm4/title-4-active.png
+share/themes/Katiola/xfwm4/title-4-active.xpm
+share/themes/Katiola/xfwm4/title-4-inactive.png
+share/themes/Katiola/xfwm4/title-4-inactive.xpm
+share/themes/Katiola/xfwm4/title-5-active.png
+share/themes/Katiola/xfwm4/title-5-active.xpm
+share/themes/Katiola/xfwm4/title-5-inactive.png
+share/themes/Katiola/xfwm4/title-5-inactive.xpm
+share/themes/Katiola/xfwm4/top-left-active.png
+share/themes/Katiola/xfwm4/top-left-active.xpm
+share/themes/Katiola/xfwm4/top-left-inactive.png
+share/themes/Katiola/xfwm4/top-left-inactive.xpm
+share/themes/Katiola/xfwm4/top-right-active.png
+share/themes/Katiola/xfwm4/top-right-active.xpm
+share/themes/Katiola/xfwm4/top-right-inactive.png
+share/themes/Katiola/xfwm4/top-right-inactive.xpm
+share/themes/Kokodi/xfwm4/README
+share/themes/Kokodi/xfwm4/themerc
+share/themes/Kokodi/xfwm4/bottom-active.xpm
+share/themes/Kokodi/xfwm4/bottom-inactive.xpm
+share/themes/Kokodi/xfwm4/bottom-left-active.xpm
+share/themes/Kokodi/xfwm4/bottom-left-inactive.xpm
+share/themes/Kokodi/xfwm4/bottom-right-active.xpm
+share/themes/Kokodi/xfwm4/bottom-right-inactive.xpm
+share/themes/Kokodi/xfwm4/close-active.xpm
+share/themes/Kokodi/xfwm4/close-inactive.xpm
+share/themes/Kokodi/xfwm4/close-pressed.xpm
+share/themes/Kokodi/xfwm4/hide-active.xpm
+share/themes/Kokodi/xfwm4/hide-inactive.xpm
+share/themes/Kokodi/xfwm4/hide-pressed.xpm
+share/themes/Kokodi/xfwm4/left-active.xpm
+share/themes/Kokodi/xfwm4/left-inactive.xpm
+share/themes/Kokodi/xfwm4/maximize-active.xpm
+share/themes/Kokodi/xfwm4/maximize-inactive.xpm
+share/themes/Kokodi/xfwm4/maximize-pressed.xpm
+share/themes/Kokodi/xfwm4/maximize-toggled-active.xpm
+share/themes/Kokodi/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Kokodi/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Kokodi/xfwm4/menu-active.xpm
+share/themes/Kokodi/xfwm4/menu-inactive.xpm
+share/themes/Kokodi/xfwm4/menu-pressed.xpm
+share/themes/Kokodi/xfwm4/right-active.xpm
+share/themes/Kokodi/xfwm4/right-inactive.xpm
+share/themes/Kokodi/xfwm4/shade-active.xpm
+share/themes/Kokodi/xfwm4/shade-inactive.xpm
+share/themes/Kokodi/xfwm4/shade-pressed.xpm
+share/themes/Kokodi/xfwm4/shade-toggled-active.xpm
+share/themes/Kokodi/xfwm4/shade-toggled-inactive.xpm
+share/themes/Kokodi/xfwm4/shade-toggled-pressed.xpm
+share/themes/Kokodi/xfwm4/stick-active.xpm
+share/themes/Kokodi/xfwm4/stick-inactive.xpm
+share/themes/Kokodi/xfwm4/stick-pressed.xpm
+share/themes/Kokodi/xfwm4/stick-toggled-active.xpm
+share/themes/Kokodi/xfwm4/stick-toggled-inactive.xpm
+share/themes/Kokodi/xfwm4/stick-toggled-pressed.xpm
+share/themes/Kokodi/xfwm4/title-1-active.xpm
+share/themes/Kokodi/xfwm4/title-1-inactive.xpm
+share/themes/Kokodi/xfwm4/title-2-active.xpm
+share/themes/Kokodi/xfwm4/title-2-inactive.xpm
+share/themes/Kokodi/xfwm4/title-3-active.xpm
+share/themes/Kokodi/xfwm4/title-3-inactive.xpm
+share/themes/Kokodi/xfwm4/title-4-active.xpm
+share/themes/Kokodi/xfwm4/title-4-inactive.xpm
+share/themes/Kokodi/xfwm4/title-5-active.xpm
+share/themes/Kokodi/xfwm4/title-5-inactive.xpm
+share/themes/Kokodi/xfwm4/top-left-active.xpm
+share/themes/Kokodi/xfwm4/top-left-inactive.xpm
+share/themes/Kokodi/xfwm4/top-right-active.xpm
+share/themes/Kokodi/xfwm4/top-right-inactive.xpm
+share/themes/Kokodi/xfwm4/bottom-active.png
+share/themes/Kokodi/xfwm4/bottom-inactive.png
+share/themes/Kokodi/xfwm4/bottom-left-active.png
+share/themes/Kokodi/xfwm4/bottom-left-inactive.png
+share/themes/Kokodi/xfwm4/bottom-right-active.png
+share/themes/Kokodi/xfwm4/bottom-right-inactive.png
+share/themes/Kokodi/xfwm4/close-active.png
+share/themes/Kokodi/xfwm4/close-inactive.png
+share/themes/Kokodi/xfwm4/close-pressed.png
+share/themes/Kokodi/xfwm4/hide-active.png
+share/themes/Kokodi/xfwm4/hide-inactive.png
+share/themes/Kokodi/xfwm4/hide-pressed.png
+share/themes/Kokodi/xfwm4/left-active.png
+share/themes/Kokodi/xfwm4/left-inactive.png
+share/themes/Kokodi/xfwm4/maximize-active.png
+share/themes/Kokodi/xfwm4/maximize-inactive.png
+share/themes/Kokodi/xfwm4/maximize-pressed.png
+share/themes/Kokodi/xfwm4/maximize-toggled-active.png
+share/themes/Kokodi/xfwm4/maximize-toggled-inactive.png
+share/themes/Kokodi/xfwm4/maximize-toggled-pressed.png
+share/themes/Kokodi/xfwm4/menu-active.png
+share/themes/Kokodi/xfwm4/menu-inactive.png
+share/themes/Kokodi/xfwm4/menu-pressed.png
+share/themes/Kokodi/xfwm4/right-active.png
+share/themes/Kokodi/xfwm4/right-inactive.png
+share/themes/Kokodi/xfwm4/shade-active.png
+share/themes/Kokodi/xfwm4/shade-inactive.png
+share/themes/Kokodi/xfwm4/shade-pressed.png
+share/themes/Kokodi/xfwm4/shade-toggled-active.png
+share/themes/Kokodi/xfwm4/shade-toggled-inactive.png
+share/themes/Kokodi/xfwm4/shade-toggled-pressed.png
+share/themes/Kokodi/xfwm4/stick-active.png
+share/themes/Kokodi/xfwm4/stick-inactive.png
+share/themes/Kokodi/xfwm4/stick-pressed.png
+share/themes/Kokodi/xfwm4/stick-toggled-active.png
+share/themes/Kokodi/xfwm4/stick-toggled-inactive.png
+share/themes/Kokodi/xfwm4/stick-toggled-pressed.png
+share/themes/Kokodi/xfwm4/title-1-active.png
+share/themes/Kokodi/xfwm4/title-1-inactive.png
+share/themes/Kokodi/xfwm4/title-2-active.png
+share/themes/Kokodi/xfwm4/title-2-inactive.png
+share/themes/Kokodi/xfwm4/title-3-active.png
+share/themes/Kokodi/xfwm4/title-3-inactive.png
+share/themes/Kokodi/xfwm4/title-4-active.png
+share/themes/Kokodi/xfwm4/title-4-inactive.png
+share/themes/Kokodi/xfwm4/title-5-active.png
+share/themes/Kokodi/xfwm4/title-5-inactive.png
+share/themes/Kokodi/xfwm4/top-left-active.png
+share/themes/Kokodi/xfwm4/top-left-inactive.png
+share/themes/Kokodi/xfwm4/top-right-active.png
+share/themes/Kokodi/xfwm4/top-right-inactive.png
+share/themes/Moheli/xfwm4/README
+share/themes/Moheli/xfwm4/bottom-active.png
+share/themes/Moheli/xfwm4/bottom-active.xpm
+share/themes/Moheli/xfwm4/bottom-inactive.png
+share/themes/Moheli/xfwm4/bottom-inactive.xpm
+share/themes/Moheli/xfwm4/bottom-left-active.png
+share/themes/Moheli/xfwm4/bottom-left-active.xpm
+share/themes/Moheli/xfwm4/bottom-left-inactive.png
+share/themes/Moheli/xfwm4/bottom-left-inactive.xpm
+share/themes/Moheli/xfwm4/bottom-right-active.png
+share/themes/Moheli/xfwm4/bottom-right-active.xpm
+share/themes/Moheli/xfwm4/bottom-right-inactive.png
+share/themes/Moheli/xfwm4/bottom-right-inactive.xpm
+share/themes/Moheli/xfwm4/close-active.png
+share/themes/Moheli/xfwm4/close-active.xpm
+share/themes/Moheli/xfwm4/close-inactive.png
+share/themes/Moheli/xfwm4/close-inactive.xpm
+share/themes/Moheli/xfwm4/close-pressed.png
+share/themes/Moheli/xfwm4/close-pressed.xpm
+share/themes/Moheli/xfwm4/hide-active.png
+share/themes/Moheli/xfwm4/hide-active.xpm
+share/themes/Moheli/xfwm4/hide-inactive.png
+share/themes/Moheli/xfwm4/hide-inactive.xpm
+share/themes/Moheli/xfwm4/hide-pressed.png
+share/themes/Moheli/xfwm4/hide-pressed.xpm
+share/themes/Moheli/xfwm4/left-active.png
+share/themes/Moheli/xfwm4/left-active.xpm
+share/themes/Moheli/xfwm4/left-inactive.png
+share/themes/Moheli/xfwm4/left-inactive.xpm
+share/themes/Moheli/xfwm4/maximize-active.png
+share/themes/Moheli/xfwm4/maximize-active.xpm
+share/themes/Moheli/xfwm4/maximize-inactive.png
+share/themes/Moheli/xfwm4/maximize-inactive.xpm
+share/themes/Moheli/xfwm4/maximize-pressed.png
+share/themes/Moheli/xfwm4/maximize-pressed.xpm
+share/themes/Moheli/xfwm4/maximize-toggled-active.png
+share/themes/Moheli/xfwm4/maximize-toggled-active.xpm
+share/themes/Moheli/xfwm4/maximize-toggled-inactive.png
+share/themes/Moheli/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Moheli/xfwm4/maximize-toggled-pressed.png
+share/themes/Moheli/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Moheli/xfwm4/menu-active.png
+share/themes/Moheli/xfwm4/menu-active.xpm
+share/themes/Moheli/xfwm4/menu-inactive.png
+share/themes/Moheli/xfwm4/menu-inactive.xpm
+share/themes/Moheli/xfwm4/menu-pressed.png
+share/themes/Moheli/xfwm4/menu-pressed.xpm
+share/themes/Moheli/xfwm4/right-active.png
+share/themes/Moheli/xfwm4/right-active.xpm
+share/themes/Moheli/xfwm4/right-inactive.png
+share/themes/Moheli/xfwm4/right-inactive.xpm
+share/themes/Moheli/xfwm4/shade-active.png
+share/themes/Moheli/xfwm4/shade-active.xpm
+share/themes/Moheli/xfwm4/shade-inactive.png
+share/themes/Moheli/xfwm4/shade-inactive.xpm
+share/themes/Moheli/xfwm4/shade-pressed.png
+share/themes/Moheli/xfwm4/shade-pressed.xpm
+share/themes/Moheli/xfwm4/shade-toggled-active.png
+share/themes/Moheli/xfwm4/shade-toggled-active.xpm
+share/themes/Moheli/xfwm4/shade-toggled-inactive.png
+share/themes/Moheli/xfwm4/shade-toggled-inactive.xpm
+share/themes/Moheli/xfwm4/shade-toggled-pressed.png
+share/themes/Moheli/xfwm4/shade-toggled-pressed.xpm
+share/themes/Moheli/xfwm4/stick-active.png
+share/themes/Moheli/xfwm4/stick-active.xpm
+share/themes/Moheli/xfwm4/stick-inactive.png
+share/themes/Moheli/xfwm4/stick-inactive.xpm
+share/themes/Moheli/xfwm4/stick-pressed.png
+share/themes/Moheli/xfwm4/stick-pressed.xpm
+share/themes/Moheli/xfwm4/stick-toggled-active.png
+share/themes/Moheli/xfwm4/stick-toggled-active.xpm
+share/themes/Moheli/xfwm4/stick-toggled-inactive.png
+share/themes/Moheli/xfwm4/stick-toggled-inactive.xpm
+share/themes/Moheli/xfwm4/stick-toggled-pressed.png
+share/themes/Moheli/xfwm4/stick-toggled-pressed.xpm
+share/themes/Moheli/xfwm4/themerc
+share/themes/Moheli/xfwm4/title-1-active.png
+share/themes/Moheli/xfwm4/title-1-active.xpm
+share/themes/Moheli/xfwm4/title-1-inactive.png
+share/themes/Moheli/xfwm4/title-1-inactive.xpm
+share/themes/Moheli/xfwm4/title-2-active.png
+share/themes/Moheli/xfwm4/title-2-active.xpm
+share/themes/Moheli/xfwm4/title-2-inactive.png
+share/themes/Moheli/xfwm4/title-2-inactive.xpm
+share/themes/Moheli/xfwm4/title-3-active.png
+share/themes/Moheli/xfwm4/title-3-active.xpm
+share/themes/Moheli/xfwm4/title-3-inactive.png
+share/themes/Moheli/xfwm4/title-3-inactive.xpm
+share/themes/Moheli/xfwm4/title-4-active.png
+share/themes/Moheli/xfwm4/title-4-active.xpm
+share/themes/Moheli/xfwm4/title-4-inactive.png
+share/themes/Moheli/xfwm4/title-4-inactive.xpm
+share/themes/Moheli/xfwm4/title-5-active.png
+share/themes/Moheli/xfwm4/title-5-active.xpm
+share/themes/Moheli/xfwm4/title-5-inactive.png
+share/themes/Moheli/xfwm4/title-5-inactive.xpm
+share/themes/Moheli/xfwm4/top-left-active.png
+share/themes/Moheli/xfwm4/top-left-active.xpm
+share/themes/Moheli/xfwm4/top-left-inactive.png
+share/themes/Moheli/xfwm4/top-left-inactive.xpm
+share/themes/Moheli/xfwm4/top-right-active.png
+share/themes/Moheli/xfwm4/top-right-active.xpm
+share/themes/Moheli/xfwm4/top-right-inactive.png
+share/themes/Moheli/xfwm4/top-right-inactive.xpm
+share/themes/Sassandra/xfwm4/README
+share/themes/Sassandra/xfwm4/themerc
+share/themes/Sassandra/xfwm4/bottom-active.png
+share/themes/Sassandra/xfwm4/bottom-active.xpm
+share/themes/Sassandra/xfwm4/bottom-inactive.png
+share/themes/Sassandra/xfwm4/bottom-inactive.xpm
+share/themes/Sassandra/xfwm4/bottom-left-active.png
+share/themes/Sassandra/xfwm4/bottom-left-active.xpm
+share/themes/Sassandra/xfwm4/bottom-left-inactive.png
+share/themes/Sassandra/xfwm4/bottom-left-inactive.xpm
+share/themes/Sassandra/xfwm4/bottom-right-active.png
+share/themes/Sassandra/xfwm4/bottom-right-active.xpm
+share/themes/Sassandra/xfwm4/bottom-right-inactive.png
+share/themes/Sassandra/xfwm4/bottom-right-inactive.xpm
+share/themes/Sassandra/xfwm4/close-active.png
+share/themes/Sassandra/xfwm4/close-active.xpm
+share/themes/Sassandra/xfwm4/close-inactive.png
+share/themes/Sassandra/xfwm4/close-inactive.xpm
+share/themes/Sassandra/xfwm4/close-pressed.png
+share/themes/Sassandra/xfwm4/close-pressed.xpm
+share/themes/Sassandra/xfwm4/hide-active.png
+share/themes/Sassandra/xfwm4/hide-active.xpm
+share/themes/Sassandra/xfwm4/hide-inactive.png
+share/themes/Sassandra/xfwm4/hide-inactive.xpm
+share/themes/Sassandra/xfwm4/hide-pressed.png
+share/themes/Sassandra/xfwm4/hide-pressed.xpm
+share/themes/Sassandra/xfwm4/left-active.png
+share/themes/Sassandra/xfwm4/left-active.xpm
+share/themes/Sassandra/xfwm4/left-inactive.png
+share/themes/Sassandra/xfwm4/left-inactive.xpm
+share/themes/Sassandra/xfwm4/maximize-active.png
+share/themes/Sassandra/xfwm4/maximize-active.xpm
+share/themes/Sassandra/xfwm4/maximize-inactive.png
+share/themes/Sassandra/xfwm4/maximize-inactive.xpm
+share/themes/Sassandra/xfwm4/maximize-pressed.png
+share/themes/Sassandra/xfwm4/maximize-pressed.xpm
+share/themes/Sassandra/xfwm4/maximize-toggled-active.png
+share/themes/Sassandra/xfwm4/maximize-toggled-active.xpm
+share/themes/Sassandra/xfwm4/maximize-toggled-inactive.png
+share/themes/Sassandra/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Sassandra/xfwm4/maximize-toggled-pressed.png
+share/themes/Sassandra/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Sassandra/xfwm4/menu-active.png
+share/themes/Sassandra/xfwm4/menu-active.xpm
+share/themes/Sassandra/xfwm4/menu-inactive.png
+share/themes/Sassandra/xfwm4/menu-inactive.xpm
+share/themes/Sassandra/xfwm4/menu-pressed.png
+share/themes/Sassandra/xfwm4/menu-pressed.xpm
+share/themes/Sassandra/xfwm4/right-active.png
+share/themes/Sassandra/xfwm4/right-active.xpm
+share/themes/Sassandra/xfwm4/right-inactive.png
+share/themes/Sassandra/xfwm4/right-inactive.xpm
+share/themes/Sassandra/xfwm4/shade-active.png
+share/themes/Sassandra/xfwm4/shade-active.xpm
+share/themes/Sassandra/xfwm4/shade-inactive.png
+share/themes/Sassandra/xfwm4/shade-inactive.xpm
+share/themes/Sassandra/xfwm4/shade-pressed.png
+share/themes/Sassandra/xfwm4/shade-pressed.xpm
+share/themes/Sassandra/xfwm4/shade-toggled-active.png
+share/themes/Sassandra/xfwm4/shade-toggled-active.xpm
+share/themes/Sassandra/xfwm4/shade-toggled-inactive.png
+share/themes/Sassandra/xfwm4/shade-toggled-inactive.xpm
+share/themes/Sassandra/xfwm4/shade-toggled-pressed.png
+share/themes/Sassandra/xfwm4/shade-toggled-pressed.xpm
+share/themes/Sassandra/xfwm4/stick-active.png
+share/themes/Sassandra/xfwm4/stick-active.xpm
+share/themes/Sassandra/xfwm4/stick-inactive.png
+share/themes/Sassandra/xfwm4/stick-inactive.xpm
+share/themes/Sassandra/xfwm4/stick-pressed.png
+share/themes/Sassandra/xfwm4/stick-pressed.xpm
+share/themes/Sassandra/xfwm4/stick-toggled-active.png
+share/themes/Sassandra/xfwm4/stick-toggled-active.xpm
+share/themes/Sassandra/xfwm4/stick-toggled-inactive.png
+share/themes/Sassandra/xfwm4/stick-toggled-inactive.xpm
+share/themes/Sassandra/xfwm4/stick-toggled-pressed.png
+share/themes/Sassandra/xfwm4/stick-toggled-pressed.xpm
+share/themes/Sassandra/xfwm4/title-1-active.png
+share/themes/Sassandra/xfwm4/title-1-active.xpm
+share/themes/Sassandra/xfwm4/title-1-inactive.png
+share/themes/Sassandra/xfwm4/title-1-inactive.xpm
+share/themes/Sassandra/xfwm4/title-2-active.png
+share/themes/Sassandra/xfwm4/title-2-active.xpm
+share/themes/Sassandra/xfwm4/title-2-inactive.png
+share/themes/Sassandra/xfwm4/title-2-inactive.xpm
+share/themes/Sassandra/xfwm4/title-3-active.png
+share/themes/Sassandra/xfwm4/title-3-active.xpm
+share/themes/Sassandra/xfwm4/title-3-inactive.png
+share/themes/Sassandra/xfwm4/title-3-inactive.xpm
+share/themes/Sassandra/xfwm4/title-4-active.png
+share/themes/Sassandra/xfwm4/title-4-active.xpm
+share/themes/Sassandra/xfwm4/title-4-inactive.png
+share/themes/Sassandra/xfwm4/title-4-inactive.xpm
+share/themes/Sassandra/xfwm4/title-5-active.png
+share/themes/Sassandra/xfwm4/title-5-active.xpm
+share/themes/Sassandra/xfwm4/title-5-inactive.png
+share/themes/Sassandra/xfwm4/title-5-inactive.xpm
+share/themes/Sassandra/xfwm4/top-left-active.png
+share/themes/Sassandra/xfwm4/top-left-active.xpm
+share/themes/Sassandra/xfwm4/top-left-inactive.png
+share/themes/Sassandra/xfwm4/top-left-inactive.xpm
+share/themes/Sassandra/xfwm4/top-right-active.png
+share/themes/Sassandra/xfwm4/top-right-active.xpm
+share/themes/Sassandra/xfwm4/top-right-inactive.png
+share/themes/Sassandra/xfwm4/top-right-inactive.xpm
+share/themes/Stoneage/xfwm4/README
+share/themes/Stoneage/xfwm4/bottom-active.png
+share/themes/Stoneage/xfwm4/bottom-active.xpm
+share/themes/Stoneage/xfwm4/bottom-inactive.png
+share/themes/Stoneage/xfwm4/bottom-inactive.xpm
+share/themes/Stoneage/xfwm4/bottom-left-active.png
+share/themes/Stoneage/xfwm4/bottom-left-active.xpm
+share/themes/Stoneage/xfwm4/bottom-left-inactive.png
+share/themes/Stoneage/xfwm4/bottom-left-inactive.xpm
+share/themes/Stoneage/xfwm4/bottom-right-active.png
+share/themes/Stoneage/xfwm4/bottom-right-active.xpm
+share/themes/Stoneage/xfwm4/bottom-right-inactive.png
+share/themes/Stoneage/xfwm4/bottom-right-inactive.xpm
+share/themes/Stoneage/xfwm4/close-active.png
+share/themes/Stoneage/xfwm4/close-active.xpm
+share/themes/Stoneage/xfwm4/close-inactive.png
+share/themes/Stoneage/xfwm4/close-inactive.xpm
+share/themes/Stoneage/xfwm4/close-pressed.png
+share/themes/Stoneage/xfwm4/close-pressed.xpm
+share/themes/Stoneage/xfwm4/hide-active.png
+share/themes/Stoneage/xfwm4/hide-active.xpm
+share/themes/Stoneage/xfwm4/hide-inactive.png
+share/themes/Stoneage/xfwm4/hide-inactive.xpm
+share/themes/Stoneage/xfwm4/hide-pressed.png
+share/themes/Stoneage/xfwm4/hide-pressed.xpm
+share/themes/Stoneage/xfwm4/left-active.png
+share/themes/Stoneage/xfwm4/left-active.xpm
+share/themes/Stoneage/xfwm4/left-inactive.png
+share/themes/Stoneage/xfwm4/left-inactive.xpm
+share/themes/Stoneage/xfwm4/maximize-active.png
+share/themes/Stoneage/xfwm4/maximize-active.xpm
+share/themes/Stoneage/xfwm4/maximize-inactive.png
+share/themes/Stoneage/xfwm4/maximize-inactive.xpm
+share/themes/Stoneage/xfwm4/maximize-pressed.png
+share/themes/Stoneage/xfwm4/maximize-pressed.xpm
+share/themes/Stoneage/xfwm4/maximize-toggled-active.png
+share/themes/Stoneage/xfwm4/maximize-toggled-active.xpm
+share/themes/Stoneage/xfwm4/maximize-toggled-inactive.png
+share/themes/Stoneage/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Stoneage/xfwm4/maximize-toggled-pressed.png
+share/themes/Stoneage/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Stoneage/xfwm4/menu-active.png
+share/themes/Stoneage/xfwm4/menu-active.xpm
+share/themes/Stoneage/xfwm4/menu-inactive.png
+share/themes/Stoneage/xfwm4/menu-inactive.xpm
+share/themes/Stoneage/xfwm4/menu-pressed.png
+share/themes/Stoneage/xfwm4/menu-pressed.xpm
+share/themes/Stoneage/xfwm4/right-active.png
+share/themes/Stoneage/xfwm4/right-active.xpm
+share/themes/Stoneage/xfwm4/right-inactive.png
+share/themes/Stoneage/xfwm4/right-inactive.xpm
+share/themes/Stoneage/xfwm4/shade-active.png
+share/themes/Stoneage/xfwm4/shade-active.xpm
+share/themes/Stoneage/xfwm4/shade-inactive.png
+share/themes/Stoneage/xfwm4/shade-inactive.xpm
+share/themes/Stoneage/xfwm4/shade-pressed.png
+share/themes/Stoneage/xfwm4/shade-pressed.xpm
+share/themes/Stoneage/xfwm4/shade-toggled-active.png
+share/themes/Stoneage/xfwm4/shade-toggled-active.xpm
+share/themes/Stoneage/xfwm4/shade-toggled-inactive.png
+share/themes/Stoneage/xfwm4/shade-toggled-inactive.xpm
+share/themes/Stoneage/xfwm4/shade-toggled-pressed.png
+share/themes/Stoneage/xfwm4/shade-toggled-pressed.xpm
+share/themes/Stoneage/xfwm4/stick-active.png
+share/themes/Stoneage/xfwm4/stick-active.xpm
+share/themes/Stoneage/xfwm4/stick-inactive.png
+share/themes/Stoneage/xfwm4/stick-inactive.xpm
+share/themes/Stoneage/xfwm4/stick-pressed.png
+share/themes/Stoneage/xfwm4/stick-pressed.xpm
+share/themes/Stoneage/xfwm4/stick-toggled-active.png
+share/themes/Stoneage/xfwm4/stick-toggled-active.xpm
+share/themes/Stoneage/xfwm4/stick-toggled-inactive.png
+share/themes/Stoneage/xfwm4/stick-toggled-inactive.xpm
+share/themes/Stoneage/xfwm4/stick-toggled-pressed.png
+share/themes/Stoneage/xfwm4/stick-toggled-pressed.xpm
+share/themes/Stoneage/xfwm4/themerc
+share/themes/Stoneage/xfwm4/title-1-active.png
+share/themes/Stoneage/xfwm4/title-1-active.xpm
+share/themes/Stoneage/xfwm4/title-1-inactive.png
+share/themes/Stoneage/xfwm4/title-1-inactive.xpm
+share/themes/Stoneage/xfwm4/title-2-active.png
+share/themes/Stoneage/xfwm4/title-2-active.xpm
+share/themes/Stoneage/xfwm4/title-2-inactive.png
+share/themes/Stoneage/xfwm4/title-2-inactive.xpm
+share/themes/Stoneage/xfwm4/title-3-active.png
+share/themes/Stoneage/xfwm4/title-3-active.xpm
+share/themes/Stoneage/xfwm4/title-3-inactive.png
+share/themes/Stoneage/xfwm4/title-3-inactive.xpm
+share/themes/Stoneage/xfwm4/title-4-active.png
+share/themes/Stoneage/xfwm4/title-4-active.xpm
+share/themes/Stoneage/xfwm4/title-4-inactive.png
+share/themes/Stoneage/xfwm4/title-4-inactive.xpm
+share/themes/Stoneage/xfwm4/title-5-active.png
+share/themes/Stoneage/xfwm4/title-5-active.xpm
+share/themes/Stoneage/xfwm4/title-5-inactive.png
+share/themes/Stoneage/xfwm4/title-5-inactive.xpm
+share/themes/Stoneage/xfwm4/top-left-active.png
+share/themes/Stoneage/xfwm4/top-left-active.xpm
+share/themes/Stoneage/xfwm4/top-left-inactive.png
+share/themes/Stoneage/xfwm4/top-left-inactive.xpm
+share/themes/Stoneage/xfwm4/top-right-active.png
+share/themes/Stoneage/xfwm4/top-right-active.xpm
+share/themes/Stoneage/xfwm4/top-right-inactive.png
+share/themes/Stoneage/xfwm4/top-right-inactive.xpm
share/themes/Therapy/xfwm4/README
share/themes/Therapy/xfwm4/bottom-active.png
share/themes/Therapy/xfwm4/bottom-active.xpm
@@ -348,11 +946,15 @@ share/themes/Therapy/xfwm4/bottom-right-active.png
share/themes/Therapy/xfwm4/bottom-right-active.xpm
share/themes/Therapy/xfwm4/bottom-right-inactive.png
share/themes/Therapy/xfwm4/bottom-right-inactive.xpm
+share/themes/Therapy/xfwm4/close-active.png
share/themes/Therapy/xfwm4/close-active.xpm
+share/themes/Therapy/xfwm4/close-inactive.png
share/themes/Therapy/xfwm4/close-inactive.xpm
share/themes/Therapy/xfwm4/close-pressed.png
share/themes/Therapy/xfwm4/close-pressed.xpm
+share/themes/Therapy/xfwm4/hide-active.png
share/themes/Therapy/xfwm4/hide-active.xpm
+share/themes/Therapy/xfwm4/hide-inactive.png
share/themes/Therapy/xfwm4/hide-inactive.xpm
share/themes/Therapy/xfwm4/hide-pressed.png
share/themes/Therapy/xfwm4/hide-pressed.xpm
@@ -360,15 +962,21 @@ share/themes/Therapy/xfwm4/left-active.png
share/themes/Therapy/xfwm4/left-active.xpm
share/themes/Therapy/xfwm4/left-inactive.png
share/themes/Therapy/xfwm4/left-inactive.xpm
+share/themes/Therapy/xfwm4/maximize-active.png
share/themes/Therapy/xfwm4/maximize-active.xpm
+share/themes/Therapy/xfwm4/maximize-inactive.png
share/themes/Therapy/xfwm4/maximize-inactive.xpm
share/themes/Therapy/xfwm4/maximize-pressed.png
share/themes/Therapy/xfwm4/maximize-pressed.xpm
+share/themes/Therapy/xfwm4/maximize-toggled-active.png
share/themes/Therapy/xfwm4/maximize-toggled-active.xpm
+share/themes/Therapy/xfwm4/maximize-toggled-inactive.png
share/themes/Therapy/xfwm4/maximize-toggled-inactive.xpm
share/themes/Therapy/xfwm4/maximize-toggled-pressed.png
-share/themes/Therapy/xfwm4/menu-active.xpm
share/themes/Therapy/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Therapy/xfwm4/menu-active.png
+share/themes/Therapy/xfwm4/menu-active.xpm
+share/themes/Therapy/xfwm4/menu-inactive.png
share/themes/Therapy/xfwm4/menu-inactive.xpm
share/themes/Therapy/xfwm4/menu-pressed.png
share/themes/Therapy/xfwm4/menu-pressed.xpm
@@ -376,23 +984,31 @@ share/themes/Therapy/xfwm4/right-active.png
share/themes/Therapy/xfwm4/right-active.xpm
share/themes/Therapy/xfwm4/right-inactive.png
share/themes/Therapy/xfwm4/right-inactive.xpm
+share/themes/Therapy/xfwm4/shade-active.png
share/themes/Therapy/xfwm4/shade-active.xpm
+share/themes/Therapy/xfwm4/shade-inactive.png
share/themes/Therapy/xfwm4/shade-inactive.xpm
share/themes/Therapy/xfwm4/shade-pressed.png
share/themes/Therapy/xfwm4/shade-pressed.xpm
+share/themes/Therapy/xfwm4/shade-toggled-active.png
share/themes/Therapy/xfwm4/shade-toggled-active.xpm
+share/themes/Therapy/xfwm4/shade-toggled-inactive.png
share/themes/Therapy/xfwm4/shade-toggled-inactive.xpm
share/themes/Therapy/xfwm4/shade-toggled-pressed.png
share/themes/Therapy/xfwm4/shade-toggled-pressed.xpm
-share/themes/Therapy/xfwm4/themerc
+share/themes/Therapy/xfwm4/stick-active.png
share/themes/Therapy/xfwm4/stick-active.xpm
+share/themes/Therapy/xfwm4/stick-inactive.png
share/themes/Therapy/xfwm4/stick-inactive.xpm
share/themes/Therapy/xfwm4/stick-pressed.png
share/themes/Therapy/xfwm4/stick-pressed.xpm
+share/themes/Therapy/xfwm4/stick-toggled-active.png
share/themes/Therapy/xfwm4/stick-toggled-active.xpm
+share/themes/Therapy/xfwm4/stick-toggled-inactive.png
share/themes/Therapy/xfwm4/stick-toggled-inactive.xpm
share/themes/Therapy/xfwm4/stick-toggled-pressed.png
share/themes/Therapy/xfwm4/stick-toggled-pressed.xpm
+share/themes/Therapy/xfwm4/themerc
share/themes/Therapy/xfwm4/title-1-active.png
share/themes/Therapy/xfwm4/title-1-active.xpm
share/themes/Therapy/xfwm4/title-1-inactive.png
@@ -422,7 +1038,6 @@ share/themes/Therapy/xfwm4/top-right-active.xpm
share/themes/Therapy/xfwm4/top-right-inactive.png
share/themes/Therapy/xfwm4/top-right-inactive.xpm
share/themes/Tyrex/xfwm4/README
-share/themes/Tyrex/xfwm4/themerc
share/themes/Tyrex/xfwm4/bottom-active.png
share/themes/Tyrex/xfwm4/bottom-active.xpm
share/themes/Tyrex/xfwm4/bottom-inactive.png
@@ -435,52 +1050,52 @@ share/themes/Tyrex/xfwm4/bottom-right-active.png
share/themes/Tyrex/xfwm4/bottom-right-active.xpm
share/themes/Tyrex/xfwm4/bottom-right-inactive.png
share/themes/Tyrex/xfwm4/bottom-right-inactive.xpm
-share/themes/Tyrex/xfwm4/close-active.xpm
share/themes/Tyrex/xfwm4/close-active.png
-share/themes/Tyrex/xfwm4/close-inactive.xpm
+share/themes/Tyrex/xfwm4/close-active.xpm
share/themes/Tyrex/xfwm4/close-inactive.png
-share/themes/Tyrex/xfwm4/close-pressed.xpm
+share/themes/Tyrex/xfwm4/close-inactive.xpm
share/themes/Tyrex/xfwm4/close-pressed.png
-share/themes/Tyrex/xfwm4/hide-active.xpm
+share/themes/Tyrex/xfwm4/close-pressed.xpm
share/themes/Tyrex/xfwm4/hide-active.png
-share/themes/Tyrex/xfwm4/hide-inactive.xpm
+share/themes/Tyrex/xfwm4/hide-active.xpm
share/themes/Tyrex/xfwm4/hide-inactive.png
-share/themes/Tyrex/xfwm4/hide-pressed.xpm
+share/themes/Tyrex/xfwm4/hide-inactive.xpm
share/themes/Tyrex/xfwm4/hide-pressed.png
+share/themes/Tyrex/xfwm4/hide-pressed.xpm
share/themes/Tyrex/xfwm4/left-active.png
share/themes/Tyrex/xfwm4/left-active.xpm
share/themes/Tyrex/xfwm4/left-inactive.png
share/themes/Tyrex/xfwm4/left-inactive.xpm
-share/themes/Tyrex/xfwm4/maximize-active.xpm
share/themes/Tyrex/xfwm4/maximize-active.png
-share/themes/Tyrex/xfwm4/maximize-inactive.xpm
+share/themes/Tyrex/xfwm4/maximize-active.xpm
share/themes/Tyrex/xfwm4/maximize-inactive.png
-share/themes/Tyrex/xfwm4/maximize-pressed.xpm
+share/themes/Tyrex/xfwm4/maximize-inactive.xpm
share/themes/Tyrex/xfwm4/maximize-pressed.png
-share/themes/Tyrex/xfwm4/maximize-toggled-active.xpm
+share/themes/Tyrex/xfwm4/maximize-pressed.xpm
share/themes/Tyrex/xfwm4/maximize-toggled-active.png
-share/themes/Tyrex/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Tyrex/xfwm4/maximize-toggled-active.xpm
share/themes/Tyrex/xfwm4/maximize-toggled-inactive.png
-share/themes/Tyrex/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Tyrex/xfwm4/maximize-toggled-inactive.xpm
share/themes/Tyrex/xfwm4/maximize-toggled-pressed.png
-share/themes/Tyrex/xfwm4/menu-active.xpm
+share/themes/Tyrex/xfwm4/maximize-toggled-pressed.xpm
share/themes/Tyrex/xfwm4/menu-active.png
-share/themes/Tyrex/xfwm4/menu-inactive.xpm
+share/themes/Tyrex/xfwm4/menu-active.xpm
share/themes/Tyrex/xfwm4/menu-inactive.png
-share/themes/Tyrex/xfwm4/menu-pressed.xpm
+share/themes/Tyrex/xfwm4/menu-inactive.xpm
share/themes/Tyrex/xfwm4/menu-pressed.png
+share/themes/Tyrex/xfwm4/menu-pressed.xpm
share/themes/Tyrex/xfwm4/right-active.png
share/themes/Tyrex/xfwm4/right-active.xpm
share/themes/Tyrex/xfwm4/right-inactive.png
share/themes/Tyrex/xfwm4/right-inactive.xpm
-share/themes/Tyrex/xfwm4/shade-active.xpm
share/themes/Tyrex/xfwm4/shade-active.png
-share/themes/Tyrex/xfwm4/shade-inactive.xpm
+share/themes/Tyrex/xfwm4/shade-active.xpm
share/themes/Tyrex/xfwm4/shade-inactive.png
-share/themes/Tyrex/xfwm4/shade-pressed.xpm
+share/themes/Tyrex/xfwm4/shade-inactive.xpm
share/themes/Tyrex/xfwm4/shade-pressed.png
-share/themes/Tyrex/xfwm4/shade-toggled-active.xpm
+share/themes/Tyrex/xfwm4/shade-pressed.xpm
share/themes/Tyrex/xfwm4/shade-toggled-active.png
+share/themes/Tyrex/xfwm4/shade-toggled-active.xpm
share/themes/Tyrex/xfwm4/shade-toggled-inactive.png
share/themes/Tyrex/xfwm4/shade-toggled-inactive.xpm
share/themes/Tyrex/xfwm4/shade-toggled-pressed.png
@@ -497,6 +1112,7 @@ share/themes/Tyrex/xfwm4/stick-toggled-inactive.png
share/themes/Tyrex/xfwm4/stick-toggled-inactive.xpm
share/themes/Tyrex/xfwm4/stick-toggled-pressed.png
share/themes/Tyrex/xfwm4/stick-toggled-pressed.xpm
+share/themes/Tyrex/xfwm4/themerc
share/themes/Tyrex/xfwm4/title-1-active.png
share/themes/Tyrex/xfwm4/title-1-active.xpm
share/themes/Tyrex/xfwm4/title-1-inactive.png
@@ -525,177 +1141,110 @@ share/themes/Tyrex/xfwm4/top-right-active.png
share/themes/Tyrex/xfwm4/top-right-active.xpm
share/themes/Tyrex/xfwm4/top-right-inactive.png
share/themes/Tyrex/xfwm4/top-right-inactive.xpm
-share/themes/Waza/xfwm4/README
-share/themes/Waza/xfwm4/themerc
-share/themes/Waza/xfwm4/bottom-active.xpm
-share/themes/Waza/xfwm4/bottom-inactive.xpm
-share/themes/Waza/xfwm4/bottom-left-active.xpm
-share/themes/Waza/xfwm4/bottom-left-inactive.xpm
-share/themes/Waza/xfwm4/bottom-right-active.xpm
-share/themes/Waza/xfwm4/bottom-right-inactive.xpm
-share/themes/Waza/xfwm4/close-active.png
-share/themes/Waza/xfwm4/close-active.xpm
-share/themes/Waza/xfwm4/close-inactive.png
-share/themes/Waza/xfwm4/close-inactive.xpm
-share/themes/Waza/xfwm4/close-pressed.png
-share/themes/Waza/xfwm4/close-pressed.xpm
-share/themes/Waza/xfwm4/hide-active.png
-share/themes/Waza/xfwm4/hide-active.xpm
-share/themes/Waza/xfwm4/hide-inactive.png
-share/themes/Waza/xfwm4/hide-inactive.xpm
-share/themes/Waza/xfwm4/hide-pressed.png
-share/themes/Waza/xfwm4/hide-pressed.xpm
-share/themes/Waza/xfwm4/left-active.xpm
-share/themes/Waza/xfwm4/left-inactive.xpm
-share/themes/Waza/xfwm4/maximize-active.png
-share/themes/Waza/xfwm4/maximize-active.xpm
-share/themes/Waza/xfwm4/maximize-inactive.png
-share/themes/Waza/xfwm4/maximize-inactive.xpm
-share/themes/Waza/xfwm4/maximize-pressed.png
-share/themes/Waza/xfwm4/maximize-pressed.xpm
-share/themes/Waza/xfwm4/maximize-toggled-active.png
-share/themes/Waza/xfwm4/maximize-toggled-active.xpm
-share/themes/Waza/xfwm4/maximize-toggled-inactive.png
-share/themes/Waza/xfwm4/maximize-toggled-inactive.xpm
-share/themes/Waza/xfwm4/maximize-toggled-pressed.png
-share/themes/Waza/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Waza/xfwm4/menu-active.png
-share/themes/Waza/xfwm4/menu-active.xpm
-share/themes/Waza/xfwm4/menu-inactive.png
-share/themes/Waza/xfwm4/menu-inactive.xpm
-share/themes/Waza/xfwm4/menu-pressed.png
-share/themes/Waza/xfwm4/menu-pressed.xpm
-share/themes/Waza/xfwm4/right-active.xpm
-share/themes/Waza/xfwm4/right-inactive.xpm
-share/themes/Waza/xfwm4/shade-active.png
-share/themes/Waza/xfwm4/shade-active.xpm
-share/themes/Waza/xfwm4/shade-inactive.png
-share/themes/Waza/xfwm4/shade-inactive.xpm
-share/themes/Waza/xfwm4/shade-pressed.png
-share/themes/Waza/xfwm4/shade-pressed.xpm
-share/themes/Waza/xfwm4/shade-toggled-active.png
-share/themes/Waza/xfwm4/shade-toggled-active.xpm
-share/themes/Waza/xfwm4/shade-toggled-inactive.png
-share/themes/Waza/xfwm4/shade-toggled-inactive.xpm
-share/themes/Waza/xfwm4/shade-toggled-pressed.png
-share/themes/Waza/xfwm4/shade-toggled-pressed.xpm
-share/themes/Waza/xfwm4/stick-active.png
-share/themes/Waza/xfwm4/stick-active.xpm
-share/themes/Waza/xfwm4/stick-inactive.png
-share/themes/Waza/xfwm4/stick-inactive.xpm
-share/themes/Waza/xfwm4/stick-pressed.png
-share/themes/Waza/xfwm4/stick-pressed.xpm
-share/themes/Waza/xfwm4/stick-toggled-active.png
-share/themes/Waza/xfwm4/stick-toggled-active.xpm
-share/themes/Waza/xfwm4/stick-toggled-inactive.png
-share/themes/Waza/xfwm4/stick-toggled-inactive.xpm
-share/themes/Waza/xfwm4/stick-toggled-pressed.png
-share/themes/Waza/xfwm4/stick-toggled-pressed.xpm
-share/themes/Waza/xfwm4/title-1-active.png
-share/themes/Waza/xfwm4/title-1-active.xpm
-share/themes/Waza/xfwm4/title-1-inactive.png
-share/themes/Waza/xfwm4/title-1-inactive.xpm
-share/themes/Waza/xfwm4/title-2-active.png
-share/themes/Waza/xfwm4/title-2-active.xpm
-share/themes/Waza/xfwm4/title-2-inactive.png
-share/themes/Waza/xfwm4/title-2-inactive.xpm
-share/themes/Waza/xfwm4/title-3-active.png
-share/themes/Waza/xfwm4/title-3-active.xpm
-share/themes/Waza/xfwm4/title-3-inactive.png
-share/themes/Waza/xfwm4/title-3-inactive.xpm
-share/themes/Waza/xfwm4/title-4-active.png
-share/themes/Waza/xfwm4/title-4-active.xpm
-share/themes/Waza/xfwm4/title-4-inactive.png
-share/themes/Waza/xfwm4/title-5-active.png
-share/themes/Waza/xfwm4/title-4-inactive.xpm
-share/themes/Waza/xfwm4/title-5-active.xpm
-share/themes/Waza/xfwm4/title-5-inactive.png
-share/themes/Waza/xfwm4/title-5-inactive.xpm
-share/themes/Waza/xfwm4/top-left-active.png
-share/themes/Waza/xfwm4/top-left-active.xpm
-share/themes/Waza/xfwm4/top-left-inactive.png
-share/themes/Waza/xfwm4/top-left-inactive.xpm
-share/themes/Waza/xfwm4/top-right-active.png
-share/themes/Waza/xfwm4/top-right-active.xpm
-share/themes/Waza/xfwm4/top-right-inactive.png
-share/themes/Waza/xfwm4/top-right-inactive.xpm
-share/themes/Wildbush/xfwm4/README
-share/themes/Wildbush/xfwm4/themerc
-share/themes/Wildbush/xfwm4/bottom-active.png
-share/themes/Wildbush/xfwm4/bottom-active.xpm
-share/themes/Wildbush/xfwm4/bottom-inactive.png
-share/themes/Wildbush/xfwm4/bottom-inactive.xpm
-share/themes/Wildbush/xfwm4/bottom-left-active.png
-share/themes/Wildbush/xfwm4/bottom-left-active.xpm
-share/themes/Wildbush/xfwm4/bottom-left-inactive.png
-share/themes/Wildbush/xfwm4/bottom-left-inactive.xpm
-share/themes/Wildbush/xfwm4/bottom-right-active.png
-share/themes/Wildbush/xfwm4/bottom-right-active.xpm
-share/themes/Wildbush/xfwm4/bottom-right-inactive.png
-share/themes/Wildbush/xfwm4/bottom-right-inactive.xpm
-share/themes/Wildbush/xfwm4/close-active.xpm
-share/themes/Wildbush/xfwm4/close-inactive.xpm
-share/themes/Wildbush/xfwm4/close-pressed.xpm
-share/themes/Wildbush/xfwm4/hide-active.xpm
-share/themes/Wildbush/xfwm4/hide-inactive.xpm
-share/themes/Wildbush/xfwm4/hide-pressed.xpm
-share/themes/Wildbush/xfwm4/left-active.png
-share/themes/Wildbush/xfwm4/left-active.xpm
-share/themes/Wildbush/xfwm4/left-inactive.png
-share/themes/Wildbush/xfwm4/left-inactive.xpm
-share/themes/Wildbush/xfwm4/maximize-active.xpm
-share/themes/Wildbush/xfwm4/maximize-inactive.xpm
-share/themes/Wildbush/xfwm4/maximize-pressed.xpm
-share/themes/Wildbush/xfwm4/maximize-toggled-active.xpm
-share/themes/Wildbush/xfwm4/maximize-toggled-inactive.xpm
-share/themes/Wildbush/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Wildbush/xfwm4/menu-active.xpm
-share/themes/Wildbush/xfwm4/menu-inactive.xpm
-share/themes/Wildbush/xfwm4/menu-pressed.xpm
-share/themes/Wildbush/xfwm4/right-active.png
-share/themes/Wildbush/xfwm4/right-active.xpm
-share/themes/Wildbush/xfwm4/right-inactive.png
-share/themes/Wildbush/xfwm4/right-inactive.xpm
-share/themes/Wildbush/xfwm4/shade-active.xpm
-share/themes/Wildbush/xfwm4/shade-inactive.xpm
-share/themes/Wildbush/xfwm4/shade-pressed.xpm
-share/themes/Wildbush/xfwm4/shade-toggled-active.xpm
-share/themes/Wildbush/xfwm4/shade-toggled-inactive.xpm
-share/themes/Wildbush/xfwm4/shade-toggled-pressed.xpm
-share/themes/Wildbush/xfwm4/stick-active.xpm
-share/themes/Wildbush/xfwm4/stick-inactive.xpm
-share/themes/Wildbush/xfwm4/stick-pressed.xpm
-share/themes/Wildbush/xfwm4/stick-toggled-active.xpm
-share/themes/Wildbush/xfwm4/stick-toggled-inactive.xpm
-share/themes/Wildbush/xfwm4/stick-toggled-pressed.xpm
-share/themes/Wildbush/xfwm4/title-1-active.png
-share/themes/Wildbush/xfwm4/title-1-active.xpm
-share/themes/Wildbush/xfwm4/title-1-inactive.png
-share/themes/Wildbush/xfwm4/title-1-inactive.xpm
-share/themes/Wildbush/xfwm4/title-2-active.png
-share/themes/Wildbush/xfwm4/title-2-active.xpm
-share/themes/Wildbush/xfwm4/title-2-inactive.png
-share/themes/Wildbush/xfwm4/title-2-inactive.xpm
-share/themes/Wildbush/xfwm4/title-3-active.png
-share/themes/Wildbush/xfwm4/title-3-active.xpm
-share/themes/Wildbush/xfwm4/title-3-inactive.png
-share/themes/Wildbush/xfwm4/title-3-inactive.xpm
-share/themes/Wildbush/xfwm4/title-4-active.png
-share/themes/Wildbush/xfwm4/title-4-active.xpm
-share/themes/Wildbush/xfwm4/title-4-inactive.png
-share/themes/Wildbush/xfwm4/title-4-inactive.xpm
-share/themes/Wildbush/xfwm4/title-5-active.png
-share/themes/Wildbush/xfwm4/title-5-active.xpm
-share/themes/Wildbush/xfwm4/title-5-inactive.png
-share/themes/Wildbush/xfwm4/title-5-inactive.xpm
-share/themes/Wildbush/xfwm4/top-left-active.png
-share/themes/Wildbush/xfwm4/top-left-active.xpm
-share/themes/Wildbush/xfwm4/top-left-inactive.png
-share/themes/Wildbush/xfwm4/top-left-inactive.xpm
-share/themes/Wildbush/xfwm4/top-right-active.png
-share/themes/Wildbush/xfwm4/top-right-active.xpm
-share/themes/Wildbush/xfwm4/top-right-inactive.png
-share/themes/Wildbush/xfwm4/top-right-inactive.xpm
+share/themes/Wallis/xfwm4/README
+share/themes/Wallis/xfwm4/bottom-active.png
+share/themes/Wallis/xfwm4/bottom-active.xpm
+share/themes/Wallis/xfwm4/bottom-inactive.png
+share/themes/Wallis/xfwm4/bottom-inactive.xpm
+share/themes/Wallis/xfwm4/bottom-left-active.png
+share/themes/Wallis/xfwm4/bottom-left-active.xpm
+share/themes/Wallis/xfwm4/bottom-left-inactive.png
+share/themes/Wallis/xfwm4/bottom-left-inactive.xpm
+share/themes/Wallis/xfwm4/bottom-right-active.png
+share/themes/Wallis/xfwm4/bottom-right-active.xpm
+share/themes/Wallis/xfwm4/bottom-right-inactive.png
+share/themes/Wallis/xfwm4/bottom-right-inactive.xpm
+share/themes/Wallis/xfwm4/close-active.png
+share/themes/Wallis/xfwm4/close-active.xpm
+share/themes/Wallis/xfwm4/close-inactive.png
+share/themes/Wallis/xfwm4/close-inactive.xpm
+share/themes/Wallis/xfwm4/close-pressed.png
+share/themes/Wallis/xfwm4/close-pressed.xpm
+share/themes/Wallis/xfwm4/hide-active.png
+share/themes/Wallis/xfwm4/hide-active.xpm
+share/themes/Wallis/xfwm4/hide-inactive.png
+share/themes/Wallis/xfwm4/hide-inactive.xpm
+share/themes/Wallis/xfwm4/hide-pressed.png
+share/themes/Wallis/xfwm4/hide-pressed.xpm
+share/themes/Wallis/xfwm4/left-active.png
+share/themes/Wallis/xfwm4/left-active.xpm
+share/themes/Wallis/xfwm4/left-inactive.png
+share/themes/Wallis/xfwm4/left-inactive.xpm
+share/themes/Wallis/xfwm4/maximize-active.png
+share/themes/Wallis/xfwm4/maximize-active.xpm
+share/themes/Wallis/xfwm4/maximize-inactive.png
+share/themes/Wallis/xfwm4/maximize-inactive.xpm
+share/themes/Wallis/xfwm4/maximize-pressed.png
+share/themes/Wallis/xfwm4/maximize-pressed.xpm
+share/themes/Wallis/xfwm4/maximize-toggled-active.png
+share/themes/Wallis/xfwm4/maximize-toggled-active.xpm
+share/themes/Wallis/xfwm4/maximize-toggled-inactive.png
+share/themes/Wallis/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Wallis/xfwm4/maximize-toggled-pressed.png
+share/themes/Wallis/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Wallis/xfwm4/menu-active.png
+share/themes/Wallis/xfwm4/menu-active.xpm
+share/themes/Wallis/xfwm4/menu-inactive.png
+share/themes/Wallis/xfwm4/menu-inactive.xpm
+share/themes/Wallis/xfwm4/menu-pressed.png
+share/themes/Wallis/xfwm4/menu-pressed.xpm
+share/themes/Wallis/xfwm4/right-active.png
+share/themes/Wallis/xfwm4/right-active.xpm
+share/themes/Wallis/xfwm4/right-inactive.png
+share/themes/Wallis/xfwm4/right-inactive.xpm
+share/themes/Wallis/xfwm4/shade-active.png
+share/themes/Wallis/xfwm4/shade-active.xpm
+share/themes/Wallis/xfwm4/shade-inactive.png
+share/themes/Wallis/xfwm4/shade-inactive.xpm
+share/themes/Wallis/xfwm4/shade-pressed.png
+share/themes/Wallis/xfwm4/shade-pressed.xpm
+share/themes/Wallis/xfwm4/shade-toggled-active.png
+share/themes/Wallis/xfwm4/shade-toggled-active.xpm
+share/themes/Wallis/xfwm4/shade-toggled-inactive.png
+share/themes/Wallis/xfwm4/shade-toggled-inactive.xpm
+share/themes/Wallis/xfwm4/shade-toggled-pressed.png
+share/themes/Wallis/xfwm4/shade-toggled-pressed.xpm
+share/themes/Wallis/xfwm4/stick-active.png
+share/themes/Wallis/xfwm4/stick-active.xpm
+share/themes/Wallis/xfwm4/stick-inactive.png
+share/themes/Wallis/xfwm4/stick-inactive.xpm
+share/themes/Wallis/xfwm4/stick-pressed.png
+share/themes/Wallis/xfwm4/stick-pressed.xpm
+share/themes/Wallis/xfwm4/stick-toggled-active.png
+share/themes/Wallis/xfwm4/stick-toggled-active.xpm
+share/themes/Wallis/xfwm4/stick-toggled-inactive.png
+share/themes/Wallis/xfwm4/stick-toggled-inactive.xpm
+share/themes/Wallis/xfwm4/stick-toggled-pressed.png
+share/themes/Wallis/xfwm4/stick-toggled-pressed.xpm
+share/themes/Wallis/xfwm4/themerc
+share/themes/Wallis/xfwm4/title-1-active.png
+share/themes/Wallis/xfwm4/title-1-active.xpm
+share/themes/Wallis/xfwm4/title-1-inactive.png
+share/themes/Wallis/xfwm4/title-1-inactive.xpm
+share/themes/Wallis/xfwm4/title-2-active.png
+share/themes/Wallis/xfwm4/title-2-active.xpm
+share/themes/Wallis/xfwm4/title-2-inactive.png
+share/themes/Wallis/xfwm4/title-2-inactive.xpm
+share/themes/Wallis/xfwm4/title-3-active.png
+share/themes/Wallis/xfwm4/title-3-active.xpm
+share/themes/Wallis/xfwm4/title-3-inactive.png
+share/themes/Wallis/xfwm4/title-3-inactive.xpm
+share/themes/Wallis/xfwm4/title-4-active.png
+share/themes/Wallis/xfwm4/title-4-active.xpm
+share/themes/Wallis/xfwm4/title-4-inactive.png
+share/themes/Wallis/xfwm4/title-4-inactive.xpm
+share/themes/Wallis/xfwm4/title-5-active.png
+share/themes/Wallis/xfwm4/title-5-active.xpm
+share/themes/Wallis/xfwm4/title-5-inactive.png
+share/themes/Wallis/xfwm4/title-5-inactive.xpm
+share/themes/Wallis/xfwm4/top-left-active.png
+share/themes/Wallis/xfwm4/top-left-active.xpm
+share/themes/Wallis/xfwm4/top-left-inactive.png
+share/themes/Wallis/xfwm4/top-left-inactive.xpm
+share/themes/Wallis/xfwm4/top-right-active.png
+share/themes/Wallis/xfwm4/top-right-active.xpm
+share/themes/Wallis/xfwm4/top-right-inactive.png
+share/themes/Wallis/xfwm4/top-right-inactive.xpm
share/xfce4/doc/C/images/compose_shortcut.png
share/xfce4/doc/C/images/decoration_style.png
share/xfce4/doc/C/images/focus.png
@@ -715,75 +1264,60 @@ share/xfce4/doc/fr/images/titlebar.png
share/xfce4/doc/fr/images/workspace_margins.png
share/xfce4/doc/fr/images/xfwm_workspaces.png
share/xfce4/doc/fr/xfwm4.html
-share/xfce4/doc/he/images/compose_shortcut.png
-share/xfce4/doc/he/images/decoration_style.png
-share/xfce4/doc/he/images/focus.png
-share/xfce4/doc/he/images/keyboard_shortcuts.png
-share/xfce4/doc/he/images/misc_wm_prefs.png
-share/xfce4/doc/he/images/titlebar.png
-share/xfce4/doc/he/images/workspace_margins.png
-share/xfce4/doc/he/images/xfwm_workspaces.png
-share/xfce4/doc/he/xfwm4.html
+share/xfce4/doc/it/images/compose_shortcut.png
+share/xfce4/doc/it/images/decoration_style.png
+share/xfce4/doc/it/images/focus.png
+share/xfce4/doc/it/images/keyboard_and_focus.png
+share/xfce4/doc/it/images/keyboard_shortcuts.png
+share/xfce4/doc/it/images/misc_wm_prefs.png
+share/xfce4/doc/it/images/titlebar.png
+share/xfce4/doc/it/images/workspace_margins.png
+share/xfce4/doc/it/images/xfwm_workspaces.png
+share/xfce4/doc/it/xfwm4.html
share/xfwm4/defaults
@dirrmtry lib/xfce4/mcs-plugins
@dirrmtry lib/xfce4
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@dirrmtry share/xfce4/doc/fr/images
@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/he/images
-@dirrmtry share/xfce4/doc/he
+@dirrmtry share/xfce4/doc/it/images
+@dirrmtry share/xfce4/doc/it
@dirrmtry share/xfce4/doc
@dirrmtry share/xfce4
+@dirrm share/themes/Daloa/xfwm4
+@dirrmtry share/themes/Daloa
@dirrm share/themes/Default/xfwm4
@dirrmtry share/themes/Default
@dirrm share/themes/Default-4.0/xfwm4
@dirrmtry share/themes/Default-4.0
-@dirrm share/themes/Opta/xfwm4
-@dirrmtry share/themes/Opta
-@dirrm share/themes/Symphony/xfwm4
-@dirrmtry share/themes/Symphony
+@dirrm share/themes/Default-4.2/xfwm4
+@dirrmtry share/themes/Default-4.2
+@dirrm share/themes/Katiola/xfwm4
+@dirrmtry share/themes/Katiola
+@dirrm share/themes/Kokodi/xfwm4
+@dirrmtry share/themes/Kokodi
+@dirrm share/themes/Moheli/xfwm4
+@dirrmtry share/themes/Moheli
+@dirrm share/themes/Sassandra/xfwm4
+@dirrmtry share/themes/Sassandra
+@dirrm share/themes/Stoneage/xfwm4
+@dirrmtry share/themes/Stoneage
@dirrm share/themes/Therapy/xfwm4
@dirrmtry share/themes/Therapy
@dirrm share/themes/Tyrex/xfwm4
@dirrmtry share/themes/Tyrex
-@dirrm share/themes/Waza/xfwm4
-@dirrmtry share/themes/Waza
-@dirrm share/themes/Wildbush/xfwm4
-@dirrmtry share/themes/Wildbush
+@dirrm share/themes/Wallis/xfwm4
+@dirrmtry share/themes/Wallis
@dirrmtry share/xfwm4/themes
@dirrmtry share/xfwm4
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sl/LC_MESSAGES
-@dirrmtry share/locale/sl
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/themes
+
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 9132ec8ab517..92651e97af68 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -6,8 +6,8 @@
#
PORTNAME= xfce
-PORTVERSION= 4.2.3.2
-PORTREVISION= 4
+PORTVERSION= 4.3.99.2
+PORTREVISION= 0
CATEGORIES= x11-wm xfce
MASTER_SITES= # empty
DISTFILES= # empty
@@ -21,15 +21,14 @@ RUN_DEPENDS= ${LOCALBASE}/lib/xfce4/mcs-plugins/ui_plugin.so:${PORTSDIR}/sysutil
xfce4-appfinder:${PORTSDIR}/misc/xfce4-appfinder \
xfce4-session:${PORTSDIR}/x11-wm/xfce4-session \
xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
- ${LOCALBASE}/lib/xfce4/panel-plugins/libtriggerlauncher.so:${PORTSDIR}/x11/xfce4-trigger-launcher \
xfdesktop:${PORTSDIR}/x11-wm/xfce4-desktop \
startxfce4:${PORTSDIR}/sysutils/xfce4-utils \
- xffm:${PORTSDIR}/x11-fm/xfce4-fm \
xfprint4:${PORTSDIR}/print/xfce4-print \
- xfce4-iconbox:${PORTSDIR}/misc/xfce4-iconbox \
- ${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libxfce.so:${PORTSDIR}/x11-themes/gtk-xfce-engine
+ ${LOCALBASE}/lib/gtk-2.0/2.10.0/engines/libxfce.so:${PORTSDIR}/x11-themes/gtk-xfce-engine \
+ thunar:${PORTSDIR}/x11-fm/thunar \
+ orage:${PORTSDIR}/deskutils/orage \
+ mousepad:${PORTSDIR}/editors/mousepad
-USE_GNOME= gtk20
NO_BUILD= yes
LATEST_LINK= xfce4
@@ -48,13 +47,12 @@ PLIST_SUB+= GDM="@comment "
.if !defined(WITHOUT_EXTRAS)
.if !defined(WITHOUT_THEMES)
-RUN_DEPENDS+= ${LOCALBASE}/share/xfce4/mime/Rodent.mime.xml:${PORTSDIR}/x11-themes/xfce4-icon-theme
+RUN_DEPENDS+= ${LOCALBASE}/share/xfce4/mime/Rodent.mime.xml:${PORTSDIR}/x11-themes/xfce4-icon-theme \
+ ${LOCALBASE}/share/themes/Xfce/xfwm4/themerc:${PORTSDIR}/misc/xfce4-wm-themes
.endif
.if !defined(WITHOUT_PLUGINS)
-RUN_DEPENDS+= ${LOCALBASE}/lib/xfce4/panel-plugins/libmixer.so:${PORTSDIR}/audio/xfce4-mixer \
- ${LOCALBASE}/lib/xfce4/panel-plugins/libsystray.so:${PORTSDIR}/x11-wm/xfce4-systray \
- xfce4-tips:${PORTSDIR}/games/xfce4-toys
+RUN_DEPENDS+= ${LOCALBASE}/lib/xfce4/modules/libxfce4mixer.so:${PORTSDIR}/audio/xfce4-mixer
.endif
.endif
diff --git a/x11-wm/xfce4/bsd.xfce.mk b/x11-wm/xfce4/bsd.xfce.mk
new file mode 100644
index 000000000000..29528d4e6b90
--- /dev/null
+++ b/x11-wm/xfce4/bsd.xfce.mk
@@ -0,0 +1,36 @@
+MASTER_SITES_XFCE= http://mocha.xfce.org/archive/%SUBDIR%/src/ \
+ http://www.us.xfce.org/archive/%SUBDIR%/src/ \
+ http://www.de.xfce.org/archive/%SUBDIR%/src/ \
+ http://www.ca-us.xfce.org/archive/%SUBDIR%/src/ \
+ http://www.p0llux.be/xfce/%SUBDIR%/src/
+
+MASTER_SITE_SUBDIR= xfce-4.4.0
+
+configenv_CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+
+libexo_LIB_DEPENDS= exo-0.3:${PORTSDIR}/x11/libexo
+
+libgui_LIB_DEPENDS= xfcegui4.6:${PORTSDIR}/x11-toolkits/libxfce4gui
+
+libutil_LIB_DEPENDS= xfce4util.4:${PORTSDIR}/x11/libxfce4util
+
+libmcs_LIB_DEPENDS= xfce4mcs-manager.3:${PORTSDIR}/x11/libxfce4mcs
+
+mcsmanager_BUILD_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
+mcsmanager_RUN_DEPENDS= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
+
+panel_BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+panel_RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+
+thunar_BUILD_DEPENDS= thunar:${PORTSDIR}/x11-fm/thunar
+thunar_RUN_DEPENDS= thunar:${PORTSDIR}/x11-fm/thunar
+
+wm_BUILD_DEPENDS= xfwm4:${PORTSDIR}/x11-wm/xfce4-wm
+wm_RUN_DEPENDS= xfwm4:${PORTSDIR}/x11-wm/xfce4-wm
+
+.for component in ${USE_XFCE}
+BUILD_DEPENDS+= ${${component}_BUILD_DEPENDS}
+LIB_DEPENDS+= ${${component}_LIB_DEPENDS}
+RUN_DEPENDS+= ${${component}_RUN_DEPENDS}
+CONFIGURE_ENV+= ${${component}_CONFIGURE_ENV}
+.endfor
diff --git a/x11-wm/xfce4/pkg-descr b/x11-wm/xfce4/pkg-descr
index e0d82837f724..484eeab7f17f 100644
--- a/x11-wm/xfce4/pkg-descr
+++ b/x11-wm/xfce4/pkg-descr
@@ -3,4 +3,4 @@ XFce 4 Desktop Environment
This package does not contain anything by itself - it is a "meta-port" that
depends on other XFce 4 packages.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 6df009dd0bbd..4c95e70110d2 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -3,30 +3,56 @@
# Whom: Matt Lancereau <ports@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/Terminal/Makefile,v 1.2 2006/10/08 00:20:31 mezz Exp $
#
PORTNAME= Terminal
-PORTVERSION= 0.2.4
-PORTREVISION= 3
-CATEGORIES= x11
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+PORTVERSION= 0.2.6
+PORTREVISION= 0
+CATEGORIES= x11 xfce
+MASTER_SITES= ${MASTER_SITES_XFCE}
+DIST_SUBDIR= xfce4
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= oliver@FreeBSD.org
COMMENT= Terminal emulator for the X windowing system
-LIB_DEPENDS= exo-0.3:${PORTSDIR}/x11/libexo \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
+LIB_DEPENDS= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
GNU_CONFIGURE= yes
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
USE_GMAKE= yes
-USE_GNOME= glib20 vte intlhack
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig vte
+USE_XFCE= configenv libexo libutil panel
+USE_XLIB= yes
+
+OPTIONS= DBUS "Enable D-BUS support" on \
+ STARTUP "Enable startup notification support" on
MAN1= Terminal.1
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+
+.if !defined(WITHOUT_DBUS)
+LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+CONFIGURE_ARGS+=--enable-dbus
+PLIST_SUB+= WITH_DBUS=""
+.else
+CONFIGURE_ARGS+=--disable-dbus
+PLIST_SUB+= WITH_DBUS="@comment "
+.endif
+
+.if !defined(WITHOUT_STARTUP)
+LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+CONFIGURE_ARGS+=--enable-startup-notification
+.else
+CONFIGURE_ARGS+=--disable-startup-notification
+.endif
+
post-patch:
.if defined(NOPORTDOCS)
@${REINPLACE_CMD} -e 's| doc[ ]*||' ${WRKSRC}/Makefile.in
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/Terminal/distinfo b/x11/Terminal/distinfo
index 61ba83082352..025c6591911b 100644
--- a/x11/Terminal/distinfo
+++ b/x11/Terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (Terminal-0.2.4.tar.gz) = 954727a2f5e54bd9ffcc3c69918efdef
-SHA256 (Terminal-0.2.4.tar.gz) = 221b1e028917487cfd8e4c3668893a436a12216a15e231292271477ee3b9cfd8
-SIZE (Terminal-0.2.4.tar.gz) = 1248992
+MD5 (xfce4/Terminal-0.2.6.tar.bz2) = ed091c02e002e2402e3203a2ab2f7c9a
+SHA256 (xfce4/Terminal-0.2.6.tar.bz2) = a1dcb1a86e79780acb1f3548466eba1fb03a9d9e9bd31e6ff3496b07504e53d8
+SIZE (xfce4/Terminal-0.2.6.tar.bz2) = 1582076
diff --git a/x11/Terminal/pkg-descr b/x11/Terminal/pkg-descr
index bb98ac08d0c3..4a02064836df 100644
--- a/x11/Terminal/pkg-descr
+++ b/x11/Terminal/pkg-descr
@@ -1,4 +1,4 @@
This is the Terminal emulator application. Terminal is a lightweight and
easy to use terminal emulator for the X windowing system.
-WWW: http://www.os-cillation.com
+WWW: http://www.os-cillation.com/
diff --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist
index c1e1fb3e156c..df3599687e8e 100644
--- a/x11/Terminal/pkg-plist
+++ b/x11/Terminal/pkg-plist
@@ -6,6 +6,8 @@ share/Terminal/Terminal.ui
share/Terminal/apps/balsa.desktop
share/Terminal/apps/epiphany.desktop
share/Terminal/apps/evolution.desktop
+share/Terminal/apps/exo-open-browser.desktop
+share/Terminal/apps/exo-open-mailer.desktop
share/Terminal/apps/firefox.desktop
share/Terminal/apps/galeon.desktop
share/Terminal/apps/kmail.desktop
@@ -17,6 +19,7 @@ share/Terminal/apps/mutt.desktop
share/Terminal/apps/opera-browser.desktop
share/Terminal/apps/opera-mailer.desktop
share/Terminal/apps/sensible-browser.desktop
+share/Terminal/apps/sylpheed-claws.desktop
share/Terminal/apps/thunderbird.desktop
share/applications/Terminal.desktop
%%PORTDOCS%%%%DOCSDIR%%/C/advanced.html
@@ -43,18 +46,106 @@ share/applications/Terminal.desktop
%%PORTDOCS%%%%DOCSDIR%%/C/preferred-applications.html
%%PORTDOCS%%%%DOCSDIR%%/C/support.html
%%PORTDOCS%%%%DOCSDIR%%/C/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-applications-dialog.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-applications-menu.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-choose-custom-webbrowser.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-compose-shortcut.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-edit-applications.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-edit-preferences.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-first-time.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-multiple-tabs.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-advanced.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-appearance.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-colors.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-set-title.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-general.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-preferences-shortcuts.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/images/terminal-toolbars.png
+%%PORTDOCS%%%%DOCSDIR%%/ja/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/preferred-applications.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/support.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/usage.html
%%PORTDOCS%%%%DOCSDIR%%/terminal.css
+share/icons/hicolor/16x16/stock/navigation/stock_terminal-closetab.png
+share/icons/hicolor/16x16/stock/navigation/stock_terminal-closewindow.png
+share/icons/hicolor/16x16/stock/navigation/stock_terminal-newtab.png
+share/icons/hicolor/16x16/stock/navigation/stock_terminal-newwindow.png
+share/icons/hicolor/16x16/stock/navigation/stock_terminal-reportbug.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-closetab.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-closewindow.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-fullscreen.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-newtab.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-newwindow.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-reportbug.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-showborders.png
+share/icons/hicolor/24x24/stock/navigation/stock_terminal-showmenu.png
share/icons/hicolor/48x48/apps/Terminal.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-advanced.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-appearance.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-colors.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-general.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-mailreader.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-shortcuts.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-webbrowser.png
share/icons/hicolor/scalable/apps/Terminal.svg
+share/locale/be/LC_MESSAGES/Terminal.mo
+share/locale/de/LC_MESSAGES/Terminal.mo
+share/locale/dz/LC_MESSAGES/Terminal.mo
+share/locale/en_GB/LC_MESSAGES/Terminal.mo
+share/locale/eo/LC_MESSAGES/Terminal.mo
+share/locale/es/LC_MESSAGES/Terminal.mo
+share/locale/eu/LC_MESSAGES/Terminal.mo
+share/locale/fr/LC_MESSAGES/Terminal.mo
+share/locale/he/LC_MESSAGES/Terminal.mo
+share/locale/hu/LC_MESSAGES/Terminal.mo
+share/locale/it/LC_MESSAGES/Terminal.mo
+share/locale/ja/LC_MESSAGES/Terminal.mo
+share/locale/lt/LC_MESSAGES/Terminal.mo
+share/locale/nl/LC_MESSAGES/Terminal.mo
+share/locale/pa/LC_MESSAGES/Terminal.mo
+share/locale/pt_BR/LC_MESSAGES/Terminal.mo
+share/locale/ru/LC_MESSAGES/Terminal.mo
+share/locale/sv/LC_MESSAGES/Terminal.mo
+share/locale/vi/LC_MESSAGES/Terminal.mo
+share/locale/ca/LC_MESSAGES/Terminal.mo
+share/locale/cs/LC_MESSAGES/Terminal.mo
+share/locale/el/LC_MESSAGES/Terminal.mo
+share/locale/fi/LC_MESSAGES/Terminal.mo
+share/locale/gl/LC_MESSAGES/Terminal.mo
+share/locale/ko/LC_MESSAGES/Terminal.mo
+share/locale/pl/LC_MESSAGES/Terminal.mo
+share/locale/sk/LC_MESSAGES/Terminal.mo
+share/locale/uk/LC_MESSAGES/Terminal.mo
+share/locale/zh_CN/LC_MESSAGES/Terminal.mo
+share/locale/zh_TW/LC_MESSAGES/Terminal.mo
share/pixmaps/terminal.xpm
@dirrmtry share/pixmaps
@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/24x24/stock/navigation
+@dirrmtry share/icons/hicolor/24x24/stock
+@dirrmtry share/icons/hicolor/24x24
@dirrmtry share/icons/hicolor
@dirrmtry icons
%%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/C
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrmtry share/applications
@dirrm share/Terminal/apps
@dirrm share/Terminal
+@dirrmtry share/icons/hicolor/16x16/stock/navigation
+@dirrmtry share/icons/hicolor/16x16/stock
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/48x48/stock/navigation
+@dirrmtry share/icons/hicolor/48x48/stock
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index 4418293328c7..2c7a1da72ea3 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -6,43 +6,72 @@
# $MCom: ports/x11/libexo/Makefile,v 1.1 2006/10/02 21:05:55 ahze Exp $
PORTNAME= libexo
-PORTVERSION= 0.3.0
-PORTREVISION= 3
+PORTVERSION= 0.3.2
CATEGORIES= x11 xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
DISTNAME= exo-${PORTVERSION}
+MASTER_SITES= ${MASTER_SITES_XFCE}
-MAINTAINER= ports@FreeBSD.org
+DIST_SUBDIR= xfce4
+PATCH_SITES= http://people.freebsd.org/~oliver/xfce/
+PATCHFILES= gcc295-libexo.patch
+
+MAINTAINER= oliver@FreeBSD.org
COMMENT= Terminal library, extensions to Xfce by os-cillation
-LIB_DEPENDS= xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui
+BUILD_DEPENDS= ${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/${DISTNAME}
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
-USE_GNOME= glib20
+INSTALLS_ICONS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
+USE_XFCE= configenv libutil mcsmanager
+USE_XLIB= yes
+
+OPTIONS= PYTHON "Enable Python support" off \
+ GTKDOC "Build with documentation" off \
+ MCS "Build with xfce4-mcs-manager support" on
+
+MAN1= exo-csource.1 exo-open.1
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
.if defined(WITH_GTKDOC)
BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc
CONFIGURE_ARGS+=--enable-gtk-doc
+PLIST_SUB+= GTK_DOC=""
.else
CONFIGURE_ARGS+=--disable-gtk-doc
+PLIST_SUB+= GTK_DOC="@comment "
.endif
.if defined(WITH_PYTHON)
CONFIGURE_ARGS+=--enable-python
USE_PYTHON= yes
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk
+RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
PLIST_SUB+= PYTHON=""
.else
CONFIGURE_ARGS+=--disable-python
PLIST_SUB+= PYTHON="@comment "
.endif
+.if !defined(WITHOUT_MCS)
+CONFIGURE_ARGS+=--enable-mcs-plugin
+BUILD_DEPENDS+= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
+RUN_DEPENDS+= xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
+PLIST_SUB+= MCS_MANAGER=""
+.else
+CONFIGURE_ARGS+=--disable-mcs-plugin
+PLIST_SUB+= MCS_MANAGER="@comment "
+.endif
+
post-patch:
- @${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
- ${WRKSRC}/exo/Makefile.in
+ @${REINPLACE_CMD} -e 's|FALSE;;|FALSE;|' ${WRKSRC}/exo/exo-icon-view.c
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/libexo/distinfo b/x11/libexo/distinfo
index 2c8673957f4d..25a994094d6a 100644
--- a/x11/libexo/distinfo
+++ b/x11/libexo/distinfo
@@ -1,3 +1,6 @@
-MD5 (exo-0.3.0.tar.gz) = 078d50c378064823696995f38e759b08
-SHA256 (exo-0.3.0.tar.gz) = 53f1a0ee85d01f597c5be9abed050960ad397586c1609780d1aaa766af694ed1
-SIZE (exo-0.3.0.tar.gz) = 541683
+MD5 (xfce4/exo-0.3.2.tar.bz2) = 8b73acc98d0938d1193b31316823b6db
+SHA256 (xfce4/exo-0.3.2.tar.bz2) = 632834506cf7768f9541286dbd90b9aa835bd3bb1ef1a022f2bcb99812945c3f
+SIZE (xfce4/exo-0.3.2.tar.bz2) = 1121928
+MD5 (xfce4/gcc295-libexo.patch) = 5b70891dfe9b9c68a9ae68759f1c7172
+SHA256 (xfce4/gcc295-libexo.patch) = dd79882498b45b9bfe2f1573b04eb2764588d94e74e526f2f0418441e21cf83f
+SIZE (xfce4/gcc295-libexo.patch) = 266
diff --git a/x11/libexo/pkg-descr b/x11/libexo/pkg-descr
index c0770bdcf806..b157cfa07232 100644
--- a/x11/libexo/pkg-descr
+++ b/x11/libexo/pkg-descr
@@ -1,3 +1,3 @@
Terminal library, extensions to Xfce by os-cillation
-WWW: http://www.os-cillation.com
+WWW: http://www.os-cillation.com/
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index a3fcb008ebe6..5622763f768b 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -1,26 +1,49 @@
+bin/exo-csource
+bin/exo-desktop-item-edit
+bin/exo-eject
+bin/exo-mount
+bin/exo-open
+bin/exo-preferred-applications
+bin/exo-unmount
+etc/xdg/xfce4/helpers.rc
include/exo-0.3/exo/exo-binding.h
include/exo-0.3/exo/exo-cell-renderer-ellipsized-text.h
+include/exo-0.3/exo/exo-cell-renderer-icon.h
include/exo-0.3/exo/exo-config.h
include/exo-0.3/exo/exo-ellipsized-label.h
include/exo-0.3/exo/exo-enum-types.h
+include/exo-0.3/exo/exo-execute.h
include/exo-0.3/exo/exo-gdk-pixbuf-extensions.h
include/exo-0.3/exo/exo-gobject-extensions.h
include/exo-0.3/exo/exo-gtk-extensions.h
include/exo-0.3/exo/exo-icon-bar.h
+include/exo-0.3/exo/exo-icon-chooser-dialog.h
include/exo-0.3/exo/exo-icon-view.h
include/exo-0.3/exo/exo-md5.h
+include/exo-0.3/exo/exo-mount-point.h
include/exo-0.3/exo/exo-pango-extensions.h
include/exo-0.3/exo/exo-string.h
include/exo-0.3/exo/exo-toolbars-editor-dialog.h
include/exo-0.3/exo/exo-toolbars-editor.h
include/exo-0.3/exo/exo-toolbars-model.h
include/exo-0.3/exo/exo-toolbars-view.h
+include/exo-0.3/exo/exo-tree-view.h
+include/exo-0.3/exo/exo-url.h
+include/exo-0.3/exo/exo-utils.h
+include/exo-0.3/exo/exo-wrap-table.h
include/exo-0.3/exo/exo-xsession-client.h
include/exo-0.3/exo/exo.h
+include/exo-0.3/exo-hal/exo-hal.h
lib/libexo-0.3.a
lib/libexo-0.3.la
lib/libexo-0.3.so
-lib/libexo-0.3.so.0
+lib/libexo-0.3.so.4
+lib/libexo-hal-0.3.a
+lib/libexo-hal-0.3.la
+lib/libexo-hal-0.3.so
+lib/libexo-hal-0.3.so.4
+%%PYTHON%%lib/python2.4/site-packages/exo-0.3/_exo.a
+%%PYTHON%%lib/python2.4/site-packages/exo-0.3/_exo.la
%%PYTHON%%lib/python2.4/site-packages/exo-0.3/_exo.so
%%PYTHON%%lib/python2.4/site-packages/exo-0.3/exo/__init__.py
%%PYTHON%%lib/python2.4/site-packages/exo-0.3/exo/__init__.pyc
@@ -28,49 +51,166 @@ lib/libexo-0.3.so.0
%%PYTHON%%lib/python2.4/site-packages/pyexo.py
%%PYTHON%%lib/python2.4/site-packages/pyexo.pyc
%%PYTHON%%lib/python2.4/site-packages/pyexo.pyo
+%%MCS_MANAGER%%lib/xfce4/mcs-plugins/exo-preferred-applications-settings.a
+%%MCS_MANAGER%%lib/xfce4/mcs-plugins/exo-preferred-applications-settings.la
+%%MCS_MANAGER%%lib/xfce4/mcs-plugins/exo-preferred-applications-settings.so
libdata/pkgconfig/exo-0.3.pc
-share/gtk-doc/html/exo/ExoCellRendererEllipsizedText.html
-share/gtk-doc/html/exo/ExoEllipsizedLabel.html
-share/gtk-doc/html/exo/ExoIconBar.html
-share/gtk-doc/html/exo/ExoIconView.html
-share/gtk-doc/html/exo/ExoToolbarsEditor.html
-share/gtk-doc/html/exo/ExoToolbarsEditorDialog.html
-share/gtk-doc/html/exo/ExoToolbarsModel.html
-share/gtk-doc/html/exo/ExoToolbarsView.html
-share/gtk-doc/html/exo/ExoXsessionClient.html
-share/gtk-doc/html/exo/exo-Binding-Properties-Functions.html
-share/gtk-doc/html/exo/exo-Extensions-to-GObject.html
-share/gtk-doc/html/exo/exo-Extensions-to-Pango.html
-share/gtk-doc/html/exo/exo-Extensions-to-gdk-pixbuf.html
-share/gtk-doc/html/exo/exo-MD5-functions.html
-share/gtk-doc/html/exo/exo-String-Utility-Functions.html
-share/gtk-doc/html/exo/exo-Version-Information.html
-share/gtk-doc/html/exo/exo-extensions.html
-share/gtk-doc/html/exo/exo-miscelleanous.html
-share/gtk-doc/html/exo/exo-overview.html
-share/gtk-doc/html/exo/exo-toolbars.html
-share/gtk-doc/html/exo/exo-widgets.html
-share/gtk-doc/html/exo/exo.devhelp
-share/gtk-doc/html/exo/home.png
-share/gtk-doc/html/exo/index.html
-share/gtk-doc/html/exo/index.sgml
-share/gtk-doc/html/exo/ix01.html
-share/gtk-doc/html/exo/left.png
-share/gtk-doc/html/exo/right.png
-share/gtk-doc/html/exo/style.css
-share/gtk-doc/html/exo/up.png
+libdata/pkgconfig/exo-hal-0.3.pc
+libexec/exo-compose-mail-0.3
+libexec/exo-helper-0.3
+share/applications/exo-preferred-applications.desktop
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoCellRendererEllipsizedText.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoEllipsizedLabel.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoIconBar.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoIconView.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoToolbarsEditor.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoToolbarsEditorDialog.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoToolbarsModel.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoToolbarsView.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoTreeView.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoWrapTable.html
+%%GTK_DOC%%share/gtk-doc/html/exo/ExoXsessionClient.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Binding-Properties-Functions.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Executing-Applications.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Extensions-to-GObject.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Extensions-to-Gtk.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Extensions-to-Pango.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Extensions-to-gdk-pixbuf.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-MD5-functions.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Miscellaneous-Utility-Functions.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Opening-URLs.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-String-Utility-Functions.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-Version-Information.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-csource.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-extensions.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-miscelleanous.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-overview.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-toolbars.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-tools.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo-widgets.html
+%%GTK_DOC%%share/gtk-doc/html/exo/exo.devhelp
+%%GTK_DOC%%share/gtk-doc/html/exo/home.png
+%%GTK_DOC%%share/gtk-doc/html/exo/index.html
+%%GTK_DOC%%share/gtk-doc/html/exo/index.sgml
+%%GTK_DOC%%share/gtk-doc/html/exo/ix01.html
+%%GTK_DOC%%share/gtk-doc/html/exo/left.png
+%%GTK_DOC%%share/gtk-doc/html/exo/right.png
+%%GTK_DOC%%share/gtk-doc/html/exo/style.css
+%%GTK_DOC%%share/gtk-doc/html/exo/up.png
+share/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
+share/icons/hicolor/48x48/apps/applications-internet.png
+share/icons/hicolor/48x48/apps/applications-other.png
+share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
+share/locale/be/LC_MESSAGES/libexo-0.3.mo
+share/locale/ca/LC_MESSAGES/libexo-0.3.mo
+share/locale/cy/LC_MESSAGES/libexo-0.3.mo
+share/locale/cs/LC_MESSAGES/libexo-0.3.mo
+share/locale/de/LC_MESSAGES/libexo-0.3.mo
+share/locale/dz/LC_MESSAGES/libexo-0.3.mo
+share/locale/el/LC_MESSAGES/libexo-0.3.mo
+share/locale/en_GB/LC_MESSAGES/libexo-0.3.mo
+share/locale/es/LC_MESSAGES/libexo-0.3.mo
+share/locale/et/LC_MESSAGES/libexo-0.3.mo
+share/locale/eu/LC_MESSAGES/libexo-0.3.mo
+share/locale/fi/LC_MESSAGES/libexo-0.3.mo
+share/locale/fr/LC_MESSAGES/libexo-0.3.mo
+share/locale/gl/LC_MESSAGES/libexo-0.3.mo
+share/locale/he/LC_MESSAGES/libexo-0.3.mo
+share/locale/hu/LC_MESSAGES/libexo-0.3.mo
+share/locale/it/LC_MESSAGES/libexo-0.3.mo
+share/locale/ja/LC_MESSAGES/libexo-0.3.mo
+share/locale/ka/LC_MESSAGES/libexo-0.3.mo
+share/locale/lt/LC_MESSAGES/libexo-0.3.mo
+share/locale/mk/LC_MESSAGES/libexo-0.3.mo
+share/locale/nl/LC_MESSAGES/libexo-0.3.mo
+share/locale/pa/LC_MESSAGES/libexo-0.3.mo
+share/locale/pl/LC_MESSAGES/libexo-0.3.mo
+share/locale/pt_BR/LC_MESSAGES/libexo-0.3.mo
+share/locale/ro/LC_MESSAGES/libexo-0.3.mo
+share/locale/ru/LC_MESSAGES/libexo-0.3.mo
+share/locale/sv/LC_MESSAGES/libexo-0.3.mo
+share/pixmaps/exo-0.3/exo-thumbnail-frame.png
%%PYTHON%%share/pygtk/2.0/defs/exo-0.3/exo.defs
-%%PYTHON%%@dirrm share/pygtk/2.0/defs/exo-0.3
+share/xfce4/doc/C/exo-preferred-applications.html
+share/xfce4/doc/C/images/exo-preferred-applications-internet.png
+share/xfce4/doc/C/images/exo-preferred-applications-utilities.png
+share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-custom.png
+share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-menu.png
+share/xfce4/doc/fr/exo-preferred-applications.html
+share/xfce4/doc/fr/images/exo-preferred-applications-internet.png
+share/xfce4/doc/fr/images/exo-preferred-applications-utilities.png
+share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-custom.png
+share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-menu.png
+share/xfce4/doc/ja/exo-preferred-applications.html
+share/xfce4/doc/ja/images/exo-preferred-applications-internet.png
+share/xfce4/doc/ja/images/exo-preferred-applications-utilities.png
+share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-custom.png
+share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-menu.png
+share/xfce4/helpers/Terminal.desktop
+share/xfce4/helpers/aterm.desktop
+share/xfce4/helpers/balsa.desktop
+share/xfce4/helpers/debian-sensible-browser.desktop
+share/xfce4/helpers/debian-x-terminal-emulator.desktop
+share/xfce4/helpers/encompass.desktop
+share/xfce4/helpers/epiphany.desktop
+share/xfce4/helpers/eterm.desktop
+share/xfce4/helpers/evolution.desktop
+share/xfce4/helpers/firefox.desktop
+share/xfce4/helpers/galeon.desktop
+share/xfce4/helpers/gnome-terminal.desktop
+share/xfce4/helpers/kmail.desktop
+share/xfce4/helpers/konqueror.desktop
+share/xfce4/helpers/links.desktop
+share/xfce4/helpers/lynx.desktop
+share/xfce4/helpers/mozilla-browser.desktop
+share/xfce4/helpers/mozilla-mailer.desktop
+share/xfce4/helpers/mutt.desktop
+share/xfce4/helpers/netscape-navigator.desktop
+share/xfce4/helpers/nxterm.desktop
+share/xfce4/helpers/opera-browser.desktop
+share/xfce4/helpers/opera-mailer.desktop
+share/xfce4/helpers/sylpheed-claws.desktop
+share/xfce4/helpers/sylpheed.desktop
+share/xfce4/helpers/thunderbird.desktop
+share/xfce4/helpers/urxvt.desktop
+share/xfce4/helpers/w3m.desktop
+share/xfce4/helpers/xterm.desktop
+@dirrmtry etc/xdg/xfce4
+@dirrmtry etc/xdg
@dirrmtry share/gtk-doc/html
-%%PYTHON%%@dirrmtry share/pygtk/2.0/defs
-%%PYTHON%%@dirrmtry share/pygtk/2.0
-%%PYTHON%%@dirrmtry share/pygtk
-@dirrm share/gtk-doc/html/exo
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
+@dirrm include/exo-0.3/exo
+@dirrm include/exo-0.3/exo-hal
+@dirrm include/exo-0.3
+@dirrmtry lib/xfce4/mcs-plugins
+@dirrmtry lib/xfce4
+%%GTK_DOC%%@dirrm share/gtk-doc/html/exo
+%%GTK_DOC%%@dirrmtry share/gtk-doc/html
+%%GTK_DOC%%@dirrmtry share/gtk-doc
+@dirrmtry share/applications
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
%%PYTHON%%@dirrm lib/python2.4/site-packages/exo-0.3/exo
%%PYTHON%%@dirrm lib/python2.4/site-packages/exo-0.3
%%PYTHON%%@dirrmtry lib/python2.4/site-packages
%%PYTHON%%@dirrmtry lib/python2.4
-@dirrm include/exo-0.3/exo
-@dirrm include/exo-0.3
+%%PYTHON%%@dirrm share/pygtk/2.0/defs/exo-0.3
+%%PYTHON%%@dirrmtry share/pygtk/2.0/defs
+%%PYTHON%%@dirrmtry share/pygtk/2.0
+%%PYTHON%%@dirrmtry share/pygtk
+@dirrm share/pixmaps/exo-0.3
+@dirrmtry share/xfce4/doc/C/images
+@dirrmtry share/xfce4/doc/C
+@dirrmtry share/xfce4/doc/fr/images
+@dirrmtry share/xfce4/doc/fr
+@dirrmtry share/xfce4/doc/ja/images
+@dirrmtry share/xfce4/doc/ja
+@dirrmtry share/xfce4/doc
+@dirrmtry share/xfce4/helpers
+@dirrmtry share/xfce4
+@dirrmtry share/pixmaps
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 58b9933a4037..9b3f3e64c4f0 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -6,32 +6,44 @@
#
PORTNAME= libxfce4mcs
-PORTVERSION= 4.2.3
-PORTREVISION= 3
+PORTVERSION= 4.4.0
CATEGORIES= x11 xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 settings management library used by most XFce 4 modules
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util
-
-USE_XLIB= yes
-USE_GNOME= glib20 gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB= yes
NO_FILTER_SHLIBS= yes
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= glib20 gnomehack gnometarget pkgconfig
+USE_LDCONFIG= yes
+USE_XFCE= configenv libutil
+USE_XLIB= yes
+
+OPTIONS= GTKDOC "install the library documentation" off \
+ STARTUP "Enable startup notification support" on
+
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
.if defined(WITH_GTKDOC)
BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc
CONFIGURE_ARGS+=--enable-gtk-doc
+PLIST_SUB+= GTK_DOC=""
.else
CONFIGURE_ARGS+=--disable-gtk-doc
+PLIST_SUB+= GTK_DOC="@comment "
+.endif
+
+.if !defined(WITHOUT_STARTUP)
+LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+CONFIGURE_ARGS+=--enable-startup-notification
+.else
+CONFIGURE_ARGS+=--disable-startup-notification
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/libxfce4mcs/distinfo b/x11/libxfce4mcs/distinfo
index 0ba8e8711b60..dd0028490e9b 100644
--- a/x11/libxfce4mcs/distinfo
+++ b/x11/libxfce4mcs/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfce4mcs-4.2.3.tar.gz) = b3244024bea7f5756f4c0f541bc24128
-SHA256 (xfce4/libxfce4mcs-4.2.3.tar.gz) = 52a3a3b034cb67de224252cd905763277080f9a068f32a879f6f30e18e5fc8dc
-SIZE (xfce4/libxfce4mcs-4.2.3.tar.gz) = 384594
+MD5 (xfce4/libxfce4mcs-4.4.0.tar.bz2) = 224863509b7f546fa1ca198374c424d3
+SHA256 (xfce4/libxfce4mcs-4.4.0.tar.bz2) = 35f2cd224f98d3c296d8f4a6299a1e99d09a841d65b9b3431edca102c15788fa
+SIZE (xfce4/libxfce4mcs-4.4.0.tar.bz2) = 259923
diff --git a/x11/libxfce4mcs/pkg-descr b/x11/libxfce4mcs/pkg-descr
index 7cc53b9ab7a9..6fc74612b2f8 100644
--- a/x11/libxfce4mcs/pkg-descr
+++ b/x11/libxfce4mcs/pkg-descr
@@ -1,3 +1,3 @@
XFce 4 settings management library used by most XFce 4 modules.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/x11/libxfce4mcs/pkg-plist b/x11/libxfce4mcs/pkg-plist
index bee51b11e758..913ac3aa4e09 100644
--- a/x11/libxfce4mcs/pkg-plist
+++ b/x11/libxfce4mcs/pkg-plist
@@ -2,14 +2,12 @@ include/xfce4/libxfce4mcs/mcs-client.h
include/xfce4/libxfce4mcs/mcs-client-enum-types.h
include/xfce4/libxfce4mcs/mcs-common.h
include/xfce4/libxfce4mcs/mcs-manager.h
-lib/libxfce4mcs-client.a
lib/libxfce4mcs-client.la
lib/libxfce4mcs-client.so
-lib/libxfce4mcs-client.so.2
-lib/libxfce4mcs-manager.a
+lib/libxfce4mcs-client.so.3
lib/libxfce4mcs-manager.la
lib/libxfce4mcs-manager.so
-lib/libxfce4mcs-manager.so.2
+lib/libxfce4mcs-manager.so.3
libdata/pkgconfig/libxfce4mcs-manager-1.0.pc
libdata/pkgconfig/libxfce4mcs-client-1.0.pc
share/gtk-doc/html/libxfce4mcs/ch01.html
@@ -22,6 +20,7 @@ share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-common.html
share/gtk-doc/html/libxfce4mcs/libxfce4mcs-mcs-manager.html
share/gtk-doc/html/libxfce4mcs/libxfce4mcs.devhelp
share/gtk-doc/html/libxfce4mcs/right.png
+share/gtk-doc/html/libxfce4mcs/style.css
share/gtk-doc/html/libxfce4mcs/up.png
@dirrm include/xfce4/libxfce4mcs
@dirrm share/gtk-doc/html/libxfce4mcs
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index cc734a398c8d..457c87d40e9d 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -6,29 +6,31 @@
#
PORTNAME= libxfce4util
-PORTVERSION= 4.2.3.2
-PORTREVISION= 2
+PORTVERSION= 4.4.0
CATEGORIES= x11 xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.p0llux.be/xfce/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
+MASTER_SITES= ${MASTER_SITES_XFCE}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 library with non-graphical helper functions
-USE_GNOME= glib20 gnomehack
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB= yes
NO_FILTER_SHLIBS= yes
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GNOME= glib20 gnomehack gnometarget pkgconfig
+USE_LDCONFIG= yes
+USE_XFCE= configenv
.if defined(WITH_GTKDOC)
BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc
CONFIGURE_ARGS+=--enable-gtk-doc
+PLIST_SUB+= GTK_DOC=""
.else
CONFIGURE_ARGS+=--disable-gtk-doc
+PLIST_SUB+= GTK_DOC="@comment "
.endif
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 971b1aa8bf10..0f0186f82fea 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfce4util-4.2.3.2.tar.gz) = 2d312ba48da612501d6776f8b4a65797
-SHA256 (xfce4/libxfce4util-4.2.3.2.tar.gz) = 344e0dec9183fbc90f38ed887f0ce4fab82d50c3076ae92bd27086f3fa6d7170
-SIZE (xfce4/libxfce4util-4.2.3.2.tar.gz) = 469106
+MD5 (xfce4/libxfce4util-4.4.0.tar.bz2) = 543fb8efe96d6e83f897a7c64c48e9e6
+SHA256 (xfce4/libxfce4util-4.4.0.tar.bz2) = 47ca0ae8dd2bc65f05603ca2a1c37ad7c8a37e5dbeec923b480b77e8212d1786
+SIZE (xfce4/libxfce4util-4.4.0.tar.bz2) = 326862
diff --git a/x11/libxfce4util/pkg-descr b/x11/libxfce4util/pkg-descr
index 5cca69a33dd7..bee6f4f5bd4d 100644
--- a/x11/libxfce4util/pkg-descr
+++ b/x11/libxfce4util/pkg-descr
@@ -1,3 +1,3 @@
XFce 4 library with non-graphical helper functions.
-WWW: http://www.xfce.org
+WWW: http://www.xfce.org/
diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist
index ed26fb17971f..e415b223174a 100644
--- a/x11/libxfce4util/pkg-plist
+++ b/x11/libxfce4util/pkg-plist
@@ -2,20 +2,23 @@ include/xfce4/libxfce4util/debug.h
include/xfce4/libxfce4util/i18n.h
include/xfce4/libxfce4util/libxfce4util.h
include/xfce4/libxfce4util/libxfce4util-config.h
+include/xfce4/libxfce4util/libxfce4util-enum-types.h
include/xfce4/libxfce4util/utf8.h
include/xfce4/libxfce4util/util.h
-include/xfce4/libxfce4util/util-enum-types.h
include/xfce4/libxfce4util/xfce-desktopentry.h
include/xfce4/libxfce4util/xfce-fileutils.h
include/xfce4/libxfce4util/xfce-generics.h
+include/xfce4/libxfce4util/xfce-i18n.h
include/xfce4/libxfce4util/xfce-kiosk.h
+include/xfce4/libxfce4util/xfce-license.h
include/xfce4/libxfce4util/xfce-miscutils.h
include/xfce4/libxfce4util/xfce-rc.h
include/xfce4/libxfce4util/xfce-resource.h
+include/xfce4/libxfce4util/xfce-utf8.h
lib/libxfce4util.a
lib/libxfce4util.la
lib/libxfce4util.so
-lib/libxfce4util.so.1
+lib/libxfce4util.so.4
libdata/pkgconfig/libxfce4util-1.0.pc
sbin/xfce4-kiosk-query
share/gtk-doc/html/libxfce4util/home.png
@@ -28,9 +31,11 @@ share/gtk-doc/html/libxfce4util/libxfce4util-Internationalisation.html
share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Standard-Macros.html
share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
+share/gtk-doc/html/libxfce4util/style.css
share/gtk-doc/html/libxfce4util/up.png
+share/gtk-doc/html/libxfce4util/libxfce4util-Software-Licenses.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Version-Information.html
share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
share/gtk-doc/html/libxfce4util/libxfce4util-core.html
@@ -40,14 +45,27 @@ share/gtk-doc/html/libxfce4util/libxfce4util-utilities.html
share/gtk-doc/html/libxfce4util/libxfce4util.devhelp
share/gtk-doc/html/libxfce4util/reference.html
share/gtk-doc/html/libxfce4util/right.png
-share/xfce4/m4/X11.m4
-share/xfce4/m4/debug.m4
-share/xfce4/m4/depends.m4
-share/xfce4/m4/i18n.m4
+share/locale/cs/LC_MESSAGES/libxfce4util.mo
+share/locale/cy/LC_MESSAGES/libxfce4util.mo
+share/locale/de/LC_MESSAGES/libxfce4util.mo
+share/locale/dz/LC_MESSAGES/libxfce4util.mo
+share/locale/fr/LC_MESSAGES/libxfce4util.mo
+share/locale/he/LC_MESSAGES/libxfce4util.mo
+share/locale/ja/LC_MESSAGES/libxfce4util.mo
+share/locale/ka/LC_MESSAGES/libxfce4util.mo
+share/locale/lt/LC_MESSAGES/libxfce4util.mo
+share/locale/mk/LC_MESSAGES/libxfce4util.mo
+share/locale/nl/LC_MESSAGES/libxfce4util.mo
+share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo
+share/locale/ca/LC_MESSAGES/libxfce4util.mo
+share/locale/fi/LC_MESSAGES/libxfce4util.mo
+share/locale/gl/LC_MESSAGES/libxfce4util.mo
+share/locale/ko/LC_MESSAGES/libxfce4util.mo
+share/locale/pl/LC_MESSAGES/libxfce4util.mo
+share/locale/uk/LC_MESSAGES/libxfce4util.mo
@dirrm include/xfce4/libxfce4util
@dirrmtry include/xfce4
@dirrm share/gtk-doc/html/libxfce4util
@dirrmtry share/gtk-doc/html
@dirrmtry share/gtk-doc
-@dirrm share/xfce4/m4
@dirrmtry share/xfce4
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 7bd939a35201..9fa4e7b4979c 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -6,26 +6,22 @@
#
PORTNAME= xfce4-clipman-plugin
-PORTVERSION= 0.4.1
-PORTREVISION= 4
+PORTVERSION= 0.8.0
CATEGORIES= x11 xfce
-MASTER_SITES= ${MASTER_SITE_BERLIOS}
-MASTER_SITE_SUBDIR= xfce-goodies
+MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
MAINTAINER= r.c.ladan@gmail.com
COMMENT= XFce 4 clipboard module for xfce4-panel
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- xml2.5:${PORTSDIR}/textproc/libxml2 \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME= gtk20
GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
+USE_BZIP2= yes
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv panel
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/xfce4-clipman-plugin/distinfo b/x11/xfce4-clipman-plugin/distinfo
index ba6a217998bd..780e90551408 100644
--- a/x11/xfce4-clipman-plugin/distinfo
+++ b/x11/xfce4-clipman-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-clipman-plugin-0.4.1.tar.gz) = 664f6ca8500d8f240289c27d7bf4f419
-SHA256 (xfce4/xfce4-clipman-plugin-0.4.1.tar.gz) = c120a80772914ea6a5da661efb8a2473bd7919d5a530867d6a4f12b9706a9df4
-SIZE (xfce4/xfce4-clipman-plugin-0.4.1.tar.gz) = 305762
+MD5 (xfce4/xfce4-clipman-plugin-0.8.0.tar.bz2) = 808d4e8bc6e9a9d4ed30124fb2236c1d
+SHA256 (xfce4/xfce4-clipman-plugin-0.8.0.tar.bz2) = 49e6c6160ae4c4123836fd1b8e24edff567cd3345e4b3f9e847299733888a1ca
+SIZE (xfce4/xfce4-clipman-plugin-0.8.0.tar.bz2) = 193458
diff --git a/x11/xfce4-clipman-plugin/pkg-descr b/x11/xfce4-clipman-plugin/pkg-descr
index 242dea8663a1..03231149cb8b 100644
--- a/x11/xfce4-clipman-plugin/pkg-descr
+++ b/x11/xfce4-clipman-plugin/pkg-descr
@@ -3,4 +3,4 @@ for the panel. It now includes a "Clear clipboard" option, and a drag-and-drop
paste feature contributed by Andre Lerche.
Author: Eduard Roccatello <master@spine-group.org>
-WWW: http://xfce-goodies.berlios.de/
+WWW: http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin
diff --git a/x11/xfce4-clipman-plugin/pkg-plist b/x11/xfce4-clipman-plugin/pkg-plist
index 4681d71322f4..7c2ba26b8c30 100644
--- a/x11/xfce4-clipman-plugin/pkg-plist
+++ b/x11/xfce4-clipman-plugin/pkg-plist
@@ -1,5 +1,16 @@
-@comment $FreeBSD$
-lib/xfce4/panel-plugins/libclipman.a
-lib/xfce4/panel-plugins/libclipman.la
-lib/xfce4/panel-plugins/libclipman.so
-@dirrmtry lib/xfce4/panel-plugins
+libexec/xfce4/panel-plugins/xfce4-clipman-plugin
+share/locale/ca/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/cs/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/de/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/eu/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/fr/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/hu/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/ja/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/pl/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-clipman-plugin.mo
+share/xfce4/panel-plugins/clipman.desktop
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
+@dirrmtry libexec/xfce4/panel-plugins
+@dirrmtry libexec/xfce4
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 518bb3f51bad..a1778ddc2a3e 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -6,15 +6,26 @@
#
PORTNAME= xfce4-taskmanager
-PORTVERSION= 0.2.1
+PORTVERSION= 0.4.0.r2
CATEGORIES= x11 xfce
-MASTER_SITES= http://download.berlios.de/xfce-goodies/
+MASTER_SITES= http://xfce4-taskmanager.nebulon.de/
+DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/}
+DIST_SUBDIR= xfce4
MAINTAINER= DaJoob@dajoob.com
COMMENT= A task manager for XFCE
-BUILD_DEPENDS= xfwm4:${PORTSDIR}/x11-wm/xfce4-wm
+CONFIGURE_ENV= PKG_CONFIG_PATH=${X11BASE}/libdata/pkgconfig:${LOCALBASE}/libdata/pkgconfig
-USE_AUTOTOOLS= automake:19 autoconf:259
+GNU_CONFIGURE= yes
+USE_BZIP= yes
+USE_GCC= 3.4+
+USE_GETTEXT= yes
+USE_GMAKE= yes
+USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_XFCE= configenv libgui
+USE_XLIB= yes
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/xfce4-taskmanager/distinfo b/x11/xfce4-taskmanager/distinfo
index c86c6e9f3842..d982a8d5252d 100644
--- a/x11/xfce4-taskmanager/distinfo
+++ b/x11/xfce4-taskmanager/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4-taskmanager-0.2.1.tar.gz) = 223be8e08c2696ff468ad15093067f03
-SHA256 (xfce4-taskmanager-0.2.1.tar.gz) = c227c7cb21762f69ac615972f1229a4ab77fcda3cf9da46dcfdc80315be20053
-SIZE (xfce4-taskmanager-0.2.1.tar.gz) = 321272
+MD5 (xfce4/xfce4-taskmanager-0.4.0-rc2.tar.gz) = 360b18415f85563f6359860d031b0382
+SHA256 (xfce4/xfce4-taskmanager-0.4.0-rc2.tar.gz) = c3c95826f59657732ae6fc53b53ae50fa195235a3f4580738b8c683df45d54c1
+SIZE (xfce4/xfce4-taskmanager-0.4.0-rc2.tar.gz) = 376201
diff --git a/x11/xfce4-taskmanager/files/patch-aclocal.m4 b/x11/xfce4-taskmanager/files/patch-aclocal.m4
deleted file mode 100644
index 9586331bbaa2..000000000000
--- a/x11/xfce4-taskmanager/files/patch-aclocal.m4
+++ /dev/null
@@ -1,19 +0,0 @@
-*** aclocal.m4.orig Mon May 9 19:35:59 2005
---- aclocal.m4 Mon May 9 19:37:22 2005
-***************
-*** 98,104 ****
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-! [AM_AUTOMAKE_VERSION([1.9.1])])
-
- # AM_AUX_DIR_EXPAND
-
---- 98,104 ----
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-! [AM_AUTOMAKE_VERSION([1.9.6])])
-
- # AM_AUX_DIR_EXPAND
-
diff --git a/x11/xfce4-taskmanager/files/patch-src-functions.c b/x11/xfce4-taskmanager/files/patch-src-functions.c
deleted file mode 100644
index 3d453cea6744..000000000000
--- a/x11/xfce4-taskmanager/files/patch-src-functions.c
+++ /dev/null
@@ -1,53 +0,0 @@
---- src/functions.c.orig Tue Feb 1 23:32:27 2005
-+++ src/functions.c Tue May 24 21:57:39 2005
-@@ -41,13 +41,13 @@
- {
- /* markes all tasks to "not checked" */
- gint i;
-+ DIR *dir;
-+ struct dirent *dir_entry;
-
- for(i = 0; i < task_count; i++)
- all_tasks[i].checked = FALSE;
-
- /* load the current taskdetails */
-- DIR *dir;
-- struct dirent *dir_entry;
-
- if((dir = opendir("/proc")) == NULL)
- printf("Error: couldn't load the directory\n");
-@@ -56,18 +56,20 @@
- {
- if(atoi(dir_entry->d_name) != 0)
- {
-- FILE *task_file;
-- gchar task_file_name[256] = "/proc/";
-- g_strlcat(task_file_name,dir_entry->d_name, 256);
-- g_strlcat(task_file_name,"/status", 256);
--
- gchar buffer[256];
- gint line_count = 0;
- struct task task;
- struct passwd *passwdp;
-
-+ FILE *task_file;
-+ gchar task_file_name[256] = "/proc/";
-+ g_strlcat(task_file_name,dir_entry->d_name, 256);
-+ g_strlcat(task_file_name,"/status", 256);
-+
- if((task_file = fopen(task_file_name,"r")) != NULL)
- {
-+ gboolean new_task = TRUE;
-+
- while(fgets(buffer, 256, task_file) != NULL)
- {
- if(line_count == 0)
-@@ -89,8 +91,6 @@
- fclose(task_file);
-
- /* check if task is new and marks the task that its checked*/
-- gboolean new_task = TRUE;
--
- for(i = 0; i < task_count; i++)
- {
- if(strcmp(all_tasks[i].pid,task.pid) == 0)
diff --git a/x11/xfce4-taskmanager/files/patch-src-gui.c b/x11/xfce4-taskmanager/files/patch-src-gui.c
deleted file mode 100644
index 19e9b9c180a3..000000000000
--- a/x11/xfce4-taskmanager/files/patch-src-gui.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/gui.c.orig Tue Feb 1 23:20:47 2005
-+++ src/gui.c Tue May 24 21:51:04 2005
-@@ -98,24 +98,25 @@
- gboolean add_new_list_item(struct task task)
- {
- GtkTreeIter iter;
-+ gchar *list_value_1, *list_value_2, *list_value_3, *list_value_4;
-
- /* Append new line in the list */
- gtk_list_store_append(GTK_LIST_STORE(list_store), &iter);
-
- /* Fill the appended line with data */
-- gchar *list_value_1 = g_strdup_printf("%s", task.uid);
-+ list_value_1 = g_strdup_printf("%s", task.uid);
- gtk_list_store_set(GTK_LIST_STORE(list_store), &iter, 0, list_value_1, -1);
- g_free(list_value_1);
-
-- gchar *list_value_2 = g_strdup_printf("%s", task.pid);
-+ list_value_2 = g_strdup_printf("%s", task.pid);
- gtk_list_store_set(GTK_LIST_STORE(list_store), &iter, 1, list_value_2, -1);
- g_free(list_value_2);
-
-- gchar *list_value_3 = g_strdup_printf("%s", task.ppid);
-+ list_value_3 = g_strdup_printf("%s", task.ppid);
- gtk_list_store_set(GTK_LIST_STORE(list_store), &iter, 2, list_value_3, -1);
- g_free(list_value_3);
-
-- gchar *list_value_4 = g_strdup_printf("%s", task.name);
-+ list_value_4 = g_strdup_printf("%s", task.name);
- gtk_list_store_set(GTK_LIST_STORE(list_store), &iter, 3, list_value_4, -1);
- g_free(list_value_4);
-
diff --git a/x11/xfce4-taskmanager/pkg-descr b/x11/xfce4-taskmanager/pkg-descr
index c1d5bc5ef484..f13a0bee0a7a 100644
--- a/x11/xfce4-taskmanager/pkg-descr
+++ b/x11/xfce4-taskmanager/pkg-descr
@@ -1,7 +1,4 @@
This is a port of the xfce-goodies plugin that adds a task
manager to XFCE.
-WWW: http://xfce-goodies.berlios.de
-
-- DaJoob
-DaJoob@dajoob.com
+WWW: http://www.xfce.org/
diff --git a/x11/xfce4-taskmanager/pkg-plist b/x11/xfce4-taskmanager/pkg-plist
index b25c6ff00a9b..2ec120eb7a04 100644
--- a/x11/xfce4-taskmanager/pkg-plist
+++ b/x11/xfce4-taskmanager/pkg-plist
@@ -1 +1,14 @@
bin/xfce4-taskmanager
+share/locale/de/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/eu/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/fr/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/hu/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/ja/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/ru/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/vi/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/fi/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/gl/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/pl/LC_MESSAGES/xfce4-taskmanager.mo
+share/locale/zh_TW/LC_MESSAGES/xfce4-taskmanager.mo
+
diff --git a/x11/xfce4-trigger-launcher/Makefile b/x11/xfce4-trigger-launcher/Makefile
deleted file mode 100644
index 0acfdfd43ddd..000000000000
--- a/x11/xfce4-trigger-launcher/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# New ports collection makefile for: xfce4-trigger-launcher
-# Date created: 2004/05/10
-# Whom: Zahemszky, Gábor <Gabor@Zahemszky.HU>
-#
-# $FreeBSD$
-#
-
-PORTNAME= xfce4-trigger-launcher
-PORTVERSION= 4.2.3
-PORTREVISION= 2
-CATEGORIES= x11 xfce
-MASTER_SITES= http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
- http://public.fh-wolfenbuettel.de/~luedickj/xfce4/xfce-${PORTVERSION}/src/ \
- http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-${PORTVERSION}/src/
-DISTNAME= xfce4-trigger-launcher-${PORTVERSION}
-DIST_SUBDIR= xfce4
-
-MAINTAINER= oliver@FreeBSD.org
-COMMENT= A command trigger plugin for xfce4-panel
-
-BUILD_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-LIB_DEPENDS= xfce4util.1:${PORTSDIR}/x11/libxfce4util \
- xfcegui4.3:${PORTSDIR}/x11-toolkits/libxfce4gui \
- startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
-
-USE_GNOME= gtk20 libxml2
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-
-.include <bsd.port.mk>
diff --git a/x11/xfce4-trigger-launcher/distinfo b/x11/xfce4-trigger-launcher/distinfo
deleted file mode 100644
index 0878518547b3..000000000000
--- a/x11/xfce4-trigger-launcher/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xfce4/xfce4-trigger-launcher-4.2.3.tar.gz) = af3c0356862af8a37e90ec18ad008918
-SHA256 (xfce4/xfce4-trigger-launcher-4.2.3.tar.gz) = 8ddb31039d3c44e04272f1d42c863d80f3bfdfcc6b39a6752c47ce65c69dd164
-SIZE (xfce4/xfce4-trigger-launcher-4.2.3.tar.gz) = 371223
diff --git a/x11/xfce4-trigger-launcher/pkg-descr b/x11/xfce4-trigger-launcher/pkg-descr
deleted file mode 100644
index cf3e0ddc348b..000000000000
--- a/x11/xfce4-trigger-launcher/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-xfce4-trigger-launcher is a command trigger plugin for xfce4-panel.
-The commands can be changed via the properties dialog.
-
-Authors:
- Danny Milosavljevic <danny_milo@yahoo.com>
- Benedikt Meurer <benedikt.meurer@unix-ag.uni-siegen.de>
-
-WWW: http://www.xfce.org/
-
-Ported: Gabor@Zahemszky.HU
diff --git a/x11/xfce4-trigger-launcher/pkg-plist b/x11/xfce4-trigger-launcher/pkg-plist
deleted file mode 100644
index a74c42d57b8d..000000000000
--- a/x11/xfce4-trigger-launcher/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/xfce4/panel-plugins/libtriggerlauncher.a
-lib/xfce4/panel-plugins/libtriggerlauncher.la
-lib/xfce4/panel-plugins/libtriggerlauncher.so
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4