diff --git a/net/amsn/Makefile b/net/amsn/Makefile
index aed883a6630..85db8ddaabf 100644
--- a/net/amsn/Makefile
+++ b/net/amsn/Makefile
@@ -1,4 +1,4 @@
-#$OpenBSD: Makefile,v 1.13 2010/09/14 18:34:14 jasper Exp $
+#$OpenBSD: Makefile,v 1.14 2010/11/11 11:54:08 espie Exp $
 
 COMMENT=	open source MSN Messenger clone
 
@@ -24,11 +24,11 @@ EXTRACT_SUFX=	.tar.bz2
 
 WANTLIB=	ICE SM X11 m stdc++ z glib-2.0 gmodule-2.0 gobject-2.0 \
 		gthread-2.0 gstbase-0.10 gstinterfaces-0.10 \
-		gstreamer-0.10 xml2
+		gstreamer-0.10 xml2 jpeg png gstfarsight-0.10
 
-LIB_DEPENDS=	jpeg::graphics/jpeg \
-		png::graphics/png \
-		gstfarsight-0.10::net/farsight2
+LIB_DEPENDS=	::graphics/jpeg \
+		::graphics/png \
+		::net/farsight2
 RUN_DEPENDS+=	${MODTK_RUN_DEPENDS} \
 		::security/tcltls \
 		::x11/bwidget \
diff --git a/net/amule/Makefile b/net/amule/Makefile
index 3cd47165966..5644810cb7b 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2010/10/24 21:30:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2010/11/11 11:54:08 espie Exp $
 
 COMMENT-main =	another eMule p2p client
 COMMENT-web =	webserver interface to amuled
@@ -28,8 +28,8 @@ EXTRACT_SUFX =	.tar.bz2
 RUN_DEPENDS-main=${RUN_DEPENDS} \
 		:desktop-file-utils-*:devel/desktop-file-utils
 
-LIB_DEPENDS =	wx_base_net,wx_base:wxWidgets-gtk2->=2.6.3:x11/wxWidgets
-WANTLIB =	c m pthread z stdc++
+LIB_DEPENDS =	:wxWidgets-gtk2->=2.6.3:x11/wxWidgets
+WANTLIB =	c m pthread z stdc++ wx_base_net wx_base
 
 USE_GMAKE =	Yes
 USE_GROFF =	Yes
diff --git a/net/angst/Makefile b/net/angst/Makefile
index dcd5181c47b..cd20021859e 100644
--- a/net/angst/Makefile
+++ b/net/angst/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2010/10/18 18:36:45 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2010/11/11 11:54:08 espie Exp $
 
 COMMENT=	active packet sniffer
 
@@ -16,9 +16,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c pcap
 
-LIB_DEPENDS=	lib/libnet-1.0/net.=0:libnet->=1.0,<1.1:net/libnet/1.0
+WANTLIB =	c pcap lib/libnet-1.0/net.=0
+LIB_DEPENDS=	:libnet->=1.0,<1.1:net/libnet/1.0
 
 ALL_TARGET=	angst
 
diff --git a/net/arpd/Makefile b/net/arpd/Makefile
index 981d0dcd71c..432281ee8f8 100644
--- a/net/arpd/Makefile
+++ b/net/arpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/10/18 18:36:45 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/11 11:54:08 espie Exp $
 			
 COMMENT=		ARP reply daemon
 
@@ -13,16 +13,16 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes 
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c pcap event
+WANTLIB=		c pcap event dnet
 
 MASTER_SITES=		http://www.citi.umich.edu/u/provos/honeyd/
 
 AUTOCONF_VERSION=	2.52
 CONFIGURE_STYLE=	autoconf
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 WRKDIST=		${WRKDIR}/arpd
 
-LIB_DEPENDS=		dnet::net/libdnet
+LIB_DEPENDS=		::net/libdnet
 
 .include <bsd.port.mk>
diff --git a/net/arping/Makefile b/net/arping/Makefile
index 9e0370d1f4f..3b01c039d47 100644
--- a/net/arping/Makefile
+++ b/net/arping/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2010/10/18 21:50:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2010/11/11 11:54:08 espie Exp $
 
 COMMENT =	ARP level ping utility
 
@@ -15,12 +15,12 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =		c pcap
+WANTLIB =	c pcap lib/libnet-1.1/net.=11
 
 MASTER_SITES =	http://www.habets.pp.se/synscan/files/ \
 		http://www.arcane-labs.net/download/OpenBSD/
 
-LIB_DEPENDS =	lib/libnet-1.1/net.=11:libnet->=1.1,<1.2:net/libnet/1.1
+LIB_DEPENDS =	:libnet->=1.1,<1.2:net/libnet/1.1
 
 CONFIGURE_STYLE = gnu
 CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include/libnet-1.1 \
diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile
index d03f133cb9c..28765d3c241 100644
--- a/net/bitlbee/Makefile
+++ b/net/bitlbee/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2010/10/18 18:36:45 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2010/11/11 11:54:08 espie Exp $
 
 COMMENT=	IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c pthread
+WANTLIB=		c pthread glib-2.0 gmodule-2.0 gnutls.>=13
 
 MASTER_SITES=		http://get.bitlbee.org/src/
 
@@ -27,8 +27,8 @@ EXAMPLEDIR=		${PREFIX}/share/examples/bitlbee
 DOCS=			${WRKSRC}/doc/user-guide/user-guide.html
 DOCDIR=			${PREFIX}/share/doc/bitlbee/
 
-LIB_DEPENDS=		glib-2.0,gmodule-2.0::devel/glib2 \
-			gnutls.>=13::security/gnutls
+LIB_DEPENDS=		::devel/glib2 \
+			::security/gnutls
 
 CONFIGURE_STYLE=	simple
 CONFIGURE_ARGS+=	--bindir=${PREFIX}/libexec \
diff --git a/net/bluetooth-tools/Makefile b/net/bluetooth-tools/Makefile
index 8a75cbe34a4..7a0351780fd 100644
--- a/net/bluetooth-tools/Makefile
+++ b/net/bluetooth-tools/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/10/19 21:04:52 naddy Exp $
+# $OpenBSD: Makefile,v 1.17 2010/11/11 11:54:08 espie Exp $
 
 COMMENT=		bluetooth network tools
 DISTNAME=		bluetooth-tools-20081122
@@ -14,8 +14,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		http://www.bsdx.de/openbsd/distfiles/
 
-WANTLIB=		c event usbhid util
-LIB_DEPENDS=		bluetooth.>=2.0,sdp.>=2.1::devel/bluetooth-libs
+WANTLIB=		c event usbhid util bluetooth.>=2.0 sdp.>=2.1
+LIB_DEPENDS=		::devel/bluetooth-libs
 
 MAKE_ENV=		BINDIR=${TRUEPREFIX}/bin \
 			SBINDIR=${TRUEPREFIX}/sbin \
diff --git a/net/bro/Makefile b/net/bro/Makefile
index d1990471549..046843a8288 100644
--- a/net/bro/Makefile
+++ b/net/bro/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2010/10/12 20:12:52 robert Exp $
+# $OpenBSD: Makefile,v 1.3 2010/11/11 11:54:08 espie Exp $
 
 COMMENT=	highly flexible sniffer/NIDS
 
@@ -22,12 +22,12 @@ PERMIT_PACKAGE_FTP=   	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP= 	Yes
 
-WANTLIB=	c crypto m pcap ssl stdc++ termcap z
+WANTLIB=	c crypto m pcap ssl stdc++ termcap z GeoIP.>=5 magic.>=1
 
 MASTER_SITES=	ftp://bro-ids.org/
 
-LIB_DEPENDS=	GeoIP.>=5::net/GeoIP \
-		magic.>=1::devel/libmagic
+LIB_DEPENDS=	::net/GeoIP \
+		::devel/libmagic
 
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE=autoconf
diff --git a/net/cadaver/Makefile b/net/cadaver/Makefile
index 3465d010957..c10a901346f 100644
--- a/net/cadaver/Makefile
+++ b/net/cadaver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/10/18 18:36:46 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2010/11/11 11:54:08 espie Exp $
 
 COMMENT=		command-line WebDAV client
 
@@ -14,11 +14,11 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB += asn1 c crypto curses expat gssapi krb5 readline ssl
-WANTLIB += z
+WANTLIB += z neon
 
 MODULES=		devel/gettext
 
-LIB_DEPENDS=		neon::net/neon
+LIB_DEPENDS=		::net/neon
 
 MASTER_SITES=		${HOMEPAGE}
 
@@ -28,6 +28,6 @@ CONFIGURE_ARGS=		--with-ssl \
 			--with-expat \
 			--with-neon="${LOCALBASE}"
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -L${LOCALBASE}/lib"
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 .include <bsd.port.mk>
diff --git a/net/castget/Makefile b/net/castget/Makefile
index e04e192873f..a1cb3e81814 100644
--- a/net/castget/Makefile
+++ b/net/castget/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2010/10/18 18:36:46 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/11 11:54:08 espie Exp $
 
 COMMENT=		command-line podcast downloader
 
@@ -18,21 +18,21 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c crypto idn m ssl stdc++ z pcre
+WANTLIB=		c crypto idn m ssl stdc++ z pcre id3 glib-2.0 curl xml2
 
 MODULES=		devel/gettext
 
-LIB_DEPENDS=            id3::audio/id3lib \
-			glib-2.0::devel/glib2 \
-			curl::net/curl \
-			xml2::textproc/libxml
+LIB_DEPENDS=            ::audio/id3lib \
+			::devel/glib2 \
+			::net/curl \
+			::textproc/libxml
 
 CONFIGURE_STYLE=        gnu
 CONFIGURE_ENV=          CPPFLAGS="-lm -I${LOCALBASE}/include" \
                         LDFLAGS="-L${LOCALBASE}/lib"
 
 USE_LIBTOOL=    	Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/castget
diff --git a/net/crawl/Makefile b/net/crawl/Makefile
index be7757e0b5b..cd2e158d276 100644
--- a/net/crawl/Makefile
+++ b/net/crawl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2010/10/18 18:36:46 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2010/11/11 11:54:08 espie Exp $
 
 COMMENT=		small and efficient HTTP crawler
 
@@ -14,16 +14,16 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c event
+WANTLIB=		c event lib/db/db.=3
 
 MASTER_SITES=		http://www.monkey.org/~provos/
 
-LIB_DEPENDS=		lib/db/db.=3:db->=3,<4:databases/db/v3
+LIB_DEPENDS=		:db->=3,<4:databases/db/v3
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--with-db="${LOCALBASE}"
 CONFIGURE_ENV=		CFLAGS="${CFLAGS} -I/usr/local/include/db"
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 NO_REGRESS=		Yes
 
diff --git a/net/dc_gui/Makefile b/net/dc_gui/Makefile
index 115be06c844..b31a0e6bc39 100644
--- a/net/dc_gui/Makefile
+++ b/net/dc_gui/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/10/24 21:30:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2010/11/11 11:54:09 espie Exp $
 
 COMMENT=		GUI for dctc (Direct Connect Text Clone)
 
@@ -21,12 +21,14 @@ WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
 		Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \
 		Xrender art_lgpl_2 atk-1.0 bonobo-2 bonobo-activation \
 		bonoboui-2 c cairo crypto dbus-1 dbus-glib-1 expat \
-		fontconfig freetype gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 \
+		fontconfig freetype gailutil gconf-2 gdk-x11-2.0 \
+		gdk_pixbuf-2.0 \
 		gio-2.0 glib-2.0 gmodule-2.0 gnome-2 gnome-keyring \
 		gnomecanvas-2 gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0 \
 		idn m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
 		pixman-1 png popt pthread pthread-stubs ssl util xcb xml2 z \
-		avahi-client avahi-common avahi-glib
+		avahi-client avahi-common avahi-glib \
+		db curl gnomeui-2
 
 MODULES=		devel/gettext
 
@@ -34,9 +36,9 @@ BUILD_DEPENDS=		:dctc->=0.85.9:net/dctc
 RUN_DEPENDS=		::devel/desktop-file-utils \
 			:dctc->=0.85.9:net/dctc \
 			::x11/gnome/yelp
-LIB_DEPENDS=		db:db->=4,<5:databases/db/v4 \
-			curl::net/curl \
-			gnomeui-2::x11/gnome/libgnomeui
+LIB_DEPENDS=		:db->=4,<5:databases/db/v4 \
+			::net/curl \
+			::x11/gnome/libgnomeui
 
 USE_LIBTOOL=		Yes
 VMEM_WARNING=		Yes
diff --git a/net/dclib/Makefile b/net/dclib/Makefile
index db55ce7e37e..c0ca6b3b325 100644
--- a/net/dclib/Makefile
+++ b/net/dclib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/10/09 09:41:41 benoit Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/11 11:54:09 espie Exp $
 
 COMMENT=	Library for direct-connect protocol
 
@@ -20,9 +20,9 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${MASTER_SITE_BERLIOS:=dcgui/}
 
 MODULES=	converters/libiconv
-LIB_DEPENDS=	bz2::archivers/bzip2 \
-		xml2::textproc/libxml
-WANTLIB=	crypto m ssl z
+LIB_DEPENDS=	::archivers/bzip2 \
+		::textproc/libxml
+WANTLIB=	crypto m ssl z bz2 xml2
 
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE=gnu
diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index efa287ad6ab..f84e29c9a86 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/10/18 18:36:46 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/11 11:54:09 espie Exp $
 
 COMMENT=		Direct Connect clone
 
@@ -17,15 +17,16 @@ MASTER_SITES=		${HOMEPAGE}
 
 MODULES=		devel/gettext
 
-WANTLIB=		c gpg-error m pcre pthread z
+WANTLIB=		c gpg-error m pcre pthread z db glib-2.0 gthread-2.0 \
+			gcrypt xml2
 
-LIB_DEPENDS=		db:db->=4,<5:databases/db/v4 \
-			glib-2.0,gthread-2.0::devel/glib2 \
-			gcrypt::security/libgcrypt \
-			xml2::textproc/libxml
+LIB_DEPENDS=		:db->=4,<5:databases/db/v4 \
+			::devel/glib2 \
+			::security/libgcrypt \
+			::textproc/libxml
 
 USE_LIBTOOL=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 SEPARATE_BUILD=		concurrent
 AUTOCONF_VERSION=	2.57
 CONFIGURE_STYLE= 	autoconf
diff --git a/net/dxpc/Makefile b/net/dxpc/Makefile
index 2dbd3dc398f..5d50595dc12 100644
--- a/net/dxpc/Makefile
+++ b/net/dxpc/Makefile
@@ -1,33 +1,32 @@
-# $OpenBSD: Makefile,v 1.27 2010/10/24 21:30:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2010/11/11 11:54:09 espie Exp $
 
-COMMENT=	X11 over a low bandwidth link
-VERSION=	3.8.2
-DISTNAME=	dxpc-${VERSION}
-REVISION=	0
-CATEGORIES=	net x11
+COMMENT =	X11 over a low bandwidth link
+VERSION =	3.8.2
+DISTNAME =	dxpc-${VERSION}
+REVISION =	0
+CATEGORIES =	net x11
 
-MAINTAINER=	Marc Espie <espie@openbsd.org>
+MAINTAINER =	Marc Espie <espie@openbsd.org>
 
 #		BSD
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c m stdc++
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
 
-FAKE=lib
-MASTER_SITES=	http://www.vigor.nu/dxpc/${VERSION}/
-HOMEPAGE=	http://www.vigor.nu/dxpc/
+MASTER_SITES =		http://www.vigor.nu/dxpc/${VERSION}/
+HOMEPAGE =		http://www.vigor.nu/dxpc/
 
-LIB_DEPENDS=	lzo::archivers/lzo
+LIB_DEPENDS =		::archivers/lzo
+WANTLIB =		c m stdc++ lzo
 
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
-CONFIGURE_STYLE=	gnu dest
-CONFIGURE_ARGS+=--with-lzo-lib=${DEPBASE}
+CONFIGURE_STYLE =	gnu dest
+CONFIGURE_ARGS +=	--with-lzo-lib=${DEPBASE}
 
-MAKE_FLAGS+=LDFLAGS=-L${DEPBASE}/lib
+MAKE_FLAGS +=		LDFLAGS=-L${DEPBASE}/lib
 
-NO_REGRESS=	Yes
+NO_REGRESS =		Yes
 
 .include <bsd.port.mk>
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index b56cc0bd14f..1d598d7da52 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2010/10/24 21:30:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.49 2010/11/11 11:54:09 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -20,10 +20,11 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
 WANTLIB += c crypto form menu ncurses panel pcap pthread ssl z
+WANTLIB += lib/libnet-1.1/net.=11 ltdl pcre
 
-LIB_DEPENDS=	lib/libnet-1.1/net.=11:libnet->=1.1,<1.2:net/libnet/1.1 \
-		ltdl::devel/libtool,-ltdl \
-		pcre::devel/pcre
+LIB_DEPENDS=	:libnet->=1.1,<1.2:net/libnet/1.1 \
+		::devel/libtool,-ltdl \
+		::devel/pcre
 
 FLAVORS=	no_x11
 FLAVOR?=
@@ -41,13 +42,14 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+= --enable-gtk=no
 .else
-MODULES=	devel/gettext
-LIB_DEPENDS+=	gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
+MODULES =	devel/gettext
+LIB_DEPENDS +=	::x11/gtk+2
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig
 WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pixman-1 png pthread-stubs xcb gdk_pixbuf-2.0
+WANTLIB += gdk-x11-2.0 gtk-x11-2.0
 .endif
 
 NO_REGRESS=	Yes
diff --git a/net/ezstream/Makefile b/net/ezstream/Makefile
index b2bafe2c48e..0072b8da0a1 100644
--- a/net/ezstream/Makefile
+++ b/net/ezstream/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/10/18 18:36:47 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/11 11:54:09 espie Exp $
 
 COMMENT=	streaming source client that uses external en-/decoders
 
@@ -16,14 +16,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	c iconv m ogg pthread theora vorbis vorbisfile z
+WANTLIB=	c iconv m ogg pthread theora vorbis vorbisfile z \
+		shout.>=3 speex.>=4 xml2.>=9 tag_c.>=1
 
 MASTER_SITES=	http://downloads.xiph.org/releases/ezstream/
 
-LIB_DEPENDS=	shout.>=3::net/libshout \
-		speex.>=4::audio/speex \
-		xml2.>=9::textproc/libxml \
-		tag_c.>=1::audio/taglib
+LIB_DEPENDS=	::net/libshout \
+		::audio/speex \
+		::textproc/libxml \
+		::audio/taglib
 
 SEPARATE_BUILD=	simple
 
diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile
index f9d40be11cf..c38da4fa58d 100644
--- a/net/filezilla/Makefile
+++ b/net/filezilla/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/10/18 18:36:47 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/11 11:54:09 espie Exp $
 
 COMMENT=	fast FTP and SFTP GUI client with a lot of features
 
@@ -26,12 +26,14 @@ WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
 WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
 WANTLIB += png pthread-stubs xcb xcb-render xcb-render-util
+WANTLIB += idn gnutls.>=13 dbus-1 wx_gtk2_aui wx_base_xml wx_gtk2_adv
+WANTLIB += wx_gtk2_xrc wx_base_net wx_base wx_gtk2_core
 
 MODULES=	devel/gettext
-LIB_DEPENDS=	idn::devel/libidn \
-		gnutls.>=13::security/gnutls \
-		dbus-1::x11/dbus \
-		wx_gtk2_aui,wx_base_xml,wx_gtk2_adv,wx_gtk2_xrc,wx_base_net,wx_base,wx_gtk2_core:wxWidgets-gtk2->=2.8.6:x11/wxWidgets
+LIB_DEPENDS=	::devel/libidn \
+		::security/gnutls \
+		::x11/dbus \
+		:wxWidgets-gtk2->=2.8.6:x11/wxWidgets
 
 BUILD_DEPENDS=	::devel/cppunit \
 		::devel/xdg-utils
diff --git a/net/firewalk/Makefile b/net/firewalk/Makefile
index 98f55aa3713..af9c03f1c61 100644
--- a/net/firewalk/Makefile
+++ b/net/firewalk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2010/10/18 18:36:47 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2010/11/11 11:54:09 espie Exp $
 
 COMMENT=	gateway acl scanner (via static-source port traceroute)
 
@@ -11,7 +11,8 @@ MASTER_SITES=	http://spacehopper.org/mirrors/
 
 #HOMEPAGE=	http://www.packetfactory.net/projects/firewalk/
 
-LIB_DEPENDS=	lib/libnet-1.0/net.=0:libnet->=1.0,<1.1:net/libnet/1.0
+LIB_DEPENDS=	:libnet->=1.0,<1.1:net/libnet/1.0
+WANTLIB=	c pcap lib/libnet-1.0/net.=0
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -19,7 +20,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c pcap
 
 CONFIGURE_STYLE= gnu dest
 
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 39dcfcf2e1e..e6c35163382 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2010/10/25 13:22:20 pea Exp $
+# $OpenBSD: Makefile,v 1.27 2010/11/11 11:54:09 espie Exp $
 
 SHARED_ONLY=	Yes
 SHARED_LIBS +=  freeradius-radius    4.0      # .0.0
@@ -36,7 +36,6 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=	crypto ssl
-WANTLIB-main=	${WANTLIB} c com_err krb5 pcap pthread readline termcap
 
 CONFIGURE_STYLE=autoconf dest
 AUTOCONF_VERSION=2.61
@@ -74,8 +73,10 @@ USE_LIBTOOL=	gnu
 USE_GROFF =	Yes
 
 BUILD_DEPENDS=	::net/net-snmp
-LIB_DEPENDS=	gdbm.>=3::databases/gdbm \
-		ltdl.>=4::devel/libtool,-ltdl
+LIB_DEPENDS-main =	::databases/gdbm \
+			::devel/libtool,-ltdl
+WANTLIB-main=		${WANTLIB} c com_err krb5 pcap pthread readline \
+			termcap gdbm.>=3 ltdl.>=4
 
 PSEUDO_FLAVORS=	no_ldap no_mysql no_pgsql no_iodbc
 FLAVOR?=		
@@ -86,8 +87,8 @@ CONFIGURE_ARGS+=	--without-rlm_sql_iodbc
 MULTI_PACKAGES+=	-iodbc
 BUILD_DEPENDS+=		::databases/iodbc
 CONFIGURE_ARGS+=	--with-rlm_sql_iodbc
-LIB_DEPENDS-iodbc=	iodbc.>=2::databases/iodbc
-WANTLIB-iodbc=
+LIB_DEPENDS-iodbc=	::databases/iodbc
+WANTLIB-iodbc=		iodbc.>=2
 .endif
 
 .if ${FLAVOR:L:Mno_ldap}
@@ -95,9 +96,10 @@ CONFIGURE_ARGS+=	--without-rlm_ldap
 .else
 MULTI_PACKAGES+=	-ldap
 BUILD_DEPENDS+=		:openldap-client-*:databases/openldap
-LIB_DEPENDS-ldap=	lber.>=8,ldap_r.>=8:openldap-client-*:databases/openldap \
-			freeradius-radius.>=1::net/freeradius
-WANTLIB-ldap=		${WANTLIB} sasl2 asn1 com_err gssapi krb5
+LIB_DEPENDS-ldap=	:openldap-client-*:databases/openldap \
+			::${BASE_PKGPATH}
+WANTLIB-ldap=		${WANTLIB} sasl2 asn1 com_err gssapi krb5 \
+			lber.>=8 ldap_r.>=8 freeradius-radius.>=1
 .endif
 
 .if ${FLAVOR:L:Mno_mysql}
@@ -105,8 +107,8 @@ CONFIGURE_ARGS+=	--without-rlm_sql_mysql
 .else
 MULTI_PACKAGES+=	-mysql
 BUILD_DEPENDS+=		:mysql-client-*:databases/mysql
-LIB_DEPENDS-mysql=	mysqlclient_r.>=16:mysql-client-*:databases/mysql
-WANTLIB-mysql=		${WANTLIB} m pthread z
+LIB_DEPENDS-mysql=	:mysql-client-*:databases/mysql
+WANTLIB-mysql=		${WANTLIB} m pthread z mysqlclient_r.>=16
 .endif
 
 .if ${FLAVOR:L:Mno_pgsql}
@@ -115,8 +117,8 @@ CONFIGURE_ARGS+=	--without-rlm_sql_postgresql
 MULTI_PACKAGES+=	-pgsql
 BUILD_DEPENDS+=		:postgresql-client-*:databases/postgresql
 CONFIGURE_ARGS+=	--with-rlm-sql-postgresql-include-dir=${LOCALBASE}/include/postgresql
-LIB_DEPENDS-pgsql=	pq.>=2:postgresql-client-*:databases/postgresql
-WANTLIB-pgsql=
+LIB_DEPENDS-pgsql=	:postgresql-client-*:databases/postgresql
+WANTLIB-pgsql=		pq.>=2
 .endif
 
 .for i in ${MULTI_PACKAGES:N-main}