diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile
index 44ec47b5d2a..a14a0adfc5c 100644
--- a/lang/open-cobol/Makefile
+++ b/lang/open-cobol/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2008/10/24 16:36:56 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2009/03/16 11:40:24 espie Exp $
 
 COMMENT=	open source COBOL compiler
 
 DISTNAME=	open-cobol-1.0
+PKGNAME =	${DISTNAME}p0
 SHARED_LIBS +=	cob                  3.0      # .2.0
 CATEGORIES=	lang
 
@@ -17,7 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=open-cobol/}
 
-LIB_DEPENDS=	db:db-4.*:databases/db/v4 \
+LIB_DEPENDS=	db:db->=4,<5:databases/db/v4 \
 	 	gmp.>=6::devel/gmp
 
 MODULES=	devel/gettext
diff --git a/lang/python/2.6/Makefile b/lang/python/2.6/Makefile
index d612df5f038..1551c2f58e1 100644
--- a/lang/python/2.6/Makefile
+++ b/lang/python/2.6/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2009/01/01 21:03:27 djm Exp $
+# $OpenBSD: Makefile,v 1.4 2009/03/16 11:40:24 espie Exp $
 
 VERSION=		2.6
 PATCHLEVEL=		.1
-#PKG_PATCHLEVEL=		
+PKG_PATCHLEVEL=		p0
 SHARED_LIBS=		python2.6 1.0
 
 # PSUBDIR=		python/${VERSION}
diff --git a/mail/archivemail/Makefile b/mail/archivemail/Makefile
index b3754701c7d..0afc3279afa 100644
--- a/mail/archivemail/Makefile
+++ b/mail/archivemail/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2008/04/24 08:27:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2009/03/16 11:40:24 espie Exp $
 
 COMMENT=	archive and compress your old email
 
 VERSION=	0.7.2
 DISTNAME=	archivemail-${VERSION}
+PKGNAME =	${DISTNAME}p0
 CATEGORIES=	mail
 
 MAINTAINER=	Mathieu Sauve-Frankel <msf@openbsd.org>
diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index 4f813776543..d0ea64e3266 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2007/10/25 21:05:33 steven Exp $
+# $OpenBSD: Makefile,v 1.5 2009/03/16 11:40:24 espie Exp $
 
 COMMENT=		anti-spam SMTP server
 DISTNAME=		avenger-0.7.4
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 CATEGORIES=		mail
 
 HOMEPAGE=		http://www.mailavenger.org/
@@ -20,7 +20,7 @@ WANTLIB=		c crypto m pcap ssl stdc++
 MASTER_SITES=		${HOMEPAGE}/dist/
 
 USE_LIBTOOL=		Yes
-LIB_DEPENDS=		lib/db4/db.>=4:db-4.*:databases/db/v4
+LIB_DEPENDS=		lib/db4/db.>=4:db->=4,<5:databases/db/v4
 
 SEPARATE_BUILD=		concurrent
 CONFIGURE_STYLE=	gnu
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 083c204948d..08bb70d25e2 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2007/12/19 21:44:08 bernd Exp $
+# $OpenBSD: Makefile,v 1.10 2009/03/16 11:40:25 espie Exp $
 
 COMMENT=	bayesian spam filter
 
 DISTNAME=	bogofilter-1.1.6
+PKGNAME =	${DISTNAME}p0
 CATEGORIES=	mail
 
 MAINTAINER=	Marc Espie <espie@openbsd.org>
@@ -24,7 +25,7 @@ FLAVOR?=
 
 .if ${FLAVOR:L} == "db4"
 DB_DIR=			db4
-LIB_DEPENDS+=		lib/db4/db.>=4:db-4.*:databases/db/v4
+LIB_DEPENDS+=		lib/db4/db.>=4:db->=4,<5:databases/db/v4
 .elif ${FLAVOR:L} == "sqlite3"
 DB_ENGINE=		sqlite3
 LIB_DEPENDS+=		sqlite3.>=8::databases/sqlite3
@@ -33,7 +34,7 @@ DB_ENGINE=		qdbm
 LIB_DEPENDS+=		qdbm.>=11::databases/qdbm
 .else
 DB_DIR=			db
-LIB_DEPENDS+=		lib/db/db.=3:db-3.*:databases/db/v3
+LIB_DEPENDS+=		lib/db/db.=3:db->=3,<4:databases/db/v3
 .endif
 
 DB_ENGINE?=		db