- Support STAGEDIR

While I'm here
- Switch to USES= gmake
- Convert to new LIB_DEPENDS format

- Enhance COMMENT entry (misc/xfce4-wm-themes)
- Adjust Xfce dependencies, and bump PORTREVISION
(sysutils/xfce4-power-manager)

3 files changed, 14 insertions, 54 deletions

diff --git a/sysutils/xfce4-power-manager/Makefile b/sysutils/xfce4-power-manager/Makefile
index d531b4cf3d06..a69790ea70cc 100644
--- a/sysutils/xfce4-power-manager/Makefile
+++ b/sysutils/xfce4-power-manager/Makefile
@@ -3,33 +3,29 @@
 
 PORTNAME=	xfce4-power-manager
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
-COMMENT=	Xfce4 power manager
+COMMENT=	Power manager for the Xfce Desktop
 
-LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify \
+	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+	libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USES=		gettext pkgconfig
-USE_GMAKE=	yes
-USE_GNOME=	gtk20 intltool intlhack
-USE_XFCE=	configenv libutil libgui panel
+USES=		gettext pkgconfig gmake
+USE_GNOME=	glib20 gtk20 intltool intlhack
+USE_XFCE=	configenv libutil libmenu panel xfconf
 INSTALLS_ICONS=	yes
+USE_XORG=	xrandr x11 xext
 CONFIGURE_ARGS=	--disable-network-manager \
 		--enable-polkit
 
-MAN1=		xfce4-power-manager.1 xfce4-power-manager-settings.1
-
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e 's|--libs "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g; \
-		s|--cflags "libxfce4panel-1.0"|& "libxfcegui4-1.0"|g' \
-		${WRKSRC}/configure
+NO_MTREE=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfce4-power-manager/pkg-descr b/sysutils/xfce4-power-manager/pkg-descr
index 5a2152d9eb29..3509e9511222 100644
--- a/sysutils/xfce4-power-manager/pkg-descr
+++ b/sysutils/xfce4-power-manager/pkg-descr
@@ -1,3 +1,4 @@
-Written by Ali Abdallah, this is a power manager for the Xfce desktop.
+Xfce power manager manages the power sources on the computer and the
+devices that can be controlled to reduce their power consumption.
 
 WWW: http://goodies.xfce.org/projects/applications/xfce4-power-manager
diff --git a/sysutils/xfce4-power-manager/pkg-plist b/sysutils/xfce4-power-manager/pkg-plist
index 561f7953eb72..d966c1c2da80 100644
--- a/sysutils/xfce4-power-manager/pkg-plist
+++ b/sysutils/xfce4-power-manager/pkg-plist
@@ -3,6 +3,8 @@ bin/xfce4-power-manager
 bin/xfce4-power-manager-settings
 etc/xdg/autostart/xfce4-power-manager.desktop
 lib/xfce4/panel-plugins/xfce4-brightness-plugin
+man/man1/xfce4-power-manager.1.gz
+man/man1/xfce4-power-manager-settings.1.gz
 sbin/xfpm-power-backlight-helper
 share/applications/xfce4-power-manager-settings.desktop
 share/icons/hicolor/128x128/devices/processor.png
@@ -289,8 +291,6 @@ share/xfce4/panel-plugins/xfce4-brightness-plugin.desktop
 @dirrmtry share/xfce4
 @dirrmtry share/polkit-1/actions
 @dirrmtry share/polkit-1
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/ur_PK/LC_MESSAGES
 @dirrmtry share/locale/ur_PK
 @dirrmtry share/locale/ur/LC_MESSAGES
@@ -301,47 +301,10 @@ share/xfce4/panel-plugins/xfce4-brightness-plugin.desktop
 @dirrmtry share/locale/te
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/nn/LC_MESSAGES
-@dirrmtry share/locale/nn
-@dirrmtry share/locale/lt/LC_MESSAGES
-@dirrmtry share/locale/lt
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
-@dirrmtry share/locale/is/LC_MESSAGES
-@dirrmtry share/locale/is
-@dirrmtry share/locale/hr/LC_MESSAGES
-@dirrmtry share/locale/hr
-@dirrmtry share/locale/bg/LC_MESSAGES
-@dirrmtry share/locale/bg
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
-@dirrmtry share/locale/ar/LC_MESSAGES
-@dirrmtry share/locale/ar
-@dirrmtry share/icons/hicolor/scalable/status
-@dirrmtry share/icons/hicolor/scalable/actions
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/48x48/status
-@dirrmtry share/icons/hicolor/48x48/actions
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/24x24/status
-@dirrmtry share/icons/hicolor/24x24/actions
-@dirrmtry share/icons/hicolor/24x24
-@dirrmtry share/icons/hicolor/22x22/status
-@dirrmtry share/icons/hicolor/22x22/actions
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/status
-@dirrmtry share/icons/hicolor/16x16/actions
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/devices
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
 @dirrmtry share/applications
 @dirrmtry lib/xfce4/panel-plugins
 @dirrmtry lib/xfce4