diff --git a/devel/llvm/Makefile b/devel/llvm/Makefile
index 5735bcfc3f3..240f137e0ab 100644
--- a/devel/llvm/Makefile
+++ b/devel/llvm/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2009/11/02 22:53:27 jsg Exp $
+# $OpenBSD: Makefile,v 1.19 2009/11/18 00:49:09 sthen Exp $
 
 COMMENT =	Low Level Virtual Machine (LLVM) compiler infrastructure
 
 LLVM_V =	2.6
 DISTNAME =	llvm-${LLVM_V}
+PKGNAME =	${DISTNAME}p0
 
 CATEGORIES =	devel
 
diff --git a/editors/openoffice3/Makefile b/editors/openoffice3/Makefile
index d1976139257..33b115133f3 100644
--- a/editors/openoffice3/Makefile
+++ b/editors/openoffice3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2009/11/09 11:03:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2009/11/18 00:49:09 sthen Exp $
 
 ONLY_FOR_ARCHS= amd64 i386
 
@@ -10,7 +10,7 @@ VERSION=	3.1.1
 DISTNAME=	OOo_${VERSION}
 WRKDIST=	${WRKDIR}/OOO310_m19
 PKGNAME=	openoffice-${VERSION}
-PKGNAME-main=	openoffice-${VERSION}
+PKGNAME-main=	openoffice-${VERSION}p0
 PKGNAME-kde=	openoffice-kde-${VERSION}
 PKGNAME-java=	openoffice-java-${VERSION}p0
 CATEGORIES=	editors productivity
@@ -90,7 +90,7 @@ MODULES+=	lang/python \
 MODGCONF2_LIBDEP=No
 LIB_DEPENDS-main=gdk-x11-2.0.>=400.14,gdk_pixbuf-2.0.>=400.14,gtk-x11-2.0.>=400.14::x11/gtk+2 \
 		${MODPY_LIB_DEPENDS} \
-		estdc++.>=11:libstdc++->=4.2,<4.3:lang/gcc/4.2,-estdc \
+		estdc++.>=11:libstdc++->=4.2,<4.3|libstdc++->=4.2v0,<4.3v0:lang/gcc/4.2,-estdc \
 		db.>=4:db->=4,<5:databases/db/v4 \
 		xslt.>=3::textproc/libxslt \
 		curl.>=7::net/curl \
diff --git a/editors/subtitleeditor/Makefile b/editors/subtitleeditor/Makefile
index fbc3e82fdab..e79b4472ecd 100644
--- a/editors/subtitleeditor/Makefile
+++ b/editors/subtitleeditor/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2009/10/14 21:47:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2009/11/18 00:49:09 sthen Exp $
 
 SHARED_ONLY=   	Yes
 
@@ -6,6 +6,7 @@ COMMENT=	GTK+2 subtitles editor
 
 V=		0.33.0
 DISTNAME=	subtitleeditor-${V}
+PKGNAME=	${DISTNAME}p0
 
 CATEGORIES=	graphics editors
 
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index 7f973300548..1c931b212f4 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2009/08/15 17:22:46 jsg Exp $
+# $OpenBSD: Makefile,v 1.12 2009/11/18 00:49:09 sthen Exp $
 
 COMMENT=	x86 with DOS emulator targeted at playing games
 DISTNAME=	dosbox-0.73
-PKGNAME=	${DISTNAME}
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	games x11 emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dosbox/}
 
@@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
+
 WANTLIB=		SDL c m pthread stdc++ z
 
 LIB_DEPENDS=	SDL_net::devel/sdl-net \
diff --git a/lang/gcc/4.2/Makefile b/lang/gcc/4.2/Makefile
index d0a6cdb5020..cdc289180e1 100644
--- a/lang/gcc/4.2/Makefile
+++ b/lang/gcc/4.2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2009/11/12 10:13:19 espie Exp $
+# $OpenBSD: Makefile,v 1.42 2009/11/18 00:49:09 sthen Exp $
 
 ONLY_FOR_ARCHS = alpha i386 m68k sparc sparc64 powerpc vax amd64
 #BROKEN=adjust for types changes
@@ -73,7 +73,7 @@ LANGS = c
 .if ${FLAVOR:L:Mc++}
 LANGS := ${LANGS},c++
 MULTI_PACKAGES += -c++ -estdc
-REGRESS_DEPENDS += 	:libstdc++->=4.2,<4.3:${BUILD_PKGPATH},-estdc
+REGRESS_DEPENDS += 	:libstdc++->=4.2,<4.3|libstdc++->=4.2v0,<4.3v0:${BUILD_PKGPATH},-estdc
 .endif
 .if ${FLAVOR:L:Mfortran}
 LANGS := ${LANGS},fortran
@@ -189,7 +189,7 @@ RUN_DEPENDS-main =
 RUN_DEPENDS-estdc =
 RUN_DEPENDS-java =
 
-RUN_DEPENDS-c++ =	${RUN_DEPENDS} :libstdc++->=4.2,<4.3:${PKGPATH},-estdc
+RUN_DEPENDS-c++ =	${RUN_DEPENDS} :libstdc++->=4.2,<4.3|libstdc++->=4.2v0,<4.3v0:${PKGPATH},-estdc
 WANTLIB-estdc =		c m
 WANTLIB-java =		c m pthread z
 
diff --git a/lang/gcc/4.2/gcc4.port.mk b/lang/gcc/4.2/gcc4.port.mk
index 69291a645ca..7f9fff2bd70 100644
--- a/lang/gcc/4.2/gcc4.port.mk
+++ b/lang/gcc/4.2/gcc4.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: gcc4.port.mk,v 1.5 2009/10/15 18:02:33 steven Exp $
+# $OpenBSD: gcc4.port.mk,v 1.6 2009/11/18 00:49:09 sthen Exp $
 
 MODGCC4_ARCHES?=
 MODGCC4_LANGS?=
@@ -25,7 +25,7 @@ MODGCC4_post-patch+= ln -s ${LOCALBASE}/bin/eg${_MODGCC4CC} ${WRKDIR}/bin/${_MOD
 .        endif
 .        if !empty(_MODGCC4CXX:L:M${_j})
 BUILD_DEPENDS+=	::lang/gcc/4.2,-c++
-LIB_DEPENDS+=	estdc++.>=7:libstdc++->=4.2,<4.3:lang/gcc/4.2,-estdc
+LIB_DEPENDS+=	estdc++.>=7:libstdc++->=4.2,<4.3|libstdc++->=4.2v0,<4.3v0:lang/gcc/4.2,-estdc
 MODGCC4_post-patch+= ln -s ${LOCALBASE}/bin/e${_MODGCC4CXX} ${WRKDIR}/bin/g++;
 MODGCC4_post-patch+= ln -s ${LOCALBASE}/bin/e${_MODGCC4CXX} ${WRKDIR}/bin/${_MODGCC4CXX};
 .        endif
diff --git a/lang/llvm-gcc4/Makefile b/lang/llvm-gcc4/Makefile
index 77502c586bf..b52744d41ca 100644
--- a/lang/llvm-gcc4/Makefile
+++ b/lang/llvm-gcc4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2009/11/02 23:00:08 jsg Exp $
+# $OpenBSD: Makefile,v 1.5 2009/11/18 00:49:09 sthen Exp $
 
 # XXX WORK IN PROGRESS.
 
@@ -13,7 +13,7 @@ COMMENT =	gcc4 front-end for LLVM
 GCC_V =		4.2.1
 LLVM_V =	2.6
 DISTNAME =	llvm-gcc-4.2-${LLVM_V}.source
-PKGNAME =	${DISTNAME:S/.source//:S/gcc-/gcc/}
+PKGNAME =	${DISTNAME:S/.source//:S/gcc-/gcc/}p0
 
 SHARED_LIBS =	ssp	0.0 \
 		objc	2.0 \
diff --git a/www/webkit/Makefile b/www/webkit/Makefile
index 711c2944caa..00857ca5f1f 100644
--- a/www/webkit/Makefile
+++ b/www/webkit/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2009/11/08 16:19:34 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2009/11/18 00:49:09 sthen Exp $
 
 COMMENT =	open source web browser engine
 
 V = 1.1.15.2
 DISTNAME =	webkit-${V}
 # XXX do not remove v0. pX comes before vX.
-PKGNAME =	webkit-${V}p1v0
+PKGNAME =	webkit-${V}p2v0
 CATEGORIES =	www
 
 HOMEPAGE =	http://webkitgtk.org/