diff --git a/x11/gnome/alacarte/Makefile b/x11/gnome/alacarte/Makefile
index 4114de0781e..1f395bf8423 100644
--- a/x11/gnome/alacarte/Makefile
+++ b/x11/gnome/alacarte/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2009/12/21 18:03:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2010/07/13 20:37:02 ajacoutot Exp $
 
 COMMENT=		easy GNOME menu editing tool
 
 GNOME_PROJECT=		alacarte
 GNOME_VERSION=		0.12.4
-PKGNAME=		${DISTNAME}p1
+REVISION=		1
 
 CATEGORIES=		x11
 
diff --git a/x11/gnome/applets2/Makefile b/x11/gnome/applets2/Makefile
index 7438e000427..fbcc693ef75 100644
--- a/x11/gnome/applets2/Makefile
+++ b/x11/gnome/applets2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.92 2010/07/06 13:02:14 espie Exp $
+# $OpenBSD: Makefile,v 1.93 2010/07/13 20:37:02 ajacoutot Exp $
 
 COMMENT-main=		applets for use with the GNOME panel
 COMMENT-battstat=	GNOME applet for monitoring battery level
@@ -6,7 +6,8 @@ COMMENT-battstat=	GNOME applet for monitoring battery level
 GNOME_PROJECT=		gnome-applets
 GNOME_VERSION=		2.30.0
 
-PKGNAME-main=		gnome-applets2-${VERSION}p1
+PKGNAME-main=		gnome-applets2-${VERSION}
+REVISION-main=		1
 PKGNAME-battstat=	gnome-applets2-battstat-${VERSION}
 
 CATEGORIES=		x11
diff --git a/x11/gnome/audio/Makefile b/x11/gnome/audio/Makefile
index 223eae96b30..17beff84eab 100644
--- a/x11/gnome/audio/Makefile
+++ b/x11/gnome/audio/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2009/02/11 15:47:49 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2010/07/13 20:37:02 ajacoutot Exp $
 
 COMMENT=		audio files for GNOME
 
 GNOME_PROJECT=		gnome-audio
 GNOME_VERSION=		2.22.2
-PKGNAME=		${DISTNAME}p2
+REVISION=		2
 
 MODULES=		x11/gnome
 
diff --git a/x11/gnome/baker/Makefile b/x11/gnome/baker/Makefile
index 1c99563fb43..42edce3eabc 100644
--- a/x11/gnome/baker/Makefile
+++ b/x11/gnome/baker/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2010/04/24 16:50:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2010/07/13 20:37:02 ajacoutot Exp $
 
 COMMENT=		CD/DVD authoring application for GNOME
 
 GNOME_PROJECT=		gnomebaker
 GNOME_VERSION=		0.6.4
-PKGNAME=		${DISTNAME}p13
+REVISION=		13
 
 CATEGORIES=		sysutils multimedia
 
diff --git a/x11/gnome/bug-buddy/Makefile b/x11/gnome/bug-buddy/Makefile
index cc3e2d781b8..cd5ae3ae890 100644
--- a/x11/gnome/bug-buddy/Makefile
+++ b/x11/gnome/bug-buddy/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2010/05/20 19:24:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2010/07/13 20:37:02 ajacoutot Exp $
 
 COMMENT=	graphical bug reporting tool for GNOME
 
 GNOME_PROJECT=	bug-buddy
 GNOME_VERSION=	2.30.0
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/x11/gnome/cheese/Makefile b/x11/gnome/cheese/Makefile
index 2325700a4d3..fdbb3359696 100644
--- a/x11/gnome/cheese/Makefile
+++ b/x11/gnome/cheese/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2010/07/05 18:59:29 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2010/07/13 20:37:02 ajacoutot Exp $
 
 COMMENT=	PhotoBooth inspired application
 
 GNOME_PROJECT=	cheese
 GNOME_VERSION=	2.28.1
-PKGNAME=	${DISTNAME}p2
+REVISION=	2
 
 CATEGORIES=	multimedia
 
diff --git a/x11/gnome/conduit/Makefile b/x11/gnome/conduit/Makefile
index 4d4ec26568e..468b7a638bd 100644
--- a/x11/gnome/conduit/Makefile
+++ b/x11/gnome/conduit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2010/03/26 13:58:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2010/07/13 20:37:02 ajacoutot Exp $
 
 # XXX the following modules are commented in PLIST
 # N800Module ===> needs HAL which we don't provide
@@ -10,7 +10,7 @@ COMMENT=		synchronization application for GNOME
 
 GNOME_PROJECT=		conduit
 GNOME_VERSION=		0.3.17
-PKGNAME=		${DISTNAME}p0
+REVISION=		0
 
 HOMEPAGE=		http://www.conduit-project.org/
 
diff --git a/x11/gnome/dasher/Makefile b/x11/gnome/dasher/Makefile
index 5f9b293970e..9cc2279347c 100644
--- a/x11/gnome/dasher/Makefile
+++ b/x11/gnome/dasher/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.25 2010/04/24 16:50:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2010/07/13 20:37:02 ajacoutot Exp $
 
 COMMENT=		graphical predictive text input system
 
 GNOME_PROJECT=		dasher
 GNOME_VERSION=		4.11
-PKGNAME=		${DISTNAME}p0
+REVISION=		1
 
 CATEGORIES=		x11
 
diff --git a/x11/gnome/development-monitor/Makefile b/x11/gnome/development-monitor/Makefile
index 7a4ffbb765c..2546796d85f 100644
--- a/x11/gnome/development-monitor/Makefile
+++ b/x11/gnome/development-monitor/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2010/04/04 07:53:52 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	follow GNOME development activity
 
 GNOME_PROJECT=	gnome-development-monitor
 GNOME_VERSION=	0.1
-PKGNAME=	${DISTNAME}p1
+REVISION=	1
 
 CATEGORIES=	devel
 
diff --git a/x11/gnome/f-spot/Makefile b/x11/gnome/f-spot/Makefile
index 2ff5d6352a9..0121377ff34 100644
--- a/x11/gnome/f-spot/Makefile
+++ b/x11/gnome/f-spot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2010/07/09 06:50:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.34 2010/07/13 20:37:03 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,7 +6,7 @@ COMMENT=		personal photo management application for GNOME
 
 GNOME_VERSION=		0.7.0
 GNOME_PROJECT=		f-spot
-PKGNAME=		${GNOME_PROJECT}-${GNOME_VERSION}p1
+REVISION=		1
 
 CATEGORIES=		graphics
 
diff --git a/x11/gnome/gdl/Makefile b/x11/gnome/gdl/Makefile
index a42c4853c6b..3795764a172 100644
--- a/x11/gnome/gdl/Makefile
+++ b/x11/gnome/gdl/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2010/04/24 16:50:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	GNOME Devtool Libraries (GDL)
 
 GNOME_PROJECT=	gdl
 GNOME_VERSION=	2.30.0
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 SHARED_LIBS +=  gdl-1                1.0      # .3.0
 
diff --git a/x11/gnome/gdm/Makefile b/x11/gnome/gdm/Makefile
index 519350e65fd..7b85d5482d4 100644
--- a/x11/gnome/gdm/Makefile
+++ b/x11/gnome/gdm/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.75 2010/07/07 16:37:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.76 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=		GNOME display manager
 
 GNOME_PROJECT=		gdm
 GNOME_VERSION=		2.20.11
-PKGNAME=		${DISTNAME}p0
+REVISION=		0
 
 HOMEPAGE=		http://projects.gnome.org/gdm/
 
diff --git a/x11/gnome/ghex/Makefile b/x11/gnome/ghex/Makefile
index 62a39be7ce3..7011e7c381e 100644
--- a/x11/gnome/ghex/Makefile
+++ b/x11/gnome/ghex/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2010/04/24 16:50:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=		binary editor
 
 GNOME_PROJECT=		ghex
 GNOME_VERSION=		2.24.0
-PKGNAME=		${DISTNAME}p7
+REVISION=		7
 
 SHARED_LIBS +=  gtkhex               1.0      # .0.0
 CATEGORIES=		sysutils editors
diff --git a/x11/gnome/gyrus/Makefile b/x11/gnome/gyrus/Makefile
index 5e12c07a382..dad35267e08 100644
--- a/x11/gnome/gyrus/Makefile
+++ b/x11/gnome/gyrus/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2010/04/24 16:50:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	Cyrus imapd administration GUI
 
 GNOME_PROJECT=	gyrus
 GNOME_VERSION=	0.3.9
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 CATEGORIES=	mail
 
diff --git a/x11/gnome/icon-theme-extras/Makefile b/x11/gnome/icon-theme-extras/Makefile
index 6ecfd432929..a1022058634 100644
--- a/x11/gnome/icon-theme-extras/Makefile
+++ b/x11/gnome/icon-theme-extras/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2010/05/01 22:22:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	extra icon theme for GNOME
 
 GNOME_PROJECT=	gnome-icon-theme-extras
 GNOME_VERSION=	2.30.1
-PKGNAME=	${DISTNAME}p3
+REVISION=	3
 
 CATEGORIES=	x11
 
diff --git a/x11/gnome/icon-theme-symbolic/Makefile b/x11/gnome/icon-theme-symbolic/Makefile
index 4783be7dc53..d3a7ea7c136 100644
--- a/x11/gnome/icon-theme-symbolic/Makefile
+++ b/x11/gnome/icon-theme-symbolic/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2010/06/08 21:34:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	base icon theme extension for special UI contexts
 
 GNOME_PROJECT=	gnome-icon-theme-symbolic
 GNOME_VERSION=	2.30.0
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 CATEGORIES=	x11
 
diff --git a/x11/gnome/keyring-query/Makefile b/x11/gnome/keyring-query/Makefile
index 971edf1f5d4..d52d75d4ede 100644
--- a/x11/gnome/keyring-query/Makefile
+++ b/x11/gnome/keyring-query/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2010/04/20 20:11:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=		provide limited command-line access to the GNOME keyring
 
 GNOME_PROJECT=		gnome-keyring-query
 GNOME_VERSION=		0.0.1
-PKGNAME=		${DISTNAME}p4
+REVISION=		4
 DISTFILES=
 CATEGORIES=		sysutils
 
diff --git a/x11/gnome/libbonoboui/Makefile b/x11/gnome/libbonoboui/Makefile
index 23b31ae1a0f..6839d778e22 100644
--- a/x11/gnome/libbonoboui/Makefile
+++ b/x11/gnome/libbonoboui/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.42 2010/04/24 16:50:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.43 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	user interface components for bonobo
 
 GNOME_PROJECT=	libbonoboui
 GNOME_VERSION=	2.24.3
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 SHARED_LIBS +=	bonoboui-2	3.0        # .0.0
 
diff --git a/x11/gnome/libgnomecanvas/Makefile b/x11/gnome/libgnomecanvas/Makefile
index 66ac5db5d54..99bb871f42e 100644
--- a/x11/gnome/libgnomecanvas/Makefile
+++ b/x11/gnome/libgnomecanvas/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.39 2010/04/24 17:00:34 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.40 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	graphics library for GNOME
 
 GNOME_PROJECT=	libgnomecanvas
 GNOME_VERSION=	2.30.1
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 SHARED_LIBS +=	gnomecanvas-2        2002.0   # .2001.0
 
diff --git a/x11/gnome/libgnomecanvasmm/Makefile b/x11/gnome/libgnomecanvasmm/Makefile
index b8fcb65d53c..37a4c491bd2 100644
--- a/x11/gnome/libgnomecanvasmm/Makefile
+++ b/x11/gnome/libgnomecanvasmm/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2010/04/26 13:34:30 jasper Exp $
+# $OpenBSD: Makefile,v 1.19 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=		C++ interface to the graphics library for GNOME
 
 GNOME_PROJECT=		libgnomecanvasmm
 GNOME_VERSION=		2.26.0
-PKGNAME=		${DISTNAME}p0
+REVISION=		0
 SHARED_LIBS=		gnomecanvasmm-2.6	1.0	# .1.6
 
 # LGPLv2.1
diff --git a/x11/gnome/libgnomecups/Makefile b/x11/gnome/libgnomecups/Makefile
index 458619fb38c..3cf662747c0 100644
--- a/x11/gnome/libgnomecups/Makefile
+++ b/x11/gnome/libgnomecups/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2009/11/22 16:40:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=		GNOME library for CUPS interaction
 
 GNOME_PROJECT=		libgnomecups
 GNOME_VERSION=		0.2.3
-PKGNAME=		${DISTNAME}p6
+REVISION=		6
 SHARED_LIBS=		gnomecups-1.0	1.0 # .1.0
 
 CATEGORIES=		devel
diff --git a/x11/gnome/libgnomeprintui/Makefile b/x11/gnome/libgnomeprintui/Makefile
index 0598bb0b183..34740aa5e95 100644
--- a/x11/gnome/libgnomeprintui/Makefile
+++ b/x11/gnome/libgnomeprintui/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.32 2010/04/24 17:00:34 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.33 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=		user interface components for libgnomeprint
 
 GNOME_PROJECT=		libgnomeprintui
 GNOME_VERSION=		2.18.5
-PKGNAME=		${DISTNAME}p0
+REVISION=		0
 
 SHARED_LIBS +=	gnomeprintui-2-2    2.0      # .1.0
 CATEGORIES=		devel
diff --git a/x11/gnome/libgnomeui/Makefile b/x11/gnome/libgnomeui/Makefile
index ce97ead367f..ad1977ee748 100644
--- a/x11/gnome/libgnomeui/Makefile
+++ b/x11/gnome/libgnomeui/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.38 2010/04/24 17:00:34 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=		user interface components for GNOME
 
 GNOME_PROJECT=		libgnomeui
 GNOME_VERSION=		2.24.3
-PKGNAME=		${DISTNAME}p1
+REVISION=		1
 
 SHARED_LIBS +=	gnomeui-2      2400.0         # .2400.2
 
diff --git a/x11/gnome/libgnomeuimm/Makefile b/x11/gnome/libgnomeuimm/Makefile
index 0bdd5f834e8..db2a9f30ece 100644
--- a/x11/gnome/libgnomeuimm/Makefile
+++ b/x11/gnome/libgnomeuimm/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2010/04/24 17:00:34 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	C++ interface for libgnomeui
 
 GNOME_PROJECT=	libgnomeuimm
 GNOME_VERSION=	2.28.0
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 SHARED_LIBS +=	gnomeuimm-2.6        1.0      # .1.4
 
diff --git a/x11/gnome/libgweather/Makefile b/x11/gnome/libgweather/Makefile
index ec1ce616335..2d633de95a5 100755
--- a/x11/gnome/libgweather/Makefile
+++ b/x11/gnome/libgweather/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/04/24 17:00:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2010/07/13 20:37:03 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,7 +6,7 @@ COMMENT=		weather information access library
 
 GNOME_PROJECT=		libgweather
 GNOME_VERSION=		2.30.0
-PKGNAME=		${DISTNAME}p0
+REVISION=		0
 
 SHARED_LIBS +=		gweather             3.0      # .3.0
 
diff --git a/x11/gnome/libxklavier/Makefile b/x11/gnome/libxklavier/Makefile
index 4b6215c309a..dcdad28b4bf 100644
--- a/x11/gnome/libxklavier/Makefile
+++ b/x11/gnome/libxklavier/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2010/04/24 17:00:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=		utility library for XKB
 
 GNOME_PROJECT=		libxklavier
 GNOME_VERSION=		5.0
-PKGNAME=		${DISTNAME}p0
+REVISION=		0
 
 SHARED_LIBS +=  xklavier             15.0     # .16.0
 
diff --git a/x11/gnome/mag/Makefile b/x11/gnome/mag/Makefile
index 17ca6d737c7..96b9a5c15c9 100644
--- a/x11/gnome/mag/Makefile
+++ b/x11/gnome/mag/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2010/04/24 17:00:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=		screen magnifier for the GNOME desktop
 
 GNOME_PROJECT=		gnome-mag
 GNOME_VERSION=		0.16.1
-PKGNAME=		${DISTNAME}p0
+REVISION=		0
 
 SHARED_LIBS +=	gnome-mag            1.0      # .5.9
 CATEGORIES=		sysutils
diff --git a/x11/gnome/metacity/Makefile b/x11/gnome/metacity/Makefile
index c7014a7993b..bd55572abe5 100644
--- a/x11/gnome/metacity/Makefile
+++ b/x11/gnome/metacity/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.44 2010/05/11 20:49:39 jasper Exp $
+# $OpenBSD: Makefile,v 1.45 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	lightweight window manager
 
 GNOME_PROJECT=	metacity
 GNOME_VERSION=	2.30.1
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 SHARED_LIBS +=  metacity-private     1.0      # .0.0
 
diff --git a/x11/gnome/mime-data/Makefile b/x11/gnome/mime-data/Makefile
index 5fc33acd167..0bd04ce6bee 100644
--- a/x11/gnome/mime-data/Makefile
+++ b/x11/gnome/mime-data/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2009/10/15 15:55:16 jasper Exp $
+# $OpenBSD: Makefile,v 1.24 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=		MIME and Application database for GNOME
 
 GNOME_PROJECT=		gnome-mime-data
 GNOME_VERSION=		2.18.0
 CATEGORIES=		x11
-PKGNAME=		${DISTNAME}p2
+REVISION=		2
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/x11/gnome/mono-gnome-desktop/Makefile b/x11/gnome/mono-gnome-desktop/Makefile
index 86c62968ff1..5b55b84ef9b 100644
--- a/x11/gnome/mono-gnome-desktop/Makefile
+++ b/x11/gnome/mono-gnome-desktop/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2010/05/15 09:40:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	.NET language bindings for the GNOME desktop
 
 GNOME_PROJECT=	gnome-desktop-sharp
 GNOME_VERSION=	2.24.0
-PKGNAME=	mono-gnome-desktop-${VERSION}p4
+PKGNAME=	mono-gnome-desktop-${VERSION}
+REVISION=	4
 
 CATEGORIES=	x11
 
diff --git a/x11/gnome/mono-gnome/Makefile b/x11/gnome/mono-gnome/Makefile
index 980e45794d6..c1efc42c443 100644
--- a/x11/gnome/mono-gnome/Makefile
+++ b/x11/gnome/mono-gnome/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2010/05/15 09:40:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	.NET language bindings for assorted GNOME libraries
 
 GNOME_PROJECT=	gnome-sharp
 GNOME_VERSION=	2.24.1
-PKGNAME=	mono-gnome-${VERSION}p3
+PKGNAME=	mono-gnome-${VERSION}
+REVISION=	3
 
 CATEGORIES=	x11
 
diff --git a/x11/gnome/mousetweaks/Makefile b/x11/gnome/mousetweaks/Makefile
index 9b8758474c0..7aa403f09b3 100644
--- a/x11/gnome/mousetweaks/Makefile
+++ b/x11/gnome/mousetweaks/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2010/07/10 21:24:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	mouse accessibility enhancements for GNOME
 
 GNOME_PROJECT=	mousetweaks
 GNOME_VERSION=	2.30.2
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 HOMEPAGE=	http://live.gnome.org/Mousetweaks/Home
 
diff --git a/x11/gnome/nautilus-open-terminal/Makefile b/x11/gnome/nautilus-open-terminal/Makefile
index bc09b3bf054..d5545d551a5 100644
--- a/x11/gnome/nautilus-open-terminal/Makefile
+++ b/x11/gnome/nautilus-open-terminal/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/04/24 17:00:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2010/07/13 20:37:03 ajacoutot Exp $
 
 # dlopen() module
 SHARED_ONLY=	Yes
@@ -7,7 +7,7 @@ COMMENT=	open terminal from a nautilus folder
 
 GNOME_PROJECT=	nautilus-open-terminal
 GNOME_VERSION=	0.18
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 CATEGORIES=	sysutils
 
diff --git a/x11/gnome/nautilus-sendto/Makefile b/x11/gnome/nautilus-sendto/Makefile
index a4ca1af7da2..871f2695e75 100644
--- a/x11/gnome/nautilus-sendto/Makefile
+++ b/x11/gnome/nautilus-sendto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/04/24 22:58:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2010/07/13 20:37:03 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	applications integration into Nautilus
 
 GNOME_PROJECT=	nautilus-sendto
 GNOME_VERSION=	2.28.4
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 CATEGORIES=	misc net
 
diff --git a/x11/gnome/nautilus/Makefile b/x11/gnome/nautilus/Makefile
index 248faee09fc..6f9d19d0009 100644
--- a/x11/gnome/nautilus/Makefile
+++ b/x11/gnome/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.64 2010/05/18 14:37:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.65 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=		GNOME shell and file manager
 
@@ -15,7 +15,7 @@ COMMENT=		GNOME shell and file manager
 
 GNOME_PROJECT=		nautilus
 GNOME_VERSION=		2.30.1
-PKGNAME=		${DISTNAME}p1
+REVISION=		1
 
 SHARED_LIBS +=	nautilus-extension   2.0      # .2.0
 
diff --git a/x11/gnome/panel/Makefile b/x11/gnome/panel/Makefile
index 4d3097fabc5..312405abedf 100644
--- a/x11/gnome/panel/Makefile
+++ b/x11/gnome/panel/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.74 2010/07/07 16:38:27 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.75 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	GNOME panel
 
 GNOME_PROJECT=	gnome-panel
 GNOME_VERSION=	2.30.2
-PKGNAME=	${DISTNAME}p1
+REVISION=	1
 
 SHARED_LIBS=	panel-applet-2       4.0      # .2.67
 
diff --git a/x11/gnome/planner/Makefile b/x11/gnome/planner/Makefile
index ae58fff6112..d18db334be7 100755
--- a/x11/gnome/planner/Makefile
+++ b/x11/gnome/planner/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.28 2010/04/24 17:00:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.29 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=		project management application
 
 GNOME_PROJECT=		planner
 GNOME_VERSION=		0.14.4
-PKGNAME=		${DISTNAME}p8
+REVISION=		8
 
 CATEGORIES=		x11
 
diff --git a/x11/gnome/py-gnome-extras/Makefile b/x11/gnome/py-gnome-extras/Makefile
index 491e253fd79..c2faff8963e 100644
--- a/x11/gnome/py-gnome-extras/Makefile
+++ b/x11/gnome/py-gnome-extras/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.22 2010/04/24 17:00:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	additional Python bindings for GNOME
 
 GNOME_PROJECT=	gnome-python-extras
 GNOME_VERSION=	2.25.3
-PKGNAME=	py-gnome-extras-${VERSION}p5
+PKGNAME=	py-gnome-extras-${VERSION}
+REVISION=	5
 
 HOMEPAGE=	http://www.pygtk.org/
 
diff --git a/x11/gnome/py-gnome/Makefile b/x11/gnome/py-gnome/Makefile
index 44c39af5143..4e5e4486cb4 100644
--- a/x11/gnome/py-gnome/Makefile
+++ b/x11/gnome/py-gnome/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2010/04/24 17:00:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	GNOME Python bindings
 
 GNOME_PROJECT=	gnome-python
 GNOME_VERSION=	2.28.1
-PKGNAME=	py-gnome-${VERSION}p0
+PKGNAME=	py-gnome-${VERSION}
+REVISION=	0
 
 HOMEPAGE=	http://www.pygtk.org/
 
diff --git a/x11/gnome/py-nautilus/Makefile b/x11/gnome/py-nautilus/Makefile
index 0df770a31f4..ed1a8d90bd4 100644
--- a/x11/gnome/py-nautilus/Makefile
+++ b/x11/gnome/py-nautilus/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2010/04/24 17:00:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	nautilus Python bindings
 
 GNOME_PROJECT=	nautilus-python
 GNOME_VERSION=	0.6.1
-PKGNAME=	py-nautilus-${GNOME_VERSION}p0
+PKGNAME=	py-nautilus-${GNOME_VERSION}
+REVISION=	0
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/x11/gnome/screensaver/Makefile b/x11/gnome/screensaver/Makefile
index 460a2e8f864..47f8416c587 100644
--- a/x11/gnome/screensaver/Makefile
+++ b/x11/gnome/screensaver/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2010/04/28 15:18:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=	screen saver and locker for GNOME
 
 GNOME_PROJECT=	gnome-screensaver
 GNOME_VERSION=	2.30.0
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/x11/gnome/seahorse-plugins/Makefile b/x11/gnome/seahorse-plugins/Makefile
index 47b0e089b31..660edffbfdc 100644
--- a/x11/gnome/seahorse-plugins/Makefile
+++ b/x11/gnome/seahorse-plugins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/06/13 21:02:20 landry Exp $
+# $OpenBSD: Makefile,v 1.17 2010/07/13 20:37:03 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	plugins and utilities for seahorse
 
 GNOME_PROJECT=	seahorse-plugins
 GNOME_VERSION=	2.30.1
-PKGNAME=	${DISTNAME}p1
+REVISION=	1
 
 CATEGORIES=	security
 
diff --git a/x11/gnome/session/Makefile b/x11/gnome/session/Makefile
index 34df8b496d9..ba99537757e 100644
--- a/x11/gnome/session/Makefile
+++ b/x11/gnome/session/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.110 2010/07/07 16:37:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.111 2010/07/13 20:37:03 ajacoutot Exp $
 
 COMMENT=		GNOME session
 
 GNOME_PROJECT=		gnome-session
 GNOME_VERSION=		2.30.2
-PKGNAME=		${DISTNAME}p0
+REVISION=		0
 
 CATEGORIES=		x11
 
diff --git a/x11/gnome/speech/Makefile b/x11/gnome/speech/Makefile
index a18163988aa..b3aaa6ed8e8 100644
--- a/x11/gnome/speech/Makefile
+++ b/x11/gnome/speech/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2009/10/12 18:25:53 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2010/07/13 20:37:04 ajacoutot Exp $
 
 COMMENT=		GNOME speech module
 
 GNOME_PROJECT=		gnome-speech
 GNOME_VERSION=		0.4.25
-PKGNAME=		${DISTNAME}p1
+REVISION=		1
 SHARED_LIBS +=  gnomespeech          0.1      # .7.1
 
 # LGPLv2
diff --git a/x11/gnome/ssh-askpass/Makefile b/x11/gnome/ssh-askpass/Makefile
index ad4a02bb871..a23894e3ca2 100644
--- a/x11/gnome/ssh-askpass/Makefile
+++ b/x11/gnome/ssh-askpass/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2010/04/24 17:00:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2010/07/13 20:37:04 ajacoutot Exp $
 
 COMMENT=	simple GNOME SSH passphrase grabber
 
 V=		5.1
 DISTNAME=	openssh-$Vp1
-PKGNAME=	gnome-ssh-askpass-${V}p1
+PKGNAME=	gnome-ssh-askpass-${V}
+REVISION=	1
 CATEGORIES=	x11
 
 # BSD
diff --git a/x11/gnome/system-monitor/Makefile b/x11/gnome/system-monitor/Makefile
index f03cd0f5abf..1bc1281a01a 100644
--- a/x11/gnome/system-monitor/Makefile
+++ b/x11/gnome/system-monitor/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2010/06/07 14:06:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2010/07/13 20:37:04 ajacoutot Exp $
 
 COMMENT=	sytem monitor for GNOME
 
 GNOME_PROJECT=	gnome-system-monitor
 GNOME_VERSION=	2.28.1
-PKGNAME=	${DISTNAME}p1
+REVISION=	1
 
 CATEGORIES=	sysutils
 
diff --git a/x11/gnome/themes-extras/Makefile b/x11/gnome/themes-extras/Makefile
index 63c5a61045a..f6326032953 100644
--- a/x11/gnome/themes-extras/Makefile
+++ b/x11/gnome/themes-extras/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2009/12/21 18:03:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2010/07/13 20:37:04 ajacoutot Exp $
 
 COMMENT=		themes collection for GNOME
 
 GNOME_PROJECT=		gnome-themes-extras
 GNOME_VERSION=		2.22.0
-PKGNAME=		${DISTNAME}p8
+REVISION=		8
 
 CATEGORIES=		x11
 
diff --git a/x11/gnome/tomboy/Makefile b/x11/gnome/tomboy/Makefile
index c8f68e7f55a..3ab017d5edf 100644
--- a/x11/gnome/tomboy/Makefile
+++ b/x11/gnome/tomboy/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.31 2010/05/15 09:40:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.32 2010/07/13 20:37:04 ajacoutot Exp $
 
 COMMENT=	desktop note-taking application written in C\#
 
 GNOME_PROJECT=	tomboy
 GNOME_VERSION=	1.2.1
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 CATEGORIES=	x11
 
diff --git a/x11/gnome/video-arcade/Makefile b/x11/gnome/video-arcade/Makefile
index 3e5cb6e7b58..b1f47887c03 100644
--- a/x11/gnome/video-arcade/Makefile
+++ b/x11/gnome/video-arcade/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2010/04/29 20:17:10 jasper Exp $
+# $OpenBSD: Makefile,v 1.17 2010/07/13 20:37:04 ajacoutot Exp $
 
 COMMENT=	MAME front-end for GNOME
 
 GNOME_PROJECT=	gnome-video-arcade
 GNOME_VERSION=	0.6.8
-PKGNAME=	${DISTNAME}p1
+REVISION=	1
 
 CATEGORIES=	emulators games
 
diff --git a/x11/gnome/vinagre/Makefile b/x11/gnome/vinagre/Makefile
index 27df52e14b1..b9658ffe070 100644
--- a/x11/gnome/vinagre/Makefile
+++ b/x11/gnome/vinagre/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2010/07/12 09:32:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2010/07/13 20:37:04 ajacoutot Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,7 @@ COMMENT=	VNC Client for the GNOME Desktop
 
 GNOME_VERSION=	2.30.2
 GNOME_PROJECT=	vinagre
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 
 CATEGORIES=	net
 
diff --git a/x11/gnome/vino/Makefile b/x11/gnome/vino/Makefile
index 913a29f6b56..40237544367 100644
--- a/x11/gnome/vino/Makefile
+++ b/x11/gnome/vino/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2010/04/24 22:59:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2010/07/13 20:37:04 ajacoutot Exp $
 
 COMMENT=	VNC server for remote acces to your GNOME desktop
 
 GNOME_PROJECT=	vino
 GNOME_VERSION=	2.28.2
-PKGNAME=	${DISTNAME}p1
+REVISION=	1
 
 CATEGORIES=	net
 
diff --git a/x11/gnome/yelp/Makefile b/x11/gnome/yelp/Makefile
index 4ce8bd2e882..729c1ee8e53 100644
--- a/x11/gnome/yelp/Makefile
+++ b/x11/gnome/yelp/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.54 2010/06/14 08:08:55 landry Exp $
+# $OpenBSD: Makefile,v 1.55 2010/07/13 20:37:04 ajacoutot Exp $
 
 COMMENT=		GNOME help browser
 
 GNOME_PROJECT=		yelp
 GNOME_VERSION=		2.30.1
-PKGNAME=		${DISTNAME}p0
+REVISION=		0
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/x11/gnome/zenity/Makefile b/x11/gnome/zenity/Makefile
index b11ce299918..2ef0503d53d 100644
--- a/x11/gnome/zenity/Makefile
+++ b/x11/gnome/zenity/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.35 2010/04/24 22:59:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2010/07/13 20:37:04 ajacoutot Exp $
 
 COMMENT=		dialogs for GNOME
 
 GNOME_PROJECT=		zenity
 GNOME_VERSION=		2.30.0
-PKGNAME=		${DISTNAME}p0
+REVISION=		0
 
 # LGPLv2
 PERMIT_PACKAGE_CDROM=	Yes