diff --git a/x11/xfce4/gtk-xfce-engine/Makefile b/x11/xfce4/gtk-xfce-engine/Makefile
index 05b8b0e2fc0..b1589c28bb8 100644
--- a/x11/xfce4/gtk-xfce-engine/Makefile
+++ b/x11/xfce4/gtk-xfce-engine/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2009/08/11 08:38:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 theme engine for Gtk+2
 
 XFCE_VERSION=	2.6.0
 XFCE_PROJECT=	gtk-xfce-engine
-PKGNAME=	${DISTNAME}p1
+REVISION=	1
 
 HOMEPAGE=	http://www.xfce.org/projects/
 
diff --git a/x11/xfce4/mousepad/Makefile b/x11/xfce4/mousepad/Makefile
index d78024a1bbb..d3ef03818c4 100644
--- a/x11/xfce4/mousepad/Makefile
+++ b/x11/xfce4/mousepad/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2010/04/04 10:48:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 simple text editor
 
 XFCE_VERSION=	0.2.16
 XFCE_GOODIE=	mousepad
-PKGNAME=	${DISTNAME}p3
+REVISION=	3
 
 HOMEPAGE=	http://www.xfce.org/projects/mousepad
 # GPLv2
diff --git a/x11/xfce4/notification-daemon-xfce/Makefile b/x11/xfce4/notification-daemon-xfce/Makefile
index 040219870df..5c85a40a96e 100644
--- a/x11/xfce4/notification-daemon-xfce/Makefile
+++ b/x11/xfce4/notification-daemon-xfce/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2010/04/04 10:48:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 notification daemon
 
 XFCE_VERSION=	0.3.7
 XFCE_GOODIE=	notification-daemon-xfce
-PKGNAME=	${DISTNAME}p9
+REVISION=	9
 
 MASTER_SITES=	http://archive.xfce.org/src/archive/${XFCE_GOODIE}/${XFCE_BRANCH}/
 # GPLv2
diff --git a/x11/xfce4/orage/Makefile b/x11/xfce4/orage/Makefile
index 8dec57d3ac8..621f48ad41a 100644
--- a/x11/xfce4/orage/Makefile
+++ b/x11/xfce4/orage/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2010/06/05 15:22:59 landry Exp $
+# $OpenBSD: Makefile,v 1.21 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 advanced calendar
 
 XFCE_GOODIE=	orage
 XFCE_VERSION=	4.6.1
-PKGNAME=	${DISTNAME}p4
+REVISION=	4
 
 HOMEPAGE=	http://www.xfce.org/projects/orage
 # GPLv2
diff --git a/x11/xfce4/ristretto/Makefile b/x11/xfce4/ristretto/Makefile
index 7d95b08399d..660e17236d1 100644
--- a/x11/xfce4/ristretto/Makefile
+++ b/x11/xfce4/ristretto/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2009/12/21 16:07:44 landry Exp $
+# $OpenBSD: Makefile,v 1.16 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 lightweight image-viewer
 
 XFCE_VERSION=	0.0.22
 XFCE_GOODIE=	ristretto
-PKGNAME=	${DISTNAME}p1
+REVISION=	1
 
 EXTRACT_SUFX=	.tar.gz
 
diff --git a/x11/xfce4/thunar-archive/Makefile b/x11/xfce4/thunar-archive/Makefile
index 07d94948a16..67054818441 100644
--- a/x11/xfce4/thunar-archive/Makefile
+++ b/x11/xfce4/thunar-archive/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2009/12/21 16:07:44 landry Exp $
+# $OpenBSD: Makefile,v 1.4 2010/07/14 11:48:13 landry Exp $
 
 COMMENT =	Thunar archive plugin
 
 XFCE_VERSION =	0.2.4
 THUNAR_PLUGIN =	thunar-archive-plugin
-PKGNAME =	${DISTNAME:S/-plugin//}p1
+REVISION =	1
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
diff --git a/x11/xfce4/thunar-media-tags/Makefile b/x11/xfce4/thunar-media-tags/Makefile
index 6dc48e0b8b9..e80e939514f 100644
--- a/x11/xfce4/thunar-media-tags/Makefile
+++ b/x11/xfce4/thunar-media-tags/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2010/04/04 10:48:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Thunar media tags plugin
 
 XFCE_VERSION=	0.1.2
 THUNAR_PLUGIN=	thunar-media-tags-plugin
-PKGNAME=	${DISTNAME:S/-plugin//}p8
+REVISION=	8
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/x11/xfce4/thunar-thumbnailers/Makefile b/x11/xfce4/thunar-thumbnailers/Makefile
index d4754961488..4d15da85b1a 100644
--- a/x11/xfce4/thunar-thumbnailers/Makefile
+++ b/x11/xfce4/thunar-thumbnailers/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2009/12/21 16:07:44 landry Exp $
+# $OpenBSD: Makefile,v 1.9 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Thunar additional thumbnailers plugin
 
 XFCE_VERSION=	0.4.1
 XFCE_GOODIE=	thunar-thumbnailers
-PKGNAME =	${DISTNAME:S/-plugin//}p0
+REVISION=	0
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/x11/xfce4/thunar-vcs/Makefile b/x11/xfce4/thunar-vcs/Makefile
index f5e8f49fcd3..7a2600a6af2 100644
--- a/x11/xfce4/thunar-vcs/Makefile
+++ b/x11/xfce4/thunar-vcs/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2010/04/04 10:48:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2010/07/14 11:48:13 landry Exp $
 
 COMMENT =	Thunar vcs integration plugin
 
 XFCE_VERSION =	0.1.2
 THUNAR_PLUGIN =	thunar-vcs-plugin
-PKGNAME=	${DISTNAME:S/-plugin//}p3
+REVISION =	3
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
diff --git a/x11/xfce4/thunar/Makefile b/x11/xfce4/thunar/Makefile
index 96f7fd33568..91519f78165 100644
--- a/x11/xfce4/thunar/Makefile
+++ b/x11/xfce4/thunar/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.23 2010/07/03 08:30:44 landry Exp $
+# $OpenBSD: Makefile,v 1.24 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 file manager
 
 XFCE_VERSION=	1.0.2
 XFCE_PROJECT=	Thunar
 # :L is here for a reason
-PKGNAME=	${DISTNAME:L}p0
+PKGNAME=	${DISTNAME:L}
+REVISION=	0
 
 SHARED_LIBS=	thunarx-1	5.1 \
 		thunar-vfs-1	5.1
diff --git a/x11/xfce4/xfce4-battery/Makefile b/x11/xfce4/xfce4-battery/Makefile
index 1c6bfb9b177..1dc757cd66c 100644
--- a/x11/xfce4/xfce4-battery/Makefile
+++ b/x11/xfce4/xfce4-battery/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2010/03/21 11:35:26 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2010/07/14 11:48:13 landry Exp $
 
 ONLY_FOR_ARCHS=	${APM_ARCHS}
 
@@ -6,7 +6,7 @@ COMMENT=	Xfce4 battery monitor panel plugin
 
 XFCE_VERSION=	0.5.0
 XFCE_PLUGIN=	battery
-PKGNAME=	${DISTNAME:S/-plugin//}p8
+REVISION=	8
 
 # BSD
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-clipman/Makefile b/x11/xfce4/xfce4-clipman/Makefile
index 0df7cadf0a8..7ca43197693 100644
--- a/x11/xfce4/xfce4-clipman/Makefile
+++ b/x11/xfce4/xfce4-clipman/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2009/12/21 16:07:44 landry Exp $
+# $OpenBSD: Makefile,v 1.24 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 clipboard history panel plugin
 
 XFCE_VERSION=	1.1.0
 XFCE_PLUGIN=	clipman
-PKGNAME=	${DISTNAME:S/-plugin//}p0
+REVISION=	0
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-diskperf/Makefile b/x11/xfce4/xfce4-diskperf/Makefile
index 86b59671e8b..2cbee4cc6ee 100644
--- a/x11/xfce4/xfce4-diskperf/Makefile
+++ b/x11/xfce4/xfce4-diskperf/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2009/08/11 08:38:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 disk performance panel plugin
 
 XFCE_VERSION=	2.2.0
 XFCE_PLUGIN=	diskperf
-PKGNAME=	${DISTNAME:S/-plugin//}p3
+REVISION=	3
 
 # BSD
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-fsguard/Makefile b/x11/xfce4/xfce4-fsguard/Makefile
index 5900cd77d23..8a6305a5dc1 100644
--- a/x11/xfce4/xfce4-fsguard/Makefile
+++ b/x11/xfce4/xfce4-fsguard/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.22 2009/12/21 16:07:44 landry Exp $
+# $OpenBSD: Makefile,v 1.23 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 disk usage monitor panel plugin
 
 XFCE_VERSION=	0.4.0
 XFCE_PLUGIN=	fsguard
-PKGNAME=	${DISTNAME:S/-plugin//}p6
+REVISION=	6
 
 # BSD
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-genmon/Makefile b/x11/xfce4/xfce4-genmon/Makefile
index ba6ded33f30..ae4fb8e3543 100644
--- a/x11/xfce4/xfce4-genmon/Makefile
+++ b/x11/xfce4/xfce4-genmon/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2009/08/11 08:38:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 generic scriptable monitor panel plugin
 
 XFCE_VERSION=	3.2
 XFCE_PLUGIN=	genmon
-PKGNAME=	${DISTNAME:S/-plugin//}p3
+REVISION=	3
 
 # LGPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-icon-theme/Makefile b/x11/xfce4/xfce4-icon-theme/Makefile
index 2abbd3dcbab..c314ed56787 100644
--- a/x11/xfce4/xfce4-icon-theme/Makefile
+++ b/x11/xfce4/xfce4-icon-theme/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2009/12/21 16:07:44 landry Exp $
+# $OpenBSD: Makefile,v 1.21 2010/07/14 11:48:13 landry Exp $
 PKG_ARCH=	*
 
 COMMENT=	Xfce4 icon theme
 
 XFCE_ARTWORK=	xfce4-icon-theme
 XFCE_VERSION=	4.4.3
-PKGNAME=	${DISTNAME}p4
+REVISION=	4
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-mailwatch/Makefile b/x11/xfce4/xfce4-mailwatch/Makefile
index bedb1218893..8cff2ca0dfb 100644
--- a/x11/xfce4/xfce4-mailwatch/Makefile
+++ b/x11/xfce4/xfce4-mailwatch/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2010/04/04 10:48:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 mailboxes monitor panel plugin
 
 XFCE_VERSION=	1.1.0
 XFCE_PLUGIN=	mailwatch
-PKGNAME=	${DISTNAME:S/-plugin//}p3
+REVISION=	3
 
 HOMEPAGE=	http://spuriousinterrupt.org/projects/mailwatch
 
diff --git a/x11/xfce4/xfce4-mixer/Makefile b/x11/xfce4/xfce4-mixer/Makefile
index 784e91e568a..ee29d413fa5 100644
--- a/x11/xfce4/xfce4-mixer/Makefile
+++ b/x11/xfce4/xfce4-mixer/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.21 2010/06/05 15:25:40 landry Exp $
+# $OpenBSD: Makefile,v 1.22 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 volume mixer
 
 XFCE_GOODIE=	xfce4-mixer
 XFCE_VERSION=	4.6.1
-PKGNAME=	${DISTNAME}p3
+REVISION=	3
 HOMEPAGE=	http://www.xfce.org/projects/xfce4-mixer
 
 # GPLv2
diff --git a/x11/xfce4/xfce4-modemlights/Makefile b/x11/xfce4/xfce4-modemlights/Makefile
index ce9b880b771..d38c9d0d8e2 100644
--- a/x11/xfce4/xfce4-modemlights/Makefile
+++ b/x11/xfce4/xfce4-modemlights/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2009/08/11 08:38:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2010/07/14 11:48:13 landry Exp $
 
 COMMENT =	Xfce4 ppp connection monitor panel plugin
 
 XFCE_VERSION =	0.1.3.99
 XFCE_PLUGIN =	modemlights
-PKGNAME=	${DISTNAME:S/-plugin//}p1
+REVISION =	1
 
 # GPLv2
 PERMIT_DISTFILES_CDROM =Yes
diff --git a/x11/xfce4/xfce4-netload/Makefile b/x11/xfce4/xfce4-netload/Makefile
index aee39ef0554..5501df2afa4 100644
--- a/x11/xfce4/xfce4-netload/Makefile
+++ b/x11/xfce4/xfce4-netload/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2009/08/11 08:38:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 network load monitor panel plugin
 
 XFCE_VERSION=	0.4.0
 XFCE_PLUGIN=	netload
-PKGNAME=	${DISTNAME:S/-plugin//}p4
+REVISION=	4
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-notes/Makefile b/x11/xfce4/xfce4-notes/Makefile
index 3b0f52705cf..0ccd97bbde0 100644
--- a/x11/xfce4/xfce4-notes/Makefile
+++ b/x11/xfce4/xfce4-notes/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2009/12/21 16:07:44 landry Exp $
+# $OpenBSD: Makefile,v 1.26 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 sticky notes panel plugin
 
 XFCE_VERSION=	1.7.2
 XFCE_PLUGIN=	notes
-PKGNAME=	${DISTNAME:S/-plugin//}p0
+REVISION=	0
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-notifyd/Makefile b/x11/xfce4/xfce4-notifyd/Makefile
index ee0c7d06ca3..4e20ad56b77 100644
--- a/x11/xfce4/xfce4-notifyd/Makefile
+++ b/x11/xfce4/xfce4-notifyd/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2009/12/21 16:07:45 landry Exp $
+# $OpenBSD: Makefile,v 1.4 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 alternative notification daemon
 
 XFCE_VERSION=	0.1.0
 XFCE_GOODIE=	xfce4-notifyd
-PKGNAME=	${DISTNAME}p1
+REVISION=	1
 
 MASTER_SITES=	http://spuriousinterrupt.org/files/xfce4-notifyd/
 
diff --git a/x11/xfce4/xfce4-places/Makefile b/x11/xfce4/xfce4-places/Makefile
index 7d3a9c2062c..2bc67776478 100644
--- a/x11/xfce4/xfce4-places/Makefile
+++ b/x11/xfce4/xfce4-places/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2010/04/04 10:48:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 places panel plugin
 
 XFCE_VERSION=	1.2.0
 XFCE_PLUGIN=	places
-PKGNAME=	${DISTNAME:S/-plugin//}p0
+REVISION=	0
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-quicklauncher/Makefile b/x11/xfce4/xfce4-quicklauncher/Makefile
index 0447e2b1cc6..3163bc28f25 100644
--- a/x11/xfce4/xfce4-quicklauncher/Makefile
+++ b/x11/xfce4/xfce4-quicklauncher/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2010/04/04 10:48:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.3 2010/07/14 11:48:13 landry Exp $
 
 COMMENT =	Xfce4 quicklauncher panel plugin
 
 XFCE_VERSION =	1.9.4
 XFCE_PLUGIN =	quicklauncher
-PKGNAME =	${DISTNAME:S/-plugin//}p0
+REVISION =	0
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-screenshooter/Makefile b/x11/xfce4/xfce4-screenshooter/Makefile
index c7443457711..f3cac33b37f 100644
--- a/x11/xfce4/xfce4-screenshooter/Makefile
+++ b/x11/xfce4/xfce4-screenshooter/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2010/04/04 10:48:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 desktop screenshot panel plugin
 
 XFCE_VERSION=	1.6.0
 XFCE_GOODIE=	xfce4-screenshooter
 EXTRACT_SUFX=	.tar.gz
-PKGNAME=	${DISTNAME}p4
+REVISION=	4
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-smartbookmark/Makefile b/x11/xfce4/xfce4-smartbookmark/Makefile
index da790b739c9..7cf02f7ed09 100644
--- a/x11/xfce4/xfce4-smartbookmark/Makefile
+++ b/x11/xfce4/xfce4-smartbookmark/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2010/04/04 10:48:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 web search panel plugin
 
 XFCE_VERSION=	0.4.2
 XFCE_PLUGIN=	smartbookmark
-PKGNAME=	${DISTNAME:S/-plugin//}p2
+REVISION=	2
 EXTRACT_SUFX=	.tar.gz
 
 # GPLv2
diff --git a/x11/xfce4/xfce4-systemload/Makefile b/x11/xfce4/xfce4-systemload/Makefile
index 429ff8ca1cb..d8adea8ac71 100644
--- a/x11/xfce4/xfce4-systemload/Makefile
+++ b/x11/xfce4/xfce4-systemload/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2009/08/11 08:38:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 cpu/memory/swap/uptime monitor panel plugin
 
 XFCE_VERSION=	0.4.2
 XFCE_PLUGIN=	systemload
-PKGNAME=	${DISTNAME:S/-plugin//}p5
+REVISION=	5
 
 # BSD
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-time-out/Makefile b/x11/xfce4/xfce4-time-out/Makefile
index 805d92f98ae..463a716dfb6 100644
--- a/x11/xfce4/xfce4-time-out/Makefile
+++ b/x11/xfce4/xfce4-time-out/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2009/08/11 08:38:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 periodical screen locker panel plugin
 
 XFCE_VERSION=	0.1.0
 XFCE_PLUGIN=	time-out
-PKGNAME=	${DISTNAME:S/-plugin//}p5
+REVISION=	5
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-verve/Makefile b/x11/xfce4/xfce4-verve/Makefile
index ec8ce92256e..c175d6ce234 100644
--- a/x11/xfce4/xfce4-verve/Makefile
+++ b/x11/xfce4/xfce4-verve/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.11 2010/04/04 10:48:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 command line panel plugin
 
 XFCE_VERSION=	0.3.5
 XFCE_PLUGIN=	verve
 DISTNAME=	${XFCE_PLUGIN}-plugin-${XFCE_VERSION}
-PKGNAME=	xfce4-${XFCE_PLUGIN}-${XFCE_VERSION}p7
+PKGNAME=	xfce4-${XFCE_PLUGIN}-${XFCE_VERSION}
+REVISION=	7
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-wavelan/Makefile b/x11/xfce4/xfce4-wavelan/Makefile
index 669c122a5e2..aaf2dc865cf 100644
--- a/x11/xfce4/xfce4-wavelan/Makefile
+++ b/x11/xfce4/xfce4-wavelan/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2010/04/04 10:48:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 wireless interface monitor panel plugin
 
 XFCE_VERSION=	0.5.5
 XFCE_PLUGIN=	wavelan
-PKGNAME=	${DISTNAME:S/-plugin//}p2
+REVISION=	2
 
 # BSD
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-weather/Makefile b/x11/xfce4/xfce4-weather/Makefile
index b5f206f0a41..87ce231ad74 100644
--- a/x11/xfce4/xfce4-weather/Makefile
+++ b/x11/xfce4/xfce4-weather/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2010/04/04 10:48:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.32 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 temperature/weather conditions panel plugin
 
 XFCE_VERSION=	0.7.3
 XFCE_PLUGIN=	weather
-PKGNAME=	${DISTNAME:S/-plugin//}p1
+REVISION=	1
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-wmdock/Makefile b/x11/xfce4/xfce4-wmdock/Makefile
index 4cb42454cef..75e215b58e7 100644
--- a/x11/xfce4/xfce4-wmdock/Makefile
+++ b/x11/xfce4/xfce4-wmdock/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2010/04/04 10:48:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 WindowMaker dockapps wrapper panel plugin
 
 XFCE_VERSION=	0.2.0
 XFCE_PLUGIN=	wmdock
-PKGNAME=	${DISTNAME:S/-plugin//}p4
+REVISION=	4
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfce4-xkb/Makefile b/x11/xfce4/xfce4-xkb/Makefile
index d03201facb4..c8d580c4c84 100644
--- a/x11/xfce4/xfce4-xkb/Makefile
+++ b/x11/xfce4/xfce4-xkb/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2009/08/11 08:38:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 xkb layout switcher panel plugin
 
 XFCE_VERSION=	0.4.3
 XFCE_PLUGIN=	xkb
-PKGNAME=	${DISTNAME:S/-plugin//}p5
+REVISION=	5
 
 # BSD
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfmpc/Makefile b/x11/xfce4/xfmpc/Makefile
index 5fb26981798..a4e92f219dc 100644
--- a/x11/xfce4/xfmpc/Makefile
+++ b/x11/xfce4/xfmpc/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2009/12/21 16:07:45 landry Exp $
+# $OpenBSD: Makefile,v 1.5 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 Music Player Daemon client
 
 XFCE_VERSION=	0.2.0
 XFCE_GOODIE=	xfmpc
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/xfce4/xfprint/Makefile b/x11/xfce4/xfprint/Makefile
index 0c288774ed9..047956e47a0 100644
--- a/x11/xfce4/xfprint/Makefile
+++ b/x11/xfce4/xfprint/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2010/06/05 15:28:47 landry Exp $
+# $OpenBSD: Makefile,v 1.17 2010/07/14 11:48:13 landry Exp $
 
 COMMENT=	Xfce4 printing helper
 
 XFCE_PROJECT=	xfprint
 XFCE_VERSION=	4.6.1
-PKGNAME=	${DISTNAME}p4
+REVISION=	4
 
 MASTER_SITES=	http://archive.xfce.org/src/archive/${XFCE_PROJECT}/${XFCE_BRANCH}/
 SHARED_LIBS=	xfprint	0.1
diff --git a/x11/xfce4/xfwm4-themes/Makefile b/x11/xfce4/xfwm4-themes/Makefile
index ab0fc08d5d3..301705b6e60 100644
--- a/x11/xfce4/xfwm4-themes/Makefile
+++ b/x11/xfce4/xfwm4-themes/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2009/08/11 19:55:52 landry Exp $
+# $OpenBSD: Makefile,v 1.14 2010/07/14 11:48:13 landry Exp $
 PKG_ARCH=	*
 
 COMMENT=	Xfwm4 window decoration themes
 
 XFCE_ARTWORK=	xfwm4-themes
 XFCE_VERSION=	4.6.0
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes