- Support STAGEDIR

- Switch to USES= gmake (xfce4-desktop, xfce4-wm)
- Convert to new LIB_DEPENDS format (xfce4-desktop, xfce4-panel,
xfce4-wm)

6 files changed, 15 insertions, 32 deletions

diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index efc21c228b26..5eea078b8feb 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -13,17 +13,16 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce's desktop manager
 
-LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		wnck-1:${PORTSDIR}/x11-toolkits/libwnck \
-		notify:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \
+		libnotify.so:${PORTSDIR}/devel/libnotify
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	glib20 gtk20 intltool intlhack desktopfileutils
+USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_XFCE=	configenv garcon libmenu libutil libexo xfconf
-USES=	pathfix pkgconfig
+USES=	pathfix pkgconfig gmake
 USE_XORG=	x11 sm
 
 CONFIGURE_ARGS+=--enable-gio-unix \
@@ -33,9 +32,6 @@ OPTIONS_DEFINE=		THUNAR NLS
 OPTIONS_DEFAULT=	THUNAR NLS
 THUNAR_DESC=	Enable thunar support
 
-MAN1=		xfdesktop.1
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTHUNAR}
@@ -59,7 +55,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|po ||' ${WRKSRC}/Makefile.in
 .endif
 
-post-install:
-	@-update-desktop-database
-
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index c7ab14f9be61..b7df3646a198 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -1,5 +1,6 @@
 bin/xfdesktop
 bin/xfdesktop-settings
+man/man1/xfdesktop.1.gz
 share/applications/xfce-backdrop-settings.desktop
 share/backgrounds/xfce/xfce-blue.jpg
 share/icons/hicolor/32x32/apps/xfce4-backdrop.png
@@ -80,8 +81,6 @@ share/pixmaps/xfce4_xicon2.png
 share/pixmaps/xfce4_xicon3.png
 share/pixmaps/xfce4_xicon4.png
 share/pixmaps/xfdesktop/xfdesktop-fallback-icon.png
-@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
 @dirrm share/pixmaps/xfdesktop
 %%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ur_PK
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index d5c20208b4ef..ccb7506f95e3 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -11,9 +11,9 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce's panel
 
-LIB_DEPENDS=	wnck-1:${PORTSDIR}/x11-toolkits/libwnck \
-		cairo:${PORTSDIR}/graphics/cairo \
-		dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \
+		libcairo.so:${PORTSDIR}/graphics/cairo \
+		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
 USES=	desktop-file-utils gmake pathfix perl5 pkgconfig
 GNU_CONFIGURE=	yes
@@ -28,7 +28,6 @@ CONFIGURE_ARGS+=--enable-gio-unix
 
 OPTIONS_DEFINE=		NLS DOCS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index d484bab231e2..4d4f421a618c 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -39,11 +39,8 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 OPTIONS_DEFINE=	NLS
 
-MAN1=		xfce4-session.1 xfce4-session-logout.1
-
 PLIST_SUB=	VERSION="4.6"
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -55,9 +52,4 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-install:
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index 89f73092fbe6..a0e1717d6a79 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -26,6 +26,8 @@ lib/xfce4/session/splash-engines/libsimple.la
 lib/xfce4/session/splash-engines/libsimple.so
 lib/xfce4/session/xfsm-shutdown-helper
 libdata/pkgconfig/xfce4-session-2.0.pc
+man/man1/xfce4-session-logout.1.gz
+man/man1/xfce4-session.1.gz
 share/applications/xfce-session-settings.desktop
 share/applications/xfce4-session-logout.desktop
 share/xsessions/xfce.desktop
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 3afff0a40448..201f986f35a3 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -12,8 +12,8 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce's window manager
 
-LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
-		wnck-1:${PORTSDIR}/x11-toolkits/libwnck
+LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
+		libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck
 
 CONFIGURE_ARGS=	--enable-xsync \
 		--enable-render \
@@ -22,8 +22,7 @@ CONFIGURE_ARGS=	--enable-xsync \
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USES=		pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		pathfix pkgconfig gmake
 USE_GNOME=	gtk20 intltool intlhack
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libmenu libutil xfconf
@@ -34,7 +33,6 @@ OPTIONS_DEFINE=		COMPOSITE NLS NOTIFY REVMOUSE
 OPTIONS_DEFAULT=	COMPOSITE NOTIFY
 REVMOUSE_DESC=		Reverse mouse workspace changing direction
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCOMPOSITE}
@@ -53,7 +51,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=	startup-notification-1:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS+=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification
 CONFIGURE_ARGS+=--enable-startup-notification
 .else
 CONFIGURE_ARGS+=--disable-startup-notification