diff --git a/www/ajaxterm/Makefile b/www/ajaxterm/Makefile
index 6469026cb97..6339c3b4e2a 100644
--- a/www/ajaxterm/Makefile
+++ b/www/ajaxterm/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2011/06/08 18:15:28 rpointel Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/16 12:00:05 espie Exp $
 
 COMMENT = 		web-based SSH client
 
 DISTNAME =		Ajaxterm-0.10
 PKGNAME =		ajaxterm-0.10
-REVISION =		5
+REVISION =		6
 
 CATEGORIES =		net security www
 PKG_ARCH =		*
diff --git a/www/amaya/browser/Makefile b/www/amaya/browser/Makefile
index 71745bd468d..1606f9a7621 100644
--- a/www/amaya/browser/Makefile
+++ b/www/amaya/browser/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2011/07/07 00:22:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2011/09/16 12:00:06 espie Exp $
 #
 # Many variables moved to ../Makefile.inc
 
@@ -7,7 +7,7 @@ COMMENT=		test-bed browser/authoring tool of the W3C
 AMAYA_VERSION=		5.1
 DISTNAME=		amaya-src-${AMAYA_VERSION}
 PKGNAME=		amaya-${AMAYA_VERSION}
-REVISION=		7
+REVISION=		8
 
 HOMEPAGE=		http://www.w3.org/Amaya/
 
diff --git a/www/amaya/english-dict/Makefile b/www/amaya/english-dict/Makefile
index 56ec74cda37..6690cdc0c73 100644
--- a/www/amaya/english-dict/Makefile
+++ b/www/amaya/english-dict/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2007/09/15 20:38:20 merdely Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:06 espie Exp $
 #
 # Many variables moved to ../Makefile.inc
 
@@ -6,6 +6,7 @@ COMMENT=	English dictionary for the Amaya browser/page composer
 
 PKGNAME=		amaya-english-dict-20011029
 DISTNAME=		English
+REVISION=	0
 
 RUN_DEPENDS=		${DICT_RUN_DEPENDS}
 
diff --git a/www/amaya/french-dict/Makefile b/www/amaya/french-dict/Makefile
index 805c787acd1..0b6faed8908 100644
--- a/www/amaya/french-dict/Makefile
+++ b/www/amaya/french-dict/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2007/09/15 20:38:20 merdely Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/16 12:00:06 espie Exp $
 #
 # Many variables moved to ../Makefile.inc
 
@@ -6,6 +6,7 @@ COMMENT=	French dictionary for the Amaya browser/page composer
 
 PKGNAME=		amaya-french-dict-20040223
 DISTNAME=		French
+REVISION=	0
 
 RUN_DEPENDS=		${DICT_RUN_DEPENDS}
 
diff --git a/www/aria2/Makefile b/www/aria2/Makefile
index 67264d4794f..c7d88daa6be 100644
--- a/www/aria2/Makefile
+++ b/www/aria2/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2011/08/26 09:42:42 rpointel Exp $
+# $OpenBSD: Makefile,v 1.14 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =		lightweight multi-protocol & multi-source download utility
 DISTNAME =		aria2-1.12.1
+REVISION=	0
 CATEGORIES =		www
 HOMEPAGE =		http://aria2.sourceforge.net/
 
diff --git a/www/arora/Makefile b/www/arora/Makefile
index c14b585b0c0..c915e82ddea 100644
--- a/www/arora/Makefile
+++ b/www/arora/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2011/05/22 19:31:09 landry Exp $
+# $OpenBSD: Makefile,v 1.2 2011/09/16 12:00:06 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -7,6 +7,7 @@ COMMENT=	simple Qt4-based browser using WebKit
 ONLY_FOR_ARCHS=	${GCC4_ARCHS}
 
 DISTNAME=	arora-0.11.0
+REVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	http://arora.googlecode.com/files/
 
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index f3f9660045d..de2271d9711 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.62 2011/04/04 17:21:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.63 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	HTML editor for experienced web designers
 
 DISTNAME=	bluefish-1.0.7
-REVISION=	8
+REVISION=	9
 CATEGORIES=	www
 HOMEPAGE=	http://bluefish.openoffice.nl/
 
diff --git a/www/canto/Makefile b/www/canto/Makefile
index e5fb8ecffd6..af1f3824801 100644
--- a/www/canto/Makefile
+++ b/www/canto/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2011/06/08 18:15:28 rpointel Exp $
+# $OpenBSD: Makefile,v 1.4 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =	ncurses Atom/RSS newsreader for the console
 DISTNAME =	canto-0.7.10
-REVISION =	1
+REVISION =	2
 CATEGORIES =	www
 
 MASTER_SITES =	http://codezen.org/static/
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index ce9b373a97a..9226f7c1802 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2011/09/16 12:00:06 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -18,11 +18,11 @@ PKGNAME-mysql =	cherokee-mysql-${VERSION}
 PKGNAME-geoip =	cherokee-geoip-${VERSION}
 PKGNAME-streaming = cherokee-streaming-${VERSION}
 
-REVISION-main =	6
-REVISION-geoip = 2
-REVISION-ldap =	3
-REVISION-mysql = 2
-REVISION-streaming = 5
+REVISION-main =	7
+REVISION-geoip = 3
+REVISION-ldap =	4
+REVISION-mysql = 3
+REVISION-streaming = 6
 
 SHARED_LIBS =	cherokee-base		0.0 \
 		cherokee-client		0.0 \
diff --git a/www/chive/Makefile b/www/chive/Makefile
index 847f2290c60..b6380296d07 100644
--- a/www/chive/Makefile
+++ b/www/chive/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	web-based MySQL management
 
 V=		0.4.2
-REVISION=	1
+REVISION=	2
 DISTNAME=	chive_$V
 PKGNAME=	${DISTNAME:S/_/-/}
 WRKDIST=	${WRKDIR}/chive
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 94fd050c7fb..fa341dc4d00 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2011/09/08 10:35:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.69 2011/09/16 12:00:06 espie Exp $
 
 ONLY_FOR_ARCHS=		i386 amd64
 
@@ -7,7 +7,7 @@ COMMENT=		Chromium browser
 V=			13.0.782.220
 DISTNAME=		chromium-${V}
 
-REVISION=		0
+REVISION=		1
 
 CATEGORIES=		www
 
diff --git a/www/clearsilver/Makefile b/www/clearsilver/Makefile
index 00369e49df5..88158bdfaba 100644
--- a/www/clearsilver/Makefile
+++ b/www/clearsilver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2011/09/05 17:12:35 okan Exp $
+# $OpenBSD: Makefile,v 1.24 2011/09/16 12:00:06 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -9,7 +9,7 @@ COMMENT-python=	python bindings for clearsilver
 V=		0.10.4
 DISTNAME=	clearsilver-${V}
 EPOCH=		0
-REVISION=	6
+REVISION=	7
 PKGNAME-main=	${DISTNAME}
 PKGNAME-perl=	clearsilver-perl-${V}
 PKGNAME-python=	clearsilver-python-${V}
diff --git a/www/cms-ms/Makefile b/www/cms-ms/Makefile
index f5c7ba1a7c9..12a87aa05c9 100644
--- a/www/cms-ms/Makefile
+++ b/www/cms-ms/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=		easy to use and powerfull CMS
 
 DISTNAME=		cmsmadesimple-1.9.4-full
-REVISION=		1
+REVISION=		2
 PKGNAME=		${DISTNAME:S/-full//}
 CATEGORIES=		www
 
diff --git a/www/community-id/Makefile b/www/community-id/Makefile
index d71760437cc..11183c7e02a 100644
--- a/www/community-id/Makefile
+++ b/www/community-id/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	PHP OpenID implementation
 
@@ -8,7 +8,7 @@ BASE_URL=	http://source.keyboard-monkeys.org
 DISTNAME=	cid-${V}
 PKGNAME=	community-id-${V}
 
-REVISION=	5
+REVISION=	6
 
 CATEGORIES=	www security
 
diff --git a/www/concrete5/Makefile b/www/concrete5/Makefile
index 125ce03e205..7fe9224d86e 100644
--- a/www/concrete5/Makefile
+++ b/www/concrete5/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	building material for websites
 
 V=		5.0.0
 DISTNAME=	concrete${V}_2
 PKGNAME=	concrete5-${V}
-REVISION=	1
+REVISION=	2
 EXTRACT_SUFX=	.zip
 CATEGORIES=	www
 HOMEPAGE=	http://www.concrete5.org/
diff --git a/www/conkeror/Makefile b/www/conkeror/Makefile
index 87a4a013fd7..56291211281 100644
--- a/www/conkeror/Makefile
+++ b/www/conkeror/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2010/12/21 20:47:48 joshe Exp $
+# $OpenBSD: Makefile,v 1.2 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =		keyboard-oriented Mozilla-based browser
 
 DATE =			20101215
 GITREV =		d81cecae9ec9bde209e2cfa0cd4d98a97428d380
 DISTNAME =		conkeror-0.9.3.${DATE}
+REVISION=	0
 
 CATEGORIES =		www
 
diff --git a/www/cssed/Makefile b/www/cssed/Makefile
index b4efa704324..1b9e5f515c7 100755
--- a/www/cssed/Makefile
+++ b/www/cssed/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2010/11/22 08:36:47 espie Exp $
+# $OpenBSD: Makefile,v 1.26 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	CSS editor
 
 DISTNAME=	cssed-0.4.0
-REVISION=	9
+REVISION=	10
 CATEGORIES=	www editors
 
 HOMEPAGE=	http://cssed.sourceforge.net/
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile
index 3698758d44d..2b844e7b3e9 100644
--- a/www/dokuwiki/Makefile
+++ b/www/dokuwiki/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2011/07/21 09:52:28 pea Exp $
+# $OpenBSD: Makefile,v 1.2 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =	standards compliant, simple to use Wiki
 
 DISTNAME = 	dokuwiki-2011-05-25a
 PKGNAME = 	${DISTNAME:S/-05-/.05./}
+REVISION=	0
 CATEGORIES =	www
 HOMEPAGE =	http://www.dokuwiki.org/dokuwiki
 
diff --git a/www/drupal6/core/Makefile b/www/drupal6/core/Makefile
index 09df55da46c..3ac22816145 100644
--- a/www/drupal6/core/Makefile
+++ b/www/drupal6/core/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =	powerful content management system
 
 DISTNAME =	drupal-6.22
 DISTFILES =	${DISTNAME}${EXTRACT_SUFX}
-REVISION =	3
+REVISION =	4
 
 MODULES=	lang/php
 RUN_DEPENDS=	php-mysql-*|php-mysqli-*|php-pgsql-*:lang/php/${MODPHP_VERSION},-mysql \
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 6b100ef101e..a45f4c8f78a 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.34 2011/09/12 12:07:26 jasper Exp $
+# $OpenBSD: Makefile,v 1.35 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=		collection of extensions for Epiphany
 
 GNOME_PROJECT=		epiphany-extensions
 GNOME_VERSION=		3.0.0
-REVISION=		7
+REVISION=		8
 
 # sync with www/epiphany
 M=		${GNOME_VERSION:R}
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 1177e318e26..1c60eee3a50 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.65 2011/09/12 12:07:26 jasper Exp $
+# $OpenBSD: Makefile,v 1.66 2011/09/16 12:00:06 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -11,6 +11,7 @@ COMMENT=	GNOME web browser based on webkit
 
 GNOME_PROJECT=	epiphany
 GNOME_VERSION=	3.0.4
+REVISION=	0
 
 M=		${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 SUBST_VARS=	M
diff --git a/www/ezpublish/Makefile b/www/ezpublish/Makefile
index bcc5c7d429a..58e8106522e 100644
--- a/www/ezpublish/Makefile
+++ b/www/ezpublish/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =	professional PHP application framework
 
 VERSION =	4.1.3
-REVISION =	1
+REVISION =	2
 DISTNAME =	ezpublish-${VERSION}-gpl
 PKGNAME =	ezpublish-${VERSION}
 CATEGORIES =	www
diff --git a/www/fennec/Makefile b/www/fennec/Makefile
index 159f2150d92..eb928c40de6 100644
--- a/www/fennec/Makefile
+++ b/www/fennec/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2011/09/06 19:45:34 landry Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =	Mozilla mobile web browser
 
@@ -6,6 +6,7 @@ MOZILLA_VERSION =	6.0.2
 MOZILLA_BRANCH =	release
 MOZILLA_PROJECT =	fennec
 MOZILLA_CODENAME =	mobile
+REVISION=	0
 
 SO_VERSION =	2.0
 # NOTE: Must bump minor version if any shlib's are removed from the
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 9a2bc556395..4431b0a2f34 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2011/09/06 19:47:03 landry Exp $
+# $OpenBSD: Makefile,v 1.72 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =	Mozilla web browser
 
@@ -8,7 +8,7 @@ MOZILLA_PROJECT =	firefox35
 MOZILLA_DIST =		firefox
 MOZILLA_CODENAME =	browser
 
-REVISION =		5
+REVISION =		6
 
 SO_VERSION =	24.0
 # NOTE: Must bump minor version if any shlib's are removed from the
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 717b82f00f6..27b3e2c84f2 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2011/09/06 19:43:50 landry Exp $
+# $OpenBSD: Makefile,v 1.14 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =	Mozilla web browser
 
@@ -9,6 +9,7 @@ MOZILLA_BRANCH =	1.9.2
 MOZILLA_PROJECT =	firefox36
 MOZILLA_DIST =		firefox
 MOZILLA_CODENAME =	browser
+REVISION=	0
 
 SO_VERSION =	22.2
 # NOTE: Must bump minor version if any shlib's are removed from the
diff --git a/www/fluxbb/Makefile b/www/fluxbb/Makefile
index b58ea3c7214..5f15042753a 100644
--- a/www/fluxbb/Makefile
+++ b/www/fluxbb/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =	fast, light, user-friendly web forum
 
 V=		1.4.2
 DISTNAME =	fluxbb-${V}
 CATEGORIES =	www
-REVISION=	2
+REVISION=	3
 
 HOMEPAGE =	http://fluxbb.org/
 
diff --git a/www/flyspray/Makefile b/www/flyspray/Makefile
index 3c21af74f8d..53e4711efcd 100644
--- a/www/flyspray/Makefile
+++ b/www/flyspray/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =	web-based bug tracking system
 
 DISTNAME =	flyspray-0.9.9.6
-REVISION =	1
+REVISION =	2
 CATEGORIES =	www devel
 
 HOMEPAGE =	http://flyspray.org/
diff --git a/www/gnash/Makefile b/www/gnash/Makefile
index 12b1553cefb..cec6126a3ac 100644
--- a/www/gnash/Makefile
+++ b/www/gnash/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2011/06/02 17:09:32 kili Exp $
+# $OpenBSD: Makefile,v 1.45 2011/09/16 12:00:06 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -8,7 +8,7 @@ COMMENT=	SWF player with Firefox browser plugin
 
 VER=		0.8.9
 DISTNAME=	gnash-${VER}
-REVISION=	1
+REVISION=	2
 EPOCH=		0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GNU:=gnash/${VER}/}
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 0a390604d47..2a551133c38 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2011/09/12 12:07:26 jasper Exp $
+# $OpenBSD: Makefile,v 1.50 2011/09/16 12:00:06 espie Exp $
 
 SHARED_ONLY=		Yes
 
@@ -10,7 +10,7 @@ API_VERSION=		3.14
 
 PKGNAME=		gtkhtml3-${VERSION}
 
-REVISION=		1
+REVISION=		2
 
 HOMEPAGE=		http://www.gnome.org/
 
diff --git a/www/gtkhtml4/Makefile b/www/gtkhtml4/Makefile
index 32013e5ba2b..c678f49d6f6 100644
--- a/www/gtkhtml4/Makefile
+++ b/www/gtkhtml4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2011/09/12 12:07:26 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:06 espie Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,6 +6,7 @@ COMMENT=		lightweight HTML rendering/printing/editing engine
 
 GNOME_PROJECT=		gtkhtml
 GNOME_VERSION=		4.0.2
+REVISION=	0
 
 API_VERSION=		4.0
 SUBST_VARS=		API_VERSION
diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile
index 9b727b311e9..4d514ad769e 100644
--- a/www/hiawatha/Makefile
+++ b/www/hiawatha/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.30 2011/06/02 18:53:39 rpointel Exp $
+# $OpenBSD: Makefile,v 1.31 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	secure webserver
 
 DISTNAME=	hiawatha-7.5
+REVISION=	0
 CATEGORIES=	www net
 
 HOMEPAGE=	http://www.hiawatha-webserver.org/
diff --git a/www/horde/chora/Makefile b/www/horde/chora/Makefile
index f718129a3f0..871d7c3ec56 100644
--- a/www/horde/chora/Makefile
+++ b/www/horde/chora/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2011/07/09 00:14:45 robert Exp $
+# $OpenBSD: Makefile,v 1.3 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	web-based CVS viewer module for Horde
 
@@ -7,7 +7,7 @@ HORDE_NAME=	Chora
 # GPLv2
 DISTNAME=	chora-h3-2.1.1
 PKGNAME=	${DISTNAME:S/-h3//}
-REVISION=	0
+REVISION=	1
 CATEGORIES=	devel
 
 .include <bsd.port.mk>
diff --git a/www/horde/dimp/Makefile b/www/horde/dimp/Makefile
index 1e209ddcd09..a4b6bcce596 100644
--- a/www/horde/dimp/Makefile
+++ b/www/horde/dimp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2011/09/06 20:09:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	dynamic front-end for IMP webmail
 
@@ -6,6 +6,7 @@ HORDE_NAME=	DIMP
 
 # GPLv2
 DISTNAME=	dimp-h3-1.1.7
+REVISION=	0
 CATEGORIES=	mail
 
 RUN_DEPENDS=	www/horde/imp
diff --git a/www/horde/horde/Makefile b/www/horde/horde/Makefile
index 7c6a76daeda..0ad7be17ec3 100644
--- a/www/horde/horde/Makefile
+++ b/www/horde/horde/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2011/09/06 20:09:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	modular framework for web-based applications
 
 # LGPLv2
 DISTNAME=	horde-3.3.12
+REVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${HORDE_SITES:=horde/}
 HOMEPAGE=	http://www.horde.org/
diff --git a/www/horde/imp/Makefile b/www/horde/imp/Makefile
index 78135967a0c..3ad709b5a2e 100644
--- a/www/horde/imp/Makefile
+++ b/www/horde/imp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2011/09/06 20:09:12 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	highly configurable pop3/imap4 webmail client
 
@@ -6,6 +6,7 @@ HORDE_NAME=	IMP
 
 # GPLv2
 DISTNAME=	imp-h3-4.3.10
+REVISION=	0
 CATEGORIES=	mail
 
 RUN_DEPENDS=	net/pear-HTTP-Request \
diff --git a/www/horde/ingo/Makefile b/www/horde/ingo/Makefile
index dea1d2d2fe5..84ce30d0f07 100644
--- a/www/horde/ingo/Makefile
+++ b/www/horde/ingo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2011/09/06 20:09:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	mail filter rules for IMP
 
@@ -7,6 +7,7 @@ HORDE_NAME=	Ingo
 
 # Horde (BSD-like with some restrictions, see LICENSE)
 DISTNAME=	ingo-h3-1.2.6
+REVISION=	0
 CATEGORIES=	mail
 
 RUN_DEPENDS=	www/horde/imp
diff --git a/www/horde/kronolith/Makefile b/www/horde/kronolith/Makefile
index 062c0ba93bd..286114d1c15 100644
--- a/www/horde/kronolith/Makefile
+++ b/www/horde/kronolith/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2011/09/06 20:09:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	web based calendar application, for Horde
 
@@ -6,6 +6,7 @@ HORDE_NAME=	Kronolith
 
 # GPLv2
 DISTNAME=	kronolith-h3-2.3.6
+REVISION=	0
 CATEGORIES=	mail
 
 RUN_DEPENDS=	devel/pear-Date \
diff --git a/www/horde/mimp/Makefile b/www/horde/mimp/Makefile
index 3f0abaf649e..c18b92b7d66 100644
--- a/www/horde/mimp/Makefile
+++ b/www/horde/mimp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2011/09/06 20:09:14 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	lightweight front-end for mobile IMP users
 
@@ -6,6 +6,7 @@ HORDE_NAME=	MIMP
 
 # GPLv2
 DISTNAME=	mimp-h3-1.1.4
+REVISION=	0
 CATEGORIES=	mail
 
 RUN_DEPENDS=	www/horde/imp
diff --git a/www/horde/mnemo/Makefile b/www/horde/mnemo/Makefile
index 692bb7cb46c..43ce7c9a148 100644
--- a/www/horde/mnemo/Makefile
+++ b/www/horde/mnemo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2011/09/06 20:09:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	memo application, for Horde
 
@@ -6,6 +6,7 @@ HORDE_NAME=	Mnemo
 
 # Horde (BSD-like with some restrictions, see LICENSE)
 DISTNAME=	mnemo-h3-2.2.5
+REVISION=	0
 CATEGORIES=	databases
 
 RUN_DEPENDS=	lang/php/${MODPHP_VERSION},-imap
diff --git a/www/horde/nag/Makefile b/www/horde/nag/Makefile
index 00cf261ec80..41ded29c877 100644
--- a/www/horde/nag/Makefile
+++ b/www/horde/nag/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2011/09/06 20:09:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	multiuser task list manager, for Horde
 
@@ -6,6 +6,7 @@ HORDE_NAME=	Nag
 
 # GPLv2
 DISTNAME=	nag-h3-2.3.7
+REVISION=	0
 
 RUN_DEPENDS=	lang/php/${MODPHP_VERSION},-imap
 
diff --git a/www/horde/turba/Makefile b/www/horde/turba/Makefile
index 7c01647e6a1..4e4716b0098 100644
--- a/www/horde/turba/Makefile
+++ b/www/horde/turba/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2011/09/06 20:09:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	contact management module, for Horde
 
 # Horde license (BSD-like with some restrictions, see LICENSE)
 DISTNAME=	turba-h3-2.3.6
+REVISION=	0
 
 RUN_DEPENDS=	www/horde/imp
 
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index 5e9311672d9..416734c9c4c 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2011/04/23 14:32:51 kili Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =		CGI library for Haskell
 
 DISTNAME =		cgi-3001.1.7.4
-REVISION =		0
+REVISION =		1
 CATEGORIES =		www devel
 HOMEPAGE =		http://andersk.mit.edu/haskell/cgi/
 
diff --git a/www/hs-html/Makefile b/www/hs-html/Makefile
index 418e87db411..d892e3712a9 100644
--- a/www/hs-html/Makefile
+++ b/www/hs-html/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2011/04/11 14:55:41 kili Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =		HTML combinator library
 
 DISTNAME =		html-1.0.1.2
-REVISION =		6
+REVISION =		7
 CATEGORIES =		www devel
 
 MAINTAINER =		Matthias Kilian <kili@openbsd.org>
diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile
index 1ff7f6818e6..baa12485fd4 100644
--- a/www/hs-snap-core/Makefile
+++ b/www/hs-snap-core/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/04/23 14:32:51 kili Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =		Snap Haskell Web Framework
 
 DISTNAME =		snap-core-0.2.16
-REVISION =		4
+REVISION =		5
 CATEGORIES =		www
 HOMEPAGE =		http://snapframework.com/
 
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
index 1062a7b7887..c6f39e4808e 100644
--- a/www/hs-snap-server/Makefile
+++ b/www/hs-snap-server/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2011/04/23 14:32:51 kili Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =		Snap Haskell Web Framework Server
 
 DISTNAME =		snap-server-0.2.16.2
-REVISION =		2
+REVISION =		3
 CATEGORIES =		www
 HOMEPAGE =		http://snapframework.com/
 
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index c3b3f4beb5e..88725172f59 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2011/07/31 09:56:10 nigel Exp $
+# $OpenBSD: Makefile,v 1.3 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =		WebKit bindings for Haskell
 DISTNAME =		webkit-0.12.1
 CATEGORIES =		www
-REVISION =		0
+REVISION =		1
 
 MAINTAINER =		Jona Joachim <jaj@hcl-club.lu>
 
diff --git a/www/hs-xhtml-combinators/Makefile b/www/hs-xhtml-combinators/Makefile
index 605a40aea7d..7b5232b1888 100644
--- a/www/hs-xhtml-combinators/Makefile
+++ b/www/hs-xhtml-combinators/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2011/04/11 14:55:41 kili Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:06 espie Exp $
 
 COMMENT =		fast and easy to use XHTML 1.0 Strict combinators
 
 DISTNAME =		xhtml-combinators-0.2.2
-REVISION =		4
+REVISION =		5
 CATEGORIES =		www
 
 MAINTAINER =		Jim Razmus II <jim@openbsd.org>
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index 499d40e176b..4f80e760ecc 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2011/05/16 08:24:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2011/09/16 12:00:06 espie Exp $
 
 COMMENT-main=	common files for kazehakase
 COMMENT-gecko=	lightweight gecko-based web browser
@@ -11,11 +11,11 @@ SHARED_ONLY=	Yes
 VERSION=	0.5.8
 DISTNAME=	kazehakase-${VERSION}
 PKGNAME-main=	kazehakase-common-${VERSION}
-REVISION-main=	5
+REVISION-main=	6
 PKGNAME-gecko=	${DISTNAME}
-REVISION-gecko=	5
+REVISION-gecko=	6
 PKGNAME-webkit=	kazehakase-webkit-${VERSION}
-REVISION-webkit=6
+REVISION-webkit=7
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP:=kazehakase/43802/}
 
 HOMEPAGE=	http://kazehakase.sourceforge.jp/
diff --git a/www/ktdms/Makefile b/www/ktdms/Makefile
index 01e906bc476..943cbaba60f 100644
--- a/www/ktdms/Makefile
+++ b/www/ktdms/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=	web-based document management system
 
 V=		3.5.1
 DISTNAME=	ktdms-${V}
-REVISION=	5
+REVISION=	6
 DISTFILES=	ktdms-src-oss-${V}.tgz
 
 CATEGORIES=	www
diff --git a/www/libcroco/Makefile b/www/libcroco/Makefile
index c63cf5942b8..9076f6767c3 100644
--- a/www/libcroco/Makefile
+++ b/www/libcroco/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2011/09/12 12:07:26 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:06 espie Exp $
 
 COMMENT=		generic CSS parsing library for GNOME project
 
 GNOME_PROJECT=		libcroco
 GNOME_VERSION=		0.6.2
-REVISION=		1
+REVISION=		2
 SHARED_LIBS +=	croco-0.6            4.0      # .3.1
 CATEGORIES=		www devel
 
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index 75d1291e27d..ad70d7369be 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2011/05/16 08:24:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.44 2011/09/16 12:00:07 espie Exp $
 
 SHARED_ONLY=		Yes
 
@@ -7,7 +7,7 @@ COMMENT=		simple GTK desktop news aggregator
 DISTNAME=		liferea-1.6.5
 CATEGORIES=		www x11
 
-REVISION=		3
+REVISION=		4
 
 HOMEPAGE=		http://liferea.sourceforge.net/
 
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index c421a89552e..1558c35de58 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.87 2011/09/06 08:49:51 sthen Exp $
+# $OpenBSD: Makefile,v 1.88 2011/09/16 12:00:07 espie Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	secure, fast, compliant, and very flexible web-server
 
 DISTNAME=	lighttpd-1.4.29
-REVISION=	1
+REVISION=	2
 CATEGORIES=	www net
 MASTER_SITES=	http://download.lighttpd.net/lighttpd/releases-1.4.x/
 
diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index 8ea7865528b..436319f2ec0 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.34 2011/08/17 17:13:10 landry Exp $
+# $OpenBSD: Makefile,v 1.35 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	checks HTML documents for broken links
 
 MODPY_EGG_VERSION=7.1
 DISTNAME=	LinkChecker-${MODPY_EGG_VERSION}
+REVISION=	0
 PKGNAME=	${DISTNAME:L}
 
 CATEGORIES=    	www
diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile
index 8ab3cf1c193..1e4b5f97227 100644
--- a/www/mediawiki/Makefile
+++ b/www/mediawiki/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.27 2011/08/01 10:56:21 jasper Exp $
+# $OpenBSD: Makefile,v 1.28 2011/09/16 12:00:07 espie Exp $
 
 COMMENT =	web-based collaborative editing environment
 
 DISTNAME =	mediawiki-1.15.5
-REVISION =	3
+REVISION =	4
 CATEGORIES =	www
 
 HOMEPAGE =	http://www.mediawiki.org/
diff --git a/www/midori/Makefile b/www/midori/Makefile
index b84e66b68b5..698e13f89e2 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.39 2011/08/16 07:49:16 landry Exp $
+# $OpenBSD: Makefile,v 1.40 2011/09/16 12:00:07 espie Exp $
 
 COMMENT =	lightweight web browser
 
 XFCE_VERSION =	0.4.0
 XFCE_GOODIE =	midori
+REVISION=	0
 
 MAINTAINER =	Landry Breuil <landry@openbsd.org>
 CATEGORIES =	www
diff --git a/www/minitube/Makefile b/www/minitube/Makefile
index 5f77e506c1b..4a731e951d7 100644
--- a/www/minitube/Makefile
+++ b/www/minitube/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2011/08/18 10:40:15 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.14 2011/09/16 12:00:07 espie Exp $
 
 COMMENT =	standalone YouTube.com video browser/player
 
 DISTNAME =	minitube-1.5
 CATEGORIES =	www multimedia
+REVISION=	0
 
 HOMEPAGE =	http://flavio.tordini.org/minitube
 
diff --git a/www/mod_auth_ldap/Makefile b/www/mod_auth_ldap/Makefile
index 44e6bf91015..8b00f13b503 100644
--- a/www/mod_auth_ldap/Makefile
+++ b/www/mod_auth_ldap/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.16 2010/11/22 08:36:49 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	Apache LDAP authentication module
 
-REVISION=	9
+REVISION=	10
 VERSION=	1.6.0
 DISTNAME=	auth_ldap-${VERSION}
 PKGNAME=	mod_auth_ldap-${VERSION}
diff --git a/www/mod_auth_mysql/Makefile b/www/mod_auth_mysql/Makefile
index 145a0114d7b..467bf68bcc8 100644
--- a/www/mod_auth_mysql/Makefile
+++ b/www/mod_auth_mysql/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.18 2010/11/22 08:36:49 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	Apache MySQL authentication module
 
-REVISION=	6
+REVISION=	7
 VERSION=	3.2
 DISTNAME=	mod_auth_mysql-${VERSION}
 CATEGORIES=	www
diff --git a/www/mod_auth_pgsql/Makefile b/www/mod_auth_pgsql/Makefile
index 7fd1073311c..daadfdcfef0 100644
--- a/www/mod_auth_pgsql/Makefile
+++ b/www/mod_auth_pgsql/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2011/03/14 09:15:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:07 espie Exp $
 
 COMMENT =	Apache PostgreSQL authentication module
 
-REVISION=	3
+REVISION=	4
 DISTNAME =	mod_auth_pgsql-0.9.12
 CATEGORIES =	www
 
diff --git a/www/mod_ldapvhost/Makefile b/www/mod_ldapvhost/Makefile
index 795ced71de6..2a713de087a 100644
--- a/www/mod_ldapvhost/Makefile
+++ b/www/mod_ldapvhost/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.13 2010/11/22 08:36:49 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=		Apache LDAP based virtual hosts module
 
-REVISION=		7
+REVISION=		8
 DISTNAME=		mod_ldapvhost-1.0.2
 CATEGORIES=		www
 
diff --git a/www/mod_log_sql/Makefile b/www/mod_log_sql/Makefile
index 43b8d393d68..4a8f649e9a9 100644
--- a/www/mod_log_sql/Makefile
+++ b/www/mod_log_sql/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.16 2010/11/22 08:36:49 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	Apache module for logging to an SQL database
 
-REVISION=	5
+REVISION=	6
 DISTNAME=	mod_log_sql-1.18
 CATEGORIES=	www
 
diff --git a/www/mod_mp3/Makefile b/www/mod_mp3/Makefile
index afe12730085..3e171942fbf 100644
--- a/www/mod_mp3/Makefile
+++ b/www/mod_mp3/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.18 2010/11/22 08:36:49 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	turns Apache into an MP3 or Ogg streaming server
 
-REVISION=	2
+REVISION=	3
 DISTNAME=	mod_mp3-0.40
 CATEGORIES=	www audio
 
diff --git a/www/mod_ruby/Makefile b/www/mod_ruby/Makefile
index 1ba0e042443..c303ec84642 100644
--- a/www/mod_ruby/Makefile
+++ b/www/mod_ruby/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2010/11/24 21:35:16 jeremy Exp $
+# $OpenBSD: Makefile,v 1.15 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=		module that embeds Ruby into Apache
 
 DISTNAME=		mod_ruby-1.2.6
-REVISION =		5
+REVISION =		6
 CATEGORIES=		www
 
 HOMEPAGE=		http://modruby.net/
diff --git a/www/moinmoin/Makefile b/www/moinmoin/Makefile
index 02fbde179b8..2743eff9f9d 100644
--- a/www/moinmoin/Makefile
+++ b/www/moinmoin/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.22 2011/07/14 22:34:55 fgsch Exp $
+# $OpenBSD: Makefile,v 1.23 2011/09/16 12:00:07 espie Exp $
 
 COMMENT =	wiki engine written in python
 
 MODPY_EGG_VERSION = 1.9.3
 DISTNAME =	moin-${MODPY_EGG_VERSION}
 PKGNAME =	moin${DISTNAME}
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	www
 
diff --git a/www/mollify/Makefile b/www/mollify/Makefile
index a8014c9c7f7..e1332e52c40 100644
--- a/www/mollify/Makefile
+++ b/www/mollify/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2011/07/09 00:14:46 robert Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	simple and clean multi-user web file manager
 
 DISTNAME=	mollify_1.6.5.5
-REVISION=	0
+REVISION=	1
 PKGNAME=	${DISTNAME:S/_/-/}
 EXTRACT_SUFX=	.zip
 CATEGORIES=	www
diff --git a/www/mongrel2/Makefile b/www/mongrel2/Makefile
index b21f9206923..906a9dc8637 100644
--- a/www/mongrel2/Makefile
+++ b/www/mongrel2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2011/07/06 01:23:50 jeremy Exp $
+# $OpenBSD: Makefile,v 1.4 2011/09/16 12:00:07 espie Exp $
 
 # Some assembly required
 ONLY_FOR_ARCHS =i386 amd64
@@ -7,6 +7,7 @@ SHARED_ONLY =	Yes
 COMMENT =	language agnostic asynchronous web server
 
 DISTNAME =	mongrel2-1.7.5
+REVISION=	0
 CATEGORIES =	www
 
 HOMEPAGE =	http://mongrel2.org/
diff --git a/www/moodle/Makefile b/www/moodle/Makefile
index 83bd106221f..b82379ccf57 100644
--- a/www/moodle/Makefile
+++ b/www/moodle/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	learning management system
 
 DISTNAME=	moodle-1.9.7
-REVISION=	1
+REVISION=	2
 CATEGORIES=	www education
 
 HOMEPAGE=	http://www.moodle.org/
diff --git a/www/mozilla-firefox/Makefile b/www/mozilla-firefox/Makefile
index f5a85a5efd7..d871c6af73d 100644
--- a/www/mozilla-firefox/Makefile
+++ b/www/mozilla-firefox/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.190 2011/09/06 19:41:59 landry Exp $
+# $OpenBSD: Makefile,v 1.191 2011/09/16 12:00:07 espie Exp $
 
 COMMENT =	Mozilla web browser
 BROKEN-sparc64 =	https://bugzilla.mozilla.org/show_bug.cgi?id=577056
@@ -10,6 +10,7 @@ MOZILLA_VERSION =	6.0.2
 MOZILLA_BRANCH =	release
 MOZILLA_PROJECT =	firefox
 MOZILLA_CODENAME =	browser
+REVISION=	0
 
 # url for beta releases
 # MASTER_SITES=  ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_PROJECT}/releases/${MOZILLA_VERSION}/source/
diff --git a/www/myreview/Makefile b/www/myreview/Makefile
index d02b4be15f2..9623a9a141f 100644
--- a/www/myreview/Makefile
+++ b/www/myreview/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	web-based conference management software
 
 V=		1.9.9
 DISTNAME=	myreview_${V:S/./_/g}
 PKGNAME=	myreview-${V}
-REVISION=	3
+REVISION=	4
 CATEGORIES=	www
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} myreview_v1.pdf:0
diff --git a/www/netsurf/browser/Makefile b/www/netsurf/browser/Makefile
index 2d0e07fb209..7afa6ef38fd 100644
--- a/www/netsurf/browser/Makefile
+++ b/www/netsurf/browser/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2011/07/18 20:10:11 landry Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/16 12:00:07 espie Exp $
 
 COMMENT =		lightweight web browser
 
 NETSURF_PROJECT =	netsurf
 NETSURF_VERSION =	2.7
+REVISION=	0
 
 CATEGORIES=		www
 
diff --git a/www/node/Makefile b/www/node/Makefile
index 2ceda407839..4ba6c423d14 100644
--- a/www/node/Makefile
+++ b/www/node/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2011/06/29 18:44:07 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2011/09/16 12:00:07 espie Exp $
 
 # XXX:
 # - Needs __ARM_NR_cacheflush (or the like) to work on arm-based ports.
@@ -9,6 +9,7 @@ ONLY_FOR_ARCHS=	amd64 i386
 COMMENT=	V8 JavaScript for clients and servers
 
 DISTNAME=	node-v0.4.9
+REVISION=	0
 PKGNAME=	${DISTNAME:S/v//g}
 
 CATEGORIES=	www devel
diff --git a/www/ntlmaps/Makefile b/www/ntlmaps/Makefile
index 64866d46b69..f71f897889a 100644
--- a/www/ntlmaps/Makefile
+++ b/www/ntlmaps/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:07 espie Exp $
 
 COMMENT =	http proxy to authenticate using NTLM
 
 DISTNAME =	ntlmaps-0.9.9.0.1
-REVISION=	3
+REVISION=	4
 CATEGORIES =	www
 HOMEPAGE =	http://ntlmaps.sourceforge.net/
 
diff --git a/www/p5-HTML-Embperl/Makefile b/www/p5-HTML-Embperl/Makefile
index 5b07ff62fd0..bdc9c1f6b59 100644
--- a/www/p5-HTML-Embperl/Makefile
+++ b/www/p5-HTML-Embperl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2010/12/03 11:46:52 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2011/09/16 12:00:07 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -7,7 +7,7 @@ COMMENT=	embperl allows you to embed perl in your HTML documents
 MODULES=	cpan converters/libiconv
 DISTNAME=	Embperl-2.3.0
 PKGNAME=	p5-HTML-${DISTNAME}
-REVISION=	1
+REVISION=	2
 CATEGORIES=	www
 USE_GROFF =	Yes
 
diff --git a/www/p5-WWW-Ebay/Makefile b/www/p5-WWW-Ebay/Makefile
index a04a98d0fb8..e0a5b989ea8 100644
--- a/www/p5-WWW-Ebay/Makefile
+++ b/www/p5-WWW-Ebay/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2010/12/03 11:46:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=		search and manage eBay accounts
 
 DISTNAME=		WWW-Ebay-0.094
-REVISION=		0
+REVISION=		1
 CATEGORIES=		www
 
 # perl
diff --git a/www/pear-HTML-Common2/Makefile b/www/pear-HTML-Common2/Makefile
index 0fd7d9db0c8..91f1f0fee10 100644
--- a/www/pear-HTML-Common2/Makefile
+++ b/www/pear-HTML-Common2/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	base package for HTML handling in PHP5
 
 DISTNAME=	HTML_Common2-0.1.0
-REVISION=	3
+REVISION=	4
 CATEGORIES=	www devel
 
 MODULES=	www/pear
diff --git a/www/pear-HTML-Page2/Makefile b/www/pear-HTML-Page2/Makefile
index bf506e5b9ee..5ee66277cc1 100644
--- a/www/pear-HTML-Page2/Makefile
+++ b/www/pear-HTML-Page2/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2011/06/04 11:41:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	base package for HTML handling in PHP5
 
 DISTNAME=	HTML_Page2-0.5.0beta
-REVISION=	1
+REVISION=	2
 CATEGORIES=	www devel
 
 MODULES=	www/pear
diff --git a/www/pear-HTML-QuickForm/Makefile b/www/pear-HTML-QuickForm/Makefile
index 782c1ff4a84..bfb0b9d94ff 100644
--- a/www/pear-HTML-QuickForm/Makefile
+++ b/www/pear-HTML-QuickForm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2011/06/04 11:41:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	package provides methods for HTML forms
 
 DISTNAME=	HTML_QuickForm-3.2.5
-REVISION=	0
+REVISION=	1
 CATEGORIES=	devel www
 
 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
diff --git a/www/pear-HTML-Select/Makefile b/www/pear-HTML-Select/Makefile
index a0588ee8974..206b75b7f2c 100644
--- a/www/pear-HTML-Select/Makefile
+++ b/www/pear-HTML-Select/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/06/04 11:41:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	class for generating HTML form select elements for PHP
 
 DISTNAME=	HTML_Select-1.2.1
-REVISION=	1
+REVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
diff --git a/www/pear-HTML-Template-IT/Makefile b/www/pear-HTML-Template-IT/Makefile
index ce60890ae12..864df4608aa 100644
--- a/www/pear-HTML-Template-IT/Makefile
+++ b/www/pear-HTML-Template-IT/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/04 11:41:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	integrated Templates for PHP
 
 DISTNAME=	HTML_Template_IT-1.1.3
-REVISION=	2
+REVISION=	3
 CATEGORIES=	www
 
 MODULES=	www/pear
diff --git a/www/pear-HTTP-WebDAV-Server/Makefile b/www/pear-HTTP-WebDAV-Server/Makefile
index 8de520bda4d..510979ebc57 100644
--- a/www/pear-HTTP-WebDAV-Server/Makefile
+++ b/www/pear-HTTP-WebDAV-Server/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2010/07/30 23:52:41 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	helper class for PHP WebDAV server implementations
 
 V=		1.0.0RC4
 DISTNAME=	HTTP_WebDAV_Server-$V
 PKGNAME=	pear-HTTP-WebDAV-Server-${V:L}
-REVISION=	1
+REVISION=	2
 CATEGORIES=	www
 
 MODULES=	www/pear
diff --git a/www/pear-SOAP/Makefile b/www/pear-SOAP/Makefile
index 1a258725cac..a9e04f77fd8 100644
--- a/www/pear-SOAP/Makefile
+++ b/www/pear-SOAP/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/04 11:41:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	SOAP Client/Server for PHP
 
 DISTNAME=	SOAP-0.12.0
-REVISION=	0
+REVISION=	1
 CATEGORIES=	www
 
 MODULES=	www/pear
diff --git a/www/pear/Makefile b/www/pear/Makefile
index 56e2cb4ffc9..7efb27efc76 100644
--- a/www/pear/Makefile
+++ b/www/pear/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2011/07/11 06:22:49 robert Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:07 espie Exp $
 
 COMMENT-main=	base classes for common PHP tasks
 COMMENT-utils=	utilities for managing pear extensions
@@ -12,7 +12,7 @@ CATEGORIES=	www devel
 EXTRACT_SUFX=	.tar.bz2
 
 REVISION-main=	2
-REVISION-utils=	2
+REVISION-utils=	3
 
 HOMEPAGE=	http://pear.php.net/
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
diff --git a/www/pecl-APC/Makefile b/www/pecl-APC/Makefile
index 663b5f07fa6..33ccd576a20 100644
--- a/www/pecl-APC/Makefile
+++ b/www/pecl-APC/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2011/07/09 00:04:11 robert Exp $
+# $OpenBSD: Makefile,v 1.18 2011/09/16 12:00:07 espie Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	Alternative PHP Cache
 
 DISTNAME=	APC-3.1.7
-REVISION=	0
+REVISION=	1
 PKGNAME=	pecl-${DISTNAME}
 CATEGORIES=	www
 
diff --git a/www/pecl-chroot/Makefile b/www/pecl-chroot/Makefile
index 70c9741b5b6..fe3f9326b50 100644
--- a/www/pecl-chroot/Makefile
+++ b/www/pecl-chroot/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2011/07/09 00:37:40 robert Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:07 espie Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	PHP support for chroot(2)
 DISTNAME=	pecl-chroot-1.0
-REVISION=	0
+REVISION=	1
 MASTER_SITES=	${MASTER_SITE_BACKUP}
 CATEGORIES=	www
 
diff --git a/www/pecl-geoip/Makefile b/www/pecl-geoip/Makefile
index 0ddd75bcf4a..595b5b05f65 100644
--- a/www/pecl-geoip/Makefile
+++ b/www/pecl-geoip/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2011/07/09 00:04:11 robert Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/16 12:00:07 espie Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	PHP support for geocoding IPv4 addresses
 
 DISTNAME=	geoip-1.0.7
-REVISION=	0
+REVISION=	1
 PKGNAME=	pecl-${DISTNAME}
 CATEGORIES=	www
 
diff --git a/www/pecl-memcache/Makefile b/www/pecl-memcache/Makefile
index 5e314aa174e..a404a495cc8 100644
--- a/www/pecl-memcache/Makefile
+++ b/www/pecl-memcache/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2011/07/09 00:04:11 robert Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/16 12:00:07 espie Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	PHP interface to memcached
 
 DISTNAME=	memcache-3.0.4
-REVISION=	0
+REVISION=	1
 PKGNAME=	pecl-${DISTNAME}
 CATEGORIES=	www
 
diff --git a/www/pecl-pcntl/Makefile b/www/pecl-pcntl/Makefile
index 79e488d7cd7..5fea18debe9 100644
--- a/www/pecl-pcntl/Makefile
+++ b/www/pecl-pcntl/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2011/07/09 00:04:11 robert Exp $
+# $OpenBSD: Makefile,v 1.7 2011/09/16 12:00:07 espie Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	PHP support for process control
 DISTNAME=	pecl-pcntl-1.0
-REVISION=	0
+REVISION=	1
 MASTER_SITES=	${MASTER_SITE_BACKUP}
 CATEGORIES=	www
 
diff --git a/www/pecl-phar/Makefile b/www/pecl-phar/Makefile
index 0f19583c80d..d0348d80fd2 100644
--- a/www/pecl-phar/Makefile
+++ b/www/pecl-phar/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2011/09/16 12:00:07 espie Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	support for PHP archives (.phar)
 DISTNAME=	phar-2.0.0
 PKGNAME=	pecl-${DISTNAME}
-REVISION=	3
+REVISION=	4
 EXTRACT_SUFX=	.tgz
 MASTER_SITES=	http://pecl.php.net/get/
 CATEGORIES=	www
diff --git a/www/pecl-proctitle/Makefile b/www/pecl-proctitle/Makefile
index d5e92b66fc6..de5895a5e1d 100644
--- a/www/pecl-proctitle/Makefile
+++ b/www/pecl-proctitle/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2011/07/09 00:04:11 robert Exp $
+# $OpenBSD: Makefile,v 1.4 2011/09/16 12:00:07 espie Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	PHP support for setproctitle
 
 DISTNAME=	proctitle-0.1.1
-REVISION=	0
+REVISION=	1
 PKGNAME=	pecl-${DISTNAME}
 CATEGORIES=	www
 
diff --git a/www/pecl-ssh2/Makefile b/www/pecl-ssh2/Makefile
index 7e57cff1922..85149fbeab3 100644
--- a/www/pecl-ssh2/Makefile
+++ b/www/pecl-ssh2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2011/07/09 00:04:11 robert Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:07 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -7,7 +7,7 @@ COMMENT=	php bindings for the libssh2 library
 DISTNAME=	ssh2-0.11.0
 EXTRACT_SUFX=	.tgz
 PKGNAME=	pecl-${DISTNAME}
-REVISION=	1
+REVISION=	2
 CATEGORIES=	www
 
 HOMEPAGE=	http://pecl.php.net/package/ssh2/
diff --git a/www/pecl-swish/Makefile b/www/pecl-swish/Makefile
index 4260f00b921..2ff5b0a800d 100644
--- a/www/pecl-swish/Makefile
+++ b/www/pecl-swish/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2011/07/09 00:04:11 robert Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/16 12:00:07 espie Exp $
 
 SHARED_ONLY =	Yes
 COMMENT =	PHP interface to swish-e
 
 DISTNAME =	swish-0.3.0
-REVISION =	0
+REVISION =	1
 PKGNAME =	pecl-${DISTNAME}
 CATEGORIES =	www
 EXTRACT_SUFX =	.tgz
diff --git a/www/pecl-uploadprogress/Makefile b/www/pecl-uploadprogress/Makefile
index 74791b030da..0765649585e 100644
--- a/www/pecl-uploadprogress/Makefile
+++ b/www/pecl-uploadprogress/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2011/07/09 00:04:11 robert Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/16 12:00:07 espie Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	PHP upload progress meter
 
 DISTNAME=	uploadprogress-1.0.1
-REVISION=	0
+REVISION=	1
 PKGNAME=	pecl-${DISTNAME}
 CATEGORIES=	www
 
diff --git a/www/php-openid/Makefile b/www/php-openid/Makefile
index 5bdd629171b..04d85ed1caa 100644
--- a/www/php-openid/Makefile
+++ b/www/php-openid/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=		OpenID authentication for PHP
 
 DISTNAME=		php-openid-2.1.2
-REVISION=		1
+REVISION=		2
 CATEGORIES=		www security
 
 # Apache 2.0 license
diff --git a/www/phpicalendar/Makefile b/www/phpicalendar/Makefile
index deaac8d6e27..17dd07c0b6a 100644
--- a/www/phpicalendar/Makefile
+++ b/www/phpicalendar/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2011/07/08 23:04:53 robert Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	web-based iCal file parser
 
 V=		2.31
 DISTNAME=	phpicalendar${V}
 PKGNAME=	phpicalendar-${V}
-REVISION=	0
+REVISION=	1
 CATEGORIES=	www
 
 HOMEPAGE=	http://phpicalendar.net/
diff --git a/www/phpldapadmin/Makefile b/www/phpldapadmin/Makefile
index 3f5246b707c..fbd0a96c054 100644
--- a/www/phpldapadmin/Makefile
+++ b/www/phpldapadmin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	web-based LDAP browser to manage LDAP servers
 
@@ -7,7 +7,7 @@ DISTNAME=	phpldapadmin-${VERSION}
 CATEGORIES=	www
 HOMEPAGE=	http://phpldapadmin.sourceforge.net/
 
-REVISION=	2
+REVISION=	3
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/www/phplist/Makefile b/www/phplist/Makefile
index 9bfd0695596..25d167edbec 100644
--- a/www/phplist/Makefile
+++ b/www/phplist/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/07/22 10:20:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=		web-based double opt-in newsletter manager
 
 DISTNAME=		phplist-2.10.14
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		www
 
diff --git a/www/phpmyadmin/Makefile b/www/phpmyadmin/Makefile
index 7d28c93baab..d80f58644ad 100644
--- a/www/phpmyadmin/Makefile
+++ b/www/phpmyadmin/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.62 2011/08/30 15:04:41 jasper Exp $
+# $OpenBSD: Makefile,v 1.63 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	tool to handle the administration of MySQL over the web
 
 V=		3.4.4
 DISTNAME=	phpMyAdmin-${V}
+REVISION=	0
 CATEGORIES=	www
 HOMEPAGE=	http://www.phpmyadmin.net/
 
diff --git a/www/phppgadmin/Makefile b/www/phppgadmin/Makefile
index 0b9ee39fba6..107209b18ff 100644
--- a/www/phppgadmin/Makefile
+++ b/www/phppgadmin/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2011/07/22 10:20:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	tool to handle the administration of PostgreSQL over the web
 
 DISTNAME=	phpPgAdmin-5.0.2
-REVISION=	1
+REVISION=	2
 CATEGORIES=	www databases
 HOMEPAGE=	http://phppgadmin.sourceforge.net/
 
diff --git a/www/piwik/Makefile b/www/piwik/Makefile
index 8defe684b5c..62d11955a58 100644
--- a/www/piwik/Makefile
+++ b/www/piwik/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.39 2011/07/22 10:20:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.40 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=		open source web analytics software program
 
 DISTNAME=		piwik-1.5.1
-REVISION=		0
+REVISION=		1
 CATEGORIES=		www
 
 HOMEPAGE=		http://www.piwik.org/
diff --git a/www/plone-ldap/Makefile b/www/plone-ldap/Makefile
index 17467d0e465..9ddcbaec5e4 100644
--- a/www/plone-ldap/Makefile
+++ b/www/plone-ldap/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2010/11/22 08:36:53 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	LDAP adapter for Plone
 
 VERSION=	1.0
 DISTNAME=	PloneLDAP-${VERSION}
 PKGNAME=	${DISTNAME:S/Plone/plone-/:L}
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	www
 HOMEPAGE=	http://plone.org/products/ploneldap
diff --git a/www/plone/3.0/Makefile b/www/plone/3.0/Makefile
index 21c71617066..fd6637330fd 100644
--- a/www/plone/3.0/Makefile
+++ b/www/plone/3.0/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2010/11/22 08:36:53 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	content management system built on top of Zope
 
 DISTNAME=	Plone-3.0.6
 PKGNAME=	${DISTNAME:L}
-REVISION=	2
+REVISION=	3
 
 MASTER_SITES=		https://launchpad.net/plone/3.0/3.0.6/+download/
 
diff --git a/www/pmwiki/Makefile b/www/pmwiki/Makefile
index 32ea9256c61..2562db1cb23 100644
--- a/www/pmwiki/Makefile
+++ b/www/pmwiki/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2011/07/08 23:01:39 robert Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	wiki-based system for collaborative creation of websites
 
 DISTNAME=	pmwiki-2.2.21
-REVISION=	0
+REVISION=	1
 EXTRACT_SUFX=	.tgz
 
 CATEGORIES=	www
diff --git a/www/puppet-dashboard/Makefile b/www/puppet-dashboard/Makefile
index e3ca4d77805..e496c28f321 100644
--- a/www/puppet-dashboard/Makefile
+++ b/www/puppet-dashboard/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2010/11/24 21:35:16 jeremy Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	overview of your Puppet ecosystem
 
 V=		1.0.0
 DISTNAME=	puppet-dashboard-$V
-REVISION =	1
+REVISION =	2
 CATEGORIES=	www sysutils
 EXTRACT_SUFX=	.tgz
 
diff --git a/www/py-CherryPy/Makefile b/www/py-CherryPy/Makefile
index 23c3140b889..db1fa8c2f72 100644
--- a/www/py-CherryPy/Makefile
+++ b/www/py-CherryPy/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2011/07/03 22:14:42 zinke Exp $
+# $OpenBSD: Makefile,v 1.19 2011/09/16 12:00:07 espie Exp $
 
 COMMENT=	pythonic, object-oriented web development framework
 
 MODPY_EGG_VERSION=	3.2.0
-REVISION=		0
+REVISION=		1
 DISTNAME=		CherryPy-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 CATEGORIES=		www
diff --git a/www/py-beaker/Makefile b/www/py-beaker/Makefile
index 3c94a3a5077..1376d87cb2e 100644
--- a/www/py-beaker/Makefile
+++ b/www/py-beaker/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.7 2011/09/16 12:00:07 espie Exp $
 
 COMMENT =	session and caching library with wsgi middleware
 
 MODPY_EGG_VERSION = 1.5.4
-REVISION =	0
+REVISION =	1
 DISTNAME =	Beaker-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
 
diff --git a/www/py-beautifulsoup/Makefile b/www/py-beautifulsoup/Makefile
index 78b52246972..e35d2819931 100644
--- a/www/py-beautifulsoup/Makefile
+++ b/www/py-beautifulsoup/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	HTML/XML parser that supports invalid markup
 
 MODPY_EGG_VERSION =	3.2.0
-REVISION =	0
+REVISION =	1
 DISTNAME =	BeautifulSoup-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
 
diff --git a/www/py-cherrypy2/Makefile b/www/py-cherrypy2/Makefile
index 5304da32150..7872d3f4010 100644
--- a/www/py-cherrypy2/Makefile
+++ b/www/py-cherrypy2/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=		pythonic, object-oriented web development framework
 
 V=			2.3.0
 DISTNAME=		CherryPy-${V}
 PKGNAME=		py-cherrypy2-${V}
-REVISION=		2
+REVISION=		3
 CATEGORIES=		www
 
 HOMEPAGE=		http://www.cherrypy.org/ 
diff --git a/www/py-clientform/Makefile b/www/py-clientform/Makefile
index bf3ea54c628..8a2f300baf6 100644
--- a/www/py-clientform/Makefile
+++ b/www/py-clientform/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=		handle HTML forms on the client side
 
 MODPY_EGG_VERSION=	0.2.10
 DISTNAME=		ClientForm-${MODPY_EGG_VERSION}
 PKGNAME=		py-clientform-${MODPY_EGG_VERSION}
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		www
 
diff --git a/www/py-django/Makefile b/www/py-django/Makefile
index c660dc37333..6722a7f5711 100644
--- a/www/py-django/Makefile
+++ b/www/py-django/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.21 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	high-level Python web framework
 
@@ -7,7 +7,7 @@ LNAME =			django
 DISTNAME =		Django-${MODPY_EGG_VERSION}
 PKGNAME =		py-${LNAME}-${MODPY_EGG_VERSION}
 CATEGORIES =		www
-REVISION =		2
+REVISION =		3
 
 HOMEPAGE =	http://www.djangoproject.com/
 
diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile
index 19f2e41a04b..5910fa38eb4 100644
--- a/www/py-flask/Makefile
+++ b/www/py-flask/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2011/07/14 22:34:02 fgsch Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/16 12:00:08 espie Exp $
 
 COMMENT = 	microframework based on Werkzeug and Jinja 2
 
 MODPY_EGG_VERSION =	0.7.2
 DISTNAME =	Flask-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
+REVISION=	0
 
 CATEGORIES =	www devel
 
diff --git a/www/py-flup/Makefile b/www/py-flup/Makefile
index 34acd865ec4..69274c9c3e7 100644
--- a/www/py-flup/Makefile
+++ b/www/py-flup/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =		random assortment of WSGI servers, middleware
 
 MODPY_EGG_VERSION =	1.0.2
 DISTNAME =		flup-${MODPY_EGG_VERSION}
 PKGNAME =		py-flup-${MODPY_EGG_VERSION}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		www
 
diff --git a/www/py-formencode/Makefile b/www/py-formencode/Makefile
index 63fd9f51c33..0bdbf1a236a 100644
--- a/www/py-formencode/Makefile
+++ b/www/py-formencode/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.15 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =		HTML form validation, generation, and conversion
 
 MODPY_EGG_VERSION =	1.2.2
 DISTNAME =		FormEncode-${MODPY_EGG_VERSION}
 PKGNAME =		py-formencode-${MODPY_EGG_VERSION}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		www
 
diff --git a/www/py-genshi/Makefile b/www/py-genshi/Makefile
index caae7bbee15..fc30db52916 100644
--- a/www/py-genshi/Makefile
+++ b/www/py-genshi/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	toolkit for generation of output for the web
 
 MODPY_EGG_VERSION =	0.6
 DISTNAME =	Genshi-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =   	www
 
diff --git a/www/py-htmltmpl/Makefile b/www/py-htmltmpl/Makefile
index 2d0562a5325..76ac1293076 100644
--- a/www/py-htmltmpl/Makefile
+++ b/www/py-htmltmpl/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.4 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=	templating engine for separation of code and HTML
 
 MODPY_EGG_VERSION= 1.22
 DISTNAME=	htmltmpl-${MODPY_EGG_VERSION}
 PKGNAME=	py-htmltmpl-${MODPY_EGG_VERSION}
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	www devel
 
diff --git a/www/py-httplib2/Makefile b/www/py-httplib2/Makefile
index a4eb04210bc..41a70332ed3 100644
--- a/www/py-httplib2/Makefile
+++ b/www/py-httplib2/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.7 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =		Python HTTP client library
 
 MODPY_EGG_VERSION =	0.6.0
 DISTNAME =		httplib2-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		www net
 
diff --git a/www/py-jinja2/Makefile b/www/py-jinja2/Makefile
index 0c9c3e2193c..2e8e55e8d7b 100644
--- a/www/py-jinja2/Makefile
+++ b/www/py-jinja2/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =		fast, optionally sandboxed, Python template engine
 
 MODPY_EGG_VERSION =	2.5.5
 DISTNAME =		Jinja2-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME:L}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		www devel
 
diff --git a/www/py-jonpy/Makefile b/www/py-jonpy/Makefile
index 54f3d18e2b9..14826a6a0f5 100644
--- a/www/py-jonpy/Makefile
+++ b/www/py-jonpy/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=	Python cgi/fastcgi/mod_python framework
 
 DISTNAME=	jonpy-0.06
 PKGNAME=	py-${DISTNAME}
-REVISION=	5
+REVISION=	6
 CATEGORIES=    	www
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=jonpy/}
diff --git a/www/py-mako/Makefile b/www/py-mako/Makefile
index 2e5dacfdc47..f227d592b08 100644
--- a/www/py-mako/Makefile
+++ b/www/py-mako/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	super-fast templating language
 
 MODPY_EGG_VERSION = 0.4.1
 DISTNAME =	Mako-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	www
 
diff --git a/www/py-mechanize/Makefile b/www/py-mechanize/Makefile
index 903592d4856..a0253a590ae 100644
--- a/www/py-mechanize/Makefile
+++ b/www/py-mechanize/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=		stateful programmatic web browsing module
 
 MODPY_EGG_VERSION=	0.2.4
 DISTNAME=		mechanize-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		www
 
diff --git a/www/py-meld3/Makefile b/www/py-meld3/Makefile
index 99075192dc4..774570198cc 100644
--- a/www/py-meld3/Makefile
+++ b/www/py-meld3/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	html/xml templating engine
 
 MODPY_EGG_VERSION = 0.6.7
 DISTNAME =	meld3-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	www
 
diff --git a/www/py-nevow/Makefile b/www/py-nevow/Makefile
index 0f9c5b07e6c..7b39237bd30 100644
--- a/www/py-nevow/Makefile
+++ b/www/py-nevow/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=	web application construction kit
 
 VERSION=	0.10.0
 DISTNAME=	Nevow-${VERSION}
 PKGNAME=	py-nevow-${VERSION}
-REVISION=	3
+REVISION=	4
 CATEGORIES=	www
 
 HOMEPAGE=	http://divmod.org/trac/wiki/DivmodNevow
diff --git a/www/py-paste-deploy/Makefile b/www/py-paste-deploy/Makefile
index c680549ec2a..06bd974d736 100644
--- a/www/py-paste-deploy/Makefile
+++ b/www/py-paste-deploy/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =		load, configure, compose WSGI applications and servers
 
 MODPY_EGG_VERSION =	1.3.3
 DISTNAME =		PasteDeploy-${MODPY_EGG_VERSION}
 PKGNAME =		py-paste-deploy-${MODPY_EGG_VERSION}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		www
 
diff --git a/www/py-paste-script/Makefile b/www/py-paste-script/Makefile
index defad075a97..e8d010ccd74 100644
--- a/www/py-paste-script/Makefile
+++ b/www/py-paste-script/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=		pluggable command-line frontend
 
 MODPY_EGG_VERSION=	1.7.3
 DISTNAME=		PasteScript-${MODPY_EGG_VERSION}
 PKGNAME=		py-paste-script-${MODPY_EGG_VERSION}
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		www
 
diff --git a/www/py-paste/Makefile b/www/py-paste/Makefile
index 0f39f7c061e..1254003c303 100644
--- a/www/py-paste/Makefile
+++ b/www/py-paste/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =		tools for using web server gateway interface stack
 
 MODPY_EGG_VERSION =	1.7.2
 DISTNAME =		Paste-${MODPY_EGG_VERSION}
 PKGNAME =		py-paste-${MODPY_EGG_VERSION}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		www
 
diff --git a/www/py-pylons/Makefile b/www/py-pylons/Makefile
index 794cc201691..efb7464066e 100644
--- a/www/py-pylons/Makefile
+++ b/www/py-pylons/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	rapid web application development framework
 
 MODPY_EGG_VERSION = 0.9.7
 DISTNAME =	Pylons-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	www devel
 
diff --git a/www/py-quixote/Makefile b/www/py-quixote/Makefile
index ffa05299dea..773c87cbb9b 100644
--- a/www/py-quixote/Makefile
+++ b/www/py-quixote/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=		simple Python framework for web-based applications
 
 MODPY_EGG_VERSION=	2.6
 DISTNAME=		Quixote-${MODPY_EGG_VERSION}
 PKGNAME=		py-quixote-${MODPY_EGG_VERSION}
-REVISION=		2
+REVISION=		3
 
 CATEGORIES=		www
 
diff --git a/www/py-repoze-profile/Makefile b/www/py-repoze-profile/Makefile
index b6a6da59b51..b2822a62114 100644
--- a/www/py-repoze-profile/Makefile
+++ b/www/py-repoze-profile/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	aggregate profiling for wsgi requests
 
 MODPY_EGG_VERSION = 1.1
 DISTNAME =	repoze.profile-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:S/./-/}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	www devel
 
diff --git a/www/py-routes/Makefile b/www/py-routes/Makefile
index 8282c10ae44..6765c84e144 100644
--- a/www/py-routes/Makefile
+++ b/www/py-routes/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	re-implementation of the rails routes system
 
 MODPY_EGG_VERSION = 1.11
 DISTNAME =	Routes-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	www devel
 
diff --git a/www/py-tempita/Makefile b/www/py-tempita/Makefile
index f265001a4be..de4fecfe32a 100644
--- a/www/py-tempita/Makefile
+++ b/www/py-tempita/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	very small text templating language
 
 MODPY_EGG_VERSION = 0.4
 DISTNAME =	Tempita-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	www
 
diff --git a/www/py-turbogears/Makefile b/www/py-turbogears/Makefile
index 44bae7fe2e8..0d92a7bdd6d 100644
--- a/www/py-turbogears/Makefile
+++ b/www/py-turbogears/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.17 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =		Python web development megaframework
 
 MODPY_EGG_VERSION =	1.1.1
 DISTNAME =		TurboGears-${MODPY_EGG_VERSION}
 PKGNAME =		py-turbogears-${MODPY_EGG_VERSION}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		www
 
diff --git a/www/py-webdav/Makefile b/www/py-webdav/Makefile
index 010bdd86190..8bf7fdadcd6 100644
--- a/www/py-webdav/Makefile
+++ b/www/py-webdav/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2011/06/13 15:32:14 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=		standards compliant Python WebDAV server and library
 
 MODPY_EGG_VERSION=	0.9.4.1
 DISTNAME=		PyWebDAV-${MODPY_EGG_VERSION}
 PKGNAME=		py-webdav-${MODPY_EGG_VERSION}
-REVISION=		0
+REVISION=		1
 
 CATEGORIES=		www
 
diff --git a/www/py-weberror/Makefile b/www/py-weberror/Makefile
index 0f69ab8e482..ac0b8c5f9da 100644
--- a/www/py-weberror/Makefile
+++ b/www/py-weberror/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	web error handling and exception catching
 
 MODPY_EGG_VERSION = 0.10.1
 DISTNAME =	WebError-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	www devel
 
diff --git a/www/py-webhelpers/Makefile b/www/py-webhelpers/Makefile
index a51b1c97e2e..46f6eebeb80 100644
--- a/www/py-webhelpers/Makefile
+++ b/www/py-webhelpers/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	helper functions focused on web applications
 
 MODPY_EGG_VERSION = 0.6.4
 DISTNAME =	WebHelpers-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	www devel
 
diff --git a/www/py-webkitgtk/Makefile b/www/py-webkitgtk/Makefile
index 9601677fe75..c9f29e9432b 100644
--- a/www/py-webkitgtk/Makefile
+++ b/www/py-webkitgtk/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2011/07/20 05:48:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=		python bindings for the WebKit GTK+ port
 
 V=			1.1.8
 DISTNAME=		pywebkitgtk-$V
 PKGNAME=		py-webkitgtk-$V
-REVISION=		5
+REVISION=		6
 CATEGORIES=		www
 
 HOMEPAGE=		http://pywebkitgtk.googlecode.com/
diff --git a/www/py-webob/Makefile b/www/py-webob/Makefile
index 0730ea148a3..f03657931ce 100644
--- a/www/py-webob/Makefile
+++ b/www/py-webob/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	wsgi request and response object
 
 MODPY_EGG_VERSION = 0.9.7.1
 DISTNAME =	WebOb-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	www devel
 
diff --git a/www/py-webpy/Makefile b/www/py-webpy/Makefile
index 4cfbdf5f603..dc56b99c6cc 100644
--- a/www/py-webpy/Makefile
+++ b/www/py-webpy/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2011/08/21 14:29:50 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=	web framework for python
 
 VERSION=	0.36
 DISTNAME=	web.py-${VERSION}
 PKGNAME=	py-webpy-${VERSION}
+REVISION=	0
 CATEGORIES=	www
 
 MASTER_SITES=	${HOMEPAGE}/static/
diff --git a/www/py-webtest/Makefile b/www/py-webtest/Makefile
index 9451d8fab12..cfd41699d5a 100644
--- a/www/py-webtest/Makefile
+++ b/www/py-webtest/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	helper to test wsgi applications
 
 MODPY_EGG_VERSION = 1.2
 DISTNAME =	WebTest-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	www devel
 
diff --git a/www/py-werkzeug/Makefile b/www/py-werkzeug/Makefile
index ea39f8357ac..dc9f616a08d 100644
--- a/www/py-werkzeug/Makefile
+++ b/www/py-werkzeug/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =		WSGI utility collection
 
 MODPY_EGG_VERSION =	0.6.2
 DISTNAME =		Werkzeug-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME:L}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		www devel
 
diff --git a/www/py-wsgiproxy/Makefile b/www/py-wsgiproxy/Makefile
index c082635f7c0..9aff7bf821d 100644
--- a/www/py-wsgiproxy/Makefile
+++ b/www/py-wsgiproxy/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	http proxying tools for wsgi apps
 
 MODPY_EGG_VERSION = 0.2
 DISTNAME =	WSGIProxy-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	www devel
 
diff --git a/www/py-zine/Makefile b/www/py-zine/Makefile
index 128bac365fa..9993c73e6d8 100644
--- a/www/py-zine/Makefile
+++ b/www/py-zine/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=		personal publishing platform / weblog engine
 
 DISTNAME=		Zine-0.1.2
 PKGNAME=		py-${DISTNAME:L}
-REVISION=		3
+REVISION=		4
 
 CATEGORIES=		www
 
diff --git a/www/pyblosxom/Makefile b/www/pyblosxom/Makefile
index 6d0d112638a..5544bf2a789 100644
--- a/www/pyblosxom/Makefile
+++ b/www/pyblosxom/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=	Python weblog system
 
 DISTNAME=	pyblosxom-1.3.2
-REVISION=	3
+REVISION=	4
 CATEGORIES=	www
 PKG_ARCH=	*
 
diff --git a/www/raggle/Makefile b/www/raggle/Makefile
index ab9f2b3517e..dd89b8aad91 100644
--- a/www/raggle/Makefile
+++ b/www/raggle/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2011/03/24 22:01:08 landry Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=	console RSS aggregator
 
 DISTNAME=	raggle-0.4.4
-REVISION =	3
+REVISION =	4
 
 CATEGORIES=	www news
 
diff --git a/www/rawdog/Makefile b/www/rawdog/Makefile
index 6307ff01a75..b455dd5c8eb 100644
--- a/www/rawdog/Makefile
+++ b/www/rawdog/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.22 2011/06/08 18:15:29 rpointel Exp $
+# $OpenBSD: Makefile,v 1.23 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=	RSS Aggregator Without Delusions Of Grandeur
 
 MODPY_EGG_VERSION=	2.12
 DISTNAME=	rawdog-${MODPY_EGG_VERSION}
-REVISION=	1
+REVISION=	2
 CATEGORIES=	www news
 
 HOMEPAGE=	http://offog.org/code/rawdog.html
diff --git a/www/ruby-activemerchant/Makefile b/www/ruby-activemerchant/Makefile
index 1f3c3596ff0..b56091e1bbe 100644
--- a/www/ruby-activemerchant/Makefile
+++ b/www/ruby-activemerchant/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/01/06 04:24:24 jeremy Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	ruby library for handling credit card processor merchants
 
 DISTNAME =	activemerchant-1.4.2
-REVISION =	3
+REVISION =	4
 CATEGORIES =	www
 
 HOMEPAGE =	http://www.activemerchant.org/
diff --git a/www/ruby-activeresource/Makefile b/www/ruby-activeresource/Makefile
index 92d963983dd..a6b1740c1d2 100644
--- a/www/ruby-activeresource/Makefile
+++ b/www/ruby-activeresource/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2011/01/06 04:24:24 jeremy Exp $
+# $OpenBSD: Makefile,v 1.17 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	wraps web resources in model classes
 
 VERSION =	3.0.3
 DISTNAME =	activeresource-${VERSION}
-REVISION =	0
+REVISION =	1
 CATEGORIES =	www
 
 # MIT License
diff --git a/www/ruby-addressable/Makefile b/www/ruby-addressable/Makefile
index d12a4e29d2c..9225b9e2e96 100644
--- a/www/ruby-addressable/Makefile
+++ b/www/ruby-addressable/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2011/07/01 15:22:34 jeremy Exp $
+# $OpenBSD: Makefile,v 1.14 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	replacement for Ruby's URI implementation
 
 # test databases/ruby-datamapper/core before updating
 DISTNAME = 	addressable-2.2.2
-REVISION = 	0
+REVISION = 	1
 CATEGORIES =	www
 
 HOMEPAGE =	http://addressable.rubyforge.org/
diff --git a/www/ruby-fcgi/Makefile b/www/ruby-fcgi/Makefile
index 362807eb737..804b9e1f80a 100644
--- a/www/ruby-fcgi/Makefile
+++ b/www/ruby-fcgi/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2010/11/24 21:35:16 jeremy Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=	ruby FastCGI library
 
 DISTNAME=	fcgi-0.8.7
-REVISION =	5
+REVISION =	6
 CATEGORIES=	www 
 
 # ruby license
diff --git a/www/ruby-httpclient/Makefile b/www/ruby-httpclient/Makefile
index f7c000e4668..8ed97de696a 100644
--- a/www/ruby-httpclient/Makefile
+++ b/www/ruby-httpclient/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	library to access web resources via HTTP
 
 DISTNAME =	httpclient-2.1.5.2
-REVISION =	3
+REVISION =	4
 CATEGORIES =	www
 
 HOMEPAGE =	http://dev.ctor.org/http-access2/
diff --git a/www/ruby-jekyll/Makefile b/www/ruby-jekyll/Makefile
index 4eb67db38dc..e2aed155ee2 100644
--- a/www/ruby-jekyll/Makefile
+++ b/www/ruby-jekyll/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2010/12/20 18:21:08 jeremy Exp $
+# $OpenBSD: Makefile,v 1.2 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=		simple, blog aware, static site generator
 
 DISTNAME=		jekyll-0.8.0
+REVISION=	0
 CATEGORIES=		www
 
 HOMEPAGE=		http://jekyllrb.com/
diff --git a/www/ruby-mechanize/Makefile b/www/ruby-mechanize/Makefile
index 446756432fc..c5f11fb193d 100644
--- a/www/ruby-mechanize/Makefile
+++ b/www/ruby-mechanize/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/16 12:00:08 espie Exp $
 
 COMMENT=		automate interaction with websites
 
 DISTNAME=		mechanize-0.9.3
-REVISION =		4
+REVISION =		5
 CATEGORIES=		www
 
 HOMEPAGE=		http://mechanize.rubyforge.org/mechanize
diff --git a/www/ruby-merb/action-args/Makefile b/www/ruby-merb/action-args/Makefile
index ef468fbea18..46960ada801 100644
--- a/www/ruby-merb/action-args/Makefile
+++ b/www/ruby-merb/action-args/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	provide support for ActionArgs
 
 DISTNAME =	merb-action-args-${VERSION}
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	www/ruby-merb/core,${MODRUBY_FLAVOR}${MERB_REL_VER_SPEC} \
 		devel/ruby-ruby2ruby,${MODRUBY_FLAVOR}>=1.1.9 \
diff --git a/www/ruby-merb/activerecord/Makefile b/www/ruby-merb/activerecord/Makefile
index 9a63ceef090..4c289774381 100644
--- a/www/ruby-merb/activerecord/Makefile
+++ b/www/ruby-merb/activerecord/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.14 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	plugin for the Merb that provides activerecord access
 
 VERSION =	1.0.0.1
 DISTNAME =	merb_activerecord-${VERSION}
-REVISION =	6
+REVISION =	7
 
 RUN_DEPENDS =	www/ruby-merb/core,${MODRUBY_FLAVOR}>=0.9.9 \
 		databases/ruby-activerecord,${MODRUBY_FLAVOR}
diff --git a/www/ruby-merb/assets/Makefile b/www/ruby-merb/assets/Makefile
index 07dbec4dad5..fbe5e624744 100644
--- a/www/ruby-merb/assets/Makefile
+++ b/www/ruby-merb/assets/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	provide Merb helpers for assets and asset bundling
 
 DISTNAME =	merb-assets-${VERSION}
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	www/ruby-merb/core,${MODRUBY_FLAVOR}${MERB_REL_VER_SPEC}
 
diff --git a/www/ruby-merb/auth-core/Makefile b/www/ruby-merb/auth-core/Makefile
index e5d23e7a46c..84769af5fb7 100644
--- a/www/ruby-merb/auth-core/Makefile
+++ b/www/ruby-merb/auth-core/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	authentication core framework
 
 DISTNAME =	merb-auth-core-1.1.1
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	www/ruby-merb/core,${MODRUBY_FLAVOR}${MERB_REL_VER_SPEC}
 
diff --git a/www/ruby-merb/auth-more/Makefile b/www/ruby-merb/auth-more/Makefile
index f143b94799e..bc2affbef7d 100644
--- a/www/ruby-merb/auth-more/Makefile
+++ b/www/ruby-merb/auth-more/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	useful extensions for merb-auth-core
 
 DISTNAME =	merb-auth-more-1.1.1
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	www/ruby-merb/auth-core,${MODRUBY_FLAVOR}>=1.1.1,<1.2
 
diff --git a/www/ruby-merb/auth-slice-password/Makefile b/www/ruby-merb/auth-slice-password/Makefile
index 756393c0cda..c663ddc17b1 100644
--- a/www/ruby-merb/auth-slice-password/Makefile
+++ b/www/ruby-merb/auth-slice-password/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	merb-auth support for slices
 
 DISTNAME =	merb-auth-slice-password-1.1.1
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	www/ruby-merb/slices,${MODRUBY_FLAVOR}>=1.1,<2.0 \
 		www/ruby-merb/auth-more,${MODRUBY_FLAVOR}>=1.1.1,<1.2 \
diff --git a/www/ruby-merb/auth/Makefile b/www/ruby-merb/auth/Makefile
index 4e880c2e986..48c5a49be84 100644
--- a/www/ruby-merb/auth/Makefile
+++ b/www/ruby-merb/auth/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	extensible architecture for authentication
 
 DISTNAME =	merb-auth-1.1.1
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	www/ruby-merb/auth-core,${MODRUBY_FLAVOR}>=1.1.1,<1.2 \
 		www/ruby-merb/auth-more,${MODRUBY_FLAVOR}>=1.1.1,<1.2 \
diff --git a/www/ruby-merb/cache/Makefile b/www/ruby-merb/cache/Makefile
index 4cb194523ea..2477720a625 100644
--- a/www/ruby-merb/cache/Makefile
+++ b/www/ruby-merb/cache/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	caching plugin for Merb
 
 DISTNAME =	merb-cache-${VERSION}
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	www/ruby-merb/core,${MODRUBY_FLAVOR}${MERB_REL_VER_SPEC}
 
diff --git a/www/ruby-merb/core/Makefile b/www/ruby-merb/core/Makefile
index 552f342c0cf..18b0145df86 100644
--- a/www/ruby-merb/core/Makefile
+++ b/www/ruby-merb/core/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	fast, lightweight MVC framework for Ruby - merb-core
 
 DISTNAME =	merb-core-${VERSION}
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	devel/ruby-extlib,${MODRUBY_FLAVOR}>=0.9.13 \
 		textproc/ruby-erubis,${MODRUBY_FLAVOR}>=2.6.2 \
diff --git a/www/ruby-merb/datamapper/Makefile b/www/ruby-merb/datamapper/Makefile
index a62093e0d1d..0e2fe40e07b 100644
--- a/www/ruby-merb/datamapper/Makefile
+++ b/www/ruby-merb/datamapper/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	DataMapper ORM plugin
 
 DISTNAME =	merb_datamapper-1.1.2
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	databases/ruby-datamapper/core,${MODRUBY_FLAVOR}>=0.10.2 \
 		databases/ruby-datamapper/migrations,${MODRUBY_FLAVOR}>=0.10.2 \
diff --git a/www/ruby-merb/exceptions/Makefile b/www/ruby-merb/exceptions/Makefile
index 8061145fdc0..bedb08b7bb8 100644
--- a/www/ruby-merb/exceptions/Makefile
+++ b/www/ruby-merb/exceptions/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:08 espie Exp $
 
 COMMENT =	exception notifications
 
 DISTNAME =	merb-exceptions-${VERSION}
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	www/ruby-merb/core,${MODRUBY_FLAVOR}${MERB_REL_VER_SPEC} \
 		www/ruby-merb/mailer,${MODRUBY_FLAVOR}${MERB_REL_VER_SPEC}
diff --git a/www/ruby-merb/gen/Makefile b/www/ruby-merb/gen/Makefile
index 2cdff29f4fd..4b815c6e2f0 100644
--- a/www/ruby-merb/gen/Makefile
+++ b/www/ruby-merb/gen/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	application and plugin generators for Merb
 
 DISTNAME =	merb-gen-${VERSION}
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	www/ruby-merb/core,${MODRUBY_FLAVOR}${MERB_REL_VER_SPEC} \
 		textproc/ruby-templater,${MODRUBY_FLAVOR}>=1.0.0
diff --git a/www/ruby-merb/haml/Makefile b/www/ruby-merb/haml/Makefile
index 5e2280b94cf..94f4d04d8f9 100644
--- a/www/ruby-merb/haml/Makefile
+++ b/www/ruby-merb/haml/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2010/12/08 22:13:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	provide HAML support for Merb
 
 DISTNAME =	merb-haml-${VERSION}
+REVISION=	0
 
 RUN_DEPENDS =	www/ruby-merb/core,${MODRUBY_FLAVOR}${MERB_REL_VER_SPEC} \
 		textproc/ruby-haml,${MODRUBY_FLAVOR}>=2.0.3
diff --git a/www/ruby-merb/helpers/Makefile b/www/ruby-merb/helpers/Makefile
index 5cfa01e0cb5..71f6494b257 100644
--- a/www/ruby-merb/helpers/Makefile
+++ b/www/ruby-merb/helpers/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	plugin for Merb that provides different view helpers
 
 DISTNAME =	merb-helpers-${VERSION}
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	www/ruby-merb/core,${MODRUBY_FLAVOR}${MERB_REL_VER_SPEC}
 
diff --git a/www/ruby-merb/mailer/Makefile b/www/ruby-merb/mailer/Makefile
index 0ea74e1f9d7..6daef8691d7 100644
--- a/www/ruby-merb/mailer/Makefile
+++ b/www/ruby-merb/mailer/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/01/06 04:22:17 jeremy Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	mailer functionality for Merb
 
 DISTNAME =	merb-mailer-${VERSION}
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	www/ruby-merb/core,${MODRUBY_FLAVOR}${MERB_REL_VER_SPEC} \
 		mail/ruby-mailfactory,${MODRUBY_FLAVOR}>=1.2.3
diff --git a/www/ruby-merb/merb/Makefile b/www/ruby-merb/merb/Makefile
index 66676274cea..d64f21c54df 100644
--- a/www/ruby-merb/merb/Makefile
+++ b/www/ruby-merb/merb/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2010/12/08 22:13:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	fast, lightweight MVC framework for Ruby
 
 DISTNAME =	merb-${VERSION}
+REVISION=	0
 
 RUN_DEPENDS =	databases/ruby-do_sqlite3,${MODRUBY_FLAVOR}>=0.10.0 \
 		databases/ruby-datamapper/data_mapper,${MODRUBY_FLAVOR}>=0.10.0 \
diff --git a/www/ruby-merb/param-protection/Makefile b/www/ruby-merb/param-protection/Makefile
index c5a55c6181a..0d426ea3338 100644
--- a/www/ruby-merb/param-protection/Makefile
+++ b/www/ruby-merb/param-protection/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	filter controller parameters
 
 DISTNAME =	merb-param-protection-${VERSION}
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	www/ruby-merb/core,${MODRUBY_FLAVOR}${MERB_REL_VER_SPEC}
 
diff --git a/www/ruby-merb/slices/Makefile b/www/ruby-merb/slices/Makefile
index e89c3434d69..09e06fecc2a 100644
--- a/www/ruby-merb/slices/Makefile
+++ b/www/ruby-merb/slices/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	using and creating application 'slices'
 
 DISTNAME =	merb-slices-${VERSION}
-REVISION =	0
+REVISION =	1
 
 RUN_DEPENDS =	www/ruby-merb/core,${MODRUBY_FLAVOR}${MERB_REL_VER_SPEC}
 
diff --git a/www/ruby-mongrel/Makefile b/www/ruby-mongrel/Makefile
index ac6f6de0a3d..c03354cfe06 100644
--- a/www/ruby-mongrel/Makefile
+++ b/www/ruby-mongrel/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2010/11/24 21:35:16 jeremy Exp $
+# $OpenBSD: Makefile,v 1.18 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=	fast HTTP library and server for Ruby
 
 DISTNAME=	mongrel-1.1.5
-REVISION =	2
+REVISION =	3
 CATEGORIES=	www
 
 MAINTAINER=	Jason LaRiviere <jason@indelicate.net>
diff --git a/www/ruby-passenger/Makefile b/www/ruby-passenger/Makefile
index ea432ceb815..f70b576599f 100644
--- a/www/ruby-passenger/Makefile
+++ b/www/ruby-passenger/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2011/07/19 18:00:51 jeremy Exp $
+# $OpenBSD: Makefile,v 1.20 2011/09/16 12:00:09 espie Exp $
 
 SHARED_ONLY =	Yes
 
@@ -6,7 +6,7 @@ COMMENT =	Nginx module for deploying Ruby applications
 
 DISTNAME =	passenger-3.0.7
 PKGNAME =	ruby-${DISTNAME}
-REVISION =	2
+REVISION =	3
 CATEGORIES =	www
 
 HOMEPAGE =	http://www.modrails.com/
diff --git a/www/ruby-rack-mount/Makefile b/www/ruby-rack-mount/Makefile
index 80ebb55ceac..a98123261e4 100644
--- a/www/ruby-rack-mount/Makefile
+++ b/www/ruby-rack-mount/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.3 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=		stackable dynamic tree based Rack router
 
 DISTNAME=		rack-mount-0.6.13
-REVISION =		0
+REVISION =		1
 CATEGORIES=		www
 
 HOMEPAGE=		https://github.com/josh/rack-mount
diff --git a/www/ruby-rack-test/Makefile b/www/ruby-rack-test/Makefile
index b7540f0da18..971e34dfae5 100644
--- a/www/ruby-rack-test/Makefile
+++ b/www/ruby-rack-test/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2011/04/23 01:31:42 jeremy Exp $
+# $OpenBSD: Makefile,v 1.4 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=		small, simple testing API for Rack apps
 
 DISTNAME=		rack-test-0.5.6
-REVISION =		1
+REVISION =		2
 CATEGORIES=		www
 
 HOMEPAGE=		https://github.com/brynary/rack-test
diff --git a/www/ruby-rack/Makefile b/www/ruby-rack/Makefile
index d8085857c33..c3c9ed64a03 100644
--- a/www/ruby-rack/Makefile
+++ b/www/ruby-rack/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/03/24 03:15:36 jeremy Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=		modular Ruby webserver interface
 
 DISTNAME=		rack-1.2.2
+REVISION=	0
 CATEGORIES=		www
 
 HOMEPAGE=		http://rack.rubyforge.org/
diff --git a/www/ruby-rails/Makefile b/www/ruby-rails/Makefile
index 92e1fd73edb..2d8b1b58d1a 100644
--- a/www/ruby-rails/Makefile
+++ b/www/ruby-rails/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.29 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.30 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=	ruby MVC web application framework
 
 VERSION=	3.0.3
 DISTNAME=	rails-${VERSION}
-REVISION =	0
+REVISION =	1
 CATEGORIES=	www
 
 # MIT License
diff --git a/www/ruby-railties/Makefile b/www/ruby-railties/Makefile
index f81b2d88c16..c62f5924559 100644
--- a/www/ruby-railties/Makefile
+++ b/www/ruby-railties/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.3 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=	glues the Ruby on Rails framework together
 
 VERSION=	3.0.3
 DISTNAME=	railties-${VERSION}
-REVISION =	0
+REVISION =	1
 CATEGORIES=	www
 
 # MIT License
diff --git a/www/ruby-rainbows/Makefile b/www/ruby-rainbows/Makefile
index 3c7ba09a8b5..8539ad464be 100644
--- a/www/ruby-rainbows/Makefile
+++ b/www/ruby-rainbows/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2011/07/06 01:19:20 jeremy Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	ruby-unicorn for sleepy apps and slow clients
 
 DISTNAME =	rainbows-4.0.0
+REVISION=	0
 CATEGORIES =	www
 
 HOMEPAGE =	http://rainbows.rubyforge.org/
diff --git a/www/ruby-raindrops/Makefile b/www/ruby-raindrops/Makefile
index dcfe9afc3e1..5b92f4a167f 100644
--- a/www/ruby-raindrops/Makefile
+++ b/www/ruby-raindrops/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2011/07/06 01:14:09 jeremy Exp $
+# $OpenBSD: Makefile,v 1.2 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	real-time stats toolkit for Rack HTTP servers
 
 DISTNAME =	raindrops-0.7.0
+REVISION=	0
 CATEGORIES =	www
 
 MAINTAINER =	Jeremy Evans <jeremy@openbsd.org>
diff --git a/www/ruby-rest-client/Makefile b/www/ruby-rest-client/Makefile
index 5558ac8afec..e9f168a69bb 100644
--- a/www/ruby-rest-client/Makefile
+++ b/www/ruby-rest-client/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	simple REST client for Ruby
 
 DISTNAME =	rest-client-1.0.3
-REVISION =	3
+REVISION =	4
 CATEGORIES =	www
 
 HOMEPAGE =	http://rest-client.heroku.com/
diff --git a/www/ruby-sanitize/Makefile b/www/ruby-sanitize/Makefile
index a2c0dc36415..5c2367e8cb1 100644
--- a/www/ruby-sanitize/Makefile
+++ b/www/ruby-sanitize/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2011/07/27 18:21:54 jeremy Exp $
+# $OpenBSD: Makefile,v 1.3 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=		whitelist-based HTML sanitizer
 
 DISTNAME=		sanitize-2.0.3
+REVISION=	0
 CATEGORIES=		www textproc
 
 HOMEPAGE=		https://github.com/rgrove/sanitize/
diff --git a/www/ruby-sinatra/Makefile b/www/ruby-sinatra/Makefile
index b72286b4f7c..feb511251f7 100644
--- a/www/ruby-sinatra/Makefile
+++ b/www/ruby-sinatra/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2011/04/25 16:11:03 kili Exp $
+# $OpenBSD: Makefile,v 1.16 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	DSL for quickly creating web-applications in Ruby
 
 DISTNAME =	sinatra-1.2.1
+REVISION=	0
 CATEGORIES =	www
 
 HOMEPAGE =	http://www.sinatrarb.com/
diff --git a/www/ruby-thin/Makefile b/www/ruby-thin/Makefile
index 94b4779b7e6..a31b8586e48 100644
--- a/www/ruby-thin/Makefile
+++ b/www/ruby-thin/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/03/25 16:39:24 jeremy Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	fast and very simple Ruby web server
 
 DISTNAME =	thin-1.2.7
-REVISION =	0
+REVISION =	1
 CATEGORIES =	www
 
 HOMEPAGE =	http://code.macournoyer.com/thin/
diff --git a/www/ruby-thin_http/Makefile b/www/ruby-thin_http/Makefile
index 551829b25da..08a8b176170 100644
--- a/www/ruby-thin_http/Makefile
+++ b/www/ruby-thin_http/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2011/01/06 04:24:25 jeremy Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	lightweight and user friendly HTTP client library for Ruby
 
 DISTNAME =	thin_http-0.1.1
-REVISION =	3
+REVISION =	4
 CATEGORIES =	www
 
 MAINTAINER =	Clint Pachl <pachl@ecentryx.com>
diff --git a/www/ruby-unicorn/Makefile b/www/ruby-unicorn/Makefile
index 1fd61a3e1e6..4e11c0d37b5 100644
--- a/www/ruby-unicorn/Makefile
+++ b/www/ruby-unicorn/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2011/07/06 01:18:27 jeremy Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	ruby-rack HTTP server for Unix and fast clients
 
 DISTNAME =	unicorn-4.0.1
+REVISION=	0
 CATEGORIES =	www
 
 HOMEPAGE =	http://unicorn.bogomips.org/
diff --git a/www/sabredav/Makefile b/www/sabredav/Makefile
index 5cd35944b4e..ab5bbd9793e 100644
--- a/www/sabredav/Makefile
+++ b/www/sabredav/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2011/07/08 23:01:39 robert Exp $
+# $OpenBSD: Makefile,v 1.4 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	php5 WebDAV server
 DISTNAME =	Sabre_DAV-1.0.0
-REVISION =	0
+REVISION =	1
 PKGNAME =	${DISTNAME:L:S/_//}
 EXTRACT_SUFX =	.tgz
 CATEGORIES =	www
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 0943b5d3f27..b8ee20d181f 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.90 2011/09/06 19:43:21 landry Exp $
+# $OpenBSD: Makefile,v 1.91 2011/09/16 12:00:09 espie Exp $
 
 COMMENT-main =		Mozilla application suite
 COMMENT-lightning =	Mozilla Seamonkey calendar extension
@@ -15,7 +15,8 @@ PKGNAME-main =		${PKGNAME}
 PKGNAME-lightning =	lightning-seamonkey-1.0beta5
 PKGNAME-enigmail =	enigmail-seamonkey-1.3
 EPOCH-lightning =	0
-REVISION-lightning =	0
+REVISION-main =		0
+REVISION-lightning =	1
 
 # must be in sync with SO_VERSION in main/enigmail/seamonkey
 SO_VERSION=	19.0
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index c5c28f69219..c55b2148043 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.28 2010/11/22 10:16:08 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=	text mode rss newsreader
 DISTNAME=	snownews-1.5.12
+REVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}download/
 
diff --git a/www/sogo/Makefile b/www/sogo/Makefile
index 3d9e6ed7b6d..0d400734d91 100644
--- a/www/sogo/Makefile
+++ b/www/sogo/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2011/07/28 11:25:22 sebastia Exp $
+# $OpenBSD: Makefile,v 1.16 2011/09/16 12:00:09 espie Exp $
 
 COMMENT = 	web based groupware server
 
 VERSION =	1.3.8
 DISTNAME =	SOGo-${VERSION}b
 PKGNAME =	sogo-${VERSION}.1
+REVISION=	0
 
 SHLIB_VERSION =	1.1
 .for _lib in GDLContentStore NGCards OGoContentStore \
diff --git a/www/sope/Makefile b/www/sope/Makefile
index 795125b41e1..078e60d106d 100644
--- a/www/sope/Makefile
+++ b/www/sope/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2011/07/28 11:22:30 sebastia Exp $
+# $OpenBSD: Makefile,v 1.18 2011/09/16 12:00:09 espie Exp $
 
 COMMENT-main=		Skyrix Object Publishing Environment
 COMMENT-mysql=		SOPE MySQL adaptor
@@ -9,6 +9,7 @@ DISTNAME =		SOPE-${VERSION}b
 PKGNAME-main =		sope-${VERSION}.1
 PKGNAME-mysql =		sope-mysql-${VERSION}.1
 PKGNAME-postgres =	sope-postgres-${VERSION}.1
+REVISION =		0
 
 SO_MAJOR=	0
 SO_MINOR=	1
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 7d1c8532e46..ffcdab8092a 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.121 2011/09/05 07:18:41 giovanni Exp $
+# $OpenBSD: Makefile,v 1.122 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=	WWW and FTP proxy cache and accelerator
 
 DISTNAME=	squid-2.7.STABLE9
-REVISION=	12
+REVISION=	13
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}/Versions/v2/2.7/
 DIST_SUBDIR=	squid
diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
index a86720e44c9..db606705241 100644
--- a/www/squidguard/Makefile
+++ b/www/squidguard/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/09/12 18:02:35 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =		filter, redirector and access controller for Squid
 
 DISTNAME =		squidGuard-1.4
-REVISION =		1
+REVISION =		2
 CATEGORIES =		www
 
 HOMEPAGE =		http://www.squidguard.org/
diff --git a/www/statusnet/Makefile b/www/statusnet/Makefile
index 590d89da619..b6df9c1c4ad 100644
--- a/www/statusnet/Makefile
+++ b/www/statusnet/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2011/07/22 10:20:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=		open source micro messaging platform
 
 DISTNAME=		statusnet-0.8.3
-REVISION=		7
+REVISION=		8
 
 CATEGORIES=		www net
 
diff --git a/www/syweb/Makefile b/www/syweb/Makefile
index f59ba31c9c3..d6c2c68d26e 100644
--- a/www/syweb/Makefile
+++ b/www/syweb/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2011/07/08 23:01:39 robert Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=		web frontend to symon
 DISTNAME=		syweb-0.63
-REVISION=		0
+REVISION=		1
 CATEGORIES=		www sysutils
 
 MAINTAINER=		Stuart Henderson <sthen@openbsd.org>
diff --git a/www/tikiwiki/Makefile b/www/tikiwiki/Makefile
index 981e2d45385..509ac0840d0 100644
--- a/www/tikiwiki/Makefile
+++ b/www/tikiwiki/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2011/07/22 10:20:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=	all-in-one wiki/groupware/CMS solution
 
@@ -6,7 +6,7 @@ V=		4.2
 DISTNAME=	tikiwiki-${V}
 CATEGORIES=	www
 
-REVISION=	4
+REVISION=	5
 
 HOMEPAGE=	http://tikiwiki.org/
 
diff --git a/www/timetrex/Makefile b/www/timetrex/Makefile
index 6a04aa3e5b0..b5ece3b36ca 100644
--- a/www/timetrex/Makefile
+++ b/www/timetrex/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2011/07/22 10:20:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=	web-based payroll and time management suite
 
 V=		3.5.1
-REVISION=	1
+REVISION=	2
 DISTNAME=	TimeTrex_Standard_Edition_v${V}
 PKGNAME=	timetrex-${V}
 CATEGORIES=	www productivity
diff --git a/www/tomcat/v5/Makefile b/www/tomcat/v5/Makefile
index 45d1e79e096..084854c3ea7 100644
--- a/www/tomcat/v5/Makefile
+++ b/www/tomcat/v5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2011/08/30 17:16:36 jasper Exp $
+# $OpenBSD: Makefile,v 1.20 2011/09/16 12:00:09 espie Exp $
 
 COMMENT-main=	Java servlet 2.4 and Java server pages 2.0 server
 COMMENT-admin=	administration web application
@@ -10,7 +10,7 @@ PKGNAME=	tomcat-${V}
 PKGNAME-main=	tomcat-${V}
 PKGNAME-admin=	tomcat-admin-${V}
 PKGNAME-examples=tomcat-examples-${V}
-REVISION-main=	1
+REVISION-main=	2
 REVISION-examples=0
 CATEGORIES=	www
 
diff --git a/www/tomcat/v6/Makefile b/www/tomcat/v6/Makefile
index fe9a78ff29c..c63458e5a6c 100644
--- a/www/tomcat/v6/Makefile
+++ b/www/tomcat/v6/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2011/09/09 10:10:52 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.15 2011/09/16 12:00:09 espie Exp $
 
 COMMENT-main=	Java servlet 2.5 and Java server pages 2.1 server
 COMMENT-examples=example applications and full documentation
@@ -8,6 +8,7 @@ DISTNAME=	apache-tomcat-${V}
 PKGNAME=	tomcat-${V}
 PKGNAME-main=	tomcat-${V}
 PKGNAME-examples=tomcat-examples-${V}
+REVISION-main =	0
 CATEGORIES=	www
 
 DISTFILES=	${DISTNAME}.tar.gz \
diff --git a/www/trac-ldapplugin/Makefile b/www/trac-ldapplugin/Makefile
index 3de51d42526..37802b5b021 100644
--- a/www/trac-ldapplugin/Makefile
+++ b/www/trac-ldapplugin/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2011/06/08 18:15:30 rpointel Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=		ldap authentication plugin for trac
 
 MODPY_EGG_VERSION=	0.6.0
 DISTNAME=		trac-ldapplugin-${MODPY_EGG_VERSION}
-REVISION=		1
+REVISION=		2
 CATEGORIES=		www devel
 
 MAINTAINER=		Michael Erdely <merdely@openbsd.org>
diff --git a/www/trac/Makefile b/www/trac/Makefile
index 50b57a5094d..50f84592cfa 100644
--- a/www/trac/Makefile
+++ b/www/trac/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.34 2011/06/24 22:41:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=	wiki and bug tracking system for software projects
 
 MODPY_EGG_VERSION=0.12.2
 DISTNAME=	Trac-${MODPY_EGG_VERSION}
 PKGNAME=	trac-${MODPY_EGG_VERSION}
-REVISION=	1
+REVISION=	2
 CATEGORIES=	www devel
 
 MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
diff --git a/www/tracnav/Makefile b/www/tracnav/Makefile
index 04da7988643..3981d64485e 100644
--- a/www/tracnav/Makefile
+++ b/www/tracnav/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2011/06/08 18:15:30 rpointel Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=	customizable navigation bar for trac's wiki
 
 MODPY_EGG_VERSION= 4.1
 DISTNAME=	TracNav-${MODPY_EGG_VERSION}
-REVISION=	1
+REVISION=	2
 EXTRACT_SUFX=	.zip
 PKGNAME=	${DISTNAME:L}
 CATEGORIES=	www devel
diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile
index 731ba703535..d722a7c8a46 100755
--- a/www/tt-rss/Makefile
+++ b/www/tt-rss/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2011/07/22 10:20:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=		webbased rss reader with standalone look and feel
 
 DISTNAME=		tt-rss-1.3.3
-REVISION=		1
+REVISION=		2
 CATEGORIES=		www
 
 HOMEPAGE=		http://tt-rss.org/
diff --git a/www/twill/Makefile b/www/twill/Makefile
index fe149246b3f..9d6cc371224 100644
--- a/www/twill/Makefile
+++ b/www/twill/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/08 18:15:30 rpointel Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=		simple scripting language for web browsing
 
 DISTNAME=		twill-0.9
-REVISION=		3
+REVISION=		4
 CATEGORIES=		www
 
 HOMEPAGE=		http://twill.idyll.org/
diff --git a/www/vteplugin/Makefile b/www/vteplugin/Makefile
index acb05452feb..a06786df84e 100644
--- a/www/vteplugin/Makefile
+++ b/www/vteplugin/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2011/06/08 18:15:30 rpointel Exp $
+# $OpenBSD: Makefile,v 1.14 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	npapi vte-based terminal for web browsers
 
 DISTNAME =	vteplugin-0.1
-REVISION =	6
+REVISION =	7
 CATEGORIES =	www x11
 
 # WTFPL
diff --git a/www/vtigercrm/Makefile b/www/vtigercrm/Makefile
index 068a6a6393a..d8cdf118858 100644
--- a/www/vtigercrm/Makefile
+++ b/www/vtigercrm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2011/07/22 10:20:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=	customer relationship management (CRM) software
 
 DISTNAME=	vtigercrm-5.2.1
-REVISION=	2
+REVISION=	3
 CATEGORIES=	www
 
 HOMEPAGE=	http://www.vtiger.com/
diff --git a/www/w3m/Makefile b/www/w3m/Makefile
index bd394c62872..b13b8b3761e 100644
--- a/www/w3m/Makefile
+++ b/www/w3m/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.78 2011/03/12 23:20:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.79 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=	pager/text-based web browser
 
 DISTNAME=	w3m-0.5.3
+REVISION=	0
 CATEGORIES=	www
 HOMEPAGE=	http://w3m.sourceforge.net/
 
diff --git a/www/wApua/Makefile b/www/wApua/Makefile
index 6dddf1e1f25..8c72bf48f02 100644
--- a/www/wApua/Makefile
+++ b/www/wApua/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2010/11/22 08:36:55 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=		browser for wap/wml
 
 DISTNAME=		wApua-0.06
-REVISION=		0
+REVISION=		1
 CATEGORIES=		www
 
 HOMEPAGE=		http://fsinfo.noone.org/~abe/wApua/
diff --git a/www/webacula/Makefile b/www/webacula/Makefile
index 55c23903f81..26dff9e04f2 100644
--- a/www/webacula/Makefile
+++ b/www/webacula/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2011/07/28 09:24:35 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=	bacula(8) web interface
 
 DISTNAME=	webacula-5.5
+REVISION=	0
 
 CATEGORIES=	www sysutils
 
diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile
index 0ed056dbe20..e8ffd2d3738 100644
--- a/www/webalizer/Makefile
+++ b/www/webalizer/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.34 2011/09/12 18:02:35 naddy Exp $
+# $OpenBSD: Makefile,v 1.35 2011/09/16 12:00:09 espie 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
+REVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.patrickfrei.ch/webalizer/rb${V}/
 
diff --git a/www/webcollab/Makefile b/www/webcollab/Makefile
index 597e8919abe..fd218accdaa 100644
--- a/www/webcollab/Makefile
+++ b/www/webcollab/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2011/07/22 10:20:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2011/09/16 12:00:09 espie Exp $
 
 COMMENT=	collaborative web-based system for project management
 
 V=		1.70
 DISTNAME=	webcollab-${V}
-REVISION=	2
+REVISION=	3
 CATEGORIES=	www
 
 HOMEPAGE=	http://webcollab.sourceforge.net/
diff --git a/www/webkit/Makefile b/www/webkit/Makefile
index 0a7e37a2b74..63f804da0c6 100644
--- a/www/webkit/Makefile
+++ b/www/webkit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2011/07/30 08:09:30 landry Exp $
+# $OpenBSD: Makefile,v 1.55 2011/09/16 12:00:09 espie Exp $
 
 ONLY_FOR_ARCHS=	${GCC4_ARCHS}
 
@@ -6,7 +6,7 @@ COMMENT =	open source web browser engine for Gtk+
 
 V =		1.4.2
 DISTNAME =	webkit-${V}
-REVISION =	1
+REVISION =	2
 EPOCH =		0
 CATEGORIES =	www
 
diff --git a/www/wordpress/Makefile b/www/wordpress/Makefile
index 75464953da1..b70d0a40a3a 100644
--- a/www/wordpress/Makefile
+++ b/www/wordpress/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.34 2011/07/22 10:20:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.35 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	standard compliant weblog
 
 DISTNAME =	wordpress-3.1.2
-REVISION =	1
+REVISION =	2
 CATEGORIES =	www
 
 HOMEPAGE =	http://wordpress.org/
diff --git a/www/xcache/Makefile b/www/xcache/Makefile
index 828fecc840b..9ae2f0048d2 100644
--- a/www/xcache/Makefile
+++ b/www/xcache/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2011/08/21 09:26:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2011/09/16 12:00:09 espie Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	fast and stable PHP opcode cacher
 
 VERSION=	1.3.2
-REVISION=	1
+REVISION=	2
 DISTNAME=	xcache-${VERSION}
 CATEGORIES=	www
 MASTER_SITES=	http://xcache.lighttpd.net/pub/Releases/${VERSION}/
diff --git a/www/xmhtml/Makefile b/www/xmhtml/Makefile
index 52c1b422264..9daa922164e 100644
--- a/www/xmhtml/Makefile
+++ b/www/xmhtml/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2010/11/22 08:36:55 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2011/09/16 12:00:09 espie Exp $
 # $FreeBSD: ports/x11-toolkits/xmhtml/Makefile,v 1.15 2001/06/29 05:19:06 lkoeller Exp $
 # Original from: Peter Hawkins <thepish@freebsd.org>
 
@@ -6,7 +6,7 @@ COMMENT=	Motif widget capable of displaying HTML 3.2 conforming text
 
 DISTNAME=	XmHTML-1.1.7
 PKGNAME=	${DISTNAME:L}
-REVISION=	5
+REVISION=	6
 CATEGORIES=     www x11
 SHARED_LIBS=	XmHTML	1.2
 
diff --git a/www/youtube-dl/Makefile b/www/youtube-dl/Makefile
index 1ef716084ce..73301177a2a 100644
--- a/www/youtube-dl/Makefile
+++ b/www/youtube-dl/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.24 2011/08/18 21:36:46 pirofti Exp $
+# $OpenBSD: Makefile,v 1.25 2011/09/16 12:00:09 espie Exp $
 
 COMMENT =	command-line program to download videos from YouTube.com
 
 V = 		2011.08.04
 DISTNAME =	youtube-dl-${V}
+REVISION=	0
 WRKDIST = 	${WRKDIR}/youtube-dl
 DIST_SUBDIR =	youtube-dl
 CATEGORIES =	www
diff --git a/www/yui/Makefile b/www/yui/Makefile
index b171c8645b1..38c5064ba4e 100644
--- a/www/yui/Makefile
+++ b/www/yui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/11/22 08:36:55 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/16 12:00:10 espie Exp $
 
 COMMENT-main =	yahoo ui library toolkit
 COMMENT-docs =	yahoo ui library examples
@@ -9,6 +9,7 @@ EXTRACT_SUFX =	.zip
 DISTNAME =	yui_${V}
 PKGNAME-main =	yui-${V}
 PKGNAME-docs =	yui-doc-${V}
+REVISION-docs =	0
 MULTI_PACKAGES = -main -docs
 
 HOMEPAGE =	http://developer.yahoo.com/yui/
diff --git a/www/zendframework/Makefile b/www/zendframework/Makefile
index e994b31165b..6522461cdcd 100644
--- a/www/zendframework/Makefile
+++ b/www/zendframework/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2011/07/08 22:43:08 robert Exp $
+# $OpenBSD: Makefile,v 1.11 2011/09/16 12:00:10 espie Exp $
 
 COMMENT=		framework for developing PHP web applications
 
@@ -6,7 +6,7 @@ V=			1.10.8
 DISTNAME=		zendframework-${V}
 DISTFILES=		ZendFramework-${V}.tar.gz
 
-REVISION=		2
+REVISION=		3
 
 CATEGORIES=		www devel
 
diff --git a/www/zope-ldapuserfolder/Makefile b/www/zope-ldapuserfolder/Makefile
index a0d8af0bd26..c1a4233e2ba 100644
--- a/www/zope-ldapuserfolder/Makefile
+++ b/www/zope-ldapuserfolder/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2010/11/22 08:36:55 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:10 espie Exp $
 
 COMMENT=	Zope LDAPUserFolder product
 
 VERSION=	2.8
 DISTNAME=	LDAPUserFolder-${VERSION}
 PKGNAME=	zope-${DISTNAME:L}
-REVISION=	1
+REVISION=	2
 CATEGORIES=	www
 HOMEPAGE=	http://www.dataflake.org/software/ldapuserfolder
 
diff --git a/www/zope/2.10/Makefile b/www/zope/2.10/Makefile
index d97bf324d97..593e4fc339f 100644
--- a/www/zope/2.10/Makefile
+++ b/www/zope/2.10/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2011/06/08 18:15:30 rpointel Exp $
+# $OpenBSD: Makefile,v 1.9 2011/09/16 12:00:10 espie Exp $
 
 VERSION=	2.10
 PATCHLEVEL=	.5
 
 PKGNAME=	${DISTNAME:S/-final//:L}
-REVISION=	5
+REVISION=	6
 
 .include <bsd.port.mk>