- Update to 4.10.1

- Trim Makefile header
- Add new option, NLS
- Finish to convert USES
- Remove ABI version in LIB_DEPENDS

4 files changed, 118 insertions, 100 deletions

diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index 4e7c945ec2ae..0d21299f9bd0 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -1,30 +1,37 @@
-# New ports collection makefile for:	xfce4-appfinder
-# Date created:				12 October 2004
-# Whom:					Oliver Lehmann <oliver@FreeBSD.org>
-#
+# Created by: Oliver Lehmann <oliver@FreeBSD.org>
 # $FreeBSD$
 #
 
 PORTNAME=	xfce4-appfinder
-PORTVERSION=	4.10.0
-PORTREVISION=	1
+PORTVERSION=	4.10.1
 CATEGORIES=	misc xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
+MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Application launcher and finder
 
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USES=		gettext
+USES=		pathfix pkgconfig
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 glib20 intltool intlhack pkgconfig desktopfileutils
+USE_GNOME=	gtk20 glib20 intltool intlhack
 USE_XFCE=	configenv garcon libmenu libutil xfconf
 
-post-install:
-	@-update-desktop-database
+OPTIONS_DEFINE=	NLS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USES+=	gettext
+CONFIGURE_ARGS+=--enable-nls
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
 
 .include <bsd.port.mk>
diff --git a/misc/xfce4-appfinder/distinfo b/misc/xfce4-appfinder/distinfo
index c20aaf933470..3641dc181a95 100644
--- a/misc/xfce4-appfinder/distinfo
+++ b/misc/xfce4-appfinder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfce4-appfinder-4.10.0.tar.bz2) = 042aae7e366428a6a92b6353b3f2727d64823076a7752b8e0a15f1f8f3645439
-SIZE (xfce4/xfce4-appfinder-4.10.0.tar.bz2) = 429196
+SHA256 (xfce4/xfce4-appfinder-4.10.1.tar.bz2) = 65ee74ffa76334d273e4c9ae501ec7f81f7de028813849f7d1441cbf7788eb77
+SIZE (xfce4/xfce4-appfinder-4.10.1.tar.bz2) = 446043
diff --git a/misc/xfce4-appfinder/files/patch-configure b/misc/xfce4-appfinder/files/patch-configure
new file mode 100644
index 000000000000..631adba6e08a
--- /dev/null
+++ b/misc/xfce4-appfinder/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./configure.orig	2013-05-05 14:56:24.000000000 +0000
++++ ./configure	2013-05-06 19:40:20.000000000 +0000
+@@ -13282,7 +13282,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++#     USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no
diff --git a/misc/xfce4-appfinder/pkg-plist b/misc/xfce4-appfinder/pkg-plist
index 132fce9f857f..f21e95913ca2 100644
--- a/misc/xfce4-appfinder/pkg-plist
+++ b/misc/xfce4-appfinder/pkg-plist
@@ -2,91 +2,91 @@ bin/xfce4-appfinder
 bin/xfrun4
 share/applications/xfce4-appfinder.desktop
 share/applications/xfce4-run.desktop
-share/locale/am/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ar/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ast/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/be/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/bn/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/bn_IN/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ca/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/cs/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/da/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/de/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/dz/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/el/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/en_GB/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/eo/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/es/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/es_MX/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/et/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/eu/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/fa/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/fi/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/fr/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/gl/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/gu/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/he/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/hr/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/hu/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/hy/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/id/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/is/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/it/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ja/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ka/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/kk/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ko/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ku/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/lt/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/lv/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/mk/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/mr/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/nb/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/nl/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/nn/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/pa/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/pl/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/pt/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/pt_BR/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ro/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ru/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/si/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/sk/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/sq/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/sv/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/te/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/tr/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ug/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/uk/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ur/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/ur_PK/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/vi/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/zh_CN/LC_MESSAGES/xfce4-appfinder.mo
-share/locale/zh_TW/LC_MESSAGES/xfce4-appfinder.mo
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/ug/LC_MESSAGES
-@dirrmtry share/locale/ug
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
+%%NLS%%share/locale/am/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/be/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/bn/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/bn_IN/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/dz/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/es_MX/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/gu/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/hy/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/ka/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/ku/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/mk/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/te/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-appfinder.mo
+%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+%%NLS%%@dirrmtry share/locale/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/mr/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/mr
+%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ku
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/hy/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/hy
+%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/dz
+%%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/bn_IN
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
 @dirrmtry share/applications
-@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true