diff --git a/databases/db/v4/Makefile b/databases/db/v4/Makefile
index cedf2c8c3d7..d6004a8b8c2 100644
--- a/databases/db/v4/Makefile
+++ b/databases/db/v4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2006/11/25 22:54:28 steven Exp $
+# $OpenBSD: Makefile,v 1.29 2007/01/16 02:48:02 kurt Exp $
 
 COMMENT-java=	"Java bindings for Berkeley DB, revision ${REVISION}"
 
@@ -6,7 +6,7 @@ REVISION=	4
 VERSION=	${REVISION}.2.52
 PKGNAME=	${DISTNAME}p11
 PKGNAME-main=	${DISTNAME}p11
-PKGNAME-java=	db-java-${VERSION}p2
+PKGNAME-java=	db-java-${VERSION}p3
 DBLIBDIR=	lib/db4
 SHARED_LIBS +=	db                   4.2      # .0.0
 SHARED_LIBS +=	db_cxx               5.0      # .0.0
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index b833eb747c2..baa4058c749 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2007/01/12 14:34:30 kurt Exp $
+# $OpenBSD: Makefile,v 1.13 2007/01/16 02:48:02 kurt Exp $
 
 COMMENT=        "java replacement for make"
 
 DISTNAME=	apache-ant-1.7.0
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	devel
 
 HOMEPAGE=	http://ant.apache.org/
diff --git a/devel/ivy/Makefile b/devel/ivy/Makefile
index 1afe67c680d..38e80b40e3b 100644
--- a/devel/ivy/Makefile
+++ b/devel/ivy/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2006/11/02 21:11:07 kili Exp $
+# $OpenBSD: Makefile,v 1.4 2007/01/16 02:48:02 kurt Exp $
 
 COMMENT=		"dependency manager for Java"
 
 VERSION=		1.4
-PKGNAME=		ivy-${VERSION}p0
 DISTNAME=		ivy-${VERSION}-bin
+PKGNAME=		ivy-${VERSION}p1
 CATEGORIES=		devel java
 WRKDIST=		${WRKDIR}/ivy-${VERSION}
 
diff --git a/devel/jakarta-servletapi/Makefile b/devel/jakarta-servletapi/Makefile
index 31873a78704..78f8d81d2dd 100644
--- a/devel/jakarta-servletapi/Makefile
+++ b/devel/jakarta-servletapi/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2006/11/01 20:47:41 kurt Exp $
+# $OpenBSD: Makefile,v 1.12 2007/01/16 02:48:02 kurt Exp $
 
 COMMENT=	"implementation of the JSP and Java Servlet APIs"
 
 V=		3.2.4
 DISTNAME=	jakarta-servletapi-${V}
-PKGNAME=	${DISTNAME}p2
+PKGNAME=	${DISTNAME}p3
 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 75414b3a84c..1ca5a9be3fa 100644
--- a/devel/maven/Makefile
+++ b/devel/maven/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2006/11/01 20:47:41 kurt Exp $
+# $OpenBSD: Makefile,v 1.4 2007/01/16 02:48:02 kurt Exp $
 
 COMMENT=	"software project management and comprehension tool"
 
 DISTNAME=	maven-2.0
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	devel
 
 HOMEPAGE=	http://maven.apache.org/
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index 78e92d8f710..56914458cd8 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2007/01/04 13:50:34 robert Exp $
+# $OpenBSD: Makefile,v 1.45 2007/01/16 02:48:02 kurt Exp $
 
 ONLY_FOR_ARCHS= amd64 i386
 
@@ -12,7 +12,7 @@ WRKDIST=	${WRKDIR}/OOE680_m6
 PKGNAME=	openoffice-${VERSION}p2
 PKGNAME-main=	openoffice-${VERSION}p2
 PKGNAME-kde=	openoffice-kde-${VERSION}
-PKGNAME-java=	openoffice-java-${VERSION}
+PKGNAME-java=	openoffice-java-${VERSION}p0
 CATEGORIES=	editors productivity
 
 SHARED_LIBS=	icudata		26.0 \
diff --git a/java/junit/Makefile b/java/junit/Makefile
index 193aebcab82..926e502508b 100644
--- a/java/junit/Makefile
+++ b/java/junit/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2006/11/01 20:47:41 kurt Exp $
+# $OpenBSD: Makefile,v 1.12 2007/01/16 02:48:02 kurt Exp $
 
 COMMENT=	"regression testing utility for use with the Java language"
 
 VERSION=	3.8.1
 DISTNAME=	junit${VERSION}
 INSTALLDIR=	junit-${VERSION}
-PKGNAME=	${INSTALLDIR}p2
+PKGNAME=	${INSTALLDIR}p3
 CATEGORIES=	java
 
 HOMEPAGE=	http://www.junit.org/
diff --git a/print/ppower4/Makefile b/print/ppower4/Makefile
index 9114eab9de3..ffeb072ed77 100644
--- a/print/ppower4/Makefile
+++ b/print/ppower4/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2006/11/01 20:47:41 kurt Exp $
+# $OpenBSD: Makefile,v 1.8 2007/01/16 02:48:02 kurt Exp $
 
 COMMENT=	"PDF presentation post processor"
 
 DISTNAME=	ppower4-0.9.4
-PKGNAME=	${DISTNAME}p4
+PKGNAME=	${DISTNAME}p5
 CATEGORIES=	print
 
 HOMEPAGE=	http://www-sp.iti.informatik.tu-darmstadt.de/software/ppower4/
diff --git a/textproc/xerces/Makefile b/textproc/xerces/Makefile
index eeaab345551..ed0d061705f 100644
--- a/textproc/xerces/Makefile
+++ b/textproc/xerces/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2006/11/01 20:47:41 kurt Exp $
+# $OpenBSD: Makefile,v 1.24 2007/01/16 02:48:02 kurt Exp $
 
 COMMENT=	"xml parser for Java"
 
 DISTNAME=	Xerces-J-bin.2.4.0
-PKGNAME=	xerces-2.4.0p2
+PKGNAME=	xerces-2.4.0p3
 CATEGORIES=	textproc
 
 HOMEPAGE=	http://xml.apache.org/xerces2-j/index.html
diff --git a/www/tomcat/v4/Makefile b/www/tomcat/v4/Makefile
index 1951cdb4082..f05cbc93739 100644
--- a/www/tomcat/v4/Makefile
+++ b/www/tomcat/v4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2006/11/25 07:42:58 steven Exp $
+# $OpenBSD: Makefile,v 1.4 2007/01/16 02:48:02 kurt 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.34
 DISTNAME=	apache-tomcat-${V}
-PKGNAME-main=	tomcat-${V}p1
+PKGNAME-main=	tomcat-${V}p2
 PKGNAME-admin=	tomcat-admin-${V}p1
 PKGNAME-examples=tomcat-examples-${V}p1
 CATEGORIES=	www