diff --git a/databases/py-axiom/Makefile b/databases/py-axiom/Makefile
index 8611c8e23cc..79edfddfdbb 100644
--- a/databases/py-axiom/Makefile
+++ b/databases/py-axiom/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2008/09/01 19:10:22 eric Exp $
+# $OpenBSD: Makefile,v 1.3 2009/01/02 13:07:36 djm Exp $
 
 COMMENT=	sqlite-based object persistence system for python
 
 VERSION=	0.5.28
 DISTNAME=	Axiom-${VERSION}
-PKGNAME=	py-axiom-${VERSION}
+PKGNAME=	py-axiom-${VERSION}p0
 CATEGORIES=	databases
 
 HOMEPAGE=	http://divmod.org/trac/wiki/DivmodAxiom
@@ -27,8 +27,7 @@ BUILD_DEPENDS+=	:py-epsilon-*:devel/py-epsilon \
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		:py-twisted-conch-*:devel/py-twisted/conch
 
-REGRESS_DEPENDS=${BUILD_DEPENDS} \
-	:python-bz2-${MODPY_VERSION}.*:lang/python/${MODPY_VERSION},-bz2
+REGRESS_DEPENDS=${BUILD_DEPENDS}
 
 MODPY_DISTUTILS_BUILD=	build --build-base=${WRKSRC}/.build
 MODPY_EGG_VERSION=	${VERSION}
diff --git a/databases/py-sqlite2/Makefile b/databases/py-sqlite2/Makefile
index de47bdc3052..492b4a38f3f 100644
--- a/databases/py-sqlite2/Makefile
+++ b/databases/py-sqlite2/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2008/01/30 17:33:13 eric Exp $
+# $OpenBSD: Makefile,v 1.11 2009/01/02 13:07:37 djm Exp $
 
 COMMENT=	SQLite3 adapter for Python
 
 VERSION=	2.4.1
 DISTNAME=	pysqlite-${VERSION}
-PKGNAME=	py-sqlite2-${VERSION}
+PKGNAME=	py-sqlite2-${VERSION}p0
 CATEGORIES=	databases devel
 
 MAINTAINER=	Eric Faurot <eric@openbsd.org>
@@ -21,7 +21,6 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 
 LIB_DEPENDS=	sqlite3.>=8.6::databases/sqlite3
-REGRESS_DEPENDS=	:python-bz2-*:lang/python/${MODPY_VERSION},-bz2
 
 SUBST_VARS=	VERSION
 
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index a79cde8beae..2ac06c89ede 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2008/10/28 09:28:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2009/01/02 13:07:37 djm Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,6 +6,7 @@ COMMENT=	distributed version control system by Canonical
 
 MODPY_EGG_VERSION=1.3
 DISTNAME=	bzr-${MODPY_EGG_VERSION}
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	devel
 
 HOMEPAGE=	http://bazaar-vcs.org/
@@ -20,9 +21,7 @@ MASTER_SITES=	${HOMEPAGE}releases/src/
 
 MODULES=	lang/python
 
-RUN_DEPENDS+=	::lang/python/${MODPY_VERSION},-bz2 \
-		::lang/python/${MODPY_VERSION},-expat \
-		::net/py-curl \
+RUN_DEPENDS+=	::net/py-curl \
 		::security/py-paramiko \
 		::textproc/gdiff
 
diff --git a/devel/iso-codes/Makefile b/devel/iso-codes/Makefile
index 4f8858775c2..199de810387 100644
--- a/devel/iso-codes/Makefile
+++ b/devel/iso-codes/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2008/11/09 19:11:56 jasper Exp $
+# $OpenBSD: Makefile,v 1.13 2009/01/02 13:07:37 djm Exp $
 
 COMMENT=	lists of the country, language and currency iso names
 
 DISTNAME=	iso-codes-3.3
+PKGNAME=	${DISTNAME}p0
 
 CATEGORIES=	devel
 
@@ -21,8 +22,7 @@ CONFIGURE_STYLE=gnu
 MODULES=	lang/python
 MODPY_RUNDEP=	No
 
-BUILD_DEPENDS=	::devel/gettext \
-		:python-expat-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-expat
+BUILD_DEPENDS=	::devel/gettext
 
 FAKE_FLAGS=	pkgconfigdir=${PREFIX}/lib/pkgconfig
 
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 7d7adadaab1..4fd4f78de06 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.15 2009/01/01 17:27:22 wcmaier Exp $
+# $OpenBSD: Makefile,v 1.16 2009/01/02 13:07:37 djm Exp $
 
 COMMENT=		fast, lightweight source control management
 
 MODPY_EGG_VERSION=	1.1.2
 DISTNAME=		mercurial-${MODPY_EGG_VERSION}
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=     	devel
 HOMEPAGE=		http://www.selenic.com/mercurial/
 
@@ -19,8 +20,7 @@ MASTER_SITES=		http://www.selenic.com/mercurial/release/
 
 MODULES=		lang/python
 
-REGRESS_DEPENDS=	:python-bz2-*:lang/python/${MODPY_VERSION},-bz2 \
-			::archivers/unzip
+REGRESS_DEPENDS=	::archivers/unzip
 
 FILES=			hgeditor hgweb.cgi hgwebdir.cgi
 
diff --git a/devel/py-twisted/core/Makefile b/devel/py-twisted/core/Makefile
index b35d221341d..8fe6104b93e 100644
--- a/devel/py-twisted/core/Makefile
+++ b/devel/py-twisted/core/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2008/10/28 09:28:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2009/01/02 13:07:37 djm Exp $
 
 COMMENT=	event-based Python framework (core module)
 
 VERSION=	8.1.0
 DISTNAME=	TwistedCore-${VERSION}
-PKGNAME=	py-twisted-core-${VERSION}p0
+PKGNAME=	py-twisted-core-${VERSION}p1
 
 HOMEPAGE=	http://twistedmatrix.com/trac/wiki/TwistedCore
 
@@ -12,7 +12,6 @@ MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Core/${VERSION:R}/
 
 RUN_DEPENDS=	:py-zopeinterface-*:devel/py-zopeinterface \
 		:py-openssl-*:security/py-openssl
-REGRESS_DEPENDS=:python-bz2-*:lang/python/${MODPY_VERSION},-bz2
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/py-twisted-core
diff --git a/devel/waf/Makefile b/devel/waf/Makefile
index be16c88560e..ec6d982cec1 100644
--- a/devel/waf/Makefile
+++ b/devel/waf/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2008/10/28 09:28:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2009/01/02 13:07:37 djm Exp $
 
 COMMENT=	Python-based build system
 
 DISTNAME=	waf-1.4.4
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	devel
 EXTRACT_SUFX=	.tar.bz2
 
@@ -21,10 +22,6 @@ NO_REGRESS=	Yes
 
 SUBST_VARS=	MODPY_SITEPKG
 
-# waf needs bz2 subpackage
-RUN_DEPENDS =	::lang/python/${MODPY_VERSION},-bz2
-BUILD_DEPENDS =	${RUN_DEPENDS}
-
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/waf ${WRKSRC}/wscript
 
diff --git a/games/childsplay/Makefile b/games/childsplay/Makefile
index 3026744b874..6cbd7989e34 100644
--- a/games/childsplay/Makefile
+++ b/games/childsplay/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2008/10/28 13:40:36 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2009/01/02 13:07:37 djm Exp $
 
 COMMENT=	suite of educational games for young children
 
 DISTNAME=	childsplay-0.85.1
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 EXTRACT_SUFX=	.tgz
 
 CATEGORIES=	games education
@@ -21,8 +21,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=childsplay/}
 
 MODULES=	lang/python
-RUN_DEPENDS=	:pygame->=1.7:devel/pygame \
-		:python-expat-${MODPY_VERSION}.*:lang/python/${MODPY_VERSION},-expat
+RUN_DEPENDS=	:pygame->=1.7:devel/pygame
 
 PKG_ARCH=	*
 NO_BUILD=	Yes
diff --git a/games/mnemosyne/Makefile b/games/mnemosyne/Makefile
index 045ff5b7607..d6bd252d159 100644
--- a/games/mnemosyne/Makefile
+++ b/games/mnemosyne/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2008/11/26 13:32:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2009/01/02 13:07:37 djm Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,6 +6,7 @@ COMMENT=	flash-card tool which optimises your learning process
 
 MODPY_EGG_VERSION=1.2
 DISTNAME=	mnemosyne-${MODPY_EGG_VERSION}
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	games education
 
 EXTRACT_SUFX=	.tgz
@@ -27,7 +28,6 @@ MODULES=	lang/python
 MODPY_SETUPTOOLS=yes
 
 RUN_DEPENDS=	::x11/py-qt3 \
-		:python-bz2-*:lang/python/${MODPY_VERSION},-bz2 \
 		::devel/pygame \
 		::textproc/py-xml \
 		:desktop-file-utils-*:devel/desktop-file-utils
diff --git a/misc/gutenpy/Makefile b/misc/gutenpy/Makefile
index 3f9cba2f90d..0152a222548 100644
--- a/misc/gutenpy/Makefile
+++ b/misc/gutenpy/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2008/09/26 08:20:45 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2009/01/02 13:07:37 djm Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		text reader and catalog browser for Project Gutenberg
 
 DISTNAME=		gutenpy-0.3.0
-PKGNAME=		${DISTNAME}p3
+PKGNAME=		${DISTNAME}p4
 CATEGORIES=		misc x11
 
 HOMEPAGE=		http://gutenpy.sourceforge.net/
@@ -25,8 +25,6 @@ MODULES=		lang/python
 
 BUILD_DEPENDS=		${RUN_DEPENDS}
 RUN_DEPENDS=		:py-xml-*:textproc/py-xml \
-			:python-bz2-${MODPY_VERSION}.*:lang/python/${MODPY_VERSION},-bz2 \
-			:python-expat-${MODPY_VERSION}.*:lang/python/${MODPY_VERSION},-expat \
 			:py-gtk2->=2.6.3:x11/py-gtk2
 			
 NO_BUILD=		Yes
diff --git a/net/scapy6/Makefile b/net/scapy6/Makefile
index a9421ec486f..2488aca440e 100644
--- a/net/scapy6/Makefile
+++ b/net/scapy6/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2008/03/17 20:59:47 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2009/01/02 13:07:37 djm Exp $
 
 COMMENT=	scapy extension to handle IPv6
 
 DISTNAME=	scapy6-20070426
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	net
 
 HOMEPAGE=	http://namabiiru.hongo.wide.ad.jp/scapy6
@@ -18,8 +18,7 @@ MASTER_SITES=	http://diehard.n-r-g.com/files/
 
 MODULES=	lang/python
 
-RUN_DEPENDS=	:scapy->=1.1:net/scapy \
-		:python-bz2-*:lang/python/${MODPY_VERSION},-bz2
+RUN_DEPENDS=	:scapy->=1.1:net/scapy
 
 PKG_ARCH=	*
 NO_REGRESS=	Yes
diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile
index 2f88ffbeb65..8049c010778 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2008/09/17 11:57:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2009/01/02 13:07:37 djm Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,7 +6,7 @@ COMMENT=		CUPS bindings for Python
 
 VERSION=		1.9.42
 DISTNAME=		pycups-${VERSION}
-PKGNAME=		py-cups-${VERSION}
+PKGNAME=		py-cups-${VERSION}p0
 CATEGORIES=		print
 
 HOMEPAGE=		http://cyberelk.net/tim/software/pycups/
@@ -23,7 +23,6 @@ EXTRACT_SUFX=		.tar.bz2
 MODULES=		converters/libiconv \
 			lang/python
 
-RUN_DEPENDS=		:python-bz2-*:lang/python/${MODPY_VERSION},-bz2
 LIB_DEPENDS=		cups::print/cups
 
 CFLAGS+=		-I${LOCALBASE}/include -DVERSION=\"${VERSION}\"
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index a1d6de521cc..45610abbfdb 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2008/12/16 04:55:09 fgsch Exp $
+# $OpenBSD: Makefile,v 1.35 2009/01/02 13:07:37 djm Exp $
 
 SHARED_ONLY=	Yes
 
@@ -8,7 +8,7 @@ MODPY_EGG_VERSION=0.8.4
 
 VERSION=	${MODPY_EGG_VERSION}
 DISTNAME=	PyXML-${VERSION}
-PKGNAME=	py-xml-${VERSION}p5
+PKGNAME=	py-xml-${VERSION}p6
 CATEGORIES=	textproc devel
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyxml/}
@@ -28,14 +28,9 @@ MODPY_DISTUTILS_BUILDARGS=	--with-libexpat=${X11BASE} --with-xslt
 
 # pyexpat - use our own pyexpat.so
 # otherwise use the python-expat version
-
 FLAVORS=pyexpat
 FLAVOR?=
 
-.if !${FLAVOR:L:Mpyexpat}
-BUILD_DEPENDS=	${MODPY_EXPAT_DEPENDS}
-.endif
-
 REGRESS_DEPENDS= :python-tests-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-tests
 
 DOC_DIR=	${PREFIX}/share/doc/py-xml/
diff --git a/www/plone/2.1/Makefile b/www/plone/2.1/Makefile
index 308005e29e4..baaa6700783 100644
--- a/www/plone/2.1/Makefile
+++ b/www/plone/2.1/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2008/03/20 11:42:34 winiger Exp $
+# $OpenBSD: Makefile,v 1.2 2009/01/02 13:07:37 djm Exp $
 
 DISTNAME=	Plone-2.1.4
-PKGNAME=	${DISTNAME:L}p0
+PKGNAME=	${DISTNAME:L}p1
 
 do-install:
 	${INSTALL_PROGRAM_DIR} ${MODZOPE_PRODUCTSDIR}
diff --git a/www/plone/2.5/Makefile b/www/plone/2.5/Makefile
index 40ac0ae63e5..6701bf215ad 100644
--- a/www/plone/2.5/Makefile
+++ b/www/plone/2.5/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2008/03/20 11:42:34 winiger Exp $
+# $OpenBSD: Makefile,v 1.2 2009/01/02 13:07:37 djm Exp $
 
 DISTNAME=	Plone-2.5.3-final
-PKGNAME=	${DISTNAME:S/-final//:L}p0
+PKGNAME=	${DISTNAME:S/-final//:L}p1
 
 do-install:
 	${INSTALL_PROGRAM_DIR} ${MODZOPE_PRODUCTSDIR}
diff --git a/www/plone/3.0/Makefile b/www/plone/3.0/Makefile
index 0a4023e8df5..b012fa0ac92 100644
--- a/www/plone/3.0/Makefile
+++ b/www/plone/3.0/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1 2008/03/20 11:42:35 winiger Exp $
+# $OpenBSD: Makefile,v 1.2 2009/01/02 13:07:37 djm Exp $
 
 COMMENT=	content management system built on top of Zope
 
 DISTNAME=	Plone-3.0.6
-PKGNAME=	${DISTNAME:L}
+PKGNAME=	${DISTNAME:L}p0
 
 MASTER_SITES=		https://launchpad.net/plone/3.0/3.0.6/+download/
 
diff --git a/www/plone/Makefile.inc b/www/plone/Makefile.inc
index 2169edf50e8..7e70d2bfbe5 100644
--- a/www/plone/Makefile.inc
+++ b/www/plone/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.1 2008/03/20 11:42:34 winiger Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2009/01/02 13:07:37 djm Exp $
 
 COMMENT=	content management system built on top of Zope
 
@@ -20,5 +20,4 @@ MODULES=		www/zope
 MODZOPE_VERSION?=	2.9
 PY_FLAVOR=		python${MODZOPE_PYTHON_VERSION}
 
-RUN_DEPENDS+=	:python-expat-${MODZOPE_PYTHON_VERSION}*:lang/python/${MODZOPE_PYTHON_VERSION},-expat \
-		:py-Imaging-*-${PY_FLAVOR}:graphics/py-Imaging,${PY_FLAVOR}
+RUN_DEPENDS+=	:py-Imaging-*-${PY_FLAVOR}:graphics/py-Imaging,${PY_FLAVOR}
diff --git a/www/py-formencode/Makefile b/www/py-formencode/Makefile
index 7f071f2fda8..4f136f49641 100644
--- a/www/py-formencode/Makefile
+++ b/www/py-formencode/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2008/04/15 09:35:18 martynas Exp $
+# $OpenBSD: Makefile,v 1.9 2009/01/02 13:07:37 djm Exp $
 
 COMMENT=		HTML form validation, generation, and conversion
 
 MODPY_EGG_VERSION=	1.0.1
 DISTNAME=		FormEncode-${MODPY_EGG_VERSION}
-PKGNAME=		py-formencode-${MODPY_EGG_VERSION}
+PKGNAME=		py-formencode-${MODPY_EGG_VERSION}p0
 
 CATEGORIES=		www
 
@@ -24,8 +24,7 @@ MODULES=		devel/gettext \
 			lang/python
 
 RUN_DEPENDS=		::devel/py-ruledispatch
-REGRESS_DEPENDS=	:python-expat-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-expat \
-			::www/py-formencode \
+REGRESS_DEPENDS=	::www/py-formencode \
 			::devel/py-py \
 			::devel/py-ruledispatch \
 			::devel/py-nose
diff --git a/www/py-genshi/Makefile b/www/py-genshi/Makefile
index 4ba56cc3a35..69bb3115d66 100644
--- a/www/py-genshi/Makefile
+++ b/www/py-genshi/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2008/12/27 16:36:16 fgsch Exp $
+# $OpenBSD: Makefile,v 1.3 2009/01/02 13:07:37 djm Exp $
 
 COMMENT =	toolkit for generation of output for the web
 
 MODPY_EGG_VERSION =	0.5.1
 DISTNAME =	Genshi-${MODPY_EGG_VERSION}
-PKGNAME =	py-${DISTNAME:L}
+PKGNAME =	py-${DISTNAME:L}p0
 
 CATEGORIES =   	www
 
@@ -22,7 +22,6 @@ MODULES =	lang/python
 
 MODPY_SETUPTOOLS =	Yes
 
-BUILD_DEPENDS =		${MODPY_EXPAT_DEPENDS}
 REGRESS_DEPENDS =	${BUILD_DEPENDS}
 
 post-install:
diff --git a/x11/driconf/Makefile b/x11/driconf/Makefile
index ee5ffaf444c..185ff7e1430 100644
--- a/x11/driconf/Makefile
+++ b/x11/driconf/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2008/07/11 13:07:54 wcmaier Exp $
+# $OpenBSD: Makefile,v 1.2 2009/01/02 13:07:37 djm Exp $
 
 COMMENT =		configuration utility for DRI drivers
 
 MODPY_EGG_VERSION =	0.9.1
-DISTNAME =		driconf-${MODPY_EGG_VERSION}
+DISTNAME =		driconf-${MODPY_EGG_VERSION}p0
 CATEGORIES =		x11
 
 HOMEPAGE =		http://people.freedesktop.org/~fxkuehl/driconf/dri_config_design_rev4.html
@@ -16,8 +16,7 @@ PERMIT_DISTFILES_CDROM = Yes
 PERMIT_DISTFILES_FTP =	Yes
 
 MODULES =		lang/python
-RUN_DEPENDS =		::x11/py-gtk2 \
-    			:python-expat-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-expat
+RUN_DEPENDS =		::x11/py-gtk2
 
 pre-configure:
 	@mkdir -p ${WRKSRC}/lib/driconf
diff --git a/x11/gnome/alacarte/Makefile b/x11/gnome/alacarte/Makefile
index 9bddebf53b5..827c76f02f8 100644
--- a/x11/gnome/alacarte/Makefile
+++ b/x11/gnome/alacarte/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2008/12/20 14:28:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2009/01/02 13:07:37 djm Exp $
 
 COMMENT=		easy GNOME menu editing tool
 
 GNOME_PROJECT=		alacarte
 GNOME_VERSION=		0.11.6
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 CATEGORIES=		x11
 
 # LGPLv2
@@ -18,7 +18,6 @@ MODULES=		lang/python \
 
 BUILD_DEPENDS=		${RUN_DEPENDS}
 RUN_DEPENDS=		::devel/gettext \
-			:python-expat-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-expat \
 			:fam-*:sysutils/fam \
 			:py-gtk2->=2.8.6:x11/py-gtk2 \
 			:gnome-menus-*:x11/gnome/menus \
diff --git a/x11/gnome/conduit/Makefile b/x11/gnome/conduit/Makefile
index 7b3c8cfaf13..96ffdf80fe7 100644
--- a/x11/gnome/conduit/Makefile
+++ b/x11/gnome/conduit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2008/12/21 13:58:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2009/01/02 13:07:37 djm Exp $
 
 # XXX the following modules are commented in PLIST
 # iPodModule ===> needs py-gpod which we don't provide
@@ -8,7 +8,7 @@ COMMENT=		synchronization application for GNOME
 
 GNOME_PROJECT=		conduit
 GNOME_VERSION=		0.3.15
-PKGNAME=		${DISTNAME}p4
+PKGNAME=		${DISTNAME}p5
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
@@ -25,7 +25,6 @@ BUILD_DEPENDS=		::x11/gnome/doc-utils \
 RUN_DEPENDS=		::devel/gettext \
 			::devel/xdg-utils \
 			::graphics/py-goocanvas \
-			:python-sqlite-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-sqlite \
 			::textproc/py-vobject \
 			::x11/dbus-python \
 			::textproc/rarian \
diff --git a/x11/gnome/deskbar-applet/Makefile b/x11/gnome/deskbar-applet/Makefile
index ae9a3fecc8d..dd6bcd5c36c 100644
--- a/x11/gnome/deskbar-applet/Makefile
+++ b/x11/gnome/deskbar-applet/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2008/12/19 09:58:29 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2009/01/02 13:07:37 djm Exp $
 
 COMMENT=		universal search and navigation for GNOME
 
@@ -7,6 +7,7 @@ GNOME_PROJECT=		deskbar-applet
 PKGNAME=		${DISTNAME}p0
 
 CATEGORIES=		sysutils
+PKGNAME=		${DISTNAME}p0
 
 HOMEPAGE=		http://projects.gnome.org/deskbar-applet/
 
@@ -36,8 +37,7 @@ WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
 BUILD_DEPENDS=		::x11/dbus-python \
 			::x11/gnome/doc-utils \
 			::x11/gnome/py-gnome-desktop
-RUN_DEPENDS=		::lang/python/${MODPY_VERSION},-bz2 \
-			::mail/evolution \
+RUN_DEPENDS=		::mail/evolution \
 			::x11/dbus-python \
 			::x11/gnome/py-gnome-desktop \
 			::devel/py-simplejson \
diff --git a/x11/gnome/hamster-applet/Makefile b/x11/gnome/hamster-applet/Makefile
index c10ec20bf7f..2036ac6577e 100644
--- a/x11/gnome/hamster-applet/Makefile
+++ b/x11/gnome/hamster-applet/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2008/11/28 15:34:26 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2009/01/02 13:07:37 djm Exp $
 
 COMMENT=		time tracker applet for GNOME
 
 GNOME_PROJECT=		hamster-applet
 GNOME_VERSION=		2.24.2
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		productivity
 
 HOMEPAGE=		http://live.gnome.org/ProjectHamster
@@ -28,8 +29,7 @@ USE_X11=		Yes
 
 # controlcenter2 is needed for custom keybindings
 BUILD_DEPENDS=		${RUN_DEPENDS}
-RUN_DEPENDS=		:python-sqlite-${MODPY_VERSION}*:lang/python/${MODPY_VERSION},-sqlite \
-			::x11/gnome/controlcenter2 \
+RUN_DEPENDS=		::x11/gnome/controlcenter2 \
 			::x11/gnome/py-gnome-desktop
 
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \