Start using the new xfce sub-category

20 files changed, 25 insertions, 21 deletions

diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index f50e1951c060..4a4d68684246 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xfce4-mixer
 PORTVERSION=	3.99.2
 PORTREVISION=	1
-CATEGORIES=	audio
+CATEGORIES=	audio xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/games/xfce4-toys/Makefile b/games/xfce4-toys/Makefile
index 78c3fc975609..7a414bca683c 100644
--- a/games/xfce4-toys/Makefile
+++ b/games/xfce4-toys/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xfce4-toys
 PORTVERSION=	3.99.2
 PORTREVISION=   1
-CATEGORIES=	games
+CATEGORIES=	games xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/misc/xfce4-iconbox/Makefile b/misc/xfce4-iconbox/Makefile
index 0964cbf854ae..78079a492796 100644
--- a/misc/xfce4-iconbox/Makefile
+++ b/misc/xfce4-iconbox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-iconbox
 PORTVERSION=	3.99.2
-CATEGORIES=	misc
+CATEGORIES=	misc xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
@@ -18,6 +18,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XFce 4 icon box, an alternative taskbar
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
+LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
diff --git a/misc/xfce4-panel-themes/Makefile b/misc/xfce4-panel-themes/Makefile
index 0f93cec12dbe..a6b7fbf6e2dc 100644
--- a/misc/xfce4-panel-themes/Makefile
+++ b/misc/xfce4-panel-themes/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xfce4-panel-themes
 PORTVERSION=	3.99.2
 PORTREVISION=   1
-CATEGORIES=	misc
+CATEGORIES=	misc xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/misc/xfce4-wm-themes/Makefile b/misc/xfce4-wm-themes/Makefile
index 46c61801c9c0..2eb7c7e55f22 100644
--- a/misc/xfce4-wm-themes/Makefile
+++ b/misc/xfce4-wm-themes/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-wm-themes
 PORTVERSION=	3.99.2
-CATEGORIES=	misc
+CATEGORIES=	misc xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index 42970562e9b4..0ff5ed2fa260 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xfce4-print
 PORTVERSION=	3.99.2
 PORTREVISION=   1
-CATEGORIES=	print
+CATEGORIES=	print xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/sysutils/xfce4-mcs-manager/Makefile b/sysutils/xfce4-mcs-manager/Makefile
index ac73c04bf3c1..cce2c040c0e3 100644
--- a/sysutils/xfce4-mcs-manager/Makefile
+++ b/sysutils/xfce4-mcs-manager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-mcs-manager
 PORTVERSION=	3.99.2
-CATEGORIES=	sysutils
+CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile
index 00419fce8040..a7e4194cf461 100644
--- a/sysutils/xfce4-mcs-plugins/Makefile
+++ b/sysutils/xfce4-mcs-plugins/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xfce4-mcs-plugins
 PORTVERSION=	3.99.2
 PORTREVISION=   1
-CATEGORIES=	sysutils
+CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile
index f21b9d2e94e4..894dfdd8071b 100644
--- a/sysutils/xfce4-utils/Makefile
+++ b/sysutils/xfce4-utils/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xfce4-utils
 PORTVERSION=	3.99.2
 PORTREVISION=   1
-CATEGORIES=	sysutils
+CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/x11-fm/xfce4-fm-icons/Makefile b/x11-fm/xfce4-fm-icons/Makefile
index 11858c8c1d24..7893784b4eb8 100644
--- a/x11-fm/xfce4-fm-icons/Makefile
+++ b/x11-fm/xfce4-fm-icons/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-fm-icons
 PORTVERSION=	3.99.2
-CATEGORIES=	x11-fm
+CATEGORIES=	x11-fm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/x11-fm/xfce4-fm/Makefile b/x11-fm/xfce4-fm/Makefile
index a25d0115d85d..3830ed7483ca 100644
--- a/x11-fm/xfce4-fm/Makefile
+++ b/x11-fm/xfce4-fm/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xfce4-fm
 PORTVERSION=	3.99.2
 PORTREVISION=   1
-CATEGORIES=	x11-fm
+CATEGORIES=	x11-fm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile
index 781865691ef7..a15661137a74 100644
--- a/x11-toolkits/libxfce4gui/Makefile
+++ b/x11-toolkits/libxfce4gui/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	libxfce4gui
 PORTVERSION=	3.99.2
 PORTREVISION=	1
-CATEGORIES=	x11-toolkits
+CATEGORIES=	x11-toolkits xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index eae8cad4eb56..24e11bc27f66 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xfce
 PORTVERSION=	3.8.18
 PORTREVISION=	2
-CATEGORIES=	x11-wm
+CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.xfce.org/archive/
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 9af5ca8bee30..a49b02ab4cd2 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xfce4-desktop
 PORTVERSION=	3.99.2
 PORTREVISION=   1
-CATEGORIES=	x11-wm
+CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index 8639cec188f4..e64af3cb2b19 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xfce4-panel
 PORTVERSION=	3.99.2
 PORTREVISION=   1
-CATEGORIES=	x11-wm
+CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/x11-wm/xfce4-systray/Makefile b/x11-wm/xfce4-systray/Makefile
index b9565b7add83..9b5439ccf4a7 100644
--- a/x11-wm/xfce4-systray/Makefile
+++ b/x11-wm/xfce4-systray/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	xfce4-systray
 PORTVERSION=	3.99.2
 PORTREVISION=   1
-CATEGORIES=	x11-wm
+CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 325e2ec943b3..7bb6b870dbbb 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-wm
 PORTVERSION=	3.99.2
-CATEGORIES=	x11-wm
+CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
@@ -19,7 +19,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XFce 4 window manager
 
 BUILD_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
-LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
+		xfce4util.1:${PORTSDIR}/x11/libxfce4util \
+		xfcegui4.1:${PORTSDIR}/x11-toolkits/libxfce4gui
 
 USE_GNOME=	gtk20
 USE_X_PREFIX=	yes
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 0b0b369304f3..7e85db540acd 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4
 PORTVERSION=	r2
-CATEGORIES=	x11-wm
+CATEGORIES=	x11-wm xfce
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 62cee155ef51..1b52d1055111 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxfce4mcs
 PORTVERSION=	3.99.2
-CATEGORIES=	x11
+CATEGORIES=	x11 xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 9c06063481ec..f760139ad02e 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxfce4util
 PORTVERSION=	3.99.2
-CATEGORIES=	x11
+CATEGORIES=	x11 xfce
 MASTER_SITES=	http://www.xfce.org/archive/xfce4-rc2/src/ \
 		ftp://ftp.unix-ag.org/user/bmeurer/xfce4/rc2/separate/ \
 		http://usuarios.lycos.es/xfce4/tarballs/rc2/separate/ \