Index: x11/cinnamon-screensaver/Makefile
===================================================================
--- x11/cinnamon-screensaver/Makefile	(revision 511368)
+++ x11/cinnamon-screensaver/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	cinnamon-screensaver
 PORTVERSION=	2.4.1
+PORTREVISIOn=	1
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome3
 
@@ -21,10 +22,10 @@
 		gsettings-desktop-schemas>=3.2.0:devel/gsettings-desktop-schemas \
 		gnome-keyring>=0:security/gnome-keyring
 
-USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig
+USES=		autoreconf:build gettext gmake libtool pathfix pkgconfig xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-USE_XORG=	x11 xext xxf86vm xxf86misc xscrnsaver
+USE_XORG=	x11 xext xxf86vm xscrnsaver
 USE_GNOME=	gnomedesktop3 gnomeprefix intlhack intlhack libgnomekbd libxml2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
Index: x11/mate-screensaver/Makefile
===================================================================
--- x11/mate-screensaver/Makefile	(revision 511368)
+++ x11/mate-screensaver/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mate-screensaver
 PORTVERSION=	1.22.1
+PORTREVISION=	1
 CATEGORIES=	x11 mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -22,10 +23,10 @@
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake localbase pathfix pkgconfig tar:xz
+USES=		gettext gmake localbase pathfix pkgconfig tar:xz xorg
 USE_GL=		gl
 USE_MATE=	desktop libmatekbd menus session:run
-USE_XORG=	ice sm x11 xext xscrnsaver xxf86misc xxf86vm
+USE_XORG=	ice sm x11 xext xscrnsaver xxf86vm
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xscreensaverdir=${XSCREENSAVER_DIR} \
Index: sysutils/cinnamon-settings-daemon/Makefile
===================================================================
--- sysutils/cinnamon-settings-daemon/Makefile	(revision 511368)
+++ sysutils/cinnamon-settings-daemon/Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cinnamon-settings-daemon
 PORTVERSION=	2.4.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils gnome
 DIST_SUBDIR=	gnome3
 
@@ -33,7 +33,6 @@
 		libxslt:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
-USE_XORG=	xxf86misc
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
Index: sysutils/mate-control-center/Makefile
===================================================================
--- sysutils/mate-control-center/Makefile	(revision 511368)
+++ sysutils/mate-control-center/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mate-control-center
 PORTVERSION=	1.22.1
+PORTREVISION=	1
 CATEGORIES=	sysutils mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -28,9 +29,9 @@
 PORTSCOUT=	limitw:1,even
 
 USES=		desktop-file-utils gettext gmake libtool localbase \
-		pathfix pkgconfig shared-mime-info tar:xz
+		pathfix pkgconfig shared-mime-info tar:xz xorg
 USE_MATE=	desktop libmatekbd marco menus settingsdaemon
-USE_XORG=	ice sm x11 xcursor xext xxf86misc xft xi xrandr xscrnsaver
+USE_XORG=	ice sm x11 xcursor xext xft xi xrandr xscrnsaver
 USE_GNOME=	cairo dconf glib20 gtk30 intlhack libxml2 librsvg2 pango
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
Index: sysutils/mate-settings-daemon/Makefile
===================================================================
--- sysutils/mate-settings-daemon/Makefile	(revision 511368)
+++ sysutils/mate-settings-daemon/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mate-settings-daemon
 PORTVERSION=	1.22.0
+PORTREVISION=	1
 CATEGORIES=	sysutils mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -27,9 +28,9 @@
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gmake libtool localbase pathfix \
-		pkgconfig tar:xz
+		pkgconfig tar:xz xorg
 USE_MATE=	desktop libmatekbd mixer
-USE_XORG=	ice sm x11 xext xi xxf86misc
+USE_XORG=	ice sm x11 xext xi
 USE_GNOME=	cairo dconf gtk30 intlhack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes