diff --git a/databases/architect/Makefile b/databases/architect/Makefile
index f2e40824424..ba6199d594b 100644
--- a/databases/architect/Makefile
+++ b/databases/architect/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2009/03/11 23:21:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2009/04/26 09:38:25 sthen Exp $
 
 PKG_ARCH=		*
 
@@ -6,7 +6,7 @@ COMMENT=		database exploration/builder written in Java
 
 V=			1.0.0
 DISTNAME=		Architect-generic-${V}
-PKGNAME=		architect-${V}p1
+PKGNAME=		architect-${V}p2
 CATEGORIES=		databases
 WRKDIST=		${WRKDIR}	# no subdirectory
 
diff --git a/databases/db/v4/Makefile b/databases/db/v4/Makefile
index 4e7d7c90c9c..a577680ac3a 100644
--- a/databases/db/v4/Makefile
+++ b/databases/db/v4/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.36 2009/04/14 19:49:04 sthen Exp $
+# $OpenBSD: Makefile,v 1.37 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT-java=	Java bindings for Berkeley DB, revision ${REVISION}
 
 REVISION=	4
 VERSION=	${REVISION}.6.21
 PKGNAME-main=	${DISTNAME}p0
-PKGNAME-java=	db-java-${VERSION}p3
+PKGNAME-java=	db-java-${VERSION}p4
 PKGNAME-tcl=	db-tcl-${VERSION}p6
 DBLIBDIR=	lib/db4
 SHARED_LIBS +=	db                   5.0      # .0.0
diff --git a/databases/jxplorer/Makefile b/databases/jxplorer/Makefile
index f56d9d85cba..de07c3916f4 100644
--- a/databases/jxplorer/Makefile
+++ b/databases/jxplorer/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.6 2009/03/11 23:21:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT=	standards compliant LDAP browser
 
 V=		3.2
 DISTNAME=	JXv${V}deploy
-PKGNAME=	jxplorer-${V}p3
+PKGNAME=	jxplorer-${V}p4
 EXTRACT_SUFX=	.zip
 CATEGORIES=	databases net
 
diff --git a/databases/postgresql-jdbc/Makefile b/databases/postgresql-jdbc/Makefile
index c14b3cbd545..d7554faeb7f 100644
--- a/databases/postgresql-jdbc/Makefile
+++ b/databases/postgresql-jdbc/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2009/03/11 23:21:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT-main=		JDBC Driver for PostgreSQL
 COMMENT-docs=		API docs for PostgreSQL JDBC Driver
 
 V=			8.2-505
 DISTNAME=		postgresql-jdbc-$V
-PKGNAME-main=		postgresql-jdbc-${V:S/-/./}p1
+PKGNAME-main=		postgresql-jdbc-${V:S/-/./}p2
 PKGNAME-docs=		postgresql-jdbc-docs-${V:S/-/./}
 PKG_ARCH-docs=		*
 CATEGORIES=		databases java
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index 5bd0ccaac1c..01f6e3b3f4c 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2009/03/25 22:14:23 kurt Exp $
+# $OpenBSD: Makefile,v 1.21 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT=        java replacement for make
 
 DISTNAME=	apache-ant-1.7.1
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	devel
 
 HOMEPAGE=	http://ant.apache.org/
diff --git a/devel/hudson/Makefile b/devel/hudson/Makefile
index 8f8307e4de8..d24e4d370cc 100644
--- a/devel/hudson/Makefile
+++ b/devel/hudson/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2009/03/12 07:57:25 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT =		continuous integration server
 
 VERSION =		1.227
 DISTNAME =		hudson # nonsensical versioning, alas.
-PKGNAME =		hudson-${VERSION}p0
+PKGNAME =		hudson-${VERSION}p1
 DIST_SUBDIR =		hudson-${VERSION}
 
 CATEGORIES =		devel
diff --git a/devel/ivy/Makefile b/devel/ivy/Makefile
index e9efcb459fc..9acf6df983a 100644
--- a/devel/ivy/Makefile
+++ b/devel/ivy/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2009/03/24 21:53:57 kili Exp $
+# $OpenBSD: Makefile,v 1.11 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT=		dependency manager for Java
 
 VERSION=		1.4.1
 DISTNAME=		ivy-${VERSION}-bin
-PKGNAME=		ivy-${VERSION}p3
+PKGNAME=		ivy-${VERSION}p4
 CATEGORIES=		devel java
 WRKDIST=		${WRKDIR}/ivy-${VERSION}
 
diff --git a/devel/jakarta-servletapi/Makefile b/devel/jakarta-servletapi/Makefile
index affebedc1aa..da8bbfc9ba1 100644
--- a/devel/jakarta-servletapi/Makefile
+++ b/devel/jakarta-servletapi/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.17 2009/03/11 23:22:00 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT=	implementation of the JSP and Java Servlet APIs
 
 V=		3.2.4
 DISTNAME=	jakarta-servletapi-${V}
-PKGNAME=	${DISTNAME}p7
+PKGNAME=	${DISTNAME}p8
 CATEGORIES=	www devel
 MASTER_SITES=	http://archive.apache.org/dist/jakarta/tomcat-3/archive/v${V}/bin/
 EXTRACT_SUFX=	.zip
diff --git a/devel/maven/Makefile b/devel/maven/Makefile
index 50e97da3863..f454faba522 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2009/03/11 23:22:00 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT=	software project management and comprehension tool
 
 DISTNAME=	maven-2.0
-PKGNAME=	${DISTNAME}p5
+PKGNAME=	${DISTNAME}p6
 CATEGORIES=	devel
 
 HOMEPAGE=	http://maven.apache.org/
diff --git a/devel/netbeans/Makefile b/devel/netbeans/Makefile
index 67d7d575137..dbe5ac43651 100644
--- a/devel/netbeans/Makefile
+++ b/devel/netbeans/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2009/03/11 23:22:00 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT=		NetBeans Java IDE
 
 DISTNAME=		netbeans-5_5-ide_sources
-PKGNAME=		netbeans-5.5p4
+PKGNAME=		netbeans-5.5p5
 CATEGORIES=		devel
 
 HOMEPAGE=		http://www.netbeans.org/
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index a7fb58e4ea1..964ec43bc32 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.83 2009/03/15 13:23:36 espie Exp $
+# $OpenBSD: Makefile,v 1.84 2009/04/26 09:38:25 sthen Exp $
 
 ONLY_FOR_ARCHS= amd64 i386
 
@@ -10,9 +10,9 @@ VERSION=	2.4.2
 DISTNAME=	OOo_${VERSION}
 WRKDIST=	${WRKDIR}/OOH680_m18
 PKGNAME=	openoffice-${VERSION}
-PKGNAME-main=	openoffice-${VERSION}p1
+PKGNAME-main=	openoffice-${VERSION}p2
 PKGNAME-kde=	openoffice-kde-${VERSION}
-PKGNAME-java=	openoffice-java-${VERSION}p1
+PKGNAME-java=	openoffice-java-${VERSION}p2
 CATEGORIES=	editors productivity
 
 SHARED_LIBS=	stlport_gcc	4.5
diff --git a/editors/openoffice3/Makefile b/editors/openoffice3/Makefile
index ad05a61df02..07365173e84 100644
--- a/editors/openoffice3/Makefile
+++ b/editors/openoffice3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2009/04/24 09:33:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2009/04/26 09:38:25 sthen Exp $
 
 ONLY_FOR_ARCHS= amd64 i386
 
@@ -12,7 +12,7 @@ WRKDIST=	${WRKDIR}/OOO300_m15
 PKGNAME=	openoffice-${VERSION}
 PKGNAME-main=	openoffice-${VERSION}p4
 PKGNAME-kde=	openoffice-kde-${VERSION}p1
-PKGNAME-java=	openoffice-java-${VERSION}p3
+PKGNAME-java=	openoffice-java-${VERSION}p4
 CATEGORIES=	editors productivity
 
 MAINTAINER=	Robert Nagy <robert@openbsd.org>
diff --git a/geo/jeoip/Makefile b/geo/jeoip/Makefile
index b23924fea93..eaef47c562a 100644
--- a/geo/jeoip/Makefile
+++ b/geo/jeoip/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2009/03/11 23:22:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2009/04/26 09:38:25 sthen Exp $
+
 COMMENT=		Java interface to GeoIP database
 DISTNAME=		jeoip-0.5
-PKGNAME=		${DISTNAME}p3
+PKGNAME=		${DISTNAME}p4
 CATEGORIES=		geo net
 PKG_ARCH=		*
 
diff --git a/java/junit/Makefile b/java/junit/Makefile
index 676854ab89f..7ad6a229877 100644
--- a/java/junit/Makefile
+++ b/java/junit/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2009/03/11 23:22:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT=	regression testing utility for use with the Java language
 
 VERSION=	3.8.2
 DISTNAME=	junit${VERSION}
-PKGNAME=	junit-${VERSION}p3
+PKGNAME=	junit-${VERSION}p4
 INSTALLDIR=	${PKGNAME}
 SUBST_VARS+=	INSTALLDIR
 CATEGORIES=	java devel
diff --git a/lang/jruby/Makefile b/lang/jruby/Makefile
index 44ac466e3aa..e92274fad8f 100644
--- a/lang/jruby/Makefile
+++ b/lang/jruby/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2009/03/11 23:22:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT =	pure-Java implementation of the Ruby language
 
 V =		1.1.3
 RUBY_REV =	1.8
 DISTNAME =	jruby-src-${V}
-PKGNAME =	jruby-${V}p1
+PKGNAME =	jruby-${V}p2
 CATEGORIES =	lang lang/ruby
 
 HOMEPAGE =	http://www.jruby.org/
diff --git a/productivity/thinkingrock/Makefile b/productivity/thinkingrock/Makefile
index 1c830a9791f..a2e437bfaf6 100644
--- a/productivity/thinkingrock/Makefile
+++ b/productivity/thinkingrock/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2009/03/11 23:22:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT=	collecting and processing thoughts according to GTD
 
 V=		2.0.1
 DISTNAME=	tr-$V
-PKGNAME=	thinkingrock-${V}p4
+PKGNAME=	thinkingrock-${V}p5
 CATEGORIES=	productivity java
 
 HOMEPAGE=	http://www.thinkingrock.com.au/
diff --git a/textproc/xerces/Makefile b/textproc/xerces/Makefile
index 01995b00c2c..c1a970a7840 100644
--- a/textproc/xerces/Makefile
+++ b/textproc/xerces/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.30 2009/03/11 23:22:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT=	xml parser for Java
 
 V=		2.9.1
 DISTNAME=	Xerces-J-bin.${V}
-PKGNAME=	xerces-${V}p3
+PKGNAME=	xerces-${V}p4
 CATEGORIES=	textproc
 
 HOMEPAGE=	http://xml.apache.org/xerces2-j/index.html
diff --git a/www/tomcat/v4/Makefile b/www/tomcat/v4/Makefile
index 49a28b4ad36..ae345638d76 100644
--- a/www/tomcat/v4/Makefile
+++ b/www/tomcat/v4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2009/03/11 23:22:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT-main=	Java servlet 2.3 and Java server pages 1.2 server
 COMMENT-admin=	administration web application
@@ -6,7 +6,7 @@ COMMENT-examples=example applications and documentation
 
 V=		4.1.39
 DISTNAME=	apache-tomcat-${V}-LE-jdk14
-PKGNAME-main=	tomcat-${V}p0
+PKGNAME-main=	tomcat-${V}p1
 PKGNAME-admin=	tomcat-admin-${V}
 PKGNAME-examples=tomcat-examples-${V}
 CATEGORIES=	www
diff --git a/www/tomcat/v5/Makefile b/www/tomcat/v5/Makefile
index e3194e01aab..f2b25d20176 100644
--- a/www/tomcat/v5/Makefile
+++ b/www/tomcat/v5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2009/03/11 23:22:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT-main=	Java servlet 2.4 and Java server pages 2.0 server
 COMMENT-admin=	administration web application
@@ -7,7 +7,7 @@ COMMENT-examples=example applications and documentation
 V=		5.5.27
 DISTNAME=	apache-tomcat-${V}
 PKGNAME=	tomcat-${V}
-PKGNAME-main=	tomcat-${V}p0
+PKGNAME-main=	tomcat-${V}p1
 PKGNAME-admin=	tomcat-admin-${V}
 PKGNAME-examples=tomcat-examples-${V}
 CATEGORIES=	www
diff --git a/www/tomcat/v6/Makefile b/www/tomcat/v6/Makefile
index 075e4c532c7..49856c2f0d0 100644
--- a/www/tomcat/v6/Makefile
+++ b/www/tomcat/v6/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2009/03/11 23:22:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.3 2009/04/26 09:38:25 sthen Exp $
 
 COMMENT-main=	Java servlet 2.5 and Java server pages 2.1 server
 COMMENT-examples=example applications and full documentation
@@ -6,7 +6,7 @@ COMMENT-examples=example applications and full documentation
 V=		6.0.18
 DISTNAME=	apache-tomcat-${V}
 PKGNAME=	tomcat-${V}
-PKGNAME-main=	tomcat-${V}p0
+PKGNAME-main=	tomcat-${V}p1
 PKGNAME-examples=tomcat-examples-${V}
 CATEGORIES=	www