7 files changed, 17 insertions, 153 deletions

diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 06ed7950d5fb..3d6e4972d0b9 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Thunar
-PORTVERSION=	1.6.3
-PORTREVISION=	4
+PORTVERSION=	1.6.4
 CATEGORIES=	x11-fm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME:tl}/${PORTVERSION:R}
@@ -18,20 +17,21 @@ LICENSE_FILE=	${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libtumbler-1.so:${PORTSDIR}/deskutils/xfce4-tumbler \
 	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+RUN_DEPENDS=	pkexec:${PORTSDIR}/sysutils/polkit
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gtk20 intltool intlhack gdkpixbuf2
 USE_LDCONFIG=	yes
-USE_XFCE=	configenv libexo libmenu libutil
+USE_XFCE=	configenv libexo libmenu libutil xfconf
 USE_XORG=	sm x11
 USES=		desktop-file-utils gmake pathfix perl5 libtool pkgconfig \
 	tar:bzip2
 
-OPTIONS_DEFINE=	DOCS GVFS NLS NOTIFY STARTUP
+OPTIONS_DEFINE=	GVFS NLS NOTIFY STARTUP
 OPTIONS_GROUP=	PLUGINS
 OPTIONS_GROUP_PLUGINS=	PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL
-OPTIONS_DEFAULT=	GVFS NOTIFY PLUG_APR PLUG_SBR PLUG_UCA PLUG_WALL STARTUP
+OPTIONS_DEFAULT=	GVFS NOTIFY PLUG_APR PLUG_SBR PLUG_UCA PLUG_TPA STARTUP
 
 # Override NOTIFY_DESC
 NOTIFY_DESC=	Display notifications
@@ -44,7 +44,8 @@ PLUG_WALL_DESC=	Wallpaper plugin
 
 CONFIGURE_ARGS+=--enable-gio-unix \
 		--disable-gudev \
-		--enable-dbus
+		--enable-dbus \
+		--without-html-dir
 
 .include <bsd.port.options.mk>
 
@@ -64,14 +65,6 @@ CONFIGURE_ARGS+=--enable-notifications
 CONFIGURE_ARGS+=--disable-notifications
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	APIDOCS=""
-.else
-CONFIGURE_ARGS+=	--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MPLUG_APR}
 LIB_DEPENDS+=	libexif.so:${PORTSDIR}/graphics/libexif
 CONFIGURE_ARGS+=--enable-apr-plugin --enable-exif
diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo
index 27d1d2aed4ba..59711573ab06 100644
--- a/x11-fm/thunar/distinfo
+++ b/x11-fm/thunar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/Thunar-1.6.3.tar.bz2) = 9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d
-SIZE (xfce4/Thunar-1.6.3.tar.bz2) = 1983127
+SHA256 (xfce4/Thunar-1.6.4.tar.bz2) = 40efc74349313c20cef2047842a06ad8dfc8522ed792a087e9fb4618ad309dae
+SIZE (xfce4/Thunar-1.6.4.tar.bz2) = 2064286
diff --git a/x11-fm/thunar/files/patch-thunar__thunar-gio-extensions.c b/x11-fm/thunar/files/patch-thunar__thunar-gio-extensions.c
deleted file mode 100644
index 23ac7e1ccbdd..000000000000
--- a/x11-fm/thunar/files/patch-thunar__thunar-gio-extensions.c
+++ /dev/null
@@ -1,13 +0,0 @@
-Add support for the GTK3 bookmarks file (bug #10627)
-
---- ./thunar/thunar-gio-extensions.c.orig	2013-05-05 16:37:23.000000000 +0000
-+++ ./thunar/thunar-gio-extensions.c	2014-07-26 15:25:12.000000000 +0000
-@@ -77,7 +77,7 @@
-   gchar *filename;
-   GFile *bookmarks;
- 
--  filename = g_build_filename (xfce_get_homedir (), ".gtk-bookmarks", NULL);
-+  filename = g_build_filename (g_get_user_config_dir (), "gtk-3.0", "bookmarks", NULL);
-   bookmarks = g_file_new_for_path (filename);
-   g_free (filename);
- 
diff --git a/x11-fm/thunar/files/patch-thunar__thunar-shortcuts-model.c b/x11-fm/thunar/files/patch-thunar__thunar-shortcuts-model.c
deleted file mode 100644
index d53146d759ae..000000000000
--- a/x11-fm/thunar/files/patch-thunar__thunar-shortcuts-model.c
+++ /dev/null
@@ -1,35 +0,0 @@
-Add support for the GTK3 bookmarks file (bug #10627)
-
---- ./thunar/thunar-shortcuts-model.c.orig	2013-05-05 16:37:23.000000000 +0000
-+++ ./thunar/thunar-shortcuts-model.c	2014-07-26 15:25:27.000000000 +0000
-@@ -1364,6 +1364,7 @@
-   gchar          *uri;
-   GList          *lp;
-   GError         *err = NULL;
-+  GFile          *parent = NULL;
- 
-   _thunar_return_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model));
- 
-@@ -1389,6 +1390,22 @@
-         }
-     }
- 
-+  /* create folder if it does not exist */
-+  parent = g_file_get_parent (model->bookmarks_file);
-+  if (!g_file_make_directory_with_parents (parent, NULL, &err))
-+    {
-+       if (g_error_matches (err, G_IO_ERROR, G_IO_ERROR_EXISTS))
-+         {
-+           g_clear_error (&err);
-+         }
-+       else
-+         {
-+           g_warning ("Failed to create bookmarks folder: %s", err->message);
-+           g_error_free (err);
-+         }
-+    }
-+  g_clear_object (&parent);
-+
-   /* write data to the disk */
-   bookmarks_path = g_file_get_path (model->bookmarks_file);
-   if (!g_file_set_contents (bookmarks_path, contents->str, contents->len, &err))
diff --git a/x11-fm/thunar/files/patch-thunar__thunar-util.c b/x11-fm/thunar/files/patch-thunar__thunar-util.c
deleted file mode 100644
index 52390df509da..000000000000
--- a/x11-fm/thunar/files/patch-thunar__thunar-util.c
+++ /dev/null
@@ -1,28 +0,0 @@
-Add support for the GTK3 bookmarks file (bug #10627)
-
---- ./thunar/thunar-util.c.orig	2013-05-05 16:37:23.000000000 +0000
-+++ ./thunar/thunar-util.c	2014-07-26 15:25:35.000000000 +0000
-@@ -84,6 +84,15 @@
- 
-   /* append the GTK+ bookmarks (if any) */
-   fp = fopen (bookmarks_path, "r");
-+  g_free (bookmarks_path);
-+
-+  if (G_UNLIKELY (fp == NULL))
-+    {
-+      bookmarks_path = g_build_filename (g_get_home_dir (), ".gtk-bookmarks", NULL);
-+      fp = fopen(bookmarks_path, "r");
-+      g_free(bookmarks_path);
-+    }
-+
-   if (G_LIKELY (fp != NULL))
-     {
-       while (fgets (line, sizeof (line), fp) != NULL)
-@@ -119,7 +128,6 @@
-       fclose (fp);
-     }
- 
--  g_free (bookmarks_path);
- }
- 
- 
diff --git a/x11-fm/thunar/pkg-descr b/x11-fm/thunar/pkg-descr
index ecfbfef9d107..5682c8b7e886 100644
--- a/x11-fm/thunar/pkg-descr
+++ b/x11-fm/thunar/pkg-descr
@@ -1,3 +1,3 @@
 Thunar is a new modern file manager for the Xfce Desktop Environment.
 
-WWW: http://docs.xfce.org/xfce/thunar/start
+WWW: http://thunar.xfce.org/
diff --git a/x11-fm/thunar/pkg-plist b/x11-fm/thunar/pkg-plist
index 00e25022456f..5650b1ea1752 100644
--- a/x11-fm/thunar/pkg-plist
+++ b/x11-fm/thunar/pkg-plist
@@ -26,6 +26,7 @@ lib/libthunarx-2.so.0.0.0
 libdata/pkgconfig/thunarx-2.pc
 man/man1/Thunar.1.gz
 share/Thunar/sendto/thunar-sendto-email.desktop
+share/appdata/thunar.appdata.xml
 share/applications/Thunar-bulk-rename.desktop
 share/applications/Thunar-folder-handler.desktop
 share/applications/Thunar.desktop
@@ -33,38 +34,6 @@ share/applications/thunar-settings.desktop
 share/dbus-1/services/org.xfce.FileManager.service
 share/dbus-1/services/org.xfce.Thunar.service
 %%DOCSDIR%%/README.gtkrc
-%%DOCSDIR%%/README.thunarrc
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxFileInfo.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxMenuProvider.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxPreferencesProvider.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxPropertyPage.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxPropertyPageProvider.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxProviderFactory.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxProviderPlugin.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxRenamer.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxRenamerProvider.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/abstraction.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/bulk-rename.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/home.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/index.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/index.sgml
-%%APIDOCS%%share/gtk-doc/html/thunarx/ix01.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/left.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/menu-provider.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/right.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/say-hello.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/style.css
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-Variables-and-functions-to-check-the-library-version.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-abstraction-layer.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-fundamentals.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-overview.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-providers.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-using-extensions.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-writing-extensions-advanced-topics.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-writing-extensions-getting-started.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-writing-extensions.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx.devhelp2
-%%APIDOCS%%share/gtk-doc/html/thunarx/up.png
 share/icons/hicolor/16x16/apps/Thunar.png
 share/icons/hicolor/16x16/stock/navigation/stock_folder-copy.png
 share/icons/hicolor/16x16/stock/navigation/stock_folder-move.png
@@ -77,6 +46,7 @@ share/icons/hicolor/64x64/apps/Thunar.png
 share/icons/hicolor/128x128/apps/Thunar.png
 share/icons/hicolor/scalable/apps/Thunar.svg
 %%NLS%%share/locale/am/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/be/LC_MESSAGES/Thunar.mo
@@ -106,9 +76,11 @@ share/icons/hicolor/scalable/apps/Thunar.svg
 %%NLS%%share/locale/ko/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/Thunar.mo
@@ -122,6 +94,7 @@ share/icons/hicolor/scalable/apps/Thunar.svg
 %%NLS%%share/locale/sr/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/te/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/th/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/ug/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/Thunar.mo
@@ -129,34 +102,8 @@ share/icons/hicolor/scalable/apps/Thunar.svg
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/Thunar.mo
+%%NLS%%share/locale/zh_HK/LC_MESSAGES/Thunar.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/Thunar.mo
 share/pixmaps/Thunar/Thunar-about-logo.png
+share/polkit-1/actions/org.xfce.thunar.policy
 %%PLUGIN_TPA%%share/xfce4/panel-plugins/thunar-tpa.desktop
-%%PLUGIN_TPA%%@dirrmtry share/xfce4/panel-plugins
-%%PLUGIN_TPA%%@dirrmtry share/xfce4
-@dirrm share/pixmaps/Thunar
-%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur_PK
-%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur
-%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/te/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/te
-%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/si
-%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ast
-%%APIDOCS%%@dirrm share/gtk-doc/html/thunarx
-%%APIDOCS%%@dirrmtry share/gtk-doc/html
-%%APIDOCS%%@dirrmtry share/gtk-doc
-@dirrm %%DOCSDIR%%
-@dirrm share/Thunar/sendto
-@dirrm share/Thunar
-@dirrmtry lib/thunarx-2
-@dirrm lib/Thunar
-@dirrm include/thunarx-2/thunarx
-@dirrm include/thunarx-2
-%%PLUGIN_UCA%%@dirrm etc/xdg/Thunar