diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 9288631c66..4352af5c07 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2011/04/10 18:00:23 jasper Exp $
+# $OpenBSD: Makefile,v 1.22 2011/09/12 18:02:34 naddy Exp $
 
 COMMENT=	X amateur station tracking and info reporting
 
 DISTNAME=	xastir-1.8.2
-REVISION=	12
+REVISION=	13
 CATEGORIES=    	comms hamradio geo
 
 HOMEPAGE=	http://www.xastir.org/
diff --git a/databases/db/v4/Makefile b/databases/db/v4/Makefile
index 22a4956ebe..cc359244ff 100644
--- a/databases/db/v4/Makefile
+++ b/databases/db/v4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2011/09/12 10:16:57 espie Exp $
+# $OpenBSD: Makefile,v 1.51 2011/09/12 18:02:34 naddy Exp $
 
 COMMENT-java=	Java bindings for Berkeley DB, revision ${REV}
 
@@ -12,8 +12,8 @@ PKGSPEC-tcl =   db-tcl->=4,<5
 PKGNAME-java=	db-java-${VERSION}
 PKGNAME-tcl=	db-tcl-${VERSION}
 EPOCH-main=	0
-REVISION-java=	9
-REVISION-tcl=	10
+REVISION-java=	10
+REVISION-tcl=	11
 DBLIBDIR=	lib/db4
 SHARED_LIBS +=	db                   5.0      # .0.0
 SHARED_LIBS +=	db_cxx               6.0      # .0.0
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 4572a183c2..3b79add3b1 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.91 2011/09/12 12:07:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.92 2011/09/12 18:02:34 naddy Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,6 +6,7 @@ COMMENT=		unified backend for PIM programs
 
 GNOME_PROJECT=		evolution-data-server
 GNOME_VERSION=		3.0.3
+REVISION=		0
 
 CATEGORIES=		databases
 
diff --git a/databases/p5-BerkeleyDB/Makefile b/databases/p5-BerkeleyDB/Makefile
index 74a3268334..f9dc48b438 100644
--- a/databases/p5-BerkeleyDB/Makefile
+++ b/databases/p5-BerkeleyDB/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2011/03/23 19:52:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2011/09/12 18:02:34 naddy Exp $
 
 COMMENT=		Berkeley DB module
 SHARED_ONLY=		Yes
 
 DISTNAME=		BerkeleyDB-0.43
+REVISION=		0
 CATEGORIES=		databases
 MODULES=		cpan
 
diff --git a/databases/ruby-bdb/Makefile b/databases/ruby-bdb/Makefile
index 399ecdbf0a..24a09c91ab 100755
--- a/databases/ruby-bdb/Makefile
+++ b/databases/ruby-bdb/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.27 2011/07/19 18:00:16 jeremy Exp $
+# $OpenBSD: Makefile,v 1.28 2011/09/12 18:02:34 naddy Exp $
 
 COMMENT=		ruby interface to Berkeley DB
 DISTNAME=		bdb-0.6.5
-REVISION=		1
+REVISION=		2
 CATEGORIES=		databases
 
 HOMEPAGE=		http://rubyforge.org/projects/bdb/
diff --git a/devel/apr-util/Makefile b/devel/apr-util/Makefile
index ff5e5ff98f..4a7697f2b1 100644
--- a/devel/apr-util/Makefile
+++ b/devel/apr-util/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.29 2011/02/12 21:06:57 pea Exp $
+# $OpenBSD: Makefile,v 1.30 2011/09/12 18:02:34 naddy Exp $
 
 COMMENT=	companion library to APR
 
 V=		1.2.10
 DISTNAME=	apr-util-$V
 FULLPKGNAME=	apr-util${MT}-$V${FLAVOR_EXT:S/-mt//}
-REVISION =	5
+REVISION =	6
 SHARED_LIBS +=	aprutil-1${MT}          2.11     # .2.11
 
 CATEGORIES=	devel
diff --git a/devel/poedit/Makefile b/devel/poedit/Makefile
index 41d478f67f..a1f3738bd9 100644
--- a/devel/poedit/Makefile
+++ b/devel/poedit/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2010/11/26 14:44:27 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2011/09/12 18:02:34 naddy Exp $
 
 COMMENT=	cross-platform gettext catalogs (PO-files) editor
 
 DISTNAME=	poedit-1.3.7
-REVISION =	3
+REVISION =	4
 CATEGORIES=	devel
 
 HOMEPAGE=	http://www.poedit.net/
diff --git a/lang/open-cobol/Makefile b/lang/open-cobol/Makefile
index 5b5c9d3ef1..47d535c3e1 100644
--- a/lang/open-cobol/Makefile
+++ b/lang/open-cobol/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2010/11/26 14:50:10 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/12 18:02:34 naddy Exp $
 
 COMMENT=	open source COBOL compiler
 
 DISTNAME=	open-cobol-1.0
-REVISION=	0
+REVISION=	1
 SHARED_LIBS +=	cob                  3.0      # .2.0
 CATEGORIES=	lang
 
diff --git a/lang/python/2.4/Makefile b/lang/python/2.4/Makefile
index 2717d6d8d1..515007a752 100644
--- a/lang/python/2.4/Makefile
+++ b/lang/python/2.4/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.38 2011/07/18 15:32:18 naddy Exp $
+# $OpenBSD: Makefile,v 1.39 2011/09/12 18:02:34 naddy Exp $
 
 VERSION=		2.4
 PATCHLEVEL=		.6
 REVISION=		10
+REVISION-bsddb=		11
 SHARED_LIBS=		python2.4 1.0
 
 ALL_TARGET?=	all ${WRKSRC}/Lib/plat-openbsd5
diff --git a/lang/python/2.5/Makefile b/lang/python/2.5/Makefile
index 61dd43aa13..b220443e31 100644
--- a/lang/python/2.5/Makefile
+++ b/lang/python/2.5/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.51 2011/09/06 20:58:08 rpointel Exp $
+# $OpenBSD: Makefile,v 1.52 2011/09/12 18:02:34 naddy Exp $
 
 VERSION=		2.5
 PATCHLEVEL=		.4
 REVISION=		14
+REVISION-bsddb=		15
 SHARED_LIBS=		python2.5 1.0
 
 AUTOCONF_VERSION=	2.61
diff --git a/lang/python/2.7/Makefile b/lang/python/2.7/Makefile
index 0823eea80d..e0951a365c 100644
--- a/lang/python/2.7/Makefile
+++ b/lang/python/2.7/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2011/09/06 20:58:08 rpointel Exp $
+# $OpenBSD: Makefile,v 1.14 2011/09/12 18:02:34 naddy Exp $
 
 VERSION =		2.7
 PATCHLEVEL =		.1
 REVISION =		11
+REVISION-bsddb =	12
 SHARED_LIBS =		python2.7 0.0
 
 AUTOCONF_VERSION =	2.65
diff --git a/lang/rubinius/Makefile b/lang/rubinius/Makefile
index 0647cd8547..05b1c3d3b6 100644
--- a/lang/rubinius/Makefile
+++ b/lang/rubinius/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2011/07/20 22:51:32 jeremy Exp $
+# $OpenBSD: Makefile,v 1.15 2011/09/12 18:02:34 naddy Exp $
 
 SHARED_ONLY=	Yes
 
@@ -7,6 +7,7 @@ COMMENT =	Ruby virtual machine and core library
 V=		1.2.4
 DISTNAME =	rubinius-${V}-20110705
 PKGNAME =	rubinius-$V
+REVISION =	0
 
 CATEGORIES =	lang lang/ruby
 
diff --git a/lang/ruby/1.9/Makefile b/lang/ruby/1.9/Makefile
index 2939fb0d71..99e3d2029a 100644
--- a/lang/ruby/1.9/Makefile
+++ b/lang/ruby/1.9/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2011/07/19 17:08:54 jeremy Exp $
+# $OpenBSD: Makefile,v 1.16 2011/09/12 18:02:34 naddy Exp $
 
 COMMENT-main =		object oriented script language with threads
 COMMENT-gdbm =		gdbm interface for Ruby
@@ -15,6 +15,8 @@ PKGNAME-gdbm =		ruby-gdbm-${VERSION}.${PATCHLEVEL}
 PKGNAME-dbm =		ruby-dbm-${VERSION}.${PATCHLEVEL}
 PKGNAME-tk =		ruby-tk-${VERSION}.${PATCHLEVEL}
 
+REVISION-dbm =		0
+
 PKGSPEC-main =		ruby->=1.9,<1.10
 
 CONFIGURE_ARGS =	--program-suffix=19 \
diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index f10ac3ecf4..ffc53d89e7 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2011/03/29 12:03:53 pea Exp $
+# $OpenBSD: Makefile,v 1.16 2011/09/12 18:02:34 naddy Exp $
 
 COMMENT=		anti-spam SMTP server
 DISTNAME=		avenger-0.8.1
+REVISION=		0
 CATEGORIES=		mail
 
 HOMEPAGE=		http://www.mailavenger.org/
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index f1afab5aba..1b81648316 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2010/11/26 14:50:10 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2011/09/12 18:02:35 naddy Exp $
 
 COMMENT =	bayesian spam filter
 
 DISTNAME =	bogofilter-1.1.6
-REVISION =	1
+REVISION =	2
 CATEGORIES =	mail
 
 MAINTAINER =	Marc Espie <espie@openbsd.org>
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index d20c76c9a8..0cfa525282 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.62 2011/09/09 06:46:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.63 2011/09/12 18:02:35 naddy Exp $
 
 COMMENT-main=	Cyrus IMAP server
 COMMENT-perl=	perl utils for the Cyrus IMAP server
@@ -8,6 +8,8 @@ DISTNAME=	cyrus-imapd-${V}
 PKGNAME-main=	${DISTNAME}
 FULLPKGNAME-perl=cyrus-imapd-perl-${V}
 FULLPKGPATH-perl=mail/cyrus-imapd,-perl
+REVISION-main=	0
+REVISION-perl=	0
 
 CATEGORIES=	mail
 
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index 5c4564d7ea..e15ebf8b12 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2010/11/26 14:50:10 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2011/09/12 18:02:35 naddy Exp $
 
 COMMENT= 	synchronize IMAP4 and maildir mailboxes
 
 DISTNAME=	isync-1.0.4
-REVISION =	1
+REVISION =	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=isync/}
 
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index cbf273e7e1..c7d2f08dde 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/11/26 14:44:27 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/12 18:02:35 naddy Exp $
 
 COMMENT-main=	fully featured POP3 and IMAP4 proxy server
 COMMENT-ldap=	LDAP backend for perdition mail proxy
@@ -9,7 +9,7 @@ DISTVER=	1.17.1
 DISTNAME=	perdition-${DISTVER}
 PKGNAME-main=	${DISTNAME}
 PKGNAME-ldap=	perdition-ldap-${DISTVER}
-REVISION-main =	0
+REVISION-main =	1
 REVISION-ldap =	0
 PKGNAME-mysql=  perdition-mysql-${DISTVER}
 PKGNAME-pgsql=  perdition-pgsql-${DISTVER}
diff --git a/mail/postler/Makefile b/mail/postler/Makefile
index 9fcf0975cd..52445912e8 100644
--- a/mail/postler/Makefile
+++ b/mail/postler/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2011/07/01 23:28:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/12 18:02:35 naddy Exp $
 
 COMMENT =	lightweight mail user agent
 
 XFCE_VERSION =	0.1.1
 XFCE_GOODIE =	postler
 
-REVISION =	5
+REVISION =	6
 
 MAINTAINER =	Landry Breuil <landry@openbsd.org>
 CATEGORIES =	mail
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 3642ca9551..932aa718d5 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.32 2011/03/14 09:17:01 sthen Exp $
+# $OpenBSD: Makefile,v 1.33 2011/09/12 18:02:35 naddy Exp $
 
 COMMENT=	AFP file and print services for AppleTalk/IP networks
 
 DISTNAME=	netatalk-2.0.3
-REVISION=	6
+REVISION=	7
 CATEGORIES=	net
 HOMEPAGE=	http://netatalk.sourceforge.net/
 
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 22a32eb1fc..15ffb6f129 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.59 2011/07/03 22:51:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.60 2011/09/12 18:02:35 naddy Exp $
 
 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)
 
 DISTNAME=	cyrus-sasl-2.1.23
-REVISION=	7
+REVISION=	8
 
 SHARED_LIBS=	anonymous	2.22 \
 		crammd5		2.22 \
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index db20f8e03e..6d33aa04e2 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.36 2011/04/17 18:19:37 jasper Exp $
+# $OpenBSD: Makefile,v 1.37 2011/09/12 18:02:35 naddy Exp $
 
 COMMENT=	GNU system administration tool for networks
 
 DISTNAME=      	cfengine-2.2.10
-REVISION=	0
+REVISION=	1
 CATEGORIES=	sysutils
 
 HOMEPAGE=	http://www.cfengine.org/
diff --git a/telephony/kamailio/Makefile b/telephony/kamailio/Makefile
index ff0e88a315..958b8a0d88 100644
--- a/telephony/kamailio/Makefile
+++ b/telephony/kamailio/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/11/26 14:44:27 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/12 18:02:35 naddy Exp $
 
 COMMENT-main =		mature and flexible open source SIP server
 
@@ -7,7 +7,7 @@ SHARED_ONLY =		Yes
 VERSION =		1.5.4
 DISTNAME =		kamailio-${VERSION}-tls_src
 PKGNAME-main =		kamailio-${VERSION}
-REVISION-main =		0
+REVISION-main =		1
 PKGNAME-mysql =		kamailio-mysql-${VERSION}
 PKGNAME-postgresql =	kamailio-postgresql-${VERSION}
 #PKGNAME-radius =	kamailio-radius-${VERSION}		TODO
diff --git a/textproc/gonzui/Makefile b/textproc/gonzui/Makefile
index c3ba9fd72d..8e73426e5a 100755
--- a/textproc/gonzui/Makefile
+++ b/textproc/gonzui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2011/07/19 18:00:16 jeremy Exp $
+# $OpenBSD: Makefile,v 1.24 2011/09/12 18:02:35 naddy Exp $
 
 SHARED_ONLY=		Yes
 
@@ -7,7 +7,7 @@ NOT_FOR_ARCHS=		mips64 mips64el
 
 COMMENT=		source code search engine
 DISTNAME=		gonzui-1.2
-REVISION=		18
+REVISION=		19
 CATEGORIES=		textproc www
 
 HOMEPAGE=		http://gonzui.sourceforge.net/
diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
index 73c4ca9b6e..a86720e44c 100644
--- a/www/squidguard/Makefile
+++ b/www/squidguard/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2010/11/26 14:50:10 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/12 18:02:35 naddy Exp $
 
 COMMENT =		filter, redirector and access controller for Squid
 
 DISTNAME =		squidGuard-1.4
-REVISION =		0
+REVISION =		1
 CATEGORIES =		www
 
 HOMEPAGE =		http://www.squidguard.org/
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index f75933dc5e..0ed056dbe2 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.33 2011/05/24 16:32:08 giovanni Exp $
+# $OpenBSD: Makefile,v 1.34 2011/09/12 18:02:35 naddy Exp $
 
 COMMENT=	web server log file analysis program
 
 V=		29
 DISTNAME=	webalizer-2.23-05-RB${V}-src
 PKGNAME=	webalizer-2.23.05.${V}
+REVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	http://www.patrickfrei.ch/webalizer/rb${V}/
 
diff --git a/x11/kde/addons3/Makefile b/x11/kde/addons3/Makefile
index 1d02c8dcc3..314c9c3247 100644
--- a/x11/kde/addons3/Makefile
+++ b/x11/kde/addons3/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.64 2010/11/26 14:50:10 espie Exp $
+# $OpenBSD: Makefile,v 1.65 2011/09/12 18:02:35 naddy Exp $
 
 COMMENT =		K Desktop Environment, addons
 CATEGORIES =		x11 x11/kde
 VERSION =		3.5.10
+REVISION =		8
 DISTNAME =		kdeaddons-${VERSION}
 MODKDE_VERSION =	3.5.8
 
@@ -24,7 +25,6 @@ LIB_DEPENDS = 	x11/kde/libs3 \
 
 SEPARATE_BUILD =	flavored
 
-REVISION = 7
 WANTLIB = ICE SDL>=1 SM X11 Xau Xdmcp Xext Xi Xrandr Xrender art_lgpl_2 \
 	artsflow artsflow_idl audiofile c fam gdk glib glib-2.0 gmodule \
 	gmodule-2.0 gthread-2.0 gtk idn jpeg kimproxy kmedia2_idl \