- Update to 4.10.1

- Finish to convert USES
- Remove desktopfileutils, because MimeType entry is not present in desktop
file

5 files changed, 22 insertions, 23 deletions

diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile
index e926a84e5b2d..4cf6c56720a9 100644
--- a/sysutils/xfce4-settings/Makefile
+++ b/sysutils/xfce4-settings/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-settings
-PORTVERSION=	4.10.0
-PORTREVISION=	5
+PORTVERSION=	4.10.1
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
@@ -18,10 +18,10 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack glib20 gtk20 desktopfileutils intltool intlhack
+USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_XFCE=	configenv garcon libexo libmenu libutil xfconf
 USE_XORG=	inputproto x11 xi
-USEs=		pkgconfig
+USES=		pathfix pkgconfig
 
 CONFIGURE_ARGS=	--enable-pluggable-dialogs \
 		--enable-gio-unix
@@ -89,7 +89,4 @@ 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.mk>
diff --git a/sysutils/xfce4-settings/distinfo b/sysutils/xfce4-settings/distinfo
index b775850c3a3b..42a667dc06d4 100644
--- a/sysutils/xfce4-settings/distinfo
+++ b/sysutils/xfce4-settings/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-settings-4.10.0.tar.bz2) = 0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e
-SIZE (xfce4/xfce4-settings-4.10.0.tar.bz2) = 782922
+SHA256 (xfce4/xfce4-settings-4.10.1.tar.bz2) = 118a6959ea50e3a533d7aa18ec5a878a47a30608b3ce9ce59a93c3888f4e13d5
+SIZE (xfce4/xfce4-settings-4.10.1.tar.bz2) = 777735
diff --git a/sysutils/xfce4-settings/files/patch-configure b/sysutils/xfce4-settings/files/patch-configure
new file mode 100644
index 000000000000..7331e34f9531
--- /dev/null
+++ b/sysutils/xfce4-settings/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./configure.orig	2013-05-05 16:12:59.000000000 +0000
++++ ./configure	2013-05-05 23:07:53.000000000 +0000
+@@ -13286,7 +13286,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++#     USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no
diff --git a/sysutils/xfce4-settings/files/patch-dialogs__appearance-settings__appearance-install-theme b/sysutils/xfce4-settings/files/patch-dialogs__appearance-settings__appearance-install-theme
index d8c00198ff7a..fd49b7fd7f10 100644
--- a/sysutils/xfce4-settings/files/patch-dialogs__appearance-settings__appearance-install-theme
+++ b/sysutils/xfce4-settings/files/patch-dialogs__appearance-settings__appearance-install-theme
@@ -1,5 +1,5 @@
---- ./dialogs/appearance-settings/appearance-install-theme.orig	2012-04-28 20:48:30.000000000 +0000
-+++ ./dialogs/appearance-settings/appearance-install-theme	2013-02-18 21:08:13.000000000 +0000
+--- ./dialogs/appearance-settings/appearance-install-theme.orig	2013-05-05 16:12:54.000000000 +0000
++++ ./dialogs/appearance-settings/appearance-install-theme	2013-05-05 23:09:09.000000000 +0000
 @@ -89,7 +89,11 @@
  
  # check file size, abort if bigger then 50Mb, only works for files
@@ -13,12 +13,3 @@
      if test "$dndsize" -gt 52428800; then
          # 2: File too big
          exit 2
-@@ -140,7 +144,7 @@
-     detectthemes "gtk-2.0/gtkrc"
- 
-     # install gtk-3.0 themes
--    detectthemes "gtk-3.0/gtkrc"
-+    detectthemes "gtk-3.0/gtk.css"
- 
-     # install xfwm4 themes
-     detectthemes "xfwm4/themerc"
diff --git a/sysutils/xfce4-settings/pkg-plist b/sysutils/xfce4-settings/pkg-plist
index 86f6d81fef19..f7698c3733ea 100644
--- a/sysutils/xfce4-settings/pkg-plist
+++ b/sysutils/xfce4-settings/pkg-plist
@@ -11,7 +11,7 @@ etc/xdg/autostart/xfsettingsd.desktop
 etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
 etc/xdg/menus/xfce-settings-manager.menu
 lib/xfce4/settings/appearance-install-theme
-%%XRANDR%%%%NLS%%share/applications/xfce-display-settings.desktop
+%%XRANDR%%share/applications/xfce-display-settings.desktop
 share/applications/xfce-keyboard-settings.desktop
 share/applications/xfce4-mime-settings.desktop
 share/applications/xfce-mouse-settings.desktop
@@ -21,6 +21,7 @@ share/applications/xfce4-accessibility-settings.desktop
 share/applications/xfce4-settings-editor.desktop
 %%NLS%%share/locale/ar/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/bn/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/xfce4-settings.mo
@@ -55,6 +56,7 @@ share/applications/xfce4-settings-editor.desktop
 %%NLS%%share/locale/ru/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/si/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/xfce4-settings.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/te/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/xfce4-settings.mo
@@ -64,8 +66,6 @@ share/applications/xfce4-settings-editor.desktop
 %%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-settings.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-settings.mo
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ur_PK
 %%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES