aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.sites.mk8
-rw-r--r--Mk/bsd.xfce.mk34
-rw-r--r--archivers/thunar-archive-plugin/Makefile2
-rw-r--r--audio/thunar-media-tags-plugin/Makefile2
-rw-r--r--audio/xfce4-mixer/Makefile2
-rw-r--r--audio/xfce4-mpc-plugin/Makefile2
-rw-r--r--audio/xfmpc/Makefile2
-rw-r--r--deskutils/orage/Makefile2
-rw-r--r--deskutils/xfce4-notes-plugin/Makefile2
-rw-r--r--deskutils/xfce4-notification-daemon/Makefile2
-rw-r--r--deskutils/xfce4-notifyd/Makefile2
-rw-r--r--deskutils/xfce4-xkb-plugin/Makefile2
-rw-r--r--devel/thunar-svn-plugin/Makefile2
-rw-r--r--devel/thunar-vcs-plugin/Makefile2
-rw-r--r--editors/mousepad/Makefile2
-rw-r--r--graphics/ristretto/Makefile2
-rw-r--r--mail/xfce4-mailwatch-plugin/Makefile2
-rw-r--r--misc/xfce4-appfinder/Makefile3
-rw-r--r--misc/xfce4-appfinder/distinfo6
-rw-r--r--misc/xfce4-appfinder/pkg-plist13
-rw-r--r--misc/xfce4-weather-plugin/Makefile2
-rw-r--r--multimedia/xfce4-media/Makefile2
-rw-r--r--multimedia/xfce4-parole/Makefile2
-rw-r--r--multimedia/xfce4-xmms-plugin/Makefile2
-rw-r--r--net-im/xfce4-messenger-plugin/Makefile2
-rw-r--r--print/xfce4-print/Makefile3
-rw-r--r--sysutils/thunar-volman-plugin/Makefile2
-rw-r--r--sysutils/xfburn/Makefile2
-rw-r--r--sysutils/xfce4-battery-plugin/Makefile2
-rw-r--r--sysutils/xfce4-cpugraph-plugin/Makefile2
-rw-r--r--sysutils/xfce4-fsguard-plugin/Makefile2
-rw-r--r--sysutils/xfce4-genmon-plugin/Makefile2
-rw-r--r--sysutils/xfce4-minicmd-plugin/Makefile2
-rw-r--r--sysutils/xfce4-netload-plugin/Makefile2
-rw-r--r--sysutils/xfce4-places-plugin/Makefile2
-rw-r--r--sysutils/xfce4-power-manager/Makefile2
-rw-r--r--sysutils/xfce4-settings/Makefile59
-rw-r--r--sysutils/xfce4-settings/distinfo6
-rw-r--r--sysutils/xfce4-settings/pkg-plist163
-rw-r--r--sysutils/xfce4-systemload-plugin/Makefile2
-rw-r--r--sysutils/xfce4-utils/Makefile3
-rw-r--r--sysutils/xfce4-utils/distinfo6
-rw-r--r--sysutils/xfce4-utils/pkg-plist13
-rw-r--r--sysutils/xfce4-wavelan-plugin/Makefile2
-rw-r--r--textproc/xfce4-dict-plugin/Makefile2
-rw-r--r--www/xfce4-smartbookmark-plugin/Makefile2
-rw-r--r--x11-clocks/xfce4-datetime-plugin/Makefile2
-rw-r--r--x11-clocks/xfce4-timer-out-plugin/Makefile2
-rw-r--r--x11-clocks/xfce4-timer-plugin/Makefile2
-rw-r--r--x11-fm/thunar/Makefile7
-rw-r--r--x11-fm/thunar/distinfo6
-rw-r--r--x11-fm/thunar/files/patch-thunar-vfs-thumb.c11
-rw-r--r--x11-fm/thunar/pkg-plist50
-rw-r--r--x11-toolkits/libxfce4gui/Makefile5
-rw-r--r--x11-toolkits/libxfce4gui/distinfo6
-rw-r--r--x11-toolkits/libxfce4gui/pkg-plist3
-rw-r--r--x11-wm/xfce4-desktop/Makefile3
-rw-r--r--x11-wm/xfce4-desktop/distinfo6
-rw-r--r--x11-wm/xfce4-desktop/pkg-plist55
-rw-r--r--x11-wm/xfce4-panel/Makefile29
-rw-r--r--x11-wm/xfce4-panel/distinfo6
-rw-r--r--x11-wm/xfce4-panel/pkg-plist316
-rw-r--r--x11-wm/xfce4-session/Makefile16
-rw-r--r--x11-wm/xfce4-session/distinfo6
-rw-r--r--x11-wm/xfce4-session/files/patch-Makefile.in28
-rw-r--r--x11-wm/xfce4-session/pkg-plist307
-rw-r--r--x11-wm/xfce4-wm/Makefile3
-rw-r--r--x11-wm/xfce4-wm/distinfo6
-rw-r--r--x11-wm/xfce4-wm/pkg-plist12
-rw-r--r--x11/Terminal/Makefile36
-rw-r--r--x11/Terminal/distinfo6
-rw-r--r--x11/Terminal/files/extra-patch-doc-Makefile.in181
-rw-r--r--x11/Terminal/pkg-plist316
-rw-r--r--x11/avant-window-navigator/Makefile2
-rw-r--r--x11/libexo/Makefile29
-rw-r--r--x11/libexo/distinfo6
-rw-r--r--x11/libexo/files/patch-Makefile.in25
-rw-r--r--x11/libexo/pkg-plist465
-rw-r--r--x11/libxfce4menu/Makefile24
-rw-r--r--x11/libxfce4menu/distinfo6
-rw-r--r--x11/libxfce4menu/pkg-plist145
-rw-r--r--x11/libxfce4util/Makefile25
-rw-r--r--x11/libxfce4util/distinfo6
-rw-r--r--x11/libxfce4util/pkg-plist180
-rw-r--r--x11/xfce4-clipman-plugin/Makefile2
-rw-r--r--x11/xfce4-conf/Makefile24
-rw-r--r--x11/xfce4-conf/distinfo6
-rw-r--r--x11/xfce4-conf/pkg-plist123
-rw-r--r--x11/xfce4-quicklauncher-plugin/Makefile2
-rw-r--r--x11/xfce4-screenshooter-plugin/Makefile2
-rw-r--r--x11/xfce4-taskmanager/Makefile2
-rw-r--r--x11/xfce4-verve-plugin/Makefile2
-rw-r--r--x11/xfce4-wmdock-plugin/Makefile2
-rw-r--r--x11/xfce4-xfapplet-plugin/Makefile2
94 files changed, 2007 insertions, 884 deletions
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 36f057a94604..5f3abc5a98e7 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -1438,11 +1438,11 @@ MASTER_SITE_XEMACS+= \
.if !defined(IGNORE_MASTER_SITE_XFCE)
MASTER_SITE_XFCE+= \
- http://mocha.xfce.org/archive/%SUBDIR%/src/ \
- http://www.us.xfce.org/archive/%SUBDIR%/src/ \
- http://www.de.xfce.org/archive/%SUBDIR%/src/ \
+ http://archive.xfce.org/%SUBDIR%/ \
+ http://mocha.xfce.org/archive/%SUBDIR%/ \
+ http://www.tx-us.xfce.org/archive/%SUBDIR%/ \
http://www.ca-us.xfce.org/archive/%SUBDIR%/src/ \
- http://www.p0llux.be/xfce/%SUBDIR%/src/
+ http://www.p0llux.be/xfce/%SUBDIR%/
.endif
.if !defined(IGNORE_MASTER_SITE_XFREE)
diff --git a/Mk/bsd.xfce.mk b/Mk/bsd.xfce.mk
index 6f930afaaf71..fc6bf3e8bdf5 100644
--- a/Mk/bsd.xfce.mk
+++ b/Mk/bsd.xfce.mk
@@ -15,33 +15,33 @@ Xfce_Include_MAINTAINER= oliver@FreeBSD.org
_USE_XFCE_ALL= configenv libexo libgui libmenu libutil panel \
thunar wm xfconf xfdev
-MASTER_SITE_SUBDIR?= xfce-4.6.1
+MASTER_SITE_SUBDIR?= xfce/4.6.2/src
configenv_CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
-libexo_BUILD_DEPENDS= libexo>=0.3.100:${PORTSDIR}/x11/libexo
-libexo_RUN_DEPENDS= libexo>=0.3.100:${PORTSDIR}/x11/libexo
+libexo_BUILD_DEPENDS= libexo>=0.3.107:${PORTSDIR}/x11/libexo
+libexo_RUN_DEPENDS= libexo>=0.3.107:${PORTSDIR}/x11/libexo
-libgui_BUILD_DEPENDS= libxfce4gui>=4.6.0:${PORTSDIR}/x11-toolkits/libxfce4gui
-libgui_RUN_DEPENDS= libxfce4gui>=4.6.0:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_BUILD_DEPENDS= libxfce4gui>=4.6.4:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_RUN_DEPENDS= libxfce4gui>=4.6.4:${PORTSDIR}/x11-toolkits/libxfce4gui
-libmenu_BUILD_DEPENDS= libxfce4menu>=4.6.0:${PORTSDIR}/x11/libxfce4menu
-libmenu_RUN_DEPENDS= libxfce4menu>=4.6.0:${PORTSDIR}/x11/libxfce4menu
+libmenu_BUILD_DEPENDS= libxfce4menu>=4.6.2:${PORTSDIR}/x11/libxfce4menu
+libmenu_RUN_DEPENDS= libxfce4menu>=4.6.2:${PORTSDIR}/x11/libxfce4menu
-libutil_BUILD_DEPENDS= libxfce4util>=4.6.0:${PORTSDIR}/x11/libxfce4util
-libutil_RUN_DEPENDS= libxfce4util>=4.6.0:${PORTSDIR}/x11/libxfce4util
+libutil_BUILD_DEPENDS= libxfce4util>=4.6.2:${PORTSDIR}/x11/libxfce4util
+libutil_RUN_DEPENDS= libxfce4util>=4.6.2:${PORTSDIR}/x11/libxfce4util
-panel_BUILD_DEPENDS= xfce4-panel>=4.6.0:${PORTSDIR}/x11-wm/xfce4-panel
-panel_RUN_DEPENDS= xfce4-panel>=4.6.0:${PORTSDIR}/x11-wm/xfce4-panel
+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
-thunar_BUILD_DEPENDS= Thunar>=1.0.0:${PORTSDIR}/x11-fm/thunar
-thunar_RUN_DEPENDS= Thunar>=1.0.0:${PORTSDIR}/x11-fm/thunar
+thunar_BUILD_DEPENDS= Thunar>=1.0.2:${PORTSDIR}/x11-fm/thunar
+thunar_RUN_DEPENDS= Thunar>=1.0.2:${PORTSDIR}/x11-fm/thunar
-wm_BUILD_DEPENDS= xfce4-wm>=4.6.0:${PORTSDIR}/x11-wm/xfce4-wm
-wm_RUN_DEPENDS= xfce4-wm>=4.6.0:${PORTSDIR}/x11-wm/xfce4-wm
+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
-xfconf_BUILD_DEPENDS= xfce4-conf>=4.6.0:${PORTSDIR}/x11/xfce4-conf
-xfconf_RUN_DEPENDS= xfce4-conf>=4.6.0:${PORTSDIR}/x11/xfce4-conf
+xfconf_BUILD_DEPENDS= xfce4-conf>=4.6.2:${PORTSDIR}/x11/xfce4-conf
+xfconf_RUN_DEPENDS= xfce4-conf>=4.6.2:${PORTSDIR}/x11/xfce4-conf
xfdev_RUN_DEPENDS= xfce4-dev-tools:${PORTSDIR}/devel/xfce4-dev-tools
diff --git a/archivers/thunar-archive-plugin/Makefile b/archivers/thunar-archive-plugin/Makefile
index fb43a47c8d67..5994a3668cb4 100644
--- a/archivers/thunar-archive-plugin/Makefile
+++ b/archivers/thunar-archive-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= thunar-archive-plugin
PORTVERSION= 0.2.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= archivers xfce
MASTER_SITES= BERLIOS
MASTER_SITE_SUBDIR= xfce-goodies
diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile
index 5ea40253ec97..d9b40c75393a 100644
--- a/audio/thunar-media-tags-plugin/Makefile
+++ b/audio/thunar-media-tags-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= thunar-media-tags-plugin
PORTVERSION= 0.1.2
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= audio xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 954bee5601b6..8ec2e9b79183 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-mixer
PORTVERSION= 4.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile
index 1e0c1977c229..c6ef51386f2f 100644
--- a/audio/xfce4-mpc-plugin/Makefile
+++ b/audio/xfce4-mpc-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-mpc-plugin
PORTVERSION= 0.3.4
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio xfce
MASTER_SITES= http://archive.xfce.org/src/panel-plugins/${PORTNAME}/0.3/
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index 97b03f0a36ce..637c3ba79b14 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfmpc
PORTVERSION= 0.2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio xfce
MASTER_SITES= http://archive.xfce.org/src/apps/${PORTNAME}/0.2/
DIST_SUBDIR= xfce4
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index a9b23fbe1117..3b5aa16bfe94 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -7,7 +7,7 @@
PORTNAME= orage
PORTVERSION= 4.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile
index 71972f137a26..1c16612250ab 100644
--- a/deskutils/xfce4-notes-plugin/Makefile
+++ b/deskutils/xfce4-notes-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-notes-plugin
PORTVERSION= 1.7.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils xfce
MASTER_SITES= http://archive.xfce.org/src/panel-plugins/${PORTNAME}/1.7/
DIST_SUBDIR= xfce4
diff --git a/deskutils/xfce4-notification-daemon/Makefile b/deskutils/xfce4-notification-daemon/Makefile
index 580d3f74279f..c47453a5d317 100644
--- a/deskutils/xfce4-notification-daemon/Makefile
+++ b/deskutils/xfce4-notification-daemon/Makefile
@@ -7,7 +7,7 @@
PORTNAME= notification-daemon
PORTVERSION= 0.3.7
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= deskutils xfce
MASTER_SITES= http://goodies.xfce.org/releases/notification-daemon-xfce/ \
CRITICAL
diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index 906eaa943e15..d70c35fda062 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-notifyd
PORTVERSION= 0.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils xfce
MASTER_SITES= http://spuriousinterrupt.org/files/xfce4-notifyd/ \
CRITICAL
diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile
index 4a31bf07fe21..8a5dd820d269 100644
--- a/deskutils/xfce4-xkb-plugin/Makefile
+++ b/deskutils/xfce4-xkb-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-xkb-plugin
PORTVERSION= 0.4.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= deskutils xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/devel/thunar-svn-plugin/Makefile b/devel/thunar-svn-plugin/Makefile
index 3bbf5167d378..1f54e1ddbed0 100644
--- a/devel/thunar-svn-plugin/Makefile
+++ b/devel/thunar-svn-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= thunar-svn-plugin
PORTVERSION= 0.0.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel xfce
MASTER_SITES= http://goodies.xfce.org/releases/thunar-svn-plugin/
DIST_SUBDIR= xfce4
diff --git a/devel/thunar-vcs-plugin/Makefile b/devel/thunar-vcs-plugin/Makefile
index 3bbf5167d378..1f54e1ddbed0 100644
--- a/devel/thunar-vcs-plugin/Makefile
+++ b/devel/thunar-vcs-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= thunar-svn-plugin
PORTVERSION= 0.0.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel xfce
MASTER_SITES= http://goodies.xfce.org/releases/thunar-svn-plugin/
DIST_SUBDIR= xfce4
diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile
index 1a2cd50d2b7a..b562be2386af 100644
--- a/editors/mousepad/Makefile
+++ b/editors/mousepad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mousepad
PORTVERSION= 0.2.16
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= editors xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/graphics/ristretto/Makefile b/graphics/ristretto/Makefile
index e2e801464618..eef6faef82b1 100644
--- a/graphics/ristretto/Makefile
+++ b/graphics/ristretto/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ristretto
PORTVERSION= 0.0.22
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile
index 5e5fef8fabfa..354e594d5491 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= 9
+PORTREVISION= 10
CATEGORIES= mail xfce
MASTER_SITES= http://spuriousinterrupt.org/files/mailwatch/ \
http://freebsd.unixfreunde.de/sources/
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index 85b56e260a32..a0a4d857c301 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xfce4-appfinder
-PORTVERSION= 4.6.1
-PORTREVISION= 5
+PORTVERSION= 4.6.2
CATEGORIES= misc xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
diff --git a/misc/xfce4-appfinder/distinfo b/misc/xfce4-appfinder/distinfo
index ccb48aaf954f..e2dbaa37f544 100644
--- a/misc/xfce4-appfinder/distinfo
+++ b/misc/xfce4-appfinder/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-appfinder-4.6.1.tar.bz2) = a1bc7d88100cfd92714a300be531589b
-SHA256 (xfce4/xfce4-appfinder-4.6.1.tar.bz2) = 5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4
-SIZE (xfce4/xfce4-appfinder-4.6.1.tar.bz2) = 314040
+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
diff --git a/misc/xfce4-appfinder/pkg-plist b/misc/xfce4-appfinder/pkg-plist
index 1323e1318f07..d193447f972f 100644
--- a/misc/xfce4-appfinder/pkg-plist
+++ b/misc/xfce4-appfinder/pkg-plist
@@ -1,6 +1,11 @@
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/da/LC_MESSAGES/xfce4-appfinder.mo
@@ -62,4 +67,12 @@ share/locale/hy/LC_MESSAGES/xfce4-appfinder.mo
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/hy/LC_MESSAGES
@dirrmtry share/locale/hy
+@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
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 189dc4b70229..9010e852b932 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-weather-plugin
PORTVERSION= 0.7.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= misc xfce geography
MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-weather-plugin/0.7/
DIST_SUBDIR= xfce4
diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile
index 3357b645874e..9d8b5f20c1e7 100644
--- a/multimedia/xfce4-media/Makefile
+++ b/multimedia/xfce4-media/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-media
PORTVERSION= 0.9.2
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= multimedia xfce
MASTER_SITES= http://spuriousinterrupt.org/files/xfmedia/
DISTNAME= xfmedia-${PORTVERSION}
diff --git a/multimedia/xfce4-parole/Makefile b/multimedia/xfce4-parole/Makefile
index b7dc698c1c77..a2333d04679d 100644
--- a/multimedia/xfce4-parole/Makefile
+++ b/multimedia/xfce4-parole/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-parole
PORTVERSION= 0.2.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia xfce
MASTER_SITES= http://archive.xfce.org/src/apps/parole/0.2/
DISTNAME= parole-${PORTVERSION}
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index 5c9babb7a101..724771bacc73 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-xmms-plugin
PORTVERSION= 0.5.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= multimedia audio xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/net-im/xfce4-messenger-plugin/Makefile b/net-im/xfce4-messenger-plugin/Makefile
index dd1b8b72b535..a9f3619411af 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= 13
+PORTREVISION= 14
CATEGORIES= net-im xfce
MASTER_SITES= ftp://ftp.berlios.de/pub/xfce-goodies/panel-plugins/4.4/
DIST_SUBDIR= xfce4
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 4ee8b0ebe9bd..cbbada943231 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -7,9 +7,10 @@
PORTNAME= xfce4-print
PORTVERSION= 4.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= print xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=xfce/4.6.1/src
DISTNAME= xfprint-${PORTVERSION}
DIST_SUBDIR= xfce4
diff --git a/sysutils/thunar-volman-plugin/Makefile b/sysutils/thunar-volman-plugin/Makefile
index 6ff51be5b7bf..9a52989861b2 100644
--- a/sysutils/thunar-volman-plugin/Makefile
+++ b/sysutils/thunar-volman-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= thunar-volman
PORTVERSION= 0.3.80
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils xfce
MASTER_SITES= http://archive.xfce.org/src/apps/${PORTNAME}/${PORTVERSION:R}/
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index f1f069258377..97a41e57e117 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfburn
PORTVERSION= 0.4.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils
MASTER_SITES= http://goodies.xfce.org/releases/xfburn/
diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile
index 7f8d7a4a9ac1..6d4a28d2c639 100644
--- a/sysutils/xfce4-battery-plugin/Makefile
+++ b/sysutils/xfce4-battery-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-battery-plugin
PORTVERSION= 0.5.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index dcffa88053f8..27c0d2db3f27 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-cpugraph-plugin
PORTVERSION= 0.3.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= sysutils xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile
index 7cacfd70657a..c705547b3929 100644
--- a/sysutils/xfce4-fsguard-plugin/Makefile
+++ b/sysutils/xfce4-fsguard-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-fsguard-plugin
PORTVERSION= 0.4.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= sysutils xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile
index 94fca67a1263..a5c5a9d5e1b6 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= 8
+PORTREVISION= 9
CATEGORIES= sysutils xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile
index 84f30bc88e7c..6394ebc8599b 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= 11
+PORTREVISION= 12
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 7d2f9a4b040d..98ae77579280 100644
--- a/sysutils/xfce4-netload-plugin/Makefile
+++ b/sysutils/xfce4-netload-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-netload-plugin
PORTVERSION= 0.4.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= sysutils xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-places-plugin/Makefile b/sysutils/xfce4-places-plugin/Makefile
index 4614745f7a1c..207c997c3c7c 100644
--- a/sysutils/xfce4-places-plugin/Makefile
+++ b/sysutils/xfce4-places-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-places-plugin
PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils xfce
MASTER_SITES= http://archive.xfce.org/src/panel-plugins/${PORTNAME}/1.2/
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index ca1c920e224b..ded04c017ea2 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-power-manager
PORTVERSION= 0.8.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index eb72db23545a..245bcdf3b3fb 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -6,29 +6,33 @@
#
PORTNAME= xfce4-settings
-PORTVERSION= 4.6.4
-PORTREVISION= 4
+PORTVERSION= 4.6.5
CATEGORIES= sysutils xfce
-MASTER_SITES= http://www.xfce.org/archive/src/xfce/xfce4-settings/4.6/
+MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 settings application
-BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck
+LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
+ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-OPTIONS= XKLAVIER "Keyboard layout settings" off
+OPTIONS= XKLAVIER "Keyboard layout settings" off \
+ XCURSOR "Enable cursor themes support" on \
+ XRANDR "Enable Xrandr support" on \
+ NOTIFY "Enable notification support" on \
+ NLS "Enable Native Language Support" on
-CONFIGURE_ARGS= --disable-sound-settings
+CONFIGURE_ARGS= --disable-sound-settings --disable-debug
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
-USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig
+USE_GNOME= gnometarget glib20 gtk20 desktopfileutils intltool intlhack \
+ libglade2 pkgconfig
USE_XFCE= configenv libexo libgui libutil xfconf
+USE_XORG= x11 xi
.include <bsd.port.pre.mk>
@@ -39,6 +43,38 @@ CONFIGURE_ARGS+=--enable-libxklavier
CONFIGURE_ARGS+=--disable-libxklavier
.endif
+.if defined(WITH_XCURSOR)
+USE_XORG+= xcursor
+CONFIGURE_ARGS+=--enable-xcursor
+.else
+CONFIGURE_ARGS+=--disable-xcursor
+.endif
+
+.if defined(WITH_XRANDR)
+USE_XORG+= xrandr
+CONFIGURE_ARGS+=--enable-xrandr
+PLIST_SUB+= XRANDR=""
+.else
+CONFIGURE_ARGS+=--disable-xrandr
+PLIST_SUB+= XRANDR="@comment "
+.endif
+
+.if defined(WITH_NOTIFY)
+LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify
+CONFIGURE_ARGS+=--enable-libnotify
+.else
+CONFIGURE_ARGS+=--disable-libnotify
+.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:
# until xfce4-icon-theme is back we rely on Tango
@${REINPLACE_CMD} -e 's|Rodent|Tango|g' \
@@ -48,4 +84,7 @@ post-patch:
s|xkl_engine_stop_listen (settings->priv->xkl_engine)|xkl_engine_stop_listen (settings->priv->xkl_engine, FALSE)|g' \
${WRKSRC}/dialogs/keyboard-settings/xfce-keyboard-settings.c
+post-install:
+ @-update-desktop-database
+
.include <bsd.port.post.mk>
diff --git a/sysutils/xfce4-settings/distinfo b/sysutils/xfce4-settings/distinfo
index 729f311ba985..0d28c5a1022d 100644
--- a/sysutils/xfce4-settings/distinfo
+++ b/sysutils/xfce4-settings/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-settings-4.6.4.tar.bz2) = 04985407e8e5b916c44780314a177e96
-SHA256 (xfce4/xfce4-settings-4.6.4.tar.bz2) = a5e3f0d959b0d424355414769250473785043c3977446a73b36fa3a5ce44ecdb
-SIZE (xfce4/xfce4-settings-4.6.4.tar.bz2) = 519247
+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
diff --git a/sysutils/xfce4-settings/pkg-plist b/sysutils/xfce4-settings/pkg-plist
index 048c4272839d..b1e1d197ad66 100644
--- a/sysutils/xfce4-settings/pkg-plist
+++ b/sysutils/xfce4-settings/pkg-plist
@@ -1,60 +1,125 @@
-bin/xfce4-appearance-settings
bin/xfce4-accessibility-settings
-bin/xfce4-display-settings
+bin/xfce4-appearance-settings
+%%XRANDR%%bin/xfce4-display-settings
bin/xfce4-keyboard-settings
bin/xfce4-mouse-settings
+bin/xfce4-settings-editor
bin/xfce4-settings-helper
bin/xfce4-settings-manager
-bin/xfce4-settings-editor
bin/xfsettingsd
etc/xdg/autostart/xfce4-settings-helper-autostart.desktop
etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
-share/locale/ast/LC_MESSAGES/xfce4-settings.mo
-share/locale/ca/LC_MESSAGES/xfce4-settings.mo
-share/locale/cs/LC_MESSAGES/xfce4-settings.mo
-share/locale/da/LC_MESSAGES/xfce4-settings.mo
-share/locale/de/LC_MESSAGES/xfce4-settings.mo
-share/locale/el/LC_MESSAGES/xfce4-settings.mo
-share/locale/es/LC_MESSAGES/xfce4-settings.mo
-share/locale/eu/LC_MESSAGES/xfce4-settings.mo
-share/locale/fi/LC_MESSAGES/xfce4-settings.mo
-share/locale/fr/LC_MESSAGES/xfce4-settings.mo
-share/locale/gl/LC_MESSAGES/xfce4-settings.mo
-share/locale/hu/LC_MESSAGES/xfce4-settings.mo
-share/locale/id/LC_MESSAGES/xfce4-settings.mo
-share/locale/it/LC_MESSAGES/xfce4-settings.mo
-share/locale/ja/LC_MESSAGES/xfce4-settings.mo
-share/locale/lv/LC_MESSAGES/xfce4-settings.mo
-share/locale/nb/LC_MESSAGES/xfce4-settings.mo
-share/locale/nl/LC_MESSAGES/xfce4-settings.mo
-share/locale/pl/LC_MESSAGES/xfce4-settings.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-settings.mo
-share/locale/pt/LC_MESSAGES/xfce4-settings.mo
-share/locale/ro/LC_MESSAGES/xfce4-settings.mo
-share/locale/ru/LC_MESSAGES/xfce4-settings.mo
-share/locale/sk/LC_MESSAGES/xfce4-settings.mo
-share/locale/sv/LC_MESSAGES/xfce4-settings.mo
-share/locale/tr/LC_MESSAGES/xfce4-settings.mo
-share/locale/uk/LC_MESSAGES/xfce4-settings.mo
-share/locale/ur/LC_MESSAGES/xfce4-settings.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo
-share/applications/xfce-ui-settings.desktop
-share/applications/xfce4-accessibility-settings.desktop
-share/applications/xfce-display-settings.desktop
-share/applications/xfce-keyboard-settings.desktop
-share/applications/xfce-mouse-settings.desktop
-share/applications/xfce-settings-manager.desktop
-share/applications/xfce4-settings-editor.desktop
-@dirrmtry etc/xdg/autostart
+%%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
+%%NLS%%share/locale/ast/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/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/hu/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/id/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/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/sk/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-settings.mo
+%%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
+@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/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
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
+@dirrmtry etc/xdg/autostart
+@dirrmtry etc/xdg
+
diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile
index fa4135b0c27b..3b3440878ea7 100644
--- a/sysutils/xfce4-systemload-plugin/Makefile
+++ b/sysutils/xfce4-systemload-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-systemload-plugin
PORTVERSION= 0.4.2
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= sysutils xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index 63005df84fa1..b6876446de04 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xfce4-utils
-PORTVERSION= 4.6.1
-PORTREVISION= 5
+PORTVERSION= 4.6.2
CATEGORIES= sysutils xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= xfce-utils-${PORTVERSION}
diff --git a/sysutils/xfce4-utils/distinfo b/sysutils/xfce4-utils/distinfo
index 45efc6942ddf..c2287eb1bf03 100644
--- a/sysutils/xfce4-utils/distinfo
+++ b/sysutils/xfce4-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce-utils-4.6.1.tar.bz2) = 1aa2362b11e79e56d52ce0d265faf1b6
-SHA256 (xfce4/xfce-utils-4.6.1.tar.bz2) = 8310ad3694567dc7cbe0d57f4283712ca9e576ca73c9dc53a576b546f0b6b571
-SIZE (xfce4/xfce-utils-4.6.1.tar.bz2) = 614143
+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
diff --git a/sysutils/xfce4-utils/pkg-plist b/sysutils/xfce4-utils/pkg-plist
index 9e1525e6f29f..6f9e1456b8d1 100644
--- a/sysutils/xfce4-utils/pkg-plist
+++ b/sysutils/xfce4-utils/pkg-plist
@@ -12,6 +12,11 @@ etc/xdg/xfce4/xinitrc
libexec/xfce4/xfconf-migration/xfconf-migration-4.6.pl
%%WITH_DBUS%%share/dbus-1/services/org.xfce.RunDialog.service
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
@@ -122,6 +127,14 @@ share/xsessions/xfce.desktop
@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
diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile
index ff8176d5fda1..bc61d11a8976 100644
--- a/sysutils/xfce4-wavelan-plugin/Makefile
+++ b/sysutils/xfce4-wavelan-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-wavelan-plugin
PORTVERSION= 0.5.4
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= sysutils xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile
index a7d506ed3023..f405976c0b26 100644
--- a/textproc/xfce4-dict-plugin/Makefile
+++ b/textproc/xfce4-dict-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-dict
PORTVERSION= 0.6.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= textproc xfce
MASTER_SITES= http://archive.xfce.org/src/apps/${PORTNAME}/0.6/
PKGNAMESUFFIX= -plugin
diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile
index 76a4e7c9445d..84c2b1d08424 100644
--- a/www/xfce4-smartbookmark-plugin/Makefile
+++ b/www/xfce4-smartbookmark-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-smartbookmark-plugin
PORTVERSION= 0.4.2
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= www xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile
index 104febbca99e..6f2fb65fa3ae 100644
--- a/x11-clocks/xfce4-datetime-plugin/Makefile
+++ b/x11-clocks/xfce4-datetime-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-datetime-plugin
PORTVERSION= 0.6.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-clocks xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/x11-clocks/xfce4-timer-out-plugin/Makefile b/x11-clocks/xfce4-timer-out-plugin/Makefile
index a42d52bc2d9d..519524ff150a 100644
--- a/x11-clocks/xfce4-timer-out-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-out-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-time-out-plugin
PORTVERSION= 0.1.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11-clocks xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile
index 4c600d8356f8..0bd8bda3e1b3 100644
--- a/x11-clocks/xfce4-timer-plugin/Makefile
+++ b/x11-clocks/xfce4-timer-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-timer-plugin
PORTVERSION= 0.6.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11-clocks xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index a29e77851221..e974d1a0ecf8 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= Thunar
-PORTVERSION= 1.0.1
-PORTREVISION= 5
+PORTVERSION= 1.0.2
CATEGORIES= x11-fm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
@@ -137,6 +136,10 @@ CONFIGURE_ARGS+=--enable-startup-notification
CONFIGURE_ARGS+=--disable-startup-notification
.endif
+.if (${OSVERSION} < 701000)
+CFLAGS+= -DHAVE_SYS_MOUNT_H
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|docdir = .*|docdir = ${DOCSDIR}|' \
${WRKSRC}/docs/Makefile.in
diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo
index 25a9b068d2cb..6a462edec047 100644
--- a/x11-fm/thunar/distinfo
+++ b/x11-fm/thunar/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/Thunar-1.0.1.tar.bz2) = 218373aa45d74b6ba8c69c4d5af3bb19
-SHA256 (xfce4/Thunar-1.0.1.tar.bz2) = 7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d
-SIZE (xfce4/Thunar-1.0.1.tar.bz2) = 8802672
+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
diff --git a/x11-fm/thunar/files/patch-thunar-vfs-thumb.c b/x11-fm/thunar/files/patch-thunar-vfs-thumb.c
deleted file mode 100644
index 96febbd462e3..000000000000
--- a/x11-fm/thunar/files/patch-thunar-vfs-thumb.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- thunar-vfs/thunar-vfs-thumb.c.orig 2009-01-12 21:38:49.000000000 +0100
-+++ thunar-vfs/thunar-vfs-thumb.c 2010-03-29 08:32:55.000000000 +0200
-@@ -1169,7 +1169,7 @@
- goto done0;
-
- /* verify the png signature */
-- if (G_LIKELY (png_check_sig ((png_bytep) signature, sizeof (signature))))
-+ if (G_LIKELY (!png_sig_cmp ((png_bytep) signature, 0, sizeof (signature))))
- rewind (fp);
- else
- goto done0;
diff --git a/x11-fm/thunar/pkg-plist b/x11-fm/thunar/pkg-plist
index 7321c0e7e21f..128569d10d8a 100644
--- a/x11-fm/thunar/pkg-plist
+++ b/x11-fm/thunar/pkg-plist
@@ -155,6 +155,27 @@ 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/es/advanced-topics.html
%%DOCSDIR%%/html/es/copyright.html
%%DOCSDIR%%/html/es/customizing-thunar.html
@@ -218,6 +239,17 @@ 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/ja/advanced-topics.html
%%DOCSDIR%%/html/ja/copyright.html
%%DOCSDIR%%/html/ja/customizing-thunar.html
@@ -403,6 +435,12 @@ share/icons/hicolor/16x16/stock/navigation/stock_thunar-templates.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
@@ -468,12 +506,16 @@ share/thumbnailers/thunar-vfs-font-thumbnailer-1.desktop
%%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
@@ -514,4 +556,12 @@ share/thumbnailers/thunar-vfs-font-thumbnailer-1.desktop
@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
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index ec7d5cd410fc..3f0030aeb2d7 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -6,10 +6,9 @@
#
PORTNAME= libxfce4gui
-PORTVERSION= 4.6.2
-PORTREVISION= 3
+PORTVERSION= 4.6.4
CATEGORIES= x11-toolkits xfce
-MASTER_SITES= http://archive.xfce.org/src/xfce/libxfcegui4/4.6/
+MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= libxfcegui4-${PORTVERSION}
DIST_SUBDIR= xfce4
diff --git a/x11-toolkits/libxfce4gui/distinfo b/x11-toolkits/libxfce4gui/distinfo
index 450f22c31d81..9adf728c78db 100644
--- a/x11-toolkits/libxfce4gui/distinfo
+++ b/x11-toolkits/libxfce4gui/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfcegui4-4.6.2.tar.bz2) = e520b93351d87194b5fcc1315acd8617
-SHA256 (xfce4/libxfcegui4-4.6.2.tar.bz2) = 399c9b16dcc0f69f3bd92bf83a8f45d0294603e28dc226164379c212bb2c6e8e
-SIZE (xfce4/libxfcegui4-4.6.2.tar.bz2) = 669487
+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
diff --git a/x11-toolkits/libxfce4gui/pkg-plist b/x11-toolkits/libxfce4gui/pkg-plist
index 3e1a352e9079..3c8a0fec4f01 100644
--- a/x11-toolkits/libxfce4gui/pkg-plist
+++ b/x11-toolkits/libxfce4gui/pkg-plist
@@ -149,6 +149,7 @@ share/locale/sq/LC_MESSAGES/libxfcegui4.mo
share/locale/sv/LC_MESSAGES/libxfcegui4.mo
share/locale/ta/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
@@ -177,6 +178,8 @@ share/locale/zh_TW/LC_MESSAGES/libxfcegui4.mo
@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
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index db79981883e3..4872c51d5378 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xfce4-desktop
-PORTVERSION= 4.6.1
-PORTREVISION= 5
+PORTVERSION= 4.6.2
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= xfdesktop-${PORTVERSION}
diff --git a/x11-wm/xfce4-desktop/distinfo b/x11-wm/xfce4-desktop/distinfo
index 96c172b633e3..88ebf94ef907 100644
--- a/x11-wm/xfce4-desktop/distinfo
+++ b/x11-wm/xfce4-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfdesktop-4.6.1.tar.bz2) = ae15cacc3e3834cca7238a8e1035c50d
-SHA256 (xfce4/xfdesktop-4.6.1.tar.bz2) = 22aa4a654798dcfa728a9c0056486f73ae87a51239950c8f85aedef488cd571a
-SIZE (xfce4/xfdesktop-4.6.1.tar.bz2) = 3671378
+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
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index 6b45ed75bfaa..48122ae3608c 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -33,6 +33,12 @@ 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/az/LC_MESSAGES/xfdesktop.mo
@@ -112,6 +118,22 @@ 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
@@ -121,6 +143,15 @@ 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
@@ -136,6 +167,14 @@ 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
@@ -150,6 +189,14 @@ share/xfce4/doc/ja/xfdesktop.html
@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
@dirrm share/xfce4/backdrops
@dirrmtry share/xfce4/doc/C/images
@dirrmtry share/xfce4/doc/C
@@ -160,6 +207,14 @@ share/xfce4/doc/ja/xfdesktop.html
@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
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index dfe602b3dc28..e2f8bff8b437 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -6,29 +6,36 @@
#
PORTNAME= xfce4-panel
-PORTVERSION= 4.6.3
-PORTREVISION= 3
+PORTVERSION= 4.6.4
CATEGORIES= x11-wm xfce
-MASTER_SITES= http://archive.xfce.org/src/xfce/xfce4-panel/4.6/
+MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= XFce 4 panel module
-LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck
+LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
+ cairo.2:${PORTSDIR}/graphics/cairo
CONFLICTS= xfce4-systray-*
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
+USE_AUTOTOOLS= libtool:22
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
+USE_PERL5= yes
USE_XFCE= configenv libexo libgui libutil
+USE_XORG= x11 sm
+
+CONFIGURE_ARGS= --enable-gtk-doc-html=no \
+ --disable-debug
OPTIONS= GTKDOC "install the library documentation" off \
- STARTUP "Enable startup notification support" on
+ STARTUP "Enable startup notification support" on \
+ NLS "Enable Native Language Support" on
.include <bsd.port.pre.mk>
@@ -48,4 +55,16 @@ CONFIGURE_ARGS+=--enable-startup-notification
CONFIGURE_ARGS+=--disable-startup-notification
.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} -e 's| manual||g' ${WRKSRC}/docs/Makefile.in
+
.include <bsd.port.post.mk>
diff --git a/x11-wm/xfce4-panel/distinfo b/x11-wm/xfce4-panel/distinfo
index acf3ff7f392f..dd6ea9d6b296 100644
--- a/x11-wm/xfce4-panel/distinfo
+++ b/x11-wm/xfce4-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-panel-4.6.3.tar.bz2) = 0b715abb929220f136483ccd7303ff62
-SHA256 (xfce4/xfce4-panel-4.6.3.tar.bz2) = 4f5e19187ddf9f812303b77479124562079d25c6263674040aba4395c6b2e41c
-SIZE (xfce4/xfce4-panel-4.6.3.tar.bz2) = 902086
+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
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index ada160113718..593bbe1b66f1 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -8,8 +8,8 @@ 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.h
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
@@ -21,31 +21,42 @@ 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
libdata/pkgconfig/libxfce4panel-1.0.pc
-share/applications/xfce4-panel-manager.desktop
+%%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
@@ -71,9 +82,9 @@ 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/xfce4-panel.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
@@ -84,74 +95,68 @@ 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/locale/am/LC_MESSAGES/xfce4-panel.mo
-share/locale/ar/LC_MESSAGES/xfce4-panel.mo
-share/locale/ast/LC_MESSAGES/xfce4-panel.mo
-share/locale/az/LC_MESSAGES/xfce4-panel.mo
-share/locale/be/LC_MESSAGES/xfce4-panel.mo
-share/locale/bg/LC_MESSAGES/xfce4-panel.mo
-share/locale/bn_IN/LC_MESSAGES/xfce4-panel.mo
-share/locale/ca/LC_MESSAGES/xfce4-panel.mo
-share/locale/cs/LC_MESSAGES/xfce4-panel.mo
-share/locale/da/LC_MESSAGES/xfce4-panel.mo
-share/locale/de/LC_MESSAGES/xfce4-panel.mo
-share/locale/dz/LC_MESSAGES/xfce4-panel.mo
-share/locale/el/LC_MESSAGES/xfce4-panel.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
-share/locale/eo/LC_MESSAGES/xfce4-panel.mo
-share/locale/es/LC_MESSAGES/xfce4-panel.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-panel.mo
-share/locale/et/LC_MESSAGES/xfce4-panel.mo
-share/locale/eu/LC_MESSAGES/xfce4-panel.mo
-share/locale/fa/LC_MESSAGES/xfce4-panel.mo
-share/locale/fi/LC_MESSAGES/xfce4-panel.mo
-share/locale/fr/LC_MESSAGES/xfce4-panel.mo
-share/locale/gl/LC_MESSAGES/xfce4-panel.mo
-share/locale/gu/LC_MESSAGES/xfce4-panel.mo
-share/locale/he/LC_MESSAGES/xfce4-panel.mo
-share/locale/hi/LC_MESSAGES/xfce4-panel.mo
-share/locale/hu/LC_MESSAGES/xfce4-panel.mo
-share/locale/hy/LC_MESSAGES/xfce4-panel.mo
-share/locale/id/LC_MESSAGES/xfce4-panel.mo
-share/locale/it/LC_MESSAGES/xfce4-panel.mo
-share/locale/ja/LC_MESSAGES/xfce4-panel.mo
-share/locale/ka/LC_MESSAGES/xfce4-panel.mo
-share/locale/kk/LC_MESSAGES/xfce4-panel.mo
-share/locale/ko/LC_MESSAGES/xfce4-panel.mo
-share/locale/ku/LC_MESSAGES/xfce4-panel.mo
-share/locale/lt/LC_MESSAGES/xfce4-panel.mo
-share/locale/lv/LC_MESSAGES/xfce4-panel.mo
-share/locale/mk/LC_MESSAGES/xfce4-panel.mo
-share/locale/mr/LC_MESSAGES/xfce4-panel.mo
-share/locale/ms/LC_MESSAGES/xfce4-panel.mo
-share/locale/nb/LC_MESSAGES/xfce4-panel.mo
-share/locale/nl/LC_MESSAGES/xfce4-panel.mo
-share/locale/nn/LC_MESSAGES/xfce4-panel.mo
-share/locale/pa/LC_MESSAGES/xfce4-panel.mo
-share/locale/pl/LC_MESSAGES/xfce4-panel.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo
-share/locale/pt/LC_MESSAGES/xfce4-panel.mo
-share/locale/ro/LC_MESSAGES/xfce4-panel.mo
-share/locale/ru/LC_MESSAGES/xfce4-panel.mo
-share/locale/si/LC_MESSAGES/xfce4-panel.mo
-share/locale/sk/LC_MESSAGES/xfce4-panel.mo
-share/locale/sq/LC_MESSAGES/xfce4-panel.mo
-share/locale/sv/LC_MESSAGES/xfce4-panel.mo
-share/locale/ta/LC_MESSAGES/xfce4-panel.mo
-share/locale/tr/LC_MESSAGES/xfce4-panel.mo
-share/locale/uk/LC_MESSAGES/xfce4-panel.mo
-share/locale/ur/LC_MESSAGES/xfce4-panel.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-panel.mo
-share/locale/vi/LC_MESSAGES/xfce4-panel.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo
-share/xfce4/doc/C/images/default_top_panel.png
-share/xfce4/doc/C/images/default_bottom_panel.png
-share/xfce4/doc/C/images/item_popup.png
-share/xfce4/doc/C/images/add_item_dialog.png
-share/xfce4/doc/C/images/launcher_properties.png
-share/xfce4/doc/C/images/panel_manager.png
-share/xfce4/doc/C/xfce4-panel.html
+%%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_IN/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/es_MX/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-panel.mo
+%%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/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/it/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/xfce4-panel.mo
+%%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
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-panel.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-panel.mo
+%%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
@@ -162,35 +167,148 @@ share/xfce4/panel-plugins/showdesktop.desktop
share/xfce4/panel-plugins/systray.desktop
share/xfce4/panel-plugins/tasklist.desktop
share/xfce4/panel-plugins/windowlist.desktop
-@dirrm etc/xdg/xfce4/panel
-@dirrmtry etc/xdg/xfce4
-@dirrmtry etc/xdg
-@dirrm include/xfce4/libxfce4panel
-@dirrmtry include/xfce4
-@dirrmtry lib/xfce4/mcs-plugins
-@dirrmtry lib/xfce4/panel-plugins
-@dirrmtry lib/xfce4
-@dirrm share/gtk-doc/html/libxfce4panel
-@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/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@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
@dirrmtry share/xfce4/panel-plugins
@dirrmtry share/xfce4
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
+%%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
+@dirrmtry share/gtk-doc
+@dirrmtry lib/xfce4/panel-plugins
+@dirrmtry lib/xfce4
+@dirrm include/xfce4/libxfce4panel
+@dirrmtry include/xfce4
+@dirrmtry etc/xdg/xfce4/panel
+@dirrmtry etc/xdg/xfce4
+@dirrmtry etc/xdg
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 9d14c60db74d..cdbada0d6d8b 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xfce4-session
-PORTVERSION= 4.6.1
-PORTREVISION= 5
+PORTVERSION= 4.6.2
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
@@ -20,10 +19,10 @@ RUN_DEPENDS= iceauth:${PORTSDIR}/x11/iceauth
LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
@@ -32,4 +31,15 @@ USE_XORG= x11 sm ice
MAN1= xfce4-session.1 xfce4-session-logout.1
+PLIST_SUB= VERSION="${PORTVERSION:R}"
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+CONFIGURE_ARGS+= --enable-nls
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
+
.include <bsd.port.mk>
diff --git a/x11-wm/xfce4-session/distinfo b/x11-wm/xfce4-session/distinfo
index efeecc67be00..c691973f2dfb 100644
--- a/x11-wm/xfce4-session/distinfo
+++ b/x11-wm/xfce4-session/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfce4-session-4.6.1.tar.bz2) = 7628be41ed3511a20cff5673d9d39858
-SHA256 (xfce4/xfce4-session-4.6.1.tar.bz2) = feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e
-SIZE (xfce4/xfce4-session-4.6.1.tar.bz2) = 1365247
+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
diff --git a/x11-wm/xfce4-session/files/patch-Makefile.in b/x11-wm/xfce4-session/files/patch-Makefile.in
new file mode 100644
index 000000000000..21f5163ddacc
--- /dev/null
+++ b/x11-wm/xfce4-session/files/patch-Makefile.in
@@ -0,0 +1,28 @@
+--- Makefile.in.orig 2010-05-21 18:58:41.000000000 +0200
++++ Makefile.in 2010-05-24 12:01:05.000000000 +0200
+@@ -293,7 +293,6 @@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = \
+ libxfsm \
+- doc \
+ engines \
+ icons \
+ po \
+@@ -809,7 +808,7 @@
+ dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-local distclean-tags \
+- distcleancheck distdir distuninstallcheck dvi dvi-am html \
++ distcleancheck distdir distuninstallcheck dvi dvi-am \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+@@ -821,8 +820,6 @@
+ uninstall uninstall-am
+
+
+-html:
+- (cd doc && $(MAKE) $(AM_MAKEFLAGS) html)
+
+ distclean-local:
+ rm -rf xfce4-session.spec *.cache *~
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index fd071eed978a..948b8737b0d6 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -4,12 +4,12 @@ bin/xfce4-session-settings
bin/xfce4-tips
etc/xdg/autostart/xfce4-tips-autostart.desktop
etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
-include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-engine.h
-include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-rc.h
-lib/libxfsm-4.6.a
-lib/libxfsm-4.6.la
-lib/libxfsm-4.6.so
-lib/libxfsm-4.6.so.0
+include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-engine.h
+include/xfce4/xfce4-session-%%VERSION%%/libxfsm/xfsm-splash-rc.h
+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
@@ -23,12 +23,14 @@ libdata/pkgconfig/xfce4-session-2.0.pc
libexec/balou-export-theme
libexec/balou-install-theme
libexec/xfsm-shutdown-helper
-share/applications/xfce-session-settings.desktop
+%%NLS%%share/applications/xfce-session-settings.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
share/icons/hicolor/48x48/apps/xfce4-splash.png
share/icons/hicolor/48x48/apps/xfsm-hibernate.png
+share/icons/hicolor/48x48/apps/xfsm-logout.png
+share/icons/hicolor/48x48/apps/xfsm-reboot.png
share/icons/hicolor/48x48/apps/xfsm-shutdown.png
share/icons/hicolor/48x48/apps/xfsm-suspend.png
share/icons/hicolor/64x64/apps/xfsm-gnome-kde-logo.png
@@ -36,109 +38,206 @@ share/icons/hicolor/72x72/apps/xfsm-trash-hilight.png
share/icons/hicolor/72x72/apps/xfsm-trash-normal.png
share/icons/hicolor/scalable/apps/xfce4-session.svg
share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
-share/locale/am/LC_MESSAGES/xfce4-session.mo
-share/locale/ar/LC_MESSAGES/xfce4-session.mo
-share/locale/az/LC_MESSAGES/xfce4-session.mo
-share/locale/be/LC_MESSAGES/xfce4-session.mo
-share/locale/bn_IN/LC_MESSAGES/xfce4-session.mo
-share/locale/ca/LC_MESSAGES/xfce4-session.mo
-share/locale/cs/LC_MESSAGES/xfce4-session.mo
-share/locale/da/LC_MESSAGES/xfce4-session.mo
-share/locale/de/LC_MESSAGES/xfce4-session.mo
-share/locale/dz/LC_MESSAGES/xfce4-session.mo
-share/locale/el/LC_MESSAGES/xfce4-session.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-session.mo
-share/locale/eo/LC_MESSAGES/xfce4-session.mo
-share/locale/es/LC_MESSAGES/xfce4-session.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-session.mo
-share/locale/et/LC_MESSAGES/xfce4-session.mo
-share/locale/eu/LC_MESSAGES/xfce4-session.mo
-share/locale/fa/LC_MESSAGES/xfce4-session.mo
-share/locale/fi/LC_MESSAGES/xfce4-session.mo
-share/locale/fr/LC_MESSAGES/xfce4-session.mo
-share/locale/gl/LC_MESSAGES/xfce4-session.mo
-share/locale/gu/LC_MESSAGES/xfce4-session.mo
-share/locale/he/LC_MESSAGES/xfce4-session.mo
-share/locale/hi/LC_MESSAGES/xfce4-session.mo
-share/locale/hu/LC_MESSAGES/xfce4-session.mo
-share/locale/id/LC_MESSAGES/xfce4-session.mo
-share/locale/it/LC_MESSAGES/xfce4-session.mo
-share/locale/ja/LC_MESSAGES/xfce4-session.mo
-share/locale/ka/LC_MESSAGES/xfce4-session.mo
-share/locale/ko/LC_MESSAGES/xfce4-session.mo
-share/locale/lt/LC_MESSAGES/xfce4-session.mo
-share/locale/lv/LC_MESSAGES/xfce4-session.mo
-share/locale/mk/LC_MESSAGES/xfce4-session.mo
-share/locale/mr/LC_MESSAGES/xfce4-session.mo
-share/locale/ms/LC_MESSAGES/xfce4-session.mo
-share/locale/nb/LC_MESSAGES/xfce4-session.mo
-share/locale/nl/LC_MESSAGES/xfce4-session.mo
-share/locale/pa/LC_MESSAGES/xfce4-session.mo
-share/locale/pl/LC_MESSAGES/xfce4-session.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-session.mo
-share/locale/pt/LC_MESSAGES/xfce4-session.mo
-share/locale/ro/LC_MESSAGES/xfce4-session.mo
-share/locale/ru/LC_MESSAGES/xfce4-session.mo
-share/locale/si/LC_MESSAGES/xfce4-session.mo
-share/locale/sk/LC_MESSAGES/xfce4-session.mo
-share/locale/sq/LC_MESSAGES/xfce4-session.mo
-share/locale/sv/LC_MESSAGES/xfce4-session.mo
-share/locale/ta/LC_MESSAGES/xfce4-session.mo
-share/locale/tr/LC_MESSAGES/xfce4-session.mo
-share/locale/uk/LC_MESSAGES/xfce4-session.mo
-share/locale/ur/LC_MESSAGES/xfce4-session.mo
-share/locale/vi/LC_MESSAGES/xfce4-session.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/am/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-session.mo
+%%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_IN/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/es_MX/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-session.mo
+%%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/hu/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ta/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
share/themes/Default/balou/logo.png
share/themes/Default/balou/themerc
-share/xfce4/doc/C/images/xfsm-advanced.png
-share/xfce4/doc/C/images/xfsm-general.png
-share/xfce4/doc/C/images/xfsm-splash.png
-share/xfce4/doc/C/xfce4-session.html
-share/xfce4/doc/fr/images/xfsm-advanced.png
-share/xfce4/doc/fr/images/xfsm-general.png
-share/xfce4/doc/fr/images/xfsm-splash.png
-share/xfce4/doc/fr/xfce4-session.html
share/xfce4/tips/tips
share/xfce4/tips/tips.dat
-share/icons/hicolor/48x48/apps/xfsm-logout.png
-share/icons/hicolor/48x48/apps/xfsm-reboot.png
-@dirrm etc/xdg/autostart
-@dirrmtry etc/xdg/xfce4/xfconf/xfce-perchannel-xml
-@dirrmtry etc/xdg/xfce4/xfconf
-@dirrmtry etc/xdg/xfce4
-@dirrmtry etc/xdg
-@dirrm include/xfce4/xfce4-session-4.6/libxfsm
-@dirrm include/xfce4/xfce4-session-4.6
-@dirrmtry include/xfce4
-@dirrmtry share/applications
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrm share/themes/Default/balou
-@dirrmtry share/themes/Default
-@dirrmtry share/themes
-@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
-@dirrmtry share/xfce4/tips
+@dirrm share/xfce4/tips
@dirrmtry share/xfce4
-@dirrmtry lib/xfce4/splash/engines
-@dirrmtry lib/xfce4/splash
-@dirrmtry lib/xfce4
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
+@dirrm share/themes/Default/balou
+@dirrm share/themes/Default
+@dirrm share/themes
+%%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/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/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/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/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/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
@dirrmtry share/icons/hicolor/72x72/apps
@dirrmtry share/icons/hicolor/72x72
+@dirrmtry share/icons/hicolor/64x64/apps
+@dirrmtry share/icons/hicolor/64x64
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
@dirrmtry share/icons/hicolor/128x128/apps
@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
+@dirrm lib/xfce4/splash/engines
+@dirrm lib/xfce4/splash
+@dirrm lib/xfce4
+@dirrm include/xfce4/xfce4-session-%%VERSION%%/libxfsm
+@dirrm include/xfce4/xfce4-session-%%VERSION%%
+@dirrmtry include/xfce4
+@dirrmtry etc/xdg/xfce4/xfconf/xfce-perchannel-xml
+@dirrmtry etc/xdg/xfce4/xfconf
+@dirrmtry etc/xdg/xfce4
+@dirrmtry etc/xdg/autostart
+@dirrmtry etc/xdg
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index e511a41dd709..abcdf6fa55c2 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xfce4-wm
-PORTVERSION= 4.6.1
-PORTREVISION= 5
+PORTVERSION= 4.6.2
CATEGORIES= x11-wm xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= xfwm4-${PORTVERSION}
diff --git a/x11-wm/xfce4-wm/distinfo b/x11-wm/xfce4-wm/distinfo
index 478e1a54b7ac..af941d84a251 100644
--- a/x11-wm/xfce4-wm/distinfo
+++ b/x11-wm/xfce4-wm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfwm4-4.6.1.tar.bz2) = 538ff2554a23bf877d336e573884da9a
-SHA256 (xfce4/xfwm4-4.6.1.tar.bz2) = 0a808d19a7ddf1f5271d0b7009a5d0dc919562a85afab4071df060f51e9ee9ed
-SIZE (xfce4/xfwm4-4.6.1.tar.bz2) = 1765862
+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
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index 3ee33e421718..510e97efcdb9 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -12,6 +12,10 @@ 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/az/LC_MESSAGES/xfwm4.mo
@@ -1339,6 +1343,14 @@ share/xfwm4/defaults
@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
diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index bf309c9a363e..e3abab229bed 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -6,49 +6,53 @@
#
PORTNAME= Terminal
-PORTVERSION= 0.4.3
-PORTREVISION= 3
+PORTVERSION= 0.4.5
CATEGORIES= x11 xfce
-MASTER_SITES= http://www.xfce.org/archive/src/apps/terminal/0.4/
+MASTER_SITES= ${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR= src/apps/${PORTNAME:L}/${PORTVERSION:R}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
COMMENT= Terminal emulator for the X windowing system
+USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
-USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig vte
+USE_GNOME= gnometarget gtk20 glib20 intltool intlhack pkgconfig vte
USE_XFCE= configenv libexo
+USE_XORG= x11
OPTIONS= DBUS "Enable D-BUS support" on \
- STARTUP "Enable startup notification support" on
+ NLS "Enable Native Language Support" on
MAN1= Terminal.1
+MANLANG= "" ca da es fr gl id it ja pt ru ug zh_CN
.include <bsd.port.pre.mk>
+.if defined(NOPORTDOCS)
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-doc-Makefile.in
+.endif
+
.if !defined(WITHOUT_DBUS)
LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
CONFIGURE_ARGS+=--enable-dbus
-PLIST_SUB+= WITH_DBUS=""
.else
CONFIGURE_ARGS+=--disable-dbus
-PLIST_SUB+= WITH_DBUS="@comment "
.endif
-.if !defined(WITHOUT_STARTUP)
-LIB_DEPENDS+= startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-CONFIGURE_ARGS+=--enable-startup-notification
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+= NLS=""
.else
-CONFIGURE_ARGS+=--disable-startup-notification
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
.endif
-post-patch:
-.if defined(NOPORTDOCS)
- @${REINPLACE_CMD} -e 's| doc[ ]*||' ${WRKSRC}/Makefile.in
-.endif
+post-install:
+ @-update-desktop-database
.include <bsd.port.post.mk>
diff --git a/x11/Terminal/distinfo b/x11/Terminal/distinfo
index 8f3f175d1a75..c294b0f03b0e 100644
--- a/x11/Terminal/distinfo
+++ b/x11/Terminal/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/Terminal-0.4.3.tar.bz2) = 0ce66b16bcb7ff274d7f93a69993f717
-SHA256 (xfce4/Terminal-0.4.3.tar.bz2) = 270da3e726a782750d392e9d21edc7af2935d1bd08daa254de8b3665115aafbf
-SIZE (xfce4/Terminal-0.4.3.tar.bz2) = 1402717
+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
diff --git a/x11/Terminal/files/extra-patch-doc-Makefile.in b/x11/Terminal/files/extra-patch-doc-Makefile.in
new file mode 100644
index 000000000000..46ba66fbdc8c
--- /dev/null
+++ b/x11/Terminal/files/extra-patch-doc-Makefile.in
@@ -0,0 +1,181 @@
+--- doc/Makefile.in.orig 2010-05-21 22:10:01.000000000 +0200
++++ doc/Makefile.in 2010-05-24 18:36:50.000000000 +0200
+@@ -53,9 +53,9 @@
+ SOURCES =
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
++ info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
++ install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+@@ -291,7 +291,6 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = \
+- images \
+ po
+
+ HTML_STYLESHEET = $(PACKAGE)-html.xsl
+@@ -359,18 +358,6 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-install-cssDATA: $(css_DATA)
+- @$(NORMAL_INSTALL)
+- test -z "$(cssdir)" || $(MKDIR_P) "$(DESTDIR)$(cssdir)"
+- @list='$(css_DATA)'; test -n "$(cssdir)" || list=; \
+- for p in $$list; do \
+- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+- echo "$$d$$p"; \
+- done | $(am__base_list) | \
+- while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(cssdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(cssdir)" || exit $$?; \
+- done
+
+ uninstall-cssDATA:
+ @$(NORMAL_UNINSTALL)
+@@ -581,9 +568,6 @@
+ all-am: Makefile $(DATA)
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(cssdir)"; do \
+- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+- done
+ install: install-recursive
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+@@ -622,15 +606,11 @@
+
+ dvi-am:
+
+-html: html-recursive
+-
+-html-am:
+-
+ info: info-recursive
+
+ info-am:
+
+-install-data-am: install-cssDATA install-data-local
++install-data-am: install-data-local
+
+ install-dvi: install-dvi-recursive
+
+@@ -638,10 +618,6 @@
+
+ install-exec-am:
+
+-install-html: install-html-recursive
+-
+-install-html-am:
+-
+ install-info: install-info-recursive
+
+ install-info-am:
+@@ -683,10 +659,10 @@
+ all all-am check check-am clean clean-generic clean-libtool \
+ clean-local ctags ctags-recursive dist-hook distclean \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+- dvi-am html html-am info info-am install install-am \
+- install-cssDATA install-data install-data-am \
++ dvi-am info info-am install install-am \
++ install-data install-data-am \
+ install-data-local install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
++ install-exec-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+@@ -698,19 +674,6 @@
+ # install the html files to the destdir
+ install-data-local:
+ for lang in $(ALL_LINGUAS); do \
+- if test -d $(srcdir)/html/$$lang; then \
+- dest=$(DESTDIR)$(docdir)/$$lang; \
+- $(mkinstalldirs) $$dest; \
+- installfiles=`echo $(srcdir)/html/$$lang/*`; \
+- for file in $$installfiles; do \
+- echo "--- Installing "$$file; \
+- $(INSTALL_DATA) $$file $$dest/; \
+- done; \
+- if test x"$$lang" != x"C" -a ! -d $(srcdir)/images/$$lang; then \
+- echo "--- Creating symlink to C images for $$lang"; \
+- ln -sf $(docdir)/C/images $$dest/images; \
+- fi \
+- fi; \
+ file=$(srcdir)/man/$$lang/$(PACKAGE_NAME).1; \
+ if test -f $$file ; then \
+ if test x"$$lang" = x"C"; then \
+@@ -728,13 +691,6 @@
+ uninstall-local:
+ for lang in $(ALL_LINGUAS); do \
+ dest=$(DESTDIR)$(docdir)/$$lang; \
+- if test -d $$dest; then \
+- if test -L $$dest/images; then \
+- rm -rf $$dest; \
+- else \
+- rm -f $$dest/*.html; \
+- fi \
+- fi; \
+ if test x"$$lang" = x"C"; then \
+ dest=$(DESTDIR)$(mandir)/man1/$(PACKAGE).1; \
+ else \
+@@ -748,7 +704,7 @@
+
+ # remove generate html from the srcdir
+ clean-local:
+- rm -rf $(srcdir)/html $(srcdir)/man
++ rm -rf $(srcdir)/man
+
+ # regenerate po(t) files
+ @GENERATE_DOCUMENTATION_TRUE@update-po:
+@@ -760,9 +716,9 @@
+ @GENERATE_DOCUMENTATION_TRUE@ done
+
+ # build the translated help files
+-@GENERATE_DOCUMENTATION_TRUE@doc-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(MANPAGE) $(srcdir)/$(HTML_STYLESHEET) $(srcdir)/$(MAN_STYLESHEET)
++@GENERATE_DOCUMENTATION_TRUE@doc-build.stamp: $(srcdir)/$(DOCUMENT) $(srcdir)/$(MANPAGE) $(srcdir)/$(MAN_STYLESHEET)
+ @GENERATE_DOCUMENTATION_TRUE@ @chmod -R u+w $(srcdir); \
+-@GENERATE_DOCUMENTATION_TRUE@ rm -rf $(srcdir)/html $(srcdir)/man; \
++@GENERATE_DOCUMENTATION_TRUE@ rm -rf $(srcdir)/man; \
+ @GENERATE_DOCUMENTATION_TRUE@ echo; \
+ @GENERATE_DOCUMENTATION_TRUE@ echo "*** Generating full XML file ***"; \
+ @GENERATE_DOCUMENTATION_TRUE@ echo "Creating Terminal-options.xml"; \
+@@ -788,11 +744,9 @@
+ @GENERATE_DOCUMENTATION_TRUE@ -i xgen-doc xgen-man; \
+ @GENERATE_DOCUMENTATION_TRUE@ echo "Validating DocBook XML files"; \
+ @GENERATE_DOCUMENTATION_TRUE@ $(XMLLINT) --noout --valid xgen-doc xgen-man; \
+-@GENERATE_DOCUMENTATION_TRUE@ echo "Creating the HTML pages"; \
+-@GENERATE_DOCUMENTATION_TRUE@ $(XSLTPROC) --nonet -o $(srcdir)/html/$$lang/ $(srcdir)/$(HTML_STYLESHEET) xgen-doc; \
+ @GENERATE_DOCUMENTATION_TRUE@ echo "Creating the MAN page"; \
+ @GENERATE_DOCUMENTATION_TRUE@ $(XSLTPROC) --nonet -o $(srcdir)/man/$$lang/$(PACKAGE_NAME).1 $(srcdir)/$(MAN_STYLESHEET) xgen-man; \
+-@GENERATE_DOCUMENTATION_TRUE@ chmod -R u+w $(srcdir)/html/$$lang $(srcdir)/man/$$lang; \
++@GENERATE_DOCUMENTATION_TRUE@ chmod -R u+w $(srcdir)/man/$$lang; \
+ @GENERATE_DOCUMENTATION_TRUE@ rm -f xgen-doc xgen-man; \
+ @GENERATE_DOCUMENTATION_TRUE@ echo; \
+ @GENERATE_DOCUMENTATION_TRUE@ done; \
+@@ -806,7 +760,7 @@
+ @GENERATE_DOCUMENTATION_FALSE@ @false
+
+ @GENERATE_DOCUMENTATION_FALSE@doc-build.stamp:
+-@GENERATE_DOCUMENTATION_FALSE@ @if test ! -d $(srcdir)/html -a ! -d $(srcdir)/man; then \
++@GENERATE_DOCUMENTATION_FALSE@ @if test ! -d $(srcdir)/man; then \
+ @GENERATE_DOCUMENTATION_FALSE@ echo; \
+ @GENERATE_DOCUMENTATION_FALSE@ echo "*** No generated documentation found. If you want to"; \
+ @GENERATE_DOCUMENTATION_FALSE@ echo "*** generate the (translated) documentation, run configure"; \
+@@ -825,10 +779,6 @@
+ # include the html and man files in the dist
+ dist-hook: dist-check-doc doc-build.stamp
+ for lang in $(ALL_LINGUAS); do \
+- if test -d $(srcdir)/html/$$lang; then \
+- mkdir -p $(distdir)/html/$$lang; \
+- cp $(srcdir)/html/$$lang/* $(distdir)/html/$$lang/; \
+- fi; \
+ if test -d $(srcdir)/man/$$lang; then \
+ mkdir -p $(distdir)/man/$$lang; \
+ cp $(srcdir)/man/$$lang/* $(distdir)/man/$$lang/; \
diff --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist
index 082a29e54be3..3ae8989b90e3 100644
--- a/x11/Terminal/pkg-plist
+++ b/x11/Terminal/pkg-plist
@@ -1,11 +1,10 @@
bin/Terminal
bin/terminal
-libexec/TerminalHelp
share/Terminal/Terminal-toolbars.ui
share/Terminal/Terminal.glade
-share/applications/Terminal.desktop
-share/gnome-control-center/default-apps/Terminal-default-apps.xml
+%%NLS%%share/applications/Terminal.desktop
%%PORTDOCS%%%%DOCSDIR%%/C/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/C/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/C/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/C/faq.html
%%PORTDOCS%%%%DOCSDIR%%/C/getting-started.html
@@ -25,6 +24,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/C/support.html
%%PORTDOCS%%%%DOCSDIR%%/C/usage.html
%%PORTDOCS%%%%DOCSDIR%%/ca/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ca/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/ca/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/ca/faq.html
%%PORTDOCS%%%%DOCSDIR%%/ca/getting-started.html
@@ -34,6 +34,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/ca/support.html
%%PORTDOCS%%%%DOCSDIR%%/ca/usage.html
%%PORTDOCS%%%%DOCSDIR%%/da/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/da/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/da/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/da/faq.html
%%PORTDOCS%%%%DOCSDIR%%/da/getting-started.html
@@ -42,7 +43,18 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/da/preferences.html
%%PORTDOCS%%%%DOCSDIR%%/da/support.html
%%PORTDOCS%%%%DOCSDIR%%/da/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/es/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/es/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/es/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/es/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/es/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/es/images
+%%PORTDOCS%%%%DOCSDIR%%/es/index.html
+%%PORTDOCS%%%%DOCSDIR%%/es/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/es/support.html
+%%PORTDOCS%%%%DOCSDIR%%/es/usage.html
%%PORTDOCS%%%%DOCSDIR%%/fr/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/fr/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/fr/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/fr/faq.html
%%PORTDOCS%%%%DOCSDIR%%/fr/getting-started.html
@@ -52,6 +64,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/fr/support.html
%%PORTDOCS%%%%DOCSDIR%%/fr/usage.html
%%PORTDOCS%%%%DOCSDIR%%/gl/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/gl/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/gl/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/gl/faq.html
%%PORTDOCS%%%%DOCSDIR%%/gl/getting-started.html
@@ -60,7 +73,18 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%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%%/id/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/id/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/id/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/id/faq.html
%%PORTDOCS%%%%DOCSDIR%%/id/getting-started.html
@@ -70,6 +94,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/id/support.html
%%PORTDOCS%%%%DOCSDIR%%/id/usage.html
%%PORTDOCS%%%%DOCSDIR%%/it/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/it/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/it/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/it/faq.html
%%PORTDOCS%%%%DOCSDIR%%/it/getting-started.html
@@ -79,6 +104,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/it/support.html
%%PORTDOCS%%%%DOCSDIR%%/it/usage.html
%%PORTDOCS%%%%DOCSDIR%%/ja/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ja/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/ja/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/ja/faq.html
%%PORTDOCS%%%%DOCSDIR%%/ja/getting-started.html
@@ -97,8 +123,39 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/ja/preferences.html
%%PORTDOCS%%%%DOCSDIR%%/ja/support.html
%%PORTDOCS%%%%DOCSDIR%%/ja/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/images
+%%PORTDOCS%%%%DOCSDIR%%/pt/index.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/support.html
+%%PORTDOCS%%%%DOCSDIR%%/pt/usage.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/images
+%%PORTDOCS%%%%DOCSDIR%%/ru/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/support.html
+%%PORTDOCS%%%%DOCSDIR%%/ru/usage.html
%%PORTDOCS%%%%DOCSDIR%%/terminal.css
+%%PORTDOCS%%%%DOCSDIR%%/ug/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/command-line.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/getting-started.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/images
+%%PORTDOCS%%%%DOCSDIR%%/ug/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/preferences.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/support.html
+%%PORTDOCS%%%%DOCSDIR%%/ug/usage.html
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/zh_CN/command-line.html
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/copyright.html
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/faq.html
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/getting-started.html
@@ -107,6 +164,7 @@ share/gnome-control-center/default-apps/Terminal-default-apps.xml
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/preferences.html
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/support.html
%%PORTDOCS%%%%DOCSDIR%%/zh_CN/usage.html
+share/gnome-control-center/default-apps/Terminal-default-apps.xml
share/icons/hicolor/16x16/stock/navigation/stock_terminal-closetab.png
share/icons/hicolor/16x16/stock/navigation/stock_terminal-newtab.png
share/icons/hicolor/16x16/stock/navigation/stock_terminal-newwindow.png
@@ -117,93 +175,187 @@ share/icons/hicolor/24x24/stock/navigation/stock_terminal-newwindow.png
share/icons/hicolor/24x24/stock/navigation/stock_terminal-reportbug.png
share/icons/hicolor/24x24/stock/navigation/stock_terminal-showborders.png
share/icons/hicolor/24x24/stock/navigation/stock_terminal-showmenu.png
-share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png
share/icons/hicolor/48x48/apps/Terminal.png
+share/icons/hicolor/48x48/stock/navigation/stock_terminal-compose.png
share/icons/hicolor/scalable/apps/Terminal.svg
-share/locale/ar/LC_MESSAGES/Terminal.mo
-share/locale/ast/LC_MESSAGES/Terminal.mo
-share/locale/be/LC_MESSAGES/Terminal.mo
-share/locale/ca/LC_MESSAGES/Terminal.mo
-share/locale/cs/LC_MESSAGES/Terminal.mo
-share/locale/da/LC_MESSAGES/Terminal.mo
-share/locale/de/LC_MESSAGES/Terminal.mo
-share/locale/dz/LC_MESSAGES/Terminal.mo
-share/locale/el/LC_MESSAGES/Terminal.mo
-share/locale/en_GB/LC_MESSAGES/Terminal.mo
-share/locale/eo/LC_MESSAGES/Terminal.mo
-share/locale/et/LC_MESSAGES/Terminal.mo
-share/locale/es/LC_MESSAGES/Terminal.mo
-share/locale/eu/LC_MESSAGES/Terminal.mo
-share/locale/fi/LC_MESSAGES/Terminal.mo
-share/locale/fr/LC_MESSAGES/Terminal.mo
-share/locale/gl/LC_MESSAGES/Terminal.mo
-share/locale/he/LC_MESSAGES/Terminal.mo
-share/locale/hu/LC_MESSAGES/Terminal.mo
-share/locale/id/LC_MESSAGES/Terminal.mo
-share/locale/it/LC_MESSAGES/Terminal.mo
-share/locale/ja/LC_MESSAGES/Terminal.mo
-share/locale/kk/LC_MESSAGES/Terminal.mo
-share/locale/ko/LC_MESSAGES/Terminal.mo
-share/locale/ku/LC_MESSAGES/Terminal.mo
-share/locale/lt/LC_MESSAGES/Terminal.mo
-share/locale/lv/LC_MESSAGES/Terminal.mo
-share/locale/nb/LC_MESSAGES/Terminal.mo
-share/locale/nl/LC_MESSAGES/Terminal.mo
-share/locale/pa/LC_MESSAGES/Terminal.mo
-share/locale/pl/LC_MESSAGES/Terminal.mo
-share/locale/pt_BR/LC_MESSAGES/Terminal.mo
-share/locale/pt/LC_MESSAGES/Terminal.mo
-share/locale/ro/LC_MESSAGES/Terminal.mo
-share/locale/ru/LC_MESSAGES/Terminal.mo
-share/locale/sk/LC_MESSAGES/Terminal.mo
-share/locale/sq/LC_MESSAGES/Terminal.mo
-share/locale/sv/LC_MESSAGES/Terminal.mo
-share/locale/tr/LC_MESSAGES/Terminal.mo
-share/locale/uk/LC_MESSAGES/Terminal.mo
-share/locale/ur/LC_MESSAGES/Terminal.mo
-share/locale/ur_PK/LC_MESSAGES/Terminal.mo
-share/locale/vi/LC_MESSAGES/Terminal.mo
-share/locale/zh_CN/LC_MESSAGES/Terminal.mo
-share/locale/zh_TW/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/be/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/da/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/de/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/el/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/et/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/he/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/id/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/it/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/si/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/Terminal.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/Terminal.mo
share/pixmaps/terminal.xpm
+@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_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/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/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/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/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/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
+%%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/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/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
+@dirrmtry man/zh_CN/man1
+@dirrmtry man/zh_CN
+@dirrmtry share/icons/hicolor/scalable/apps
@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/24x24/stock/navigation
-@dirrmtry share/icons/hicolor/24x24/stock
-@dirrmtry share/icons/hicolor/24x24
@dirrmtry share/icons/hicolor/48x48/stock/navigation
@dirrmtry share/icons/hicolor/48x48/stock
+@dirrmtry share/icons/hicolor/48x48/apps
@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry icons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/C
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/da
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/ca
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/gl
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/id
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/it
+@dirrmtry share/icons/hicolor/24x24/stock/navigation
+@dirrmtry share/icons/hicolor/24x24/stock
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/16x16/stock/navigation
+@dirrmtry share/icons/hicolor/16x16/stock
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/gnome-control-center/default-apps
+@dirrmtry share/gnome-control-center
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/zh_CN
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ug
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ru
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/pt
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/zh_CN
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/it
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/id
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/hr
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/gl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/es
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/da
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ca
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/C/images
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/C
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrmtry share/applications
@dirrm share/Terminal
-@dirrmtry share/gnome-control-center/default-apps
-@dirrmtry share/icons/hicolor/16x16/stock/navigation
-@dirrmtry share/icons/hicolor/16x16/stock
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/48x48/stock/navigation
-@dirrmtry share/icons/hicolor/48x48/stock
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@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/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index e343bc6efaee..c802b67b2b83 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?= 5
+PORTREVISION?= 6
CATEGORIES= x11
MASTER_SITES= http://launchpadlibrarian.net/26374006/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index e9d4643187c9..1f407c9dc40a 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -6,11 +6,10 @@
# $MCom: ports/x11/libexo/Makefile,v 1.1 2006/10/02 21:05:55 ahze Exp $
PORTNAME= libexo
-PORTVERSION= 0.3.106
-PORTREVISION= 3
+PORTVERSION= 0.3.107
CATEGORIES= x11 xfce
DISTNAME= exo-${PORTVERSION}
-MASTER_SITES= http://www.xfce.org/archive/src/xfce/exo/0.3/
+MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
MAINTAINER= oliver@FreeBSD.org
@@ -24,16 +23,22 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_PERL5= yes
USE_XFCE= configenv libutil
+CONFIGURE_ARGS= --enable-gtk-doc-html=no \
+ --enable-gtk-doc=no \
+ --disable-debug
+
+PLIST_SUB= VERSION="${PORTVERSION:R}"
+
OPTIONS= HAL "Enable HAL support" on \
NOTIFY "Enable notification support" on \
PYTHON "Enable Python support" off \
+ NLS "Enable Native Language Support" on
MAN1= exo-csource.1 exo-open.1
@@ -56,10 +61,9 @@ PLIST_SUB+= NOTIFY="@comment "
.endif
.if defined(WITH_PYTHON)
-CONFIGURE_ARGS+=--enable-python
USE_PYTHON= yes
+CONFIGURE_ARGS+=--enable-python
.include "${PORTSDIR}/Mk/bsd.python.mk"
-BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pygtk.py:${PORTSDIR}/x11-toolkits/py-gtk2
PLIST_SUB+= PYTHON=""
.else
@@ -67,4 +71,17 @@ CONFIGURE_ARGS+=--disable-python
PLIST_SUB+= PYTHON="@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-install:
+ ${FIND} ${WRKSRC}/docs/reference -type f -regex '.*\.1' \
+ -exec ${INSTALL_MAN} "{}" "${MANPREFIX}/man/man1" \;
+
.include <bsd.port.post.mk>
diff --git a/x11/libexo/distinfo b/x11/libexo/distinfo
index b86770d58ad5..eb8b4fd744ba 100644
--- a/x11/libexo/distinfo
+++ b/x11/libexo/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/exo-0.3.106.tar.bz2) = 927905f89252fa397e50d7a4fbf3c9a7
-SHA256 (xfce4/exo-0.3.106.tar.bz2) = 0b9b8625eb27896402d2a4f219dfb92ac9a1fe1f3e7367709f87fc866f1c02d9
-SIZE (xfce4/exo-0.3.106.tar.bz2) = 1732898
+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
diff --git a/x11/libexo/files/patch-Makefile.in b/x11/libexo/files/patch-Makefile.in
new file mode 100644
index 000000000000..d72c5d05222c
--- /dev/null
+++ b/x11/libexo/files/patch-Makefile.in
@@ -0,0 +1,25 @@
+--- 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/pkg-plist b/x11/libexo/pkg-plist
index 70d2279bcfd6..e6854cd90707 100644
--- a/x11/libexo/pkg-plist
+++ b/x11/libexo/pkg-plist
@@ -7,211 +7,109 @@ bin/exo-preferred-applications
bin/exo-unmount
etc/xdg/xfce4/helpers.rc
etc/xdg/xfce4/mount.rc
-include/exo-0.3/exo/exo-binding.h
-include/exo-0.3/exo/exo-cell-renderer-ellipsized-text.h
-include/exo-0.3/exo/exo-cell-renderer-icon.h
-include/exo-0.3/exo/exo-config.h
-include/exo-0.3/exo/exo-ellipsized-label.h
-include/exo-0.3/exo/exo-enum-types.h
-include/exo-0.3/exo/exo-execute.h
-include/exo-0.3/exo/exo-gdk-pixbuf-extensions.h
-include/exo-0.3/exo/exo-gobject-extensions.h
-include/exo-0.3/exo/exo-gtk-extensions.h
-include/exo-0.3/exo/exo-icon-bar.h
-include/exo-0.3/exo/exo-icon-chooser-dialog.h
-include/exo-0.3/exo/exo-icon-view.h
-include/exo-0.3/exo/exo-md5.h
-include/exo-0.3/exo/exo-mount-point.h
-include/exo-0.3/exo/exo-pango-extensions.h
-include/exo-0.3/exo/exo-string.h
-include/exo-0.3/exo/exo-toolbars-editor-dialog.h
-include/exo-0.3/exo/exo-toolbars-editor.h
-include/exo-0.3/exo/exo-toolbars-model.h
-include/exo-0.3/exo/exo-toolbars-view.h
-include/exo-0.3/exo/exo-tree-view.h
-include/exo-0.3/exo/exo-url.h
-include/exo-0.3/exo/exo-utils.h
-include/exo-0.3/exo/exo-wrap-table.h
-include/exo-0.3/exo/exo-xsession-client.h
-include/exo-0.3/exo/exo.h
-include/exo-0.3/exo-hal/exo-hal.h
-lib/libexo-0.3.a
-lib/libexo-0.3.la
-lib/libexo-0.3.so
-lib/libexo-0.3.so.5
-lib/libexo-hal-0.3.a
-lib/libexo-hal-0.3.la
-lib/libexo-hal-0.3.so
-lib/libexo-hal-0.3.so.5
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/_exo.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/_exo.la
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/_exo.so
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/exo/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/exo/__init__.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/exo-0.3/exo/__init__.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/pyexo.pyo
-libdata/pkgconfig/exo-0.3.pc
-libdata/pkgconfig/exo-hal-0.3.pc
-libexec/exo-compose-mail-0.3
-libexec/exo-helper-0.3
-%%NOTIFY%%libexec/exo-mount-notify-0.3
-share/applications/exo-preferred-applications.desktop
-share/gtk-doc/html/exo-0.3/ExoCellRendererEllipsizedText.html
-share/gtk-doc/html/exo-0.3/ExoCellRendererIcon.html
-share/gtk-doc/html/exo-0.3/ExoEllipsizedLabel.html
-share/gtk-doc/html/exo-0.3/ExoIconBar.html
-share/gtk-doc/html/exo-0.3/ExoIconChooserDialog.html
-share/gtk-doc/html/exo-0.3/ExoIconView.html
-share/gtk-doc/html/exo-0.3/ExoToolbarsEditor.html
-share/gtk-doc/html/exo-0.3/ExoToolbarsEditorDialog.html
-share/gtk-doc/html/exo-0.3/ExoToolbarsModel.html
-share/gtk-doc/html/exo-0.3/ExoToolbarsView.html
-share/gtk-doc/html/exo-0.3/ExoTreeView.html
-share/gtk-doc/html/exo-0.3/ExoWrapTable.html
-share/gtk-doc/html/exo-0.3/ExoXsessionClient.html
-share/gtk-doc/html/exo-0.3/ch01.html
-share/gtk-doc/html/exo-0.3/exo-Binding-Properties-Functions.html
-share/gtk-doc/html/exo-0.3/exo-Executing-Applications.html
-share/gtk-doc/html/exo-0.3/exo-Extensions-to-GObject.html
-share/gtk-doc/html/exo-0.3/exo-Extensions-to-Gtk.html
-share/gtk-doc/html/exo-0.3/exo-Extensions-to-Pango.html
-share/gtk-doc/html/exo-0.3/exo-Extensions-to-gdk-pixbuf.html
-share/gtk-doc/html/exo-0.3/exo-HAL-Support-Functions.html
-share/gtk-doc/html/exo-0.3/exo-MD5-functions.html
-share/gtk-doc/html/exo-0.3/exo-Miscellaneous-Utility-Functions.html
-share/gtk-doc/html/exo-0.3/exo-Mount-Points.html
-share/gtk-doc/html/exo-0.3/exo-Opening-URLs.html
-share/gtk-doc/html/exo-0.3/exo-String-Utility-Functions.html
-share/gtk-doc/html/exo-0.3/exo-Version-Information.html
-share/gtk-doc/html/exo-0.3/exo-cell-renderers.html
-share/gtk-doc/html/exo-0.3/exo-csource.html
-share/gtk-doc/html/exo-0.3/exo-deprecated-widgets.html
-share/gtk-doc/html/exo-0.3/exo-extensions.html
-share/gtk-doc/html/exo-0.3/exo-gtk-file-chooser-add-thumbnail-preview.png
-share/gtk-doc/html/exo-0.3/exo-icon-chooser-dialog.png
-share/gtk-doc/html/exo-0.3/exo-miscelleanous.html
-share/gtk-doc/html/exo-0.3/exo-overview.html
-share/gtk-doc/html/exo-0.3/exo-toolbars-editor-dialog.png
-share/gtk-doc/html/exo-0.3/exo-toolbars-editor.png
-share/gtk-doc/html/exo-0.3/exo-toolbars-view.png
-share/gtk-doc/html/exo-0.3/exo-toolbars.html
-share/gtk-doc/html/exo-0.3/exo-tools.html
-share/gtk-doc/html/exo-0.3/exo-widgets.html
-share/gtk-doc/html/exo-0.3/exo-wrap-table.png
-share/gtk-doc/html/exo-0.3/exo-0.3.devhelp
-share/gtk-doc/html/exo-0.3/exo-0.3.devhelp2
-share/gtk-doc/html/exo-0.3/home.png
-share/gtk-doc/html/exo-0.3/index.html
-share/gtk-doc/html/exo-0.3/index.sgml
-share/gtk-doc/html/exo-0.3/ix01.html
-share/gtk-doc/html/exo-0.3/left.png
-share/gtk-doc/html/exo-0.3/right.png
-share/gtk-doc/html/exo-0.3/style.css
-share/gtk-doc/html/exo-0.3/up.png
+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
+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
share/icons/hicolor/24x24/apps/preferences-desktop-default-applications.png
share/icons/hicolor/48x48/apps/applications-internet.png
share/icons/hicolor/48x48/apps/applications-other.png
share/icons/hicolor/48x48/apps/preferences-desktop-default-applications.png
-share/locale/ar/LC_MESSAGES/libexo-0.3.mo
-share/locale/ast/LC_MESSAGES/libexo-0.3.mo
-share/locale/be/LC_MESSAGES/libexo-0.3.mo
-share/locale/ca/LC_MESSAGES/libexo-0.3.mo
-share/locale/cy/LC_MESSAGES/libexo-0.3.mo
-share/locale/cs/LC_MESSAGES/libexo-0.3.mo
-share/locale/da/LC_MESSAGES/libexo-0.3.mo
-share/locale/de/LC_MESSAGES/libexo-0.3.mo
-share/locale/dz/LC_MESSAGES/libexo-0.3.mo
-share/locale/el/LC_MESSAGES/libexo-0.3.mo
-share/locale/en_GB/LC_MESSAGES/libexo-0.3.mo
-share/locale/es/LC_MESSAGES/libexo-0.3.mo
-share/locale/et/LC_MESSAGES/libexo-0.3.mo
-share/locale/eu/LC_MESSAGES/libexo-0.3.mo
-share/locale/fi/LC_MESSAGES/libexo-0.3.mo
-share/locale/fr/LC_MESSAGES/libexo-0.3.mo
-share/locale/gl/LC_MESSAGES/libexo-0.3.mo
-share/locale/he/LC_MESSAGES/libexo-0.3.mo
-share/locale/hu/LC_MESSAGES/libexo-0.3.mo
-share/locale/id/LC_MESSAGES/libexo-0.3.mo
-share/locale/it/LC_MESSAGES/libexo-0.3.mo
-share/locale/ja/LC_MESSAGES/libexo-0.3.mo
-share/locale/ka/LC_MESSAGES/libexo-0.3.mo
-share/locale/kk/LC_MESSAGES/libexo-0.3.mo
-share/locale/ku/LC_MESSAGES/libexo-0.3.mo
-share/locale/lt/LC_MESSAGES/libexo-0.3.mo
-share/locale/lv/LC_MESSAGES/libexo-0.3.mo
-share/locale/mk/LC_MESSAGES/libexo-0.3.mo
-share/locale/nb/LC_MESSAGES/libexo-0.3.mo
-share/locale/nl/LC_MESSAGES/libexo-0.3.mo
-share/locale/nn/LC_MESSAGES/libexo-0.3.mo
-share/locale/pa/LC_MESSAGES/libexo-0.3.mo
-share/locale/pl/LC_MESSAGES/libexo-0.3.mo
-share/locale/pt_BR/LC_MESSAGES/libexo-0.3.mo
-share/locale/pt/LC_MESSAGES/libexo-0.3.mo
-share/locale/ro/LC_MESSAGES/libexo-0.3.mo
-share/locale/ru/LC_MESSAGES/libexo-0.3.mo
-share/locale/sk/LC_MESSAGES/libexo-0.3.mo
-share/locale/sq/LC_MESSAGES/libexo-0.3.mo
-share/locale/sv/LC_MESSAGES/libexo-0.3.mo
-share/locale/tr/LC_MESSAGES/libexo-0.3.mo
-share/locale/uk/LC_MESSAGES/libexo-0.3.mo
-share/locale/ur/LC_MESSAGES/libexo-0.3.mo
-share/locale/ur_PK/LC_MESSAGES/libexo-0.3.mo
-share/locale/zh_CN/LC_MESSAGES/libexo-0.3.mo
-share/locale/zh_TW/LC_MESSAGES/libexo-0.3.mo
-share/pixmaps/exo-0.3/exo-thumbnail-frame.png
-%%PYTHON%%share/pygtk/2.0/defs/exo-0.3/exo.defs
-share/xfce4/doc/C/exo-preferred-applications.html
-share/xfce4/doc/C/images/exo-preferred-applications-internet.png
-share/xfce4/doc/C/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/C/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/da/exo-preferred-applications.html
-share/xfce4/doc/da/images/exo-preferred-applications-internet.png
-share/xfce4/doc/da/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/da/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/da/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/fr/exo-preferred-applications.html
-share/xfce4/doc/fr/images/exo-preferred-applications-internet.png
-share/xfce4/doc/fr/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/fr/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/es/images/exo-preferred-applications-internet.png
-share/xfce4/doc/es/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/es/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/es/exo-preferred-applications.html
-share/xfce4/doc/gl/exo-preferred-applications.html
-share/xfce4/doc/gl/images/exo-preferred-applications-internet.png
-share/xfce4/doc/gl/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/gl/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/gl/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/id/images/exo-preferred-applications-internet.png
-share/xfce4/doc/id/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/id/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/id/exo-preferred-applications.html
-share/xfce4/doc/it/images/exo-preferred-applications-internet.png
-share/xfce4/doc/it/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/it/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/it/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/it/exo-preferred-applications.html
-share/xfce4/doc/ja/exo-preferred-applications.html
-share/xfce4/doc/ja/images/exo-preferred-applications-internet.png
-share/xfce4/doc/ja/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/ja/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/pt_BR/images/exo-preferred-applications-internet.png
-share/xfce4/doc/pt_BR/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/pt_BR/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/pt_BR/exo-preferred-applications.html
-share/xfce4/doc/tr/images/exo-preferred-applications-internet.png
-share/xfce4/doc/tr/images/exo-preferred-applications-utilities.png
-share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-custom.png
-share/xfce4/doc/tr/images/exo-preferred-applications-webbrowser-menu.png
-share/xfce4/doc/tr/exo-preferred-applications.html
+%%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/xfce4/helpers/Terminal.desktop
share/xfce4/helpers/aterm.desktop
share/xfce4/helpers/balsa.desktop
@@ -242,59 +140,118 @@ share/xfce4/helpers/thunderbird.desktop
share/xfce4/helpers/urxvt.desktop
share/xfce4/helpers/w3m.desktop
share/xfce4/helpers/xterm.desktop
-@dirrmtry etc/xdg/xfce4
-@dirrmtry etc/xdg
-@dirrmtry share/gtk-doc/html
-@dirrm include/exo-0.3/exo
-@dirrm include/exo-0.3/exo-hal
-@dirrm include/exo-0.3
-@dirrmtry lib/xfce4
-@dirrm share/gtk-doc/html/exo-0.3
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
-@dirrmtry share/applications
-@dirrmtry share/icons/hicolor/24x24/apps
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/exo-0.3/exo
-%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/exo-0.3
-%%PYTHON%%@dirrmtry %%PYTHON_SITELIBDIR%%
-%%PYTHON%%@dirrm share/pygtk/2.0/defs/exo-0.3
+@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
-@dirrm share/pixmaps/exo-0.3
-@dirrmtry share/xfce4/doc/C/images
-@dirrmtry share/xfce4/doc/C
-@dirrmtry share/xfce4/doc/da/images
-@dirrmtry share/xfce4/doc/da
-@dirrmtry share/xfce4/doc/es/images
-@dirrmtry share/xfce4/doc/es
-@dirrmtry share/xfce4/doc/fr/images
-@dirrmtry share/xfce4/doc/fr
-@dirrmtry share/xfce4/doc/gl/images
-@dirrmtry share/xfce4/doc/gl
-@dirrmtry share/xfce4/doc/id/images
-@dirrmtry share/xfce4/doc/id
-@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/pt_BR/images
-@dirrmtry share/xfce4/doc/pt_BR
-@dirrmtry share/xfce4/doc/tr/images
-@dirrmtry share/xfce4/doc/tr
-@dirrmtry share/xfce4/doc
-@dirrmtry share/xfce4/helpers
-@dirrmtry share/xfce4
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
+%%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
+@dirrm include/exo-%%VERSION%%/exo-hal
+@dirrm include/exo-%%VERSION%%/exo
+@dirrm include/exo-%%VERSION%%
+@dirrmtry etc/xdg/xfce4
+@dirrmtry etc/xdg
diff --git a/x11/libxfce4menu/Makefile b/x11/libxfce4menu/Makefile
index 016f6216dd57..9c6b4bcf5564 100644
--- a/x11/libxfce4menu/Makefile
+++ b/x11/libxfce4menu/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libxfce4menu
-PORTVERSION= 4.6.1
-PORTREVISION= 3
+PORTVERSION= 4.6.2
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
@@ -19,10 +18,18 @@ USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= glib20 gnomehack gnometarget gtk20 pkgconfig
+USE_GNOME= glib20 gnomehack gnometarget gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_XFCE= configenv libutil
+CONFIGURE_ARGS= --enable-gtk-doc-html=no \
+ --disable-debug
+
+OPTIONS= GTKDOC "install the library documentation" off \
+ NLS "Enable Native Language Support" on
+
+.include <bsd.port.pre.mk>
+
.if defined(WITH_GTKDOC)
BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc
CONFIGURE_ARGS+=--enable-gtk-doc
@@ -32,4 +39,13 @@ CONFIGURE_ARGS+=--disable-gtk-doc
PLIST_SUB+= GTK_DOC="@comment "
.endif
-.include <bsd.port.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
+
+.include <bsd.port.post.mk>
diff --git a/x11/libxfce4menu/distinfo b/x11/libxfce4menu/distinfo
index 1ed9d4312586..3748d2b5c6a0 100644
--- a/x11/libxfce4menu/distinfo
+++ b/x11/libxfce4menu/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfce4menu-4.6.1.tar.bz2) = 5dc9343885c2c6f931318b2a1cdcc9db
-SHA256 (xfce4/libxfce4menu-4.6.1.tar.bz2) = 5442b458b0e4f6bbbb6ddfbf1a7789dde1d270ab85686a3be77731a4d5ef84da
-SIZE (xfce4/libxfce4menu-4.6.1.tar.bz2) = 404201
+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
diff --git a/x11/libxfce4menu/pkg-plist b/x11/libxfce4menu/pkg-plist
index f8e640a0503c..248c077de45a 100644
--- a/x11/libxfce4menu/pkg-plist
+++ b/x11/libxfce4menu/pkg-plist
@@ -58,38 +58,119 @@ 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
-share/locale/ca/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/cs/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/da/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/de/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/el/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/en_GB/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/es/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/eu/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/fi/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/fr/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/gl/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/hu/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/id/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/it/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/ja/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/ku/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/lv/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/nb/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/pl/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/pt_BR/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/pt/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/ro/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/ru/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/sq/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/sv/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/tr/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/uk/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/ur/LC_MESSAGES/libxfce4menu-0.1.mo
-share/locale/zh_CN/LC_MESSAGES/libxfce4menu-0.1.mo
+%%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
@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
@dirrm include/xfce4/libxfce4menu-0.1/libxfce4menu
-@dirrmtry include/xfce4/libxfce4menu-0.1
-@dirrmtry include/xfce4/libxfce4menu-0.1
+@dirrm include/xfce4/libxfce4menu-0.1
+@dirrmtry include/xfce4
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index ea5deb62693c..07f6b2a5a18a 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libxfce4util
-PORTVERSION= 4.6.1
+PORTVERSION= 4.6.2
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DIST_SUBDIR= xfce4
@@ -18,17 +18,24 @@ USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
-USE_GNOME= glib20 gnomehack gnometarget pkgconfig
+USE_GNOME= glib20 gnomehack intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_XFCE= configenv
-.if defined(WITH_GTKDOC)
-BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc
-CONFIGURE_ARGS+=--enable-gtk-doc
-PLIST_SUB+= GTK_DOC=""
+CONFIGURE_ARGS= --enable-gtk-doc-html=no \
+ --disable-debug
+
+OPTIONS= NLS "Enable Native Language Support" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+= NLS=""
.else
-CONFIGURE_ARGS+=--disable-gtk-doc
-PLIST_SUB+= GTK_DOC="@comment "
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+= NLS="@comment "
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/libxfce4util/distinfo b/x11/libxfce4util/distinfo
index a89c0aad103a..3f5ee46d10d3 100644
--- a/x11/libxfce4util/distinfo
+++ b/x11/libxfce4util/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/libxfce4util-4.6.1.tar.bz2) = eac51d58179cbcadc3f802450a8ec9cd
-SHA256 (xfce4/libxfce4util-4.6.1.tar.bz2) = ceecdc7d3c89f547606c2d77a8a42ccf9975c809374fab84ff0833a08510c16b
-SIZE (xfce4/libxfce4util-4.6.1.tar.bz2) = 405327
+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
diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist
index a41a29b29bf5..9e01fddf05d3 100644
--- a/x11/libxfce4util/pkg-plist
+++ b/x11/libxfce4util/pkg-plist
@@ -1,8 +1,8 @@
include/xfce4/libxfce4util/debug.h
include/xfce4/libxfce4util/i18n.h
-include/xfce4/libxfce4util/libxfce4util.h
include/xfce4/libxfce4util/libxfce4util-config.h
include/xfce4/libxfce4util/libxfce4util-enum-types.h
+include/xfce4/libxfce4util/libxfce4util.h
include/xfce4/libxfce4util/utf8.h
include/xfce4/libxfce4util/util.h
include/xfce4/libxfce4util/xfce-desktopentry.h
@@ -33,8 +33,8 @@ share/gtk-doc/html/libxfce4util/libxfce4util-Miscellaneous-Utilities.html
share/gtk-doc/html/libxfce4util/libxfce4util-POSIX-Signal-Handling.html
share/gtk-doc/html/libxfce4util/libxfce4util-Resource-Config-File-Support.html
share/gtk-doc/html/libxfce4util/libxfce4util-Resource-lookup-functions.html
-share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
share/gtk-doc/html/libxfce4util/libxfce4util-Software-Licenses.html
+share/gtk-doc/html/libxfce4util/libxfce4util-Unicode-Support-Functions.html
share/gtk-doc/html/libxfce4util/libxfce4util-Version-Information.html
share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Generics.html
share/gtk-doc/html/libxfce4util/libxfce4util-Xfce-Kiosk-functions.html
@@ -48,48 +48,140 @@ share/gtk-doc/html/libxfce4util/reference.html
share/gtk-doc/html/libxfce4util/right.png
share/gtk-doc/html/libxfce4util/style.css
share/gtk-doc/html/libxfce4util/up.png
-share/locale/am/LC_MESSAGES/libxfce4util.mo
-share/locale/ar/LC_MESSAGES/libxfce4util.mo
-share/locale/ca/LC_MESSAGES/libxfce4util.mo
-share/locale/cs/LC_MESSAGES/libxfce4util.mo
-share/locale/cy/LC_MESSAGES/libxfce4util.mo
-share/locale/da/LC_MESSAGES/libxfce4util.mo
-share/locale/de/LC_MESSAGES/libxfce4util.mo
-share/locale/dz/LC_MESSAGES/libxfce4util.mo
-share/locale/en_GB/LC_MESSAGES/libxfce4util.mo
-share/locale/es/LC_MESSAGES/libxfce4util.mo
-share/locale/et/LC_MESSAGES/libxfce4util.mo
-share/locale/eu/LC_MESSAGES/libxfce4util.mo
-share/locale/fi/LC_MESSAGES/libxfce4util.mo
-share/locale/fr/LC_MESSAGES/libxfce4util.mo
-share/locale/gl/LC_MESSAGES/libxfce4util.mo
-share/locale/he/LC_MESSAGES/libxfce4util.mo
-share/locale/id/LC_MESSAGES/libxfce4util.mo
-share/locale/ja/LC_MESSAGES/libxfce4util.mo
-share/locale/ka/LC_MESSAGES/libxfce4util.mo
-share/locale/ko/LC_MESSAGES/libxfce4util.mo
-share/locale/lt/LC_MESSAGES/libxfce4util.mo
-share/locale/lv/LC_MESSAGES/libxfce4util.mo
-share/locale/mk/LC_MESSAGES/libxfce4util.mo
-share/locale/nb/LC_MESSAGES/libxfce4util.mo
-share/locale/nl/LC_MESSAGES/libxfce4util.mo
-share/locale/pl/LC_MESSAGES/libxfce4util.mo
-share/locale/pt_BR/LC_MESSAGES/libxfce4util.mo
-share/locale/pt/LC_MESSAGES/libxfce4util.mo
-share/locale/ro/LC_MESSAGES/libxfce4util.mo
-share/locale/si/LC_MESSAGES/libxfce4util.mo
-share/locale/sl/LC_MESSAGES/libxfce4util.mo
-share/locale/sq/LC_MESSAGES/libxfce4util.mo
-share/locale/sv/LC_MESSAGES/libxfce4util.mo
-share/locale/tr/LC_MESSAGES/libxfce4util.mo
-share/locale/uk/LC_MESSAGES/libxfce4util.mo
-share/locale/ur/LC_MESSAGES/libxfce4util.mo
-share/locale/zh_CN/LC_MESSAGES/libxfce4util.mo
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrm include/xfce4/libxfce4util
-@dirrmtry include/xfce4
+%%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/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/en_GB/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/et/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/he/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/id/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/libxfce4util.mo
+%%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/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/sl/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/libxfce4util.mo
+%%NLS%%share/locale/sv/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%%@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/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
-@dirrmtry share/xfce4
+@dirrm include/xfce4/libxfce4util
+@dirrmtry include/xfce4
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index be915e7c5e97..4a3ab1895100 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-clipman-plugin
PORTVERSION= 1.1.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11 xfce
MASTER_SITES= http://archive.xfce.org/src/panel-plugins/${PORTNAME}/1.1/
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-conf/Makefile b/x11/xfce4-conf/Makefile
index a8bd871f1ff6..b9028ba85533 100644
--- a/x11/xfce4-conf/Makefile
+++ b/x11/xfce4-conf/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xfce4-conf
-PORTVERSION= 4.6.1
-PORTREVISION= 4
+PORTVERSION= 4.6.2
CATEGORIES= x11 xfce
MASTER_SITES= ${MASTER_SITE_XFCE}
DISTNAME= xfconf-${PORTVERSION}
@@ -21,14 +20,18 @@ LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
USE_AUTOTOOLS= libtool:22
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_GETTEXT= yes
USE_GMAKE= yes
USE_GNOME= glib20 gnometarget gnomehack gtk20 intltool intlhack pkgconfig
USE_LDCONFIG= yes
USE_XFCE= configenv libutil
+USE_XORG= x11
+
+CONFIGURE_ARGS= --enable-gtk-doc-html=no \
+ --disable-debug
OPTIONS= GTKDOC "install the library documentation" off \
- PERL "Install Perl bindings" off
+ PERL "Install Perl bindings" off \
+ NLS "Enable Native Language Support" on
MAN3PREFIX?= ${PREFIX}/lib/perl5/${PERL_VERSION}
@@ -39,9 +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+= 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}
CONFIGURE_ARGS+=--enable-perl-bindings
PLIST_SUB+= PERLBIND=""
.else
@@ -56,6 +57,15 @@ CONFIGURE_ARGS+=--enable-gtk-doc
CONFIGURE_ARGS+=--disable-gtk-doc
.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} -e 's|--module-dir|--module=xfconf &|' \
${WRKSRC}/docs/reference/Makefile.in
diff --git a/x11/xfce4-conf/distinfo b/x11/xfce4-conf/distinfo
index 9f9fa766572e..706fe316bfc9 100644
--- a/x11/xfce4-conf/distinfo
+++ b/x11/xfce4-conf/distinfo
@@ -1,3 +1,3 @@
-MD5 (xfce4/xfconf-4.6.1.tar.bz2) = d4d3018767ea9eb4b57cc57d4038023b
-SHA256 (xfce4/xfconf-4.6.1.tar.bz2) = 22a596f73795be398382e82e9c11062423daa374339ce6db808f73a6ba19380e
-SIZE (xfce4/xfconf-4.6.1.tar.bz2) = 440499
+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
diff --git a/x11/xfce4-conf/pkg-plist b/x11/xfce4-conf/pkg-plist
index 94c442147561..abfd91b69244 100644
--- a/x11/xfce4-conf/pkg-plist
+++ b/x11/xfce4-conf/pkg-plist
@@ -4,10 +4,10 @@ include/xfce4/xfconf-0/xfconf/xfconf-channel.h
include/xfce4/xfconf-0/xfconf/xfconf-errors.h
include/xfce4/xfconf-0/xfconf/xfconf-types.h
include/xfce4/xfconf-0/xfconf/xfconf.h
-lib/libxfconf-0.so.2
-lib/libxfconf-0.so
-lib/libxfconf-0.la
lib/libxfconf-0.a
+lib/libxfconf-0.la
+lib/libxfconf-0.so
+lib/libxfconf-0.so.2
libdata/pkgconfig/libxfconf-0.pc
libexec/xfconfd
share/dbus-1/services/org.xfce.Xfconf.service
@@ -29,30 +29,37 @@ 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
-share/locale/ca/LC_MESSAGES/xfconf.mo
-share/locale/cs/LC_MESSAGES/xfconf.mo
-share/locale/da/LC_MESSAGES/xfconf.mo
-share/locale/de/LC_MESSAGES/xfconf.mo
-share/locale/es/LC_MESSAGES/xfconf.mo
-share/locale/eu/LC_MESSAGES/xfconf.mo
-share/locale/fi/LC_MESSAGES/xfconf.mo
-share/locale/fr/LC_MESSAGES/xfconf.mo
-share/locale/gl/LC_MESSAGES/xfconf.mo
-share/locale/hu/LC_MESSAGES/xfconf.mo
-share/locale/id/LC_MESSAGES/xfconf.mo
-share/locale/it/LC_MESSAGES/xfconf.mo
-share/locale/ja/LC_MESSAGES/xfconf.mo
-share/locale/nb/LC_MESSAGES/xfconf.mo
-share/locale/nl/LC_MESSAGES/xfconf.mo
-share/locale/pl/LC_MESSAGES/xfconf.mo
-share/locale/pt_BR/LC_MESSAGES/xfconf.mo
-share/locale/pt/LC_MESSAGES/xfconf.mo
-share/locale/ro/LC_MESSAGES/xfconf.mo
-share/locale/ru/LC_MESSAGES/xfconf.mo
-share/locale/sv/LC_MESSAGES/xfconf.mo
-share/locale/tr/LC_MESSAGES/xfconf.mo
-share/locale/uk/LC_MESSAGES/xfconf.mo
-share/locale/zh_CN/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/am/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/ast/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/es/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/eu/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/hu/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfconf.mo
+%%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/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/sv/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfconf.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfconf.mo
+%%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
@@ -66,6 +73,68 @@ share/locale/zh_CN/LC_MESSAGES/xfconf.mo
%%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%%@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/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
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index 2e55d7e06ee5..9d8462ad97b7 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-quicklauncher-plugin
PORTVERSION= 1.9.4
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= x11 xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile
index 5e835b4ebbf7..e087557330b1 100644
--- a/x11/xfce4-screenshooter-plugin/Makefile
+++ b/x11/xfce4-screenshooter-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-screenshooter-plugin
PORTVERSION= 1.6.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11 xfce
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-screenshooter/
DISTNAME= xfce4-screenshooter-${PORTVERSION}
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 17fbe3da604a..0d8b61630db8 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-taskmanager
PORTVERSION= 0.4.0.r2
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= x11 xfce
MASTER_SITES= http://freebsd.unixfreunde.de/sources/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/}
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index d4ce45d5f9a9..de70661000a7 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= verve-plugin
PORTVERSION= 0.3.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11 xfce
MASTER_SITES= http://goodies.xfce.org/releases/xfce4-verve-plugin/
PKGNAMEPREFIX= xfce4-
diff --git a/x11/xfce4-wmdock-plugin/Makefile b/x11/xfce4-wmdock-plugin/Makefile
index cd43ca421542..a6b3dee5acc9 100644
--- a/x11/xfce4-wmdock-plugin/Makefile
+++ b/x11/xfce4-wmdock-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-wmdock-plugin
PORTVERSION= 0.3.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= x11 xfce
MASTER_SITES= http://www.ibh.de/~ellguth/develop/
diff --git a/x11/xfce4-xfapplet-plugin/Makefile b/x11/xfce4-xfapplet-plugin/Makefile
index 762d0bdb7a40..ef5c7c1ea2dc 100644
--- a/x11/xfce4-xfapplet-plugin/Makefile
+++ b/x11/xfce4-xfapplet-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-xfapplet-plugin
PORTVERSION= 0.1.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= x11 xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4