aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Lehmann <oliver@FreeBSD.org>2011-03-03 10:12:30 +0000
committerOliver Lehmann <oliver@FreeBSD.org>2011-03-03 10:12:30 +0000
commit6f4ce81280e8188f1b8dbaa092858fded2abc02e (patch)
treec562f41d08d739c18c1ae57328d9c042e20c2282
parenta7d0f2f1180a5ad6ad2935884415f5e86bd32114 (diff)
downloadports-6f4ce81280e8188f1b8dbaa092858fded2abc02e.tar.gz
ports-6f4ce81280e8188f1b8dbaa092858fded2abc02e.zip
Welcome XFCE 4.8 to the portstree!
Special Thanks to: miwi, Olivier Duchateau <duchateau.olivier@gmail.com>
Notes
Notes: svn path=/head/; revision=270185
-rw-r--r--Mk/bsd.xfce.mk44
-rw-r--r--archivers/squeeze/Makefile3
-rw-r--r--archivers/thunar-archive-plugin/Makefile13
-rw-r--r--archivers/thunar-archive-plugin/distinfo5
-rw-r--r--archivers/thunar-archive-plugin/pkg-plist42
-rw-r--r--audio/thunar-media-tags-plugin/Makefile12
-rw-r--r--audio/xfce4-mixer/Makefile5
-rw-r--r--audio/xfce4-mixer/distinfo5
-rw-r--r--audio/xfce4-mixer/pkg-plist12
-rw-r--r--audio/xfce4-mpc-plugin/Makefile7
-rw-r--r--audio/xfce4-mpc-plugin/distinfo5
-rw-r--r--audio/xfce4-mpc-plugin/pkg-plist2
-rw-r--r--audio/xfmpc/Makefile3
-rw-r--r--deskutils/orage/Makefile10
-rw-r--r--deskutils/orage/distinfo5
-rw-r--r--deskutils/orage/pkg-plist219
-rw-r--r--deskutils/xfce4-generic-slider/Makefile10
-rw-r--r--deskutils/xfce4-generic-slider/pkg-plist2
-rw-r--r--deskutils/xfce4-notes-plugin/Makefile4
-rw-r--r--deskutils/xfce4-notes-plugin/pkg-plist9
-rw-r--r--deskutils/xfce4-notification-daemon/Makefile3
-rw-r--r--deskutils/xfce4-notifyd/Makefile34
-rw-r--r--deskutils/xfce4-notifyd/distinfo4
-rw-r--r--deskutils/xfce4-notifyd/pkg-plist48
-rw-r--r--deskutils/xfce4-volstatus-icon/Makefile3
-rw-r--r--deskutils/xfce4-xkb-plugin/Makefile5
-rw-r--r--devel/thunar-svn-plugin/Makefile12
-rw-r--r--devel/thunar-vcs-plugin/Makefile12
-rw-r--r--devel/xfce4-dev-tools/Makefile2
-rw-r--r--devel/xfce4-dev-tools/distinfo5
-rw-r--r--editors/mousepad/Makefile3
-rw-r--r--graphics/ristretto/Makefile1
-rw-r--r--mail/xfce4-mailwatch-plugin/Makefile7
-rw-r--r--misc/xfce4-appfinder/Makefile6
-rw-r--r--misc/xfce4-appfinder/distinfo5
-rw-r--r--misc/xfce4-appfinder/pkg-plist77
-rw-r--r--misc/xfce4-weather-plugin/Makefile6
-rw-r--r--misc/xfce4-weather-plugin/distinfo5
-rw-r--r--misc/xfce4-weather-plugin/pkg-plist8
-rw-r--r--misc/xfce4-wm-themes/Makefile2
-rw-r--r--misc/xfce4-wm-themes/distinfo1
-rw-r--r--multimedia/xfce4-media/Makefile4
-rw-r--r--multimedia/xfce4-parole/Makefile7
-rw-r--r--multimedia/xfce4-xmms-plugin/Makefile5
-rw-r--r--multimedia/xfmedia-remote-plugin/Makefile7
-rw-r--r--net-im/xfce4-messenger-plugin/Makefile7
-rw-r--r--print/xfce4-print/Makefile2
-rw-r--r--print/xfce4-print/distinfo1
-rw-r--r--sysutils/thunar-volman-plugin/Makefile7
-rw-r--r--sysutils/xfburn/Makefile8
-rw-r--r--sysutils/xfburn/distinfo5
-rw-r--r--sysutils/xfburn/pkg-plist13
-rw-r--r--sysutils/xfce4-battery-plugin/Makefile5
-rw-r--r--sysutils/xfce4-cpugraph-plugin/Makefile1
-rw-r--r--sysutils/xfce4-fsguard-plugin/Makefile1
-rw-r--r--sysutils/xfce4-genmon-plugin/Makefile9
-rw-r--r--sysutils/xfce4-minicmd-plugin/Makefile2
-rw-r--r--sysutils/xfce4-netload-plugin/Makefile1
-rw-r--r--sysutils/xfce4-places-plugin/Makefile17
-rw-r--r--sysutils/xfce4-power-manager/Makefile12
-rw-r--r--sysutils/xfce4-settings/Makefile17
-rw-r--r--sysutils/xfce4-settings/distinfo5
-rw-r--r--sysutils/xfce4-settings/pkg-plist80
-rw-r--r--sysutils/xfce4-systemload-plugin/Makefile1
-rw-r--r--sysutils/xfce4-utils/Makefile37
-rw-r--r--sysutils/xfce4-utils/distinfo5
-rw-r--r--sysutils/xfce4-utils/pkg-plist301
-rw-r--r--sysutils/xfce4-wavelan-plugin/Makefile12
-rw-r--r--textproc/xfce4-dict-plugin/Makefile7
-rw-r--r--www/xfce4-smartbookmark-plugin/Makefile5
-rw-r--r--x11-clocks/xfce4-datetime-plugin/Makefile5
-rw-r--r--x11-clocks/xfce4-timer-out-plugin/Makefile5
-rw-r--r--x11-clocks/xfce4-timer-plugin/Makefile5
-rw-r--r--x11-fm/thunar/Makefile60
-rw-r--r--x11-fm/thunar/distinfo5
-rw-r--r--x11-fm/thunar/pkg-plist681
-rw-r--r--x11-themes/gtk-xfce-engine/Makefile4
-rw-r--r--x11-themes/gtk-xfce-engine/distinfo5
-rw-r--r--x11-themes/gtk-xfce-engine/pkg-plist4
-rw-r--r--x11-toolkits/libxfce4gui/Makefile2
-rw-r--r--x11-toolkits/libxfce4gui/distinfo5
-rw-r--r--x11-toolkits/libxfce4gui/pkg-plist100
-rw-r--r--x11-wm/xfce4-desktop/Makefile7
-rw-r--r--x11-wm/xfce4-desktop/distinfo5
-rw-r--r--x11-wm/xfce4-desktop/pkg-plist237
-rw-r--r--x11-wm/xfce4-panel/Makefile7
-rw-r--r--x11-wm/xfce4-panel/distinfo5
-rw-r--r--x11-wm/xfce4-panel/files/patch-plugins-launcher-launcher-exec.c13
-rw-r--r--x11-wm/xfce4-panel/pkg-plist376
-rw-r--r--x11-wm/xfce4-session/Makefile7
-rw-r--r--x11-wm/xfce4-session/distinfo5
-rw-r--r--x11-wm/xfce4-session/pkg-plist40
-rw-r--r--x11-wm/xfce4-wm/Makefile5
-rw-r--r--x11-wm/xfce4-wm/distinfo5
-rw-r--r--x11-wm/xfce4-wm/pkg-plist633
-rw-r--r--x11/Terminal/Makefile2
-rw-r--r--x11/Terminal/distinfo5
-rw-r--r--x11/Terminal/pkg-plist34
-rw-r--r--x11/avant-window-navigator/Makefile2
-rw-r--r--x11/libexo/Makefile6
-rw-r--r--x11/libexo/distinfo5
-rw-r--r--x11/libexo/files/patch-Makefile.in25
-rw-r--r--x11/libexo/files/patch-exo-mount-point.c12
-rw-r--r--x11/libexo/pkg-plist469
-rw-r--r--x11/libxfce4menu/Makefile5
-rw-r--r--x11/libxfce4menu/distinfo5
-rw-r--r--x11/libxfce4menu/pkg-plist289
-rw-r--r--x11/libxfce4util/Makefile2
-rw-r--r--x11/libxfce4util/distinfo5
-rw-r--r--x11/libxfce4util/pkg-plist82
-rw-r--r--x11/xfce4-clipman-plugin/Makefile12
-rw-r--r--x11/xfce4-conf/Makefile4
-rw-r--r--x11/xfce4-conf/distinfo5
-rw-r--r--x11/xfce4-conf/pkg-plist82
-rw-r--r--x11/xfce4-quicklauncher-plugin/Makefile5
-rw-r--r--x11/xfce4-screenshooter-plugin/Makefile7
-rw-r--r--x11/xfce4-screenshooter-plugin/distinfo1
-rw-r--r--x11/xfce4-verve-plugin/Makefile4
-rw-r--r--x11/xfce4-wmdock-plugin/Makefile4
-rw-r--r--x11/xfce4-xfapplet-plugin/Makefile5
120 files changed, 2352 insertions, 2201 deletions
diff --git a/Mk/bsd.xfce.mk b/Mk/bsd.xfce.mk
index fc6bf3e8bdf5..8f21eee76b74 100644
--- a/Mk/bsd.xfce.mk
+++ b/Mk/bsd.xfce.mk
@@ -12,36 +12,42 @@ Xfce_Include_MAINTAINER= oliver@FreeBSD.org
# desktop environment. It's automatically included when USE_XFCE
# is defined in the ports' makefile.
-_USE_XFCE_ALL= configenv libexo libgui libmenu libutil panel \
- thunar wm xfconf xfdev
+_USE_XFCE_ALL= configenv garcon libexo libgui libmenu libutil panel \
+ thunar thunarvfs wm xfconf xfdev
-MASTER_SITE_SUBDIR?= xfce/4.6.2/src
+MASTER_SITE_SUBDIR?= xfce/4.8/src
configenv_CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
-libexo_BUILD_DEPENDS= libexo>=0.3.107:${PORTSDIR}/x11/libexo
-libexo_RUN_DEPENDS= libexo>=0.3.107:${PORTSDIR}/x11/libexo
+garcon_BUILD_DEPENDS= garcon>=0.1.4:${PORTSDIR}/sysutils/garcon
+garcon_RUN_DEPENDS= garcon>=0.1.4:${PORTSDIR}/sysutils/garcon
-libgui_BUILD_DEPENDS= libxfce4gui>=4.6.4:${PORTSDIR}/x11-toolkits/libxfce4gui
-libgui_RUN_DEPENDS= libxfce4gui>=4.6.4:${PORTSDIR}/x11-toolkits/libxfce4gui
+libexo_BUILD_DEPENDS= libexo>=0.5.6:${PORTSDIR}/x11/libexo
+libexo_RUN_DEPENDS= libexo>=0.5.6:${PORTSDIR}/x11/libexo
-libmenu_BUILD_DEPENDS= libxfce4menu>=4.6.2:${PORTSDIR}/x11/libxfce4menu
-libmenu_RUN_DEPENDS= libxfce4menu>=4.6.2:${PORTSDIR}/x11/libxfce4menu
+libgui_BUILD_DEPENDS= libxfce4gui>=4.7.0:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_RUN_DEPENDS= libxfce4gui>=4.7.0:${PORTSDIR}/x11-toolkits/libxfce4gui
-libutil_BUILD_DEPENDS= libxfce4util>=4.6.2:${PORTSDIR}/x11/libxfce4util
-libutil_RUN_DEPENDS= libxfce4util>=4.6.2:${PORTSDIR}/x11/libxfce4util
+libmenu_BUILD_DEPENDS= libxfce4menu>=4.7.6:${PORTSDIR}/x11/libxfce4menu
+libmenu_RUN_DEPENDS= libxfce4menu>=4.7.6:${PORTSDIR}/x11/libxfce4menu
-panel_BUILD_DEPENDS= xfce4-panel>=4.6.4:${PORTSDIR}/x11-wm/xfce4-panel
-panel_RUN_DEPENDS= xfce4-panel>=4.6.4:${PORTSDIR}/x11-wm/xfce4-panel
+libutil_BUILD_DEPENDS= libxfce4util>=4.7.5:${PORTSDIR}/x11/libxfce4util
+libutil_RUN_DEPENDS= libxfce4util>=4.7.5:${PORTSDIR}/x11/libxfce4util
-thunar_BUILD_DEPENDS= Thunar>=1.0.2:${PORTSDIR}/x11-fm/thunar
-thunar_RUN_DEPENDS= Thunar>=1.0.2:${PORTSDIR}/x11-fm/thunar
+panel_BUILD_DEPENDS= xfce4-panel>=4.7.7:${PORTSDIR}/x11-wm/xfce4-panel
+panel_RUN_DEPENDS= xfce4-panel>=4.7.7:${PORTSDIR}/x11-wm/xfce4-panel
-wm_BUILD_DEPENDS= xfce4-wm>=4.6.2:${PORTSDIR}/x11-wm/xfce4-wm
-wm_RUN_DEPENDS= xfce4-wm>=4.6.2:${PORTSDIR}/x11-wm/xfce4-wm
+thunar_BUILD_DEPENDS= Thunar>=1.1.6:${PORTSDIR}/x11-fm/thunar
+thunar_RUN_DEPENDS= Thunar>=1.1.6:${PORTSDIR}/x11-fm/thunar
-xfconf_BUILD_DEPENDS= xfce4-conf>=4.6.2:${PORTSDIR}/x11/xfce4-conf
-xfconf_RUN_DEPENDS= xfce4-conf>=4.6.2:${PORTSDIR}/x11/xfce4-conf
+thunarvfs_BUILD_DEPENDS= thunar-vfs>=1.2.0:${PORTSDIR}/x11-fm/thunar-vfs
+thunarvfs_RUN_DEPENDS= thunar-vfs>=1.2.0:${PORTSDIR}/x11-fm/thunar-vfs
+
+wm_BUILD_DEPENDS= xfce4-wm>=4.7.4:${PORTSDIR}/x11-wm/xfce4-wm
+wm_RUN_DEPENDS= xfce4-wm>=4.7.4:${PORTSDIR}/x11-wm/xfce4-wm
+
+xfconf_BUILD_DEPENDS= xfce4-conf>=4.7.5:${PORTSDIR}/x11/xfce4-conf
+xfconf_RUN_DEPENDS= xfce4-conf>=4.7.5:${PORTSDIR}/x11/xfce4-conf
xfdev_RUN_DEPENDS= xfce4-dev-tools:${PORTSDIR}/devel/xfce4-dev-tools
diff --git a/archivers/squeeze/Makefile b/archivers/squeeze/Makefile
index 3a45dc260b1c..2da4d8f99754 100644
--- a/archivers/squeeze/Makefile
+++ b/archivers/squeeze/Makefile
@@ -7,6 +7,7 @@
PORTNAME= squeeze
PORTVERSION= 0.2.3
+PORTREVISION= 1
CATEGORIES= archivers xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -22,7 +23,7 @@ LICENSE= GPLv2
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USE_XFCE= configenv panel thunar
+USE_XFCE= configenv panel thunar thunarvfs
USE_XORG= x11
USE_GNOME= gnomehack gnometarget gtk20 glib20 intltool intlhack pkgconfig
USE_BZIP2= yes
diff --git a/archivers/thunar-archive-plugin/Makefile b/archivers/thunar-archive-plugin/Makefile
index 5994a3668cb4..94fc780bb877 100644
--- a/archivers/thunar-archive-plugin/Makefile
+++ b/archivers/thunar-archive-plugin/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= thunar-archive-plugin
-PORTVERSION= 0.2.4
-PORTREVISION= 8
+PORTVERSION= 0.3.0
CATEGORIES= archivers xfce
-MASTER_SITES= BERLIOS
-MASTER_SITE_SUBDIR= xfce-goodies
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/thunar-plugins//${PORTNAME}/${PORTVERSION:R}
+DIST_SUBDIR= xfce4
MAINTAINER= ports@c0decafe.net
COMMENT= Archive plugin for the Thunar File Manager
@@ -21,9 +21,6 @@ USE_XFCE= configenv libexo thunar
USE_GETTEXT= yes
INSTALLS_ICONS= yes
USE_GNOME= desktopfileutils
-
-post-patch:
- @${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' \
- ${WRKSRC}/configure
+USE_GMAKE= yes
.include <bsd.port.mk>
diff --git a/archivers/thunar-archive-plugin/distinfo b/archivers/thunar-archive-plugin/distinfo
index c09d79d54595..24a9af7161fe 100644
--- a/archivers/thunar-archive-plugin/distinfo
+++ b/archivers/thunar-archive-plugin/distinfo
@@ -1,3 +1,2 @@
-MD5 (thunar-archive-plugin-0.2.4.tar.bz2) = 4c389e6328af9322937af76382f0baec
-SHA256 (thunar-archive-plugin-0.2.4.tar.bz2) = 470ac5880b939003178a7055a7d0c2dbcee8c4cf53e0d91d9475307c42e6e8c0
-SIZE (thunar-archive-plugin-0.2.4.tar.bz2) = 255828
+SHA256 (xfce4/thunar-archive-plugin-0.3.0.tar.bz2) = 74be7c6e242ba240b9477e9cf4ccc9190769c2717c5b5bf26788d1847adaf896
+SIZE (xfce4/thunar-archive-plugin-0.3.0.tar.bz2) = 316778
diff --git a/archivers/thunar-archive-plugin/pkg-plist b/archivers/thunar-archive-plugin/pkg-plist
index 710220545973..f8941d90ddf1 100644
--- a/archivers/thunar-archive-plugin/pkg-plist
+++ b/archivers/thunar-archive-plugin/pkg-plist
@@ -1,9 +1,9 @@
@comment $FreeBSD$
-lib/thunarx-1/thunar-archive-plugin.so
-lib/thunarx-1/thunar-archive-plugin.la
+lib/thunarx-2/thunar-archive-plugin.so
+lib/thunarx-2/thunar-archive-plugin.la
libexec/thunar-archive-plugin/ark.tap
libexec/thunar-archive-plugin/file-roller.tap
-@dirrmtry libexec/thunar-archive-plugin
+libexec/thunar-archive-plugin/gnome-file-roller.tap
share/locale/ca/LC_MESSAGES/thunar-archive-plugin.mo
share/locale/cs/LC_MESSAGES/thunar-archive-plugin.mo
share/locale/de/LC_MESSAGES/thunar-archive-plugin.mo
@@ -20,6 +20,42 @@ share/locale/pl/LC_MESSAGES/thunar-archive-plugin.mo
share/locale/pt_BR/LC_MESSAGES/thunar-archive-plugin.mo
share/locale/ru/LC_MESSAGES/thunar-archive-plugin.mo
share/locale/zh_TW/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ar/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ast/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/be/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/da/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/en_GB/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/es/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/fi/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/gl/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/hr/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/id/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/kk/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/lv/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/nb/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/pt/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ro/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/sk/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/sq/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/sv/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/tr/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ug/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/uk/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ur/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/ur_PK/LC_MESSAGES/thunar-archive-plugin.mo
+share/locale/zh_CN/LC_MESSAGES/thunar-archive-plugin.mo
share/icons/hicolor/16x16/apps/tap-create.png
share/icons/hicolor/16x16/apps/tap-extract.png
share/icons/hicolor/16x16/apps/tap-extract-to.png
+@dirrmtry libexec/thunar-archive-plugin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
+@dirrmtry share/locale/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
+
diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile
index c909988f3247..c9b8f6783814 100644
--- a/audio/thunar-media-tags-plugin/Makefile
+++ b/audio/thunar-media-tags-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= thunar-media-tags-plugin
PORTVERSION= 0.1.2
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= audio xfce
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/thunar-plugins//${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
@@ -23,7 +24,12 @@ INSTALLS_ICONS= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GNOME= gnometarget gnomehack gtk20 intltool intlhack pkgconfig
-USE_XFCE= configenv libexo thunar
+USE_XFCE= configenv libexo thunar thunarvfs
USE_AUTOTOOLS= libtool
+post-patch:
+ @${REINPLACE_CMD} -e 's|exo-0\.3|exo-1|g; \
+ s|thunarx-1|thunarx-2|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 0c62f1e318c4..1cdb586dcfa0 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= xfce4-mixer
-PORTVERSION= 4.6.1
-PORTREVISION= 6
+PORTVERSION= 4.8.0
CATEGORIES= audio xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=xfce/4.6.1/src
+MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
index 0a0d0342966b..c1ad06588cf0 100644
--- a/audio/xfce4-mixer/distinfo
+++ b/audio/xfce4-mixer/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce4-mixer-4.6.1.tar.bz2) = a99e2455445480ef5081fe69454a46fc
-SHA256 (xfce4/xfce4-mixer-4.6.1.tar.bz2) = cf7b8af6696b0e3795ab65d15a8b5d217123955919713f7bae86008b56abb5dd
-SIZE (xfce4/xfce4-mixer-4.6.1.tar.bz2) = 412483
+SHA256 (xfce4/xfce4-mixer-4.8.0.tar.bz2) = 9f9f48fdd0d3f6b1e46694b93a44d15b800db72a96d831b5111d9ac976970fab
+SIZE (xfce4/xfce4-mixer-4.8.0.tar.bz2) = 494990
diff --git a/audio/xfce4-mixer/pkg-plist b/audio/xfce4-mixer/pkg-plist
index caf7b218a09f..cf60ec824d84 100644
--- a/audio/xfce4-mixer/pkg-plist
+++ b/audio/xfce4-mixer/pkg-plist
@@ -1,6 +1,12 @@
bin/xfce4-mixer
libexec/xfce4/panel-plugins/xfce4-mixer-plugin
share/applications/xfce4-mixer.desktop
+share/locale/ast/LC_MESSAGES/xfce4-mixer.mo
+share/locale/lv/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ro/LC_MESSAGES/xfce4-mixer.mo
+share/locale/sk/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ur/LC_MESSAGES/xfce4-mixer.mo
+share/locale/ur_PK/LC_MESSAGES/xfce4-mixer.mo
share/locale/am/LC_MESSAGES/xfce4-mixer.mo
share/locale/ar/LC_MESSAGES/xfce4-mixer.mo
share/locale/ca/LC_MESSAGES/xfce4-mixer.mo
@@ -90,3 +96,9 @@ share/xfce4/panel-plugins/xfce4-mixer-plugin.desktop
@dirrm share/xfce4-mixer/icons/hicolor
@dirrm share/xfce4-mixer/icons
@dirrm share/xfce4-mixer
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile
index 52c0571d611d..de4091d472f2 100644
--- a/audio/xfce4-mpc-plugin/Makefile
+++ b/audio/xfce4-mpc-plugin/Makefile
@@ -6,10 +6,11 @@
#
PORTNAME= xfce4-mpc-plugin
-PORTVERSION= 0.3.5
-PORTREVISION= 1
+PORTVERSION= 0.3.6
CATEGORIES= audio xfce
-MASTER_SITES= http://archive.xfce.org/src/panel-plugins/${PORTNAME}/0.3/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
COMMENT= A mpc plugin for xfce
diff --git a/audio/xfce4-mpc-plugin/distinfo b/audio/xfce4-mpc-plugin/distinfo
index 51a96fd51e34..d4fc17e1a9e2 100644
--- a/audio/xfce4-mpc-plugin/distinfo
+++ b/audio/xfce4-mpc-plugin/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4-mpc-plugin-0.3.5.tar.bz2) = 20ea8c37dcb90a8ae3cb026463b27f06
-SHA256 (xfce4-mpc-plugin-0.3.5.tar.bz2) = 5f986d089b1f1d19a30aacb0e7dd95866662977290a5bde2360572cd02d6dddb
-SIZE (xfce4-mpc-plugin-0.3.5.tar.bz2) = 107366
+SHA256 (xfce4/xfce4-mpc-plugin-0.3.6.tar.bz2) = 71de41e6dc055522ba9d74697b26ecd7884bb91aea2b70a9da338df4fee877e7
+SIZE (xfce4/xfce4-mpc-plugin-0.3.6.tar.bz2) = 108945
diff --git a/audio/xfce4-mpc-plugin/pkg-plist b/audio/xfce4-mpc-plugin/pkg-plist
index 000db6acde3f..88691ffe55f1 100644
--- a/audio/xfce4-mpc-plugin/pkg-plist
+++ b/audio/xfce4-mpc-plugin/pkg-plist
@@ -5,6 +5,7 @@ share/locale/ca/LC_MESSAGES/xfce4-mpc-plugin.mo
share/locale/cs/LC_MESSAGES/xfce4-mpc-plugin.mo
share/locale/da/LC_MESSAGES/xfce4-mpc-plugin.mo
share/locale/de/LC_MESSAGES/xfce4-mpc-plugin.mo
+share/locale/el/LC_MESSAGES/xfce4-mpc-plugin.mo
share/locale/en_GB/LC_MESSAGES/xfce4-mpc-plugin.mo
share/locale/es/LC_MESSAGES/xfce4-mpc-plugin.mo
share/locale/eu/LC_MESSAGES/xfce4-mpc-plugin.mo
@@ -23,6 +24,7 @@ share/locale/sk/LC_MESSAGES/xfce4-mpc-plugin.mo
share/locale/sq/LC_MESSAGES/xfce4-mpc-plugin.mo
share/locale/sv/LC_MESSAGES/xfce4-mpc-plugin.mo
share/locale/tr/LC_MESSAGES/xfce4-mpc-plugin.mo
+share/locale/ug/LC_MESSAGES/xfce4-mpc-plugin.mo
share/locale/uk/LC_MESSAGES/xfce4-mpc-plugin.mo
share/locale/ur/LC_MESSAGES/xfce4-mpc-plugin.mo
share/locale/ur_PK/LC_MESSAGES/xfce4-mpc-plugin.mo
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index 275188e2b6dc..9a75ad2e94fb 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -9,7 +9,8 @@ PORTNAME= xfmpc
PORTVERSION= 0.2.0
PORTREVISION= 6
CATEGORIES= audio xfce
-MASTER_SITES= http://archive.xfce.org/src/apps/${PORTNAME}/0.2/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index 4eed76200f2a..0f65b23c9f22 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -6,16 +6,17 @@
#
PORTNAME= orage
-PORTVERSION= 4.6.1
-PORTREVISION= 6
+PORTVERSION= 4.8.1
CATEGORIES= deskutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=xfce/4.6.1/src
+MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= A calendar application to manage your time with XFce 4
+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
+
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
@@ -25,11 +26,12 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libgui panel
USE_XORG= xext xrender xinerama xi xrandr xcursor xcomposite xdamage x11 \
xfixes
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
OPTIONS= BDB "Enable BDB support" off \
ICAL "Enable libical support" off
-MAN1= globaltime.1 orage.1
+MAN1= globaltime.1 orage.1 tz_convert.1
.include <bsd.port.pre.mk>
diff --git a/deskutils/orage/distinfo b/deskutils/orage/distinfo
index 3cab6aec43be..52c265ed0f89 100644
--- a/deskutils/orage/distinfo
+++ b/deskutils/orage/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/orage-4.6.1.tar.bz2) = 24fa43dd86ec5af5a4766620fd972cf2
-SHA256 (xfce4/orage-4.6.1.tar.bz2) = f1580f5f0082eff89f7a76a57da9dce7e7d5380804939771611499482523bd4d
-SIZE (xfce4/orage-4.6.1.tar.bz2) = 1937593
+SHA256 (xfce4/orage-4.8.1.tar.bz2) = 612d9e0e6b0113e04332d13cfbe027e464ff1c8e7ddef5052369ac88e67e09d8
+SIZE (xfce4/orage-4.8.1.tar.bz2) = 2235528
diff --git a/deskutils/orage/pkg-plist b/deskutils/orage/pkg-plist
index 7816fef2bc03..61ad1dac82cb 100644
--- a/deskutils/orage/pkg-plist
+++ b/deskutils/orage/pkg-plist
@@ -1,14 +1,17 @@
bin/globaltime
bin/orage
-libexec/xfce4/panel-plugins/orageclock
+bin/tz_convert
+libexec/xfce4/panel-plugins/xfce4-orageclock-plugin
share/applications/xfcalendar.desktop
share/applications/xfce-xfcalendar-settings.desktop
+share/applications/globaltime.desktop
share/dbus-1/services/org.xfce.calendar.service
share/dbus-1/services/org.xfce.orage.service
share/icons/hicolor/48x48/apps/xfcalendar.png
share/icons/hicolor/scalable/apps/xfcalendar.svg
share/locale/am/LC_MESSAGES/orage.mo
share/locale/ar/LC_MESSAGES/orage.mo
+share/locale/ast/LC_MESSAGES/orage.mo
share/locale/az/LC_MESSAGES/orage.mo
share/locale/bg/LC_MESSAGES/orage.mo
share/locale/da/LC_MESSAGES/orage.mo
@@ -45,6 +48,7 @@ share/locale/sv/LC_MESSAGES/orage.mo
share/locale/ta/LC_MESSAGES/orage.mo
share/locale/tr/LC_MESSAGES/orage.mo
share/locale/ur/LC_MESSAGES/orage.mo
+share/locale/ur_PK/LC_MESSAGES/orage.mo
share/locale/vi/LC_MESSAGES/orage.mo
share/locale/be/LC_MESSAGES/orage.mo
share/locale/ca/LC_MESSAGES/orage.mo
@@ -467,8 +471,210 @@ share/orage/zoneinfo/Pacific/Truk.ics
share/orage/zoneinfo/Pacific/Wake.ics
share/orage/zoneinfo/Pacific/Wallis.ics
share/orage/zoneinfo/Pacific/Yap.ics
+share/orage/zoneinfo/CET.ics
+share/orage/zoneinfo/CST6CDT.ics
+share/orage/zoneinfo/Cuba.ics
+share/orage/zoneinfo/EET.ics
+share/orage/zoneinfo/EST.ics
+share/orage/zoneinfo/EST5EDT.ics
+share/orage/zoneinfo/Egypt.ics
+share/orage/zoneinfo/Eire.ics
+share/orage/zoneinfo/Factory.ics
+share/orage/zoneinfo/GB-Eire.ics
+share/orage/zoneinfo/GB.ics
+share/orage/zoneinfo/GMT+0.ics
+share/orage/zoneinfo/GMT-0.ics
+share/orage/zoneinfo/GMT.ics
+share/orage/zoneinfo/GMT0.ics
+share/orage/zoneinfo/Greenwich.ics
+share/orage/zoneinfo/HST.ics
+share/orage/zoneinfo/Hongkong.ics
+share/orage/zoneinfo/Iceland.ics
+share/orage/zoneinfo/Iran.ics
+share/orage/zoneinfo/Israel.ics
+share/orage/zoneinfo/Jamaica.ics
+share/orage/zoneinfo/Japan.ics
+share/orage/zoneinfo/Kwajalein.ics
+share/orage/zoneinfo/Libya.ics
+share/orage/zoneinfo/MET.ics
+share/orage/zoneinfo/MST.ics
+share/orage/zoneinfo/MST7MDT.ics
+share/orage/zoneinfo/NZ-CHAT.ics
+share/orage/zoneinfo/NZ.ics
+share/orage/zoneinfo/Navajo.ics
+share/orage/zoneinfo/PRC.ics
+share/orage/zoneinfo/PST8PDT.ics
+share/orage/zoneinfo/Poland.ics
+share/orage/zoneinfo/Portugal.ics
+share/orage/zoneinfo/ROC.ics
+share/orage/zoneinfo/ROK.ics
+share/orage/zoneinfo/Singapore.ics
+share/orage/zoneinfo/Turkey.ics
+share/orage/zoneinfo/UCT.ics
+share/orage/zoneinfo/UTC.ics
+share/orage/zoneinfo/Universal.ics
+share/orage/zoneinfo/W-SU.ics
+share/orage/zoneinfo/WET.ics
+share/orage/zoneinfo/Zulu.ics
+share/orage/zoneinfo/posixrules.ics
+share/orage/zoneinfo/Africa/Asmara.ics
+share/orage/zoneinfo/America/Atikokan.ics
+share/orage/zoneinfo/America/Atka.ics
+share/orage/zoneinfo/America/Bahia.ics
+share/orage/zoneinfo/America/Blanc-Sablon.ics
+share/orage/zoneinfo/America/Campo_Grande.ics
+share/orage/zoneinfo/America/Coral_Harbour.ics
+share/orage/zoneinfo/America/Danmarkshavn.ics
+share/orage/zoneinfo/America/Ensenada.ics
+share/orage/zoneinfo/America/Fort_Wayne.ics
+share/orage/zoneinfo/America/Knox_IN.ics
+share/orage/zoneinfo/America/Marigot.ics
+share/orage/zoneinfo/America/Moncton.ics
+share/orage/zoneinfo/America/Porto_Acre.ics
+share/orage/zoneinfo/America/Resolute.ics
+share/orage/zoneinfo/America/Santarem.ics
+share/orage/zoneinfo/America/St_Barthelemy.ics
+share/orage/zoneinfo/America/Toronto.ics
+share/orage/zoneinfo/America/Virgin.ics
+share/orage/zoneinfo/America/Argentina/ComodRivadavia.ics
+share/orage/zoneinfo/America/Argentina/La_Rioja.ics
+share/orage/zoneinfo/America/Argentina/Rio_Gallegos.ics
+share/orage/zoneinfo/America/Argentina/Salta.ics
+share/orage/zoneinfo/America/Argentina/San_Juan.ics
+share/orage/zoneinfo/America/Argentina/San_Luis.ics
+share/orage/zoneinfo/America/Argentina/Tucuman.ics
+share/orage/zoneinfo/America/Argentina/Ushuaia.ics
+share/orage/zoneinfo/America/Indiana/Petersburg.ics
+share/orage/zoneinfo/America/Indiana/Tell_City.ics
+share/orage/zoneinfo/America/Indiana/Vincennes.ics
+share/orage/zoneinfo/America/Indiana/Winamac.ics
+share/orage/zoneinfo/America/North_Dakota/Center.ics
+share/orage/zoneinfo/America/North_Dakota/New_Salem.ics
+share/orage/zoneinfo/Antarctica/Rothera.ics
+share/orage/zoneinfo/Asia/Ashkhabad.ics
+share/orage/zoneinfo/Asia/Choibalsan.ics
+share/orage/zoneinfo/Asia/Chongqing.ics
+share/orage/zoneinfo/Asia/Dacca.ics
+share/orage/zoneinfo/Asia/Ho_Chi_Minh.ics
+share/orage/zoneinfo/Asia/Kathmandu.ics
+share/orage/zoneinfo/Asia/Kolkata.ics
+share/orage/zoneinfo/Asia/Macau.ics
+share/orage/zoneinfo/Asia/Makassar.ics
+share/orage/zoneinfo/Asia/Oral.ics
+share/orage/zoneinfo/Asia/Qyzylorda.ics
+share/orage/zoneinfo/Asia/Riyadh87.ics
+share/orage/zoneinfo/Asia/Riyadh88.ics
+share/orage/zoneinfo/Asia/Riyadh89.ics
+share/orage/zoneinfo/Asia/Sakhalin.ics
+share/orage/zoneinfo/Asia/Tel_Aviv.ics
+share/orage/zoneinfo/Asia/Thimbu.ics
+share/orage/zoneinfo/Asia/Ulan_Bator.ics
+share/orage/zoneinfo/Atlantic/Faroe.ics
+share/orage/zoneinfo/Australia/ACT.ics
+share/orage/zoneinfo/Australia/Canberra.ics
+share/orage/zoneinfo/Australia/Currie.ics
+share/orage/zoneinfo/Australia/Eucla.ics
+share/orage/zoneinfo/Australia/LHI.ics
+share/orage/zoneinfo/Australia/NSW.ics
+share/orage/zoneinfo/Australia/North.ics
+share/orage/zoneinfo/Australia/Queensland.ics
+share/orage/zoneinfo/Australia/South.ics
+share/orage/zoneinfo/Australia/Tasmania.ics
+share/orage/zoneinfo/Australia/Victoria.ics
+share/orage/zoneinfo/Australia/West.ics
+share/orage/zoneinfo/Australia/Yancowinna.ics
+share/orage/zoneinfo/Brazil/Acre.ics
+share/orage/zoneinfo/Brazil/DeNoronha.ics
+share/orage/zoneinfo/Brazil/East.ics
+share/orage/zoneinfo/Brazil/West.ics
+share/orage/zoneinfo/Canada/Atlantic.ics
+share/orage/zoneinfo/Canada/Central.ics
+share/orage/zoneinfo/Canada/East-Saskatchewan.ics
+share/orage/zoneinfo/Canada/Eastern.ics
+share/orage/zoneinfo/Canada/Mountain.ics
+share/orage/zoneinfo/Canada/Newfoundland.ics
+share/orage/zoneinfo/Canada/Pacific.ics
+share/orage/zoneinfo/Canada/Saskatchewan.ics
+share/orage/zoneinfo/Canada/Yukon.ics
+share/orage/zoneinfo/Chile/Continental.ics
+share/orage/zoneinfo/Chile/EasterIsland.ics
+share/orage/zoneinfo/Etc/GMT+0.ics
+share/orage/zoneinfo/Etc/GMT+1.ics
+share/orage/zoneinfo/Etc/GMT+10.ics
+share/orage/zoneinfo/Etc/GMT+11.ics
+share/orage/zoneinfo/Etc/GMT+12.ics
+share/orage/zoneinfo/Etc/GMT+2.ics
+share/orage/zoneinfo/Etc/GMT+3.ics
+share/orage/zoneinfo/Etc/GMT+4.ics
+share/orage/zoneinfo/Etc/GMT+5.ics
+share/orage/zoneinfo/Etc/GMT+6.ics
+share/orage/zoneinfo/Etc/GMT+7.ics
+share/orage/zoneinfo/Etc/GMT+8.ics
+share/orage/zoneinfo/Etc/GMT+9.ics
+share/orage/zoneinfo/Etc/GMT-0.ics
+share/orage/zoneinfo/Etc/GMT-1.ics
+share/orage/zoneinfo/Etc/GMT-10.ics
+share/orage/zoneinfo/Etc/GMT-11.ics
+share/orage/zoneinfo/Etc/GMT-12.ics
+share/orage/zoneinfo/Etc/GMT-13.ics
+share/orage/zoneinfo/Etc/GMT-14.ics
+share/orage/zoneinfo/Etc/GMT-2.ics
+share/orage/zoneinfo/Etc/GMT-3.ics
+share/orage/zoneinfo/Etc/GMT-4.ics
+share/orage/zoneinfo/Etc/GMT-5.ics
+share/orage/zoneinfo/Etc/GMT-6.ics
+share/orage/zoneinfo/Etc/GMT-7.ics
+share/orage/zoneinfo/Etc/GMT-8.ics
+share/orage/zoneinfo/Etc/GMT-9.ics
+share/orage/zoneinfo/Etc/GMT.ics
+share/orage/zoneinfo/Etc/GMT0.ics
+share/orage/zoneinfo/Etc/Greenwich.ics
+share/orage/zoneinfo/Etc/UCT.ics
+share/orage/zoneinfo/Etc/UTC.ics
+share/orage/zoneinfo/Etc/Universal.ics
+share/orage/zoneinfo/Etc/Zulu.ics
+share/orage/zoneinfo/Europe/Guernsey.ics
+share/orage/zoneinfo/Europe/Isle_of_Man.ics
+share/orage/zoneinfo/Europe/Jersey.ics
+share/orage/zoneinfo/Europe/Mariehamn.ics
+share/orage/zoneinfo/Europe/Podgorica.ics
+share/orage/zoneinfo/Europe/Tiraspol.ics
+share/orage/zoneinfo/Europe/Volgograd.ics
+share/orage/zoneinfo/Mexico/BajaNorte.ics
+share/orage/zoneinfo/Mexico/BajaSur.ics
+share/orage/zoneinfo/Mexico/General.ics
+share/orage/zoneinfo/Mideast/Riyadh87.ics
+share/orage/zoneinfo/Mideast/Riyadh88.ics
+share/orage/zoneinfo/Mideast/Riyadh89.ics
+share/orage/zoneinfo/Pacific/Samoa.ics
+share/orage/zoneinfo/SystemV/AST4.ics
+share/orage/zoneinfo/SystemV/AST4ADT.ics
+share/orage/zoneinfo/SystemV/CST6.ics
+share/orage/zoneinfo/SystemV/CST6CDT.ics
+share/orage/zoneinfo/SystemV/EST5.ics
+share/orage/zoneinfo/SystemV/EST5EDT.ics
+share/orage/zoneinfo/SystemV/HST10.ics
+share/orage/zoneinfo/SystemV/MST7.ics
+share/orage/zoneinfo/SystemV/MST7MDT.ics
+share/orage/zoneinfo/SystemV/PST8.ics
+share/orage/zoneinfo/SystemV/PST8PDT.ics
+share/orage/zoneinfo/SystemV/YST9.ics
+share/orage/zoneinfo/SystemV/YST9YDT.ics
+share/orage/zoneinfo/US/Alaska.ics
+share/orage/zoneinfo/US/Aleutian.ics
+share/orage/zoneinfo/US/Arizona.ics
+share/orage/zoneinfo/US/Central.ics
+share/orage/zoneinfo/US/East-Indiana.ics
+share/orage/zoneinfo/US/Eastern.ics
+share/orage/zoneinfo/US/Hawaii.ics
+share/orage/zoneinfo/US/Indiana-Starke.ics
+share/orage/zoneinfo/US/Michigan.ics
+share/orage/zoneinfo/US/Mountain.ics
+share/orage/zoneinfo/US/Pacific.ics
+share/orage/zoneinfo/US/Samoa.ics
+share/orage/zoneinfo/tz_convert.par
share/orage/zoneinfo/zones.tab
-share/xfce4/panel-plugins/orageclock.desktop
+share/xfce4/panel-plugins/xfce4-orageclock-plugin.desktop
@dirrmtry libexec/xfce4/panel-plugins
@dirrmtry libexec/xfce4
@dirrmtry share/applications
@@ -482,12 +688,21 @@ share/xfce4/panel-plugins/orageclock.desktop
@dirrm share/orage/zoneinfo/America/Argentina
@dirrm share/orage/zoneinfo/America/Indiana
@dirrm share/orage/zoneinfo/America/Kentucky
+@dirrm share/orage/zoneinfo/America/North_Dakota
@dirrm share/orage/zoneinfo/America
@dirrm share/orage/zoneinfo/Antarctica
@dirrm share/orage/zoneinfo/Arctic
@dirrm share/orage/zoneinfo/Asia
@dirrm share/orage/zoneinfo/Atlantic
@dirrm share/orage/zoneinfo/Australia
+@dirrm share/orage/zoneinfo/Brazil
+@dirrm share/orage/zoneinfo/Canada
+@dirrm share/orage/zoneinfo/Chile
+@dirrm share/orage/zoneinfo/Etc
+@dirrm share/orage/zoneinfo/Mexico
+@dirrm share/orage/zoneinfo/Mideast
+@dirrm share/orage/zoneinfo/SystemV
+@dirrm share/orage/zoneinfo/US
@dirrm share/orage/zoneinfo/Europe
@dirrm share/orage/zoneinfo/Indian
@dirrm share/orage/zoneinfo/Pacific
diff --git a/deskutils/xfce4-generic-slider/Makefile b/deskutils/xfce4-generic-slider/Makefile
index 07d697b1f0eb..95b0eaf8f4e6 100644
--- a/deskutils/xfce4-generic-slider/Makefile
+++ b/deskutils/xfce4-generic-slider/Makefile
@@ -7,17 +7,21 @@
PORTNAME= xfce4-generic-slider
PORTVERSION= 0.0.20100827
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= CRITICAL
+MASTER_SITE_SUBDIR=xfce/4.6.2/src
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= A slider plugin to adjust and/or monitor any numeric variable
-USE_XFCE= panel
+#BROKEN= Does not work with xfce 4.8
+
+USE_XFCE= panel libutil libgui
USE_GNOME= pkgconfig
-CFLAGS+= `pkg-config --cflags libxfce4panel-1.0`
-LDFLAGS+= `pkg-config --libs libxfce4panel-1.0`
+CFLAGS+= `pkg-config --cflags libxfce4panel-1.0 libxfcegui4-1.0`
+LDFLAGS+= `pkg-config --libs libxfce4panel-1.0 libxfcegui4-1.0`
LICENSE= GPLv3
diff --git a/deskutils/xfce4-generic-slider/pkg-plist b/deskutils/xfce4-generic-slider/pkg-plist
index c640961a3e4c..8affa7fddb17 100644
--- a/deskutils/xfce4-generic-slider/pkg-plist
+++ b/deskutils/xfce4-generic-slider/pkg-plist
@@ -3,3 +3,5 @@ share/xfce4/panel-plugins/generic-slider.desktop
@dirrmtry lib/xfce4/xfce4/panel-plugins
@dirrmtry lib/xfce4/xfce4
@dirrmtry lib/xfce4
+@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 1d361a67f608..88e0f9e49d59 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -7,8 +7,10 @@
PORTNAME= xfce4-notes-plugin
PORTVERSION= 1.7.6
+PORTREVISION= 1
CATEGORIES= deskutils xfce
-MASTER_SITES= http://archive.xfce.org/src/panel-plugins/${PORTNAME}/1.7/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
diff --git a/deskutils/xfce4-notes-plugin/pkg-plist b/deskutils/xfce4-notes-plugin/pkg-plist
index 4f494891a5d1..cea1bc749f14 100644
--- a/deskutils/xfce4-notes-plugin/pkg-plist
+++ b/deskutils/xfce4-notes-plugin/pkg-plist
@@ -2,7 +2,10 @@ bin/xfce4-notes
bin/xfce4-notes-settings
bin/xfce4-popup-notes
etc/xdg/autostart/xfce4-notes-autostart.desktop
-libexec/xfce4/panel-plugins/xfce4-notes-plugin
+lib/xfce4/panel-plugins/libnotes.a
+lib/xfce4/panel-plugins/libnotes.la
+lib/xfce4/panel-plugins/libnotes.so
+lib/xfce4/panel-plugins/libnotes.so.0
share/applications/xfce4-notes.desktop
share/icons/hicolor/16x16/apps/xfce4-notes-plugin.png
share/icons/hicolor/22x22/apps/xfce4-notes-plugin.png
@@ -63,9 +66,11 @@ share/locale/zh_TW/LC_MESSAGES/xfce4-notes-plugin.mo
%%DATADIR%%/gtk-2.0/scrollbars/trough-scrollbar-vert.png
%%DATADIR%%/pixmaps/notes-menu-active.png
%%DATADIR%%/pixmaps/notes-menu.png
-share/xfce4/panel-plugins/xfce4-notes-plugin.desktop
+share/xfce4/panel-plugins/xfce4-notes-plugin-47.desktop
@dirrmtry share/xfce4/panel-plugins
@dirrmtry share/xfce4
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%/gtk-2.0/scrollbars
@dirrm %%DATADIR%%/gtk-2.0
diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile
index d9b9e95ff33d..1de8bca69fff 100644
--- a/deskutils/xfce4-notification-daemon/Makefile
+++ b/deskutils/xfce4-notification-daemon/Makefile
@@ -7,10 +7,11 @@
PORTNAME= notification-daemon
PORTVERSION= 0.3.7
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= deskutils xfce
MASTER_SITES= http://goodies.xfce.org/releases/notification-daemon-xfce/ \
CRITICAL
+MASTER_SITE_SUBDIR=xfce/4.6.2/src
PKGNAMEPREFIX= xfce4-
DISTNAME= ${PORTNAME}-xfce-${PORTVERSION}
DIST_SUBDIR= xfce4
diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index bba9c8a69dfc..51548e57b52a 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -6,44 +6,50 @@
#
PORTNAME= xfce4-notifyd
-PORTVERSION= 0.1.0
-PORTREVISION= 6
+PORTVERSION= 0.2.1
CATEGORIES= deskutils xfce
-MASTER_SITES= http://spuriousinterrupt.org/files/xfce4-notifyd/ \
- CRITICAL
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
+DIST_SUBDIR= xfce4
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Visually-appealing notification daemon for Xfce
-LIB_DEPENDS= sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
- dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-RUN_DEPENDS= dbus-daemon:${PORTSDIR}/devel/dbus
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+ notify.1:${PORTSDIR}/devel/libnotify
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= intltool librsvg2
-USE_XFCE= configenv libutil libgui
+USE_GNOME= gtk20 gnomehack intltool intlhack desktopfileutils pkgconfig
+USE_XFCE= configenv libexo libmenu libutil xfconf
INSTALLS_ICONS= yes
+USE_XORG= x11
-CONFLICTS= notification-daemon-[0-9]* xfce4-notification-daemon-[0-9]*
+CONFIGURE_ARGS= --disable-debug
+
+CONFLICTS= notification-daemon-[0-9]* xfce4-notification-daemon-[0-9]* \
+ xfce4-notifyd-0.1*
OPTIONS= NLS "Enable Native Language Support" on
+MAN1= xfce4-notifyd-config.1
+
LICENSE= GPLv3
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
+CONFIGURE_ARGS+=--enable-nls
PLIST_SUB+= NLS=""
.else
+CONFIGURE_ARGS+=--disable-nls
PLIST_SUB+= NLS="@comment "
.endif
-post-patch: .SILENT
-.if defined(WITHOUT_NLS)
- ${REINPLACE_CMD} -e 's|\(USE_NLS=\)yes|\1no|' ${WRKSRC}/configure
-.endif
+post-install:
+ @-update-desktop-database
.include <bsd.port.post.mk>
diff --git a/deskutils/xfce4-notifyd/distinfo b/deskutils/xfce4-notifyd/distinfo
index 3c2d34907fbb..9fcada4103da 100644
--- a/deskutils/xfce4-notifyd/distinfo
+++ b/deskutils/xfce4-notifyd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4-notifyd-0.1.0.tar.bz2) = 989b0e9ae9ff5bdbdbf56368a44eca039236033f84d05001e311c21c988bd0e1
-SIZE (xfce4-notifyd-0.1.0.tar.bz2) = 165593
+SHA256 (xfce4/xfce4-notifyd-0.2.1.tar.bz2) = aab2da3d14401ea91d816744e7c4b9e2e7a996e7d8b6756c7ad0c0b3bec3ed70
+SIZE (xfce4/xfce4-notifyd-0.2.1.tar.bz2) = 313671
diff --git a/deskutils/xfce4-notifyd/pkg-plist b/deskutils/xfce4-notifyd/pkg-plist
index bf841845a4a9..24e9d922e2fc 100644
--- a/deskutils/xfce4-notifyd/pkg-plist
+++ b/deskutils/xfce4-notifyd/pkg-plist
@@ -1,28 +1,62 @@
bin/xfce4-notifyd-config
-libexec/xfce4-notifyd
+lib/xfce4/notifyd/xfce4-notifyd
share/applications/xfce4-notifyd-config.desktop
share/dbus-1/services/org.freedesktop.Notifications.service
share/icons/hicolor/48x48/apps/xfce4-notifyd.png
-share/themes/Default/xfce-notify-4.0/gtkrc
-share/themes/Smoke/xfce-notify-4.0/gtkrc
-share/themes/ZOMG-PONIES!/xfce-notify-4.0/gtkrc
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-notifyd.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-notifyd.mo
%%NLS%%share/locale/da/LC_MESSAGES/xfce4-notifyd.mo
%%NLS%%share/locale/de/LC_MESSAGES/xfce4-notifyd.mo
%%NLS%%share/locale/el/LC_MESSAGES/xfce4-notifyd.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-notifyd.mo
%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-notifyd.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-notifyd.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-notifyd.mo
%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-notifyd.mo
%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-notifyd.mo
%%NLS%%share/locale/pt_PT/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-notifyd.mo
%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-notifyd.mo
%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-notifyd.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-notifyd.mo
+share/themes/Default/xfce-notify-4.0/gtkrc
+share/themes/Smoke/xfce-notify-4.0/gtkrc
+share/themes/ZOMG-PONIES!/xfce-notify-4.0/gtkrc
@dirrm share/themes/ZOMG-PONIES!/xfce-notify-4.0
-@dirrm share/themes/ZOMG-PONIES!
+@dirrmtry share/themes/ZOMG-PONIES!
@dirrm share/themes/Smoke/xfce-notify-4.0
-@dirrm share/themes/Smoke
+@dirrmtry share/themes/Smoke
@dirrm share/themes/Default/xfce-notify-4.0
@dirrmtry share/themes/Default
-@dirrmtry share/applications
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+@dirrm lib/xfce4/notifyd
+@dirrmtry lib/xfce4
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/deskutils/xfce4-volstatus-icon/Makefile b/deskutils/xfce4-volstatus-icon/Makefile
index fe8713e16903..b3a4d720d13f 100644
--- a/deskutils/xfce4-volstatus-icon/Makefile
+++ b/deskutils/xfce4-volstatus-icon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-volstatus-icon
PORTVERSION= 0.1.0
+PORTREVISION= 1
CATEGORIES= deskutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
@@ -18,6 +19,8 @@ COMMENT= Notification area icon that allows safe removal of removable devices
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
hal.1:${PORTSDIR}/sysutils/hal
+BROKEN= Does not work with xfce 4.8
+
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 8a5dd820d269..d74a13d13bdd 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfce4-xkb-plugin
PORTVERSION= 0.4.3
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= deskutils xfce
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= des@FreeBSD.org
diff --git a/devel/thunar-svn-plugin/Makefile b/devel/thunar-svn-plugin/Makefile
index 1f54e1ddbed0..b787628bc7e5 100644
--- a/devel/thunar-svn-plugin/Makefile
+++ b/devel/thunar-svn-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= thunar-svn-plugin
PORTVERSION= 0.0.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel xfce
-MASTER_SITES= http://goodies.xfce.org/releases/thunar-svn-plugin/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= sergey.dyatko@gmail.com
@@ -22,7 +23,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk20
-USE_XFCE= configenv libexo thunar
+USE_XFCE= configenv libexo thunar thunarvfs
.include <bsd.port.pre.mk>
@@ -30,4 +31,9 @@ USE_XFCE= configenv libexo thunar
BROKEN= does not configure on 6.X
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|exo-0\.3|exo-1|g; \
+ s|thunarx-1|thunarx-2|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.post.mk>
diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile
index 1f54e1ddbed0..b787628bc7e5 100644
--- a/devel/thunar-vcs-plugin/Makefile
+++ b/devel/thunar-vcs-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= thunar-svn-plugin
PORTVERSION= 0.0.3
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel xfce
-MASTER_SITES= http://goodies.xfce.org/releases/thunar-svn-plugin/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/thunar-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= sergey.dyatko@gmail.com
@@ -22,7 +23,7 @@ USE_GMAKE= yes
USE_GETTEXT= yes
GNU_CONFIGURE= yes
USE_GNOME= gtk20
-USE_XFCE= configenv libexo thunar
+USE_XFCE= configenv libexo thunar thunarvfs
.include <bsd.port.pre.mk>
@@ -30,4 +31,9 @@ USE_XFCE= configenv libexo thunar
BROKEN= does not configure on 6.X
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|exo-0\.3|exo-1|g; \
+ s|thunarx-1|thunarx-2|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.post.mk>
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index aaddb249bdb3..29b9711be25c 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-dev-tools
-PORTVERSION= 4.6.0
+PORTVERSION= 4.8.0
CATEGORIES= devel xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/devel/xfce4-dev-tools/distinfo b/devel/xfce4-dev-tools/distinfo
index 95c73a673ec3..44bbfea34a30 100644
--- a/devel/xfce4-dev-tools/distinfo
+++ b/devel/xfce4-dev-tools/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce4-dev-tools-4.6.0.tar.bz2) = c9587fa78e877eee858a33391d0afd62
-SHA256 (xfce4/xfce4-dev-tools-4.6.0.tar.bz2) = 4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac
-SIZE (xfce4/xfce4-dev-tools-4.6.0.tar.bz2) = 61934
+SHA256 (xfce4/xfce4-dev-tools-4.8.0.tar.bz2) = 7a1457e9dc839cb121a48e5c53c483ce02a3a5dbaf09376794a13bafe4194815
+SIZE (xfce4/xfce4-dev-tools-4.8.0.tar.bz2) = 77707
diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index b562be2386af..1be031edb2d4 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -7,9 +7,10 @@
PORTNAME= mousepad
PORTVERSION= 0.2.16
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= editors xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile
index dd1e26230d67..ad73bea0f9f2 100644
--- a/graphics/ristretto/Makefile
+++ b/graphics/ristretto/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ristretto
PORTVERSION= 0.0.91
+PORTREVISION= 1
CATEGORIES= graphics xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index 354e594d5491..6ea69bc2f739 100644
--- a/mail/xfce4-mailwatch-plugin/Makefile
+++ b/mail/xfce4-mailwatch-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-mailwatch-plugin
PORTVERSION= 1.1.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= mail xfce
MASTER_SITES= http://spuriousinterrupt.org/files/mailwatch/ \
http://freebsd.unixfreunde.de/sources/
@@ -27,4 +27,9 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libgui libutil panel
USE_XORG= x11 xt xaw
+post-patch:
+ @${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
+ s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index a0a4d857c301..32b95dcd5c38 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-appfinder
-PORTVERSION= 4.6.2
+PORTVERSION= 4.8.0
CATEGORIES= misc xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
@@ -15,11 +15,11 @@ MAINTAINER= oliver@FreeBSD.org
COMMENT= Find application in the system supporting Desktop entry format
GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
+INSTALLS_ICONS= yes
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE= configenv libgui libmenu libutil thunar xfconf
+USE_XFCE= configenv garcon libgui libmenu libutil thunar xfconf
.include <bsd.port.mk>
diff --git a/misc/xfce4-appfinder/distinfo b/misc/xfce4-appfinder/distinfo
index e2dbaa37f544..9c2fe2669316 100644
--- a/misc/xfce4-appfinder/distinfo
+++ b/misc/xfce4-appfinder/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce4-appfinder-4.6.2.tar.bz2) = 7752e43578b821e35010bcd3762da166
-SHA256 (xfce4/xfce4-appfinder-4.6.2.tar.bz2) = a1bf35b838922a7f81f588c727a6ef2f56b1bed0c46f7c36b209ac336f7e492a
-SIZE (xfce4/xfce4-appfinder-4.6.2.tar.bz2) = 340027
+SHA256 (xfce4/xfce4-appfinder-4.8.0.tar.bz2) = fd74184355e45f8a16cc3cdd32b012b6787a453deb3a8b96af90494c7a8ac77f
+SIZE (xfce4/xfce4-appfinder-4.8.0.tar.bz2) = 358433
diff --git a/misc/xfce4-appfinder/pkg-plist b/misc/xfce4-appfinder/pkg-plist
index d193447f972f..3f5984d536a0 100644
--- a/misc/xfce4-appfinder/pkg-plist
+++ b/misc/xfce4-appfinder/pkg-plist
@@ -1,16 +1,18 @@
bin/xfce4-appfinder
share/applications/xfce4-appfinder.desktop
share/icons/hicolor/48x48/apps/xfce4-appfinder.png
-share/locale/ast/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/kk/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/nn/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ug/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-appfinder.mo
share/locale/am/LC_MESSAGES/xfce4-appfinder.mo
share/locale/ar/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/ast/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/be/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/bn/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/bn_IN/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/ca/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/cs/LC_MESSAGES/xfce4-appfinder.mo
share/locale/da/LC_MESSAGES/xfce4-appfinder.mo
share/locale/de/LC_MESSAGES/xfce4-appfinder.mo
share/locale/dz/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/el/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
@@ -18,61 +20,64 @@ 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/fi/LC_MESSAGES/xfce4-appfinder.mo
share/locale/fr/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/gl/LC_MESSAGES/xfce4-appfinder.mo
share/locale/gu/LC_MESSAGES/xfce4-appfinder.mo
share/locale/he/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/hr/LC_MESSAGES/xfce4-appfinder.mo
share/locale/hu/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/hy/LC_MESSAGES/xfce4-appfinder.mo
share/locale/id/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/kk/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/ko/LC_MESSAGES/xfce4-appfinder.mo
share/locale/ku/LC_MESSAGES/xfce4-appfinder.mo
share/locale/lt/LC_MESSAGES/xfce4-appfinder.mo
share/locale/lv/LC_MESSAGES/xfce4-appfinder.mo
share/locale/mk/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/mr/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/nb/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/pl/LC_MESSAGES/xfce4-appfinder.mo
share/locale/pt/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/pt_BR/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/ro/LC_MESSAGES/xfce4-appfinder.mo
share/locale/ru/LC_MESSAGES/xfce4-appfinder.mo
share/locale/si/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/sk/LC_MESSAGES/xfce4-appfinder.mo
share/locale/sq/LC_MESSAGES/xfce4-appfinder.mo
share/locale/sv/LC_MESSAGES/xfce4-appfinder.mo
share/locale/tr/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ur/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/nb/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/ug/LC_MESSAGES/xfce4-appfinder.mo
share/locale/uk/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/ur/LC_MESSAGES/xfce4-appfinder.mo
+share/locale/ur_PK/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
-@dirrmtry share/applications
-@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/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/ast/LC_MESSAGES
@dirrmtry share/locale/ast
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
-
+@dirrmtry share/applications
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 9010e852b932..9d9d80dd41ef 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -6,10 +6,10 @@
#
PORTNAME= xfce4-weather-plugin
-PORTVERSION= 0.7.3
-PORTREVISION= 5
+PORTVERSION= 0.7.4
CATEGORIES= misc xfce geography
-MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.7/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
diff --git a/misc/xfce4-weather-plugin/distinfo b/misc/xfce4-weather-plugin/distinfo
index 20ff87888293..012e03d222e1 100644
--- a/misc/xfce4-weather-plugin/distinfo
+++ b/misc/xfce4-weather-plugin/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce4-weather-plugin-0.7.3.tar.bz2) = b3436929dd94cdd8acc744c474cca5c4
-SHA256 (xfce4/xfce4-weather-plugin-0.7.3.tar.bz2) = 3b369296ecf5b89a9906264647212b88c7ed5fdd3b2e54021e9b6dcd0463a5ab
-SIZE (xfce4/xfce4-weather-plugin-0.7.3.tar.bz2) = 658780
+SHA256 (xfce4/xfce4-weather-plugin-0.7.4.tar.bz2) = 3f76207b8a845d15bfec6825bd5300aedd086c455259c4dd8670a89a3c8ab382
+SIZE (xfce4/xfce4-weather-plugin-0.7.4.tar.bz2) = 686773
diff --git a/misc/xfce4-weather-plugin/pkg-plist b/misc/xfce4-weather-plugin/pkg-plist
index 1d3a1bb99fe2..9014f101c066 100644
--- a/misc/xfce4-weather-plugin/pkg-plist
+++ b/misc/xfce4-weather-plugin/pkg-plist
@@ -1,10 +1,12 @@
libexec/xfce4/panel-plugins/xfce4-weather-plugin
share/icons/hicolor/48x48/apps/xfce4-weather.png
share/locale/ar/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/ast/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/ca/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/cs/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/da/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/de/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/el/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/en_GB/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/es/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/eu/LC_MESSAGES/xfce4-weather-plugin.mo
@@ -23,10 +25,12 @@ share/locale/pa/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/pl/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/pt/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/pt_BR/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/ru/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/sk/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/sq/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/sv/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/tr/LC_MESSAGES/xfce4-weather-plugin.mo
+share/locale/ug/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/uk/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/ur/LC_MESSAGES/xfce4-weather-plugin.mo
share/locale/ur_PK/LC_MESSAGES/xfce4-weather-plugin.mo
@@ -87,6 +91,10 @@ share/xfce4/weather/icons/liquid/99.png
@dirrm share/xfce4/weather
@dirrmtry share/xfce4/panel-plugins
@dirrmtry share/xfce4
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
@dirrmtry share/locale/ur_PK/LC_MESSAGES
@dirrmtry share/locale/ur_PK
@dirrmtry share/locale/ur/LC_MESSAGES
diff --git a/misc/xfce4-wm-themes/Makefile b/misc/xfce4-wm-themes/Makefile
index f0a04e8a501f..d736bd3bad77 100644
--- a/misc/xfce4-wm-themes/Makefile
+++ b/misc/xfce4-wm-themes/Makefile
@@ -7,11 +7,13 @@
PORTNAME= xfce4-wm-themes
PORTVERSION= 4.6.0
+PORTREVISION= 1
CATEGORIES= misc xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= xfwm4-themes-${PORTVERSION}
DIST_SUBDIR= xfce4
+MASTER_SITE_SUBDIR=xfce/4.6.0/src
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 window decoration themes for xfwm4
diff --git a/misc/xfce4-wm-themes/distinfo b/misc/xfce4-wm-themes/distinfo
index d32d30761249..99932cdac219 100644
--- a/misc/xfce4-wm-themes/distinfo
+++ b/misc/xfce4-wm-themes/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfwm4-themes-4.6.0.tar.bz2) = 4dc5cb29cbd40e3b9dece12a85e20854
SHA256 (xfce4/xfwm4-themes-4.6.0.tar.bz2) = 9964ce221c1715a892c3ecb802739c0f5eae2b64912093d13fe7631710254c8c
SIZE (xfce4/xfwm4-themes-4.6.0.tar.bz2) = 508403
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 9d8b5f20c1e7..097d364d7292 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-media
PORTVERSION= 0.9.2
-PORTREVISION= 19
+PORTREVISION= 20
CATEGORIES= multimedia xfce
MASTER_SITES= http://spuriousinterrupt.org/files/xfmedia/
DISTNAME= xfmedia-${PORTVERSION}
@@ -18,6 +18,8 @@ COMMENT= Lightweight media player for Xfce4 based on the xine engine
LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine
+BROKEN= Does not work with xfce 4.8
+
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index 0f05c2292183..277317d74b32 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -7,11 +7,12 @@
PORTNAME= xfce4-parole
PORTVERSION= 0.2.0.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia xfce
-MASTER_SITES= http://archive.xfce.org/src/apps/parole/0.2/
-DISTNAME= parole-${PORTVERSION}
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/apps/parole/0.2
DIST_SUBDIR= xfce4
+DISTNAME= parole-${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= Lightweight media player for Xfce4 based on the gstreamer engine
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index 724771bacc73..1085a2c601d6 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfce4-xmms-plugin
PORTVERSION= 0.5.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= multimedia audio xfce
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
diff --git a/multimedia/xfmedia-remote-plugin/Makefile b/multimedia/xfmedia-remote-plugin/Makefile
index 0f207921e8f6..11394c8e264e 100644
--- a/multimedia/xfmedia-remote-plugin/Makefile
+++ b/multimedia/xfmedia-remote-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfmedia-remote-plugin
PORTVERSION= 0.2.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= multimedia audio xfce
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins//${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
@@ -17,6 +18,8 @@ COMMENT= XFce 4 media remote plugin for xfce4-panel
BUILD_DEPENDS= xfce4-media>=0.9.2:${PORTSDIR}/multimedia/xfce4-media
+BROKEN= Does not work with xfce 4.8
+
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/net-im/xfce4-messenger-plugin/Makefile b/net-im/xfce4-messenger-plugin/Makefile
index a9f3619411af..f31da7d09d34 100644
--- a/net-im/xfce4-messenger-plugin/Makefile
+++ b/net-im/xfce4-messenger-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-messenger-plugin
PORTVERSION= 0.1.0
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= net-im xfce
MASTER_SITES= ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
DIST_SUBDIR= xfce4
@@ -25,4 +25,9 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
USE_XFCE= configenv libgui libutil panel
USE_XORG= x11 xt xaw
+post-patch:
+ @${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
+ s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index cbbada943231..3a6a4fdefc45 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-print
PORTVERSION= 4.6.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= print xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR=xfce/4.6.1/src
diff --git a/print/xfce4-print/distinfo b/print/xfce4-print/distinfo
index 953c0afd56a5..48032f47a0e1 100644
--- a/print/xfce4-print/distinfo
+++ b/print/xfce4-print/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfprint-4.6.1.tar.bz2) = d92fca97a42816085080baf07a99a62e
SHA256 (xfce4/xfprint-4.6.1.tar.bz2) = be0cc5d149234c22dee69db5f8cbddebc46bc21a4f96fefdec21df36b2a15f17
SIZE (xfce4/xfprint-4.6.1.tar.bz2) = 842675
diff --git a/sysutils/thunar-volman-plugin/Makefile b/sysutils/thunar-volman-plugin/Makefile
index 9a52989861b2..9e7da251fd00 100644
--- a/sysutils/thunar-volman-plugin/Makefile
+++ b/sysutils/thunar-volman-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= thunar-volman
PORTVERSION= 0.3.80
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils xfce
-MASTER_SITES= http://archive.xfce.org/src/apps/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
@@ -18,6 +19,8 @@ COMMENT= A Device manager plugin.
LIB_DEPENDS= hal.1:${PORTSDIR}/sysutils/hal \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+BROKEN= Does not work with xfce 4.8
+
USE_BZIP2= yes
USE_GMAKE= yes
INSTALLS_ICONS= yes
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index 97a41e57e117..0411258a6da2 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -1,3 +1,4 @@
+
# New ports collection makefile for: xfburn
# Date created: 2008 November 06
# Whom: J.R. Oldroyd <fbsd@opal.com>
@@ -6,10 +7,11 @@
#
PORTNAME= xfburn
-PORTVERSION= 0.4.1
-PORTREVISION= 8
+PORTVERSION= 0.4.3
CATEGORIES= sysutils
-MASTER_SITES= http://goodies.xfce.org/releases/xfburn/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
+DIST_SUBDIR= xfce4
MAINTAINER= fbsd@opal.com
COMMENT= CD/DVD burning tool for Xfce
diff --git a/sysutils/xfburn/distinfo b/sysutils/xfburn/distinfo
index 736939eab116..b1b5e904ed08 100644
--- a/sysutils/xfburn/distinfo
+++ b/sysutils/xfburn/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfburn-0.4.1.tar.bz2) = f5ed76149fd348504d4a75830b4996dc
-SHA256 (xfburn-0.4.1.tar.bz2) = 1967d82539b70935beb4ffff32a79a9478193ccabedc6028c793ee4d78084f42
-SIZE (xfburn-0.4.1.tar.bz2) = 631005
+SHA256 (xfce4/xfburn-0.4.3.tar.bz2) = c9993226f0f4e3dea3326ad320a01c165a7e1a485f07fa4a2583475a4e6eaafe
+SIZE (xfce4/xfburn-0.4.3.tar.bz2) = 652080
diff --git a/sysutils/xfburn/pkg-plist b/sysutils/xfburn/pkg-plist
index e39e864a4135..3a368651fb71 100644
--- a/sysutils/xfburn/pkg-plist
+++ b/sysutils/xfburn/pkg-plist
@@ -63,12 +63,10 @@ share/locale/ja/LC_MESSAGES/xfburn.mo
share/locale/ko/LC_MESSAGES/xfburn.mo
share/locale/lt/LC_MESSAGES/xfburn.mo
share/locale/lv/LC_MESSAGES/xfburn.mo
-share/locale/nb_NO/LC_MESSAGES/xfburn.mo
share/locale/nl/LC_MESSAGES/xfburn.mo
share/locale/pa/LC_MESSAGES/xfburn.mo
share/locale/pl/LC_MESSAGES/xfburn.mo
share/locale/pt_BR/LC_MESSAGES/xfburn.mo
-share/locale/pt_PT/LC_MESSAGES/xfburn.mo
share/locale/ru/LC_MESSAGES/xfburn.mo
share/locale/sq/LC_MESSAGES/xfburn.mo
share/locale/sv/LC_MESSAGES/xfburn.mo
@@ -77,6 +75,11 @@ share/locale/uk/LC_MESSAGES/xfburn.mo
share/locale/ur/LC_MESSAGES/xfburn.mo
share/locale/zh_CN/LC_MESSAGES/xfburn.mo
share/locale/zh_TW/LC_MESSAGES/xfburn.mo
+share/locale/ast/LC_MESSAGES/xfburn.mo
+share/locale/kk/LC_MESSAGES/xfburn.mo
+share/locale/nb/LC_MESSAGES/xfburn.mo
+share/locale/pt/LC_MESSAGES/xfburn.mo
+share/locale/ur_PK/LC_MESSAGES/xfburn.mo
@dirrm %%DATADIR%%
@dirrmtry share/locale/ar/LC_MESSAGES
@dirrmtry share/locale/ar
@@ -148,6 +151,12 @@ share/locale/zh_TW/LC_MESSAGES/xfburn.mo
@dirrmtry share/locale/zh_CN
@dirrmtry share/locale/zh_TW/LC_MESSAGES
@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
@dirrmtry share/Thunar/sendto
@dirrmtry share/Thunar
@unexec /bin/rm %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || /usr/bin/true
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 6d4a28d2c639..437475bf31ca 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfce4-battery-plugin
PORTVERSION= 0.5.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= sysutils xfce
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index 08c2b14a33a7..83415009721e 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-cpugraph-plugin
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index afb53a210cd7..451c1ca5ba8a 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-fsguard-plugin
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index 337c5a4b8d8c..76b0107c480f 100644
--- a/sysutils/xfce4-genmon-plugin/Makefile
+++ b/sysutils/xfce4-genmon-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-genmon-plugin
PORTVERSION= 3.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= sysutils xfce
MASTER_SITES= CRITICAL/xfce4
DIST_SUBDIR= xfce4
@@ -20,6 +20,11 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE= configenv panel
+USE_XFCE= configenv libutil libgui panel
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
+ s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g' \
+ ${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index 6394ebc8599b..b2a5172f481a 100644
--- a/sysutils/xfce4-minicmd-plugin/Makefile
+++ b/sysutils/xfce4-minicmd-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-minicmd-plugin
PORTVERSION= 0.4
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= sysutils xfce
MASTER_SITES= ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile
index 3f927f7181fc..732e28cad7b2 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-netload-plugin
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-places-plugin/Makefile b/sysutils/xfce4-places-plugin/Makefile
index 207c997c3c7c..1ed931091556 100644
--- a/sysutils/xfce4-places-plugin/Makefile
+++ b/sysutils/xfce4-places-plugin/Makefile
@@ -7,20 +7,29 @@
PORTNAME= xfce4-places-plugin
PORTVERSION= 1.2.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils xfce
-MASTER_SITES= http://archive.xfce.org/src/panel-plugins/${PORTNAME}/1.2/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
-#DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= A file browser launcher for XFce4 panel plugin
+BROKEN= Does not work with xfce 4.8
+
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE= configenv panel thunar
+USE_XFCE= configenv panel thunar thunarvfs
+
+# exo_url_show function is still missing
+#post-patch:
+# @${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
+# s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
+# s|exo-0.3|exo-1|g' \
+# ${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index ded04c017ea2..0ce62daaaf40 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfce4-power-manager
PORTVERSION= 0.8.2
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils xfce
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= fbsd@opal.com
@@ -20,8 +21,13 @@ USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE= configenv panel
+USE_XFCE= configenv libutil libgui panel
MAN1= xfce4-power-manager.1 xfce4-power-manager-settings.1
+post-patch:
+ @${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
+ s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.mk>
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index 7997ebf6d9c5..8ebee8442057 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -6,16 +6,18 @@
#
PORTNAME= xfce4-settings
-PORTVERSION= 4.6.5
+PORTVERSION= 4.8.1
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR= src/xfce/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 settings application
-LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
- dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+CONFLICTS= xfce4-settings-4.6*
+
+LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
OPTIONS= XKLAVIER "Keyboard layout settings" off \
XCURSOR "Enable cursor themes support" on \
@@ -23,15 +25,16 @@ OPTIONS= XKLAVIER "Keyboard layout settings" off \
NOTIFY "Enable notification support" on \
NLS "Enable Native Language Support" on
-CONFIGURE_ARGS= --disable-sound-settings --disable-debug
+CONFIGURE_ARGS= --disable-sound-settings \
+ --disable-debug
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= gnometarget glib20 gtk20 desktopfileutils intltool intlhack \
- libglade2 pkgconfig
-USE_XFCE= configenv libexo libgui libutil xfconf
+USE_GNOME= gnomehack glib20 gtk20 desktopfileutils intltool intlhack \
+ pkgconfig
+USE_XFCE= configenv libexo libmenu libutil xfconf
USE_XORG= x11 xi
.include <bsd.port.pre.mk>
diff --git a/sysutils/xfce4-settings/distinfo b/sysutils/xfce4-settings/distinfo
index 0d28c5a1022d..1b71f8686dbc 100644
--- a/sysutils/xfce4-settings/distinfo
+++ b/sysutils/xfce4-settings/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce4-settings-4.6.5.tar.bz2) = f988cb732913b5fbc115ad7105d2231e
-SHA256 (xfce4/xfce4-settings-4.6.5.tar.bz2) = 1601b8d2cac5d931c39bed7e331c5bd91018d0e56663295e7a083a2c78fe168b
-SIZE (xfce4/xfce4-settings-4.6.5.tar.bz2) = 522389
+SHA256 (xfce4/xfce4-settings-4.8.1.tar.bz2) = 0df5fa505c0a5c0ec0741c0ecb1f18b3fbb59eed39a0b21851ee0379501f1b5a
+SIZE (xfce4/xfce4-settings-4.8.1.tar.bz2) = 660885
diff --git a/sysutils/xfce4-settings/pkg-plist b/sysutils/xfce4-settings/pkg-plist
index b1e1d197ad66..0f77b3c08b26 100644
--- a/sysutils/xfce4-settings/pkg-plist
+++ b/sysutils/xfce4-settings/pkg-plist
@@ -10,37 +10,44 @@ bin/xfsettingsd
etc/xdg/autostart/xfce4-settings-helper-autostart.desktop
etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
%%XRANDR%%%%NLS%%share/applications/xfce-display-settings.desktop
-%%NLS%%share/applications/xfce-keyboard-settings.desktop
-%%NLS%%share/applications/xfce-mouse-settings.desktop
-%%NLS%%share/applications/xfce-settings-manager.desktop
-%%NLS%%share/applications/xfce-ui-settings.desktop
-%%NLS%%share/applications/xfce4-accessibility-settings.desktop
-%%NLS%%share/applications/xfce4-settings-editor.desktop
-%%NLS%%share/locale/am/LC_MESSAGES/xfce4-settings.mo
+share/applications/xfce-keyboard-settings.desktop
+share/applications/xfce-mouse-settings.desktop
+share/applications/xfce-settings-manager.desktop
+share/applications/xfce-ui-settings.desktop
+share/applications/xfce4-accessibility-settings.desktop
+share/applications/xfce4-settings-editor.desktop
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/da/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/de/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/el/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-settings.mo
@@ -49,74 +56,21 @@ etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-settings.mo
@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ur_PK
%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ur
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tr
-%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt_BR
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl
-%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nb
-%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lv
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja
-%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it
-%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id
-%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hu
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eu
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/el
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
-%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/da
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ast
-%%NLS%%@dirrmtry share/locale/am/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/am
@dirrmtry etc/xdg/xfce4/xfconf/xfce-perchannel-xml
@dirrmtry etc/xdg/xfce4/xfconf
@dirrmtry etc/xdg/xfce4
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index 0e3e57b1cfcb..9c3b4048d41c 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xfce4-systemload-plugin
PORTVERSION= 1.0.0
+PORTREVISION= 1
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index b6876446de04..8d2ff24b10cd 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -6,25 +6,36 @@
#
PORTNAME= xfce4-utils
-PORTVERSION= 4.6.2
+PORTVERSION= 4.8.1
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR= src/xfce/xfce-utils/${PORTVERSION:R}
DISTNAME= xfce-utils-${PORTVERSION}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 essential utilities and scripts
-CONFIGURE_ARGS+=--with-xsession-prefix=${PREFIX}
+CONFLICTS= xfce4-utils-4.6*
+
+BUILD_DEPENDS= p5-XML-Parser>=2.40:${PORTSDIR}/textproc/p5-XML-Parser
+
+DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/4//}
+
+CONFIGURE_ARGS+=--with-xsession-prefix=${PREFIX} \
+ --disable-debug
+USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
+INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
-USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE= configenv libgui libutil panel
+USE_PERL5= yes
+USE_GNOME= gnomehack gtk20 intltool intlhack desktopfileutils pkgconfig
+USE_XFCE= configenv libgui libmenu libutil xfconf
+USE_XORG= x11
-OPTIONS= DBUS "Enable D-BUS support" on
+OPTIONS= DBUS "Enable D-BUS support" on \
+ NLS "Enable Native Language Support" on
.include <bsd.port.pre.mk>
@@ -37,10 +48,22 @@ CONFIGURE_ARGS+=--disable-dbus
PLIST_SUB+= WITH_DBUS="@comment "
.endif
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
post-patch:
@${REINPLACE_CMD} 's|/usr/local/share:|${LOCALBASE}/share:|' \
${WRKSRC}/scripts/startxfce4.in
@${REINPLACE_CMD} 's|/usr/local/share:||' \
${WRKSRC}/scripts/startxfce4.in
+post-install:
+ @-update-desktop-database
+
.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-utils/distinfo b/sysutils/xfce4-utils/distinfo
index c2287eb1bf03..82aea3c80bac 100644
--- a/sysutils/xfce4-utils/distinfo
+++ b/sysutils/xfce4-utils/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce-utils-4.6.2.tar.bz2) = 5d23407700d7e8c9751e17a5bc955109
-SHA256 (xfce4/xfce-utils-4.6.2.tar.bz2) = 54efc2038bfbd5acaadfc91ed91fb3dfd6cec64f9402f364accce7bcafe2ba7a
-SIZE (xfce4/xfce-utils-4.6.2.tar.bz2) = 638094
+SHA256 (xfce4/xfce-utils-4.8.1.tar.bz2) = ed04c66b6b9cc65e434adf04732407673db90d74bc225c3d8952d09a7caf8686
+SIZE (xfce4/xfce-utils-4.8.1.tar.bz2) = 706171
diff --git a/sysutils/xfce4-utils/pkg-plist b/sysutils/xfce4-utils/pkg-plist
index 6f9e1456b8d1..3998cff33c4d 100644
--- a/sysutils/xfce4-utils/pkg-plist
+++ b/sysutils/xfce4-utils/pkg-plist
@@ -9,140 +9,177 @@ bin/xfterm4
etc/xdg/autostart/xfconf-migration-4.6.desktop
etc/xdg/xfce4/Xft.xrdb
etc/xdg/xfce4/xinitrc
-libexec/xfce4/xfconf-migration/xfconf-migration-4.6.pl
+lib/xfce4/xfconf-migration/xfconf-migration-4.6.pl
+share/applications/xfce4-about.desktop
+share/applications/xfhelp4.desktop
+share/applications/xfrun4.desktop
%%WITH_DBUS%%share/dbus-1/services/org.xfce.RunDialog.service
+%%DOCSDIR%%/html/C/BSD.html
+%%DOCSDIR%%/html/C/GPL.html
+%%DOCSDIR%%/html/C/LGPL.html
+%%DOCSDIR%%/html/C/images/about-dialog.png
+%%DOCSDIR%%/html/C/images/default-session.png
+%%DOCSDIR%%/html/C/images/run-dialog.png
+%%DOCSDIR%%/html/C/images/xfce-mouse.png
+%%DOCSDIR%%/html/C/index.html
+%%DOCSDIR%%/html/C/xfce-user-guide.html
+%%DOCSDIR%%/html/C/xfce-utils.html
+%%DOCSDIR%%/html/da/BSD.html
+%%DOCSDIR%%/html/da/GPL.html
+%%DOCSDIR%%/html/da/LGPL.html
+%%DOCSDIR%%/html/da/images
+%%DOCSDIR%%/html/da/index.html
+%%DOCSDIR%%/html/da/xfce-user-guide.html
+%%DOCSDIR%%/html/da/xfce-utils.html
+%%DOCSDIR%%/html/el/BSD.html
+%%DOCSDIR%%/html/el/GPL.html
+%%DOCSDIR%%/html/el/LGPL.html
+%%DOCSDIR%%/html/el/index.html
+%%DOCSDIR%%/html/el/xfce-user-guide.html
+%%DOCSDIR%%/html/el/xfce-utils.html
+%%DOCSDIR%%/html/el/images
+%%DOCSDIR%%/html/gl/BSD.html
+%%DOCSDIR%%/html/gl/GPL.html
+%%DOCSDIR%%/html/gl/LGPL.html
+%%DOCSDIR%%/html/gl/images
+%%DOCSDIR%%/html/gl/index.html
+%%DOCSDIR%%/html/gl/xfce-user-guide.html
+%%DOCSDIR%%/html/gl/xfce-utils.html
+%%DOCSDIR%%/html/it/BSD.html
+%%DOCSDIR%%/html/it/GPL.html
+%%DOCSDIR%%/html/it/LGPL.html
+%%DOCSDIR%%/html/it/images
+%%DOCSDIR%%/html/it/index.html
+%%DOCSDIR%%/html/it/xfce-user-guide.html
+%%DOCSDIR%%/html/it/xfce-utils.html
+%%DOCSDIR%%/html/ja/BSD.html
+%%DOCSDIR%%/html/ja/GPL.html
+%%DOCSDIR%%/html/ja/LGPL.html
+%%DOCSDIR%%/html/ja/images
+%%DOCSDIR%%/html/ja/index.html
+%%DOCSDIR%%/html/ja/xfce-user-guide.html
+%%DOCSDIR%%/html/ja/xfce-utils.html
+%%DOCSDIR%%/html/sv/BSD.html
+%%DOCSDIR%%/html/sv/GPL.html
+%%DOCSDIR%%/html/sv/LGPL.html
+%%DOCSDIR%%/html/sv/images
+%%DOCSDIR%%/html/sv/index.html
+%%DOCSDIR%%/html/sv/xfce-user-guide.html
+%%DOCSDIR%%/html/sv/xfce-utils.html
+%%DOCSDIR%%/html/ug/BSD.html
+%%DOCSDIR%%/html/ug/GPL.html
+%%DOCSDIR%%/html/ug/LGPL.html
+%%DOCSDIR%%/html/ug/images
+%%DOCSDIR%%/html/ug/index.html
+%%DOCSDIR%%/html/ug/xfce-user-guide.html
+%%DOCSDIR%%/html/ug/xfce-utils.html
+%%DOCSDIR%%/html/xfce-utils.css
share/icons/hicolor/48x48/apps/xfce4-logo.png
-share/locale/ast/LC_MESSAGES/xfce-utils.mo
-share/locale/kk/LC_MESSAGES/xfce-utils.mo
-share/locale/nn/LC_MESSAGES/xfce-utils.mo
-share/locale/ug/LC_MESSAGES/xfce-utils.mo
-share/locale/ur_PK/LC_MESSAGES/xfce-utils.mo
-share/locale/af/LC_MESSAGES/xfce-utils.mo
-share/locale/am/LC_MESSAGES/xfce-utils.mo
-share/locale/ar/LC_MESSAGES/xfce-utils.mo
-share/locale/az/LC_MESSAGES/xfce-utils.mo
-share/locale/be/LC_MESSAGES/xfce-utils.mo
-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
-share/locale/es/LC_MESSAGES/xfce-utils.mo
-share/locale/es_MX/LC_MESSAGES/xfce-utils.mo
-share/locale/et/LC_MESSAGES/xfce-utils.mo
-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
-share/locale/hu/LC_MESSAGES/xfce-utils.mo
-share/locale/hy/LC_MESSAGES/xfce-utils.mo
-share/locale/id/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/lv/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/nb/LC_MESSAGES/xfce-utils.mo
-share/locale/nl/LC_MESSAGES/xfce-utils.mo
-share/locale/pl/LC_MESSAGES/xfce-utils.mo
-share/locale/pa/LC_MESSAGES/xfce-utils.mo
-share/locale/pt_BR/LC_MESSAGES/xfce-utils.mo
-share/locale/pt/LC_MESSAGES/xfce-utils.mo
-share/locale/ro/LC_MESSAGES/xfce-utils.mo
-share/locale/ru/LC_MESSAGES/xfce-utils.mo
-share/locale/si/LC_MESSAGES/xfce-utils.mo
-share/locale/sk/LC_MESSAGES/xfce-utils.mo
-share/locale/sq/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
-share/locale/uk/LC_MESSAGES/xfce-utils.mo
-share/locale/ur/LC_MESSAGES/xfce-utils.mo
-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/COPYING
-share/xfce4/BSD
-share/xfce4/GPL
-share/xfce4/INFO
-share/xfce4/INFO.ca
-share/xfce4/INFO.de
-share/xfce4/INFO.es
-share/xfce4/INFO.fi
-share/xfce4/INFO.fr
-share/xfce4/INFO.it
-share/xfce4/INFO.ja
-share/xfce4/INFO.ru
-share/xfce4/INFO.uk
-share/xfce4/INFO.vi
-share/xfce4/LGPL
-share/xfce4/doc/C/index.html
-share/xfce4/doc/C/images/about-dialog.png
-share/xfce4/doc/C/images/run-dialog.png
-share/xfce4/doc/C/images/default-session.png
-share/xfce4/doc/C/images/link_xfce.jpg
-share/xfce4/doc/C/images/taskbar_settings.png
-share/xfce4/doc/C/BSD.html
-share/xfce4/doc/C/GPL.html
-share/xfce4/doc/C/LGPL.html
-share/xfce4/doc/C/xfce-utils.html
-share/xfce4/doc/C/xfce4-components.html
-share/xfce4/doc/C/xfce4-user-guide.html
-share/xfce4/doc/C/xfce4-intro.html
-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/it/index.html
-share/xfce4/doc/xfce.css
-share/xfce4/doc/xfce-chunk.css
-share/xfce4/doc/xfce-mouse.png
+%%NLS%%share/locale/af/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/am/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/az/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/es_MX/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/gu/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/hy/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce-utils.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce-utils.mo
share/xsessions/xfce.desktop
-@dirrmtry etc/xdg/autostart
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrm share/xsessions
+%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
+%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/mr
+%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ku
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/hy/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hy
+%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/dz
+%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bn_IN
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+@dirrm %%DOCSDIR%%/html/ug
+@dirrm %%DOCSDIR%%/html/sv
+@dirrm %%DOCSDIR%%/html/ja
+@dirrm %%DOCSDIR%%/html/it
+@dirrm %%DOCSDIR%%/html/gl
+@dirrm %%DOCSDIR%%/html/el
+@dirrm %%DOCSDIR%%/html/da
+@dirrm %%DOCSDIR%%/html/C/images
+@dirrm %%DOCSDIR%%/html/C
+@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%
+%%WITH_DBUS%%@dirrmtry share/dbus-1/services
+%%WITH_DBUS%%@dirrmtry share/dbus-1
+@dirrm lib/xfce4/xfconf-migration
+@dirrmtry lib/xfce4
@dirrmtry etc/xdg/xfce4
+@dirrmtry etc/xdg/autostart
@dirrmtry etc/xdg
-@dirrmtry etc/xfce4
-@dirrm libexec/xfce4/xfconf-migration
-@dirrmtry libexec/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/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
-@dirrmtry share/xfce4/doc/C/images
-@dirrmtry share/xfce4/doc/C
-@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/it
-@dirrmtry share/xfce4/doc
-@dirrmtry share/xfce4
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/xsessions
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index bc61d11a8976..525d21a66269 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfce4-wavelan-plugin
PORTVERSION= 0.5.4
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= sysutils xfce
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
@@ -21,6 +22,11 @@ GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
-USE_XFCE= configenv panel
+USE_XFCE= configenv libutil libgui panel
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
+ s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g' \
+ ${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile
index f405976c0b26..98b61e3c139c 100644
--- a/textproc/xfce4-dict-plugin/Makefile
+++ b/textproc/xfce4-dict-plugin/Makefile
@@ -7,11 +7,12 @@
PORTNAME= xfce4-dict
PORTVERSION= 0.6.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc xfce
-MASTER_SITES= http://archive.xfce.org/src/apps/${PORTNAME}/0.6/
-PKGNAMESUFFIX= -plugin
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
+PKGNAMESUFFIX= -plugin
MAINTAINER= miwi@FreeBSD.org
COMMENT= Xfce Plugin for searching for the translation or explanation of a word
diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile
index 84c2b1d08424..536db0ac1e19 100644
--- a/www/xfce4-smartbookmark-plugin/Makefile
+++ b/www/xfce4-smartbookmark-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfce4-smartbookmark-plugin
PORTVERSION= 0.4.2
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= www xfce
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index 6f2fb65fa3ae..81b719fada23 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfce4-datetime-plugin
PORTVERSION= 0.6.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-clocks xfce
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
diff --git a/x11-clocks/xfce4-timer-out-plugin/Makefile b/x11-clocks/xfce4-timer-out-plugin/Makefile
index 519524ff150a..216c09bd36d9 100644
--- a/x11-clocks/xfce4-timer-out-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-out-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfce4-time-out-plugin
PORTVERSION= 0.1.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11-clocks xfce
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile
index 0bd8bda3e1b3..f10d4e75773c 100644
--- a/x11-clocks/xfce4-timer-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfce4-timer-plugin
PORTVERSION= 0.6.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11-clocks xfce
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index e974d1a0ecf8..f3f7debf5463 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -6,31 +6,32 @@
#
PORTNAME= Thunar
-PORTVERSION= 1.0.2
+PORTVERSION= 1.2.1
CATEGORIES= x11-fm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR= src/xfce/${PORTNAME:L}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 file manager
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS= tumbler-1.0:${PORTSDIR}/deskutils/xfce4-tumbler
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
+USE_PERL5= yes
USE_GMAKE= yes
-USE_GNOME= desktopfileutils glib20 gnomehack gtk20 intltool intlhack pkgconfig
+USE_GNOME= desktopfileutils glib20 gnomehack gtk20 intltool intlhack pkgconfig gdkpixbuf2
USE_LDCONFIG= yes
-USE_XFCE= configenv libexo libutil
+USE_XFCE= configenv libexo libmenu libutil
+USE_XORG= sm x11
OPTIONS= DBUS "Enable D-BUS support" on \
- JPEG "Enable JPEG support" on \
- FAM "Enable FAM support" on \
- HAL "Enable HAL support" on \
- GCONF "Enable GCONF support" off \
+ NLS "Enable Native Language Support" on \
STARTUP "Enable startup notification support" on \
+ NOTIFY "Enable mount notifications support" on \
+ APIDOCS "Install api documentation" on \
PLUG_APR "Thunar Advanced Properties plugin" on \
PLUG_APR_EXIF "Exif support for the APR plugin" off \
PLUG_SBR "Thunar Simple Builtin Renamers plugin" on \
@@ -39,6 +40,9 @@ OPTIONS= DBUS "Enable D-BUS support" on \
PLUG_UCA "Thunar User Customizable Actions plugin" on \
PLUG_WALL "Thunar Wallpaper plugin" on
+CONFIGURE_ARGS+= --disable-debug \
+ --enable-gio-unix \
+ --disable-gudev
MAN1= Thunar.1
@@ -53,27 +57,28 @@ CONFIGURE_ARGS+=--disable-dbus
PLIST_SUB+= WITH_DBUS="@comment "
.endif
-.if !defined(WITHOUT_JPEG)
-LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg
-CONFIGURE_ARGS+=--enable-jpeg
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+= NLS=""
.else
-CONFIGURE_ARGS+=--disable-jpeg
-.endif
-
-.if !defined(WITHOUT_HAL)
-LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
.endif
-.if defined(WITH_FAM)
-USE_FAM= yes
-WANT_FAM_SYSTEM=gamin
+.if !defined(WITHOUT_NOTIFY)
+LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+=--enable-notifications
+.else
+CONFIGURE_ARGS+=--disable-notifications
.endif
-.if defined(WITH_GCONF)
-USE_GNOME+= gconf2
-CONFIGURE_ARGS+=--enable-gconf
+.if defined(WITHOUT_APIDOCS)
+CONFIGURE_ARGS+= --without-html-dir
+PLIST_SUB+= APIDOCS="@comment "
.else
-CONFIGURE_ARGS+=--disable-gconf
+CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/gtk-doc/html
+PLIST_SUB+= APIDOCS=""
.endif
.if !defined(WITHOUT_PLUG_APR)
@@ -105,6 +110,7 @@ PLIST_SUB+= PLUGIN_SBR="@comment "
.endif
.if !defined(WITHOUT_PLUG_TPA)
+#USE_XFCE+= xfcehack
CONFIGURE_ARGS+=--enable-tpa-plugin
PLIST_SUB+= PLUGIN_TPA=""
USE_XFCE+= panel
@@ -144,12 +150,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|docdir = .*|docdir = ${DOCSDIR}|' \
${WRKSRC}/docs/Makefile.in
@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure
-.if !defined(WITH_FAM)
- @${REINPLACE_CMD} -e 's|gamin|no-gamin|g; s|fam|no-fam|g' ${WRKSRC}/configure
-.endif
-.if !defined(WITH_HAL)
- @${REINPLACE_CMD} -e 's|hal-storage|no-hal-storage|g' ${WRKSRC}/configure
-.endif
@${REINPLACE_CMD} -e 's|enable_val|enableval|g' ${WRKSRC}/configure
post-install:
diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo
index 6a462edec047..9067d9d70719 100644
--- a/x11-fm/thunar/distinfo
+++ b/x11-fm/thunar/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/Thunar-1.0.2.tar.bz2) = c91073202d373a1f9951a1240083c36d
-SHA256 (xfce4/Thunar-1.0.2.tar.bz2) = 75829b34a68346b33f66882bedc9794d580c200d11af22541885750459b55c03
-SIZE (xfce4/Thunar-1.0.2.tar.bz2) = 9320379
+SHA256 (xfce4/Thunar-1.2.1.tar.bz2) = 67e9886895771cf3b51af1ac5e13cb9e3892d2546a1a814869f83be06409a49b
+SIZE (xfce4/Thunar-1.2.1.tar.bz2) = 4181843
diff --git a/x11-fm/thunar/pkg-plist b/x11-fm/thunar/pkg-plist
index 128569d10d8a..e1f942c7d086 100644
--- a/x11-fm/thunar/pkg-plist
+++ b/x11-fm/thunar/pkg-plist
@@ -2,59 +2,34 @@ bin/Thunar
bin/thunar
bin/thunar-settings
%%PLUGIN_UCA%%etc/xdg/Thunar/uca.xml
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-config.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-enum-types.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-info.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-interactive-job.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-job.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-mime-action.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-mime-application.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-mime-database.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-mime-handler.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-mime-info.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-monitor.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-path.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-thumb.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-types.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-user.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-util.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs-volume.h
-include/thunar-vfs-1/thunar-vfs/thunar-vfs.h
-include/thunarx-1/thunarx/thunarx-config.h
-include/thunarx-1/thunarx/thunarx-file-info.h
-include/thunarx-1/thunarx/thunarx-menu-provider.h
-include/thunarx-1/thunarx/thunarx-preferences-provider.h
-include/thunarx-1/thunarx/thunarx-property-page-provider.h
-include/thunarx-1/thunarx/thunarx-property-page.h
-include/thunarx-1/thunarx/thunarx-provider-factory.h
-include/thunarx-1/thunarx/thunarx-provider-plugin.h
-include/thunarx-1/thunarx/thunarx-renamer-provider.h
-include/thunarx-1/thunarx/thunarx-renamer.h
-include/thunarx-1/thunarx/thunarx.h
-lib/libthunar-vfs-1.la
-lib/libthunar-vfs-1.so
-lib/libthunar-vfs-1.so.5
-lib/libthunarx-1.la
-lib/libthunarx-1.so
-lib/libthunarx-1.so.5
-%%PLUGIN_APR%%lib/thunarx-1/thunar-apr.la
-%%PLUGIN_APR%%lib/thunarx-1/thunar-apr.so
-%%PLUGIN_SBR%%lib/thunarx-1/thunar-sbr.la
-%%PLUGIN_SBR%%lib/thunarx-1/thunar-sbr.so
-%%PLUGIN_UCA%%lib/thunarx-1/thunar-uca.la
-%%PLUGIN_UCA%%lib/thunarx-1/thunar-uca.so
-%%PLUGIN_WALL%%lib/thunarx-1/thunar-wallpaper-plugin.so
-%%PLUGIN_WALL%%lib/thunarx-1/thunar-wallpaper-plugin.la
-libdata/pkgconfig/thunar-vfs-1.pc
-libdata/pkgconfig/thunarx-1.pc
-libexec/ThunarBulkRename
-libexec/ThunarHelp
-libexec/thunar-sendto-email
-libexec/thunar-vfs-font-thumbnailer-1
-libexec/thunar-vfs-mime-cleaner-1
-libexec/thunar-vfs-pixbuf-thumbnailer-1
-libexec/thunar-vfs-update-thumbnailers-cache-1
-%%PLUGIN_TPA%%libexec/xfce4/panel-plugins/thunar-tpa
+include/thunarx-2/thunarx/thunarx-config.h
+include/thunarx-2/thunarx/thunarx-file-info.h
+include/thunarx-2/thunarx/thunarx-menu-provider.h
+include/thunarx-2/thunarx/thunarx-preferences-provider.h
+include/thunarx-2/thunarx/thunarx-property-page-provider.h
+include/thunarx-2/thunarx/thunarx-property-page.h
+include/thunarx-2/thunarx/thunarx-provider-factory.h
+include/thunarx-2/thunarx/thunarx-provider-plugin.h
+include/thunarx-2/thunarx/thunarx-renamer-provider.h
+include/thunarx-2/thunarx/thunarx-renamer.h
+include/thunarx-2/thunarx/thunarx.h
+lib/Thunar/ThunarBulkRename
+lib/Thunar/ThunarHelp
+lib/Thunar/thunar-sendto-email
+lib/libthunarx-2.la
+lib/libthunarx-2.so
+lib/libthunarx-2.so.0
+%%PLUGIN_APR%%lib/thunarx-2/thunar-apr.la
+%%PLUGIN_APR%%lib/thunarx-2/thunar-apr.so
+%%PLUGIN_SBR%%lib/thunarx-2/thunar-sbr.la
+%%PLUGIN_SBR%%lib/thunarx-2/thunar-sbr.so
+%%PLUGIN_UCA%%lib/thunarx-2/thunar-uca.la
+%%PLUGIN_UCA%%lib/thunarx-2/thunar-uca.so
+%%PLUGIN_WALL%%lib/thunarx-2/thunar-wallpaper-plugin.la
+%%PLUGIN_WALL%%lib/thunarx-2/thunar-wallpaper-plugin.so
+%%PLUGIN_TPA%%lib/xfce4/panel/plugins/libthunar-tpa.la
+%%PLUGIN_TPA%%lib/xfce4/panel/plugins/libthunar-tpa.so
+libdata/pkgconfig/thunarx-2.pc
share/Thunar/sendto/thunar-sendto-email.desktop
share/applications/Thunar-bulk-rename.desktop
share/applications/Thunar-folder-handler.desktop
@@ -62,78 +37,8 @@ share/applications/Thunar.desktop
share/applications/thunar-settings.desktop
%%WITH_DBUS%%share/dbus-1/services/org.xfce.FileManager.service
%%WITH_DBUS%%share/dbus-1/services/org.xfce.Thunar.service
-share/gtk-doc/html/thunar-vfs/ThunarVfsGroup.html
-share/gtk-doc/html/thunar-vfs/ThunarVfsJob.html
-share/gtk-doc/html/thunar-vfs/ThunarVfsMimeAction.html
-share/gtk-doc/html/thunar-vfs/ThunarVfsMimeApplication.html
-share/gtk-doc/html/thunar-vfs/ThunarVfsMimeDatabase.html
-share/gtk-doc/html/thunar-vfs/ThunarVfsMimeHandler.html
-share/gtk-doc/html/thunar-vfs/ThunarVfsMonitor.html
-share/gtk-doc/html/thunar-vfs/ThunarVfsUser.html
-share/gtk-doc/html/thunar-vfs/ThunarVfsUserManager.html
-share/gtk-doc/html/thunar-vfs/ThunarVfsVolume.html
-share/gtk-doc/html/thunar-vfs/ThunarVfsVolumeManager.html
-share/gtk-doc/html/thunar-vfs/filesystem-monitoring.html
-share/gtk-doc/html/thunar-vfs/fundamentals.html
-share/gtk-doc/html/thunar-vfs/home.png
-share/gtk-doc/html/thunar-vfs/index.html
-share/gtk-doc/html/thunar-vfs/index.sgml
-share/gtk-doc/html/thunar-vfs/introduction.html
-share/gtk-doc/html/thunar-vfs/ix01.html
-share/gtk-doc/html/thunar-vfs/jobs.html
-share/gtk-doc/html/thunar-vfs/left.png
-share/gtk-doc/html/thunar-vfs/mime-types.html
-share/gtk-doc/html/thunar-vfs/right.png
-share/gtk-doc/html/thunar-vfs/style.css
-share/gtk-doc/html/thunar-vfs/thunar-vfs-Basic-Types.html
-share/gtk-doc/html/thunar-vfs/thunar-vfs-Initialization-and-Shutdown.html
-share/gtk-doc/html/thunar-vfs/thunar-vfs-Jobs.html
-share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsInfo.html
-share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsMimeInfo.html
-share/gtk-doc/html/thunar-vfs/thunar-vfs-ThunarVfsPath.html
-share/gtk-doc/html/thunar-vfs/thunar-vfs-Utility-Functions.html
-share/gtk-doc/html/thunar-vfs/thunar-vfs.devhelp
-share/gtk-doc/html/thunar-vfs/thunar-vfs.devhelp2
-share/gtk-doc/html/thunar-vfs/up.png
-share/gtk-doc/html/thunar-vfs/users-and-groups-handling.html
-share/gtk-doc/html/thunar-vfs/volume-handling.html
-share/gtk-doc/html/thunarx/ThunarxFileInfo.html
-share/gtk-doc/html/thunarx/ThunarxMenuProvider.html
-share/gtk-doc/html/thunarx/ThunarxPreferencesProvider.html
-share/gtk-doc/html/thunarx/ThunarxPropertyPage.html
-share/gtk-doc/html/thunarx/ThunarxPropertyPageProvider.html
-share/gtk-doc/html/thunarx/ThunarxProviderFactory.html
-share/gtk-doc/html/thunarx/ThunarxProviderPlugin.html
-share/gtk-doc/html/thunarx/ThunarxRenamer.html
-share/gtk-doc/html/thunarx/ThunarxRenamerProvider.html
-share/gtk-doc/html/thunarx/abstraction.png
-share/gtk-doc/html/thunarx/bulk-rename.png
-share/gtk-doc/html/thunarx/home.png
-share/gtk-doc/html/thunarx/index.html
-share/gtk-doc/html/thunarx/index.sgml
-share/gtk-doc/html/thunarx/ix01.html
-share/gtk-doc/html/thunarx/left.png
-share/gtk-doc/html/thunarx/menu-provider.png
-share/gtk-doc/html/thunarx/right.png
-share/gtk-doc/html/thunarx/say-hello.png
-share/gtk-doc/html/thunarx/style.css
-share/gtk-doc/html/thunarx/thunarx-Variables-and-functions-to-check-the-library-version.html
-share/gtk-doc/html/thunarx/thunarx-abstraction-layer.html
-share/gtk-doc/html/thunarx/thunarx-fundamentals.html
-share/gtk-doc/html/thunarx/thunarx-overview.html
-share/gtk-doc/html/thunarx/thunarx-providers.html
-share/gtk-doc/html/thunarx/thunarx-using-extensions.html
-share/gtk-doc/html/thunarx/thunarx-writing-extensions-advanced-topics.html
-share/gtk-doc/html/thunarx/thunarx-writing-extensions-getting-started.html
-share/gtk-doc/html/thunarx/thunarx-writing-extensions.html
-share/gtk-doc/html/thunarx/thunarx.devhelp
-share/gtk-doc/html/thunarx/thunarx.devhelp2
-share/gtk-doc/html/thunarx/up.png
-%%PLUGIN_TPA%%share/xfce4/panel-plugins/thunar-tpa.desktop
%%DOCSDIR%%/README.gtkrc
%%DOCSDIR%%/README.thunarrc
-%%DOCSDIR%%/README.volumes
-%%DOCSDIR%%/ThumbnailersCacheFormat.txt
%%DOCSDIR%%/html/C/advanced-topics.html
%%DOCSDIR%%/html/C/copyright.html
%%DOCSDIR%%/html/C/customizing-thunar.html
@@ -155,42 +60,44 @@ share/gtk-doc/html/thunarx/up.png
%%DOCSDIR%%/html/C/the-file-manager-window.html
%%DOCSDIR%%/html/C/using-removable-media.html
%%DOCSDIR%%/html/C/working-with-files-and-folders.html
-%%DOCSDIR%%/html/am/images/bulk-rename.png
-%%DOCSDIR%%/html/am/images/file-manager-window.png
-%%DOCSDIR%%/html/am/images/file-properties.png
-%%DOCSDIR%%/html/am/images/preferences-advanced.png
-%%DOCSDIR%%/html/am/images/preferences-behavior.png
-%%DOCSDIR%%/html/am/images/preferences-side-pane.png
-%%DOCSDIR%%/html/am/images/preferences-views.png
-%%DOCSDIR%%/html/am/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/am/images/removable-media-unmount.png
-%%DOCSDIR%%/html/am/images/sendto-menu.png
-%%DOCSDIR%%/html/am/images/visible-columns.png
-%%DOCSDIR%%/html/am/advanced-topics.html
-%%DOCSDIR%%/html/am/copyright.html
-%%DOCSDIR%%/html/am/customizing-thunar.html
-%%DOCSDIR%%/html/am/faq.html
-%%DOCSDIR%%/html/am/index.html
-%%DOCSDIR%%/html/am/preferences.html
-%%DOCSDIR%%/html/am/support.html
-%%DOCSDIR%%/html/am/the-file-manager-window.html
-%%DOCSDIR%%/html/am/using-removable-media.html
-%%DOCSDIR%%/html/am/working-with-files-and-folders.html
+%%DOCSDIR%%/html/bn/advanced-topics.html
+%%DOCSDIR%%/html/bn/copyright.html
+%%DOCSDIR%%/html/bn/customizing-thunar.html
+%%DOCSDIR%%/html/bn/faq.html
+%%DOCSDIR%%/html/bn/images
+%%DOCSDIR%%/html/bn/index.html
+%%DOCSDIR%%/html/bn/preferences.html
+%%DOCSDIR%%/html/bn/support.html
+%%DOCSDIR%%/html/bn/the-file-manager-window.html
+%%DOCSDIR%%/html/bn/using-removable-media.html
+%%DOCSDIR%%/html/bn/working-with-files-and-folders.html
+%%DOCSDIR%%/html/ca/advanced-topics.html
+%%DOCSDIR%%/html/ca/copyright.html
+%%DOCSDIR%%/html/ca/customizing-thunar.html
+%%DOCSDIR%%/html/ca/faq.html
+%%DOCSDIR%%/html/ca/images
+%%DOCSDIR%%/html/ca/index.html
+%%DOCSDIR%%/html/ca/preferences.html
+%%DOCSDIR%%/html/ca/support.html
+%%DOCSDIR%%/html/ca/the-file-manager-window.html
+%%DOCSDIR%%/html/ca/using-removable-media.html
+%%DOCSDIR%%/html/ca/working-with-files-and-folders.html
+%%DOCSDIR%%/html/da/advanced-topics.html
+%%DOCSDIR%%/html/da/copyright.html
+%%DOCSDIR%%/html/da/customizing-thunar.html
+%%DOCSDIR%%/html/da/faq.html
+%%DOCSDIR%%/html/da/images
+%%DOCSDIR%%/html/da/index.html
+%%DOCSDIR%%/html/da/preferences.html
+%%DOCSDIR%%/html/da/support.html
+%%DOCSDIR%%/html/da/the-file-manager-window.html
+%%DOCSDIR%%/html/da/using-removable-media.html
+%%DOCSDIR%%/html/da/working-with-files-and-folders.html
%%DOCSDIR%%/html/es/advanced-topics.html
%%DOCSDIR%%/html/es/copyright.html
%%DOCSDIR%%/html/es/customizing-thunar.html
%%DOCSDIR%%/html/es/faq.html
-%%DOCSDIR%%/html/es/images/bulk-rename.png
-%%DOCSDIR%%/html/es/images/file-manager-window.png
-%%DOCSDIR%%/html/es/images/file-properties.png
-%%DOCSDIR%%/html/es/images/preferences-advanced.png
-%%DOCSDIR%%/html/es/images/preferences-behavior.png
-%%DOCSDIR%%/html/es/images/preferences-side-pane.png
-%%DOCSDIR%%/html/es/images/preferences-views.png
-%%DOCSDIR%%/html/es/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/es/images/removable-media-unmount.png
-%%DOCSDIR%%/html/es/images/sendto-menu.png
-%%DOCSDIR%%/html/es/images/visible-columns.png
+%%DOCSDIR%%/html/es/images
%%DOCSDIR%%/html/es/index.html
%%DOCSDIR%%/html/es/preferences.html
%%DOCSDIR%%/html/es/support.html
@@ -201,17 +108,7 @@ share/gtk-doc/html/thunarx/up.png
%%DOCSDIR%%/html/eu/copyright.html
%%DOCSDIR%%/html/eu/customizing-thunar.html
%%DOCSDIR%%/html/eu/faq.html
-%%DOCSDIR%%/html/eu/images/bulk-rename.png
-%%DOCSDIR%%/html/eu/images/file-manager-window.png
-%%DOCSDIR%%/html/eu/images/file-properties.png
-%%DOCSDIR%%/html/eu/images/preferences-advanced.png
-%%DOCSDIR%%/html/eu/images/preferences-behavior.png
-%%DOCSDIR%%/html/eu/images/preferences-side-pane.png
-%%DOCSDIR%%/html/eu/images/preferences-views.png
-%%DOCSDIR%%/html/eu/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/eu/images/removable-media-unmount.png
-%%DOCSDIR%%/html/eu/images/sendto-menu.png
-%%DOCSDIR%%/html/eu/images/visible-columns.png
+%%DOCSDIR%%/html/eu/images
%%DOCSDIR%%/html/eu/index.html
%%DOCSDIR%%/html/eu/preferences.html
%%DOCSDIR%%/html/eu/support.html
@@ -239,17 +136,39 @@ share/gtk-doc/html/thunarx/up.png
%%DOCSDIR%%/html/fr/the-file-manager-window.html
%%DOCSDIR%%/html/fr/using-removable-media.html
%%DOCSDIR%%/html/fr/working-with-files-and-folders.html
-%%DOCSDIR%%/html/gl/images/bulk-rename.png
-%%DOCSDIR%%/html/gl/images/file-manager-window.png
-%%DOCSDIR%%/html/gl/images/file-properties.png
-%%DOCSDIR%%/html/gl/images/preferences-advanced.png
-%%DOCSDIR%%/html/gl/images/preferences-behavior.png
-%%DOCSDIR%%/html/gl/images/preferences-side-pane.png
-%%DOCSDIR%%/html/gl/images/preferences-views.png
-%%DOCSDIR%%/html/gl/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/gl/images/removable-media-unmount.png
-%%DOCSDIR%%/html/gl/images/sendto-menu.png
-%%DOCSDIR%%/html/gl/images/visible-columns.png
+%%DOCSDIR%%/html/gl/advanced-topics.html
+%%DOCSDIR%%/html/gl/copyright.html
+%%DOCSDIR%%/html/gl/customizing-thunar.html
+%%DOCSDIR%%/html/gl/faq.html
+%%DOCSDIR%%/html/gl/images
+%%DOCSDIR%%/html/gl/index.html
+%%DOCSDIR%%/html/gl/preferences.html
+%%DOCSDIR%%/html/gl/support.html
+%%DOCSDIR%%/html/gl/the-file-manager-window.html
+%%DOCSDIR%%/html/gl/using-removable-media.html
+%%DOCSDIR%%/html/gl/working-with-files-and-folders.html
+%%DOCSDIR%%/html/id/advanced-topics.html
+%%DOCSDIR%%/html/id/copyright.html
+%%DOCSDIR%%/html/id/customizing-thunar.html
+%%DOCSDIR%%/html/id/faq.html
+%%DOCSDIR%%/html/id/images
+%%DOCSDIR%%/html/id/index.html
+%%DOCSDIR%%/html/id/preferences.html
+%%DOCSDIR%%/html/id/support.html
+%%DOCSDIR%%/html/id/the-file-manager-window.html
+%%DOCSDIR%%/html/id/using-removable-media.html
+%%DOCSDIR%%/html/id/working-with-files-and-folders.html
+%%DOCSDIR%%/html/it/advanced-topics.html
+%%DOCSDIR%%/html/it/copyright.html
+%%DOCSDIR%%/html/it/customizing-thunar.html
+%%DOCSDIR%%/html/it/faq.html
+%%DOCSDIR%%/html/it/images
+%%DOCSDIR%%/html/it/index.html
+%%DOCSDIR%%/html/it/preferences.html
+%%DOCSDIR%%/html/it/support.html
+%%DOCSDIR%%/html/it/the-file-manager-window.html
+%%DOCSDIR%%/html/it/using-removable-media.html
+%%DOCSDIR%%/html/it/working-with-files-and-folders.html
%%DOCSDIR%%/html/ja/advanced-topics.html
%%DOCSDIR%%/html/ja/copyright.html
%%DOCSDIR%%/html/ja/customizing-thunar.html
@@ -271,21 +190,11 @@ share/gtk-doc/html/thunarx/up.png
%%DOCSDIR%%/html/ja/the-file-manager-window.html
%%DOCSDIR%%/html/ja/using-removable-media.html
%%DOCSDIR%%/html/ja/working-with-files-and-folders.html
-%%DOCSDIR%%/html/nl/images/bulk-rename.png
-%%DOCSDIR%%/html/nl/images/file-manager-window.png
-%%DOCSDIR%%/html/nl/images/file-properties.png
-%%DOCSDIR%%/html/nl/images/preferences-advanced.png
-%%DOCSDIR%%/html/nl/images/preferences-behavior.png
-%%DOCSDIR%%/html/nl/images/preferences-side-pane.png
-%%DOCSDIR%%/html/nl/images/preferences-views.png
-%%DOCSDIR%%/html/nl/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/nl/images/removable-media-unmount.png
-%%DOCSDIR%%/html/nl/images/sendto-menu.png
-%%DOCSDIR%%/html/nl/images/visible-columns.png
%%DOCSDIR%%/html/nl/advanced-topics.html
%%DOCSDIR%%/html/nl/copyright.html
%%DOCSDIR%%/html/nl/customizing-thunar.html
%%DOCSDIR%%/html/nl/faq.html
+%%DOCSDIR%%/html/nl/images
%%DOCSDIR%%/html/nl/index.html
%%DOCSDIR%%/html/nl/preferences.html
%%DOCSDIR%%/html/nl/support.html
@@ -317,251 +226,235 @@ share/gtk-doc/html/thunarx/up.png
%%DOCSDIR%%/html/ru/copyright.html
%%DOCSDIR%%/html/ru/customizing-thunar.html
%%DOCSDIR%%/html/ru/faq.html
-%%DOCSDIR%%/html/ru/images/bulk-rename.png
-%%DOCSDIR%%/html/ru/images/file-manager-window.png
-%%DOCSDIR%%/html/ru/images/file-properties.png
-%%DOCSDIR%%/html/ru/images/preferences-advanced.png
-%%DOCSDIR%%/html/ru/images/preferences-behavior.png
-%%DOCSDIR%%/html/ru/images/preferences-side-pane.png
-%%DOCSDIR%%/html/ru/images/preferences-views.png
-%%DOCSDIR%%/html/ru/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/ru/images/removable-media-unmount.png
-%%DOCSDIR%%/html/ru/images/sendto-menu.png
-%%DOCSDIR%%/html/ru/images/visible-columns.png
+%%DOCSDIR%%/html/ru/images
%%DOCSDIR%%/html/ru/index.html
%%DOCSDIR%%/html/ru/preferences.html
%%DOCSDIR%%/html/ru/support.html
%%DOCSDIR%%/html/ru/the-file-manager-window.html
%%DOCSDIR%%/html/ru/using-removable-media.html
%%DOCSDIR%%/html/ru/working-with-files-and-folders.html
+%%DOCSDIR%%/html/sv/advanced-topics.html
+%%DOCSDIR%%/html/sv/copyright.html
+%%DOCSDIR%%/html/sv/customizing-thunar.html
+%%DOCSDIR%%/html/sv/faq.html
+%%DOCSDIR%%/html/sv/images
+%%DOCSDIR%%/html/sv/index.html
+%%DOCSDIR%%/html/sv/preferences.html
+%%DOCSDIR%%/html/sv/support.html
+%%DOCSDIR%%/html/sv/the-file-manager-window.html
+%%DOCSDIR%%/html/sv/using-removable-media.html
+%%DOCSDIR%%/html/sv/working-with-files-and-folders.html
%%DOCSDIR%%/html/thunar.css
-%%DOCSDIR%%/html/tr/images/bulk-rename.png
-%%DOCSDIR%%/html/tr/images/file-manager-window.png
-%%DOCSDIR%%/html/tr/images/file-properties.png
-%%DOCSDIR%%/html/tr/images/preferences-advanced.png
-%%DOCSDIR%%/html/tr/images/preferences-behavior.png
-%%DOCSDIR%%/html/tr/images/preferences-side-pane.png
-%%DOCSDIR%%/html/tr/images/preferences-views.png
-%%DOCSDIR%%/html/tr/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/tr/images/removable-media-unmount.png
-%%DOCSDIR%%/html/tr/images/sendto-menu.png
-%%DOCSDIR%%/html/tr/images/visible-columns.png
%%DOCSDIR%%/html/tr/advanced-topics.html
%%DOCSDIR%%/html/tr/copyright.html
%%DOCSDIR%%/html/tr/customizing-thunar.html
%%DOCSDIR%%/html/tr/faq.html
+%%DOCSDIR%%/html/tr/images
%%DOCSDIR%%/html/tr/index.html
%%DOCSDIR%%/html/tr/preferences.html
%%DOCSDIR%%/html/tr/support.html
%%DOCSDIR%%/html/tr/the-file-manager-window.html
%%DOCSDIR%%/html/tr/using-removable-media.html
%%DOCSDIR%%/html/tr/working-with-files-and-folders.html
+%%DOCSDIR%%/html/ug/advanced-topics.html
+%%DOCSDIR%%/html/ug/copyright.html
+%%DOCSDIR%%/html/ug/customizing-thunar.html
+%%DOCSDIR%%/html/ug/faq.html
+%%DOCSDIR%%/html/ug/images
+%%DOCSDIR%%/html/ug/index.html
+%%DOCSDIR%%/html/ug/preferences.html
+%%DOCSDIR%%/html/ug/support.html
+%%DOCSDIR%%/html/ug/the-file-manager-window.html
+%%DOCSDIR%%/html/ug/using-removable-media.html
+%%DOCSDIR%%/html/ug/working-with-files-and-folders.html
+%%DOCSDIR%%/html/zh_CN/advanced-topics.html
+%%DOCSDIR%%/html/zh_CN/copyright.html
+%%DOCSDIR%%/html/zh_CN/customizing-thunar.html
+%%DOCSDIR%%/html/zh_CN/faq.html
+%%DOCSDIR%%/html/zh_CN/images
+%%DOCSDIR%%/html/zh_CN/index.html
+%%DOCSDIR%%/html/zh_CN/preferences.html
+%%DOCSDIR%%/html/zh_CN/support.html
+%%DOCSDIR%%/html/zh_CN/the-file-manager-window.html
+%%DOCSDIR%%/html/zh_CN/using-removable-media.html
+%%DOCSDIR%%/html/zh_CN/working-with-files-and-folders.html
%%DOCSDIR%%/html/zh_TW/advanced-topics.html
%%DOCSDIR%%/html/zh_TW/copyright.html
%%DOCSDIR%%/html/zh_TW/customizing-thunar.html
%%DOCSDIR%%/html/zh_TW/faq.html
-%%DOCSDIR%%/html/zh_TW/images/bulk-rename.png
-%%DOCSDIR%%/html/zh_TW/images/file-manager-window.png
-%%DOCSDIR%%/html/zh_TW/images/file-properties.png
-%%DOCSDIR%%/html/zh_TW/images/preferences-advanced.png
-%%DOCSDIR%%/html/zh_TW/images/preferences-behavior.png
-%%DOCSDIR%%/html/zh_TW/images/preferences-side-pane.png
-%%DOCSDIR%%/html/zh_TW/images/preferences-views.png
-%%DOCSDIR%%/html/zh_TW/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/zh_TW/images/removable-media-unmount.png
-%%DOCSDIR%%/html/zh_TW/images/sendto-menu.png
-%%DOCSDIR%%/html/zh_TW/images/visible-columns.png
+%%DOCSDIR%%/html/zh_TW/images
%%DOCSDIR%%/html/zh_TW/index.html
%%DOCSDIR%%/html/zh_TW/preferences.html
%%DOCSDIR%%/html/zh_TW/support.html
%%DOCSDIR%%/html/zh_TW/the-file-manager-window.html
%%DOCSDIR%%/html/zh_TW/using-removable-media.html
%%DOCSDIR%%/html/zh_TW/working-with-files-and-folders.html
-%%DOCSDIR%%/html/da/advanced-topics.html
-%%DOCSDIR%%/html/da/copyright.html
-%%DOCSDIR%%/html/da/customizing-thunar.html
-%%DOCSDIR%%/html/da/faq.html
-%%DOCSDIR%%/html/da/images/bulk-rename.png
-%%DOCSDIR%%/html/da/images/file-manager-window.png
-%%DOCSDIR%%/html/da/images/file-properties.png
-%%DOCSDIR%%/html/da/images/preferences-advanced.png
-%%DOCSDIR%%/html/da/images/preferences-behavior.png
-%%DOCSDIR%%/html/da/images/preferences-side-pane.png
-%%DOCSDIR%%/html/da/images/preferences-views.png
-%%DOCSDIR%%/html/da/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/da/images/removable-media-unmount.png
-%%DOCSDIR%%/html/da/images/sendto-menu.png
-%%DOCSDIR%%/html/da/images/visible-columns.png
-%%DOCSDIR%%/html/da/index.html
-%%DOCSDIR%%/html/da/preferences.html
-%%DOCSDIR%%/html/da/support.html
-%%DOCSDIR%%/html/da/the-file-manager-window.html
-%%DOCSDIR%%/html/da/using-removable-media.html
-%%DOCSDIR%%/html/da/working-with-files-and-folders.html
-%%DOCSDIR%%/html/gl/advanced-topics.html
-%%DOCSDIR%%/html/gl/copyright.html
-%%DOCSDIR%%/html/gl/customizing-thunar.html
-%%DOCSDIR%%/html/gl/faq.html
-%%DOCSDIR%%/html/gl/index.html
-%%DOCSDIR%%/html/gl/preferences.html
-%%DOCSDIR%%/html/gl/support.html
-%%DOCSDIR%%/html/gl/the-file-manager-window.html
-%%DOCSDIR%%/html/gl/using-removable-media.html
-%%DOCSDIR%%/html/gl/working-with-files-and-folders.html
-%%DOCSDIR%%/html/it/advanced-topics.html
-%%DOCSDIR%%/html/it/copyright.html
-%%DOCSDIR%%/html/it/customizing-thunar.html
-%%DOCSDIR%%/html/it/faq.html
-%%DOCSDIR%%/html/it/images/bulk-rename.png
-%%DOCSDIR%%/html/it/images/file-manager-window.png
-%%DOCSDIR%%/html/it/images/file-properties.png
-%%DOCSDIR%%/html/it/images/preferences-advanced.png
-%%DOCSDIR%%/html/it/images/preferences-behavior.png
-%%DOCSDIR%%/html/it/images/preferences-side-pane.png
-%%DOCSDIR%%/html/it/images/preferences-views.png
-%%DOCSDIR%%/html/it/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/it/images/removable-media-unmount.png
-%%DOCSDIR%%/html/it/images/sendto-menu.png
-%%DOCSDIR%%/html/it/images/visible-columns.png
-%%DOCSDIR%%/html/it/index.html
-%%DOCSDIR%%/html/it/preferences.html
-%%DOCSDIR%%/html/it/support.html
-%%DOCSDIR%%/html/it/the-file-manager-window.html
-%%DOCSDIR%%/html/it/using-removable-media.html
-%%DOCSDIR%%/html/it/working-with-files-and-folders.html
+%%DOCSDIR%%/html/el/advanced-topics.html
+%%DOCSDIR%%/html/el/copyright.html
+%%DOCSDIR%%/html/el/customizing-thunar.html
+%%DOCSDIR%%/html/el/faq.html
+%%DOCSDIR%%/html/el/index.html
+%%DOCSDIR%%/html/el/preferences.html
+%%DOCSDIR%%/html/el/support.html
+%%DOCSDIR%%/html/el/the-file-manager-window.html
+%%DOCSDIR%%/html/el/using-removable-media.html
+%%DOCSDIR%%/html/el/working-with-files-and-folders.html
+%%DOCSDIR%%/html/el/images
+%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxFileInfo.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxMenuProvider.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxPreferencesProvider.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxPropertyPage.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxPropertyPageProvider.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxProviderFactory.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxProviderPlugin.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxRenamer.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxRenamerProvider.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/abstraction.png
+%%APIDOCS%%share/gtk-doc/html/thunarx/bulk-rename.png
+%%APIDOCS%%share/gtk-doc/html/thunarx/home.png
+%%APIDOCS%%share/gtk-doc/html/thunarx/index.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/index.sgml
+%%APIDOCS%%share/gtk-doc/html/thunarx/ix01.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/left.png
+%%APIDOCS%%share/gtk-doc/html/thunarx/menu-provider.png
+%%APIDOCS%%share/gtk-doc/html/thunarx/right.png
+%%APIDOCS%%share/gtk-doc/html/thunarx/say-hello.png
+%%APIDOCS%%share/gtk-doc/html/thunarx/style.css
+%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-Variables-and-functions-to-check-the-library-version.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-abstraction-layer.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-fundamentals.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-overview.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-providers.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-using-extensions.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-writing-extensions-advanced-topics.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-writing-extensions-getting-started.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-writing-extensions.html
+%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx.devhelp
+%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx.devhelp2
+%%APIDOCS%%share/gtk-doc/html/thunarx/up.png
share/icons/hicolor/16x16/apps/Thunar.png
share/icons/hicolor/16x16/stock/navigation/stock_thunar-shortcuts.png
share/icons/hicolor/16x16/stock/navigation/stock_thunar-templates.png
+share/icons/hicolor/16x16/stock/navigation/stock_folder-copy.png
+share/icons/hicolor/16x16/stock/navigation/stock_folder-move.png
+share/icons/hicolor/24x24/stock/navigation/stock_folder-copy.png
+share/icons/hicolor/24x24/stock/navigation/stock_folder-move.png
share/icons/hicolor/24x24/apps/Thunar.png
share/icons/hicolor/48x48/apps/Thunar.png
share/icons/hicolor/scalable/apps/Thunar.svg
-share/locale/am/LC_MESSAGES/Thunar.mo
-share/locale/ast/LC_MESSAGES/Thunar.mo
-share/locale/bn/LC_MESSAGES/Thunar.mo
-share/locale/kk/LC_MESSAGES/Thunar.mo
-share/locale/ug/LC_MESSAGES/Thunar.mo
-share/locale/ur_PK/LC_MESSAGES/Thunar.mo
-share/locale/ar/LC_MESSAGES/Thunar.mo
-share/locale/be/LC_MESSAGES/Thunar.mo
-share/locale/ca/LC_MESSAGES/Thunar.mo
-share/locale/cs/LC_MESSAGES/Thunar.mo
-share/locale/da/LC_MESSAGES/Thunar.mo
-share/locale/de/LC_MESSAGES/Thunar.mo
-share/locale/dz/LC_MESSAGES/Thunar.mo
-share/locale/el/LC_MESSAGES/Thunar.mo
-share/locale/en_GB/LC_MESSAGES/Thunar.mo
-share/locale/eo/LC_MESSAGES/Thunar.mo
-share/locale/es/LC_MESSAGES/Thunar.mo
-share/locale/et/LC_MESSAGES/Thunar.mo
-share/locale/eu/LC_MESSAGES/Thunar.mo
-share/locale/fi/LC_MESSAGES/Thunar.mo
-share/locale/fr/LC_MESSAGES/Thunar.mo
-share/locale/gl/LC_MESSAGES/Thunar.mo
-share/locale/he/LC_MESSAGES/Thunar.mo
-share/locale/hu/LC_MESSAGES/Thunar.mo
-share/locale/id/LC_MESSAGES/Thunar.mo
-share/locale/it/LC_MESSAGES/Thunar.mo
-share/locale/ja/LC_MESSAGES/Thunar.mo
-share/locale/ka/LC_MESSAGES/Thunar.mo
-share/locale/ko/LC_MESSAGES/Thunar.mo
-share/locale/ku/LC_MESSAGES/Thunar.mo
-share/locale/lt/LC_MESSAGES/Thunar.mo
-share/locale/lv/LC_MESSAGES/Thunar.mo
-share/locale/mk/LC_MESSAGES/Thunar.mo
-share/locale/nb/LC_MESSAGES/Thunar.mo
-share/locale/nl/LC_MESSAGES/Thunar.mo
-share/locale/nn/LC_MESSAGES/Thunar.mo
-share/locale/pa/LC_MESSAGES/Thunar.mo
-share/locale/pl/LC_MESSAGES/Thunar.mo
-share/locale/pt_BR/LC_MESSAGES/Thunar.mo
-share/locale/pt/LC_MESSAGES/Thunar.mo
-share/locale/ro/LC_MESSAGES/Thunar.mo
-share/locale/ru/LC_MESSAGES/Thunar.mo
-share/locale/sk/LC_MESSAGES/Thunar.mo
-share/locale/sq/LC_MESSAGES/Thunar.mo
-share/locale/sv/LC_MESSAGES/Thunar.mo
-share/locale/tr/LC_MESSAGES/Thunar.mo
-share/locale/uk/LC_MESSAGES/Thunar.mo
-share/locale/ur/LC_MESSAGES/Thunar.mo
-share/locale/zh_CN/LC_MESSAGES/Thunar.mo
-share/locale/zh_TW/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/be/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/da/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/de/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/el/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/et/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/he/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/id/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/it/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/si/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/Thunar.mo
share/pixmaps/Thunar/Thunar-about-logo.png
-share/pixmaps/Thunar/Thunar-fallback-icon.png
-share/thumbnailers/thunar-vfs-font-thumbnailer-1.desktop
-%%PLUGIN_UCA%%@dirrm etc/xdg/Thunar
-%%PLUGIN_UCA%%@dirrmtry etc/xdg
-@dirrm include/thunar-vfs-1/thunar-vfs
-@dirrm include/thunar-vfs-1
-@dirrm include/thunarx-1/thunarx
-@dirrm include/thunarx-1
-@dirrmtry lib/thunarx-1
-%%PLUGIN_TPA%%@dirrmtry libexec/xfce4/panel-plugins
-%%PLUGIN_TPA%%@dirrmtry libexec/xfce4
-@dirrmtry share/applications
-@dirrm share/gtk-doc/html/thunar-vfs
-@dirrm share/gtk-doc/html/thunarx
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
+%%PLUGIN_TPA%%share/xfce4/panel-plugins/thunar-tpa.desktop
%%PLUGIN_TPA%%@dirrmtry share/xfce4/panel-plugins
+%%PLUGIN_TPA%%@dirrmtry share/xfce4/panel/plugins
+%%PLUGIN_TPA%%@dirrmtry share/xfce4/panel
%%PLUGIN_TPA%%@dirrmtry share/xfce4
-@dirrmtry %%DOCSDIR%%/html/C/images
-@dirrm %%DOCSDIR%%/html/C
-@dirrmtry %%DOCSDIR%%/html/am/images
-@dirrm %%DOCSDIR%%/html/am
-@dirrmtry %%DOCSDIR%%/html/es/images
-@dirrm %%DOCSDIR%%/html/es
-@dirrmtry %%DOCSDIR%%/html/eu/images
-@dirrm %%DOCSDIR%%/html/eu
-@dirrmtry %%DOCSDIR%%/html/fr/images
-@dirrm %%DOCSDIR%%/html/fr
-@dirrmtry %%DOCSDIR%%/html/gl/images
-@dirrm %%DOCSDIR%%/html/gl
-@dirrmtry %%DOCSDIR%%/html/ja/images
-@dirrm %%DOCSDIR%%/html/ja
-@dirrmtry %%DOCSDIR%%/html/nl/images
-@dirrm %%DOCSDIR%%/html/nl
-@dirrmtry %%DOCSDIR%%/html/pl/images
-@dirrm %%DOCSDIR%%/html/pl
-@dirrmtry %%DOCSDIR%%/html/ru/images
-@dirrm %%DOCSDIR%%/html/ru
-@dirrmtry %%DOCSDIR%%/html/tr/images
-@dirrm %%DOCSDIR%%/html/tr
-@dirrmtry %%DOCSDIR%%/html/zh_TW/images
+@dirrm share/pixmaps/Thunar
+@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
+%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/sk
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
+%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ku
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/dz
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
+%%APIDOCS%%@dirrm share/gtk-doc/html/thunarx
+%%APIDOCS%%@dirrmtry share/gtk-doc/html
+%%APIDOCS%%@dirrmtry share/gtk-doc
@dirrm %%DOCSDIR%%/html/zh_TW
-@dirrmtry %%DOCSDIR%%/html/da/images
-@dirrm %%DOCSDIR%%/html/da
-@dirrm %%DOCSDIR%%/html/gl
-@dirrmtry %%DOCSDIR%%/html/it/images
+@dirrm %%DOCSDIR%%/html/zh_CN
+@dirrm %%DOCSDIR%%/html/ug
+@dirrm %%DOCSDIR%%/html/tr
+@dirrm %%DOCSDIR%%/html/sv
+@dirrm %%DOCSDIR%%/html/ru
+@dirrm %%DOCSDIR%%/html/pl/images
+@dirrm %%DOCSDIR%%/html/pl
+@dirrm %%DOCSDIR%%/html/nl
+@dirrm %%DOCSDIR%%/html/ja/images
+@dirrm %%DOCSDIR%%/html/ja
@dirrm %%DOCSDIR%%/html/it
+@dirrm %%DOCSDIR%%/html/id
+@dirrm %%DOCSDIR%%/html/gl
+@dirrm %%DOCSDIR%%/html/fr/images
+@dirrm %%DOCSDIR%%/html/fr
+@dirrm %%DOCSDIR%%/html/eu
+@dirrm %%DOCSDIR%%/html/es
+@dirrm %%DOCSDIR%%/html/da
+@dirrm %%DOCSDIR%%/html/ca
+@dirrm %%DOCSDIR%%/html/bn
+@dirrm %%DOCSDIR%%/html/el
+@dirrm %%DOCSDIR%%/html/C/images
+@dirrm %%DOCSDIR%%/html/C
@dirrm %%DOCSDIR%%/html
@dirrm %%DOCSDIR%%
@dirrm share/Thunar/sendto
@dirrm share/Thunar
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrm share/pixmaps/Thunar
-@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || true
-@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || true
-@dirrmtry share/icons/hicolor/16x16/stock/navigation
-@dirrmtry share/icons/hicolor/16x16/stock
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/nn_NO/LC_MESSAGES
-@dirrmtry share/locale/nn_NO
-@dirrmtry share/locale/tr/LC_MESSAGES
-@dirrmtry share/locale/tr
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
-@dirrm share/thumbnailers
+@dirrmtry lib/thunarx-2
+@dirrm lib/Thunar
+@dirrm include/thunarx-2/thunarx
+@dirrm include/thunarx-2
+%%PLUGIN_UCA%%@dirrm etc/xdg/Thunar
+%%PLUGIN_UCA%%@dirrmtry etc/xdg
diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile
index 72d7916108de..016bc6de590b 100644
--- a/x11-themes/gtk-xfce-engine/Makefile
+++ b/x11-themes/gtk-xfce-engine/Makefile
@@ -1,3 +1,4 @@
+
# New ports collection makefile for: gtk-xfce-engine
# Date Created: 10 October 2002
# Whom: olgeni@FreeBSD.org
@@ -6,8 +7,7 @@
#
PORTNAME= gtk-xfce-engine
-PORTVERSION= 2.6.0
-PORTREVISION= 3
+PORTVERSION= 2.8.0
CATEGORIES= x11-themes xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/x11-themes/gtk-xfce-engine/distinfo b/x11-themes/gtk-xfce-engine/distinfo
index 56175526115d..8c323b6443c5 100644
--- a/x11-themes/gtk-xfce-engine/distinfo
+++ b/x11-themes/gtk-xfce-engine/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/gtk-xfce-engine-2.6.0.tar.bz2) = e836705d2933d0a77c6628285e10d982
-SHA256 (xfce4/gtk-xfce-engine-2.6.0.tar.bz2) = c817050b2526ac107e1971d344aa20e06b98b80b60c912e83fa96d7804b4e8ca
-SIZE (xfce4/gtk-xfce-engine-2.6.0.tar.bz2) = 280627
+SHA256 (xfce4/gtk-xfce-engine-2.8.0.tar.bz2) = 138d6064e91f6715bbb81a8986f31b27ad3200e7ddae648ddf95f041fc917f89
+SIZE (xfce4/gtk-xfce-engine-2.8.0.tar.bz2) = 326783
diff --git a/x11-themes/gtk-xfce-engine/pkg-plist b/x11-themes/gtk-xfce-engine/pkg-plist
index ced92137a90f..390d48f314e8 100644
--- a/x11-themes/gtk-xfce-engine/pkg-plist
+++ b/x11-themes/gtk-xfce-engine/pkg-plist
@@ -1,8 +1,10 @@
+lib/gtk-2.0/%%GTK2_VERSION%%/engines/libxfce.a
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libxfce.la
lib/gtk-2.0/%%GTK2_VERSION%%/engines/libxfce.so
share/themes/Xfce-4.0/gtk-2.0/gtkrc
share/themes/Xfce-4.2/gtk-2.0/gtkrc
share/themes/Xfce-4.4/gtk-2.0/gtkrc
+share/themes/Xfce-4.6/gtk-2.0/gtkrc
share/themes/Xfce-b5/gtk-2.0/gtkrc
share/themes/Xfce-basic/gtk-2.0/gtkrc
share/themes/Xfce-cadmium/gtk-2.0/gtkrc
@@ -25,6 +27,8 @@ share/themes/Xfce/gtk-2.0/gtkrc
@dirrm share/themes/Xfce-4.2
@dirrm share/themes/Xfce-4.4/gtk-2.0
@dirrm share/themes/Xfce-4.4
+@dirrm share/themes/Xfce-4.6/gtk-2.0
+@dirrm share/themes/Xfce-4.6
@dirrm share/themes/Xfce/gtk-2.0
@dirrmtry share/themes/Xfce
@dirrm share/themes/Xfce-cadmium/gtk-2.0
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 2021290d322c..432219c1ecba 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libxfce4gui
-PORTVERSION= 4.6.4
+PORTVERSION= 4.8.0
CATEGORIES= x11-toolkits xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= libxfcegui4-${PORTVERSION}
diff --git a/x11-toolkits/libxfce4gui/distinfo b/x11-toolkits/libxfce4gui/distinfo
index 9adf728c78db..e913a6f14d82 100644
--- a/x11-toolkits/libxfce4gui/distinfo
+++ b/x11-toolkits/libxfce4gui/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/libxfcegui4-4.6.4.tar.bz2) = 88de59b222cb9977f93a4c61011c1e1f
-SHA256 (xfce4/libxfcegui4-4.6.4.tar.bz2) = c37e407dc00fb87dc16758d53e69edeac7b32aa76c5fcad2b784cf22f58af421
-SIZE (xfce4/libxfcegui4-4.6.4.tar.bz2) = 669219
+SHA256 (xfce4/libxfcegui4-4.8.0.tar.bz2) = 692120ea7318fda1e82d9f553081b7b0cf959af8e3a8ca0808229ca3d4c1d545
+SIZE (xfce4/libxfcegui4-4.8.0.tar.bz2) = 674799
diff --git a/x11-toolkits/libxfce4gui/pkg-plist b/x11-toolkits/libxfce4gui/pkg-plist
index 3c8a0fec4f01..307b1b14787a 100644
--- a/x11-toolkits/libxfce4gui/pkg-plist
+++ b/x11-toolkits/libxfce4gui/pkg-plist
@@ -1,35 +1,25 @@
-etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
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
include/xfce4/libxfcegui4/libxfcegui4-config.h
+include/xfce4/libxfcegui4/libxfcegui4.h
include/xfce4/libxfcegui4/netk-application.h
+include/xfce4/libxfcegui4/netk-class-group.h
include/xfce4/libxfcegui4/netk-enum-types.h
include/xfce4/libxfcegui4/netk-pager.h
include/xfce4/libxfcegui4/netk-screen.h
include/xfce4/libxfcegui4/netk-tasklist.h
include/xfce4/libxfcegui4/netk-trayicon.h
include/xfce4/libxfcegui4/netk-util.h
+include/xfce4/libxfcegui4/netk-window-action-menu.h
include/xfce4/libxfcegui4/netk-window-menu.h
include/xfce4/libxfcegui4/netk-window.h
include/xfce4/libxfcegui4/netk-workspace.h
include/xfce4/libxfcegui4/preview_filesel.h
include/xfce4/libxfcegui4/session-client.h
-include/xfce4/libxfcegui4/xfce_aboutdialog.h
-include/xfce4/libxfcegui4/xfce_clock.h
-include/xfce4/libxfcegui4/xfce_decorbutton.h
-include/xfce4/libxfcegui4/xfce_decortoggle.h
-include/xfce4/libxfcegui4/xfce_framebox.h
-include/xfce4/libxfcegui4/xfce_iconbutton.h
-include/xfce4/libxfcegui4/xfce_menubutton.h
-include/xfce4/libxfcegui4/xfce_movehandler.h
-include/xfce4/libxfcegui4/xfce_scaled_image.h
-include/xfce4/libxfcegui4/xfce_systemtray.h
-include/xfce4/libxfcegui4/xfce_togglebutton.h
include/xfce4/libxfcegui4/xfce-appmenuitem.h
include/xfce4/libxfcegui4/xfce-colorbutton.h
include/xfce4/libxfcegui4/xfce-exec.h
@@ -41,13 +31,18 @@ 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/xfce_aboutdialog.h
+include/xfce4/libxfcegui4/xfce_clock.h
+include/xfce4/libxfcegui4/xfce_decorbutton.h
+include/xfce4/libxfcegui4/xfce_decortoggle.h
+include/xfce4/libxfcegui4/xfce_framebox.h
+include/xfce4/libxfcegui4/xfce_iconbutton.h
+include/xfce4/libxfcegui4/xfce_menubutton.h
+include/xfce4/libxfcegui4/xfce_movehandler.h
+include/xfce4/libxfcegui4/xfce_scaled_image.h
+include/xfce4/libxfcegui4/xfce_systemtray.h
+include/xfce4/libxfcegui4/xfce_togglebutton.h
include/xfce4/libxfcegui4/xinerama.h
-include/xfce4/libxfce4kbd-private/xfce-shortcuts-provider.h
-include/xfce4/libxfce4kbd-private/xfce-shortcuts-grabber.h
-include/xfce4/libxfce4kbd-private/xfce-shortcut-dialog.h
-include/xfce4/libxfce4kbd-private/xfce-shortcuts.h
lib/libglade/2.0/libxfce4.a
lib/libglade/2.0/libxfce4.la
lib/libglade/2.0/libxfce4.so
@@ -55,12 +50,7 @@ lib/libxfcegui4.a
lib/libxfcegui4.la
lib/libxfcegui4.so
lib/libxfcegui4.so.7
-lib/libxfce4kbd-private.a
-lib/libxfce4kbd-private.la
-lib/libxfce4kbd-private.so
-lib/libxfce4kbd-private.so.5
libdata/pkgconfig/libxfcegui4-1.0.pc
-libdata/pkgconfig/libxfce4kbd-private-1.0.pc
share/gtk-doc/html/libxfcegui4/XfceAboutDialog.html
share/gtk-doc/html/libxfcegui4/XfceAppMenuItem.html
share/gtk-doc/html/libxfcegui4/XfceFramebox.html
@@ -77,8 +67,8 @@ share/gtk-doc/html/libxfcegui4/libxfcegui4-Xfce-Gtk+-extensions.html
share/gtk-doc/html/libxfcegui4/libxfcegui4-XfceFileChooser.html
share/gtk-doc/html/libxfcegui4/libxfcegui4-core.html
share/gtk-doc/html/libxfcegui4/libxfcegui4-dialogs.html
-share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html
share/gtk-doc/html/libxfcegui4/libxfcegui4-fundamentals.html
+share/gtk-doc/html/libxfcegui4/libxfcegui4-netk.html
share/gtk-doc/html/libxfcegui4/libxfcegui4-xfce-exec.html
share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp
share/gtk-doc/html/libxfcegui4/libxfcegui4.devhelp2
@@ -129,6 +119,7 @@ share/locale/id/LC_MESSAGES/libxfcegui4.mo
share/locale/it/LC_MESSAGES/libxfcegui4.mo
share/locale/ja/LC_MESSAGES/libxfcegui4.mo
share/locale/ka/LC_MESSAGES/libxfcegui4.mo
+share/locale/kk/LC_MESSAGES/libxfcegui4.mo
share/locale/ko/LC_MESSAGES/libxfcegui4.mo
share/locale/ku/LC_MESSAGES/libxfcegui4.mo
share/locale/lt/LC_MESSAGES/libxfcegui4.mo
@@ -139,8 +130,8 @@ share/locale/nb/LC_MESSAGES/libxfcegui4.mo
share/locale/nl/LC_MESSAGES/libxfcegui4.mo
share/locale/pa/LC_MESSAGES/libxfcegui4.mo
share/locale/pl/LC_MESSAGES/libxfcegui4.mo
-share/locale/pt_BR/LC_MESSAGES/libxfcegui4.mo
share/locale/pt/LC_MESSAGES/libxfcegui4.mo
+share/locale/pt_BR/LC_MESSAGES/libxfcegui4.mo
share/locale/ro/LC_MESSAGES/libxfcegui4.mo
share/locale/ru/LC_MESSAGES/libxfcegui4.mo
share/locale/si/LC_MESSAGES/libxfcegui4.mo
@@ -148,44 +139,39 @@ share/locale/sk/LC_MESSAGES/libxfcegui4.mo
share/locale/sq/LC_MESSAGES/libxfcegui4.mo
share/locale/sv/LC_MESSAGES/libxfcegui4.mo
share/locale/ta/LC_MESSAGES/libxfcegui4.mo
+share/locale/tl_PH/LC_MESSAGES/libxfcegui4.mo
share/locale/tr/LC_MESSAGES/libxfcegui4.mo
share/locale/ug/LC_MESSAGES/libxfcegui4.mo
share/locale/uk/LC_MESSAGES/libxfcegui4.mo
share/locale/ur/LC_MESSAGES/libxfcegui4.mo
share/locale/ur_PK/LC_MESSAGES/libxfcegui4.mo
share/locale/zh_CN/LC_MESSAGES/libxfcegui4.mo
+share/locale/ug/LC_MESSAGES/libxfcegui4.mo
share/locale/zh_TW/LC_MESSAGES/libxfcegui4.mo
-@dirrm include/xfce4/libxfcegui4
-@dirrmtry include/xfce4/xfce4-modules
-@dirrm include/xfce4/libxfce4kbd-private
-@dirrmtry include/xfce4
-@dirrmtry lib/xfce4/modules
-@dirrmtry lib/xfce4
-@comment @dirrmtry share/xfce4/mime
-@comment @dirrmtry share/xfce4
+@dirrmtry share/locale/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
+@dirrmtry share/locale/tl_PH/LC_MESSAGES
+@dirrmtry share/locale/tl_PH
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrm share/gtk-doc/html/libxfcegui4
@dirrmtry share/gtk-doc/html
@dirrmtry share/gtk-doc
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
-@dirrm etc/xdg/xfce4/xfconf/xfce-perchannel-xml
-@dirrm etc/xdg/xfce4/xfconf
-@dirrm etc/xdg/xfce4
-@dirrm etc/xdg
-
+@dirrm include/xfce4/libxfcegui4
+@dirrmtry include/xfce4
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 4872c51d5378..b19784f5dd4e 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= xfce4-desktop
-PORTVERSION= 4.6.2
+PORTVERSION= 4.8.1
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR= src/xfce/xfdesktop/${PORTVERSION:R}
DISTNAME= xfdesktop-${PORTVERSION}
DIST_SUBDIR= xfce4
@@ -18,13 +19,13 @@ COMMENT= XFce 4 desktop background manager and root menu
LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
+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 libmenu libutil panel xfconf
+USE_XFCE= configenv garcon libgui libmenu libutil panel xfconf
OPTIONS= FAM "Enable FAM support" on \
THUNAR "Enable thunar support" on
diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo
index 88ebf94ef907..9108411ccb3f 100644
--- a/x11-wm/xfce4-desktop/distinfo
+++ b/x11-wm/xfce4-desktop/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfdesktop-4.6.2.tar.bz2) = e800ea9fee7a5c5eaf2ae96e23a83e3a
-SHA256 (xfce4/xfdesktop-4.6.2.tar.bz2) = cd760f95486ba3f1c6d0179bb10a4c21c99c1d459dd8265823fed85f7376a3fb
-SIZE (xfce4/xfdesktop-4.6.2.tar.bz2) = 4480477
+SHA256 (xfce4/xfdesktop-4.8.1.tar.bz2) = 596483b9faf0c7617f265a8f30981f205aa1eecbd27d2d9428921cf9700740b8
+SIZE (xfce4/xfdesktop-4.8.1.tar.bz2) = 2717331
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index 48122ae3608c..d4144b57058e 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -1,49 +1,57 @@
-bin/xfce4-popup-menu
bin/xfdesktop
bin/xfdesktop-settings
-etc/xdg/menus/xfce-applications.menu
-lib/xfce4/modules/xfce4_desktop_menu.so
-lib/xfce4/modules/xfce4_desktop_menu.la
-lib/xfce4/modules/xfce4_desktop_menu.a
-libexec/xfce4/panel-plugins/xfce4-menu-plugin
-share/applications/xfce4-about-xfce.desktop
-share/applications/xfce4-file-manager.desktop
-share/applications/xfce4-help.desktop
-share/applications/xfce4-logout.desktop
-share/applications/xfce4-run-program.desktop
-share/applications/xfce4-terminal.desktop
-share/applications/xfce4-web-browser.desktop
share/applications/xfce-backdrop-settings.desktop
-share/desktop-directories/xfce-accessories.directory
-share/desktop-directories/xfce-development.directory
-share/desktop-directories/xfce-education.directory
-share/desktop-directories/xfce-games.directory
-share/desktop-directories/xfce-graphics.directory
-share/desktop-directories/xfce-multimedia.directory
-share/desktop-directories/xfce-network.directory
-share/desktop-directories/xfce-office.directory
-share/desktop-directories/xfce-other.directory
-share/desktop-directories/xfce-screensavers.directory
-share/desktop-directories/xfce-settings.directory
-share/desktop-directories/xfce-system.directory
-share/xfce4/panel-plugins/xfce4-menu.desktop
+share/doc/xfdesktop/html/C/images/root_menu.png
+share/doc/xfdesktop/html/C/images/root_menu2.png
+share/doc/xfdesktop/html/C/images/select_bg_color.png
+share/doc/xfdesktop/html/C/images/xfdesktop-background-tab.png
+share/doc/xfdesktop/html/C/images/xfdesktop-icons-tab.png
+share/doc/xfdesktop/html/C/images/xfdesktop-menus-tab.png
+share/doc/xfdesktop/html/C/index.html
+share/doc/xfdesktop/html/bn/images
+share/doc/xfdesktop/html/bn/index.html
+share/doc/xfdesktop/html/ca/images
+share/doc/xfdesktop/html/ca/index.html
+share/doc/xfdesktop/html/da/images
+share/doc/xfdesktop/html/da/index.html
+share/doc/xfdesktop/html/fr/images/root_menu.png
+share/doc/xfdesktop/html/fr/images/root_menu2.png
+share/doc/xfdesktop/html/fr/images/select_bg_color.png
+share/doc/xfdesktop/html/fr/images/xfdesktop-background-tab.png
+share/doc/xfdesktop/html/fr/images/xfdesktop-icons-tab.png
+share/doc/xfdesktop/html/fr/images/xfdesktop-menus-tab.png
+share/doc/xfdesktop/html/fr/index.html
+share/doc/xfdesktop/html/gl/images
+share/doc/xfdesktop/html/gl/index.html
+share/doc/xfdesktop/html/it/images
+share/doc/xfdesktop/html/it/index.html
+share/doc/xfdesktop/html/ja/images/root_menu.png
+share/doc/xfdesktop/html/ja/images/root_menu2.png
+share/doc/xfdesktop/html/ja/images/select_bg_color.png
+share/doc/xfdesktop/html/ja/images/xfdesktop-background-tab.png
+share/doc/xfdesktop/html/ja/images/xfdesktop-icons-tab.png
+share/doc/xfdesktop/html/ja/images/xfdesktop-menus-tab.png
+share/doc/xfdesktop/html/ja/index.html
+share/doc/xfdesktop/html/ru/images
+share/doc/xfdesktop/html/ru/index.html
+share/doc/xfdesktop/html/ug/images
+share/doc/xfdesktop/html/ug/index.html
+share/doc/xfdesktop/html/xfdesktop.css
+share/doc/xfdesktop/html/zh_CN/images
+share/doc/xfdesktop/html/zh_CN/index.html
share/icons/hicolor/32x32/apps/xfce4-backdrop.png
share/icons/hicolor/32x32/apps/xfce4-menueditor.png
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/ast/LC_MESSAGES/xfdesktop.mo
-share/locale/kk/LC_MESSAGES/xfdesktop.mo
-share/locale/nn/LC_MESSAGES/xfdesktop.mo
-share/locale/si/LC_MESSAGES/xfdesktop.mo
-share/locale/ug/LC_MESSAGES/xfdesktop.mo
-share/locale/ur_PK/LC_MESSAGES/xfdesktop.mo
share/locale/am/LC_MESSAGES/xfdesktop.mo
share/locale/ar/LC_MESSAGES/xfdesktop.mo
+share/locale/ast/LC_MESSAGES/xfdesktop.mo
share/locale/az/LC_MESSAGES/xfdesktop.mo
share/locale/be/LC_MESSAGES/xfdesktop.mo
share/locale/bg/LC_MESSAGES/xfdesktop.mo
+share/locale/bn/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
@@ -64,12 +72,15 @@ 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
+share/locale/hr/LC_MESSAGES/xfdesktop.mo
share/locale/hu/LC_MESSAGES/xfdesktop.mo
share/locale/hy/LC_MESSAGES/xfdesktop.mo
share/locale/id/LC_MESSAGES/xfdesktop.mo
+share/locale/is/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/kk/LC_MESSAGES/xfdesktop.mo
share/locale/ko/LC_MESSAGES/xfdesktop.mo
share/locale/lt/LC_MESSAGES/xfdesktop.mo
share/locale/lv/LC_MESSAGES/xfdesktop.mo
@@ -80,148 +91,74 @@ share/locale/nb/LC_MESSAGES/xfdesktop.mo
share/locale/nl/LC_MESSAGES/xfdesktop.mo
share/locale/pa/LC_MESSAGES/xfdesktop.mo
share/locale/pl/LC_MESSAGES/xfdesktop.mo
-share/locale/pt_BR/LC_MESSAGES/xfdesktop.mo
share/locale/pt/LC_MESSAGES/xfdesktop.mo
+share/locale/pt_BR/LC_MESSAGES/xfdesktop.mo
share/locale/ro/LC_MESSAGES/xfdesktop.mo
share/locale/ru/LC_MESSAGES/xfdesktop.mo
+share/locale/si/LC_MESSAGES/xfdesktop.mo
share/locale/sk/LC_MESSAGES/xfdesktop.mo
share/locale/sq/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
+share/locale/ug/LC_MESSAGES/xfdesktop.mo
share/locale/uk/LC_MESSAGES/xfdesktop.mo
share/locale/ur/LC_MESSAGES/xfdesktop.mo
+share/locale/ur_PK/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
share/pixmaps/xfce4_xicon3.png
share/pixmaps/xfce4_xicon4.png
-share/xfce4/backdrops/flower.png
-share/xfce4/backdrops/xfce4gradientcurve.png
-share/xfce4/backdrops/xfce4logo.png
+share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png
share/xfce4/backdrops/xfce-in-a-grid.png
share/xfce4/backdrops/xfce-in-the-moon.png
share/xfce4/backdrops/xfce-smoke.png
-share/xfce4/backdrops/xfce-stripes.png
share/xfce4/backdrops/xfce-stellar-tile.png
+share/xfce4/backdrops/xfce-stripes.png
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-list.png
-share/xfce4/doc/C/xfdesktop.html
-share/xfce4/doc/am/images/root_menu2.png
-share/xfce4/doc/am/images/root_menu.png
-share/xfce4/doc/am/images/select_bg_color.png
-share/xfce4/doc/am/images/xfdesktop-appearance-tab.png
-share/xfce4/doc/am/images/xfdesktop-behavior-tab.png
-share/xfce4/doc/am/images/xfdesktop-editor.png
-share/xfce4/doc/am/images/xfdesktop-list.png
-share/xfce4/doc/am/xfdesktop.html
-share/xfce4/doc/ca/images/root_menu2.png
-share/xfce4/doc/ca/images/root_menu.png
-share/xfce4/doc/ca/images/select_bg_color.png
-share/xfce4/doc/ca/images/xfdesktop-appearance-tab.png
-share/xfce4/doc/ca/images/xfdesktop-behavior-tab.png
-share/xfce4/doc/ca/images/xfdesktop-list.png
-share/xfce4/doc/ca/images/xfdesktop-editor.png
-share/xfce4/doc/ca/xfdesktop.html
-share/xfce4/doc/da/xfdesktop.html
-share/xfce4/doc/fr/images/root_menu2.png
-share/xfce4/doc/fr/images/root_menu.png
-share/xfce4/doc/fr/images/select_bg_color.png
-share/xfce4/doc/fr/images/xfdesktop-appearance-tab.png
-share/xfce4/doc/fr/images/xfdesktop-behavior-tab.png
-share/xfce4/doc/fr/images/xfdesktop-editor.png
-share/xfce4/doc/fr/images/xfdesktop-list.png
-share/xfce4/doc/fr/xfdesktop.html
-share/xfce4/doc/gl/images
-share/xfce4/doc/gl/images/root_menu2.png
-share/xfce4/doc/gl/images/root_menu.png
-share/xfce4/doc/gl/images/select_bg_color.png
-share/xfce4/doc/gl/images/xfdesktop-appearance-tab.png
-share/xfce4/doc/gl/images/xfdesktop-behavior-tab.png
-share/xfce4/doc/gl/images/xfdesktop-list.png
-share/xfce4/doc/gl/images/xfdesktop-editor.png
-share/xfce4/doc/gl/xfdesktop.html
-share/xfce4/doc/it/images/root_menu2.png
-share/xfce4/doc/it/images/root_menu.png
-share/xfce4/doc/it/images/select_bg_color.png
-share/xfce4/doc/it/images/xfdesktop-appearance-tab.png
-share/xfce4/doc/it/images/xfdesktop-behavior-tab.png
-share/xfce4/doc/it/images/xfdesktop-editor.png
-share/xfce4/doc/it/images/xfdesktop-list.png
-share/xfce4/doc/it/xfdesktop.html
-share/xfce4/doc/ja/images/root_menu.png
-share/xfce4/doc/ja/images/root_menu2.png
-share/xfce4/doc/ja/images/select_bg_color.png
-share/xfce4/doc/ja/images/xfdesktop-background-tab.png
-share/xfce4/doc/ja/images/xfdesktop-icons-tab.png
-share/xfce4/doc/ja/images/xfdesktop-menus-tab.png
-share/xfce4/doc/ja/xfdesktop.html
-share/xfce4/doc/ug/images/root_menu2.png
-share/xfce4/doc/ug/images/root_menu.png
-share/xfce4/doc/ug/images/select_bg_color.png
-share/xfce4/doc/ug/images/xfdesktop-appearance-tab.png
-share/xfce4/doc/ug/images/xfdesktop-behavior-tab.png
-share/xfce4/doc/ug/images/xfdesktop-editor.png
-share/xfce4/doc/ug/images/xfdesktop-list.png
-share/xfce4/doc/ug/xfdesktop.html
-@dirrmtry etc/xdg/menus
-@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/applications
-@dirrmtry share/desktop-directories
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
+share/xfce4/backdrops/xfce4gradientcurve.png
+share/xfce4/backdrops/xfce4logo.png
+@dirrm share/xfce4/backdrops
+@dirrmtry share/xfce4
+@dirrm share/pixmaps/xfdesktop
+@dirrmtry share/locale/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
@dirrmtry share/locale/kk/LC_MESSAGES
@dirrmtry share/locale/kk
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
-@dirrm share/xfce4/backdrops
-@dirrmtry share/xfce4/doc/C/images
-@dirrmtry share/xfce4/doc/C
-@dirrmtry share/xfce4/doc/da
-@dirrmtry share/xfce4/doc/fr/images
-@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/it/images
-@dirrmtry share/xfce4/doc/it
-@dirrmtry share/xfce4/doc/ja/images
-@dirrmtry share/xfce4/doc/ja
-@dirrmtry share/xfce4/doc/am/images
-@dirrmtry share/xfce4/doc/am
-@dirrmtry share/xfce4/doc/ca/images
-@dirrmtry share/xfce4/doc/ca
-@dirrmtry share/xfce4/doc/gl/images
-@dirrmtry share/xfce4/doc/gl
-@dirrmtry share/xfce4/doc/ug/images
-@dirrmtry share/xfce4/doc/ug
-@dirrmtry share/xfce4/doc
-@dirrmtry share/xfce4/panel-plugins
-@dirrmtry share/xfce4
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/pixmaps/xfdesktop
-@dirrmtry share/pixmaps/xfce4/xfdesktop
-@dirrmtry share/pixmaps/xfce4
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrm share/doc/xfdesktop/html/zh_CN
+@dirrm share/doc/xfdesktop/html/ug
+@dirrm share/doc/xfdesktop/html/ru
+@dirrm share/doc/xfdesktop/html/ja/images
+@dirrm share/doc/xfdesktop/html/ja
+@dirrm share/doc/xfdesktop/html/it
+@dirrm share/doc/xfdesktop/html/gl
+@dirrm share/doc/xfdesktop/html/fr/images
+@dirrm share/doc/xfdesktop/html/fr
+@dirrm share/doc/xfdesktop/html/da
+@dirrm share/doc/xfdesktop/html/ca
+@dirrm share/doc/xfdesktop/html/bn
+@dirrm share/doc/xfdesktop/html/C/images
+@dirrm share/doc/xfdesktop/html/C
+@dirrm share/doc/xfdesktop/html
+@dirrm share/doc/xfdesktop
+@dirrmtry share/applications
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index f818cc92f749..4af4a927ea84 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= xfce4-panel
-PORTVERSION= 4.6.4
+PORTVERSION= 4.8.2
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/xfce/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
@@ -19,7 +20,7 @@ LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
CONFLICTS= xfce4-systray-*
GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
+INSTALLS_ICONS= yes
USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GETTEXT= yes
@@ -27,7 +28,7 @@ USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_PERL5= yes
-USE_XFCE= configenv libexo libgui libutil
+USE_XFCE= configenv garcon libexo libgui libutil libmenu
USE_XORG= x11 sm
CONFIGURE_ARGS= --enable-gtk-doc-html=no \
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index dd6ea9d6b296..51f488732b42 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce4-panel-4.6.4.tar.bz2) = 82f10a42aefca4cc26a6633e7478cc65
-SHA256 (xfce4/xfce4-panel-4.6.4.tar.bz2) = cc9b70bdc73ab80f46655a34cdbaf876a67cd90b50230cbf4d77a3106a5c54e7
-SIZE (xfce4/xfce4-panel-4.6.4.tar.bz2) = 902913
+SHA256 (xfce4/xfce4-panel-4.8.2.tar.bz2) = 497e88067a79ed02976663f5ed3082b56d3ce1de4c55d77bc462bd6fa380bb66
+SIZE (xfce4/xfce4-panel-4.8.2.tar.bz2) = 1179686
diff --git a/x11-wm/xfce4-panel/files/patch-plugins-launcher-launcher-exec.c b/x11-wm/xfce4-panel/files/patch-plugins-launcher-launcher-exec.c
deleted file mode 100644
index 011081a4e023..000000000000
--- a/x11-wm/xfce4-panel/files/patch-plugins-launcher-launcher-exec.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- plugins/launcher/launcher-exec.c.orig 2009-01-15 13:10:55.000000000 +0100
-+++ plugins/launcher/launcher-exec.c 2009-01-15 13:11:12.000000000 +0100
-@@ -49,6 +49,10 @@
- #define WAIT_ANY (-1)
- #endif
-
-+#ifndef environ
-+extern char **environ;
-+#endif
-+
- #include "launcher.h"
- #include "launcher-exec.h"
-
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index 593bbe1b66f1..e47e65eeb171 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -1,106 +1,139 @@
bin/xfce4-panel
-bin/xfce4-popup-windowlist
-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/libxfce4panel-enum-types.h
-include/xfce4/libxfce4panel/libxfce4panel.h
-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-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.a
-lib/libxfce4panel.la
-lib/libxfce4panel.so
-lib/libxfce4panel.so.2
-lib/xfce4/panel-plugins/libactions.a
-lib/xfce4/panel-plugins/libactions.la
-lib/xfce4/panel-plugins/libactions.so
-lib/xfce4/panel-plugins/libclock.a
-lib/xfce4/panel-plugins/libclock.la
-lib/xfce4/panel-plugins/libclock.so
-lib/xfce4/panel-plugins/libiconbox.a
-lib/xfce4/panel-plugins/libiconbox.la
-lib/xfce4/panel-plugins/libiconbox.so
-lib/xfce4/panel-plugins/liblauncher.a
-lib/xfce4/panel-plugins/liblauncher.la
-lib/xfce4/panel-plugins/liblauncher.so
-lib/xfce4/panel-plugins/libpager.a
-lib/xfce4/panel-plugins/libpager.la
-lib/xfce4/panel-plugins/libpager.so
-lib/xfce4/panel-plugins/libseparator.a
-lib/xfce4/panel-plugins/libseparator.la
-lib/xfce4/panel-plugins/libseparator.so
-lib/xfce4/panel-plugins/libshowdesktop.a
-lib/xfce4/panel-plugins/libshowdesktop.la
-lib/xfce4/panel-plugins/libshowdesktop.so
-lib/xfce4/panel-plugins/libsystray.a
-lib/xfce4/panel-plugins/libsystray.la
-lib/xfce4/panel-plugins/libsystray.so
-lib/xfce4/panel-plugins/libtasklist.a
-lib/xfce4/panel-plugins/libtasklist.la
-lib/xfce4/panel-plugins/libtasklist.so
-lib/xfce4/panel-plugins/libwindowlist.a
-lib/xfce4/panel-plugins/libwindowlist.la
-lib/xfce4/panel-plugins/libwindowlist.so
+bin/xfce4-popup-applicationsmenu
+bin/xfce4-popup-directorymenu
+bin/xfce4-popup-windowmenu
+etc/xdg/xfce4/panel/default.xml
+include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-config.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-enum-types.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-enums.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-arrow-button.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-hvbox.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-convenience.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-image.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros-46.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-macros.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin-provider.h
+include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin.h
+lib/libxfce4panel-1.0.a
+lib/libxfce4panel-1.0.la
+lib/libxfce4panel-1.0.so
+lib/libxfce4panel-1.0.so.3
+lib/xfce4/panel/migrate
+lib/xfce4/panel/plugins/libactions.a
+lib/xfce4/panel/plugins/libactions.la
+lib/xfce4/panel/plugins/libactions.so
+lib/xfce4/panel/plugins/libapplicationsmenu.a
+lib/xfce4/panel/plugins/libapplicationsmenu.la
+lib/xfce4/panel/plugins/libapplicationsmenu.so
+lib/xfce4/panel/plugins/libclock.a
+lib/xfce4/panel/plugins/libclock.la
+lib/xfce4/panel/plugins/libclock.so
+lib/xfce4/panel/plugins/libdirectorymenu.a
+lib/xfce4/panel/plugins/libdirectorymenu.la
+lib/xfce4/panel/plugins/libdirectorymenu.so
+lib/xfce4/panel/plugins/liblauncher.a
+lib/xfce4/panel/plugins/liblauncher.la
+lib/xfce4/panel/plugins/liblauncher.so
+lib/xfce4/panel/plugins/libpager.a
+lib/xfce4/panel/plugins/libpager.la
+lib/xfce4/panel/plugins/libpager.so
+lib/xfce4/panel/plugins/libseparator.a
+lib/xfce4/panel/plugins/libseparator.la
+lib/xfce4/panel/plugins/libseparator.so
+lib/xfce4/panel/plugins/libshowdesktop.a
+lib/xfce4/panel/plugins/libshowdesktop.la
+lib/xfce4/panel/plugins/libshowdesktop.so
+lib/xfce4/panel/plugins/libsystray.a
+lib/xfce4/panel/plugins/libsystray.la
+lib/xfce4/panel/plugins/libsystray.so
+lib/xfce4/panel/plugins/libtasklist.a
+lib/xfce4/panel/plugins/libtasklist.la
+lib/xfce4/panel/plugins/libtasklist.so
+lib/xfce4/panel/plugins/libwindowmenu.a
+lib/xfce4/panel/plugins/libwindowmenu.la
+lib/xfce4/panel/plugins/libwindowmenu.so
+lib/xfce4/panel/wrapper
libdata/pkgconfig/libxfce4panel-1.0.pc
-%%NLS%%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/home.png
-share/gtk-doc/html/libxfce4panel/index.html
-share/gtk-doc/html/libxfce4panel/index.sgml
-share/gtk-doc/html/libxfce4panel/ix01.html
-share/gtk-doc/html/libxfce4panel/ix02.html
-share/gtk-doc/html/libxfce4panel/left.png
-share/gtk-doc/html/libxfce4panel/libxfce4panel-Common-macros.html
-share/gtk-doc/html/libxfce4panel/libxfce4panel-Convenience-Widgets.html
-share/gtk-doc/html/libxfce4panel/libxfce4panel-Register-Plugins.html
-share/gtk-doc/html/libxfce4panel/libxfce4panel-Standard-Enumerations.html
-share/gtk-doc/html/libxfce4panel/libxfce4panel-fundamentals.html
-share/gtk-doc/html/libxfce4panel/libxfce4panel-panel.html
-share/gtk-doc/html/libxfce4panel/libxfce4panel-widgets.html
-share/gtk-doc/html/libxfce4panel/libxfce4panel.devhelp
-share/gtk-doc/html/libxfce4panel/libxfce4panel.devhelp2
-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-lock.png
-share/icons/hicolor/16x16/apps/xfce4-panel.png
-share/icons/hicolor/22x22/apps/xfce4-panel.png
-share/icons/hicolor/24x24/apps/xfce4-panel.png
-share/icons/hicolor/32x32/apps/xfce4-panel.png
-share/icons/hicolor/48x48/apps/xfce-mouse.png
-share/icons/hicolor/48x48/apps/xfce4-clock.png
-share/icons/hicolor/48x48/apps/xfce4-iconbox.png
-share/icons/hicolor/48x48/apps/xfce4-panel.png
-share/icons/hicolor/48x48/apps/xfce4-separator.png
-share/icons/hicolor/48x48/apps/xfce4-systray.png
-share/icons/hicolor/48x48/apps/xfce4-taskbar.png
+share/applications/panel-desktop-handler.desktop
+share/applications/panel-preferences.desktop
+%%DOCSDIR%%/README.gtkrc-2.0
+%%DOCSDIR%%/html/C/figures/actions.png
+%%DOCSDIR%%/html/C/figures/add-new-items.png
+%%DOCSDIR%%/html/C/figures/applicationsmenu.png
+%%DOCSDIR%%/html/C/figures/clock.png
+%%DOCSDIR%%/html/C/figures/directorymenu.png
+%%DOCSDIR%%/html/C/figures/launcher.png
+%%DOCSDIR%%/html/C/figures/pager.png
+%%DOCSDIR%%/html/C/figures/preferences.png
+%%DOCSDIR%%/html/C/figures/separator.png
+%%DOCSDIR%%/html/C/figures/systray.png
+%%DOCSDIR%%/html/C/figures/tasklist.png
+%%DOCSDIR%%/html/C/figures/windowmenu.png
+%%DOCSDIR%%/html/xfce4-panel.css
+%%DOCSDIR%%/html/C/actions.html
+%%DOCSDIR%%/html/C/add-new-items.html
+%%DOCSDIR%%/html/C/applicationsmenu.html
+%%DOCSDIR%%/html/C/clock.html
+%%DOCSDIR%%/html/C/directorymenu.html
+%%DOCSDIR%%/html/C/getting-started.html
+%%DOCSDIR%%/html/C/index.html
+%%DOCSDIR%%/html/C/launcher.html
+%%DOCSDIR%%/html/C/license.html
+%%DOCSDIR%%/html/C/pager.html
+%%DOCSDIR%%/html/C/preferences.html
+%%DOCSDIR%%/html/C/separator.html
+%%DOCSDIR%%/html/C/showdesktop.html
+%%DOCSDIR%%/html/C/systray.html
+%%DOCSDIR%%/html/C/tasklist.html
+%%DOCSDIR%%/html/C/theming.html
+%%DOCSDIR%%/html/C/windowmenu.html
+share/gtk-doc/html/libxfce4panel-1.0/XfceArrowButton.html
+share/gtk-doc/html/libxfce4panel-1.0/XfceHVBox.html
+share/gtk-doc/html/libxfce4panel-1.0/XfcePanelImage.html
+share/gtk-doc/html/libxfce4panel-1.0/XfcePanelPlugin.html
+share/gtk-doc/html/libxfce4panel-1.0/api-index-4-6.html
+share/gtk-doc/html/libxfce4panel-1.0/api-index-4-8.html
+share/gtk-doc/html/libxfce4panel-1.0/api-index-deprecated.html
+share/gtk-doc/html/libxfce4panel-1.0/api-index-full.html
+share/gtk-doc/html/libxfce4panel-1.0/home.png
+share/gtk-doc/html/libxfce4panel-1.0/index.html
+share/gtk-doc/html/libxfce4panel-1.0/index.sgml
+share/gtk-doc/html/libxfce4panel-1.0/left.png
+share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-1.0.devhelp
+share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-1.0.devhelp2
+share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Commonly-used-plugin-macros.html
+share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Convenience-Functions.html
+share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-GObject-Oriented-Panel-Plugin-Registers-Macros.html
+share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros-(4.6-Style).html
+share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Panel-Plugin-Register-Macros.html
+share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Standard-Enumerations.html
+share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Version-Information.html
+share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-fundamentals.html
+share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-miscelleanous.html
+share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-plugins.html
+share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-widgets.html
+share/gtk-doc/html/libxfce4panel-1.0/right.png
+share/gtk-doc/html/libxfce4panel-1.0/style.css
+share/gtk-doc/html/libxfce4panel-1.0/up.png
+%%NLS%%share/icons/hicolor/16x16/apps/xfce4-panel-menu.png
+%%NLS%%share/icons/hicolor/16x16/apps/xfce4-panel.png
+%%NLS%%share/icons/hicolor/22x22/apps/xfce4-panel-menu.png
+%%NLS%%share/icons/hicolor/22x22/apps/xfce4-panel.png
+%%NLS%%share/icons/hicolor/24x24/apps/xfce4-panel-menu.png
+%%NLS%%share/icons/hicolor/24x24/apps/xfce4-panel.png
+%%NLS%%share/icons/hicolor/32x32/apps/xfce4-panel-menu.png
+%%NLS%%share/icons/hicolor/32x32/apps/xfce4-panel.png
+%%NLS%%share/icons/hicolor/48x48/apps/xfce4-panel-menu.png
+%%NLS%%share/icons/hicolor/48x48/apps/xfce4-panel.png
+%%NLS%%share/icons/hicolor/scalable/apps/xfce4-panel.svg
%%NLS%%share/locale/am/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/az/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/be/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-panel.mo
@@ -121,9 +154,11 @@ share/icons/hicolor/48x48/apps/xfce4-taskbar.png
%%NLS%%share/locale/gu/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/hi/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/hy/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/ka/LC_MESSAGES/xfce4-panel.mo
@@ -137,7 +172,6 @@ share/icons/hicolor/48x48/apps/xfce4-taskbar.png
%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-panel.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-panel.mo
@@ -157,158 +191,58 @@ share/icons/hicolor/48x48/apps/xfce4-taskbar.png
%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
-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
-@dirrmtry share/xfce4/panel-plugins
+share/xfce4/panel/plugins/actions.desktop
+share/xfce4/panel/plugins/applicationsmenu.desktop
+share/xfce4/panel/plugins/clock.desktop
+share/xfce4/panel/plugins/directorymenu.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/windowmenu.desktop
+@dirrm share/xfce4/panel/plugins
+@dirrm share/xfce4/panel
@dirrmtry share/xfce4
-%%NLS%%@dirrmtry share/applications
-%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_TW
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/vi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/vi
%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ur_PK
%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ur
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tr
-%%NLS%%@dirrmtry share/locale/ta/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ta
-%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv
-%%NLS%%@dirrmtry share/locale/sq/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sq
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/si
-%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt_BR
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/pa/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pa
-%%NLS%%@dirrmtry share/locale/nn/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nn
-%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl
-%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nb
-%%NLS%%@dirrmtry share/locale/ms/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ms
%%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/mr
-%%NLS%%@dirrmtry share/locale/mk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/mk
-%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lv
-%%NLS%%@dirrmtry share/locale/lt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lt
%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ku
-%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko
%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/ka/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ka
-%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja
-%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it
-%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id
%%NLS%%@dirrmtry share/locale/hy/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/hy
-%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hu
-%%NLS%%@dirrmtry share/locale/hi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hi
-%%NLS%%@dirrmtry share/locale/he/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/he
-%%NLS%%@dirrmtry share/locale/gu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gu
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/fa/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fa
-%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eu
-%%NLS%%@dirrmtry share/locale/et/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/et
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es
-%%NLS%%@dirrmtry share/locale/eo/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eo
-%%NLS%%@dirrmtry share/locale/en_GB/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en_GB
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/el
%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/dz
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
-%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/da
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/bn_IN
-%%NLS%%@dirrmtry share/locale/bg/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/bg
-%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/be
-%%NLS%%@dirrmtry share/locale/az/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/az
%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ast
-%%NLS%%@dirrmtry share/locale/ar/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ar
-%%NLS%%@dirrmtry share/locale/am/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/am
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrm share/gtk-doc/html/libxfce4panel
+@dirrmtry share/gtk-doc/html/libxfce4panel-1.0
@dirrmtry share/gtk-doc/html
@dirrmtry share/gtk-doc
-@dirrmtry lib/xfce4/panel-plugins
+@dirrm %%DOCSDIR%%/html/C/figures
+@dirrm %%DOCSDIR%%/html/C
+@dirrm %%DOCSDIR%%/html
+@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
+@dirrmtry lib/xfce4/panel/plugins
+@dirrmtry lib/xfce4/panel
@dirrmtry lib/xfce4
-@dirrm include/xfce4/libxfce4panel
+@dirrmtry include/xfce4/libxfce4panel-1.0/libxfce4panel
+@dirrmtry include/xfce4/libxfce4panel-1.0
@dirrmtry include/xfce4
@dirrmtry etc/xdg/xfce4/panel
@dirrmtry etc/xdg/xfce4
@dirrmtry etc/xdg
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 95080790bf86..84cf6fc4ab30 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-session
-PORTVERSION= 4.6.2
+PORTVERSION= 4.8.0
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
@@ -26,12 +26,13 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
-USE_XFCE= configenv libgui libutil xfconf
+USE_XFCE= configenv libgui libmenu libutil xfconf
USE_XORG= x11 sm ice
MAN1= xfce4-session.1 xfce4-session-logout.1
-PLIST_SUB= VERSION="${PORTVERSION:R}"
+#PLIST_SUB= VERSION="${PORTVERSION:R}"
+PLIST_SUB= VERSION="4.6"
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index c691973f2dfb..7e3eb4e90446 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce4-session-4.6.2.tar.bz2) = 9d9890130e45e0e9476591ed9ba2c9d5
-SHA256 (xfce4/xfce4-session-4.6.2.tar.bz2) = 725e269254c34c530acb670f5ccd0fd69b57cbe9f2176abd8499fc5d6dcd30a8
-SIZE (xfce4/xfce4-session-4.6.2.tar.bz2) = 1385541
+SHA256 (xfce4/xfce4-session-4.8.0.tar.bz2) = b93b6e06e28c97c1968cf9283b82618f4a4fdbf2ba838e8303e38122867a25d3
+SIZE (xfce4/xfce4-session-4.8.0.tar.bz2) = 1462995
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index 948b8737b0d6..40f16dbca5d5 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -10,20 +10,21 @@ lib/libxfsm-%%VERSION%%.a
lib/libxfsm-%%VERSION%%.la
lib/libxfsm-%%VERSION%%.so
lib/libxfsm-%%VERSION%%.so.0
-lib/xfce4/splash/engines/libbalou.a
-lib/xfce4/splash/engines/libbalou.la
-lib/xfce4/splash/engines/libbalou.so
-lib/xfce4/splash/engines/libmice.a
-lib/xfce4/splash/engines/libmice.la
-lib/xfce4/splash/engines/libmice.so
-lib/xfce4/splash/engines/libsimple.a
-lib/xfce4/splash/engines/libsimple.la
-lib/xfce4/splash/engines/libsimple.so
+lib/xfce4/session/splash-engines/libbalou.a
+lib/xfce4/session/splash-engines/libbalou.la
+lib/xfce4/session/splash-engines/libbalou.so
+lib/xfce4/session/splash-engines/libmice.a
+lib/xfce4/session/splash-engines/libmice.la
+lib/xfce4/session/splash-engines/libmice.so
+lib/xfce4/session/splash-engines/libsimple.a
+lib/xfce4/session/splash-engines/libsimple.la
+lib/xfce4/session/splash-engines/libsimple.so
libdata/pkgconfig/xfce4-session-2.0.pc
-libexec/balou-export-theme
-libexec/balou-install-theme
-libexec/xfsm-shutdown-helper
-%%NLS%%share/applications/xfce-session-settings.desktop
+lib/xfce4/session/balou-export-theme
+lib/xfce4/session/balou-install-theme
+lib/xfce4/session/xfsm-shutdown-helper
+share/applications/xfce-session-settings.desktop
+share/applications/xfce4-session-logout.desktop
share/icons/hicolor/128x128/apps/xfce4-session.png
share/icons/hicolor/48x48/apps/xfce4-autostart-editor.png
share/icons/hicolor/48x48/apps/xfce4-session.png
@@ -43,6 +44,7 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/az/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/be/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-session.mo
@@ -63,6 +65,7 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
%%NLS%%share/locale/gu/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/he/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/hi/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfce4-session.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfce4-session.mo
@@ -99,12 +102,11 @@ share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
share/themes/Default/balou/logo.png
share/themes/Default/balou/themerc
share/xfce4/tips/tips
-share/xfce4/tips/tips.dat
@dirrm share/xfce4/tips
@dirrmtry share/xfce4
@dirrm share/themes/Default/balou
-@dirrm share/themes/Default
-@dirrm share/themes
+@dirrmtry share/themes/Default
+@dirrmtry share/themes
%%NLS%%@dirrmtry share/applications
%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/zh_TW
@@ -230,9 +232,9 @@ share/xfce4/tips/tips.dat
@dirrmtry share/icons/hicolor/48x48
@dirrmtry share/icons/hicolor/128x128/apps
@dirrmtry share/icons/hicolor/128x128
-@dirrm lib/xfce4/splash/engines
-@dirrm lib/xfce4/splash
-@dirrm lib/xfce4
+@dirrm lib/xfce4/session/splash-engines
+@dirrm lib/xfce4/session
+@dirrmtry lib/xfce4
@dirrm include/xfce4/xfce4-session-%%VERSION%%/libxfsm
@dirrm include/xfce4/xfce4-session-%%VERSION%%
@dirrmtry include/xfce4
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index abcdf6fa55c2..78316a785251 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= xfce4-wm
-PORTVERSION= 4.6.2
+PORTVERSION= 4.8.1
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR= src/xfce/xfwm4/${PORTVERSION:R}
DISTNAME= xfwm4-${PORTVERSION}
DIST_SUBDIR= xfce4
@@ -45,7 +46,7 @@ CONFIGURE_ARGS+=--disable-startup-notification
.endif
.if defined(WITH_REVMOUSE)
-EXTRA_PATCHES= ${FILESDIR}/extrapatch-src__events.c
+EXTRA_PATCHES= ${FILESDIR}/extrapatch-src__events.c
.endif
post-patch:
diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo
index af941d84a251..6f361cf6a10a 100644
--- a/x11-wm/xfce4-wm/distinfo
+++ b/x11-wm/xfce4-wm/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfwm4-4.6.2.tar.bz2) = 3e6c0c54b028b6ea60e865e55ecdf3f8
-SHA256 (xfce4/xfwm4-4.6.2.tar.bz2) = 212819ee03c24635f79d50930284c422469e22489952d0b286e6fe5af2155828
-SIZE (xfce4/xfwm4-4.6.2.tar.bz2) = 1849923
+SHA256 (xfce4/xfwm4-4.8.1.tar.bz2) = 6a3cbf6c92a0cc3bcaf7cf2565c35beae6354768ec26b4d616a3c2544a8f8499
+SIZE (xfce4/xfwm4-4.8.1.tar.bz2) = 1886443
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index 510e97efcdb9..b50f78c4f4a6 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -2,25 +2,63 @@ bin/xfwm4
bin/xfwm4-settings
bin/xfwm4-tweaks-settings
bin/xfwm4-workspace-settings
-libexec/xfce4/xfwm4/helper-dialog
+lib/xfce4/xfwm4/helper-dialog
share/applications/xfce-wm-settings.desktop
share/applications/xfce-wmtweaks-settings.desktop
share/applications/xfce-workspaces-settings.desktop
+share/doc/xfwm4/html/C/images/Makefile.am
+share/doc/xfwm4/html/C/images/compose_shortcut.png
+share/doc/xfwm4/html/C/images/decoration_style.png
+share/doc/xfwm4/html/C/images/focus.png
+share/doc/xfwm4/html/C/images/keyboard_shortcuts.png
+share/doc/xfwm4/html/C/images/misc_wm_prefs.png
+share/doc/xfwm4/html/C/images/titlebar.png
+share/doc/xfwm4/html/C/images/workspace_margins.png
+share/doc/xfwm4/html/C/images/xfwm_workspaces.png
+share/doc/xfwm4/html/C/index.html
+share/doc/xfwm4/html/da/images
+share/doc/xfwm4/html/da/index.html
+share/doc/xfwm4/html/el/images
+share/doc/xfwm4/html/el/index.html
+share/doc/xfwm4/html/fr/images/Makefile.am
+share/doc/xfwm4/html/fr/images/compose_shortcut.png
+share/doc/xfwm4/html/fr/images/decoration_style.png
+share/doc/xfwm4/html/fr/images/focus.png
+share/doc/xfwm4/html/fr/images/keyboard_shortcuts.png
+share/doc/xfwm4/html/fr/images/misc_wm_prefs.png
+share/doc/xfwm4/html/fr/images/titlebar.png
+share/doc/xfwm4/html/fr/images/workspace_margins.png
+share/doc/xfwm4/html/fr/images/xfwm_workspaces.png
+share/doc/xfwm4/html/gl/images
+share/doc/xfwm4/html/gl/index.html
+share/doc/xfwm4/html/it/images/Makefile.am
+share/doc/xfwm4/html/it/images/compose_shortcut.png
+share/doc/xfwm4/html/it/images/decoration_style.png
+share/doc/xfwm4/html/it/images/focus.png
+share/doc/xfwm4/html/it/images/keyboard_shortcuts.png
+share/doc/xfwm4/html/it/images/misc_wm_prefs.png
+share/doc/xfwm4/html/it/images/titlebar.png
+share/doc/xfwm4/html/it/images/workspace_margins.png
+share/doc/xfwm4/html/it/images/xfwm_workspaces.png
+share/doc/xfwm4/html/it/index.html
+share/doc/xfwm4/html/sv/images
+share/doc/xfwm4/html/sv/index.html
+share/doc/xfwm4/html/ug/images
+share/doc/xfwm4/html/ug/index.html
+share/doc/xfwm4/html/xfwm4.css
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/ast/LC_MESSAGES/xfwm4.mo
-share/locale/kk/LC_MESSAGES/xfwm4.mo
-share/locale/ug/LC_MESSAGES/xfwm4.mo
-share/locale/ur_PK/LC_MESSAGES/xfwm4.mo
share/locale/am/LC_MESSAGES/xfwm4.mo
share/locale/ar/LC_MESSAGES/xfwm4.mo
+share/locale/ast/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/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
@@ -41,11 +79,13 @@ 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/hr/LC_MESSAGES/xfwm4.mo
share/locale/hu/LC_MESSAGES/xfwm4.mo
share/locale/id/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/kk/LC_MESSAGES/xfwm4.mo
share/locale/ko/LC_MESSAGES/xfwm4.mo
share/locale/lt/LC_MESSAGES/xfwm4.mo
share/locale/lv/LC_MESSAGES/xfwm4.mo
@@ -56,17 +96,20 @@ share/locale/nb/LC_MESSAGES/xfwm4.mo
share/locale/nl/LC_MESSAGES/xfwm4.mo
share/locale/pa/LC_MESSAGES/xfwm4.mo
share/locale/pl/LC_MESSAGES/xfwm4.mo
-share/locale/pt_BR/LC_MESSAGES/xfwm4.mo
share/locale/pt/LC_MESSAGES/xfwm4.mo
+share/locale/pt_BR/LC_MESSAGES/xfwm4.mo
share/locale/ro/LC_MESSAGES/xfwm4.mo
share/locale/ru/LC_MESSAGES/xfwm4.mo
+share/locale/si/LC_MESSAGES/xfwm4.mo
share/locale/sk/LC_MESSAGES/xfwm4.mo
share/locale/sq/LC_MESSAGES/xfwm4.mo
share/locale/sv/LC_MESSAGES/xfwm4.mo
share/locale/ta/LC_MESSAGES/xfwm4.mo
share/locale/tr/LC_MESSAGES/xfwm4.mo
+share/locale/ug/LC_MESSAGES/xfwm4.mo
share/locale/uk/LC_MESSAGES/xfwm4.mo
share/locale/ur/LC_MESSAGES/xfwm4.mo
+share/locale/ur_PK/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
@@ -87,12 +130,16 @@ 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-prelight.png
+share/themes/Daloa/xfwm4/close-prelight.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-prelight.png
+share/themes/Daloa/xfwm4/hide-prelight.xpm
share/themes/Daloa/xfwm4/hide-pressed.png
share/themes/Daloa/xfwm4/hide-pressed.xpm
share/themes/Daloa/xfwm4/left-active.png
@@ -103,18 +150,24 @@ 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-prelight.png
+share/themes/Daloa/xfwm4/maximize-prelight.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-prelight.png
+share/themes/Daloa/xfwm4/maximize-toggled-prelight.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-prelight.png
+share/themes/Daloa/xfwm4/menu-prelight.xpm
share/themes/Daloa/xfwm4/menu-pressed.png
share/themes/Daloa/xfwm4/menu-pressed.xpm
share/themes/Daloa/xfwm4/right-active.png
@@ -125,24 +178,32 @@ 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-prelight.png
+share/themes/Daloa/xfwm4/shade-prelight.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-prelight.png
+share/themes/Daloa/xfwm4/shade-toggled-prelight.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-prelight.png
+share/themes/Daloa/xfwm4/stick-prelight.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-prelight.png
+share/themes/Daloa/xfwm4/stick-toggled-prelight.xpm
share/themes/Daloa/xfwm4/stick-toggled-pressed.png
share/themes/Daloa/xfwm4/stick-toggled-pressed.xpm
share/themes/Daloa/xfwm4/themerc
@@ -174,24 +235,6 @@ 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/Daloa/xfwm4/close-prelight.xpm
-share/themes/Daloa/xfwm4/hide-prelight.xpm
-share/themes/Daloa/xfwm4/maximize-prelight.xpm
-share/themes/Daloa/xfwm4/maximize-toggled-prelight.xpm
-share/themes/Daloa/xfwm4/menu-prelight.xpm
-share/themes/Daloa/xfwm4/shade-prelight.xpm
-share/themes/Daloa/xfwm4/shade-toggled-prelight.xpm
-share/themes/Daloa/xfwm4/stick-prelight.xpm
-share/themes/Daloa/xfwm4/stick-toggled-prelight.xpm
-share/themes/Daloa/xfwm4/close-prelight.png
-share/themes/Daloa/xfwm4/hide-prelight.png
-share/themes/Daloa/xfwm4/maximize-prelight.png
-share/themes/Daloa/xfwm4/maximize-toggled-prelight.png
-share/themes/Daloa/xfwm4/menu-prelight.png
-share/themes/Daloa/xfwm4/shade-prelight.png
-share/themes/Daloa/xfwm4/shade-toggled-prelight.png
-share/themes/Daloa/xfwm4/stick-prelight.png
-share/themes/Daloa/xfwm4/stick-toggled-prelight.png
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
@@ -332,109 +375,231 @@ 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-4.4/xfwm4/README
-share/themes/Default-4.4/xfwm4/themerc
-share/themes/Default-4.4/xfwm4/bottom-active.xpm
-share/themes/Default-4.4/xfwm4/bottom-inactive.xpm
-share/themes/Default-4.4/xfwm4/bottom-left-active.xpm
-share/themes/Default-4.4/xfwm4/bottom-left-inactive.xpm
-share/themes/Default-4.4/xfwm4/bottom-right-active.xpm
-share/themes/Default-4.4/xfwm4/bottom-right-inactive.xpm
-share/themes/Default-4.4/xfwm4/close-active.xpm
-share/themes/Default-4.4/xfwm4/close-inactive.xpm
-share/themes/Default-4.4/xfwm4/close-pressed.xpm
-share/themes/Default-4.4/xfwm4/hide-active.xpm
-share/themes/Default-4.4/xfwm4/hide-inactive.xpm
-share/themes/Default-4.4/xfwm4/hide-pressed.xpm
-share/themes/Default-4.4/xfwm4/left-active.xpm
-share/themes/Default-4.4/xfwm4/left-inactive.xpm
-share/themes/Default-4.4/xfwm4/maximize-active.xpm
-share/themes/Default-4.4/xfwm4/maximize-inactive.xpm
-share/themes/Default-4.4/xfwm4/maximize-pressed.xpm
-share/themes/Default-4.4/xfwm4/maximize-toggled-active.xpm
-share/themes/Default-4.4/xfwm4/maximize-toggled-inactive.xpm
-share/themes/Default-4.4/xfwm4/maximize-toggled-pressed.xpm
-share/themes/Default-4.4/xfwm4/menu-active.xpm
-share/themes/Default-4.4/xfwm4/menu-inactive.xpm
-share/themes/Default-4.4/xfwm4/menu-pressed.xpm
-share/themes/Default-4.4/xfwm4/right-active.xpm
-share/themes/Default-4.4/xfwm4/right-inactive.xpm
-share/themes/Default-4.4/xfwm4/shade-active.xpm
-share/themes/Default-4.4/xfwm4/shade-inactive.xpm
-share/themes/Default-4.4/xfwm4/shade-pressed.xpm
-share/themes/Default-4.4/xfwm4/shade-toggled-active.xpm
-share/themes/Default-4.4/xfwm4/shade-toggled-inactive.xpm
-share/themes/Default-4.4/xfwm4/shade-toggled-pressed.xpm
-share/themes/Default-4.4/xfwm4/stick-active.xpm
-share/themes/Default-4.4/xfwm4/stick-inactive.xpm
-share/themes/Default-4.4/xfwm4/stick-pressed.xpm
-share/themes/Default-4.4/xfwm4/stick-toggled-active.xpm
-share/themes/Default-4.4/xfwm4/stick-toggled-inactive.xpm
-share/themes/Default-4.4/xfwm4/stick-toggled-pressed.xpm
-share/themes/Default-4.4/xfwm4/title-1-active.xpm
-share/themes/Default-4.4/xfwm4/title-1-inactive.xpm
-share/themes/Default-4.4/xfwm4/title-2-active.xpm
-share/themes/Default-4.4/xfwm4/title-2-inactive.xpm
-share/themes/Default-4.4/xfwm4/title-3-active.xpm
-share/themes/Default-4.4/xfwm4/title-3-inactive.xpm
-share/themes/Default-4.4/xfwm4/title-4-active.xpm
-share/themes/Default-4.4/xfwm4/title-4-inactive.xpm
-share/themes/Default-4.4/xfwm4/title-5-active.xpm
-share/themes/Default-4.4/xfwm4/title-5-inactive.xpm
-share/themes/Default-4.4/xfwm4/top-left-active.xpm
-share/themes/Default-4.4/xfwm4/top-left-inactive.xpm
-share/themes/Default-4.4/xfwm4/top-right-active.xpm
-share/themes/Default-4.4/xfwm4/top-right-inactive.xpm
share/themes/Default-4.4/xfwm4/bottom-active.png
+share/themes/Default-4.4/xfwm4/bottom-active.xpm
share/themes/Default-4.4/xfwm4/bottom-inactive.png
+share/themes/Default-4.4/xfwm4/bottom-inactive.xpm
share/themes/Default-4.4/xfwm4/bottom-left-active.png
+share/themes/Default-4.4/xfwm4/bottom-left-active.xpm
share/themes/Default-4.4/xfwm4/bottom-left-inactive.png
+share/themes/Default-4.4/xfwm4/bottom-left-inactive.xpm
share/themes/Default-4.4/xfwm4/bottom-right-active.png
+share/themes/Default-4.4/xfwm4/bottom-right-active.xpm
share/themes/Default-4.4/xfwm4/bottom-right-inactive.png
+share/themes/Default-4.4/xfwm4/bottom-right-inactive.xpm
share/themes/Default-4.4/xfwm4/close-active.png
+share/themes/Default-4.4/xfwm4/close-active.xpm
share/themes/Default-4.4/xfwm4/close-inactive.png
+share/themes/Default-4.4/xfwm4/close-inactive.xpm
share/themes/Default-4.4/xfwm4/close-pressed.png
+share/themes/Default-4.4/xfwm4/close-pressed.xpm
share/themes/Default-4.4/xfwm4/hide-active.png
+share/themes/Default-4.4/xfwm4/hide-active.xpm
share/themes/Default-4.4/xfwm4/hide-inactive.png
+share/themes/Default-4.4/xfwm4/hide-inactive.xpm
share/themes/Default-4.4/xfwm4/hide-pressed.png
+share/themes/Default-4.4/xfwm4/hide-pressed.xpm
share/themes/Default-4.4/xfwm4/left-active.png
+share/themes/Default-4.4/xfwm4/left-active.xpm
share/themes/Default-4.4/xfwm4/left-inactive.png
+share/themes/Default-4.4/xfwm4/left-inactive.xpm
share/themes/Default-4.4/xfwm4/maximize-active.png
+share/themes/Default-4.4/xfwm4/maximize-active.xpm
share/themes/Default-4.4/xfwm4/maximize-inactive.png
+share/themes/Default-4.4/xfwm4/maximize-inactive.xpm
share/themes/Default-4.4/xfwm4/maximize-pressed.png
+share/themes/Default-4.4/xfwm4/maximize-pressed.xpm
share/themes/Default-4.4/xfwm4/maximize-toggled-active.png
+share/themes/Default-4.4/xfwm4/maximize-toggled-active.xpm
share/themes/Default-4.4/xfwm4/maximize-toggled-inactive.png
+share/themes/Default-4.4/xfwm4/maximize-toggled-inactive.xpm
share/themes/Default-4.4/xfwm4/maximize-toggled-pressed.png
+share/themes/Default-4.4/xfwm4/maximize-toggled-pressed.xpm
share/themes/Default-4.4/xfwm4/menu-active.png
+share/themes/Default-4.4/xfwm4/menu-active.xpm
share/themes/Default-4.4/xfwm4/menu-inactive.png
+share/themes/Default-4.4/xfwm4/menu-inactive.xpm
share/themes/Default-4.4/xfwm4/menu-pressed.png
+share/themes/Default-4.4/xfwm4/menu-pressed.xpm
share/themes/Default-4.4/xfwm4/right-active.png
+share/themes/Default-4.4/xfwm4/right-active.xpm
share/themes/Default-4.4/xfwm4/right-inactive.png
+share/themes/Default-4.4/xfwm4/right-inactive.xpm
share/themes/Default-4.4/xfwm4/shade-active.png
+share/themes/Default-4.4/xfwm4/shade-active.xpm
share/themes/Default-4.4/xfwm4/shade-inactive.png
+share/themes/Default-4.4/xfwm4/shade-inactive.xpm
share/themes/Default-4.4/xfwm4/shade-pressed.png
+share/themes/Default-4.4/xfwm4/shade-pressed.xpm
share/themes/Default-4.4/xfwm4/shade-toggled-active.png
+share/themes/Default-4.4/xfwm4/shade-toggled-active.xpm
share/themes/Default-4.4/xfwm4/shade-toggled-inactive.png
+share/themes/Default-4.4/xfwm4/shade-toggled-inactive.xpm
share/themes/Default-4.4/xfwm4/shade-toggled-pressed.png
+share/themes/Default-4.4/xfwm4/shade-toggled-pressed.xpm
share/themes/Default-4.4/xfwm4/stick-active.png
+share/themes/Default-4.4/xfwm4/stick-active.xpm
share/themes/Default-4.4/xfwm4/stick-inactive.png
+share/themes/Default-4.4/xfwm4/stick-inactive.xpm
share/themes/Default-4.4/xfwm4/stick-pressed.png
+share/themes/Default-4.4/xfwm4/stick-pressed.xpm
share/themes/Default-4.4/xfwm4/stick-toggled-active.png
+share/themes/Default-4.4/xfwm4/stick-toggled-active.xpm
share/themes/Default-4.4/xfwm4/stick-toggled-inactive.png
+share/themes/Default-4.4/xfwm4/stick-toggled-inactive.xpm
share/themes/Default-4.4/xfwm4/stick-toggled-pressed.png
+share/themes/Default-4.4/xfwm4/stick-toggled-pressed.xpm
+share/themes/Default-4.4/xfwm4/themerc
share/themes/Default-4.4/xfwm4/title-1-active.png
+share/themes/Default-4.4/xfwm4/title-1-active.xpm
share/themes/Default-4.4/xfwm4/title-1-inactive.png
+share/themes/Default-4.4/xfwm4/title-1-inactive.xpm
share/themes/Default-4.4/xfwm4/title-2-active.png
+share/themes/Default-4.4/xfwm4/title-2-active.xpm
share/themes/Default-4.4/xfwm4/title-2-inactive.png
+share/themes/Default-4.4/xfwm4/title-2-inactive.xpm
share/themes/Default-4.4/xfwm4/title-3-active.png
+share/themes/Default-4.4/xfwm4/title-3-active.xpm
share/themes/Default-4.4/xfwm4/title-3-inactive.png
+share/themes/Default-4.4/xfwm4/title-3-inactive.xpm
share/themes/Default-4.4/xfwm4/title-4-active.png
+share/themes/Default-4.4/xfwm4/title-4-active.xpm
share/themes/Default-4.4/xfwm4/title-4-inactive.png
+share/themes/Default-4.4/xfwm4/title-4-inactive.xpm
share/themes/Default-4.4/xfwm4/title-5-active.png
+share/themes/Default-4.4/xfwm4/title-5-active.xpm
share/themes/Default-4.4/xfwm4/title-5-inactive.png
+share/themes/Default-4.4/xfwm4/title-5-inactive.xpm
share/themes/Default-4.4/xfwm4/top-left-active.png
+share/themes/Default-4.4/xfwm4/top-left-active.xpm
share/themes/Default-4.4/xfwm4/top-left-inactive.png
+share/themes/Default-4.4/xfwm4/top-left-inactive.xpm
share/themes/Default-4.4/xfwm4/top-right-active.png
+share/themes/Default-4.4/xfwm4/top-right-active.xpm
share/themes/Default-4.4/xfwm4/top-right-inactive.png
+share/themes/Default-4.4/xfwm4/top-right-inactive.xpm
+share/themes/Default-4.6/xfwm4/README
+share/themes/Default-4.6/xfwm4/bottom-active.png
+share/themes/Default-4.6/xfwm4/bottom-active.xpm
+share/themes/Default-4.6/xfwm4/bottom-inactive.png
+share/themes/Default-4.6/xfwm4/bottom-inactive.xpm
+share/themes/Default-4.6/xfwm4/bottom-left-active.png
+share/themes/Default-4.6/xfwm4/bottom-left-active.xpm
+share/themes/Default-4.6/xfwm4/bottom-left-inactive.png
+share/themes/Default-4.6/xfwm4/bottom-left-inactive.xpm
+share/themes/Default-4.6/xfwm4/bottom-right-active.png
+share/themes/Default-4.6/xfwm4/bottom-right-active.xpm
+share/themes/Default-4.6/xfwm4/bottom-right-inactive.png
+share/themes/Default-4.6/xfwm4/bottom-right-inactive.xpm
+share/themes/Default-4.6/xfwm4/close-active.png
+share/themes/Default-4.6/xfwm4/close-active.xpm
+share/themes/Default-4.6/xfwm4/close-inactive.png
+share/themes/Default-4.6/xfwm4/close-inactive.xpm
+share/themes/Default-4.6/xfwm4/close-prelight.png
+share/themes/Default-4.6/xfwm4/close-prelight.xpm
+share/themes/Default-4.6/xfwm4/close-pressed.png
+share/themes/Default-4.6/xfwm4/close-pressed.xpm
+share/themes/Default-4.6/xfwm4/hide-active.png
+share/themes/Default-4.6/xfwm4/hide-active.xpm
+share/themes/Default-4.6/xfwm4/hide-inactive.png
+share/themes/Default-4.6/xfwm4/hide-inactive.xpm
+share/themes/Default-4.6/xfwm4/hide-prelight.png
+share/themes/Default-4.6/xfwm4/hide-prelight.xpm
+share/themes/Default-4.6/xfwm4/hide-pressed.png
+share/themes/Default-4.6/xfwm4/hide-pressed.xpm
+share/themes/Default-4.6/xfwm4/left-active.png
+share/themes/Default-4.6/xfwm4/left-active.xpm
+share/themes/Default-4.6/xfwm4/left-inactive.png
+share/themes/Default-4.6/xfwm4/left-inactive.xpm
+share/themes/Default-4.6/xfwm4/maximize-active.png
+share/themes/Default-4.6/xfwm4/maximize-active.xpm
+share/themes/Default-4.6/xfwm4/maximize-inactive.png
+share/themes/Default-4.6/xfwm4/maximize-inactive.xpm
+share/themes/Default-4.6/xfwm4/maximize-prelight.png
+share/themes/Default-4.6/xfwm4/maximize-prelight.xpm
+share/themes/Default-4.6/xfwm4/maximize-pressed.png
+share/themes/Default-4.6/xfwm4/maximize-pressed.xpm
+share/themes/Default-4.6/xfwm4/maximize-toggled-active.png
+share/themes/Default-4.6/xfwm4/maximize-toggled-active.xpm
+share/themes/Default-4.6/xfwm4/maximize-toggled-inactive.png
+share/themes/Default-4.6/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Default-4.6/xfwm4/maximize-toggled-prelight.png
+share/themes/Default-4.6/xfwm4/maximize-toggled-prelight.xpm
+share/themes/Default-4.6/xfwm4/maximize-toggled-pressed.png
+share/themes/Default-4.6/xfwm4/maximize-toggled-pressed.xpm
+share/themes/Default-4.6/xfwm4/menu-active.png
+share/themes/Default-4.6/xfwm4/menu-active.xpm
+share/themes/Default-4.6/xfwm4/menu-inactive.png
+share/themes/Default-4.6/xfwm4/menu-inactive.xpm
+share/themes/Default-4.6/xfwm4/menu-prelight.png
+share/themes/Default-4.6/xfwm4/menu-prelight.xpm
+share/themes/Default-4.6/xfwm4/menu-pressed.png
+share/themes/Default-4.6/xfwm4/menu-pressed.xpm
+share/themes/Default-4.6/xfwm4/right-active.png
+share/themes/Default-4.6/xfwm4/right-active.xpm
+share/themes/Default-4.6/xfwm4/right-inactive.png
+share/themes/Default-4.6/xfwm4/right-inactive.xpm
+share/themes/Default-4.6/xfwm4/shade-active.png
+share/themes/Default-4.6/xfwm4/shade-active.xpm
+share/themes/Default-4.6/xfwm4/shade-inactive.png
+share/themes/Default-4.6/xfwm4/shade-inactive.xpm
+share/themes/Default-4.6/xfwm4/shade-prelight.png
+share/themes/Default-4.6/xfwm4/shade-prelight.xpm
+share/themes/Default-4.6/xfwm4/shade-pressed.png
+share/themes/Default-4.6/xfwm4/shade-pressed.xpm
+share/themes/Default-4.6/xfwm4/shade-toggled-active.png
+share/themes/Default-4.6/xfwm4/shade-toggled-active.xpm
+share/themes/Default-4.6/xfwm4/shade-toggled-inactive.png
+share/themes/Default-4.6/xfwm4/shade-toggled-inactive.xpm
+share/themes/Default-4.6/xfwm4/shade-toggled-prelight.png
+share/themes/Default-4.6/xfwm4/shade-toggled-prelight.xpm
+share/themes/Default-4.6/xfwm4/shade-toggled-pressed.png
+share/themes/Default-4.6/xfwm4/shade-toggled-pressed.xpm
+share/themes/Default-4.6/xfwm4/stick-active.png
+share/themes/Default-4.6/xfwm4/stick-active.xpm
+share/themes/Default-4.6/xfwm4/stick-inactive.png
+share/themes/Default-4.6/xfwm4/stick-inactive.xpm
+share/themes/Default-4.6/xfwm4/stick-prelight.png
+share/themes/Default-4.6/xfwm4/stick-prelight.xpm
+share/themes/Default-4.6/xfwm4/stick-pressed.png
+share/themes/Default-4.6/xfwm4/stick-pressed.xpm
+share/themes/Default-4.6/xfwm4/stick-toggled-active.png
+share/themes/Default-4.6/xfwm4/stick-toggled-active.xpm
+share/themes/Default-4.6/xfwm4/stick-toggled-inactive.png
+share/themes/Default-4.6/xfwm4/stick-toggled-inactive.xpm
+share/themes/Default-4.6/xfwm4/stick-toggled-prelight.png
+share/themes/Default-4.6/xfwm4/stick-toggled-prelight.xpm
+share/themes/Default-4.6/xfwm4/stick-toggled-pressed.png
+share/themes/Default-4.6/xfwm4/stick-toggled-pressed.xpm
+share/themes/Default-4.6/xfwm4/themerc
+share/themes/Default-4.6/xfwm4/title-1-active.png
+share/themes/Default-4.6/xfwm4/title-1-active.xpm
+share/themes/Default-4.6/xfwm4/title-1-inactive.png
+share/themes/Default-4.6/xfwm4/title-1-inactive.xpm
+share/themes/Default-4.6/xfwm4/title-2-active.png
+share/themes/Default-4.6/xfwm4/title-2-active.xpm
+share/themes/Default-4.6/xfwm4/title-2-inactive.png
+share/themes/Default-4.6/xfwm4/title-2-inactive.xpm
+share/themes/Default-4.6/xfwm4/title-3-active.png
+share/themes/Default-4.6/xfwm4/title-3-active.xpm
+share/themes/Default-4.6/xfwm4/title-3-inactive.png
+share/themes/Default-4.6/xfwm4/title-3-inactive.xpm
+share/themes/Default-4.6/xfwm4/title-4-active.png
+share/themes/Default-4.6/xfwm4/title-4-active.xpm
+share/themes/Default-4.6/xfwm4/title-4-inactive.png
+share/themes/Default-4.6/xfwm4/title-4-inactive.xpm
+share/themes/Default-4.6/xfwm4/title-5-active.png
+share/themes/Default-4.6/xfwm4/title-5-active.xpm
+share/themes/Default-4.6/xfwm4/title-5-inactive.png
+share/themes/Default-4.6/xfwm4/title-5-inactive.xpm
+share/themes/Default-4.6/xfwm4/top-left-active.png
+share/themes/Default-4.6/xfwm4/top-left-active.xpm
+share/themes/Default-4.6/xfwm4/top-left-inactive.png
+share/themes/Default-4.6/xfwm4/top-left-inactive.xpm
+share/themes/Default-4.6/xfwm4/top-right-active.png
+share/themes/Default-4.6/xfwm4/top-right-active.xpm
+share/themes/Default-4.6/xfwm4/top-right-inactive.png
+share/themes/Default-4.6/xfwm4/top-right-inactive.xpm
share/themes/Default/xfwm4/README
share/themes/Default/xfwm4/bottom-active.png
share/themes/Default/xfwm4/bottom-active.xpm
@@ -452,12 +617,16 @@ 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-prelight.png
+share/themes/Default/xfwm4/close-prelight.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-prelight.png
+share/themes/Default/xfwm4/hide-prelight.xpm
share/themes/Default/xfwm4/hide-pressed.png
share/themes/Default/xfwm4/hide-pressed.xpm
share/themes/Default/xfwm4/left-active.png
@@ -468,18 +637,24 @@ 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-prelight.png
+share/themes/Default/xfwm4/maximize-prelight.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-prelight.png
+share/themes/Default/xfwm4/maximize-toggled-prelight.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-prelight.png
+share/themes/Default/xfwm4/menu-prelight.xpm
share/themes/Default/xfwm4/menu-pressed.png
share/themes/Default/xfwm4/menu-pressed.xpm
share/themes/Default/xfwm4/right-active.png
@@ -490,24 +665,32 @@ 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-prelight.png
+share/themes/Default/xfwm4/shade-prelight.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-prelight.png
+share/themes/Default/xfwm4/shade-toggled-prelight.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-prelight.png
+share/themes/Default/xfwm4/stick-prelight.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-prelight.png
+share/themes/Default/xfwm4/stick-toggled-prelight.xpm
share/themes/Default/xfwm4/stick-toggled-pressed.png
share/themes/Default/xfwm4/stick-toggled-pressed.xpm
share/themes/Default/xfwm4/themerc
@@ -539,146 +722,128 @@ 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/close-prelight.xpm
-share/themes/Default/xfwm4/hide-prelight.xpm
-share/themes/Default/xfwm4/maximize-prelight.xpm
-share/themes/Default/xfwm4/maximize-toggled-prelight.xpm
-share/themes/Default/xfwm4/menu-prelight.xpm
-share/themes/Default/xfwm4/shade-prelight.xpm
-share/themes/Default/xfwm4/shade-toggled-prelight.xpm
-share/themes/Default/xfwm4/stick-prelight.xpm
-share/themes/Default/xfwm4/stick-toggled-prelight.xpm
-share/themes/Default/xfwm4/close-prelight.png
-share/themes/Default/xfwm4/hide-prelight.png
-share/themes/Default/xfwm4/maximize-prelight.png
-share/themes/Default/xfwm4/maximize-toggled-prelight.png
-share/themes/Default/xfwm4/menu-prelight.png
-share/themes/Default/xfwm4/shade-prelight.png
-share/themes/Default/xfwm4/shade-toggled-prelight.png
-share/themes/Default/xfwm4/stick-prelight.png
-share/themes/Default/xfwm4/stick-toggled-prelight.png
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-active.xpm
share/themes/Kokodi/xfwm4/bottom-inactive.png
+share/themes/Kokodi/xfwm4/bottom-inactive.xpm
share/themes/Kokodi/xfwm4/bottom-left-active.png
+share/themes/Kokodi/xfwm4/bottom-left-active.xpm
share/themes/Kokodi/xfwm4/bottom-left-inactive.png
+share/themes/Kokodi/xfwm4/bottom-left-inactive.xpm
share/themes/Kokodi/xfwm4/bottom-right-active.png
+share/themes/Kokodi/xfwm4/bottom-right-active.xpm
share/themes/Kokodi/xfwm4/bottom-right-inactive.png
+share/themes/Kokodi/xfwm4/bottom-right-inactive.xpm
share/themes/Kokodi/xfwm4/close-active.png
+share/themes/Kokodi/xfwm4/close-active.xpm
share/themes/Kokodi/xfwm4/close-inactive.png
+share/themes/Kokodi/xfwm4/close-inactive.xpm
+share/themes/Kokodi/xfwm4/close-prelight.png
+share/themes/Kokodi/xfwm4/close-prelight.xpm
share/themes/Kokodi/xfwm4/close-pressed.png
+share/themes/Kokodi/xfwm4/close-pressed.xpm
share/themes/Kokodi/xfwm4/hide-active.png
+share/themes/Kokodi/xfwm4/hide-active.xpm
share/themes/Kokodi/xfwm4/hide-inactive.png
+share/themes/Kokodi/xfwm4/hide-inactive.xpm
+share/themes/Kokodi/xfwm4/hide-prelight.png
+share/themes/Kokodi/xfwm4/hide-prelight.xpm
share/themes/Kokodi/xfwm4/hide-pressed.png
+share/themes/Kokodi/xfwm4/hide-pressed.xpm
share/themes/Kokodi/xfwm4/left-active.png
+share/themes/Kokodi/xfwm4/left-active.xpm
share/themes/Kokodi/xfwm4/left-inactive.png
+share/themes/Kokodi/xfwm4/left-inactive.xpm
share/themes/Kokodi/xfwm4/maximize-active.png
+share/themes/Kokodi/xfwm4/maximize-active.xpm
share/themes/Kokodi/xfwm4/maximize-inactive.png
+share/themes/Kokodi/xfwm4/maximize-inactive.xpm
+share/themes/Kokodi/xfwm4/maximize-prelight.png
+share/themes/Kokodi/xfwm4/maximize-prelight.xpm
share/themes/Kokodi/xfwm4/maximize-pressed.png
+share/themes/Kokodi/xfwm4/maximize-pressed.xpm
share/themes/Kokodi/xfwm4/maximize-toggled-active.png
+share/themes/Kokodi/xfwm4/maximize-toggled-active.xpm
share/themes/Kokodi/xfwm4/maximize-toggled-inactive.png
+share/themes/Kokodi/xfwm4/maximize-toggled-inactive.xpm
+share/themes/Kokodi/xfwm4/maximize-toggled-prelight.png
+share/themes/Kokodi/xfwm4/maximize-toggled-prelight.xpm
share/themes/Kokodi/xfwm4/maximize-toggled-pressed.png
+share/themes/Kokodi/xfwm4/maximize-toggled-pressed.xpm
share/themes/Kokodi/xfwm4/menu-active.png
+share/themes/Kokodi/xfwm4/menu-active.xpm
share/themes/Kokodi/xfwm4/menu-inactive.png
+share/themes/Kokodi/xfwm4/menu-inactive.xpm
+share/themes/Kokodi/xfwm4/menu-prelight.png
+share/themes/Kokodi/xfwm4/menu-prelight.xpm
share/themes/Kokodi/xfwm4/menu-pressed.png
+share/themes/Kokodi/xfwm4/menu-pressed.xpm
share/themes/Kokodi/xfwm4/right-active.png
+share/themes/Kokodi/xfwm4/right-active.xpm
share/themes/Kokodi/xfwm4/right-inactive.png
+share/themes/Kokodi/xfwm4/right-inactive.xpm
share/themes/Kokodi/xfwm4/shade-active.png
+share/themes/Kokodi/xfwm4/shade-active.xpm
share/themes/Kokodi/xfwm4/shade-inactive.png
+share/themes/Kokodi/xfwm4/shade-inactive.xpm
+share/themes/Kokodi/xfwm4/shade-prelight.png
+share/themes/Kokodi/xfwm4/shade-prelight.xpm
share/themes/Kokodi/xfwm4/shade-pressed.png
+share/themes/Kokodi/xfwm4/shade-pressed.xpm
share/themes/Kokodi/xfwm4/shade-toggled-active.png
+share/themes/Kokodi/xfwm4/shade-toggled-active.xpm
share/themes/Kokodi/xfwm4/shade-toggled-inactive.png
+share/themes/Kokodi/xfwm4/shade-toggled-inactive.xpm
+share/themes/Kokodi/xfwm4/shade-toggled-prelight.png
+share/themes/Kokodi/xfwm4/shade-toggled-prelight.xpm
share/themes/Kokodi/xfwm4/shade-toggled-pressed.png
+share/themes/Kokodi/xfwm4/shade-toggled-pressed.xpm
share/themes/Kokodi/xfwm4/stick-active.png
+share/themes/Kokodi/xfwm4/stick-active.xpm
share/themes/Kokodi/xfwm4/stick-inactive.png
+share/themes/Kokodi/xfwm4/stick-inactive.xpm
+share/themes/Kokodi/xfwm4/stick-prelight.png
+share/themes/Kokodi/xfwm4/stick-prelight.xpm
share/themes/Kokodi/xfwm4/stick-pressed.png
+share/themes/Kokodi/xfwm4/stick-pressed.xpm
share/themes/Kokodi/xfwm4/stick-toggled-active.png
+share/themes/Kokodi/xfwm4/stick-toggled-active.xpm
share/themes/Kokodi/xfwm4/stick-toggled-inactive.png
+share/themes/Kokodi/xfwm4/stick-toggled-inactive.xpm
+share/themes/Kokodi/xfwm4/stick-toggled-prelight.png
+share/themes/Kokodi/xfwm4/stick-toggled-prelight.xpm
share/themes/Kokodi/xfwm4/stick-toggled-pressed.png
+share/themes/Kokodi/xfwm4/stick-toggled-pressed.xpm
+share/themes/Kokodi/xfwm4/themerc
share/themes/Kokodi/xfwm4/title-1-active.png
+share/themes/Kokodi/xfwm4/title-1-active.xpm
share/themes/Kokodi/xfwm4/title-1-inactive.png
+share/themes/Kokodi/xfwm4/title-1-inactive.xpm
share/themes/Kokodi/xfwm4/title-2-active.png
+share/themes/Kokodi/xfwm4/title-2-active.xpm
share/themes/Kokodi/xfwm4/title-2-inactive.png
+share/themes/Kokodi/xfwm4/title-2-inactive.xpm
share/themes/Kokodi/xfwm4/title-3-active.png
+share/themes/Kokodi/xfwm4/title-3-active.xpm
share/themes/Kokodi/xfwm4/title-3-inactive.png
+share/themes/Kokodi/xfwm4/title-3-inactive.xpm
share/themes/Kokodi/xfwm4/title-4-active.png
+share/themes/Kokodi/xfwm4/title-4-active.xpm
share/themes/Kokodi/xfwm4/title-4-inactive.png
+share/themes/Kokodi/xfwm4/title-4-inactive.xpm
share/themes/Kokodi/xfwm4/title-5-active.png
+share/themes/Kokodi/xfwm4/title-5-active.xpm
share/themes/Kokodi/xfwm4/title-5-inactive.png
+share/themes/Kokodi/xfwm4/title-5-inactive.xpm
share/themes/Kokodi/xfwm4/top-left-active.png
+share/themes/Kokodi/xfwm4/top-left-active.xpm
share/themes/Kokodi/xfwm4/top-left-inactive.png
+share/themes/Kokodi/xfwm4/top-left-inactive.xpm
share/themes/Kokodi/xfwm4/top-right-active.png
+share/themes/Kokodi/xfwm4/top-right-active.xpm
share/themes/Kokodi/xfwm4/top-right-inactive.png
-share/themes/Kokodi/xfwm4/close-prelight.xpm
-share/themes/Kokodi/xfwm4/hide-prelight.xpm
-share/themes/Kokodi/xfwm4/maximize-prelight.xpm
-share/themes/Kokodi/xfwm4/maximize-toggled-prelight.xpm
-share/themes/Kokodi/xfwm4/menu-prelight.xpm
-share/themes/Kokodi/xfwm4/shade-prelight.xpm
-share/themes/Kokodi/xfwm4/shade-toggled-prelight.xpm
-share/themes/Kokodi/xfwm4/stick-prelight.xpm
-share/themes/Kokodi/xfwm4/stick-toggled-prelight.xpm
-share/themes/Kokodi/xfwm4/close-prelight.png
-share/themes/Kokodi/xfwm4/hide-prelight.png
-share/themes/Kokodi/xfwm4/maximize-prelight.png
-share/themes/Kokodi/xfwm4/maximize-toggled-prelight.png
-share/themes/Kokodi/xfwm4/menu-prelight.png
-share/themes/Kokodi/xfwm4/shade-prelight.png
-share/themes/Kokodi/xfwm4/shade-toggled-prelight.png
-share/themes/Kokodi/xfwm4/stick-prelight.png
-share/themes/Kokodi/xfwm4/stick-toggled-prelight.png
+share/themes/Kokodi/xfwm4/top-right-inactive.xpm
share/themes/Moheli/xfwm4/README
share/themes/Moheli/xfwm4/bottom-active.png
share/themes/Moheli/xfwm4/bottom-active.xpm
@@ -784,7 +949,6 @@ 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
@@ -859,6 +1023,7 @@ 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/themerc
share/themes/Sassandra/xfwm4/title-1-active.png
share/themes/Sassandra/xfwm4/title-1-active.xpm
share/themes/Sassandra/xfwm4/title-1-inactive.png
@@ -1303,88 +1468,66 @@ 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
-share/xfce4/doc/C/images/keyboard_shortcuts.png
-share/xfce4/doc/C/images/misc_wm_prefs.png
-share/xfce4/doc/C/images/titlebar.png
-share/xfce4/doc/C/images/workspace_margins.png
-share/xfce4/doc/C/images/xfwm_workspaces.png
-share/xfce4/doc/C/xfwm4.html
-share/xfce4/doc/fr/images/compose_shortcut.png
-share/xfce4/doc/fr/images/decoration_style.png
-share/xfce4/doc/fr/images/focus.png
-share/xfce4/doc/fr/images/keyboard_and_focus.png
-share/xfce4/doc/fr/images/keyboard_shortcuts.png
-share/xfce4/doc/fr/images/misc_wm_prefs.png
-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/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
-@dirrm libexec/xfce4/xfwm4
-@dirrm libexec/xfce4
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
+@dirrm share/xfwm4
+@dirrm share/themes/Wallis/xfwm4
+@dirrm share/themes/Wallis
+@dirrm share/themes/Tyrex/xfwm4
+@dirrm share/themes/Tyrex
+@dirrm share/themes/Therapy/xfwm4
+@dirrm share/themes/Therapy
+@dirrm share/themes/Stoneage/xfwm4
+@dirrm share/themes/Stoneage
+@dirrm share/themes/Sassandra/xfwm4
+@dirrm share/themes/Sassandra
+@dirrm share/themes/Moheli/xfwm4
+@dirrm share/themes/Moheli
+@dirrm share/themes/Kokodi/xfwm4
+@dirrm share/themes/Kokodi
+@dirrm share/themes/Default/xfwm4
+@dirrm share/themes/Default-4.6/xfwm4
+@dirrm share/themes/Default-4.6
+@dirrm share/themes/Default-4.4/xfwm4
+@dirrm share/themes/Default-4.4
+@dirrm share/themes/Default-4.2/xfwm4
+@dirrm share/themes/Default-4.2
+@dirrm share/themes/Default-4.0/xfwm4
+@dirrm share/themes/Default-4.0
+@dirrm share/themes/Default
+@dirrm share/themes/Daloa/xfwm4
+@dirrm share/themes/Daloa
+@dirrm share/themes
+@dirrmtry share/locale/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
@dirrmtry share/locale/kk/LC_MESSAGES
@dirrmtry share/locale/kk
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
-@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/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/Default-4.2/xfwm4
-@dirrmtry share/themes/Default-4.2
-@dirrm share/themes/Default-4.4/xfwm4
-@dirrmtry share/themes/Default-4.4
-@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/Wallis/xfwm4
-@dirrmtry share/themes/Wallis
-@dirrmtry share/xfwm4/themes
-@dirrmtry share/xfwm4
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/themes
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrm share/doc/xfwm4/html/ug
+@dirrm share/doc/xfwm4/html/sv
+@dirrm share/doc/xfwm4/html/it/images
+@dirrm share/doc/xfwm4/html/it
+@dirrm share/doc/xfwm4/html/gl
+@dirrm share/doc/xfwm4/html/el
+@dirrm share/doc/xfwm4/html/fr/images
+@dirrm share/doc/xfwm4/html/fr
+@dirrm share/doc/xfwm4/html/da
+@dirrm share/doc/xfwm4/html/C/images
+@dirrm share/doc/xfwm4/html/C
+@dirrm share/doc/xfwm4/html
+@dirrm share/doc/xfwm4
+@dirrmtry share/applications
+@dirrm lib/xfce4/xfwm4
+@dirrm lib/xfce4
diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 0032b0b31189..acafbfe3df99 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= Terminal
-PORTVERSION= 0.4.5
+PORTVERSION= 0.4.6
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
MASTER_SITE_SUBDIR= src/apps/${PORTNAME:L}/${PORTVERSION:R}
diff --git a/x11/Terminal/distinfo b/x11/Terminal/distinfo
index c294b0f03b0e..3e8be6e72fe9 100644
--- a/x11/Terminal/distinfo
+++ b/x11/Terminal/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/Terminal-0.4.5.tar.bz2) = 3c707628e2e97c6d9566cd74d400036a
-SHA256 (xfce4/Terminal-0.4.5.tar.bz2) = 92fddcbc1422076672d8ec61832793d4ceea2fc0db7d724a6acde0ec2bac8893
-SIZE (xfce4/Terminal-0.4.5.tar.bz2) = 1564662
+SHA256 (xfce4/Terminal-0.4.6.tar.bz2) = 3a8d55d3b1bf3454ac7a695bec46e0aa3a957af2232f8f1d7f2c3c71806f897f
+SIZE (xfce4/Terminal-0.4.6.tar.bz2) = 1577616
diff --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist
index 3ae8989b90e3..959edae50232 100644
--- a/x11/Terminal/pkg-plist
+++ b/x11/Terminal/pkg-plist
@@ -73,16 +73,26 @@ share/Terminal/Terminal.glade
%%PORTDOCS%%%%DOCSDIR%%/gl/preferences.html
%%PORTDOCS%%%%DOCSDIR%%/gl/support.html
%%PORTDOCS%%%%DOCSDIR%%/gl/usage.html
-%%PORTDOCS%%%%DOCSDIR%%/hr/advanced.html
-%%PORTDOCS%%%%DOCSDIR%%/hr/command-line.html
-%%PORTDOCS%%%%DOCSDIR%%/hr/copyright.html
-%%PORTDOCS%%%%DOCSDIR%%/hr/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/hr/getting-started.html
-%%PORTDOCS%%%%DOCSDIR%%/hr/images
-%%PORTDOCS%%%%DOCSDIR%%/hr/index.html
-%%PORTDOCS%%%%DOCSDIR%%/hr/preferences.html
-%%PORTDOCS%%%%DOCSDIR%%/hr/support.html
-%%PORTDOCS%%%%DOCSDIR%%/hr/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/el/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/el/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/el/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/el/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/el/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/el/index.html
+%%PORTDOCS%%%%DOCSDIR%%/el/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/el/support.html
+%%PORTDOCS%%%%DOCSDIR%%/el/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/el/images
+%%PORTDOCS%%%%DOCSDIR%%/sv/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/index.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/support.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/sv/images
%%PORTDOCS%%%%DOCSDIR%%/id/advanced.html
%%PORTDOCS%%%%DOCSDIR%%/id/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/id/copyright.html
@@ -287,8 +297,6 @@ share/pixmaps/terminal.xpm
%%NLS%%@dirrmtry share/locale/id
%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/hu
-%%NLS%%@dirrmtry share/locale/hr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hr
%%NLS%%@dirrmtry share/locale/he/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/he
%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
@@ -355,6 +363,8 @@ share/pixmaps/terminal.xpm
%%PORTDOCS%%@dirrm %%DOCSDIR%%/es
%%PORTDOCS%%@dirrm %%DOCSDIR%%/da
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ca
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/el
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/sv
%%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/C
%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index c802b67b2b83..90168af06ab7 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -7,7 +7,7 @@
PORTNAME= avant-window-navigator
PORTVERSION= 0.3.2.1
-PORTREVISION?= 6
+PORTREVISION?= 7
CATEGORIES= x11
MASTER_SITES= http://launchpadlibrarian.net/26374006/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index a172102ae14d..099619bd7075 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -6,7 +6,7 @@
# $MCom: ports/x11/libexo/Makefile,v 1.1 2006/10/02 21:05:55 ahze Exp $
PORTNAME= libexo
-PORTVERSION= 0.3.107
+PORTVERSION= 0.6.0
CATEGORIES= x11 xfce
DISTNAME= exo-${PORTVERSION}
MASTER_SITES= ${MASTER_SITE_XFCE}
@@ -21,10 +21,10 @@ RUN_DEPENDS= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/${DISTNAME}
GNU_CONFIGURE= yes
-INSTALLS_ICONS= yes
+INSTALLS_ICONS= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
+USE_GNOME= gnomehack glib20 gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_PERL5= yes
USE_XFCE= configenv libutil
diff --git a/x11/libexo/distinfo b/x11/libexo/distinfo
index eb8b4fd744ba..86f72878d946 100644
--- a/x11/libexo/distinfo
+++ b/x11/libexo/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/exo-0.3.107.tar.bz2) = 3a92cca0c99ee940db4410891c9e8498
-SHA256 (xfce4/exo-0.3.107.tar.bz2) = 0a12ac124bad67c8de7135f7052641239ed640884a71612930f99c425bede2a3
-SIZE (xfce4/exo-0.3.107.tar.bz2) = 1889276
+SHA256 (xfce4/exo-0.6.0.tar.bz2) = 2869c016dd5b8e6700383bed6441dd41f395405bbc7f2d24ee732860783cfe12
+SIZE (xfce4/exo-0.6.0.tar.bz2) = 1607552
diff --git a/x11/libexo/files/patch-Makefile.in b/x11/libexo/files/patch-Makefile.in
deleted file mode 100644
index d72c5d05222c..000000000000
--- a/x11/libexo/files/patch-Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.in.orig 2010-05-21 18:51:18.000000000 +0200
-+++ Makefile.in 2010-05-23 19:55:57.000000000 +0200
-@@ -71,8 +71,8 @@
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = exo exo-csource exo-support exo-desktop-item-edit \
-- exo-hal exo-helper exo-mount exo-mount-notify exo-open docs \
-- icons pixmaps po po-doc python tests
-+ exo-hal exo-helper exo-mount exo-mount-notify exo-open \
-+ icons pixmaps po python tests
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- distdir = $(PACKAGE)-$(VERSION)
- top_distdir = $(distdir)
-@@ -320,11 +320,9 @@
- exo-mount \
- $(EXO_MOUNT_NOTIFY_SUBDIR) \
- exo-open \
-- docs \
- icons \
- pixmaps \
- po \
-- po-doc \
- $(PYTHON_SUBDIR) \
- tests
-
diff --git a/x11/libexo/files/patch-exo-mount-point.c b/x11/libexo/files/patch-exo-mount-point.c
deleted file mode 100644
index 249cbb8c673f..000000000000
--- a/x11/libexo/files/patch-exo-mount-point.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- exo/exo-mount-point.c.orig 2010-01-14 17:36:19.000000000 +0100
-+++ exo/exo-mount-point.c 2010-01-14 17:36:41.000000000 +0100
-@@ -38,6 +38,9 @@
- #include <sys/ucred.h>
- #endif
- #ifdef HAVE_SYS_MOUNT_H
-+#ifdef __FreeBSD__
-+#include <sys/param.h>
-+#endif
- #include <sys/mount.h>
- #endif
-
diff --git a/x11/libexo/pkg-plist b/x11/libexo/pkg-plist
index 877c6a1b8d07..b71be510e5c0 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -1,119 +1,203 @@
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
-etc/xdg/xfce4/mount.rc
-include/exo-%%VERSION%%/exo-hal/exo-hal.h
-include/exo-%%VERSION%%/exo/exo-binding.h
-include/exo-%%VERSION%%/exo/exo-cell-renderer-ellipsized-text.h
-include/exo-%%VERSION%%/exo/exo-cell-renderer-icon.h
-include/exo-%%VERSION%%/exo/exo-config.h
-include/exo-%%VERSION%%/exo/exo-ellipsized-label.h
-include/exo-%%VERSION%%/exo/exo-enum-types.h
-include/exo-%%VERSION%%/exo/exo-execute.h
-include/exo-%%VERSION%%/exo/exo-gdk-pixbuf-extensions.h
-include/exo-%%VERSION%%/exo/exo-gobject-extensions.h
-include/exo-%%VERSION%%/exo/exo-gtk-extensions.h
-include/exo-%%VERSION%%/exo/exo-icon-bar.h
-include/exo-%%VERSION%%/exo/exo-icon-chooser-dialog.h
-include/exo-%%VERSION%%/exo/exo-icon-view.h
-include/exo-%%VERSION%%/exo/exo-md5.h
-include/exo-%%VERSION%%/exo/exo-mount-point.h
-include/exo-%%VERSION%%/exo/exo-pango-extensions.h
-include/exo-%%VERSION%%/exo/exo-string.h
-include/exo-%%VERSION%%/exo/exo-toolbars-editor-dialog.h
-include/exo-%%VERSION%%/exo/exo-toolbars-editor.h
-include/exo-%%VERSION%%/exo/exo-toolbars-model.h
-include/exo-%%VERSION%%/exo/exo-toolbars-view.h
-include/exo-%%VERSION%%/exo/exo-tree-view.h
-include/exo-%%VERSION%%/exo/exo-url.h
-include/exo-%%VERSION%%/exo/exo-utils.h
-include/exo-%%VERSION%%/exo/exo-wrap-table.h
-include/exo-%%VERSION%%/exo/exo-xsession-client.h
-include/exo-%%VERSION%%/exo/exo.h
-lib/libexo-%%VERSION%%.a
-lib/libexo-%%VERSION%%.la
-lib/libexo-%%VERSION%%.so
-lib/libexo-%%VERSION%%.so.5
-lib/libexo-hal-%%VERSION%%.a
-lib/libexo-hal-%%VERSION%%.la
-lib/libexo-hal-%%VERSION%%.so
-lib/libexo-hal-%%VERSION%%.so.5
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%/_exo.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%/_exo.la
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%/_exo.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%/exo/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%/exo/__init__.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%/exo/__init__.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyo
-libdata/pkgconfig/exo-%%VERSION%%.pc
-libdata/pkgconfig/exo-hal-%%VERSION%%.pc
-libexec/exo-compose-mail-%%VERSION%%
-libexec/exo-helper-%%VERSION%%
-%%NOTIFY%%libexec/exo-mount-notify-%%VERSION%%
-%%NLS%%share/applications/exo-preferred-applications.desktop
+include/exo-1/exo/exo-binding.h
+include/exo-1/exo/exo-cell-renderer-ellipsized-text.h
+include/exo-1/exo/exo-cell-renderer-icon.h
+include/exo-1/exo/exo-config.h
+include/exo-1/exo/exo-enum-types.h
+include/exo-1/exo/exo-execute.h
+include/exo-1/exo/exo-gdk-pixbuf-extensions.h
+include/exo-1/exo/exo-gobject-extensions.h
+include/exo-1/exo/exo-gtk-extensions.h
+include/exo-1/exo/exo-icon-bar.h
+include/exo-1/exo/exo-icon-chooser-dialog.h
+include/exo-1/exo/exo-icon-view.h
+include/exo-1/exo/exo-job.h
+include/exo-1/exo/exo-simple-job.h
+include/exo-1/exo/exo-string.h
+include/exo-1/exo/exo-toolbars-editor-dialog.h
+include/exo-1/exo/exo-toolbars-editor.h
+include/exo-1/exo/exo-toolbars-model.h
+include/exo-1/exo/exo-toolbars-view.h
+include/exo-1/exo/exo-tree-view.h
+include/exo-1/exo/exo-utils.h
+include/exo-1/exo/exo-wrap-table.h
+include/exo-1/exo/exo-xsession-client.h
+include/exo-1/exo/exo.h
+lib/libexo-1.so.0
+lib/libexo-1.so
+lib/libexo-1.la
+lib/libexo-1.a
+lib/gio/modules/libexo-module-1.a
+lib/gio/modules/libexo-module-1.la
+lib/gio/modules/libexo-module-1.so
+lib/xfce4/exo-1/exo-compose-mail-1
+lib/xfce4/exo-1/exo-helper-1
+libdata/pkgconfig/exo-1.pc
+share/applications/exo-file-manager.desktop
+share/applications/exo-mail-reader.desktop
+share/applications/exo-preferred-applications.desktop
+share/applications/exo-terminal-emulator.desktop
+share/applications/exo-web-browser.desktop
+share/doc/exo/html/C/exo-preferred-applications.html
+share/doc/exo/html/C/images/exo-preferred-applications-internet.png
+share/doc/exo/html/C/images/exo-preferred-applications-utilities.png
+share/doc/exo/html/C/images/exo-preferred-applications-webbrowser-custom.png
+share/doc/exo/html/C/images/exo-preferred-applications-webbrowser-menu.png
+share/doc/exo/html/bn/exo-preferred-applications.html
+share/doc/exo/html/bn/images
+share/doc/exo/html/ca/exo-preferred-applications.html
+share/doc/exo/html/ca/images
+share/doc/exo/html/da/exo-preferred-applications.html
+share/doc/exo/html/da/images
+share/doc/exo/html/de/exo-preferred-applications.html
+share/doc/exo/html/de/images
+share/doc/exo/html/el/exo-preferred-applications.html
+share/doc/exo/html/el/images
+share/doc/exo/html/es/exo-preferred-applications.html
+share/doc/exo/html/es/images/exo-preferred-applications-internet.png
+share/doc/exo/html/es/images/exo-preferred-applications-utilities.png
+share/doc/exo/html/es/images/exo-preferred-applications-webbrowser-custom.png
+share/doc/exo/html/es/images/exo-preferred-applications-webbrowser-menu.png
+share/doc/exo/html/exo-preferred-applications.css
+share/doc/exo/html/fr/exo-preferred-applications.html
+share/doc/exo/html/fr/images
+share/doc/exo/html/gl/exo-preferred-applications.html
+share/doc/exo/html/gl/images
+share/doc/exo/html/id/exo-preferred-applications.html
+share/doc/exo/html/id/images
+share/doc/exo/html/it/exo-preferred-applications.html
+share/doc/exo/html/it/images
+share/doc/exo/html/ja/exo-preferred-applications.html
+share/doc/exo/html/ja/images/exo-preferred-applications-internet.png
+share/doc/exo/html/ja/images/exo-preferred-applications-utilities.png
+share/doc/exo/html/ja/images/exo-preferred-applications-webbrowser-custom.png
+share/doc/exo/html/ja/images/exo-preferred-applications-webbrowser-menu.png
+share/doc/exo/html/pt/exo-preferred-applications.html
+share/doc/exo/html/pt/images
+share/doc/exo/html/pt_BR/exo-preferred-applications.html
+share/doc/exo/html/pt_BR/images
+share/doc/exo/html/ru/exo-preferred-applications.html
+share/doc/exo/html/ru/images
+share/doc/exo/html/sv/exo-preferred-applications.html
+share/doc/exo/html/sv/images
+share/doc/exo/html/tr/exo-preferred-applications.html
+share/doc/exo/html/tr/images
+share/doc/exo/html/ug/exo-preferred-applications.html
+share/doc/exo/html/ug/images
+share/doc/exo/html/zh_CN/exo-preferred-applications.html
+share/doc/exo/html/zh_CN/images
+share/gtk-doc/html/exo-1/ExoCellRendererEllipsizedText.html
+share/gtk-doc/html/exo-1/ExoCellRendererIcon.html
+share/gtk-doc/html/exo-1/ExoIconBar.html
+share/gtk-doc/html/exo-1/ExoIconChooserDialog.html
+share/gtk-doc/html/exo-1/ExoIconView.html
+share/gtk-doc/html/exo-1/ExoJob.html
+share/gtk-doc/html/exo-1/ExoSimpleJob.html
+share/gtk-doc/html/exo-1/ExoToolbarsEditor.html
+share/gtk-doc/html/exo-1/ExoToolbarsEditorDialog.html
+share/gtk-doc/html/exo-1/ExoToolbarsModel.html
+share/gtk-doc/html/exo-1/ExoToolbarsView.html
+share/gtk-doc/html/exo-1/ExoTreeView.html
+share/gtk-doc/html/exo-1/ExoWrapTable.html
+share/gtk-doc/html/exo-1/ExoXsessionClient.html
+share/gtk-doc/html/exo-1/ch01.html
+share/gtk-doc/html/exo-1/exo-1.devhelp
+share/gtk-doc/html/exo-1/exo-1.devhelp2
+share/gtk-doc/html/exo-1/exo-Binding-Properties-Functions.html
+share/gtk-doc/html/exo-1/exo-Executing-Applications.html
+share/gtk-doc/html/exo-1/exo-Extensions-to-GObject.html
+share/gtk-doc/html/exo-1/exo-Extensions-to-Gtk.html
+share/gtk-doc/html/exo-1/exo-Extensions-to-gdk-pixbuf.html
+share/gtk-doc/html/exo-1/exo-Miscellaneous-Utility-Functions.html
+share/gtk-doc/html/exo-1/exo-String-Utility-Functions.html
+share/gtk-doc/html/exo-1/exo-Version-Information.html
+share/gtk-doc/html/exo-1/exo-cell-renderers.html
+share/gtk-doc/html/exo-1/exo-csource.html
+share/gtk-doc/html/exo-1/exo-extensions.html
+share/gtk-doc/html/exo-1/exo-gtk-file-chooser-add-thumbnail-preview.png
+share/gtk-doc/html/exo-1/exo-icon-chooser-dialog.png
+share/gtk-doc/html/exo-1/exo-jobs.html
+share/gtk-doc/html/exo-1/exo-miscelleanous.html
+share/gtk-doc/html/exo-1/exo-overview.html
+share/gtk-doc/html/exo-1/exo-toolbars-editor-dialog.png
+share/gtk-doc/html/exo-1/exo-toolbars-editor.png
+share/gtk-doc/html/exo-1/exo-toolbars-view.png
+share/gtk-doc/html/exo-1/exo-toolbars.html
+share/gtk-doc/html/exo-1/exo-tools.html
+share/gtk-doc/html/exo-1/exo-widgets.html
+share/gtk-doc/html/exo-1/exo-wrap-table.png
+share/gtk-doc/html/exo-1/home.png
+share/gtk-doc/html/exo-1/index.html
+share/gtk-doc/html/exo-1/index.sgml
+share/gtk-doc/html/exo-1/ix01.html
+share/gtk-doc/html/exo-1/left.png
+share/gtk-doc/html/exo-1/right.png
+share/gtk-doc/html/exo-1/style.css
+share/gtk-doc/html/exo-1/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
-%%NLS%%share/locale/am/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/ar/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/ast/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/be/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/bn/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/cy/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/da/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/dz/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/el/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/et/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/he/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/id/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/ku/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/mk/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/ur/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/ur_PK/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libexo-%%VERSION%%.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/libexo-%%VERSION%%.mo
-share/pixmaps/exo-%%VERSION%%/exo-thumbnail-frame.png
-%%PYTHON%%share/pygtk/2.0/defs/exo-%%VERSION%%/exo.defs
+share/locale/ar/LC_MESSAGES/exo-1.mo
+share/locale/ast/LC_MESSAGES/exo-1.mo
+share/locale/be/LC_MESSAGES/exo-1.mo
+share/locale/bg/LC_MESSAGES/exo-1.mo
+share/locale/bn/LC_MESSAGES/exo-1.mo
+share/locale/ca/LC_MESSAGES/exo-1.mo
+share/locale/cs/LC_MESSAGES/exo-1.mo
+share/locale/cy/LC_MESSAGES/exo-1.mo
+share/locale/da/LC_MESSAGES/exo-1.mo
+share/locale/de/LC_MESSAGES/exo-1.mo
+share/locale/dz/LC_MESSAGES/exo-1.mo
+share/locale/el/LC_MESSAGES/exo-1.mo
+share/locale/en_GB/LC_MESSAGES/exo-1.mo
+share/locale/es/LC_MESSAGES/exo-1.mo
+share/locale/et/LC_MESSAGES/exo-1.mo
+share/locale/eu/LC_MESSAGES/exo-1.mo
+share/locale/fi/LC_MESSAGES/exo-1.mo
+share/locale/fr/LC_MESSAGES/exo-1.mo
+share/locale/gl/LC_MESSAGES/exo-1.mo
+share/locale/he/LC_MESSAGES/exo-1.mo
+share/locale/hr/LC_MESSAGES/exo-1.mo
+share/locale/hu/LC_MESSAGES/exo-1.mo
+share/locale/id/LC_MESSAGES/exo-1.mo
+share/locale/is/LC_MESSAGES/exo-1.mo
+share/locale/it/LC_MESSAGES/exo-1.mo
+share/locale/ja/LC_MESSAGES/exo-1.mo
+share/locale/ka/LC_MESSAGES/exo-1.mo
+share/locale/kk/LC_MESSAGES/exo-1.mo
+share/locale/ku/LC_MESSAGES/exo-1.mo
+share/locale/lt/LC_MESSAGES/exo-1.mo
+share/locale/lv/LC_MESSAGES/exo-1.mo
+share/locale/mk/LC_MESSAGES/exo-1.mo
+share/locale/nb/LC_MESSAGES/exo-1.mo
+share/locale/nl/LC_MESSAGES/exo-1.mo
+share/locale/pa/LC_MESSAGES/exo-1.mo
+share/locale/pl/LC_MESSAGES/exo-1.mo
+share/locale/pt/LC_MESSAGES/exo-1.mo
+share/locale/pt_BR/LC_MESSAGES/exo-1.mo
+share/locale/ro/LC_MESSAGES/exo-1.mo
+share/locale/ru/LC_MESSAGES/exo-1.mo
+share/locale/si/LC_MESSAGES/exo-1.mo
+share/locale/sk/LC_MESSAGES/exo-1.mo
+share/locale/sl/LC_MESSAGES/exo-1.mo
+share/locale/sq/LC_MESSAGES/exo-1.mo
+share/locale/sv/LC_MESSAGES/exo-1.mo
+share/locale/tl_PH/LC_MESSAGES/exo-1.mo
+share/locale/tr/LC_MESSAGES/exo-1.mo
+share/locale/ug/LC_MESSAGES/exo-1.mo
+share/locale/uk/LC_MESSAGES/exo-1.mo
+share/locale/ur/LC_MESSAGES/exo-1.mo
+share/locale/ur_PK/LC_MESSAGES/exo-1.mo
+share/locale/zh_CN/LC_MESSAGES/exo-1.mo
+share/locale/zh_TW/LC_MESSAGES/exo-1.mo
+share/pixmaps/exo-1/exo-thumbnail-frame.png
share/xfce4/helpers/Terminal.desktop
+share/xfce4/helpers/Thunar.desktop
share/xfce4/helpers/aterm.desktop
share/xfce4/helpers/balsa.desktop
share/xfce4/helpers/debian-sensible-browser.desktop
@@ -125,6 +209,7 @@ share/xfce4/helpers/evolution.desktop
share/xfce4/helpers/firefox.desktop
share/xfce4/helpers/galeon.desktop
share/xfce4/helpers/gnome-terminal.desktop
+share/xfce4/helpers/icedove.desktop
share/xfce4/helpers/kmail.desktop
share/xfce4/helpers/konqueror.desktop
share/xfce4/helpers/links.desktop
@@ -133,130 +218,72 @@ share/xfce4/helpers/midori.desktop
share/xfce4/helpers/mozilla-browser.desktop
share/xfce4/helpers/mozilla-mailer.desktop
share/xfce4/helpers/mutt.desktop
+share/xfce4/helpers/nautilus.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/pcmanfm.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 share/xfce4/helpers
-@dirrmtry share/xfce4
-@dirrm share/pixmaps/exo-%%VERSION%%
-%%PYTHON%%@dirrm share/pygtk/2.0/defs/exo-%%VERSION%%
-%%PYTHON%%@dirrmtry share/pygtk/2.0/defs
-%%PYTHON%%@dirrmtry share/pygtk/2.0
-%%PYTHON%%@dirrmtry share/pygtk
-%%NLS%%@dirrmtry share/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_TW
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur_PK
-%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
-%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tr
-%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv
-%%NLS%%@dirrmtry share/locale/sq/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sq
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt_BR
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/pa/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pa
-%%NLS%%@dirrmtry share/locale/nn/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nn
-%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl
-%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nb
-%%NLS%%@dirrmtry share/locale/mk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/mk
-%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lv
-%%NLS%%@dirrmtry share/locale/lt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lt
-%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ku
-%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/ka/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ka
-%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja
-%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it
-%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id
-%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hu
-%%NLS%%@dirrmtry share/locale/he/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/he
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eu
-%%NLS%%@dirrmtry share/locale/et/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/et
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es
-%%NLS%%@dirrmtry share/locale/en_GB/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en_GB
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/el
-%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/dz
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
-%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/da
-%%NLS%%@dirrmtry share/locale/cy/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cy
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
-%%NLS%%@dirrmtry share/locale/bn/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/bn
-%%NLS%%@dirrmtry share/locale/be/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/be
-%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ast
-%%NLS%%@dirrmtry share/locale/ar/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ar
-%%NLS%%@dirrmtry share/locale/am/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/am
-%%NLS%%@dirrmtry share/applications
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry %%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%/exo
-@dirrmtry %%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-%%VERSION%%
-@dirrm include/exo-%%VERSION%%/exo-hal
-@dirrm include/exo-%%VERSION%%/exo
-@dirrm include/exo-%%VERSION%%
+@dirrm share/xfce4/helpers
+@dirrm share/xfce4
+@dirrm share/pixmaps/exo-1
+@dirrmtry share/locale/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/tl_PH/LC_MESSAGES
+@dirrmtry share/locale/tl_PH
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrm share/gtk-doc/html/exo-1
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+@dirrm share/doc/exo/html/zh_CN
+@dirrm share/doc/exo/html/ug
+@dirrm share/doc/exo/html/tr
+@dirrm share/doc/exo/html/sv
+@dirrm share/doc/exo/html/ru
+@dirrm share/doc/exo/html/pt_BR
+@dirrm share/doc/exo/html/pt
+@dirrm share/doc/exo/html/ja/images
+@dirrm share/doc/exo/html/ja
+@dirrm share/doc/exo/html/it
+@dirrm share/doc/exo/html/id
+@dirrm share/doc/exo/html/gl
+@dirrm share/doc/exo/html/fr
+@dirrm share/doc/exo/html/es/images
+@dirrm share/doc/exo/html/es
+@dirrm share/doc/exo/html/el
+@dirrm share/doc/exo/html/de
+@dirrm share/doc/exo/html/da
+@dirrm share/doc/exo/html/ca
+@dirrm share/doc/exo/html/bn
+@dirrm share/doc/exo/html/C/images
+@dirrm share/doc/exo/html/C
+@dirrm share/doc/exo/html
+@dirrm share/doc/exo
+@dirrmtry share/applications
+@dirrm lib/gio/modules
+@dirrm lib/gio
+@dirrm lib/xfce4/exo-1
+@dirrmtry lib/xfce4
+@dirrm include/exo-1/exo
+@dirrm include/exo-1
@dirrmtry etc/xdg/xfce4
@dirrmtry etc/xdg
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index db861a3bfe1c..97edbccaefd8 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -6,9 +6,10 @@
#
PORTNAME= libxfce4menu
-PORTVERSION= 4.6.2
+PORTVERSION= 4.8.0
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
+DISTNAME= libxfce4ui-${PORTVERSION}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
@@ -20,7 +21,7 @@ USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
-USE_XFCE= configenv libutil
+USE_XFCE= configenv libutil xfconf
CONFIGURE_ARGS= --enable-gtk-doc-html=no \
--disable-debug
diff --git a/x11/libxfce4menu/distinfo b/x11/libxfce4menu/distinfo
index 3748d2b5c6a0..181e12caa7d4 100644
--- a/x11/libxfce4menu/distinfo
+++ b/x11/libxfce4menu/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/libxfce4menu-4.6.2.tar.bz2) = ff10cacb76803ee37159e3a43345f0d1
-SHA256 (xfce4/libxfce4menu-4.6.2.tar.bz2) = 62352be57318d6f241c4f6e4b6f9303d0b80246ea8f6e4753a962360a9965162
-SIZE (xfce4/libxfce4menu-4.6.2.tar.bz2) = 375499
+SHA256 (xfce4/libxfce4ui-4.8.0.tar.bz2) = 21f67fd004653440bfdb44874ed69c9806b4784978ec068d0b1c7012864ba339
+SIZE (xfce4/libxfce4ui-4.8.0.tar.bz2) = 434180
diff --git a/x11/libxfce4menu/pkg-plist b/x11/libxfce4menu/pkg-plist
index 248c077de45a..1ac4b60124b1 100644
--- a/x11/libxfce4menu/pkg-plist
+++ b/x11/libxfce4menu/pkg-plist
@@ -1,176 +1,117 @@
-include/xfce4/libxfce4menu-0.1/libxfce4menu/libxfce4menu-config.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/libxfce4menu.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-and-rules.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-directory.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-element.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-environment.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-item-cache.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-item-pool.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-item.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-layout.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-monitor.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-move.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-not-rules.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-or-rules.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-rules.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-separator.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu-standard-rules.h
-include/xfce4/libxfce4menu-0.1/libxfce4menu/xfce-menu.h
-lib/libxfce4menu-0.1.a
-lib/libxfce4menu-0.1.la
-lib/libxfce4menu-0.1.so
-lib/libxfce4menu-0.1.so.0
-libdata/pkgconfig/libxfce4menu-0.1.pc
-share/gtk-doc/html/libxfce4menu/XfceMenu.html
-share/gtk-doc/html/libxfce4menu/XfceMenuAndRules.html
-share/gtk-doc/html/libxfce4menu/XfceMenuDirectory.html
-share/gtk-doc/html/libxfce4menu/XfceMenuElement.html
-share/gtk-doc/html/libxfce4menu/XfceMenuItem.html
-share/gtk-doc/html/libxfce4menu/XfceMenuItemCache.html
-share/gtk-doc/html/libxfce4menu/XfceMenuItemPool.html
-share/gtk-doc/html/libxfce4menu/XfceMenuLayout.html
-share/gtk-doc/html/libxfce4menu/XfceMenuNotRules.html
-share/gtk-doc/html/libxfce4menu/XfceMenuOrRules.html
-share/gtk-doc/html/libxfce4menu/XfceMenuRules.html
-share/gtk-doc/html/libxfce4menu/XfceMenuSeparator.html
-share/gtk-doc/html/libxfce4menu/XfceMenuStandardRules.html
-share/gtk-doc/html/libxfce4menu/fundamentals.html
-share/gtk-doc/html/libxfce4menu/home.png
-share/gtk-doc/html/libxfce4menu/index.html
-share/gtk-doc/html/libxfce4menu/index.sgml
-share/gtk-doc/html/libxfce4menu/internals.html
-share/gtk-doc/html/libxfce4menu/introduction.html
-share/gtk-doc/html/libxfce4menu/items.html
-share/gtk-doc/html/libxfce4menu/ix01.html
-share/gtk-doc/html/libxfce4menu/layout.html
-share/gtk-doc/html/libxfce4menu/left.png
-share/gtk-doc/html/libxfce4menu/libxfce4menu-Desktop-Environment.html
-share/gtk-doc/html/libxfce4menu/libxfce4menu-Initialization-and-Shutdown.html
-share/gtk-doc/html/libxfce4menu/libxfce4menu-Monitoring.html
-share/gtk-doc/html/libxfce4menu/libxfce4menu-Version-Information.html
-share/gtk-doc/html/libxfce4menu/libxfce4menu-XfceMenuMove.html
-share/gtk-doc/html/libxfce4menu/libxfce4menu.devhelp
-share/gtk-doc/html/libxfce4menu/libxfce4menu.devhelp2
-share/gtk-doc/html/libxfce4menu/menus.html
-share/gtk-doc/html/libxfce4menu/move.html
-share/gtk-doc/html/libxfce4menu/right.png
-share/gtk-doc/html/libxfce4menu/rules.html
-share/gtk-doc/html/libxfce4menu/style.css
-share/gtk-doc/html/libxfce4menu/up.png
-share/gtk-doc/html/libxfce4menu/utilities.html
-%%NLS%%share/locale/am/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/ast/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/da/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/el/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/id/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/ku/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/ur/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/ur_PK/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/libxfce4menu-0.1.mo
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur_PK
-%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
-%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tr
-%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv
-%%NLS%%@dirrmtry share/locale/sq/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sq
-%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt_BR
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/pa/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pa
-%%NLS%%@dirrmtry share/locale/nn/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nn
-%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl
-%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nb
-%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lv
-%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ku
-%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja
-%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it
-%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id
-%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hu
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eu
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es
-%%NLS%%@dirrmtry share/locale/en_GB/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en_GB
-%%NLS%%@dirrmtry share/locale/el/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/el
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
-%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/da
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
-%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ast
-%%NLS%%@dirrmtry share/locale/am/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/am
-@dirrm share/gtk-doc/html/libxfce4menu
+etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcut-dialog.h
+include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-grabber.h
+include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts-provider.h
+include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private/xfce-shortcuts.h
+include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui-config.h
+include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui-enum-types.h
+include/xfce4/libxfce4ui-1/libxfce4ui/libxfce4ui.h
+include/xfce4/libxfce4ui-1/libxfce4ui/xfce-dialogs.h
+include/xfce4/libxfce4ui-1/libxfce4ui/xfce-gdk-extensions.h
+include/xfce4/libxfce4ui-1/libxfce4ui/xfce-gtk-extensions.h
+include/xfce4/libxfce4ui-1/libxfce4ui/xfce-sm-client.h
+include/xfce4/libxfce4ui-1/libxfce4ui/xfce-spawn.h
+include/xfce4/libxfce4ui-1/libxfce4ui/xfce-titled-dialog.h
+lib/libxfce4kbd-private-2.a
+lib/libxfce4kbd-private-2.la
+lib/libxfce4kbd-private-2.so
+lib/libxfce4kbd-private-2.so.0
+lib/libxfce4ui-1.a
+lib/libxfce4ui-1.la
+lib/libxfce4ui-1.so
+lib/libxfce4ui-1.so.0
+libdata/pkgconfig/libxfce4kbd-private-2.pc
+libdata/pkgconfig/libxfce4ui-1.pc
+share/gtk-doc/html/libxfce4ui/XfceSMClient.html
+share/gtk-doc/html/libxfce4ui/home.png
+share/gtk-doc/html/libxfce4ui/index.html
+share/gtk-doc/html/libxfce4ui/index.sgml
+share/gtk-doc/html/libxfce4ui/ix01.html
+share/gtk-doc/html/libxfce4ui/left.png
+share/gtk-doc/html/libxfce4ui/libxfce4ui-extensions.html
+share/gtk-doc/html/libxfce4ui/libxfce4ui-fundamentals.html
+share/gtk-doc/html/libxfce4ui/libxfce4ui-introduction.html
+share/gtk-doc/html/libxfce4ui/libxfce4ui-libxfce4ui-config.html
+share/gtk-doc/html/libxfce4ui/libxfce4ui-sm.html
+share/gtk-doc/html/libxfce4ui/libxfce4ui-widgets.html
+share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-dialogs.html
+share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-gdk-extensions.html
+share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-gtk-extensions.html
+share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-spawn.html
+share/gtk-doc/html/libxfce4ui/libxfce4ui-xfce-titled-dialog.html
+share/gtk-doc/html/libxfce4ui/libxfce4ui.devhelp
+share/gtk-doc/html/libxfce4ui/libxfce4ui.devhelp2
+share/gtk-doc/html/libxfce4ui/right.png
+share/gtk-doc/html/libxfce4ui/style.css
+share/gtk-doc/html/libxfce4ui/up.png
+share/locale/ar/LC_MESSAGES/libxfce4ui.mo
+share/locale/ast/LC_MESSAGES/libxfce4ui.mo
+share/locale/bn/LC_MESSAGES/libxfce4ui.mo
+share/locale/ca/LC_MESSAGES/libxfce4ui.mo
+share/locale/cs/LC_MESSAGES/libxfce4ui.mo
+share/locale/da/LC_MESSAGES/libxfce4ui.mo
+share/locale/de/LC_MESSAGES/libxfce4ui.mo
+share/locale/el/LC_MESSAGES/libxfce4ui.mo
+share/locale/en_GB/LC_MESSAGES/libxfce4ui.mo
+share/locale/es/LC_MESSAGES/libxfce4ui.mo
+share/locale/eu/LC_MESSAGES/libxfce4ui.mo
+share/locale/fi/LC_MESSAGES/libxfce4ui.mo
+share/locale/fr/LC_MESSAGES/libxfce4ui.mo
+share/locale/gl/LC_MESSAGES/libxfce4ui.mo
+share/locale/he/LC_MESSAGES/libxfce4ui.mo
+share/locale/hr/LC_MESSAGES/libxfce4ui.mo
+share/locale/hu/LC_MESSAGES/libxfce4ui.mo
+share/locale/id/LC_MESSAGES/libxfce4ui.mo
+share/locale/is/LC_MESSAGES/libxfce4ui.mo
+share/locale/it/LC_MESSAGES/libxfce4ui.mo
+share/locale/ja/LC_MESSAGES/libxfce4ui.mo
+share/locale/kk/LC_MESSAGES/libxfce4ui.mo
+share/locale/ku/LC_MESSAGES/libxfce4ui.mo
+share/locale/lv/LC_MESSAGES/libxfce4ui.mo
+share/locale/nb/LC_MESSAGES/libxfce4ui.mo
+share/locale/nl/LC_MESSAGES/libxfce4ui.mo
+share/locale/pa/LC_MESSAGES/libxfce4ui.mo
+share/locale/pl/LC_MESSAGES/libxfce4ui.mo
+share/locale/pt/LC_MESSAGES/libxfce4ui.mo
+share/locale/pt_BR/LC_MESSAGES/libxfce4ui.mo
+share/locale/ro/LC_MESSAGES/libxfce4ui.mo
+share/locale/ru/LC_MESSAGES/libxfce4ui.mo
+share/locale/si/LC_MESSAGES/libxfce4ui.mo
+share/locale/sk/LC_MESSAGES/libxfce4ui.mo
+share/locale/sv/LC_MESSAGES/libxfce4ui.mo
+share/locale/tl_PH/LC_MESSAGES/libxfce4ui.mo
+share/locale/tr/LC_MESSAGES/libxfce4ui.mo
+share/locale/ug/LC_MESSAGES/libxfce4ui.mo
+share/locale/uk/LC_MESSAGES/libxfce4ui.mo
+share/locale/ur/LC_MESSAGES/libxfce4ui.mo
+share/locale/ur_PK/LC_MESSAGES/libxfce4ui.mo
+share/locale/zh_CN/LC_MESSAGES/libxfce4ui.mo
+share/locale/zh_TW/LC_MESSAGES/libxfce4ui.mo
+@dirrmtry share/locale/ur_PK/LC_MESSAGES
+@dirrmtry share/locale/ur_PK
+@dirrmtry share/locale/ur/LC_MESSAGES
+@dirrmtry share/locale/ur
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/tl_PH/LC_MESSAGES
+@dirrmtry share/locale/tl_PH
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrm share/gtk-doc/html/libxfce4ui
@dirrmtry share/gtk-doc/html
-@dirrm include/xfce4/libxfce4menu-0.1/libxfce4menu
-@dirrm include/xfce4/libxfce4menu-0.1
+@dirrmtry share/gtk-doc
+@dirrm include/xfce4/libxfce4ui-1/libxfce4ui
+@dirrm include/xfce4/libxfce4ui-1
+@dirrm include/xfce4/libxfce4kbd-private-2/libxfce4kbd-private
+@dirrm include/xfce4/libxfce4kbd-private-2
@dirrmtry include/xfce4
+@dirrm etc/xdg/xfce4/xfconf/xfce-perchannel-xml
+@dirrm etc/xdg/xfce4/xfconf
+@dirrm etc/xdg/xfce4
+@dirrm etc/xdg
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 305596677636..c388524c0fb9 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libxfce4util
-PORTVERSION= 4.6.2
+PORTVERSION= 4.8.1
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index 3f5ee46d10d3..2bb5d83ba8d0 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/libxfce4util-4.6.2.tar.bz2) = 9c3129d827d480f0906c575e7a13f1e9
-SHA256 (xfce4/libxfce4util-4.6.2.tar.bz2) = ae2e7ed1000bb0b3589643a39a65e6ab64c9ee198045e7b272604986f2e18c83
-SIZE (xfce4/libxfce4util-4.6.2.tar.bz2) = 400115
+SHA256 (xfce4/libxfce4util-4.8.1.tar.bz2) = 732aeb4f845fb92efb5487e49662f5b8544ea5feb9f1e4bd7629e726aaa70c81
+SIZE (xfce4/libxfce4util-4.8.1.tar.bz2) = 441032
diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist
index 9e01fddf05d3..cb9176a3c983 100644
--- a/x11/libxfce4util/pkg-plist
+++ b/x11/libxfce4util/pkg-plist
@@ -51,12 +51,14 @@ share/gtk-doc/html/libxfce4util/up.png
%%NLS%%share/locale/am/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/ar/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/ast/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/ca/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/cs/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/cy/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/da/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/de/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/dz/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/el/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/es/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/et/LC_MESSAGES/libxfce4util.mo
@@ -77,109 +79,41 @@ share/gtk-doc/html/libxfce4util/up.png
%%NLS%%share/locale/mk/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/nb/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/nl/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/pl/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/pt/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/ro/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/ru/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/si/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/sl/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/sq/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/sv/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/tl_PH/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/tr/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/ug/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/uk/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/ur/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/ur_PK/LC_MESSAGES/libxfce4util.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/libxfce4util.mo
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/libxfce4util.mo
%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ur_PK
%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ur
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tr
-%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv
-%%NLS%%@dirrmtry share/locale/sq/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sq
-%%NLS%%@dirrmtry share/locale/sl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sl
+%%NLS%%@dirrmtry share/locale/tl_PH/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/tl_PH
%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/si
-%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt_BR
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl
-%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nb
-%%NLS%%@dirrmtry share/locale/mk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/mk
-%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lv
-%%NLS%%@dirrmtry share/locale/lt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lt
-%%NLS%%@dirrmtry share/locale/ko/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ko
%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/ka/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ka
-%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja
-%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it
-%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id
-%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hu
-%%NLS%%@dirrmtry share/locale/he/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/he
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eu
-%%NLS%%@dirrmtry share/locale/et/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/et
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es
-%%NLS%%@dirrmtry share/locale/en_GB/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en_GB
%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/dz
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
-%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/da
-%%NLS%%@dirrmtry share/locale/cy/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cy
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ast
-%%NLS%%@dirrmtry share/locale/ar/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ar
-%%NLS%%@dirrmtry share/locale/am/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/am
@dirrm share/gtk-doc/html/libxfce4util
@dirrmtry share/gtk-doc/html
@dirrmtry share/gtk-doc
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index aacbf9d6a80d..c02fee4517bc 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfce4-clipman-plugin
PORTVERSION= 1.1.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 xfce
-MASTER_SITES= http://archive.xfce.org/src/panel-plugins/${PORTNAME}/1.1/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= rene@FreeBSD.org
@@ -20,6 +21,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
OPTIONS= UNIQUE "Enable Unique (single instance) support" on
+#BROKEN= Does not work with xfce 4.8
+
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GETTEXT= yes
@@ -39,4 +42,9 @@ CONFIGURE_ARGS+= --enable-unique
CONFIGURE_ARGS+= --disable-unique
.endif
+post-patch:
+ @${REINPLACE_CMD} -e 's|exo-0\.3|exo-1|g; \
+ s|thunarx-1|thunarx-2|g' \
+ ${WRKSRC}/configure
+
.include <bsd.port.post.mk>
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index fa77d116767c..f2941c5dbd09 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xfce4-conf
-PORTVERSION= 4.6.2
+PORTVERSION= 4.8.0
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= xfconf-${PORTVERSION}
@@ -42,7 +42,7 @@ MAN3= Xfce4::Xfconf.3
BUILD_DEPENDS+= p5-ExtUtils-Depends>=0.300:${PORTSDIR}/devel/p5-ExtUtils-Depends \
p5-ExtUtils-PkgConfig>=1.12:${PORTSDIR}/devel/p5-ExtUtils-PkgConfig \
p5-Glib2>=1.200:${PORTSDIR}/devel/p5-Glib2
-RUN_DEPENDS+= ${BUILD_DEPENDS}
+RUN_DEPENDS+= ${BUILD_DEPENDS}
CONFIGURE_ARGS+=--enable-perl-bindings
PLIST_SUB+= PERLBIND=""
.else
diff --git a/x11/xfce4-conf/distinfo b/x11/xfce4-conf/distinfo
index 706fe316bfc9..9f3c0c6e78fb 100644
--- a/x11/xfce4-conf/distinfo
+++ b/x11/xfce4-conf/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfconf-4.6.2.tar.bz2) = 5ff93c15077c6dbbcd38c437bc1ab2ef
-SHA256 (xfce4/xfconf-4.6.2.tar.bz2) = 7b2635abc33ae6a76145238ed27557bc1ff91b1a5ee0757962f798a66d56f478
-SIZE (xfce4/xfconf-4.6.2.tar.bz2) = 463902
+SHA256 (xfce4/xfconf-4.8.0.tar.bz2) = e071d55982238f997a691ff4bb08ef39e4c86bae31cf69b6666bc0cdadd1b85d
+SIZE (xfce4/xfconf-4.8.0.tar.bz2) = 489324
diff --git a/x11/xfce4-conf/pkg-plist b/x11/xfce4-conf/pkg-plist
index abfd91b69244..6fb61bf84f45 100644
--- a/x11/xfce4-conf/pkg-plist
+++ b/x11/xfce4-conf/pkg-plist
@@ -8,8 +8,8 @@ lib/libxfconf-0.a
lib/libxfconf-0.la
lib/libxfconf-0.so
lib/libxfconf-0.so.2
+lib/xfce4/xfconf/xfconfd
libdata/pkgconfig/libxfconf-0.pc
-libexec/xfconfd
share/dbus-1/services/org.xfce.Xfconf.service
share/gtk-doc/html/xfconf/ch01.html
share/gtk-doc/html/xfconf/ch02.html
@@ -29,17 +29,21 @@ share/gtk-doc/html/xfconf/xfconf-xfconf-types.html
share/gtk-doc/html/xfconf/xfconf-xfconf.html
share/gtk-doc/html/xfconf/xfconf.devhelp
share/gtk-doc/html/xfconf/xfconf.devhelp2
-%%NLS%%share/locale/am/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/ast/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/ca/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/cs/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/da/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/de/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/es/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/eu/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/fi/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/fr/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/gl/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/hu/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/id/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/it/LC_MESSAGES/xfconf.mo
@@ -48,11 +52,14 @@ share/gtk-doc/html/xfconf/xfconf.devhelp2
%%NLS%%share/locale/lv/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/nb/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/nl/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/pl/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/pt/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/ro/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/ru/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/sv/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/tr/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/ug/LC_MESSAGES/xfconf.mo
@@ -60,84 +67,25 @@ share/gtk-doc/html/xfconf/xfconf.devhelp2
%%NLS%%share/locale/ur/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfconf.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfconf.mo
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/Xfconf.so
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/Xfconf.bs
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf/.packlist
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install/Files.pm
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.h
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install/xfconfperl-autogen.h
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install/xfconfperl.typemap
-%%PERLBIND%%%%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf.pm
-%%PERLBIND%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4/Xfconf
-%%PERLBIND%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Xfce4
-%%PERLBIND%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf/Install
-%%PERLBIND%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Xfce4/Xfconf
-%%PERLBIND%%@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Xfce4
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfconf.mo
%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ur_PK
%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ur
-%%NLS%%@dirrmtry share/locale/uk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/uk
%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/tr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/tr
-%%NLS%%@dirrmtry share/locale/sv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sv
-%%NLS%%@dirrmtry share/locale/ru/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ru
-%%NLS%%@dirrmtry share/locale/ro/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ro
-%%NLS%%@dirrmtry share/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt_BR
-%%NLS%%@dirrmtry share/locale/pt/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pt
-%%NLS%%@dirrmtry share/locale/pl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl
-%%NLS%%@dirrmtry share/locale/nl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nl
-%%NLS%%@dirrmtry share/locale/nb/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/nb
-%%NLS%%@dirrmtry share/locale/lv/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/lv
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/ja/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ja
-%%NLS%%@dirrmtry share/locale/it/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/it
-%%NLS%%@dirrmtry share/locale/id/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/id
-%%NLS%%@dirrmtry share/locale/hu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/hu
-%%NLS%%@dirrmtry share/locale/gl/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/gl
-%%NLS%%@dirrmtry share/locale/fr/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fr
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/eu/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/eu
-%%NLS%%@dirrmtry share/locale/es/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/es
-%%NLS%%@dirrmtry share/locale/de/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/de
-%%NLS%%@dirrmtry share/locale/da/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/da
-%%NLS%%@dirrmtry share/locale/cs/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/cs
-%%NLS%%@dirrmtry share/locale/ca/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ca
%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ast
-%%NLS%%@dirrmtry share/locale/am/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/am
@dirrm share/gtk-doc/html/xfconf
@dirrmtry share/gtk-doc/html
@dirrmtry share/gtk-doc
+@dirrmtry share/dbus-1
+@dirrm lib/xfce4/xfconf
+@dirrm lib/xfce4
@dirrm include/xfce4/xfconf-0/xfconf
@dirrm include/xfce4/xfconf-0
@dirrmtry include/xfce4
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index 9d8462ad97b7..ff1b05c0a4c8 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfce4-quicklauncher-plugin
PORTVERSION= 1.9.4
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= x11 xfce
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index 569cb92c9ac6..27fe99b66c50 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -7,11 +7,12 @@
PORTNAME= xfce4-screenshooter-plugin
PORTVERSION= 1.7.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 xfce
-MASTER_SITES= http://mocha.xfce.org/archive/src/apps/${PORTNAME:S/-plugin//}/${PORTVERSION:R}/
-DISTNAME= xfce4-screenshooter-${PORTVERSION}
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/apps/xfce4-screenshooter/${PORTVERSION:R}
DIST_SUBDIR= xfce4
+DISTNAME= xfce4-screenshooter-${PORTVERSION}
MAINTAINER= miwi@FreeBSD.org
COMMENT= Desktop Screenshot plugin for xfce
diff --git a/x11/xfce4-screenshooter-plugin/distinfo b/x11/xfce4-screenshooter-plugin/distinfo
index a93a355371c3..8ff12214832d 100644
--- a/x11/xfce4-screenshooter-plugin/distinfo
+++ b/x11/xfce4-screenshooter-plugin/distinfo
@@ -1,3 +1,2 @@
-MD5 (xfce4/xfce4-screenshooter-1.7.9.tar.bz2) = c01d1cf3830bf8d60e09c0cdd223034c
SHA256 (xfce4/xfce4-screenshooter-1.7.9.tar.bz2) = c895e0bb8371ec2922133e4d886dfdb401470fd8081162316e2bbc264d1f3358
SIZE (xfce4/xfce4-screenshooter-1.7.9.tar.bz2) = 1352359
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index c91bd78541cd..956f92d5cdd4 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -9,10 +9,10 @@ PORTNAME= verve-plugin
PORTVERSION= 1.0.0
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR= src/panel-plugins/${DISTNAME:S/-${PORTVERSION}//}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R}
+DIST_SUBDIR= xfce4
PKGNAMEPREFIX= xfce4-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
-DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org
COMMENT= A command line plugin for xfce4
diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile
index a6b3dee5acc9..c054c9d2e692 100644
--- a/x11/xfce4-wmdock-plugin/Makefile
+++ b/x11/xfce4-wmdock-plugin/Makefile
@@ -7,13 +7,15 @@
PORTNAME= xfce4-wmdock-plugin
PORTVERSION= 0.3.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= x11 xfce
MASTER_SITES= http://www.ibh.de/~ellguth/develop/
MAINTAINER= miwi@FreeBSD.org
COMMENT= WMdock plugin for XFCE
+BROKEN= Does not work with xfce 4.8
+
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GETTEXT= yes
diff --git a/x11/xfce4-xfapplet-plugin/Makefile b/x11/xfce4-xfapplet-plugin/Makefile
index ef5c7c1ea2dc..ee6b1be4bf2e 100644
--- a/x11/xfce4-xfapplet-plugin/Makefile
+++ b/x11/xfce4-xfapplet-plugin/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfce4-xfapplet-plugin
PORTVERSION= 0.1.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= x11 xfce
-MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= miwi@FreeBSD.org