- Bump PORTREVISION after update of x11/libxfce4util, and x11-wm/xfce4-panel

While I'm here,
- Finish to convert USES
- Trim Makefile header
- Remove ABI version in LIB_DEPENDS
- Remove desktopfileutils, because MimeType entry is not present in desktop file

5 files changed, 12 insertions, 25 deletions

diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index 0d4ce5f8c554..833d4532616e 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -3,24 +3,24 @@
 
 PORTNAME=	xfce4-mixer
 PORTVERSION=	4.10.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	A volume control for the Xfce desktop
+COMMENT=	Volume control for the Xfce desktop
 
 LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 	unique-1:${PORTSDIR}/x11-toolkits/unique
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS= yes
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext pathfix
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack glib20 gtk20 intltool intlhack desktopfileutils
+USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu libutil panel xfconf
 USE_GSTREAMER=	good
 
@@ -47,7 +47,4 @@ post-patch:
 		's|(pkgdatadir)/icons|(datadir)/icons| ; \
 		s|pixmaps/xfce4-mixer|pixmaps|'
 
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>
diff --git a/audio/xfce4-mixer/pkg-plist b/audio/xfce4-mixer/pkg-plist
index 5a4065286949..553ee7c56096 100644
--- a/audio/xfce4-mixer/pkg-plist
+++ b/audio/xfce4-mixer/pkg-plist
@@ -69,5 +69,3 @@ share/xfce4/panel/plugins/mixer.desktop
 @dirrmtry share/locale/ast
 @dirrmtry lib/xfce4/panel/plugins
 @dirrmtry lib/xfce4/panel
-@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile
index 83d8edc1a5f4..28f651c90cc9 100644
--- a/audio/xfce4-mpc-plugin/Makefile
+++ b/audio/xfce4-mpc-plugin/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	xfce4-mpc-plugin
 PORTVERSION=	0.4.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	An MPC plugin for Xfce
+COMMENT=	MPC plugin for Xfce
 
 LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd
 
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index aa2ca4c0bc77..1b1408cb0ba3 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -1,35 +1,29 @@
-# New ports collection makefile for:	xfmpc
-# Date created:				21 Jan 2008
-# Whom:					Martin Wilke (miwi@FreeBSD.org)
-#
+# Created by: Martin Wilke (miwi@FreeBSD.org)
 # $FreeBSD$
 #
 
 PORTNAME=	xfmpc
 PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=/src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	A graphical MPD client focusing on low footprint
+COMMENT=	Graphical MPD client focusing on low footprint
 
-LIB_DEPENDS=	mpd.4:${PORTSDIR}/audio/libmpd
+LIB_DEPENDS=	mpd:${PORTSDIR}/audio/libmpd
 
 MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
-USES=		gettext
+USES=		gettext pkgconfig
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20 intltool intlhack pkgconfig desktopfileutils
+USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu libutil
 
 MAN1=	xfmpc.1
 
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>
diff --git a/audio/xfmpc/pkg-plist b/audio/xfmpc/pkg-plist
index 8a5b537b1a45..ee4f3431b218 100644
--- a/audio/xfmpc/pkg-plist
+++ b/audio/xfmpc/pkg-plist
@@ -43,5 +43,3 @@ share/locale/zh_TW/LC_MESSAGES/xfmpc.mo
 @dirrmtry share/locale/si
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
-@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true