diff --git a/net/ktorrent/Makefile b/net/ktorrent/Makefile
index a657797a615..a783e1306c7 100644
--- a/net/ktorrent/Makefile
+++ b/net/ktorrent/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/10/24 21:30:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2010/11/11 16:27:54 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -24,13 +24,15 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=	art_lgpl_2 jpeg GL ICE SM X11 Xau Xcursor Xdmcp Xext \
 		Xfixes Xft Xi Xinerama Xmu Xrandr Xrender Xt c dbus-1 \
 		expat fontconfig freetype lcms m mng pcre pcreposix \
-		png pthread pthread-stubs stdc++ util xcb z idn fam rpcsvc
-
+		png pthread pthread-stubs stdc++ util xcb z idn fam rpcsvc \
+		kdecore.>=6 DCOP kdefx kdeprint kdesu kparts kdeui khtml \
+		kio kjs kutils kwalletclient gmp.>=4 avahi-client \
+		avahi-common avahi-qt3
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS=	kdecore.>=6,DCOP,kdefx,kdeprint,kdesu,kparts,kdeui,khtml,kio,kjs,kutils,kwalletclient::x11/kde/libs3 \
-		gmp.>=4.::devel/gmp \
-		avahi-client,avahi-common::net/avahi \
-		avahi-qt3::net/avahi,-qt3,no_gtk,no_mono,no_qt4
+LIB_DEPENDS=	::x11/kde/libs3 \
+		::devel/gmp \
+		::net/avahi \
+		::net/avahi,-qt3,no_gtk,no_mono,no_qt4
 
 SUBST_VARS+=	VERSION
 
diff --git a/net/libgalago/Makefile b/net/libgalago/Makefile
index d31a7d15203..3645db97287 100644
--- a/net/libgalago/Makefile
+++ b/net/libgalago/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/07/12 22:07:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=		desktop presence framework
 
@@ -17,11 +17,11 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		http://www.galago-project.org/files/releases/source/libgalago/
 
-WANTLIB=		dbus-1 glib-2.0 gobject-2.0 pcre
+WANTLIB=		dbus-1 glib-2.0 gobject-2.0 pcre dbus-glib-1
 
 MODULES=		devel/gettext
 
-LIB_DEPENDS=		dbus-glib-1::x11/dbus-glib
+LIB_DEPENDS=		::x11/dbus-glib
 BUILD_DEPENDS=		:check->=0.9.5:devel/check
 REGRESS_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/net/libnetdude/libnetdude/Makefile b/net/libnetdude/libnetdude/Makefile
index 67f79759061..7f92385eacf 100644
--- a/net/libnetdude/libnetdude/Makefile
+++ b/net/libnetdude/libnetdude/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/07/13 21:08:00 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=	packet manipulation backend of Netdude framework
 
@@ -12,8 +12,8 @@ HOMEPAGE=	http://netdude.sourceforge.net/
 
 MAINTAINER=	Rui Reis <rui@openbsd.org>
 
-LIB_DEPENDS=	pcapnav::net/libpcapnav \
-		glib::devel/glib
+LIB_DEPENDS=	::net/libpcapnav \
+		::devel/glib
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -21,7 +21,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c pcap
+WANTLIB=		c pcap pcapnav glib
 
 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE= 	gnu
diff --git a/net/libnice/Makefile b/net/libnice/Makefile
index 652f2835398..714c9174a82 100644
--- a/net/libnice/Makefile
+++ b/net/libnice/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/09/22 14:28:59 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/11 16:27:54 espie Exp $
 
 SHARED_ONLY =	Yes
 
@@ -21,11 +21,11 @@ PERMIT_DISTFILES_FTP =	Yes
 MASTER_SITES =		${HOMEPAGE}/releases/
 
 WANTLIB += c glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 m pcre
-WANTLIB += xml2 z
+WANTLIB += xml2 z gstbase-0.10 gstreamer-0.10
 
 MODULES =		devel/gettext
 
-LIB_DEPENDS =		gstbase-0.10,gstreamer-0.10::multimedia/gstreamer-0.10/core
+LIB_DEPENDS =		::multimedia/gstreamer-0.10/core
 
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS = 	${CONFIGURE_SHARED} \
diff --git a/net/libproxy/Makefile b/net/libproxy/Makefile
index e2b34e12728..c6f646dfe28 100644
--- a/net/libproxy/Makefile
+++ b/net/libproxy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/08/30 21:14:35 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/11 16:27:54 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -32,15 +32,16 @@ USE_GMAKE=		Yes
 
 MULTI_PACKAGES=		-main -gnome
 
-LIB_DEPENDS-gnome=	proxy::${BUILD_PKGPATH},-main \
-			gconf-2::devel/gconf2
+LIB_DEPENDS-gnome=	::${BUILD_PKGPATH},-main \
+			::devel/gconf2
 
 WANTLIB-main=		ICE SM X11 Xau Xdmcp Xext Xmu Xt c m pthread \
 			pthread-stubs xcb
 
-WANTLIB-gnome =		ICE ORBit-2 SM X11 Xau Xdmcp Xext Xmu Xt dbus-1 dbus-glib-1 \
-			glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 iconv \
-			intl m pcre pthread-stubs xcb
+WANTLIB-gnome =		ICE ORBit-2 SM X11 Xau Xdmcp Xext Xmu Xt dbus-1 \
+			dbus-glib-1 glib-2.0 gmodule-2.0 gobject-2.0 \
+			gthread-2.0 iconv intl m pcre pthread-stubs xcb \
+			proxy gconf-2
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
diff --git a/net/librest/Makefile b/net/librest/Makefile
index e4c942c901b..f26cafe2199 100644
--- a/net/librest/Makefile
+++ b/net/librest/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2010/07/12 22:07:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/11 16:27:54 espie Exp $
 
 COMMENT =	access web services that claim to be RESTful
 
@@ -26,9 +26,9 @@ USE_LIBTOOL =	Yes
 CONFIGURE_ARGS =	--without-gnome
 
 MODULES =	devel/gettext
-LIB_DEPENDS =	soup-2.4::devel/libsoup
+LIB_DEPENDS =	::devel/libsoup
 
 WANTLIB += gcrypt gio-2.0 glib-2.0 gmodule-2.0 gnutls gobject-2.0
-WANTLIB += gpg-error gthread-2.0 m pcre tasn1 xml2 z
+WANTLIB += gpg-error gthread-2.0 m pcre tasn1 xml2 z soup-2.4
 
 .include <bsd.port.mk>
diff --git a/net/librsync/Makefile b/net/librsync/Makefile
index 759a3d4347d..669e541e6ae 100644
--- a/net/librsync/Makefile
+++ b/net/librsync/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/10/18 18:36:49 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=	Library for delta compression of streams
 DISTNAME=	librsync-0.9.7
@@ -14,13 +14,13 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-LIB_DEPENDS=		bz2::archivers/bzip2 \
-			popt::devel/popt
+LIB_DEPENDS=		::archivers/bzip2 \
+			::devel/popt
 
-WANTLIB=		c z
+WANTLIB=		c z bz2 popt
 
 USE_LIBTOOL=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} --disable-trace
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/libshout/Makefile b/net/libshout/Makefile
index eb6d59123de..9220987c50e 100644
--- a/net/libshout/Makefile
+++ b/net/libshout/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/07/12 22:07:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=	library for communicating with an icecast server
 
@@ -17,13 +17,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	m ogg
+WANTLIB=	m ogg vorbis.>=4 theora.>=1
 
 MASTER_SITES=	http://downloads.xiph.org/releases/libshout/
 
 BUILD_DEPENDS=	::audio/speex
-LIB_DEPENDS=	vorbis.>=4::audio/libvorbis \
-		theora.>=1::multimedia/libtheora
+LIB_DEPENDS=	::audio/libvorbis \
+		::multimedia/libtheora
 
 FAKE_FLAGS=	docdir='${PREFIX}/share/examples/libshout'
 
diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile
index d842c24a946..f92210639cd 100644
--- a/net/libtorrent/Makefile
+++ b/net/libtorrent/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2010/03/24 15:45:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=		BitTorrent library written in C++
 
@@ -17,8 +17,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${HOMEPAGE}downloads/
 
-WANTLIB=		crypto
-LIB_DEPENDS=		sigc-2.0:libsigc++->=2,<3:devel/libsigc++-2
+WANTLIB=		crypto sigc-2.0
+LIB_DEPENDS=		:libsigc++->=2,<3:devel/libsigc++-2
 
 USE_LIBTOOL=		Yes
 
diff --git a/net/loudmouth/Makefile b/net/loudmouth/Makefile
index 09237e699ff..a4899da38e4 100644
--- a/net/loudmouth/Makefile
+++ b/net/loudmouth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/07/12 22:07:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=		lightweight Jabber client library
 
@@ -15,15 +15,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		crypto pcre ssl
+WANTLIB=		crypto pcre ssl glib-2.0 idn.>=16
 
 MODULES=		devel/gettext
 
 MASTER_SITES=   	${MASTER_SITE_GNOME:=sources/loudmouth/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}
 EXTRACT_SUFX=   	.tar.bz2
 
-LIB_DEPENDS=		glib-2.0::devel/glib2 \
-			idn.>=16::devel/libidn
+LIB_DEPENDS=		::devel/glib2 \
+			::devel/libidn
 BUILD_DEPENDS=		${REGRESS_DEPENDS}
 REGRESS_DEPENDS=	::devel/check
 
diff --git a/net/mbrowse/Makefile b/net/mbrowse/Makefile
index 8956a6592c7..084a3eebbcf 100644
--- a/net/mbrowse/Makefile
+++ b/net/mbrowse/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/10/24 21:30:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=	graphical MIB browser
 
@@ -19,6 +19,7 @@ WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
 WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
 WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0
+WANTLIB += gdk-x11-2.0 gtk-x11-2.0 netsnmp.>=6.2
 
 MODULES=	devel/gettext
 
@@ -28,7 +29,7 @@ CONFIGURE_ARGS+= --with-snmp-type=net \
 		--with-snmp-include=${LOCALBASE}/include \
 		--with-snmp-lib=${LOCALBASE}/lib
 
-LIB_DEPENDS=	gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
-		netsnmp.>=6.2::net/net-snmp
+LIB_DEPENDS=	::x11/gtk+2 \
+		::net/net-snmp
 
 .include <bsd.port.mk>
diff --git a/net/mcabber/Makefile b/net/mcabber/Makefile
index 4681c49ef86..ec1fb8f25ba 100644
--- a/net/mcabber/Makefile
+++ b/net/mcabber/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/10/23 14:20:13 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/11 16:27:54 espie Exp $
 
 SHARED_ONLY=		Yes
 
@@ -21,13 +21,15 @@ EXTRACT_SUFX=		.tar.bz2
 
 MODULES=		devel/gettext
 
-WANTLIB=		c crypto gcrypt gpg-error ncurses panel pcre pthread ssl
+WANTLIB=		c crypto gcrypt gpg-error ncurses panel pcre pthread \
+			ssl glib-2.0 gmodule-2.0 gpgme loudmouth-1.>=3 \
+			idn otr
 
-LIB_DEPENDS=		glib-2.0,gmodule-2.0::devel/glib2 \
-			gpgme::security/gpgme \
-			loudmouth-1.>=3::net/loudmouth \
-			idn::devel/libidn \
-			otr::security/libotr
+LIB_DEPENDS=		::devel/glib2 \
+			::security/gpgme \
+			::net/loudmouth \
+			::devel/libidn \
+			::security/libotr
 RUN_DEPENDS=		::devel/desktop-file-utils
 
 USE_LIBTOOL=		Yes
diff --git a/net/meanwhile/Makefile b/net/meanwhile/Makefile
index 090809a8f8a..7f280c8c03b 100644
--- a/net/meanwhile/Makefile
+++ b/net/meanwhile/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/07/12 22:07:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=	implementation of Lotus Sametime Community Client protocol
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 
-WANTLIB=	m pcre
+WANTLIB=	m pcre glib-2.0.>=800
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=meanwhile/}
 
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=	--enable-mailme=no \
 		--enable-doxygen=no
 
 MODULES=	devel/gettext
-LIB_DEPENDS=	glib-2.0.>=800.0::devel/glib2
+LIB_DEPENDS=	::devel/glib2
 
 USE_LIBTOOL=	Yes
 
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 3e61b7e5ea2..374a8017eba 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2010/10/24 21:30:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.69 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=	multi-router traffic grapher
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	c jpeg m png z
+WANTLIB=	c jpeg m png z gd.>=18
 
 MASTER_SITES=	${HOMEPAGE}pub/ \
 		${HOMEPAGE}pub/old
@@ -24,7 +24,7 @@ RUN_DEPENDS=	::net/p5-IO-Socket-INET6 \
 		::net/p5-Net-SNMP \
 		::net/p5-SNMP_Session \
 		:p5-RRD-*:net/rrdtool,-perl
-LIB_DEPENDS=	gd.>=18::graphics/gd
+LIB_DEPENDS=	::graphics/gd
 
 USE_GROFF =	Yes
 
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index d6db9043a0c..38e9d036026 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2010/10/24 21:30:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.45 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=	Matt's traceroute - network diagnostic tool
 
@@ -30,14 +30,14 @@ FLAVOR?=
 CONFIGURE_ARGS+=	--without-gtk
 .else
 CONFIGURE_ARGS+=	--with-gtk-prefix=${LOCALBASE}
-LIB_DEPENDS+=		gtk-x11-2.0::x11/gtk+2
+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 iconv intl pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-render-util
-WANTLIB += z
+WANTLIB += z gtk-x11-2.0
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/nagios/nsca/Makefile b/net/nagios/nsca/Makefile
index 0793df5ffc6..f75dc61a035 100644
--- a/net/nagios/nsca/Makefile
+++ b/net/nagios/nsca/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/05 20:28:44 sturm Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/11 16:27:54 espie Exp $
 
 COMMENT-main=	nagios service check acceptor
 COMMENT-client=	nagios service check acceptor - client
@@ -19,8 +19,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=nagios/}
 
-WANTLIB=		c
-LIB_DEPENDS=		mcrypt.>=8::security/libmcrypt
+WANTLIB=		c mcrypt.>=8
+LIB_DEPENDS=		::security/libmcrypt
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--with-nsca-user=_nagios \
diff --git a/net/nemesis/Makefile b/net/nemesis/Makefile
index 72dbc1350ed..61d0a7f5340 100644
--- a/net/nemesis/Makefile
+++ b/net/nemesis/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2010/10/18 21:17:11 espie Exp $
+# $OpenBSD: Makefile,v 1.30 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=	command line arbitrary packet builder
 
@@ -9,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nemesis/}
 
 HOMEPAGE=	http://nemesis.sourceforge.net/
 
-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
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c m
+WANTLIB=		c m lib/libnet-1.0/net.=0
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+= --with-libnet_includes=${LOCALBASE}/include/libnet-1.0 \
diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index 7d6e6e7c0ae..8109f26ee9d 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2010/10/18 18:36:50 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2010/11/11 16:27:54 espie Exp $
 SHARED_ONLY=	Yes
 
 COMMENT=	determine the malware activity on a network
@@ -23,12 +23,13 @@ USE_LIBTOOL=	Yes
 LIBTOOL_FLAGS+=	--tag=disable-static
 USE_GROFF =	Yes
 
-LIB_DEPENDS=	adns.>=1::net/adns \
-		curl.>=3.3::net/curl \
-		magic.>=1::devel/libmagic \
-		pcre.>=1::devel/pcre
+LIB_DEPENDS=	::net/adns \
+		::net/curl \
+		::devel/libmagic \
+		::devel/pcre
 
-WANTLIB=	c crypto iconv intl idn m ssl stdc++ pcap z
+WANTLIB=	c crypto iconv intl idn m ssl stdc++ pcap z \
+		adns.>=1 curl.>=3 magic.>=1 pcre.>=1
 
 FAKE_FLAGS+=	localstatedir='/var/nepenthes' \
 		sysconfdir='${PREFIX}/share/examples'
@@ -47,15 +48,16 @@ FLAVORS=        prelude
 FLAVOR?=
 
 .if ${FLAVOR:L:Mprelude}
-LIB_DEPENDS+=   prelude.>=8::security/prelude/libprelude
+LIB_DEPENDS+=   ::security/prelude/libprelude
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include  \
                 -I${LOCALBASE}/include/libprelude/" \
 		LDFLAGS="-L${LOCALBASE}/lib -pthread"
-WANTLIB+=	gcrypt gnutls gpg-error iconv intl pthread tasn1
+WANTLIB+=	gcrypt gnutls gpg-error iconv intl pthread tasn1 prelude.>=8
 CONFIGURE_ARGS+=--enable-prelude
 MESSAGE=        ${PKGDIR}/MESSAGE-prelude
 .else
-LIB_DEPENDS+=	pq.>=4::databases/postgresql
+LIB_DEPENDS+=	::databases/postgresql
+WANTLIB +=	pq.>=4
 .endif
 
 pre-configure:
diff --git a/net/nepim/Makefile b/net/nepim/Makefile
index d650c32c44d..c71abb48f24 100644
--- a/net/nepim/Makefile
+++ b/net/nepim/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/07/12 22:07:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=		network pipe meter
 
@@ -14,11 +14,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB= c
+WANTLIB= c oop.>=4
 
 MASTER_SITES=		${MASTER_SITE_SAVANNAH:=nepim/}
 
-LIB_DEPENDS=		oop.>=4::devel/liboop
+LIB_DEPENDS=		::devel/liboop
 
 USE_GMAKE=		Yes
 
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 6c087e33cd5..d289ff371d7 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2010/10/18 18:36:50 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=	AFP file and print services for AppleTalk/IP networks
 
@@ -15,7 +15,6 @@ PERMIT_PACKAGE_FTP=		Yes
 PERMIT_DISTFILES_CDROM=		Yes
 PERMIT_DISTFILES_FTP=		Yes
 
-WANTLIB=			c crypto rpcsvc
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 
@@ -23,7 +22,8 @@ CONFIGURE_STYLE=	gnu
 USE_LIBTOOL=		Yes
 USE_GROFF =	Yes
 
-LIB_DEPENDS=	db.>=4:db->=4,<5:databases/db/v4
+WANTLIB=	c crypto rpcsvc db.>=4
+LIB_DEPENDS=	:db->=4,<5:databases/db/v4
 
 CONFIGURE_ARGS+=	--with-db4=${LOCALBASE}
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} 
diff --git a/net/netdude/netdude/Makefile b/net/netdude/netdude/Makefile
index 89c60c2b80d..3b896dffddd 100644
--- a/net/netdude/netdude/Makefile
+++ b/net/netdude/netdude/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/10/24 21:30:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=	network traffic visualization and editing tool
 
@@ -19,12 +19,13 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MODULES=	devel/gettext
 
-LIB_DEPENDS=	netdude::net/libnetdude/libnetdude \
-		pcapnav::net/libpcapnav \
-		glib.>=1,gmodule.>=1::devel/glib \
-		gdk,gtk::x11/gtk+
+LIB_DEPENDS=	::net/libnetdude/libnetdude \
+		::net/libpcapnav \
+		::devel/glib \
+		::x11/gtk+
 
-WANTLIB=		X11 Xau Xdmcp Xext Xi c m pcap pthread-stubs xcb
+WANTLIB=	X11 Xau Xdmcp Xext Xi c m pcap pthread-stubs xcb netdude \
+		pcapnav glib.>=1 gmodule.>=1 gdk gtk
 
 USE_LIBTOOL=		Yes
 USE_GROFF =	Yes
diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile
index 8789a38f82b..3b0ace7fe39 100644
--- a/net/nfdump/Makefile
+++ b/net/nfdump/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/10/18 21:50:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/11 16:27:54 espie Exp $
 
 COMMENT-main =		tools to collect and process netflow data
 COMMENT-nfprofile =	filters data from nfdump according to profiles
@@ -39,12 +39,14 @@ CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
 			--enable-ftconv \
 			--with-ftpath=${LOCALBASE} \
 			--enable-sflow
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 MULTI_PACKAGES =	-main -nfprofile
 
-LIB_DEPENDS-main =	ft:flow-tools->=0.68.5:net/flow-tools
-LIB_DEPENDS-nfprofile =	rrd:rrdtool-*:net/rrdtool
+LIB_DEPENDS-main =	:flow-tools->=0.68.5:net/flow-tools
+WANTLIB-main =		${WANTLIB} ft
+LIB_DEPENDS-nfprofile =	:rrdtool-*:net/rrdtool
+WANTLIB-nfprofile =	${WANTLIB} rrd
 RUN_DEPENDS-nfprofile =	:nfdump-$V:net/nfdump,-main
 
 post-build:
diff --git a/net/ngrep/Makefile b/net/ngrep/Makefile
index 942ffded9a9..ddec659c962 100644
--- a/net/ngrep/Makefile
+++ b/net/ngrep/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2010/10/18 18:36:50 espie Exp $
+# $OpenBSD: Makefile,v 1.31 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=	network grep
 
@@ -16,8 +16,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	c pcap
-LIB_DEPENDS=	pcre::devel/pcre
+WANTLIB=	c pcap pcre
+LIB_DEPENDS=	::devel/pcre
 
 NO_REGRESS=	Yes
 
diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 9d8582a22d2..8d95eab91f8 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.92 2010/10/18 18:36:50 espie Exp $
+# $OpenBSD: Makefile,v 1.93 2010/11/11 16:27:54 espie Exp $
 
 COMMENT-main=	scan ports and fingerprint stack of network hosts
 COMMENT-zenmap=	graphical frontend for nmap
@@ -26,8 +26,6 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MULTI_PACKAGES=	-main -zenmap
 
-WANTLIB-main=	c crypto m pcap ssl stdc++ 
-
 USE_GMAKE=	yes
 USE_GROFF =	Yes
 MODULES=	lang/python
@@ -45,13 +43,13 @@ CONFIGURE_ARGS=	--with-libpcap=/usr \
 		--with-mandir=${LOCALBASE}/man \
 		--disable-nls
 
-LIB_DEPENDS=	pcre::devel/pcre \
-		dnet::net/libdnet \
-		lua.>=5::lang/lua
-
-LIB_DEPENDS-zenmap=
+WANTLIB-main=		c crypto m pcap ssl stdc++ pcre dnet lua.>=5
+LIB_DEPENDS-main=	::devel/pcre \
+			::net/libdnet \
+			::lang/lua
 
 RUN_DEPENDS-main=
+
 RUN_DEPENDS-zenmap=	::x11/py-gtk2 \
 			::databases/py-sqlite2 \
 			::devel/desktop-file-utils \
diff --git a/net/ns/Makefile b/net/ns/Makefile
index c74e4e0adc4..ce10150d477 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2010/10/24 21:30:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2010/11/11 16:27:54 espie Exp $
 # $FreeBSD: ports/net/ns/Makefile,v 1.3 1999/11/28 18:31:26 steve Exp $
 
 COMMENT=	UCB/LBNL Network Simulator Version 2
@@ -17,13 +17,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	X11 c m pcap pthread-stubs stdc++ tcl84 tk84 xcb
+WANTLIB=	X11 c m pcap pthread-stubs stdc++ tcl84 tk84 xcb otcl
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nsnam/}
 WRKDIST=	${WRKDIR}/ns-$V
 
 BUILD_DEPENDS=	:tclcl->=1.0b13p0:devel/tclcl
-LIB_DEPENDS=	otcl::lang/otcl
+LIB_DEPENDS=	::lang/otcl
 
 USE_GROFF =	Yes
 CONFIGURE_STYLE=gnu
diff --git a/net/oggfwd/Makefile b/net/oggfwd/Makefile
index 758564cb4bf..8e79616d1c1 100644
--- a/net/oggfwd/Makefile
+++ b/net/oggfwd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:50 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=	pipe an Ogg stream to an Icecast server
 
@@ -16,12 +16,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	c m ogg pthread theora vorbis
+WANTLIB=	c m ogg pthread theora vorbis shout.>=5 speex.>=4
 
 MASTER_SITES=	http://v2v.cc/~j/oggfwd/
 
-LIB_DEPENDS=	shout.>=5::net/libshout \
-		speex.>=4::audio/speex
+LIB_DEPENDS=	::net/libshout \
+		::audio/speex
 
 USE_GROFF =	Yes
 NO_REGRESS=	Yes
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index 2e897a3d544..324a9267ec2 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2010/10/18 18:36:51 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2010/11/11 16:27:54 espie Exp $
 
 COMMENT-main=		OLSR routing daemon
 COMMENT-gui=		OLSR routing daemon GUI
@@ -31,14 +31,15 @@ MULTI_PACKAGES= -main -gui -plugins
 BUILD_DEPENDS=	::devel/bison
 WANTLIB-main=	c
 
-LIB_DEPENDS-gui= gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2
+LIB_DEPENDS-gui= ::x11/gtk+2
 
 WANTLIB-gui=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
 		freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
 		gthread-2.0 iconv intl m pango-1.0 pangocairo-1.0 \
 		pangoft2-1.0 pixman-1 png pthread pthread-stubs xcb \
-		xcb-render xcb-render-util z gdk_pixbuf-2.0
+		xcb-render xcb-render-util z gdk_pixbuf-2.0 gtk-x11-2.0 \
+		gdk-x11-2.0
 
 RUN_DEPENDS-plugins=:olsrd-${VERSION}:net/olsrd
 
diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index a4b8b17190c..f89bbedea54 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2010/11/10 13:50:04 fkr Exp $
+# $OpenBSD: Makefile,v 1.35 2010/11/11 16:27:54 espie Exp $
 
 COMMENT=	easy-to-use, robust, and highly configurable VPN
 
@@ -16,11 +16,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c crypto ssl pthread
+WANTLIB=		c crypto ssl pthread lzo2
 
 MASTER_SITES=	http://swupdate.openvpn.net/community/releases/
 
-LIB_DEPENDS=	lzo2::archivers/lzo2
+LIB_DEPENDS=	::archivers/lzo2
 
 SEPARATE_BUILD=	concurrent
 
diff --git a/net/p5-Geo-IP/Makefile b/net/p5-Geo-IP/Makefile
index 066d0a33973..46ba040a535 100644
--- a/net/p5-Geo-IP/Makefile
+++ b/net/p5-Geo-IP/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2010/10/18 18:36:51 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2010/11/11 16:27:54 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -16,7 +16,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-LIB_DEPENDS=	GeoIP.>=4::net/GeoIP
+LIB_DEPENDS=	::net/GeoIP
+WANTLIB =	GeoIP.>=4
 
 CONFIGURE_ARGS= LIBS='-L${LOCALBASE}/lib' INC='-I${LOCALBASE}/include'
 
diff --git a/net/p5-Net-DBus/Makefile b/net/p5-Net-DBus/Makefile
index 1a4b1f3dea2..32db93e4704 100644
--- a/net/p5-Net-DBus/Makefile
+++ b/net/p5-Net-DBus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:52 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/11 16:27:54 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -20,6 +20,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 RUN_DEPENDS=	::textproc/p5-XML-Twig
 BUILD_DEPENDS=	${RUN_DEPENDS}
-LIB_DEPENDS=	dbus-1.>=6::x11/dbus
+LIB_DEPENDS=	::x11/dbus
+WANTLIB =	dbus-1.>=6
 
 .include <bsd.port.mk>
diff --git a/net/p5-Net-SSH2/Makefile b/net/p5-Net-SSH2/Makefile
index 5f750cbc544..988e4444b67 100644
--- a/net/p5-Net-SSH2/Makefile
+++ b/net/p5-Net-SSH2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/10/18 18:36:54 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/11 16:27:55 espie Exp $
 
 SHARED_ONLY =	Yes
 COMMENT =	support for the SSH 2 protocol via libssh2
@@ -17,8 +17,8 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-LIB_DEPENDS =	ssh2::security/libssh2
+LIB_DEPENDS =	::security/libssh2
 
-WANTLIB +=     crypto ssl z
+WANTLIB +=     crypto ssl z ssh2
 
 .include <bsd.port.mk>
diff --git a/net/p5-Net-Z3950-Zoom/Makefile b/net/p5-Net-Z3950-Zoom/Makefile
index 4069cca0192..6496e4e4ddf 100644
--- a/net/p5-Net-Z3950-Zoom/Makefile
+++ b/net/p5-Net-Z3950-Zoom/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/10/18 21:50:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/11 16:27:55 espie Exp $
 
 SHARED_ONLY=	Yes
 COMMENT=	perl interface to yaz zoom
@@ -14,9 +14,9 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 RUN_DEPENDS=	::converters/p5-MARC-Record
-LIB_DEPENDS=	yaz::net/yaz
+LIB_DEPENDS=	::net/yaz
 
-WANTLIB += exslt gcrypt gpg-error m pthread xml2 xslt z
+WANTLIB += exslt gcrypt gpg-error m pthread xml2 xslt z yaz
 
 MODULES=	cpan \
 		devel/gettext
diff --git a/net/packit/Makefile b/net/packit/Makefile
index 693899de5c9..70b49120d81 100644
--- a/net/packit/Makefile
+++ b/net/packit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2010/10/18 18:36:56 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/11 16:27:55 espie Exp $
 
 COMMENT=		packet generation tool
 DISTNAME=		packit-1.0
@@ -17,13 +17,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-LIB_DEPENDS=		lib/libnet-1.1/net.=11:libnet->=1.1,<1.2:net/libnet/1.1
-WANTLIB=		c pcap
+LIB_DEPENDS=		:libnet->=1.1,<1.2:net/libnet/1.1
+WANTLIB=		c pcap lib/libnet-1.1/net.=11
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-libnet-includes=${LOCALBASE}/include/libnet-1.1 \
 			--with-libnet-libraries=${LOCALBASE}/lib/libnet-1.1
 CONFIGURE_ENV=		CPPFLAGS=`libnet-config-1.1 --cflags`
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 .include <bsd.port.mk>
diff --git a/net/pavuk/Makefile b/net/pavuk/Makefile
index d70cb95b013..3b7354aa351 100644
--- a/net/pavuk/Makefile
+++ b/net/pavuk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2010/10/24 21:30:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2010/11/11 16:27:55 espie Exp $
 
 COMMENT=	tool to mirror contents of HTTP and FTP servers
 
@@ -31,12 +31,13 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 USE_GROFF =	Yes
 
 .if !${FLAVOR:L:Mno_x11}
-LIB_DEPENDS+=	gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2
+LIB_DEPENDS+=	::x11/gtk+2
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xmu Xrandr Xrender atk-1.0 cairo expat
 WANTLIB += fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pixman-1 png pthread-stubs xcb gdk_pixbuf-2.0
+WANTLIB += gtk-x11-2.0 gdk-x11-2.0
 .else
 CONFIGURE_ARGS+= --disable-gtk
 .endif
diff --git a/net/pidgin-facebookchat/Makefile b/net/pidgin-facebookchat/Makefile
index 514b133fbb4..c5e2bdb7f16 100644
--- a/net/pidgin-facebookchat/Makefile
+++ b/net/pidgin-facebookchat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/10/24 19:19:06 steven Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/11 16:27:55 espie Exp $
 
 SHARED_ONLY =	Yes
 
@@ -26,7 +26,8 @@ WRKDIST =	${WRKDIR}/pidgin-facebookchat
 
 BUILD_DEPENDS =	${RUN_DEPENDS}
 RUN_DEPENDS =	:libpurple->=2.0.0:net/pidgin
-LIB_DEPENDS =	json-glib-1.0.>=1.0:json-glib->=0.7.6:devel/json-glib
+LIB_DEPENDS =	:json-glib->=0.7.6:devel/json-glib
+WANTLIB =	json-glib-1.0.>=1.0
 
 MAKE_FLAGS =	LINUX32_COMPILER="${CC}" LOCALBASE=${LOCALBASE}
 ALL_TARGET =	libfacebook.so
diff --git a/net/pidgin/Makefile b/net/pidgin/Makefile
index 9572e0c8211..5a510157069 100644
--- a/net/pidgin/Makefile
+++ b/net/pidgin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.79 2010/11/07 12:32:07 steven Exp $
+# $OpenBSD: Makefile,v 1.80 2010/11/11 16:27:55 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -44,11 +44,13 @@ WANTLIB-main=	X11 Xau Xdmcp ICE SM Xcomposite Xcursor Xdamage Xext \
 		execinfo expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
 		gio-2.0 gtk-x11-2.0 pango-1.0 pangocairo-1.0 \
 		pangoft2-1.0 pixman-1 png pthread-stubs stdc++ xcb-atom \
+		startup-notification-1 purple \
 		xcb-aux xcb-event xcb-render xcb-render-util xcb ${WANTLIB}
 
-WANTLIB-libpurple= crypto ssl ${WANTLIB}
+WANTLIB-libpurple= crypto ssl silc.>=7 silcclient.>=5 meanwhile gadu.>=4 \
+		${WANTLIB}
 
-WANTLIB-finch=	X11 Xau Xdmcp ncurses panel pthread-stubs xcb ${WANTLIB}
+WANTLIB-finch=	X11 Xau Xdmcp ncurses panel pthread-stubs xcb purple ${WANTLIB}
 WANTLIB-finch += ${MODPY_WANTLIB}
 
 MODULES=	devel/gettext \
@@ -61,15 +63,15 @@ RUN_DEPENDS-main=	::x11/dbus-python \
 			::x11/py-gtk2 \
 			::devel/desktop-file-utils
 LIB_DEPENDS-main=	${LIB_DEPENDS} \
-			startup-notification-1:startup-notification->=0.10:devel/startup-notification
+			:startup-notification->=0.10:devel/startup-notification
 RUN_DEPENDS-finch=	# empty
 LIB_DEPENDS-finch=	${LIB_DEPENDS} \
 			${MODPY_LIB_DEPENDS}
 RUN_DEPENDS-libpurple=	${MODGCONF2_RUN_DEPENDS}
 LIB_DEPENDS-libpurple=	${LIB_DEPENDS} \
-			silc.>=7,silcclient.>=5::devel/silc-toolkit \
-			meanwhile::net/meanwhile \
-			gadu.>=4::net/libgadu
+			::devel/silc-toolkit \
+			::net/meanwhile \
+			::net/libgadu
 
 MODGCONF2_SCHEMAS_DIR=	pidgin
 MODGCONF2_LIBDEP=	No
@@ -111,14 +113,15 @@ FLAVOR?=
 MULTI_PACKAGES= -main -finch -libpurple
 
 .if ${FLAVOR:L:Maudio}
-LIB_DEPENDS+=		gstreamer-0.10:gstreamer->=0.10,<=0.11:multimedia/gstreamer-0.10/core \
-			gstinterfaces-0.10::multimedia/gstreamer-0.10/plugins-base
-LIB_DEPENDS-main+=	purple:libpurple-${VERSION}-audio:${BUILD_PKGPATH},-libpurple
-LIB_DEPENDS-finch+=	purple:libpurple-${VERSION}-audio:${BUILD_PKGPATH},-libpurple
+LIB_DEPENDS+=	:gstreamer->=0.10,<=0.11:multimedia/gstreamer-0.10/core \
+		::multimedia/gstreamer-0.10/plugins-base
+WANTLIB +=	gstreamer-0.10 gstinterfaces-0.10
+LIB_DEPENDS-main+=	:libpurple-${VERSION}-audio:${BUILD_PKGPATH},-libpurple
+LIB_DEPENDS-finch+=	:libpurple-${VERSION}-audio:${BUILD_PKGPATH},-libpurple
 .else
 CONFIGURE_ARGS+=	--disable-gstreamer
-LIB_DEPENDS-main+=	purple:libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple
-LIB_DEPENDS-finch+=	purple:libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple
+LIB_DEPENDS-main+=	:libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple
+LIB_DEPENDS-finch+=	:libpurple-${VERSION}:${BUILD_PKGPATH},-libpurple
 .endif
 
 .if ${FLAVOR:L:Mdebug}
@@ -127,8 +130,8 @@ DEBUG=			-O0 -g
 .endif
 
 .if ${FLAVOR:L:Mgtkspell}
-LIB_DEPENDS-main+=	gtkspell::textproc/gtkspell
-WANTLIB-main+=		enchant
+LIB_DEPENDS-main+=	::textproc/gtkspell
+WANTLIB-main+=		enchant gtkspell
 .else
 CONFIGURE_ARGS+=	--disable-gtkspell
 .endif
diff --git a/net/pmacct/Makefile b/net/pmacct/Makefile
index 690812fdd90..0c99a8c135e 100644
--- a/net/pmacct/Makefile
+++ b/net/pmacct/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/08/17 19:51:18 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/11 16:27:55 espie Exp $
 
 COMMENT=	IP accounting software
 
@@ -13,11 +13,11 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	c m pcap z
+WANTLIB=	c m pcap z sqlite3.>=8
 
 MASTER_SITES=	${HOMEPAGE}
 
-LIB_DEPENDS+=	sqlite3.>=8::databases/sqlite3
+LIB_DEPENDS+=	::databases/sqlite3
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS= --enable-64bit \
@@ -32,7 +32,8 @@ FLAVORS=	mysql postgresql threads
 FLAVOR?=
 
 .if ${FLAVOR:L:Mpostgresql}
-LIB_DEPENDS+=	pq.>=2::databases/postgresql
+LIB_DEPENDS+=	::databases/postgresql
+WANTLIB +=	pq.>=2
 CONFIGURE_ARGS+= --enable-pgsql \
 		--with-pgsql-includes="${LOCALBASE}/include/postgresql/"
 .else
@@ -40,7 +41,8 @@ CONFIGURE_ARGS+= --disable-pgsql
 .endif
 
 .if ${FLAVOR:L:Mmysql}
-LIB_DEPENDS+=	lib/mysql/mysqlclient.>=10::databases/mysql
+LIB_DEPENDS+=	::databases/mysql
+WANTLIB +=	lib/mysql/mysqlclient.>=10
 CONFIGURE_ARGS+= --enable-mysql
 .else
 CONFIGURE_ARGS+= --disable-mysql
diff --git a/net/powerdns/Makefile b/net/powerdns/Makefile
index 32df753c59c..f88a3ca62ec 100644
--- a/net/powerdns/Makefile
+++ b/net/powerdns/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/10/18 18:36:56 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/11 16:27:55 espie Exp $
 
 SHARED_ONLY=		Yes
 
@@ -33,7 +33,7 @@ WANTLIB-main=		c m pthread stdc++ z
 
 MASTER_SITES=		http://downloads.powerdns.com/releases/
 
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 NO_REGRESS=		Yes
 
 BUILD_DEPENDS=		::devel/boost
@@ -49,9 +49,9 @@ CONFIGURE_ARGS+=	--without-mysql
 .else
 MULTI_PACKAGES+=	-mysql
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-LIB_DEPENDS-mysql=	lib/mysql/mysqlclient.>=10::databases/mysql
+LIB_DEPENDS-mysql=	::databases/mysql
 RUN_DEPENDS-mysql=	:${FULLPKGNAME-main}:net/powerdns
-WANTLIB-mysql+= 	crypto m ssl z
+WANTLIB-mysql+= 	crypto m ssl z lib/mysql/mysqlclient.>=10
 BACKENDS+=		gmysql
 .endif
 
@@ -62,9 +62,9 @@ CONFIGURE_ARGS+=	--without-pgsql
 MULTI_PACKAGES+=	-pgsql
 CONFIGURE_ARGS+=	--with-pgsql=${LOCALBASE} \
 			--with-pgsql-includes=${LOCALBASE}/include/postgresql
-LIB_DEPENDS-pgsql=	pq.>=2::databases/postgresql,-main
+LIB_DEPENDS-pgsql=	::databases/postgresql,-main
 RUN_DEPENDS-pgsql=	:${FULLPKGNAME-main}:net/powerdns
-WANTLIB-pgsql=		crypto ssl z
+WANTLIB-pgsql=		crypto ssl z pq.>=2
 BACKENDS+=		gpgsql
 .endif
 
@@ -75,9 +75,9 @@ CONFIGURE_ARGS+=	--without-sqlite
 MULTI_PACKAGES+=	-sqlite
 CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE} \
 			--with-sqlite-includes=${LOCALBASE}/include
-LIB_DEPENDS-sqlite=	sqlite.>=8::databases/sqlite
+LIB_DEPENDS-sqlite=	::databases/sqlite
 RUN_DEPENDS-sqlite=	:${FULLPKGNAME-main}:net/powerdns
-WANTLIB-sqlite+=	z
+WANTLIB-sqlite+=	z sqlite.>=8 
 BACKENDS+=		gsqlite
 .endif
 
@@ -88,9 +88,9 @@ CONFIGURE_ARGS+=	--without-sqlite3
 MULTI_PACKAGES+=	-sqlite3
 CONFIGURE_ARGS+=	--with-sqlite3=${LOCALBASE} \
 			--with-sqlite3-includes=${LOCALBASE}/include
-LIB_DEPENDS-sqlite3=	sqlite3.>=8::databases/sqlite3
+LIB_DEPENDS-sqlite3=	::databases/sqlite3
 RUN_DEPENDS-sqlite3=	:${FULLPKGNAME-main}:net/powerdns
-WANTLIB-sqlite3+=	z
+WANTLIB-sqlite3+=	z sqlite3.>=8
 BACKENDS+=		gsqlite3
 .endif
 
@@ -99,11 +99,11 @@ BACKENDS+=		gsqlite3
 CONFIGURE_ARGS+=	--without-ldap
 .else
 MULTI_PACKAGES+=	-ldap
-LIB_DEPENDS-ldap=	lber,ldap_r::databases/openldap
+LIB_DEPENDS-ldap=	::databases/openldap
 RUN_DEPENDS-ldap=	:${FULLPKGNAME-main}:net/powerdns
 CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE} \
 			--with-ldap-includes=${LOCALBASE}/include
-WANTLIB-ldap+=		asn1 com_err crypto gssapi krb5 sasl2 ssl z
+WANTLIB-ldap+=		asn1 com_err crypto gssapi krb5 sasl2 ssl z lber ldap_r
 BACKENDS+=		ldap
 .endif
 
diff --git a/net/prosody/Makefile b/net/prosody/Makefile
index 5e2eba7dfaf..04768ad7dd1 100644
--- a/net/prosody/Makefile
+++ b/net/prosody/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/11/10 23:35:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/11 16:27:55 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -21,14 +21,14 @@ PERMIT_PACKAGE_FTP=	Yes
 USE_GMAKE=	Yes
 USE_GROFF =	Yes
 MODULES=	lang/lua
-LIB_DEPENDS=	idn::devel/libidn \
-		lua::lang/lua
+LIB_DEPENDS=	::devel/libidn \
+		::lang/lua
 RUN_DEPENDS+=	::archivers/luazlib \
 		::devel/luaevent \
 		::devel/luafs \
 		::security/luasec \
 		::textproc/luaexpat
-WANTLIB+=	crypto
+WANTLIB+=	crypto idn lua
 
 CONFIGURE_STYLE=simple
 CONFIGURE_ARGS+=--prefix="${PREFIX}" \
diff --git a/net/psi/Makefile b/net/psi/Makefile
index 4d04e2162dd..473591dc290 100644
--- a/net/psi/Makefile
+++ b/net/psi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2010/10/24 21:30:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2010/11/11 16:27:55 espie Exp $
 
 COMMENT=	multiplatform Jabber client
 
@@ -17,7 +17,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		X11 Xext Xss m c pthread pthread-stubs stdc++ xcb z
+WANTLIB=		X11 Xext Xss m c pthread pthread-stubs stdc++ xcb z \
+			qca.>=1
 
 MODULES=		x11/qt3
 
@@ -25,7 +26,7 @@ MODQT_OVERRIDE_UIC=	No
 
 USE_GMAKE=		Yes
 
-LIB_DEPENDS=		qca.>=1::security/qca
+LIB_DEPENDS=		::security/qca
 RUN_DEPENDS=		::security/qca-tls
 
 CONFIGURE_STYLE=	simple
diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index b23ac67d975..c99619487a3 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2010/10/18 18:36:57 espie Exp $
+# $OpenBSD: Makefile,v 1.51 2010/11/11 16:27:55 espie Exp $
 
 COMMENT=	small, easy to set up, fast and very secure FTP server
 
@@ -40,14 +40,16 @@ FLAVORS=	ldap mysql postgresql virtual_chroot
 FLAVOR?=
 
 .if ${FLAVOR:L:Mldap}
-LIB_DEPENDS+= ldap.>=2,lber:openldap-client->=2,<3:databases/openldap
+LIB_DEPENDS+= 	:openldap-client->=2,<3:databases/openldap
+WANTLIB +=	ldap.>=2 lber
 CONFIGURE_ARGS+= --with-ldap="${LOCALBASE}"
 DOCS+=	README.LDAP pureftpd.schema
 CONF_FILE+= pureftpd-ldap.conf
 .endif
 
 .if ${FLAVOR:L:Mmysql}
-LIB_DEPENDS+= lib/mysql/mysqlclient.>=10::databases/mysql
+LIB_DEPENDS+=	::databases/mysql
+WANTLIB +=	lib/mysql/mysqlclient.>=10
 CONFIGURE_ARGS+= --with-mysql="${LOCALBASE}"
 DOCS+=	README.MySQL
 CONF_FILE+= pureftpd-mysql.conf
@@ -55,7 +57,8 @@ WANTLIB+=	m z
 .endif
 
 .if ${FLAVOR:L:Mpostgresql}
-LIB_DEPENDS+= pq.>=2::databases/postgresql
+LIB_DEPENDS+=	::databases/postgresql
+WANTLIB +=	pq.>=2
 CONFIGURE_ARGS+= --with-pgsql="${LOCALBASE}"
 DOCS+=	README.PGSQL
 CONF_FILE+= pureftpd-pgsql.conf
diff --git a/net/putty/Makefile b/net/putty/Makefile
index b6654aaa8aa..2b330de13c8 100644
--- a/net/putty/Makefile
+++ b/net/putty/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/18 18:36:57 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/11 16:27:55 espie Exp $
 
 COMMENT-main=	SSH and telnet client
 COMMENT-gui=	PuTTY GUI clients
@@ -30,8 +30,8 @@ MULTI_PACKAGES= 	-main -gui
 
 WANTLIB=		c
 WANTLIB-gui=		X11 Xext Xi c glib gmodule iconv intl m \
-			pthread-stubs xcb
-LIB_DEPENDS-gui=	gtk.>=1,gdk.>=1::x11/gtk+
+			pthread-stubs xcb gtk.>=1 gdk.>=1
+LIB_DEPENDS-gui=	::x11/gtk+
 
 pre-configure:
 	cd ${WRKSRC} && ./mkfiles.pl
diff --git a/net/py-GeoIP/Makefile b/net/py-GeoIP/Makefile
index de228a0a567..d22749a422f 100644
--- a/net/py-GeoIP/Makefile
+++ b/net/py-GeoIP/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2010/08/30 21:21:53 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/11 16:27:55 espie Exp $
 
 COMMENT =		GeoIP Python API
 
@@ -22,7 +22,8 @@ MASTER_SITES =		http://geolite.maxmind.com/download/geoip/api/python/
 
 MODULES =		lang/python
 
-LIB_DEPENDS =		GeoIP.>=7::net/GeoIP
+LIB_DEPENDS =		::net/GeoIP
+WANTLIB =		GeoIP.>=7
 
 EXAMPLEDIR =		${PREFIX}/share/examples/py-GeoIP
 NO_REGRESS =		Yes
diff --git a/net/py-adns/Makefile b/net/py-adns/Makefile
index 7fe07d1fb08..61aba21aaee 100644
--- a/net/py-adns/Makefile
+++ b/net/py-adns/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2010/08/30 21:21:53 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/11 16:27:55 espie Exp $
 
 SHARED_ONLY=		Yes
 
@@ -22,7 +22,8 @@ MASTER_SITES=		${HOMEPAGE}/files/
 MODULES=		lang/python
 CATEGORIES =		net
 
-LIB_DEPENDS=		adns::net/adns
+LIB_DEPENDS=		::net/adns
+WANTLIB =		adns
 
 NO_REGRESS=		Yes
 
diff --git a/net/py-curl/Makefile b/net/py-curl/Makefile
index 0e76b75ed97..4a01216c9e6 100644
--- a/net/py-curl/Makefile
+++ b/net/py-curl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2010/08/30 21:21:53 sthen Exp $
+# $OpenBSD: Makefile,v 1.31 2010/11/11 16:27:55 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -17,14 +17,14 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		crypto idn ssl z
 
 MASTER_SITES=	${HOMEPAGE}download/ \
 		${HOMEPAGE}download/00-OLD-VERSIONS/
 
 MODULES=	lang/python
 
-LIB_DEPENDS=	curl.>=12::net/curl
+LIB_DEPENDS=	::net/curl
+WANTLIB=	crypto idn ssl z curl.>=12
 
 do-regress: fake
 	@cd ${WRKSRC}/tests && ${MAKE_ENV} \
diff --git a/net/py-flowtools/Makefile b/net/py-flowtools/Makefile
index 83f0c26562c..769b7775252 100644
--- a/net/py-flowtools/Makefile
+++ b/net/py-flowtools/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/08/30 21:21:53 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/11 16:27:55 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -18,12 +18,12 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB+=	z
+WANTLIB+=	z ft
 
 HOMEPAGE=	http://code.google.com/p/pyflowtools/
 MASTER_SITES=	http://pyflowtools.googlecode.com/files/
 
-LIB_DEPENDS=	ft::net/flow-tools
+LIB_DEPENDS=	::net/flow-tools
 MODULES=	lang/python
 
 NO_REGRESS= 	Yes