diff --git a/net/libshout/Makefile b/net/libshout/Makefile
index 9783a75dcfa..5881af9b88b 100644
--- a/net/libshout/Makefile
+++ b/net/libshout/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2006/08/03 23:15:57 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2006/11/20 20:00:04 bernd Exp $
 
 COMMENT=	"library for communicating with an icecast server"
 
@@ -20,7 +20,7 @@ WANTLIB=	m ogg
 MASTER_SITES=	http://downloads.xiph.org/releases/libshout/
 
 BUILD_DEPENDS=	::devel/pkgconfig \
-		speex.>=4::audio/speex
+		::audio/speex
 LIB_DEPENDS=	vorbis.>=4::audio/libvorbis \
 		theora.>=1::multimedia/libtheora
 
diff --git a/net/p5-flowd/Makefile b/net/p5-flowd/Makefile
index bd866c3ea33..f622db4f895 100644
--- a/net/p5-flowd/Makefile
+++ b/net/p5-flowd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2006/03/29 11:50:31 msf Exp $
+# $OpenBSD: Makefile,v 1.3 2006/11/20 20:00:05 bernd Exp $
 
 SHARED_ONLY=		Yes
 
@@ -21,7 +21,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		http://www2.mindrot.org/files/flowd/
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/Flowd-perl
-BUILD_DEPENDS=		flowd::net/flowd
+BUILD_DEPENDS=		::net/flowd
 CONFIGURE_STYLE=	perl
 
 post-patch:
diff --git a/net/pear-Net-LDAP/Makefile b/net/pear-Net-LDAP/Makefile
index 518603fa1e9..c90c118c25a 100644
--- a/net/pear-Net-LDAP/Makefile
+++ b/net/pear-Net-LDAP/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2006/10/28 17:21:03 mbalmer Exp $
+# $OpenBSD: Makefile,v 1.2 2006/11/20 20:00:05 bernd Exp $
 
 COMMENT=	"pear ldap"
 
 DISTNAME=	Net_LDAP-0.6.6
-PKGNAME=	pear-${DISTNAME:S/_/-/}
+PKGNAME=	pear-${DISTNAME:S/_/-/}p0
 CATEGORIES=	net pear
 
 MASTER_SITES=	http://pear.php.net/get/
@@ -18,6 +18,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-RUN_DEPENDS=	php5-ldap::www/php5/extensions,-ldap
+RUN_DEPENDS=	::www/php5/extensions,-ldap
 
 .include <bsd.port.mk>
diff --git a/net/py-flowd/Makefile b/net/py-flowd/Makefile
index e0171dd024f..1265700efa5 100644
--- a/net/py-flowd/Makefile
+++ b/net/py-flowd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2006/06/03 09:43:03 alek Exp $
+# $OpenBSD: Makefile,v 1.4 2006/11/20 20:00:05 bernd Exp $
 
 SHARED_ONLY=		Yes
 
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		http://www2.mindrot.org/files/flowd/
 
-BUILD_DEPENDS=		flowd::net/flowd
+BUILD_DEPENDS=		::net/flowd
 MODULES=		lang/python
 MAKE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include/flowd" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 6a3c3ce6292..2a616c2f09e 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.74 2006/11/18 11:42:26 mbalmer Exp $
+# $OpenBSD: Makefile,v 1.75 2006/11/20 20:00:05 bernd Exp $
 
 COMMENT=	"SMB and CIFS client and server for UNIX"
 COMMENT-docs=	"documentation and examples for samba"
@@ -81,7 +81,7 @@ CONFIGURE_ARGS+= --disable-cups
 .if ${FLAVOR:L:Mldap}
 CONFIGURE_ARGS+= --with-ldap --without-ads
 LIB_DEPENDS+=	ldap,lber::databases/openldap
-BUILD_DEPENDS+=	utf8::misc/libutf8
+BUILD_DEPENDS+=	::misc/libutf8
 .else
 CONFIGURE_ARGS+= --without-ldap --without-ads
 .endif