diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index af49d43a826..d2d8826985a 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.80 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.81 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=	free cross-platform WYSIWYG word processor
 
@@ -22,11 +22,11 @@ HOMEPAGE=	http://www.abisource.com/
 
 MODULES=	devel/gettext
 
-RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS=	::devel/fribidi \
-		::converters/wv \
-		::textproc/enchant \
-		::x11/gnome/librsvg
+RUN_DEPENDS=	devel/desktop-file-utils
+LIB_DEPENDS=	devel/fribidi \
+		converters/wv \
+		textproc/enchant \
+		x11/gnome/librsvg
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/editors/axe/Makefile b/editors/axe/Makefile
index fcb5c894ef7..a80cee56947 100644
--- a/editors/axe/Makefile
+++ b/editors/axe/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=		simple to use text editor for X11
 
@@ -19,7 +19,7 @@ MASTER_SITES=		${MASTER_SITE_XCONTRIB:=editors/}
 EXTRACT_SUFX=		.tar.Z
 
 CONFIGURE_STYLE=	imake
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 NO_REGRESS=		Yes
 
 .include <bsd.port.mk>
diff --git a/editors/beaver/Makefile b/editors/beaver/Makefile
index af316d4c3cc..e4d70adfe31 100644
--- a/editors/beaver/Makefile
+++ b/editors/beaver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/11/07 18:50:57 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=	lightweight Gtk text editor with syntax highlighting
 
@@ -26,9 +26,9 @@ WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png \
 		pthread-stubs xcb z gdk_pixbuf-2.0 gdk-x11-2.0 gtk-x11-2.0
 
-LIB_DEPENDS=	::x11/gtk+2
+LIB_DEPENDS=	x11/gtk+2
 
-RUN_DEPENDS=	::devel/desktop-file-utils
+RUN_DEPENDS=	devel/desktop-file-utils
 
 USE_GMAKE=	Yes
 USE_GROFF =	Yes
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 84fea162151..736c9523ad6 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,48 +1,48 @@
-# $OpenBSD: Makefile,v 1.34 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.35 2010/11/15 23:22:07 espie Exp $
 
-COMMENT=	easy to use, graphical editor
+COMMENT =	easy to use, graphical editor
 
-CATEGORIES=	editors
-MASTER_SITES=	${HOMEPAGE}
-HOMEPAGE= 	ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/
-DISTNAME=	cooledit-3.17.14
-REVISION=	5
+CATEGORIES =	editors
+MASTER_SITES =	${HOMEPAGE}
+HOMEPAGE = 	ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/
+DISTNAME =	cooledit-3.17.14
+REVISION =	5
 
-SHARED_LIBS=	Cw	1.0
+SHARED_LIBS =	Cw	1.0
 
-MAINTAINER=	Marc Espie <espie@openbsd.org>
+MAINTAINER =	Marc Espie <espie@openbsd.org>
 
-FLAVORS=	python
-FLAVOR?=
+FLAVORS =	python
+FLAVOR ?=
 
-PYTHON_VER=	2.4
-WANTLIB=	X11 Xau Xdmcp c pthread-stubs util xcb
-USE_LIBTOOL=	Yes
+PYTHON_VER =	2.4
+WANTLIB =	X11 Xau Xdmcp c pthread-stubs util xcb
+USE_LIBTOOL =	Yes
 
 .if ${FLAVOR:L:Mpython}
-LIB_DEPENDS+=	:python->=${PYTHON_VER},<2.5:lang/python/${PYTHON_VER}
-CONFIGURE_ENV+=	PYTHON_VER=${PYTHON_VER} LOCALBASE=${LOCALBASE}
-WANTLIB+=	pthread m python${PYTHON_VER}
+LIB_DEPENDS +=	python->=${PYTHON_VER},<2.5:lang/python/${PYTHON_VER}
+CONFIGURE_ENV +=PYTHON_VER=${PYTHON_VER} LOCALBASE=${LOCALBASE}
+WANTLIB +=	pthread m python${PYTHON_VER}
 .else
-CONFIGURE_ENV+=	NOPYTHON=Yes
+CONFIGURE_ENV +=NOPYTHON=Yes
 .endif
 
-MODULES=	devel/gettext
+MODULES =	devel/gettext
 USE_GROFF =	Yes
 
-CONFIGURE_STYLE=gnu
-CONFIGURE_ENV+=	XTERM_CMD=xterm LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_STYLE = gnu
+CONFIGURE_ENV += XTERM_CMD=xterm LDFLAGS="-L${LOCALBASE}/lib"
 
 # XXX temporary until we have full internationalization support
-#CONFIGURE_ENV+=		ac_cv_header_wchar_h=no
+#CONFIGURE_ENV +=		ac_cv_header_wchar_h=no
 
-CONFIGURE_ARGS+=${CONFIGURE_SHARED}
-CONFIGURE_ARGS+=--enable-static --disable-mail-author
+CONFIGURE_ARGS += ${CONFIGURE_SHARED}
+CONFIGURE_ARGS += --enable-static --disable-mail-author
 
 # GPL
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_FTP =	Yes
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_DISTFILES_CDROM =Yes
 
 .include <bsd.port.mk>
diff --git a/editors/ee/Makefile b/editors/ee/Makefile
index 192139ec441..d45f452405c 100644
--- a/editors/ee/Makefile
+++ b/editors/ee/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/10/23 18:26:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=		easy to use text editor
 
@@ -23,7 +23,7 @@ EXTRACT_SUFX=		.src.tgz
 WRKDIST=		${WRKDIR}/easyedit-${VERSION}
 MAKE_ENV=		SYSCONFDIR=${SYSCONFDIR}
 
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 NO_REGRESS=		Yes
 
 do-install:
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 1817df848ab..497342120e7 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.53 2010/11/15 23:22:07 espie Exp $
 
 COMMENT-main=		GNU editor: extensible, customizable, self documenting
 COMMENT-el=		elisp sources for those who want to read/modify them
@@ -31,7 +31,7 @@ MASTER_SITES=		${MASTER_SITE_GNU:=emacs/}
 DISTFILES=		emacs-${VERSION}a.tar.gz leim-${VERSION}.tar.gz
 
 MULTI_PACKAGES=		-main -el -leim
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 FLAVORS=		no_x11
 FLAVOR?=
@@ -54,14 +54,14 @@ WANTLIB-main=		c m ncurses ossaudio
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+=	--with-x=no
 .else
-LIB_DEPENDS-main=	::graphics/libungif \
-			::graphics/png \
-			::graphics/tiff
+LIB_DEPENDS-main=	graphics/libungif \
+			graphics/png \
+			graphics/tiff
 WANTLIB-main+=		ICE SM X11 Xaw Xext Xmu Xpm Xt z
 WANTLIB-main+=		ungif jpeg png tiff
 .endif
 
-RUN_DEPENDS=		:emacs-${VERSION}:${PKGPATH}
+RUN_DEPENDS=		emacs-${VERSION}:${PKGPATH}
 RUN_DEPENDS-main=
 
 PKG_ARCH-el=		*
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 3b5aed7548c..c89e2698329 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2010/11/15 23:22:07 espie Exp $
 
 COMMENT-main=		GNU editor: extensible, customizable, self-documenting
 COMMENT-el=		elisp sources for those who want to read/modify them
@@ -28,7 +28,7 @@ MASTER_SITES=		${MASTER_SITE_GNU:=emacs/}
 MULTI_PACKAGES=		-main -el
 
 USE_GMAKE=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 FLAVORS=		gtk no_x11
 FLAVOR?=
@@ -51,15 +51,15 @@ SUBST_VARS=		GCCARCH VERSION
 WANTLIB-main=		c m ncurses ossaudio
 
 .if ${FLAVOR:L:Mno_x11}
-.if ${FLAVOR:L:Mgtk}
+.  if ${FLAVOR:L:Mgtk}
 ERRORS=			"Fatal: gtk and no_x11 flavors are mutually exclusive"
-.endif
+.  endif
 CONFIGURE_ARGS+=	--without-x
 
 .elif ${FLAVOR:L:Mgtk}
 CONFIGURE_ARGS+=	--with-gtk
-LIB_DEPENDS-main+=	::x11/gtk+2 \
-			::graphics/libungif
+LIB_DEPENDS-main+=	x11/gtk+2 \
+			graphics/libungif
 WANTLIB-main+=		ICE SM X11 Xdmcp Xext Xft Xpm Xrender Xau Xcomposite \
 			Xcursor Xdamage Xfixes Xi Xinerama Xrandr \
 			atk-1.0 cairo expat fontconfig freetype gio-2.0 \
@@ -70,14 +70,14 @@ WANTLIB-main+=		ICE SM X11 Xdmcp Xext Xft Xpm Xrender Xau Xcomposite \
 			xcb-render xcb-render-util
 .else
 CONFIGURE_ARGS+=	--with-x-toolkit=athena --without-toolkit-scroll-bars
-LIB_DEPENDS-main+=	::graphics/png \
-			::graphics/tiff \
-			::graphics/libungif 
+LIB_DEPENDS-main+=	graphics/png \
+			graphics/tiff \
+			graphics/libungif 
 WANTLIB-main+=		ICE SM X11 Xaw Xext Xmu Xpm Xt z
 WANTLIB-main+=		jpeg png tiff ungif
 .endif
 
-RUN_DEPENDS-el=		:emacs-${VERSION}:${PKGPATH}
+RUN_DEPENDS-el=		emacs-${VERSION}:${PKGPATH}
 PKG_ARCH-el=		*
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "mips64"
diff --git a/editors/gummi/Makefile b/editors/gummi/Makefile
index 0d9d35005da..51aad8c2906 100644
--- a/editors/gummi/Makefile
+++ b/editors/gummi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2010/11/08 20:08:55 kili Exp $
+# $OpenBSD: Makefile,v 1.2 2010/11/15 23:22:07 espie Exp $
 
 COMMENT =		simple LaTeX editor
 
@@ -29,12 +29,12 @@ MASTER_SITES =		http://dev.midnightcoding.org/redmine/attachments/download/90/
 
 MODULES =		devel/gettext textproc/intltool
 
-RUN_DEPENDS =		::devel/desktop-file-utils \
-			:texlive_base-*:print/texlive/base
+RUN_DEPENDS =		devel/desktop-file-utils \
+			print/texlive/base
 
-LIB_DEPENDS =		::print/poppler \
-			::textproc/gtkspell \
-			::x11/gtksourceview
+LIB_DEPENDS =		print/poppler \
+			textproc/gtkspell \
+			x11/gtksourceview
 
 CONFIGURE_STYLE =	gnu
 
diff --git a/editors/ht/Makefile b/editors/ht/Makefile
index 279d71bb949..778e38bf586 100644
--- a/editors/ht/Makefile
+++ b/editors/ht/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2010/11/07 18:50:57 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2010/11/15 23:22:07 espie Exp $
 
 COMMENT =		file editor/viewer/analyzer for executables
 
@@ -25,7 +25,7 @@ USE_GMAKE =		Yes
 FLAVORS =		no_x11
 FLAVOR ?=
 
-LIB_DEPENDS =		::archivers/lzo2
+LIB_DEPENDS =		archivers/lzo2
 WANTLIB +=		lzo2
 
 CONFIGURE_ENV =		CFLAGS="-I${LOCALBASE}/include" \
diff --git a/editors/jed/Makefile b/editors/jed/Makefile
index 2ef1d007783..3d1baf7ee5b 100644
--- a/editors/jed/Makefile
+++ b/editors/jed/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=	text editor
 
@@ -17,9 +17,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += c m slang.>=15 termcap util
+WANTLIB += c m slang>=15 termcap util
 
-LIB_DEPENDS=	::devel/libslang
+LIB_DEPENDS=	devel/libslang
 
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	--with-slang=${LOCALBASE}
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 1b9b0b56292..0e2c4aa5e9f 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=	integrated LaTeX environment for KDE
 DISTNAME=	kile-2.0
@@ -24,11 +24,11 @@ WANTLIB += pthread-stubs xcb DCOP kabc katepartinterfaces kdecore
 WANTLIB += kdefx kdeprint kdesu kdeui khtml kio kjs kparts kresources 
 WANTLIB += kspell ktexteditor kutils kwalletclient vcard
 
-LIB_DEPENDS=	::x11/kde/libs3
+LIB_DEPENDS=	x11/kde/libs3
 	
-RUN_DEPENDS=	::x11/kde/graphics3 \
-		::print/texlive/base \
-		:desktop-file-utils-*:devel/desktop-file-utils
+RUN_DEPENDS=	x11/kde/graphics3 \
+		print/texlive/base \
+		devel/desktop-file-utils
 
 MODULES=	x11/kde devel/gettext
 
diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile
index cfe22ade9c1..0b80e815971 100644
--- a/editors/kxmleditor/Makefile
+++ b/editors/kxmleditor/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.34 2010/11/15 23:22:07 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -27,7 +27,7 @@ WANTLIB += kdesu kdeui kio kparts kwalletclient
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kxmleditor/}
 
-LIB_DEPENDS=	::x11/kde/libs3
+LIB_DEPENDS=	x11/kde/libs3
 
 MODULES=	x11/kde
 MODKDE_VERSION=	3.1
diff --git a/editors/ldapvi/Makefile b/editors/ldapvi/Makefile
index 4c7109df237..634b9271055 100755
--- a/editors/ldapvi/Makefile
+++ b/editors/ldapvi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/11/07 18:50:57 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=	update LDAP entries with a text editor
 
@@ -22,11 +22,11 @@ MASTER_SITES=	http://www.lichteblau.com/download/
 WANTLIB=	c curses crypto readline ssl
 
 MODULES=	devel/gettext
-BUILD_DEPENDS=	::textproc/libxslt
-LIB_DEPENDS=	::devel/glib2 \
-		:openldap-client-*:databases/openldap \
-		::devel/popt
-WANTLIB +=	glib-2.0.>=0.8 lber ldap popt
+BUILD_DEPENDS=	textproc/libxslt
+LIB_DEPENDS=	devel/glib2 \
+		databases/openldap \
+		devel/popt
+WANTLIB +=	glib-2.0>=0.8 lber ldap popt
 
 MAKE_FILE=	GNUmakefile
 USE_GMAKE=	Yes
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 755b4689186..58eb52daa86 100755
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2010/11/07 18:50:57 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=	simple GTK+ text editor
 
@@ -21,13 +21,13 @@ WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0 \
 		gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
 		pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0 \
-		gtk-x11-2.0.>=1000 gdk-x11-2.0.>=1000
+		gtk-x11-2.0>=1000 gdk-x11-2.0>=1000
 
 MODULES=	devel/gettext \
 		textproc/intltool
 
-LIB_DEPENDS=	::x11/gtk+2
-RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS=	x11/gtk+2
+RUN_DEPENDS=	devel/desktop-file-utils
 
 USE_GMAKE=	Yes
 
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index 85bc8869fa1..ba990db75fb 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.58 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.59 2010/11/15 23:22:07 espie Exp $
 # $FreeBSD: Makefile,v 1.10 1998/03/28 14:36:34 steve Exp $
 
 COMMENT=		X11/Motif GUI text editor
@@ -37,7 +37,7 @@ WANTLIB += c expat fontconfig freetype m z
 MODULES=		converters/libiconv
 
 USE_MOTIF=		Any
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 ALL_TARGET=		openbsd
 
 NO_REGRESS=		Yes
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index 2e5797f51c8..95adf050cd0 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2010/10/23 18:26:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2010/11/15 23:22:07 espie Exp $
 # NetBSD: Makefile,v 1.6 2000/01/19 12:28:44 hubertf Exp
 # FreeBSD Id: Makefile,v 1.11 1999/04/17 10:51:03 itojun Exp
 
@@ -34,7 +34,7 @@ USE_GROFF =	Yes
 
 .if ${FLAVOR:L} == "canna"
 WANTLIB+=	canna
-LIB_DEPENDS+=	::japanese/canna
+LIB_DEPENDS+=	japanese/canna
 CONFIGURE_ARGS+=--enable-canna=${LOCALBASE}
 
 CANNA_OPT.euc-jp=canna cannactrl cannakey=
diff --git a/editors/openoffice3-dicts/Makefile b/editors/openoffice3-dicts/Makefile
index e719c372480..1a64e8fe940 100644
--- a/editors/openoffice3-dicts/Makefile
+++ b/editors/openoffice3-dicts/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/10/23 18:26:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/15 23:22:07 espie Exp $
 
 PKG_ARCH=	*
 
@@ -25,7 +25,7 @@ LANGUAGES=	ar_AR de_DE en_GB en_US fa_IR fr_FR hu_HU nl_NL \
 
 EXTRACT_CASES=	*.oxt) break;; 
 
-RUN_DEPENDS=	:openoffice->=3:editors/openoffice3
+RUN_DEPENDS=	openoffice->=3:editors/openoffice3
 
 DIST_SUBDIR=	${NAME}-${V}
 NO_EXTRACT=	Yes
diff --git a/editors/openoffice3/Makefile b/editors/openoffice3/Makefile
index 1f36cdba46e..e8c7d6e796e 100644
--- a/editors/openoffice3/Makefile
+++ b/editors/openoffice3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.61 2010/11/14 23:37:41 robert Exp $
+# $OpenBSD: Makefile,v 1.62 2010/11/15 23:22:07 espie Exp $
 
 ONLY_FOR_ARCHS= amd64 i386
 
@@ -119,43 +119,43 @@ LANGS=			bg ca de es fa fi fr hu it ja ko \
 MULTI_PACKAGES+=	-i18n-$l
 PKGNAME-i18n-$l=	openoffice-i18n-$l-${VERSION}
 COMMENT-i18n-$l=	$l language pack for OpenOffice.Org
-RUN_DEPENDS-i18n-$l=	::editors/openoffice3
+RUN_DEPENDS-i18n-$l=	editors/openoffice3
 WANTLIB-i18n-$l=
 LIB_DEPENDS-i18n-$l=
 .endfor
 .endif
 
-BUILD_DEPENDS+=	:zip-*:archivers/zip \
-		:unzip-*:archivers/unzip \
-		:gtar-*:archivers/gtar \
-		:bison-*:devel/bison \
-		:bash-*:shells/bash \
-		:p5-Archive-Zip-*:archivers/p5-Archive-Zip \
-		::print/cups \
-		:boost->=1.41.0:devel/boost \
-		::misc/fileutils
+BUILD_DEPENDS+=	archivers/zip \
+		archivers/unzip \
+		archivers/gtar \
+		devel/bison \
+		shells/bash \
+		archivers/p5-Archive-Zip \
+		print/cups \
+		boost->=1.41.0:devel/boost \
+		misc/fileutils
 
 MODULES+=	lang/python \
 		devel/gconf2
 MODGCONF2_LIBDEP=No
-LIB_DEPENDS-main=::x11/gtk+2 \
+LIB_DEPENDS-main=x11/gtk+2 \
 		${MODPY_LIB_DEPENDS} \
-		:db->=4,<5:databases/db/v4 \
-		::textproc/libxslt \
-		::net/curl \
-		::net/neon \
-		::textproc/libwpd \
-		::textproc/icu4c \
-		::devel/gperf \
-		::textproc/raptor \
-		::textproc/redland \
-		::textproc/hunspell \
-		::devel/cppunit \
+		db->=4,<5:databases/db/v4 \
+		textproc/libxslt \
+		net/curl \
+		net/neon \
+		textproc/libwpd \
+		textproc/icu4c \
+		devel/gperf \
+		textproc/raptor \
+		textproc/redland \
+		textproc/hunspell \
+		devel/cppunit \
 		${MODGCONF2_LIB_DEPENDS}
-WANTLIB-main=	gdk-x11-2.0.>=400.14 gtk-x11-2.0.>=400.14 \
-		db.>=4 xslt.>=3 curl.>=7 neon.>=24 \
-		icuuc.>=0 icudata.>=0 icui18n icule \
-		raptor.>=2 rasqal rdf.>=0
+WANTLIB-main=	gdk-x11-2.0>=400.14 gtk-x11-2.0>=400.14 \
+		db>=4 xslt>=3 curl>=7 neon>=24 \
+		icuuc>=0 icudata>=0 icui18n icule \
+		raptor>=2 rasqal rdf>=0
 WANTLIB-main+=	ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
 		Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo \
 		crypto expat fontconfig freetype gio-2.0 glib-2.0 \
@@ -166,14 +166,14 @@ WANTLIB-main+=	ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
 WANTLIB-main+=	GL Xxf86vm drm python2.6 stdc++ xcb-render xcb-shm
 WANTLIB-main+=	${MODPY_WANTLIB}
 
-RUN_DEPENDS-main=	:desktop-file-utils-*:devel/desktop-file-utils
+RUN_DEPENDS-main=	devel/desktop-file-utils
 
 .include <bsd.own.mk>
 
 MODULES+=		x11/qt3
-RUN_DEPENDS-kde=	::editors/openoffice3
+RUN_DEPENDS-kde=	editors/openoffice3
 LIB_DEPENDS-kde=	${MODQT_LIB_DEPENDS} \
-			::x11/kde/libs3
+			x11/kde/libs3
 WANTLIB-kde=		${MODQT_WANTLIB} \
 			X11 Xau Xdmcp Xext Xrandr Xrender stdc++ m \
 			pthread-stubs xcb kabc kdecore kdeui kio
@@ -183,11 +183,11 @@ MODULES+=		java
 MODJAVA_VER=		1.4+
 MODJAVA_JRERUN=		Yes
 .endif
-LIB_DEPENDS-java=	:db-java->=4,<5:databases/db/v4,-java,java \
-			::devel/apache-ant
+LIB_DEPENDS-java=	db-java->=4,<5:databases/db/v4,-java,java \
+			devel/apache-ant
 RUN_DEPENDS-java=	${MODJAVA_RUN_DEPENDS} \
-			::editors/openoffice3 \
-			::java/javaPathHelper
+			editors/openoffice3 \
+			java/javaPathHelper
 WANTLIB-java=		c stdc++ m pthread
 
 USE_GMAKE=	Yes
diff --git a/editors/qscintilla/Makefile b/editors/qscintilla/Makefile
index 800a2ec71fa..7475b0cfd2f 100644
--- a/editors/qscintilla/Makefile
+++ b/editors/qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/09/01 10:05:18 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/15 23:22:07 espie Exp $
 
 # XXX: Upstream doesn't keep old files; if updating please mirror or ask sthen@
 
@@ -28,8 +28,6 @@ WANTLIB =	ICE SM X11 Xext Xi Xinerama Xrender expat fontconfig \
 		freetype glib-2.0 gobject-2.0 gthread-2.0 m png pthread-stubs \
 		xcb z stdc++ QtCore QtGui
 
-LIB_DEPENDS =	::x11/qt4
-
 CONFIGURE_ENV =	HOME=${WRKDIR}
 MAKE_FLAGS =	QMAKE_CXX=${CXX} QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" \
 		HOME=${WRKDIR} INSTALL_ROOT=${DESTDIR} \
diff --git a/editors/scintilla/Makefile b/editors/scintilla/Makefile
index 92396e3fe85..edccd9179e2 100644
--- a/editors/scintilla/Makefile
+++ b/editors/scintilla/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/10/03 18:09:01 jeremy Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=	source code editing component for GTK+
 
@@ -31,7 +31,7 @@ MAKE_ENV=	CXX='${CXX}' CXXFLAGS='${CXXFLAGS}' \
 		NO_SHARED_LIBS='${NO_SHARED_LIBS:L}'
 
 WANTLIB=	m stdc++ gtk-x11-2.0 gdk-x11-2.0
-LIB_DEPENDS=	::x11/gtk+2
+LIB_DEPENDS=	x11/gtk+2
 
 .for n v in ${SHARED_LIBS}
 MAKE_ENV+=	LIB$n_VERSION=${LIB$n_VERSION}
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index d0eaa847ee6..86d27745b1f 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=		flexible and small GTK+ editor
 
@@ -24,15 +24,15 @@ 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 pthread-stubs stdc++ xcb z
 WANTLIB += gtk-x11-2.0 gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB += scintilla.>=7 scintilla_lexers.>=7
+WANTLIB += scintilla>=7 scintilla_lexers>=7
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scintilla/}
 EXTRACT_SUFX=		.tgz
 
 MODULES=	        devel/gettext
 
-LIB_DEPENDS=		::x11/gtk+2 \
-			::editors/scintilla
+LIB_DEPENDS=		x11/gtk+2 \
+			editors/scintilla
 
 USE_GMAKE=		Yes
 NO_REGRESS=		Yes
diff --git a/editors/subtitleeditor/Makefile b/editors/subtitleeditor/Makefile
index af71c89ac7d..0e6088f8e09 100644
--- a/editors/subtitleeditor/Makefile
+++ b/editors/subtitleeditor/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2010/10/26 15:02:13 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2010/11/15 23:22:07 espie Exp $
 
 SHARED_ONLY=   	Yes
 
@@ -45,16 +45,16 @@ WANTLIB += GL Xxf86vm drm gstcontroller-0.10 gstdataprotocol-0.10
 WANTLIB += gstreamermm-0.10 gstcdda-0.10 gstnetbuffer-0.10 gstrtp-0.10
 
 
-BUILD_DEPENDS=	:gstreamer-plugins-good-*:multimedia/gstreamer-0.10/plugins-good \
-		:iso-codes-*:devel/iso-codes
-LIB_DEPENDS=	:pcre->=6.4p2:devel/pcre \
-		::textproc/enchant \
-		::multimedia/gstreamer-0.10/mm \
-		::multimedia/gstreamer-0.10/plugins-base \
-		::x11/gtk2mm
-RUN_DEPENDS=	:gstreamer-plugins-good-*:multimedia/gstreamer-0.10/plugins-good \
-		:iso-codes-*:devel/iso-codes \
-		:desktop-file-utils-*:devel/desktop-file-utils
+BUILD_DEPENDS=	multimedia/gstreamer-0.10/plugins-good \
+		devel/iso-codes
+LIB_DEPENDS=	pcre->=6.4p2:devel/pcre \
+		textproc/enchant \
+		multimedia/gstreamer-0.10/mm \
+		multimedia/gstreamer-0.10/plugins-base \
+		x11/gtk2mm
+RUN_DEPENDS=	multimedia/gstreamer-0.10/plugins-good \
+		devel/iso-codes \
+		devel/desktop-file-utils
 
 MODULES+=	devel/gettext \
 		textproc/intltool
diff --git a/editors/tea/Makefile b/editors/tea/Makefile
index b88d4a0d8af..d9cd8ece8a2 100644
--- a/editors/tea/Makefile
+++ b/editors/tea/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/11/07 18:50:57 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=	powerful and simple GTK editor
 
@@ -18,19 +18,19 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-LIB_DEPENDS=	::x11/gtk+2 \
-		:gtksourceview->=2,<3:x11/gtksourceview \
-		:aspell-*:textproc/aspell/core \
-		::archivers/zziplib
-RUN_DEPENDS=	::textproc/antiword
+LIB_DEPENDS=	x11/gtk+2 \
+		gtksourceview->=2,<3:x11/gtksourceview \
+		textproc/aspell/core \
+		archivers/zziplib
+RUN_DEPENDS=	textproc/antiword
 
 WANTLIB=	X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
 		Xcomposite Xdamage Xrender expat fontconfig freetype z \
 		atk-1.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
 		pango-1.0 pangoft2-1.0 pangocairo-1.0 png cairo xml2 \
 		c m stdc++ pixman-1 pthread-stubs xcb gdk_pixbuf-2.0 \
-		gdk-x11-2.0 gtk-x11-2.0 gtksourceview-2.0 aspell.>=16 \
-		zzip.>=13
+		gdk-x11-2.0 gtk-x11-2.0 gtksourceview-2.0 aspell>=16 \
+		zzip>=13
 
 MODULES=	devel/gettext
 
diff --git a/editors/teaqt/Makefile b/editors/teaqt/Makefile
index 854e2b09906..f8874705adf 100644
--- a/editors/teaqt/Makefile
+++ b/editors/teaqt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/15 23:22:07 espie Exp $
 
 COMMENT =	powerful and simple qt4 editor
 
@@ -19,7 +19,7 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-LIB_DEPENDS =	::textproc/aspell/core
+LIB_DEPENDS =	textproc/aspell/core
 WANTLIB += c m pthread stdc++ z QtGui QtScript QtSvg QtXml aspell
 
 MODULES =	x11/qt4
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index d1f002763a6..7556568264d 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,39 +1,39 @@
-# $OpenBSD: Makefile,v 1.21 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2010/11/15 23:22:07 espie Exp $
 
 
-COMMENT=	X11 based RTF editor
-V=		2.17
-DISTNAME=	ted-$V
-REVISION=	1
-CATEGORIES=	editors textproc print
-HOMEPAGE=	http://www.nllgg.nl/Ted/
-MASTER_SITES=	ftp://ftp.nluug.nl/pub/editors/ted/
+COMMENT =	X11 based RTF editor
+V =		2.17
+DISTNAME =	ted-$V
+REVISION =	1
+CATEGORIES =	editors textproc print
+HOMEPAGE =	http://www.nllgg.nl/Ted/
+MASTER_SITES =	ftp://ftp.nluug.nl/pub/editors/ted/
 
-DISTFILES=	ted-$V.src.tar.gz
+DISTFILES =	ted-$V.src.tar.gz
 # GPL
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_FTP=	Yes
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_FTP =	Yes
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_DISTFILES_CDROM =Yes
 
 WANTLIB += ICE SM X11 Xext Xmu Xpm Xt c m pthread-stubs xcb z
 WANTLIB += png jpeg tiff
 
-MAINTAINER=	Marc Espie <espie@openbsd.org>
+MAINTAINER =	Marc Espie <espie@openbsd.org>
 
-WRKDIST=	${WRKDIR}/Ted-$V
-LIB_DEPENDS=	::graphics/png \
-		::graphics/jpeg \
-		::graphics/tiff
+WRKDIST =	${WRKDIR}/Ted-$V
+LIB_DEPENDS =	graphics/png \
+		graphics/jpeg \
+		graphics/tiff
 
-USE_MOTIF=	openmotif
-ALL_TARGET=	compile.shared
-SHARED_ONLY=	Yes
-NO_REGRESS=	Yes
+USE_MOTIF =	openmotif
+ALL_TARGET =	compile.shared
+SHARED_ONLY =	Yes
+NO_REGRESS =	Yes
 
-AFMDIR=		${PREFIX}/share/Ted/afm
-INDDIR=		${PREFIX}/share/Ted/ind
-INFODIR=	${PREFIX}/share/doc/Ted
+AFMDIR =	${PREFIX}/share/Ted/afm
+INDDIR =	${PREFIX}/share/Ted/ind
+INFODIR =	${PREFIX}/share/doc/Ted
 
 post-extract:
 	cd ${WRKDIST}/tedPackage && tar xf TedBindist.tar
@@ -55,7 +55,7 @@ pre-configure:
 		cat config.h.in.bak >>config.h.in; \
 	done
 
-#CFLAGS+=-DAFMDIR=${AFMDIR} -DINDDIR=${INDDIR} -DINFODIR=${INFODIR}
+#CFLAGS += -DAFMDIR=${AFMDIR} -DINDDIR=${INDDIR} -DINFODIR=${INFODIR}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/Ted/Ted ${PREFIX}/bin/Ted
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 3a6544ca7e3..ea0b415d3da 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/10/27 08:16:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/15 23:22:07 espie Exp $
 # $FreeBSD: ports/editors/texmaker/Makefile,v 1.2 2004/01/09 09:16:33 krion Exp $
 
 COMMENT=		LaTeX development environment
@@ -23,11 +23,11 @@ WANTLIB += m phonon poppler poppler-qt4 pthread sqlite3 stdc++
 
 MODULES=		x11/qt4
 
-RUN_DEPENDS=		::print/texlive/base \
-			::devel/desktop-file-utils
+RUN_DEPENDS=		print/texlive/base \
+			devel/desktop-file-utils
 
-LIB_DEPENDS=		::textproc/hunspell \
-			::print/poppler,-qt4
+LIB_DEPENDS=		textproc/hunspell \
+			print/poppler,-qt4
 
 NO_REGRESS=		Yes
 
diff --git a/editors/textedit/Makefile b/editors/textedit/Makefile
index c3ec09ad187..8cc42aff25d 100644
--- a/editors/textedit/Makefile
+++ b/editors/textedit/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.29 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=	standard OpenLook text editor for X11
 
@@ -16,8 +16,8 @@ WANTLIB=		X11 Xext c pthread-stubs xcb xview olgx
 
 MASTER_SITES=	http://www.darwinsys.com/freeware/
 
-LIB_DEPENDS=    ::x11/xview/lib
-BUILD_DEPENDS=	::x11/xview/config
+LIB_DEPENDS=    x11/xview/lib
+BUILD_DEPENDS=	x11/xview/config
 
 CONFIGURE_STYLE=imake
 
diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
index 5823af76d10..75f6ac2c6d1 100644
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/10/24 21:16:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/15 23:22:07 espie Exp $
 
 COMMENT =		easy to use LaTeX and ConTeXt editor
 
@@ -20,11 +20,10 @@ WANTLIB +=		QtDBus QtGui QtXml c dbus-1 hunspell-1.2 m poppler \
 MASTER_SITES =		http://texworks.googlecode.com/files/
 
 MODULES =		x11/qt4
-LIB_DEPENDS =		::textproc/hunspell \
-			::x11/dbus \
-			::print/poppler,-qt4 \
-			::x11/qt4
-RUN_DEPENDS = 		:texlive_base-*:print/texlive/base
+LIB_DEPENDS =		textproc/hunspell \
+			x11/dbus \
+			print/poppler,-qt4
+RUN_DEPENDS = 		print/texlive/base
 
 USE_GMAKE =		Yes
 
diff --git a/editors/vim-spell/Makefile b/editors/vim-spell/Makefile
index 664b2fd9e3b..7b60bd2918e 100644
--- a/editors/vim-spell/Makefile
+++ b/editors/vim-spell/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2010/09/22 18:24:10 stsp Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/15 23:22:07 espie Exp $
 
 LANGS = 	af am bg ca cs cy da de el eo es fo fr ga gd gl he hr hu \
 		id it ku la lt lv mg mi ms nb nl nn ny pl pt ro ru rw sk \
@@ -203,7 +203,7 @@ PLIST = 	${PKGDIR}/PLIST-$l
 .endfor
 
 NO_BUILD = 	Yes
-RUN_DEPENDS = 	::editors/vim
+RUN_DEPENDS = 	editors/vim
 
 SUBST_VARS = 	LANG_NAME P
 
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 1b3fe0cab86..2ef9fdc9858 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.117 2010/11/07 18:50:57 espie Exp $
+# $OpenBSD: Makefile,v 1.118 2010/11/15 23:22:07 espie Exp $
 
 COMMENT-main=	vi clone, many additional features
 COMMENT-lang=	vi clone, NLS subpackage
@@ -101,20 +101,20 @@ WANTLIB+=	ICE SM X11 Xaw Xext Xmu Xpm Xt pthread-stubs xcb
 		!${FLAVOR:L:Mmotif} && !${FLAVOR:L:Mno_x11} && !${FLAVOR:L:Mathena}
 MAKE_FLAGS+=	'LDFLAGS=-pthread'
 MAKE_FLAGS+=	'CFLAGS=-pthread'
-LIB_DEPENDS+=	::x11/gtk+2
+LIB_DEPENDS+=	x11/gtk+2
 CONFIGURE_ARGS+=--enable-gui="gtk2" --with-x --enable-fontset --enable-xim --disable-gtk-check --enable-gtk2-check
 WANTLIB+=	ICE SM X11 Xext Xrender Xt fontconfig freetype m z\
 	 	atk-1.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 png expat\
 		pango-1.0 pangoft2-1.0 pangocairo-1.0 cairo pthread\
 		Xau Xcomposite Xcursor Xdamage Xfixes Xi Xinerama \
 		Xrandr pixman-1 pthread-stubs xcb gthread-2.0 xcb-render \
-		xcb-render-util gdk_pixbuf-2.0 gdk-x11-2.0.>=0.11 \
-		gtk-x11-2.0.>=0.11
+		xcb-render-util gdk_pixbuf-2.0 gdk-x11-2.0>=0.11 \
+		gtk-x11-2.0>=0.11
 .else
 ERRORS=		"Fatal: You must select one GUI interface: no_x11, gtk2, athena or motif"
 .endif
 
-RUN_DEPENDS-lang=	::${BUILD_PKGPATH}
+RUN_DEPENDS-lang=	${BUILD_PKGPATH}
 PKG_ARCH-lang=		*
 LIB_DEPENDS-lang=
 WANTLIB-lang=
diff --git a/editors/xemacs21/stable/Makefile b/editors/xemacs21/stable/Makefile
index 1aa5e621629..08ac7bd3df6 100644
--- a/editors/xemacs21/stable/Makefile
+++ b/editors/xemacs21/stable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2010/11/07 18:50:57 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2010/11/15 23:22:07 espie Exp $
 
 BRANCH=		21.4
 VERSION=	19
@@ -49,10 +49,10 @@ CONFIGURE_ARGS+=--with-menubars=lucid \
 		--with-tiff \
 		--site-includes="${LOCALBASE}/include/libpng"
 
-LIB_DEPENDS+=	::graphics/jpeg \
-		::graphics/png \
-		::graphics/tiff
-WANTLIB +=	jpeg.>=62 png.>=2 tiff.>=35
+LIB_DEPENDS+=	graphics/jpeg \
+		graphics/png \
+		graphics/tiff
+WANTLIB +=	jpeg>=62 png>=2 tiff>=35
 
 . if ${FLAVOR:L:Mmule}
 CONFIGURE_ARGS+=--with-xim=xlib
@@ -64,15 +64,15 @@ MODULES=	devel/gettext
 CONFIGURE_ARGS+=--with-mule
 
 . if ${FLAVOR:L:Mcanna}
-LIB_DEPENDS+=	::japanese/canna
+LIB_DEPENDS+=	japanese/canna
 CONFIGURE_ARGS+=--with-canna
-WANTLIB +=	canna.>=1 RKC.>=1
+WANTLIB +=	canna>=1 RKC>=1
 . else
 CONFIGURE_ARGS+=--with-canna=no
 . endif
 
 . if ${FLAVOR:L:Mwnn}
-BUILD_DEPENDS+= ::japanese/Wnn
+BUILD_DEPENDS+= japanese/Wnn
 CONFIGURE_ARGS+=--with-wnn
 . else
 CONFIGURE_ARGS+=--with-wnn=no
diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index 71198fe8339..3f35040e616 100644
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2010/10/18 18:00:16 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=		lightweight Emacs clone
 DISTNAME=		zile-2.3.18
@@ -16,6 +16,6 @@ MASTER_SITES=		${MASTER_SITE_GNU:=zile/}
 WANTLIB=		c ncurses
 
 CONFIGURE_STYLE=	gnu
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 .include <bsd.port.mk>
diff --git a/education/algotutor/Makefile b/education/algotutor/Makefile
index 037670cb585..9af849d0116 100644
--- a/education/algotutor/Makefile
+++ b/education/algotutor/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/10/18 18:00:16 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=	interactive tutorial for algorithms and data structures
 
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	http://people.ofset.org/~ckhung/dl/
 EXTRACT_SUFX=	.tgz
 
-RUN_DEPENDS=	:p5-Tk-*:x11/p5-Tk
+RUN_DEPENDS=	x11/p5-Tk
 
 USE_GROFF =	Yes
 NO_BUILD=	Yes
diff --git a/education/drgeo/Makefile b/education/drgeo/Makefile
index 2c4b853c211..aa249bdfb2d 100644
--- a/education/drgeo/Makefile
+++ b/education/drgeo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2010/10/24 21:17:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.29 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=	interactive geometry program
 
@@ -26,9 +26,9 @@ WANTLIB += png pthread pthread-stubs stdc++ xcb xml2 z glade-2.0
 MODULES=	devel/gettext \
 		textproc/intltool
 
-RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS=	::devel/libglade2 \
-		::lang/guile
+RUN_DEPENDS=	devel/desktop-file-utils
+LIB_DEPENDS=	devel/libglade2 \
+		lang/guile
 
 USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
diff --git a/education/epte/Makefile b/education/epte/Makefile
index 4ca400904a9..5013ff68f87 100644
--- a/education/epte/Makefile
+++ b/education/epte/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2010/10/18 18:00:16 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=		electronic periodic table of the elements
 
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WRKDIST=		${WRKDIR}/epte
 MAKE_FILE=		makefile
 ALL_TARGET=		epte
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 MASTER_SITES=		${HOMEPAGE}
 
diff --git a/education/gamgi/Makefile b/education/gamgi/Makefile
index 8f73ae1dee0..b1bdbfcb3d1 100755
--- a/education/gamgi/Makefile
+++ b/education/gamgi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/10/24 21:17:05 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=		General Atomistic Modelling Graphic Interface
 
@@ -26,8 +26,8 @@ WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pthread
 WANTLIB += gdkglext-x11-1.0 gtkglext-x11-1.0
 
-LIB_DEPENDS=		::x11/gtkglext
-RUN_DEPENDS=		::graphics/netpbm
+LIB_DEPENDS=		x11/gtkglext
+RUN_DEPENDS=		graphics/netpbm
 
 WRKDIST=		${WRKDIR}/gamgi${V}/
 WRKSRC= 		${WRKDIST}/src/
diff --git a/education/verbiste/Makefile b/education/verbiste/Makefile
index fa5ce24f53e..5fc21c23446 100644
--- a/education/verbiste/Makefile
+++ b/education/verbiste/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/10/18 18:00:16 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/15 23:22:07 espie Exp $
 
 COMMENT=	French and Italian conjugation system
 
@@ -20,9 +20,9 @@ MASTER_SITES=	http://sarrazip.com/dev/
 
 MODULES=	devel/gettext
 
-BUILD_DEPENDS=	::textproc/p5-XML-Parser
-LIB_DEPENDS=	::x11/gtk+2 \
-		::textproc/libxml
+BUILD_DEPENDS=	textproc/p5-XML-Parser
+LIB_DEPENDS=	x11/gtk+2 \
+		textproc/libxml
 
 WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index 3848f49a05b..69c98e4ff51 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/10/24 21:17:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2010/11/15 23:22:07 espie Exp $
 # $RuOBSD: Makefile,v 1.4 2002/04/29 11:07:18 grange Exp $
 # $NetBSD: Makefile,v 1.1.1.1 2001/12/29 00:22:02 abs Exp $
 
@@ -30,11 +30,11 @@ WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 m pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread pthread-stubs
 WANTLIB += sndio stdc++ xcb z gdk_pixbuf-2.0 esd gdk-x11-2.0 gtk-x11-2.0
 
-LIB_DEPENDS=		::audio/esound \
-			::x11/gtk+2
+LIB_DEPENDS=		audio/esound \
+			x11/gtk+2
 
 USE_GMAKE=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 AUTOCONF_VERSION=	2.59
 CONFIGURE_STYLE=	autoconf
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index 85edb736624..be1f0670e84 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/10/24 21:17:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=	x86 with DOS emulator targeted at playing games
 DISTNAME=	dosbox-0.74
@@ -18,9 +18,9 @@ PERMIT_DISTFILES_FTP=   Yes
 
 WANTLIB=		SDL SDL_net SDL_sound png X11 c m pthread z
 
-LIB_DEPENDS=	::devel/sdl-net \
-		::devel/sdl-sound \
-		::graphics/png
+LIB_DEPENDS=	devel/sdl-net \
+		devel/sdl-sound \
+		graphics/png
 
 USE_GROFF =	Yes
 NO_REGRESS=	Yes
diff --git a/emulators/dynagen/Makefile b/emulators/dynagen/Makefile
index 54320518964..975f5f95a14 100644
--- a/emulators/dynagen/Makefile
+++ b/emulators/dynagen/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2010/08/30 17:11:35 fgsch Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=		front-end for dynamips cisco emulator
 
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=dyna-gen/}
 
 MODULES=		lang/python
-RUN_DEPENDS=		::emulators/dynamips
+RUN_DEPENDS=		emulators/dynamips
 
 NO_BUILD=		Yes
 NO_REGRESS=		Yes
diff --git a/emulators/dynamips/Makefile b/emulators/dynamips/Makefile
index 1d11f1f4ad2..fa1a55cfedf 100644
--- a/emulators/dynamips/Makefile
+++ b/emulators/dynamips/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/23 22:01:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=		cisco 3600/7200 platform emulator
 
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-LIB_DEPENDS=		::devel/libelf
+LIB_DEPENDS=		devel/libelf
 WANTLIB=		c elf pcap pthread
 
 MAKE_ENV=		DYNAMIPS_ARCH=${DYNAMIPS_ARCH}
diff --git a/emulators/fedora/Makefile.inc b/emulators/fedora/Makefile.inc
index b4138aac852..a8b23b0be7f 100644
--- a/emulators/fedora/Makefile.inc
+++ b/emulators/fedora/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 2010/06/07 08:41:38 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2010/11/15 23:22:08 espie Exp $
 
 ONLY_FOR_ARCHS=	i386
 SHARED_ONLY=	Yes
@@ -16,7 +16,7 @@ MASTER_SITE_FEDORA=http://archive.fedoraproject.org/pub/archive/fedora/linux/cor
 DIST_SUBDIR=	rpm
 EXTRACT_ONLY=
 
-BUILD_DEPENDS+=	:rpm-*|rpm2cpio-*:converters/rpm2cpio
+BUILD_DEPENDS+=	rpm-*|rpm2cpio-*:converters/rpm2cpio
 
 NO_BUILD=	Yes
 NO_REGRESS=	Yes
diff --git a/emulators/fedora/cups/Makefile b/emulators/fedora/cups/Makefile
index bdaaf3802f9..1a1d120f2fb 100644
--- a/emulators/fedora/cups/Makefile
+++ b/emulators/fedora/cups/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2010/11/09 13:23:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.2 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=	Linux CUPS package based on Fedora Core 4
 
@@ -15,7 +15,7 @@ SHARED_LIBS=	com_err	2.1 \
 MASTER_SITES=	${MASTER_SITE_FEDORA:=4/i386/os/Fedora/RPMS/}
 MASTER_SITES0=	${MASTER_SITE_FEDORA:=updates/4/i386/}
 
-RUN_DEPENDS=	::emulators/fedora/base
+RUN_DEPENDS=	emulators/fedora/base
 
 DISTFILES=	${RPMS}
 
diff --git a/emulators/fedora/motif/Makefile b/emulators/fedora/motif/Makefile
index cc76206da41..8d3923fd130 100644
--- a/emulators/fedora/motif/Makefile
+++ b/emulators/fedora/motif/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2010/10/23 22:01:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=	Motif toolkit Linux libraries
 
@@ -13,7 +13,7 @@ SHARED_LIBS=	Mrm	2.1 \
 DISTFILES=	openmotif21-2.1.30-14.i386.rpm
 MASTER_SITES=	${MASTER_SITE_FEDORA:=4/i386/os/Fedora/RPMS/}
 
-RUN_DEPENDS=	::emulators/fedora/base
+RUN_DEPENDS=	emulators/fedora/base
 
 EXTRACT_FILES=	./usr/X11R6/lib/libMrm.so.2.1 \
 		./usr/X11R6/lib/libUil.so.2.1 \
diff --git a/emulators/frodo/Makefile b/emulators/frodo/Makefile
index 2eea0c3e28d..5ee67f68424 100644
--- a/emulators/frodo/Makefile
+++ b/emulators/frodo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/10/24 21:17:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=	Commodore 64 emulator
 
@@ -23,8 +23,8 @@ WANTLIB=		SDL c m pthread sndio stdc++
 
 CONFIGURE_STYLE=	gnu
 
-RUN_DEPENDS=	::x11/tk/8.4
-LIB_DEPENDS=	:sdl-*-!no_x11:devel/sdl
+RUN_DEPENDS=	x11/tk/8.4
+LIB_DEPENDS=	sdl-*-!no_x11:devel/sdl
 
 WISH=wish8.4
 FRODOLIBDIR=${PREFIX}/lib/frodo
diff --git a/emulators/fuse-utils/Makefile b/emulators/fuse-utils/Makefile
index ff1b8c6675c..563de853424 100644
--- a/emulators/fuse-utils/Makefile
+++ b/emulators/fuse-utils/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/07 18:50:57 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=		Free Unix Spectrum Emulator utilities
 
@@ -19,8 +19,8 @@ WANTLIB=		c m stdc++ z gcrypt bz2 glib-2.0 gpg-error pcre \
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
 
-LIB_DEPENDS=		::devel/libspectrum
-WANTLIB +=		spectrum.>=5
+LIB_DEPENDS=		devel/libspectrum
+WANTLIB +=		spectrum>=5
 
 CONFIGURE_STYLE=	gnu
 USE_LIBTOOL=		Yes
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index 009095d713f..5582e4623c1 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/10/24 21:17:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=		Free Unix Spectrum Emulator
 DISTNAME=		fuse-0.10.0.2
@@ -21,12 +21,12 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fuse-emulator/}
 USE_GROFF=		Yes
 
 MODULES=		devel/gettext
-LIB_DEPENDS=		::devel/glib2 \
-			::audio/libsamplerate \
-			::devel/libspectrum \
-			::graphics/png \
-			::textproc/libxml \
-			::audio/libao
+LIB_DEPENDS=		devel/glib2 \
+			audio/libsamplerate \
+			devel/libspectrum \
+			graphics/png \
+			textproc/libxml \
+			audio/libao
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include/libpng" \
@@ -38,13 +38,14 @@ FLAVORS=gtk
 FLAVOR?=
 
 .if ${FLAVOR:L:Mgtk}
-LIB_DEPENDS+=		gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
-			gio-2.0,gmodule-2.0,gobject-2.0::devel/glib2
+LIB_DEPENDS+=		x11/gtk+2 \
+			devel/glib2
 CONFIGURE_ARGS+=	--with-gtk2
 WANTLIB+=		Xcomposite Xcursor Xdamage Xfixes Xi Xinerama Xrandr \
 			Xrender atk-1.0 cairo expat fontconfig freetype \
 			pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 \
-			gdk_pixbuf-2.0
+			gdk_pixbuf-2.0 gdk-x11-2.0 gtk-x11-2.0 gio-2.0 \
+			gmodule-2.0 gobject-2.0
 .else
 CONFIGURE_ARGS+=	--without-gtk
 WANTLIB+=		ICE SM
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index 96619644dbd..eef2933b22d 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/10/24 21:17:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=	Sega Genesis emulator
 
@@ -18,9 +18,9 @@ PERMIT_PACKAGE_CDROM=	can't sell
 PERMIT_PACKAGE_FTP=	Yes
 WANTLIB=	c m pthread z bz2 SDL jpeg
 
-LIB_DEPENDS+=	::archivers/bzip2 \
-		::devel/sdl \
-		::graphics/jpeg
+LIB_DEPENDS+=	archivers/bzip2 \
+		devel/sdl \
+		graphics/jpeg
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+=--with-sdl --with-sdl-audio --without-gcc
@@ -28,7 +28,7 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS+=	::devel/nasm
+BUILD_DEPENDS+=	devel/nasm
 CONFIGURE_ARGS+=--with-raze
 .else
 CONFIGURE_ARGS+=--with-cmz80
diff --git a/emulators/gns3/Makefile b/emulators/gns3/Makefile
index a7e34a86edf..83aba50e04c 100644
--- a/emulators/gns3/Makefile
+++ b/emulators/gns3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/10/24 21:17:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=	graphical network simulator
 
@@ -21,8 +21,8 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gns-3/}
 
 MODULES=	lang/python
-RUN_DEPENDS=	::x11/py-qt4 \
-		::emulators/dynamips
+RUN_DEPENDS=	x11/py-qt4 \
+		emulators/dynamips
 
 NO_REGRESS=	Yes
 PKG_ARCH=	*
diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile
index 84215a826c5..2a554be083c 100644
--- a/emulators/gxemul/Makefile
+++ b/emulators/gxemul/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2010/10/24 21:17:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=		ARM/M88k/MIPS/PowerPC/SuperH machines emulator
 
@@ -20,7 +20,7 @@ MASTER_SITES=		${HOMEPAGE}/src/
 WANTLIB=		c m
 
 CONFIGURE_STYLE=	simple
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 FLAVORS=		no_x11
 FLAVOR?=
diff --git a/emulators/ines/Makefile b/emulators/ines/Makefile
index 9bba01fd062..ce2349d6d3c 100644
--- a/emulators/ines/Makefile
+++ b/emulators/ines/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/10/24 21:17:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/15 23:22:08 espie Exp $
 
 ONLY_FOR_ARCHS=	i386
 
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tar.Z
 
-RUN_DEPENDS=	::emulators/fedora/base
+RUN_DEPENDS=	emulators/fedora/base
 
 NO_BUILD=	Yes
 NO_REGRESS=	Yes
diff --git a/emulators/kqemu/Makefile b/emulators/kqemu/Makefile
index 5be4a8c4630..d4184c7606f 100644
--- a/emulators/kqemu/Makefile
+++ b/emulators/kqemu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/10/23 22:01:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/15 23:22:08 espie Exp $
 
 ONLY_FOR_ARCHS=	amd64 i386
 
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${HOMEPAGE}
 
-BUILD_DEPENDS=		::devel/gmake
+BUILD_DEPENDS=		devel/gmake
 
 CONFIGURE_STYLE=	simple
 CONFIGURE_ARGS=		--prefix=${PREFIX} \
diff --git a/emulators/mastergear/Makefile b/emulators/mastergear/Makefile
index 74d61064ad7..b0911e248a7 100644
--- a/emulators/mastergear/Makefile
+++ b/emulators/mastergear/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/10/24 21:17:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/15 23:22:08 espie Exp $
 
 ONLY_FOR_ARCHS=	i386
 
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tar.Z
 
-RUN_DEPENDS=	::emulators/fedora/base
+RUN_DEPENDS=	emulators/fedora/base
 
 NO_BUILD=	Yes
 NO_REGRESS=	Yes
diff --git a/emulators/qemu-old/Makefile b/emulators/qemu-old/Makefile
index e9ac9f6a71a..fe760bbbd1e 100644
--- a/emulators/qemu-old/Makefile
+++ b/emulators/qemu-old/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/11/12 14:43:13 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/15 23:22:08 espie Exp $
 
 # no success building on other archs yet
 ONLY_FOR_ARCHS=		amd64 i386 powerpc
@@ -25,9 +25,9 @@ MASTER_SITES=		${MASTER_SITE_OPENBSD}
 MODULES=	gcc3
 MODGCC3_ARCHES=	${GCC4_ARCHS}
 
-BUILD_DEPENDS=		::textproc/texi2html
+BUILD_DEPENDS=		textproc/texi2html
 USE_GMAKE=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 WANTLIB=		c m ossaudio z
 CONFIGURE_STYLE=	simple
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
@@ -47,7 +47,7 @@ FLAVOR?=
 CONFIGURE_ARGS+=	--disable-gfx-check \
 			--disable-sdl
 .else
-LIB_DEPENDS=    	::devel/sdl
+LIB_DEPENDS=    	devel/sdl
 
 WANTLIB+=		pthread SDL
 .endif
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 061f55d64e2..7a96dac7c68 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2010/11/12 14:43:12 jasper Exp $
+# $OpenBSD: Makefile,v 1.58 2010/11/15 23:22:08 espie Exp $
 
 # no success building on other archs yet
 ONLY_FOR_ARCHS =	i386 amd64 sparc64
@@ -21,7 +21,7 @@ WANTLIB =		c m ossaudio pthread util z
 
 MASTER_SITES =		${MASTER_SITE_SAVANNAH:=qemu/}
 
-BUILD_DEPENDS =		::textproc/texi2html
+BUILD_DEPENDS =		textproc/texi2html
 
 USE_GMAKE =		Yes
 USE_GROFF =	Yes
@@ -41,7 +41,7 @@ FLAVOR ?=
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS +=	--disable-sdl
 .else
-LIB_DEPENDS =    	::devel/sdl
+LIB_DEPENDS =    	devel/sdl
 
 WANTLIB +=		SDL X11
 .endif
diff --git a/emulators/redhat/Makefile.inc b/emulators/redhat/Makefile.inc
index c48e003c04a..a06295baaac 100644
--- a/emulators/redhat/Makefile.inc
+++ b/emulators/redhat/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.15 2010/06/07 08:48:45 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.16 2010/11/15 23:22:08 espie Exp $
 
 ONLY_FOR_ARCHS=	i386
 
@@ -15,7 +15,7 @@ MASTER_SITE_REDHAT=ftp://archive.download.redhat.com/pub/ \
 DIST_SUBDIR=	rpm
 EXTRACT_ONLY=
 
-BUILD_DEPENDS+=	:rpm2cpio-*|rpm-*:converters/rpm2cpio
+BUILD_DEPENDS+=	rpm2cpio-*|rpm-*:converters/rpm2cpio
 
 NO_BUILD=	Yes
 
diff --git a/emulators/redhat/libc5/Makefile b/emulators/redhat/libc5/Makefile
index bdb8c337b6d..20f750a902d 100644
--- a/emulators/redhat/libc5/Makefile
+++ b/emulators/redhat/libc5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/10/23 22:01:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=	Linux libc5
 
@@ -15,7 +15,7 @@ RPMDIR=		${FULLDISTDIR}
 RPMS=		libc-5.3.12-31.i386.rpm \
 		ld.so-1.9.5-13.i386.rpm 
 
-RUN_DEPENDS=	::emulators/fedora/base
+RUN_DEPENDS=	emulators/fedora/base
 
 NO_BUILD=	Yes
 NO_REGRESS=	Yes
diff --git a/emulators/sdlmame/Makefile b/emulators/sdlmame/Makefile
index 734cd85fd5c..e860f980394 100644
--- a/emulators/sdlmame/Makefile
+++ b/emulators/sdlmame/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/10/24 21:17:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/15 23:22:08 espie Exp $
 
 # Other archs have not been tested
 ONLY_FOR_ARCHS =	amd64 i386
@@ -42,10 +42,10 @@ MASTER_SITES0 = 	http://www.arcade-history.com/dats/
 DISTFILES+=		${DISTNAME}${EXTRACT_SUFX} \
 			mamehistory137.zip:0
 
-BUILD_DEPENDS = 	::archivers/unzip
-LIB_DEPENDS =		::devel/sdl \
-			::devel/gconf2
-RUN_DEPENDS-main =	:${PKGNAME-tools}:emulators/sdlmame,-tools
+BUILD_DEPENDS = 	archivers/unzip
+LIB_DEPENDS =		devel/sdl \
+			devel/gconf2
+RUN_DEPENDS-main =	${PKGNAME-tools}:emulators/sdlmame,-tools
 
 USE_GMAKE =		Yes
 
diff --git a/emulators/sdlmess/Makefile b/emulators/sdlmess/Makefile
index 73234ff6053..663f049efff 100644
--- a/emulators/sdlmess/Makefile
+++ b/emulators/sdlmess/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/11/07 18:50:57 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2010/11/15 23:22:08 espie Exp $
 
 # Other archs have not been tested
 ONLY_FOR_ARCHS =	amd64 i386
@@ -28,13 +28,13 @@ WANTLIB +=	expat fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB +=	gobject-2.0 gthread-2.0 iconv intl m pango-1.0 pangocairo-1.0
 WANTLIB +=	pangoft2-1.0 pixman-1 png pthread pthread-stubs xcb z
 WANTLIB +=	xcb-render xcb-render-util gdk_pixbuf-2.0 SDL
-WANTLIB +=	gdk-x11-2.0 gtk-x11-2.0 gconf-2.>=5
+WANTLIB +=	gdk-x11-2.0 gtk-x11-2.0 gconf-2>=5
 
 MASTER_SITES =		http://rbelmont.mameworld.info/
 EXTRACT_SUFX =		.zip
 
-LIB_DEPENDS =		::devel/sdl ::devel/gconf2 ::x11/gtk+2
-RUN_DEPENDS =		:sdlmame-tools-${V}:emulators/sdlmame,-tools
+LIB_DEPENDS =		devel/sdl devel/gconf2 x11/gtk+2
+RUN_DEPENDS =		sdlmame-tools-${V}:emulators/sdlmame,-tools
 
 USE_GMAKE =		Yes
 
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 02b48eb765c..8319ff4dd8b 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/10/24 21:17:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/15 23:22:08 espie Exp $
 
 COMMENT =	emulates the Super Nintendo Entertainment System
 
@@ -27,16 +27,16 @@ WANTLIB =	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 MASTER_SITES =	http://sites.google.com/site/bearoso/snes9x/
 EXTRACT_SUFX =	.tar.bz2
 
-BUILD_DEPENDS =	::textproc/intltool
-RUN_DEPENDS =	:desktop-file-utils-*:devel/desktop-file-utils
-LIB_DEPENDS =	::devel/libglade2 \
-		::devel/sdl \
-		::graphics/png \
-		::textproc/libxml \
-		::x11/gtk+2 
+BUILD_DEPENDS =	textproc/intltool
+RUN_DEPENDS =	devel/desktop-file-utils
+LIB_DEPENDS =	devel/libglade2 \
+		devel/sdl \
+		graphics/png \
+		textproc/libxml \
+		x11/gtk+2 
 
 .if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS =  ::devel/nasm 
+BUILD_DEPENDS =  devel/nasm 
 .endif
 
 MODULES =	devel/gettext
diff --git a/emulators/spectemu/Makefile b/emulators/spectemu/Makefile
index ef3503cfe02..6ddc27b3de2 100644
--- a/emulators/spectemu/Makefile
+++ b/emulators/spectemu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/10/24 21:17:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=		ZX Spectrum 48k emulator
 
@@ -18,7 +18,7 @@ WANTLIB=		X11 Xext c pthread-stubs readline termcap xcb
 
 MASTER_SITES=		${HOMEPAGE}
 
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 CONFIGURE_STYLE=	gnu
 
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index fe7c31a5d88..68fbe513137 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2010/10/24 21:17:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=	MIPS R2000/R3000 simulator
 
@@ -21,7 +21,7 @@ WANTLIB=	ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c m \
 
 MASTER_SITES=	http://www.cs.wisc.edu/~larus/SPIM/
 
-BUILD_DEPENDS=	:bison-*:devel/bison
+BUILD_DEPENDS=	devel/bison
 
 XMKMF=		xmkmf
 
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index b8f96fa0fc5..cb014152320 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/10/24 21:17:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/15 23:22:08 espie Exp $
 
 COMMENT =		Atari 2600 VCS emulator
 
@@ -16,12 +16,12 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =		c stdc++ m z pthread SDL.>=1.2 png
+WANTLIB =		c stdc++ m z pthread SDL>=1.2 png
 
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=stella/}
 
-LIB_DEPENDS =		::devel/sdl \
-			::graphics/png
+LIB_DEPENDS =		devel/sdl \
+			graphics/png
 
 CXXFLAGS +=		-I${LOCALBASE}/include/libpng \
 			-I${X11BASE}/include \
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 43cebc6fabd..df812305a88 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/10/24 21:17:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=	UAE amiga emulator
 DISTNAME=	uae-0.8.25
@@ -23,8 +23,8 @@ WANTLIB=	ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama \
 MASTER_SITES=	ftp://ftp.coresystems.de/pub/uae/sources/develop/
 
 MODULES=	devel/gettext
-LIB_DEPENDS+=	::x11/gtk+2 \
-		::devel/sdl
+LIB_DEPENDS+=	x11/gtk+2 \
+		devel/sdl
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--enable-dga --enable-vidmode \
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index ab1b2fb7c63..06f41386765 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/11/04 17:57:21 jasper Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/15 23:22:08 espie Exp $
 
 COMMENT=		Gameboy Advance emulator
 
@@ -38,10 +38,10 @@ MODULES+=		devel/gettext
 USE_LIBTOOL=		Yes
 USE_GMAKE=		Yes
 
-LIB_DEPENDS=		::devel/libglademm \
-			::devel/sdl \
-			::graphics/cairo \
-			::graphics/png
+LIB_DEPENDS=		devel/libglademm \
+			devel/sdl \
+			graphics/cairo \
+			graphics/png
 
 CONFIGURE_STYLE=	autoconf
 AUTOCONF_VERSION=	2.59
@@ -54,7 +54,7 @@ CONFIGURE_ARGS= 	--disable-profiling \
 			--enable-gtk=2.4
 
 .if ${MACHINE_ARCH} == "i386"
-BUILD_DEPENDS+= 	::devel/nasm
+BUILD_DEPENDS+= 	devel/nasm
 CONFIGURE_ARGS+=	--enable-c-core
 .endif
 
diff --git a/emulators/vgb/Makefile b/emulators/vgb/Makefile
index e3eb9e920c0..c6e7cb8e986 100644
--- a/emulators/vgb/Makefile
+++ b/emulators/vgb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/10/24 21:17:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/15 23:22:08 espie Exp $
 
 ONLY_FOR_ARCHS=	i386
 
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=	${HOMEPAGE}
 EXTRACT_SUFX=	.tar.Z
 
-RUN_DEPENDS=	::emulators/fedora/base
+RUN_DEPENDS=	emulators/fedora/base
 
 NO_BUILD=	Yes
 NO_REGRESS=	Yes
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index d4f30e1d5dd..aa7a4ac15c0 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2010/10/24 21:17:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.44 2010/11/15 23:22:08 espie Exp $
 
 
 # XXX  This port is not finished and does not work.
@@ -36,19 +36,19 @@ MASTER_SITES =		http://ibiblio.org/pub/linux/system/emulators/wine/ \
 			http://prdownloads.sourceforge.net/wine/
 EXTRACT_SUFX =		.tar.bz2
 
-BUILD_DEPENDS =		:bison-*:devel/bison
-LIB_DEPENDS =		::textproc/libxslt \
-			::graphics/jpeg \
-			::graphics/png \
-			::graphics/libgphoto2 \
-			::graphics/sane-backends \
-			::graphics/lcms \
-			::converters/libiconv
-RUN_DEPENDS =		::devel/desktop-file-utils
+BUILD_DEPENDS =		devel/bison
+LIB_DEPENDS =		textproc/libxslt \
+			graphics/jpeg \
+			graphics/png \
+			graphics/libgphoto2 \
+			graphics/sane-backends \
+			graphics/lcms \
+			converters/libiconv
+RUN_DEPENDS =		devel/desktop-file-utils
 
 USE_GMAKE =		Yes
 USE_LIBTOOL =		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 CONFIGURE_STYLE =	gnu autoconf
 
 CPPFLAGS =		-I${LOCALBASE}/include \
@@ -92,7 +92,8 @@ CONFIGURE_ARGS +=	--without-cups
 .endif
 .if ${FLAVOR:L:Mesd}
 CONFIGURE_ARGS +=	--with-esd
-LIB_DEPENDS =		esd.>=2::sound/esound
+LIB_DEPENDS =		sound/esound
+WANTLIB +=		esd>=2
 .else
 CONFIGURE_ARGS +=	--without-esd
 .endif
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 5229f7436aa..80c5a74252f 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/10/24 21:17:49 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.22 2010/11/15 23:22:08 espie Exp $
 
 ONLY_FOR_ARCHS=		i386
 
@@ -23,10 +23,10 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=		GL SDL c m png pthread stdc++ z
 
-BUILD_DEPENDS=		::devel/nasm \
+BUILD_DEPENDS=		devel/nasm \
 			${MODGNU_AUTOMAKE_DEPENDS}
-LIB_DEPENDS=		:sdl-*-!no_x11:devel/sdl \
-			::graphics/png
+LIB_DEPENDS=		sdl-*-!no_x11:devel/sdl \
+			graphics/png
 
 USE_GROFF=		Yes