diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index d3ff0acc4fb..cdea82947d3 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2010/10/19 15:21:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2010/11/08 01:22:36 espie Exp $
 
 COMMENT=		high-performance CORBA Object Request Broker
 
@@ -23,9 +23,10 @@ WANTLIB=		c m pcre pthread
 MODULES=		devel/gettext \
 			x11/gnome
 
-LIB_DEPENDS=		IDL-2::devel/libIDL \
-			glib-2.0,gmodule-2.0,gobject-2.0,gthread-2.0::devel/glib2
-REGRESS_DEPENDS=	:${PKGNAME}:${BUILD_PKGPATH}
+LIB_DEPENDS =		::devel/libIDL \
+			::devel/glib2
+WANTLIB +=		IDL-2 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+REGRESS_DEPENDS =	:${PKGNAME}:${BUILD_PKGPATH}
 
 
 CONFIGURE_STYLE=	autoconf
diff --git a/devel/apr-util/Makefile b/devel/apr-util/Makefile
index 233790e712c..bd0cb1700ab 100644
--- a/devel/apr-util/Makefile
+++ b/devel/apr-util/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2009/08/07 04:49:38 steven Exp $
+# $OpenBSD: Makefile,v 1.26 2010/11/08 01:22:36 espie Exp $
 
 COMMENT=	companion library to APR
 
@@ -24,8 +24,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_APACHE:=apr/}
 
-WANTLIB=	expat
-LIB_DEPENDS=	lib/db4/db.>=4:db->=4,<5:databases/db/v4
+WANTLIB=	expat lib/db4/db.>=4
+LIB_DEPENDS=	:db->=4,<5:databases/db/v4
 
 MODULES=	converters/libiconv		
 USE_LIBTOOL=	Yes
@@ -42,21 +42,23 @@ CONFIGURE_ARGS=	--with-apr=${LOCALBASE} \
 CONFIGURE_ARGS+=	--with-ldap-include=${LOCALBASE}/include \
 			--with-ldap-lib=${LOCALBASE}/lib \
 			--with-ldap
-LIB_DEPENDS+=		lber,ldap::databases/openldap
-WANTLIB+=		asn1 com_err crypto gssapi krb5 sasl2 ssl
+LIB_DEPENDS+=		::databases/openldap
+WANTLIB+=		asn1 com_err crypto gssapi krb5 sasl2 ssl lber ldap
 .endif
 
 MT?=
 .if ${FLAVOR:L:Mmt}
 MT=-mt
 CONFIGURE_ENV+=	APRUTIL_EXPORT_LIBS=-pthread
-LIB_DEPENDS+=	apr-1-mt.=3:apr-mt-1.2.11:devel/apr,mt
+LIB_DEPENDS+=	:apr-mt-1.2.11:devel/apr,mt
+WANTLIB +=	apr-1-mt.=3
 
 post-install:
 	sed 's/{APRUTIL_LIBNAME}/{APRUTIL_LIBNAME}-mt/g' ${WRKSRC}/apu-config.out > ${PREFIX}/bin/apu-1-mt-config
 
 .else
-LIB_DEPENDS+=	apr-1.=3:apr-1.2.11:devel/apr
+LIB_DEPENDS+=	:apr-1.2.11:devel/apr
+WANTLIB+=	apr-1.=3
 .endif
 
 SUBST_VARS+=	MT
diff --git a/devel/asp2php/Makefile b/devel/asp2php/Makefile
index 8f64829e3a5..c6f8712105b 100644
--- a/devel/asp2php/Makefile
+++ b/devel/asp2php/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2010/10/24 21:10:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2010/11/08 01:22:36 espie Exp $
 
 COMMENT=	convert ASP code to PHP code
 
@@ -21,8 +21,9 @@ FLAVORS=	no_x11
 FLAVOR?=		
 
 .if ${FLAVOR} != "no_x11"
-LIB_DEPENDS+=	gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
-ALL_TARGET=	all gui
+LIB_DEPENDS +=	::x11/gtk+2
+WANTLIB +=	gdk-x11-2.0 gtk-x11-2.0
+ALL_TARGET =	all gui
 
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 1491d0ec4e0..284fb2e8dee 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/10/18 17:47:51 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/08 01:22:36 espie Exp $
 
 COMMENT=automatic text creation from templates
 CATEGORIES=devel
@@ -19,9 +19,9 @@ PERMIT_DISTFILES_CDROM=Yes
 
 MODULES=	devel/gettext
 
-WANTLIB=	c gmp ltdl m pthread z
-LIB_DEPENDS=	guile::lang/guile \
-		xml2::textproc/libxml
+WANTLIB=	c gmp ltdl m pthread z guile xml2
+LIB_DEPENDS=	::lang/guile \
+		::textproc/libxml
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--without-libregex \
 		--includedir=${PREFIX}/include/autogen \
diff --git a/devel/avrdude/Makefile b/devel/avrdude/Makefile
index aed96390048..c7efb82f59a 100644
--- a/devel/avrdude/Makefile
+++ b/devel/avrdude/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/10/18 21:35:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/08 01:22:36 espie Exp $
 
 COMMENT=	AVR microcontroller hardware in-system programmer
 
@@ -26,7 +26,8 @@ CONFIGURE_ARGS+=	CPPFLAGS=-I${LOCALBASE}/include \
 			LDFLAGS=-L${LOCALBASE}/lib
 USE_GROFF =	Yes
 
-LIB_DEPENDS=		usb.>=1::devel/libusb
+LIB_DEPENDS=		::devel/libusb
+WANTLIB +=		usb.>=1
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/avrdude
diff --git a/devel/bakery/Makefile b/devel/bakery/Makefile
index 894d3534ff8..960d537a171 100644
--- a/devel/bakery/Makefile
+++ b/devel/bakery/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2010/10/11 08:12:30 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/08 01:22:36 espie Exp $
 
 COMMENT=		C++ Application Framework for use with Gtkmm
 
@@ -29,10 +29,11 @@ WANTLIB += gio-2.0 giomm-2.4 glade-2.0 glib-2.0 glibmm-2.4
 WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 gtkmm-2.4
 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4
 WANTLIB += pcre pixman-1 png pthread-stubs sigc-2.0 xcb xml2 z
+WANTLIB += gconfmm-2.6 glademm-2.4 xml++-2.6
 
-LIB_DEPENDS=		gconfmm-2.6::devel/gconfmm \
-			glademm-2.4::devel/libglademm \
-			xml++-2.6::textproc/libxml++
+LIB_DEPENDS =		::devel/gconfmm \
+			::devel/libglademm \
+			::textproc/libxml++
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
diff --git a/devel/beediff/Makefile b/devel/beediff/Makefile
index 448c5126c1e..0615ca961a1 100644
--- a/devel/beediff/Makefile
+++ b/devel/beediff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/24 21:10:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/08 01:22:36 espie Exp $
 
 COMMENT=	graphical file comparator
 
@@ -19,8 +19,9 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c expat fontconfig
 WANTLIB += freetype glib-2.0 gobject-2.0 gthread-2.0 iconv intl
 WANTLIB += m png pthread pthread-stubs stdc++ xcb z
+WANTLIB += lib/qt4/QtGui
 
-LIB_DEPENDS+=	lib/qt4/QtGui::x11/qt4
+LIB_DEPENDS+=	::x11/qt4
 
 WRKDIST=	${WRKDIR}/beediff
 
diff --git a/devel/c2hs/Makefile b/devel/c2hs/Makefile
index e15c423cae7..dc51712d485 100644
--- a/devel/c2hs/Makefile
+++ b/devel/c2hs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/10/18 17:47:51 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/08 01:22:36 espie Exp $
 # $FreeBSD: ports/devel/hs-c2hs/Makefile,v 1.20 2004/03/25 08:29:28 obraun Exp $
 
 COMMENT=		interface generator for Haskell to C bindings
@@ -32,9 +32,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c m
+WANTLIB=		c m gmp
 
-LIB_DEPENDS=		gmp::devel/gmp
+LIB_DEPENDS=		::devel/gmp
 
 BUILD_DEPENDS=		::devel/alex ::devel/happy ::textproc/sgmlformat
 
diff --git a/devel/ccrtp/Makefile b/devel/ccrtp/Makefile
index aa889ecfdea..9ef9975824b 100644
--- a/devel/ccrtp/Makefile
+++ b/devel/ccrtp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2009/03/25 08:58:04 jakemsr Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/08 01:22:36 espie Exp $
 
 COMMENT=	implementation of the Real-time Transport Protocol
 
@@ -16,9 +16,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=	crypto ssl
+WANTLIB=	crypto ssl ccgnu2.>=1
 
-LIB_DEPENDS=	ccgnu2.>=1::devel/commoncpp
+LIB_DEPENDS=	::devel/commoncpp
 
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= gnu
diff --git a/devel/cln/Makefile b/devel/cln/Makefile
index 8846adc40e9..a2fccbd8248 100644
--- a/devel/cln/Makefile
+++ b/devel/cln/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/02/09 12:18:45 jasper Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/08 01:22:36 espie Exp $
 
 NOT_FOR_ARCHS =	arm mips64 mips64el sparc64
 
@@ -22,9 +22,9 @@ PERMIT_DISTFILES_FTP =		Yes
 MASTER_SITES =		${HOMEPAGE}
 EXTRACT_SUFX =		.tar.bz2
 
-WANTLIB	+=		c m stdc++
+WANTLIB	+=		c m stdc++ gmp
 
-LIB_DEPENDS =		gmp::devel/gmp 
+LIB_DEPENDS =		::devel/gmp 
 
 USE_GMAKE =		Yes
 USE_LIBTOOL =		Yes
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index db857829f30..ae880978871 100755
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2010/10/18 17:47:51 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/08 01:22:36 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -43,8 +43,12 @@ MASTER_SITES=	${MASTER_SITE_BERLIOS:=codeblocks/}
 
 BUILD_DEPENDS=	::archivers/zip
 
-LIB_DEPENDS=	bz2.>=10::archivers/bzip2 \
-		wx_base.>=1,wx_base_net,wx_base_odbc,wx_base_xml,wx_gtk2_adv,wx_gtk2_aui,wx_gtk2_core,wx_gtk2_dbgrid,wx_gtk2_html,wx_gtk2_qa,wx_gtk2_richtext,wx_gtk2_xrc::x11/wxWidgets
+LIB_DEPENDS=	::archivers/bzip2 \
+		::x11/wxWidgets
+
+WANTLIB +=	bz2.>=10 wx_base.>=1 wx_base_net wx_base_odbc wx_base_xml \
+		wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid \
+		wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc
 
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils \
 		:shared-mime-info->=0.21:misc/shared-mime-info
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 7909239f406..70352b84650 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/10/18 21:35:48 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2010/11/08 01:22:37 espie Exp $
 
 COMMENT=		graphical representation of CVS repository
 
@@ -11,13 +11,13 @@ PERMIT_PACKAGE_CDROM=	Yes
 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
 
 MODULES=		converters/libiconv
 
 MASTER_SITES=		${HOMEPAGE}/release/
 
-LIB_DEPENDS=		gd.>=18::graphics/gd
+LIB_DEPENDS=		::graphics/gd
 
 ALL_TARGET=		
 
diff --git a/devel/cvstrac/Makefile b/devel/cvstrac/Makefile
index 19806f47b6d..49b5e33ec54 100644
--- a/devel/cvstrac/Makefile
+++ b/devel/cvstrac/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2009/02/17 00:20:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.3 2010/11/08 01:22:37 espie Exp $
 
 COMMENT =	patch-set and bug tracking system for CVS
 
 DISTNAME =	cvstrac-2.0.1
-PKGNAME =	${DISTNAME}p0
+PKGNAME =	${DISTNAME}
+REVISION =	0
 CATEGORIES =	devel www
 
 HOMEPAGE =	http://www.cvstrac.org/
@@ -18,8 +19,8 @@ PERMIT_DISTFILES_FTP =	Yes
 
 MASTER_SITES =	${HOMEPAGE}
 
-WANTLIB =	c m
-LIB_DEPENDS =	sqlite3::databases/sqlite3
+WANTLIB =	c m sqlite3
+LIB_DEPENDS =	::databases/sqlite3
 
 USE_GMAKE =	Yes
 MAKE_FILE =	bsd-gcc.mk