7 files changed, 23 insertions, 25 deletions

diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index 03dcb3b188b2..cdf205412a67 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xfce4-clipman-plugin
 PORTVERSION=	1.2.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
@@ -13,26 +13,22 @@ MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce 4 clipboard module for xfce4-panel
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	UNIQUE
 UNIQUE_DESC=	Enable Unique (single instance) support
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gtk20 intltool intlhack glib20
 USE_XFCE=	configenv libexo libmenu libutil panel xfconf
 USE_XORG=	xtst
-USES=		pkgconfig gettext pathfix
-
+USES=		pkgconfig gettext gmake
 INSTALLS_ICONS=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MUNIQUE}
-LIB_DEPENDS+=	unique-1:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS+=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
 CONFIGURE_ARGS+=	--enable-unique
 .else
 CONFIGURE_ARGS+=	--disable-unique
diff --git a/x11/xfce4-clipman-plugin/pkg-plist b/x11/xfce4-clipman-plugin/pkg-plist
index 6e34441d75d9..67ae498507df 100644
--- a/x11/xfce4-clipman-plugin/pkg-plist
+++ b/x11/xfce4-clipman-plugin/pkg-plist
@@ -95,7 +95,7 @@ share/locale/vi/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/zh_CN/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-clipman-plugin.mo
 share/xfce4/panel/plugins/xfce4-clipman-plugin.desktop
-@dirrmtry share/xfce4/panel-plugins
+@dirrmtry share/xfce4/panel/plugins
 @dirrmtry share/locale/ur_PK/LC_MESSAGES
 @dirrmtry share/locale/ur_PK
 @dirrmtry share/locale/ur/LC_MESSAGES
@@ -125,6 +125,6 @@ share/xfce4/panel/plugins/xfce4-clipman-plugin.desktop
 @dirrm %%DOCSDIR%%/html/C
 @dirrm %%DOCSDIR%%/html
 @dirrm %%DOCSDIR%%
-@dirrmtry lib/xfce4/panel
+@dirrmtry lib/xfce4/panel/plugins
 @dirrmtry etc/xdg/xfce4/panel
 @dirrmtry etc/xdg/xfce4
diff --git a/x11/xfce4-embed-plugin/Makefile b/x11/xfce4-embed-plugin/Makefile
index 51417a350633..87716ca38b2c 100644
--- a/x11/xfce4-embed-plugin/Makefile
+++ b/x11/xfce4-embed-plugin/Makefile
@@ -11,18 +11,18 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Embed arbitrary windows into the Xfce panel
 
+LICENSE=	GPLv2
+
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=	pkgconfig
+USES=	pkgconfig gmake
 USE_XORG=	x11
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu libutil panel
 
 OPTIONS_DEFINE=	NLS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/x11/xfce4-embed-plugin/pkg-plist b/x11/xfce4-embed-plugin/pkg-plist
index efc5286aab59..4a2679a5464d 100644
--- a/x11/xfce4-embed-plugin/pkg-plist
+++ b/x11/xfce4-embed-plugin/pkg-plist
@@ -27,5 +27,7 @@ lib/xfce4/panel/plugins/libembed.so
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/xfce4-embed-plugin.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-embed-plugin.mo
 share/xfce4/panel/plugins/embed.desktop
+@dirrmtry share/xfce4/panel/plugins
 %%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ug
+@dirrmtry lib/xfce4/panel/plugins
diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile
index 97b946464b7a..fc79618c7abd 100644
--- a/x11/xfce4-quicklauncher-plugin/Makefile
+++ b/x11/xfce4-quicklauncher-plugin/Makefile
@@ -12,12 +12,12 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Quicklauncher plugin for Xfce
 
+LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USES=		gettext pkgconfig
-USE_GMAKE=	yes
+USES=		gettext pkgconfig gmake
 USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libgui panel
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/x11/xfce4-verve-plugin/Makefile b/x11/xfce4-verve-plugin/Makefile
index 04d1eea551f6..35c07606b893 100644
--- a/x11/xfce4-verve-plugin/Makefile
+++ b/x11/xfce4-verve-plugin/Makefile
@@ -7,28 +7,27 @@ PORTREVISION=	8
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/panel-plugins/${PKGNAMEPREFIX}${PORTNAME}/${PORTVERSION:R}
-DIST_SUBDIR=	xfce4
 PKGNAMEPREFIX=	xfce4-
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
+DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Command line plugin for Xfce4
 
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	glib20 intltool intlhack
 USE_XFCE=	configenv panel libexo libgui libutil
-USES=		pkgconfig pathfix
-
-CONFIGURE_ARGS=	--disable-debug
+USES=		pkgconfig pathfix gmake
 
 OPTIONS_DEFINE=	NLS DBUS
+OPTIONS_DEFAULT=	NLS DBUS
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
@@ -41,7 +40,7 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
-LIB_DEPENDS+=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 CONFIGURE_ARGS+=--enable-dbus
 PLIST_SUB+=	DBUS=""
 .else
diff --git a/x11/xfce4-xfapplet-plugin/Makefile b/x11/xfce4-xfapplet-plugin/Makefile
index 3a437d899bb1..9b17d717f43b 100644
--- a/x11/xfce4-xfapplet-plugin/Makefile
+++ b/x11/xfce4-xfapplet-plugin/Makefile
@@ -12,7 +12,9 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfapplet plugin for Xfce
 
-LIB_DEPENDS=	panelappletmm-2.6:${PORTSDIR}/x11-toolkits/libpanelappletmm
+LICENSE=	GPLv2
+
+LIB_DEPENDS=	libpanelappletmm-2.6.so:${PORTSDIR}/x11-toolkits/libpanelappletmm
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
@@ -20,5 +22,4 @@ USES=		gettext gmake pkgconfig
 USE_GNOME=	gtk20 intltool intlhack orbit2
 USE_XFCE=	configenv libgui libutil panel
 
-NO_STAGE=	yes
 .include <bsd.port.mk>