- Update to 1.6.3

- Finish to convert USES
- Remove unneeded patch

5 files changed, 19 insertions, 24 deletions

diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 84263fb2b074..139d2b114925 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Thunar
-PORTVERSION=	1.6.2
-PORTREVISION=	3
+PORTVERSION=	1.6.3
 CATEGORIES=	x11-fm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME:L}/${PORTVERSION:R}
@@ -19,11 +18,11 @@ INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
-USE_GNOME=	desktopfileutils gnomehack gtk20 intltool intlhack gdkpixbuf2
+USE_GNOME=	gtk20 intltool intlhack gdkpixbuf2
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libexo libmenu libutil
 USE_XORG=	sm x11
-USES=		pkgconfig
+USES=		desktop-file-utils pathfix pkgconfig
 
 OPTIONS_DEFINE=	DBUS DOCS GVFS NLS NOTIFY STARTUP
 OPTIONS_GROUP=	PLUGINS
@@ -39,8 +38,7 @@ PLUG_TPA_DESC=	Trash Panel Applet plugin
 PLUG_UCA_DESC=	User Customizable Actions plugin
 PLUG_WALL_DESC=	Wallpaper plugin
 
-CONFIGURE_ARGS+=	--disable-gtk-doc-html \
-		--enable-gio-unix \
+CONFIGURE_ARGS+=--enable-gio-unix \
 		--disable-gudev
 
 MAN1=		Thunar.1
@@ -134,7 +132,4 @@ CONFIGURE_ARGS+=--disable-startup-notification
 USE_GNOME+=gvfs
 .endif
 
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>
diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo
index a2ceb26c22bc..27d1d2aed4ba 100644
--- a/x11-fm/thunar/distinfo
+++ b/x11-fm/thunar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/Thunar-1.6.2.tar.bz2) = 7dbd172ae396e7a2533f47dc1ff703a9ea1a61af3edfdc6f4877b9b9331abd85
-SIZE (xfce4/Thunar-1.6.2.tar.bz2) = 1953026
+SHA256 (xfce4/Thunar-1.6.3.tar.bz2) = 9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d
+SIZE (xfce4/Thunar-1.6.3.tar.bz2) = 1983127
diff --git a/x11-fm/thunar/files/patch-configure b/x11-fm/thunar/files/patch-configure
new file mode 100644
index 000000000000..224f97122c14
--- /dev/null
+++ b/x11-fm/thunar/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./configure.orig	2013-05-05 16:37:29.000000000 +0000
++++ ./configure	2013-05-05 22:49:56.000000000 +0000
+@@ -13934,7 +13934,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++#     USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no
diff --git a/x11-fm/thunar/files/patch-plugins__thunar-uca__uca.xml.in b/x11-fm/thunar/files/patch-plugins__thunar-uca__uca.xml.in
deleted file mode 100644
index 8b906984b9d0..000000000000
--- a/x11-fm/thunar/files/patch-plugins__thunar-uca__uca.xml.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./plugins/thunar-uca/uca.xml.in.orig	2012-12-27 12:27:54.000000000 +0000
-+++ ./plugins/thunar-uca/uca.xml.in	2013-01-03 20:31:59.000000000 +0000
-@@ -36,7 +36,7 @@
- <actions>
- 
-   <action>
--    <icon>Terminal</icon>
-+    <icon>utilities-terminal</icon>
-     <patterns>*</patterns>
-     <_name>Open Terminal Here</_name>
-     <command>exo-open --working-directory %f --launch TerminalEmulator</command>
diff --git a/x11-fm/thunar/pkg-plist b/x11-fm/thunar/pkg-plist
index 2e6158c7321d..8a2aee6eb624 100644
--- a/x11-fm/thunar/pkg-plist
+++ b/x11-fm/thunar/pkg-plist
@@ -84,6 +84,7 @@ share/icons/hicolor/scalable/apps/Thunar.svg
 %%NLS%%share/locale/ar/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/be/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/Thunar.mo
@@ -120,6 +121,7 @@ share/icons/hicolor/scalable/apps/Thunar.svg
 %%NLS%%share/locale/ru/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/si/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/Thunar.mo
@@ -137,8 +139,6 @@ share/pixmaps/Thunar/Thunar-about-logo.png
 %%PLUGIN_TPA%%@dirrmtry share/xfce4/panel-plugins
 %%PLUGIN_TPA%%@dirrmtry share/xfce4
 @dirrm share/pixmaps/Thunar
-@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
 %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ur_PK
 %%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES