diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile
index 3765d198a8f..ddc8d5f76dc 100644
--- a/news/hellanzb/Makefile
+++ b/news/hellanzb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/08/30 17:46:57 fgsch Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/20 09:48:38 espie Exp $
 
 COMMENT=		retrieve and process nzb-files
 
@@ -17,11 +17,11 @@ MASTER_SITES=		http://www.hellanzb.com/distfiles/
 
 MODULES=		lang/python
 
-RUN_DEPENDS=		::archivers/par2cmdline \
-			::archivers/unrar \
-			::devel/py-twisted/core \
-			::devel/py-twisted/web \
-			::news/py-yenc
+RUN_DEPENDS=		archivers/par2cmdline \
+			archivers/unrar \
+			devel/py-twisted/core \
+			devel/py-twisted/web \
+			news/py-yenc
 
 NO_REGRESS=		Yes
 
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index ef63308f0c2..05787440801 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.50 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.51 2010/11/20 09:48:38 espie Exp $
 
 COMMENT=		USENET software package designed for small sites
 
@@ -21,14 +21,14 @@ WANTLIB=		c pcre
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=leafnode/}
 EXTRACT_SUFX=		.tar.bz2
 
-LIB_DEPENDS=		::devel/pcre
+LIB_DEPENDS=		devel/pcre
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--with-lockfile=/var/spool/news/fetchnews.lck
 CONFIGURE_ARGS+=	--with-ipv6
 CONFIGURE_ARGS+=	--with-user=_news
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 DOCS=		README README-FQDN INSTALL FAQ.txt NEWS OLDNEWS
 
diff --git a/news/nn/Makefile b/news/nn/Makefile
index d4949d96a8e..d01e57dd956 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/20 09:48:38 espie Exp $
 
 NOT_FOR_ARCHS =		arm hppa hp300
 
@@ -22,7 +22,7 @@ MASTER_SITES =		ftp://ftp.nndev.org/pub/nn-6.7/ \
                         http://distfiles.nl/
 EXTRACT_SUFX =		.tar.Z
 
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 NO_REGRESS =		Yes
 
 .if "${MACHINE_ARCH}" == "alpha"
diff --git a/news/p5-Gateway/Makefile b/news/p5-Gateway/Makefile
index 826131be671..02757540c6a 100644
--- a/news/p5-Gateway/Makefile
+++ b/news/p5-Gateway/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2010/11/20 09:48:38 espie Exp $
 
 COMMENT=	perl module to gateway between news and mail
 
@@ -9,8 +9,8 @@ CATEGORIES=	news
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=News/}
 USE_GROFF =	Yes
 
-RUN_DEPENDS=	:p5-PGP-Sign-*:security/p5-PGP-Sign \
-		:p5-News-Article->=1.07:news/p5-News-Article
+RUN_DEPENDS=	security/p5-PGP-Sign \
+		news/p5-News-Article>=1.07
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 # Perl
diff --git a/news/p5-News-Article/Makefile b/news/p5-News-Article/Makefile
index b0bad7bb4f3..c3b006a47f6 100644
--- a/news/p5-News-Article/Makefile
+++ b/news/p5-News-Article/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2010/11/20 09:48:38 espie Exp $
 
 COMMENT=	perl module for accessing NNTP articles
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-RUN_DEPENDS=	:p5-PGP-Sign-*:security/p5-PGP-Sign
+RUN_DEPENDS=	security/p5-PGP-Sign
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/news/p5-News-Newsrc/Makefile b/news/p5-News-Newsrc/Makefile
index 5926b734dbe..fd3a9af6f66 100644
--- a/news/p5-News-Newsrc/Makefile
+++ b/news/p5-News-Newsrc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.14 2010/11/20 09:48:38 espie Exp $
 
 COMMENT=	module for managing newsrc files
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-RUN_DEPENDS=	::math/p5-Set-IntSpan
+RUN_DEPENDS=	math/p5-Set-IntSpan
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 .include <bsd.port.mk>
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 636279efc4a..5ef597973a1 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2010/10/24 21:30:46 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2010/11/20 09:48:38 espie Exp $
 
 COMMENT=	powerful Gtk+2 newsreader
 
@@ -30,10 +30,10 @@ MASTER_SITES=	http://pan.rebelbase.com/download/releases/${V}/source/
 MODULES=	devel/gettext \
 		textproc/intltool # regress target
 
-LIB_DEPENDS=	::x11/gtk+2 \
-		:gmime->=2.4,<2.6:mail/gmime24 \
-		::textproc/gtkspell
-RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS=	x11/gtk+2 \
+		gmime->=2.4,<2.6:mail/gmime24 \
+		textproc/gtkspell
+RUN_DEPENDS=	devel/desktop-file-utils
 
 VMEM_WARNING=	Yes
 
diff --git a/news/py-yenc/Makefile b/news/py-yenc/Makefile
index ce93667baf7..91a934d62da 100644
--- a/news/py-yenc/Makefile
+++ b/news/py-yenc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2010/08/30 17:46:57 fgsch Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/20 09:48:38 espie Exp $
 
 COMMENT=		yEnc encoding/decoding extension for Python
 
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MODULES=		lang/python
 
-REGRESS_DEPENDS=	::news/py-yenc
+REGRESS_DEPENDS=	news/py-yenc
 
 CFLAGS+=		-g -O2
 
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 45125f3ba93..bee70986ae2 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.48 2010/11/20 09:48:38 espie Exp $
 
 COMMENT=		SLang-based newsreader
 
@@ -20,9 +20,9 @@ WANTLIB=		c crypto m ssl termcap slang
 
 MAKE_ARGS+=		LDFLAGS="${LDFLAGS}"
 
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 NO_REGRESS=		Yes
-LIB_DEPENDS=		::devel/libslang
+LIB_DEPENDS=		devel/libslang
 MODULES=		devel/gettext
 
 CONFIGURE_STYLE=	gnu
diff --git a/news/tin/Makefile b/news/tin/Makefile
index adf9768203f..3ae60268522 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2010/11/20 09:48:38 espie Exp $
 
 COMMENT=	threaded NNTP- and spool-based UseNet newsreader
 
@@ -48,10 +48,10 @@ CONFIGURE_ARGS+=	--with-ispell=${LOCALBASE}/bin/ispell \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-LIB_DEPENDS+=	::devel/pcre \
-		::misc/libutf8 \
-		::devel/libidn \
-		::textproc/icu4c
+LIB_DEPENDS+=	devel/pcre \
+		misc/libutf8 \
+		devel/libidn \
+		textproc/icu4c
 
 ALL_TARGET=	build
 
diff --git a/news/ubh/Makefile b/news/ubh/Makefile
index ea5855a1779..52c6bd9a8b3 100644
--- a/news/ubh/Makefile
+++ b/news/ubh/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2007/09/15 21:41:50 merdely Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/20 09:48:38 espie Exp $
 
 COMMENT=	download and decode binaries posted to Usenet
 
@@ -16,9 +16,9 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${HOMEPAGE}/download/
 
-RUN_DEPENDS=	::mail/p5-MIME-tools \
-		::news/p5-News-Newsrc \
-		::devel/p5-String-CRC32
+RUN_DEPENDS=	mail/p5-MIME-tools \
+		news/p5-News-Newsrc \
+		devel/p5-String-CRC32
 
 NO_BUILD=	Yes
 NO_REGRESS=	Yes
diff --git a/palm/coldsync/Makefile b/palm/coldsync/Makefile
index 8a64690818c..fc3931966cf 100644
--- a/palm/coldsync/Makefile
+++ b/palm/coldsync/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/20 09:48:38 espie Exp $
 
 COMMENT=		tool for synchronizing PalmOS devices
 
@@ -20,7 +20,7 @@ WANTLIB=		c stdc++ m
 MODULES=		devel/gettext
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--without-usb --without-libusb
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 # DESTDIR bugs the fake process, so make sure it does not get set
 DESTDIRNAME=		none
diff --git a/palm/palm2ical/Makefile b/palm/palm2ical/Makefile
index 3d9bcddca42..cdfa2e69b75 100644
--- a/palm/palm2ical/Makefile
+++ b/palm/palm2ical/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2010/04/15 17:31:10 giovanni Exp $
+# $OpenBSD: Makefile,v 1.2 2010/11/20 09:48:38 espie Exp $
 
 COMMENT =	Palm Databook/Calendar export to iCalendar
 
@@ -22,10 +22,10 @@ WRKDIST =	${WRKDIR}
 NO_BUILD =	Yes
 PKG_ARCH =	*
 
-RUN_DEPENDS =	::palm/p5-Palm \
-		::devel/p5-Data-ICal \
-		::devel/p5-DateTime-Format-ICal \
-		::devel/p5-Data-ICal-TimeZone
+RUN_DEPENDS =	palm/p5-Palm \
+		devel/p5-Data-ICal \
+		devel/p5-DateTime-Format-ICal \
+		devel/p5-Data-ICal-TimeZone
 
 NO_REGRESS =	Yes
 
diff --git a/palm/pose/Makefile b/palm/pose/Makefile
index cc45b56d918..c7572a6a196 100644
--- a/palm/pose/Makefile
+++ b/palm/pose/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/10/24 21:31:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/20 09:48:38 espie Exp $
 
 ONLY_FOR_ARCHS=		i386
 COMMENT=		Palm OS Emulator
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-BUILD_DEPENDS=		::x11/fltk
+BUILD_DEPENDS=		x11/fltk
 
 MASTER_SITES=		http://www.palmos.com/dev/tools/emulator/sources/
 DISTFILES=		${DISTNAME:L}.tar.gz
diff --git a/plan9/9libs/Makefile b/plan9/9libs/Makefile
index 7ed3dc8a339..97cf8cd27e6 100644
--- a/plan9/9libs/Makefile
+++ b/plan9/9libs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/10/24 21:31:50 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/20 09:48:38 espie Exp $
 
 # varargs misuse, and unportable software
 ONLY_FOR_ARCHS= 	i386 sparc sparc64
@@ -32,7 +32,7 @@ MASTER_SITES=		${HOMEPAGE}
 SEPARATE_BUILD=		simple
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 CONFIGURE_STYLE=	gnu
 
 CONFIGURE_ARGS+=        ${CONFIGURE_SHARED} \
diff --git a/plan9/wily/Makefile b/plan9/wily/Makefile
index 07c46913f57..fb6c4954638 100644
--- a/plan9/wily/Makefile
+++ b/plan9/wily/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2010/10/24 21:31:50 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2010/11/20 09:48:38 espie Exp $
 
 COMMENT=	clone of the Plan9 editor 'acme'
 
@@ -20,10 +20,10 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		ICE SM X11 Xg Xt c frame m plan9c pthread-stubs xcb
 
-LIB_DEPENDS=		::plan9/9libs
+LIB_DEPENDS=		plan9/9libs
 
 SEPARATE_BUILD=		simple
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS=		--with-9libs=${LOCALBASE}/include/9libs
 CONFIGURE_ENV=		mhw_cv_mod_9libs_lib_path=${LOCALBASE}/lib
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index ea67ec93409..29245593845 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.47 2010/11/20 09:48:38 espie Exp $
 
 COMMENT=	format files for printing on PostScript printers
 
@@ -26,12 +26,12 @@ MASTER_SITES=	${MASTER_SITE_GNU:=a2ps/}
 MODULES=	devel/gettext
 
 USE_LIBTOOL=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 CONFIGURE_STYLE=	gnu
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/auxdir
 
-BUILD_DEPENDS=	::print/psutils \
-		::devel/gperf
+BUILD_DEPENDS=	print/psutils \
+		devel/gperf
 
 FLAVORS=	a4 a4dj letter letterdj
 FLAVOR?=	letter
@@ -39,18 +39,18 @@ FLAVOR?=	letter
 .if defined(FLAVOR)
 .if ${FLAVOR:L} == "a4"
 PAPERSIZE=	A4
-RUN_DEPENDS+=	:psutils-*-a4:print/psutils,a4
+RUN_DEPENDS+=	psutils-*-a4:print/psutils,a4
 .elif ${FLAVOR:L} == "a4dj"
 PAPERSIZE=	A4dj
-RUN_DEPENDS+=	:psutils-*-a4:print/psutils,a4
+RUN_DEPENDS+=	psutils-*-a4:print/psutils,a4
 .elif ${FLAVOR:L} == "letterdj"
 PAPERSIZE=	Letterdj
-RUN_DEPENDS+=	:psutils-*-letter:print/psutils,letter
+RUN_DEPENDS+=	psutils-*-letter:print/psutils,letter
 .elif ${FLAVOR:L} == "letter"
 PAPERSIZE=	Letter
-RUN_DEPENDS+=	:psutils-*-letter:print/psutils,letter
+RUN_DEPENDS+=	psutils-*-letter:print/psutils,letter
 .else
-RUN_DEPENDS+=	::print/psutils
+RUN_DEPENDS+=	print/psutils
 .endif
 .endif
 
diff --git a/print/acrofonts/Makefile b/print/acrofonts/Makefile
index 37e21f3213a..ab73da37b64 100644
--- a/print/acrofonts/Makefile
+++ b/print/acrofonts/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2008/10/10 13:45:02 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=		asian font pack for acroread
 
@@ -20,7 +20,7 @@ DISTFILES=		chsfont.tar.gz chtfont.tar.gz \
 
 DIST_SUBDIR=		acrofonts
 
-RUN_DEPENDS=		:acroread->=7:print/acroread
+RUN_DEPENDS=		print/acroread>=7
 
 NO_BUILD=		Yes
 
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index 6936cdc5dfb..636e5296d73 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2010/07/26 20:07:31 edd Exp $
+# $OpenBSD: Makefile,v 1.37 2010/11/20 09:48:39 espie Exp $
 
 ONLY_FOR_ARCHS=	i386
 SHARED_ONLY=	Yes
@@ -32,8 +32,8 @@ MULTI_PACKAGES=	-main -plugins
 
 MASTER_SITES=	http://ardownload.adobe.com/pub/adobe/reader/unix/7x/7.0.9/enu/
 
-RUN_DEPENDS=	::emulators/fedora/base \
-		:desktop-file-utils-*:devel/desktop-file-utils
+RUN_DEPENDS=	emulators/fedora/base \
+		devel/desktop-file-utils
 
 RUN_DEPENDS-plugins=	${RUN_DEPENDS} :${PKGNAME-main}:print/acroread
 
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index c597e1bf856..e19967c9d20 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=		filter to print a wide range of file formats
 
@@ -19,10 +19,10 @@ MASTER_SITES=		http://www.apsfilter.org/download/
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-shell=/bin/sh \
 			--with-awk=/usr/bin/awk
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
-RUN_DEPENDS=		::print/a2ps \
-			::print/psutils
+RUN_DEPENDS=		print/a2ps \
+			print/psutils
 
 WRKDIST=		${WRKDIR}/apsfilter/
 
diff --git a/print/apvlv/Makefile b/print/apvlv/Makefile
index cace07a5df2..99eb9c33cdc 100644
--- a/print/apvlv/Makefile
+++ b/print/apvlv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	lightweight PDF document viewer with vi bindings
 
@@ -17,18 +17,18 @@ PERMIT_DISTFILES_FTP=   Yes
 
 WANTLIB +=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi
 WANTLIB +=	Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
-WANTLIB +=	freetype gdk-x11-2.0.>=0.14 gdk_pixbuf-2.0.>=0.14 gio-2.0
+WANTLIB +=	freetype gdk-x11-2.0>=0.14 gdk_pixbuf-2.0>=0.14 gio-2.0
 WANTLIB +=	glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB +=	gtk-x11-2.0.>=0.14 iconv intl m pango-1.0 pangocairo-1.0
-WANTLIB +=	pangoft2-1.0 pixman-1 png poppler-glib.>=3 poppler.>=3
+WANTLIB +=	gtk-x11-2.0>=0.14 iconv intl m pango-1.0 pangocairo-1.0
+WANTLIB +=	pangoft2-1.0 pixman-1 png poppler-glib>=3 poppler>=3
 WANTLIB +=	pthread pthread-stubs stdc++ xcb xcb-render xcb-render-util z
 
-LIB_DEPENDS=	::x11/gtk+2 \
-		::print/poppler
+LIB_DEPENDS=	x11/gtk+2 \
+		print/poppler
 
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS+=	--without-djvu
 FAKE_FLAGS =		sysconfdir=${PREFIX}/share/examples/apvlv
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 .include <bsd.port.mk>
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 0904b75d179..453d34f56f2 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/07/26 20:07:31 edd Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	extensible emacs interface for TeX
 
@@ -20,9 +20,9 @@ MASTER_SITES=	${MASTER_SITE_GNU:=auctex/11.14/}
 
 FAKE_FLAGS=	lispdir=${DESTDIR}${PREFIX}/share/emacs/site-lisp
 
-RUN_DEPENDS=	:emacs->=21,<22:editors/emacs21 \
-		::print/texlive/base
-BUILD_DEPENDS=	:emacs->=21,<22:editors/emacs21
+RUN_DEPENDS=	emacs->=21,<22:editors/emacs21 \
+		print/texlive/base
+BUILD_DEPENDS=	emacs->=21,<22:editors/emacs21
 
 post-install:
 	@chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/emacs/site-lisp/auctex
diff --git a/print/cups-pdf/Makefile b/print/cups-pdf/Makefile
index e765fc92a22..6276d306429 100644
--- a/print/cups-pdf/Makefile
+++ b/print/cups-pdf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2009/09/08 14:02:45 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=		PDF backend for CUPS
 
@@ -17,10 +17,10 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=		c
 
-RUN_DEPENDS=		::print/cups \
-			::print/ghostscript/gnu \
-			::mail/p5-MIME-Lite \
-			::mail/p5-MIME-tools
+RUN_DEPENDS=		print/cups \
+			print/ghostscript/gnu \
+			mail/p5-MIME-Lite \
+			mail/p5-MIME-tools
 
 NO_REGRESS=		Yes
 
diff --git a/print/cups/Makefile b/print/cups/Makefile
index e4166ec6f51..f81dbf537aa 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.86 2010/11/12 07:09:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.87 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	Common Unix Printing System
 
@@ -26,8 +26,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += 	asn1 c crypto dbus-1.>=7 gssapi jpeg krb5 m png.>=3 pthread
-WANTLIB +=	ssl stdc++ tiff.>=35 z
+WANTLIB += 	asn1 c crypto dbus-1>=7 gssapi jpeg krb5 m png>=3 pthread
+WANTLIB +=	ssl stdc++ tiff>=35 z
 
 MASTER_SITES=	http://ftp.easysw.com/pub/cups/${VERSION}/ \
 		http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${VERSION}/ \
@@ -40,16 +40,16 @@ EXTRACT_SUFX=	.tar.bz2
 
 WRKDIST=	${WRKDIR}/${DISTNAME:S/-source//}
 
-BUILD_DEPENDS=	::devel/xdg-utils \
+BUILD_DEPENDS=	devel/xdg-utils \
 		${MODGNU_AUTOMAKE_DEPENDS} \
 		${MODGNU_AUTOCONF_DEPENDS}
 
-RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils \
-		::devel/xdg-utils
+RUN_DEPENDS=	devel/desktop-file-utils \
+		devel/xdg-utils
 
-LIB_DEPENDS=	::graphics/png \
-		::graphics/tiff \
-		::x11/dbus
+LIB_DEPENDS=	graphics/png \
+		graphics/tiff \
+		x11/dbus
 
 LIBS_ENV=	LIBcups_VERSION=${LIBcups_VERSION} \
 		LIBcupscgi_VERSION=${LIBcupscgi_VERSION} \
@@ -112,7 +112,8 @@ FLAVOR?=
 
 .if ${FLAVOR:L:Mldap}
 CONFIGURE_ARGS+= --enable-ldap
-LIB_DEPENDS+=	ldap::databases/openldap
+WANTLIB +=	ldap
+LIB_DEPENDS+=	databases/openldap
 .else
 CONFIGURE_ARGS+=--disable-ldap
 .endif
diff --git a/print/detex/Makefile b/print/detex/Makefile
index e23e2782135..ac2cd3ce209 100644
--- a/print/detex/Makefile
+++ b/print/detex/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.26 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=		strip TeX/LaTeX codes from a file
 
@@ -18,7 +18,7 @@ WANTLIB=		c
 
 NO_REGRESS=		Yes
 MAKE_FLAGS=		CFLAGS="${CFLAGS} -DNO_MALLOC_DECL"
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/detex ${PREFIX}/bin
diff --git a/print/dvi2tty/Makefile b/print/dvi2tty/Makefile
index f2ae29e4c12..678034c1780 100644
--- a/print/dvi2tty/Makefile
+++ b/print/dvi2tty/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=		converts .dvi files to plain text
 
@@ -15,7 +15,7 @@ WANTLIB=		c
 MASTER_SITES=		http://www.mesa.nl/pub/dvi2tty/
 
 MAKE_FLAGS=		CC="${CC}" CFLAGS="${CFLAGS}"
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 NO_REGRESS=		Yes
 
diff --git a/print/enscript/Makefile b/print/enscript/Makefile
index dcdf89ae815..36ab1a17b3b 100644
--- a/print/enscript/Makefile
+++ b/print/enscript/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2010/10/18 21:25:08 espie Exp $
+# $OpenBSD: Makefile,v 1.28 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=		convert ASCII files to PostScript
 
@@ -25,7 +25,7 @@ WANTLIB=		c m
 CONFIGURE_STYLE=	gnu
 # gettext detection is broken and the translations are severely lacking
 CONFIGURE_ARGS=		--disable-nls
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 .if !${FLAVOR:L:Ma4}
 CONFIGURE_ARGS+=	--with-media=Letter
diff --git a/print/epdfview/Makefile b/print/epdfview/Makefile
index 208b1462f51..b2f0c4fa99f 100644
--- a/print/epdfview/Makefile
+++ b/print/epdfview/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/10/24 21:32:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	lightweight PDF document viewer
 
@@ -21,17 +21,17 @@ PERMIT_DISTFILES_FTP=   Yes
 
 WANTLIB+= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB+= Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
-WANTLIB+= freetype gdk-x11-2.0.>=0.14 gdk_pixbuf-2.0.>=0.14 gio-2.0 glib-2.0
-WANTLIB+= gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0.>=0.14 m
-WANTLIB+= pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png poppler.>=3
-WANTLIB+= poppler-glib.>=3 pthread pthread-stubs stdc++ xcb xcb-render
+WANTLIB+= freetype gdk-x11-2.0>=0.14 gdk_pixbuf-2.0>=0.14 gio-2.0 glib-2.0
+WANTLIB+= gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0>=0.14 m
+WANTLIB+= pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png poppler>=3
+WANTLIB+= poppler-glib>=3 pthread pthread-stubs stdc++ xcb xcb-render
 WANTLIB+= xcb-render-util z
 
 MODULES=	devel/gettext
 
-RUN_DEPENDS=	::devel/desktop-file-utils
-LIB_DEPENDS=	::x11/gtk+2 \
-		::print/poppler
+RUN_DEPENDS=	devel/desktop-file-utils
+LIB_DEPENDS=	x11/gtk+2 \
+		print/poppler
 
 CONFIGURE_STYLE=gnu
 
@@ -41,8 +41,8 @@ FLAVORS=	cups
 FLAVOR?=
 
 .if ${FLAVOR:L:Mcups}
-WANTLIB+=		asn1 crypto cups.>=3 gssapi krb5 ssl
-LIB_DEPENDS+=		:cups->=1.2:print/cups
+WANTLIB+=		asn1 crypto cups>=3 gssapi krb5 ssl
+LIB_DEPENDS+=		print/cups>=1.2
 CONFIGURE_ARGS+=	--with-cups
 .else
 CONFIGURE_ARGS+=	--without-cups
diff --git a/print/foiltex/Makefile b/print/foiltex/Makefile
index 8114da86821..43d8b216d89 100644
--- a/print/foiltex/Makefile
+++ b/print/foiltex/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/07/12 10:34:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.15 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	LaTeX2e class for overhead transparencies
 
@@ -18,7 +18,7 @@ DISTFILES=	foiltex.ins foiltex.dtx
 DIST_SUBDIR=	${DISTNAME}
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	::print/texlive/base
+RUN_DEPENDS=	print/texlive/base
 
 CLS_DIR=	${PREFIX}/share/texmf-local/tex/latex/foiltex
 DOC_DIR=	${PREFIX}/share/texmf-local/doc/latex/foiltex
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index e00d7207514..5ccbc3abf69 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2010/10/24 21:32:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2010/11/20 09:48:39 espie Exp $
 
 SHARED_ONLY=		Yes
 
@@ -39,13 +39,13 @@ WANTLIB += ${MODPY_WANTLIB}
 MODULES=		devel/gettext lang/python
 
 LIB_DEPENDS=		${MODPY_LIB_DEPENDS}	\
-			::graphics/cairo	\
-			::graphics/jpeg		\
-			::devel/pango		\
-			::graphics/png		\
-			::graphics/tiff		\
-			::graphics/libungif	\
-			::textproc/libxml
+			graphics/cairo	\
+			graphics/jpeg		\
+			devel/pango		\
+			graphics/png		\
+			graphics/tiff		\
+			graphics/libungif	\
+			textproc/libxml
 
 WRKDIST=		${WRKDIR}/${DISTNAME:S,_full,,}
 
@@ -60,7 +60,7 @@ CONFIGURE_ARGS=		--without-freetype-src \
 			--with-regular-link
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 NO_REGRESS=		Yes
 
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index d3e9cef6d86..0ebe277103f 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2010/11/12 16:06:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2010/11/20 09:48:39 espie Exp $
 
 COMMENT-main=	driver for ZjStream wire protocol compatible printers
 COMMENT-cups=	Konica-Minolta foo2zjs command filter for CUPS
@@ -30,14 +30,14 @@ MULTI_PACKAGES=	-main -cups
 USE_GMAKE=	Yes
 WRKDIST=	${WRKDIR}/foo2zjs
 
-BUILD_DEPENDS=	::print/ghostscript/gnu # ps2pdf
+BUILD_DEPENDS=	print/ghostscript/gnu # ps2pdf
 
 WANTLIB-main += ${WANTLIB} m
-RUN_DEPENDS-main=::print/foomatic-filters
+RUN_DEPENDS-main=print/foomatic-filters
 
 WANTLIB-cups += ${WANTLIB} cups pthread
-RUN_DEPENDS-cups=::${BASE_PKGPATH},-main
-LIB_DEPENDS-cups=::print/cups
+RUN_DEPENDS-cups=${BASE_PKGPATH},-main
+LIB_DEPENDS-cups=print/cups
 
 MAKE_FLAGS+=	CUPS_SERVERBIN=`cups-config --serverbin`
 
diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile
index 2db03625b24..de251e60203 100644
--- a/print/foomatic-db-engine/Makefile
+++ b/print/foomatic-db-engine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/11/13 09:48:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=		Foomatic PPD generator
 
@@ -24,14 +24,14 @@ MASTER_SITES=		http://www.linuxprinting.org/download/foomatic/ \
 
 MODULES=		converters/libiconv
 
-LIB_DEPENDS=		::textproc/libxml
-RUN_DEPENDS=		::print/foomatic-filters \
-			::databases/p5-DBI \
-			:curl-*|wget-*:net/curl
-WANTLIB=		c m xml2.>=8 z
+LIB_DEPENDS=		textproc/libxml
+RUN_DEPENDS=		print/foomatic-filters \
+			databases/p5-DBI \
+			curl-*|wget-*:net/curl
+WANTLIB=		c m xml2>=8 z
 
 USE_GMAKE=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 NO_REGRESS=		Yes
 
 CONFIGURE_STYLE=	gnu
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index e7b5442b78b..f0666a29b91 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/08/24 16:33:26 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/20 09:48:39 espie Exp $
 
 PKG_ARCH=		*
 
@@ -28,7 +28,7 @@ MASTER_SITES=		http://www.bsdfrog.org/OpenBSD/distfiles/
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--disable-ppds-to-cups
 
-RUN_DEPENDS=		::print/foomatic-db-engine
+RUN_DEPENDS=		print/foomatic-db-engine
 
 WRKDIST=		${WRKDIR}/foomatic-db-${V}
 
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 68c03981f38..4db82e75b68 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/11/13 09:36:22 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=		Foomatic PPD print filters
 
@@ -26,8 +26,8 @@ MASTER_SITES=		http://www.linuxprinting.org/download/foomatic/ \
 
 BUILD_DEPENDS=		${MODGNU_AUTOMAKE_DEPENDS}
 
-RUN_DEPENDS=		::print/ghostscript/gnu \
-			::print/a2ps
+RUN_DEPENDS=		print/ghostscript/gnu \
+			print/a2ps
 
 AUTOMAKE_VERSION=1.10
 AUTOCONF_VERSION=2.61
@@ -54,7 +54,7 @@ CONFIGURE_ARGS=		--enable-file-converter-check=no
 MAKE_ENV=		${CONFIGURE_ENV}
 
 FAKE_FLAGS=		ETCDIR="${PREFIX}/share/examples/foomatic"
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/configure.ac \
diff --git a/print/ghostscript/gnu/Makefile b/print/ghostscript/gnu/Makefile
index 1abd818ece9..7ddbf340a28 100644
--- a/print/ghostscript/gnu/Makefile
+++ b/print/ghostscript/gnu/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.79 2010/10/24 21:32:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.80 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	GNU PostScript interpreter
 
@@ -32,11 +32,11 @@ WANTLIB=	c ijs m jpeg.>=62 png.>=6 pthread z
 
 MODULES=	converters/libiconv
 
-RUN_DEPENDS=	:ghostscript-fonts-*:print/ghostscript/gnu-fonts
-BUILD_DEPENDS=	:cups->=1.4.3:print/cups
-LIB_DEPENDS=	::graphics/jpeg	\
-		::graphics/png		\
-		::print/ijs
+RUN_DEPENDS=	print/ghostscript/gnu-fonts
+BUILD_DEPENDS=	print/cups>=1.4.3
+LIB_DEPENDS=	graphics/jpeg	\
+		graphics/png		\
+		print/ijs
 
 CFLAGS+=	-DSYS_TYPES_HAS_STDINT_TYPES	\
 		-I${LOCALBASE}/include		\
diff --git a/print/ghostview/Makefile b/print/ghostview/Makefile
index bc91c9455ff..c3808fc168d 100644
--- a/print/ghostview/Makefile
+++ b/print/ghostview/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2010/10/24 21:32:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.26 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	X11 front-end for ghostscript
 
@@ -16,7 +16,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt c m pthread-stubs xcb
 
-RUN_DEPENDS=    :ghostscript-*:print/ghostscript/gnu
+RUN_DEPENDS=    print/ghostscript/gnu
 
 CONFIGURE_STYLE=imake
 USE_GROFF =	Yes
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index cd0be635315..f6a046d74c1 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/10/24 21:32:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	GTK+2 frontend to CUPS
 
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender asn1 atk-1.0 c cairo crypto cups.>=3
+WANTLIB += Xi Xinerama Xrandr Xrender asn1 atk-1.0 c cairo crypto cups>=3
 WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 
 WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gssapi gthread-2.0
 WANTLIB += gtk-x11-2.0 krb5 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
@@ -29,8 +29,8 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gtklp/}
 
 MODULES=	devel/gettext
 
-LIB_DEPENDS=	::x11/gtk+2 \
-		::print/cups
+LIB_DEPENDS=	x11/gtk+2 \
+		print/cups
 
 USE_LIBTOOL=	Yes
 USE_GMAKE=	Yes
diff --git a/print/gutenprint/Makefile b/print/gutenprint/Makefile
index aca2d71fbe1..0b39f0842df 100644
--- a/print/gutenprint/Makefile
+++ b/print/gutenprint/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/11/06 16:07:00 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2010/11/20 09:48:39 espie Exp $
 
 COMMENT-main=		high quality print drivers
 COMMENT-foomatic=	Foomatic data for gutenprint drivers
@@ -37,20 +37,20 @@ MODULES=	devel/gettext
 
 WANTLIB-main +=	c m ncurses readline ijs ${MODGETTEXT_WANTLIB}
 
-BUILD_DEPENDS=		:foomatic-db-engine->=4.0.3:print/foomatic-db-engine
+BUILD_DEPENDS=		print/foomatic-db-engine>=4.0.3
 
 LIB_DEPENDS-main=	${MODGETTEXT_LIB_DEPENDS} \
-			::print/ijs
+			print/ijs
 
 WANTLIB-foomatic += # empty
 LIB_DEPENDS-foomatic=	# empty
-RUN_DEPENDS-foomatic=	::print/foomatic-db \
-			::${BUILD_PKGPATH},-main
+RUN_DEPENDS-foomatic=	print/foomatic-db \
+			${BUILD_PKGPATH},-main
 PKG_ARCH-foomatic=	*
 
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
diff --git a/print/gv/Makefile b/print/gv/Makefile
index d4e85ae6ad6..67c58849b57 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2010/10/24 21:32:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2010/11/20 09:48:39 espie Exp $
 
 COMMENT= 	PostScript and PDF previewer
 
@@ -19,15 +19,15 @@ WANTLIB += ICE SM X11 Xext Xmu Xpm Xt c m Xaw3d Xinerama
 
 MODULES=	converters/libiconv
 
-LIB_DEPENDS=	::x11/Xaw3d
-RUN_DEPENDS=	:ghostscript-*:print/ghostscript/gnu
+LIB_DEPENDS=	x11/Xaw3d
+RUN_DEPENDS=	print/ghostscript/gnu
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--enable-SIGCHLD-fallback \
 			--enable-scrollbar-code
 CONFIGURE_ENV=          CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
                         LDFLAGS="-L${LOCALBASE}/lib"
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 FAKE_FLAGS+=		appdefaultsdir="${PREFIX}/lib/X11/app-defaults/"
 
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 493102ef291..d70a4bc6d54 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2010/11/06 19:07:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.30 2010/11/20 09:48:39 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -48,39 +48,39 @@ WANTLIB-main += ${WANTLIB} ${cWANTLIB} sane cups hpip hpmud asn1 gssapi krb5
 WANTLIB-main += ssl avahi-client avahi-common c crypto dbus-1 exif gphoto2
 WANTLIB-main += gphoto2_port jpeg ltdl netsnmp tiff usb z
 
-BUILD_DEPENDS=	::sysutils/polkit
+BUILD_DEPENDS=	sysutils/polkit
 
 LIB_DEPENDS-main=${LIB_DEPENDS} \
-		::graphics/sane-backends \
-		::print/cups \
-		::print/hplip,-libs
+		graphics/sane-backends \
+		print/cups \
+		print/hplip,-libs
 RUN_DEPENDS-main=${MODPY_RUN_DEPENDS} \
-		::print/py-reportlab/reportlab \
-		::x11/dbus-python \
-		::devel/py-notify \
-		::graphics/py-Imaging \
-		::print/hplip,-hpcups \
-		::devel/xdg-utils
+		print/py-reportlab/reportlab \
+		x11/dbus-python \
+		devel/py-notify \
+		graphics/py-Imaging \
+		print/hplip,-hpcups \
+		devel/xdg-utils
 
 WANTLIB-hpijs += ${cWANTLIB} asn1 gssapi krb5 ssl hpip
 WANTLIB-hpijs += c jpeg netsnmp stdc++ usb dbus-1 hpmud
-LIB_DEPENDS-hpijs= ::print/hplip,-libs \
-		::graphics/jpeg \
-		::x11/dbus
+LIB_DEPENDS-hpijs= print/hplip,-libs \
+		graphics/jpeg \
+		x11/dbus
 
 WANTLIB-hpcups += ${cWANTLIB} png tiff z asn1 gssapi krb5 ssl
 WANTLIB-hpcups += c jpeg stdc++ hpip cups cupsimage
-LIB_DEPENDS-hpcups= ::print/hplip,-libs \
-		::print/cups
+LIB_DEPENDS-hpcups= print/hplip,-libs \
+		print/cups
 
 WANTLIB-libs +=	${cWANTLIB} netsnmp usb
-LIB_DEPENDS-libs= ::net/net-snmp \
-		::devel/libusb
+LIB_DEPENDS-libs= net/net-snmp \
+		devel/libusb
 
 WANTLIB-gui +=	# empty
-RUN_DEPENDS-gui= ::x11/py-qt4 \
-		::print/hplip,-main \
-		:desktop-file-utils-*:devel/desktop-file-utils
+RUN_DEPENDS-gui= x11/py-qt4 \
+		print/hplip,-main \
+		devel/desktop-file-utils
 LIB_DEPENDS-gui= # empty
 
 MODULES=	devel/gettext \
diff --git a/print/htmldoc/Makefile b/print/htmldoc/Makefile
index 70f94998ef4..f1f0709365f 100644
--- a/print/htmldoc/Makefile
+++ b/print/htmldoc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2010/10/24 21:32:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	convert HTML pages to PDF/PS format
 
@@ -28,14 +28,14 @@ MASTER_SITES=		ftp://ftp.easysw.com/pub/htmldoc/${V}/ \
 
 FLAVORS=		no_x11
 FLAVOR?=
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+=	--without-gui
-LIB_DEPENDS=		::graphics/jpeg \
-			::graphics/png
+LIB_DEPENDS=		graphics/jpeg \
+			graphics/png
 .else
-LIB_DEPENDS=		::x11/fltk
+LIB_DEPENDS=		x11/fltk
 WANTLIB+=		X11 Xau Xdmcp Xext Xpm fltk fltk_images pthread
 .endif
 
diff --git a/print/ijs/Makefile b/print/ijs/Makefile
index 81f60a381f8..b03eeb244b7 100644
--- a/print/ijs/Makefile
+++ b/print/ijs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2010/10/18 21:25:09 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=		raster image transmission library
 
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		${HOMEPAGE}/download/
 
 USE_LIBTOOL=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		${CONFIGURE_SHARED} --enable-static
diff --git a/print/l2a/Makefile b/print/l2a/Makefile
index f55f8732767..3b4d384823e 100644
--- a/print/l2a/Makefile
+++ b/print/l2a/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/10/18 21:25:09 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=		filter for removing (La)TeX markup
 
@@ -15,7 +15,7 @@ MASTER_SITES=		http://monkey.org/~jose/openbsd/ports/
 
 MAKE_FLAGS=		CC='${CC}' OBJ=l2a.o EXE=l2a LLL=-ll
 
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 NO_REGRESS=		Yes
 
 do-install:
diff --git a/print/latex-mk/Makefile b/print/latex-mk/Makefile
index 181885b56ff..5fb46829065 100644
--- a/print/latex-mk/Makefile
+++ b/print/latex-mk/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2010/03/24 16:15:06 oga Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	set of Makefile fragments to manage LaTeX documents
 
 DISTNAME=	latex-mk-1.9.1
-PKGNAME=	${DISTNAME}p0
+REVISION =	0
 CATEGORIES=	print
 HOMEPAGE=	http://latex-mk.sourceforge.net/
 
@@ -20,7 +20,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=latex-mk/}
 CONFIGURE_STYLE=gnu
 PKG_ARCH=	*
 
-REGRESS_DEPENDS=::print/texlive/base
+REGRESS_DEPENDS=print/texlive/base
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/dated_draft.ps ${PREFIX}/share/latex-mk
diff --git a/print/libpaper/Makefile b/print/libpaper/Makefile
index 309c3f3eb94..af660d5b3ce 100644
--- a/print/libpaper/Makefile
+++ b/print/libpaper/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2010/10/18 21:25:09 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	library for handling paper characteristics
 
 V=		1.1.21
 DISTNAME=	libpaper_${V}
-PKGNAME=	libpaper-${V}p0
+PKGNAME=	libpaper-${V}
+REVISION =	0
 SHARED_LIBS+=	paper 0.0	# .2.2
 CATEGORIES=	print
 
diff --git a/print/libspectre/Makefile b/print/libspectre/Makefile
index 85c2f9b2697..3ab2f6f662a 100644
--- a/print/libspectre/Makefile
+++ b/print/libspectre/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/11/11 18:34:59 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/20 09:48:39 espie Exp $
 
 # libgs from ghostscript is only provided on shared libs archs
 SHARED_ONLY=	Yes
@@ -24,8 +24,8 @@ MASTER_SITES=	${HOMEPAGE}/releases/
 
 # we want the 'display' device from ghostscript, which is not available
 # in the no_x11 FLAVOR
-LIB_DEPENDS=	:ghostscript-*-!no_x11:print/ghostscript/gnu
-WANTLIB =	gs.>=11
+LIB_DEPENDS=	ghostscript-*-!no_x11:print/ghostscript/gnu
+WANTLIB =	gs>=11
 
 USE_LIBTOOL=	Yes
 
@@ -36,7 +36,7 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--disable-silent-rules
 
 .ifdef DEBUG
-BUILD_DEPENDS+=	::graphics/cairo
+BUILD_DEPENDS+=	graphics/cairo
 CONFIGURE_ARGS+=--enable-test
 .else
 CONFIGURE_ARGS+=--disable-test
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index f39c654e0f7..70c4b1e3af8 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2010/11/11 18:34:59 espie Exp $
+# $OpenBSD: Makefile,v 1.29 2010/11/20 09:48:39 espie Exp $
 #
 # Credits to Matt Jibson. He did the initial work on this port and many
 # tools it depends on.
@@ -63,20 +63,20 @@ LIB_DEPENDS-docs=
 RUN_DEPENDS-docs=
 
 WANTLIB-main=		X11 c expat fontconfig freetype gmp gthread-2.0 ltdl m \
-			pthread stdc++ z guile.>=20 glib-2.0.>=1000 \
-			gmodule-2.0.>=1000 gobject-2.0.>=1000 \
-			pango-1.0.>=1200 pangoft2-1.0.>=1200 ${WANTLIB}
+			pthread stdc++ z guile>=20 glib-2.0>=1000 \
+			gmodule-2.0>=1000 gobject-2.0>=1000 \
+			pango-1.0>=1200 pangoft2-1.0>=1200 ${WANTLIB}
 MODULES=		devel/gettext lang/python
 LIB_DEPENDS-main=	${LIB_DEPENDS} \
-			::lang/guile \
-			::devel/glib2 \
-			::devel/pango
-RUN_DEPENDS=		::print/ghostscript/gnu
-BUILD_DEPENDS= 		::print/mftrace \
-			::devel/bison \
-			::archivers/bzip2 \
-			:autoconf-${AUTOCONF_VERSION}:devel/autoconf/${AUTOCONF_VERSION} \
-			::textproc/texi2html \
+			lang/guile \
+			devel/glib2 \
+			devel/pango
+RUN_DEPENDS=		print/ghostscript/gnu
+BUILD_DEPENDS= 		print/mftrace \
+			devel/bison \
+			archivers/bzip2 \
+			autoconf-${AUTOCONF_VERSION}:devel/autoconf/${AUTOCONF_VERSION} \
+			textproc/texi2html \
 			${RUN_DEPENDS}
 
 SUBST_VARS+=		VERSION
@@ -94,7 +94,7 @@ post-install:
 	umask 022 && cp -R ${WRKDIR}/docs/share/doc/lilypond/html/* \
 		${PREFIX}/share/doc/lilypond/${VERSION}
 
-REGRESS_DEPENDS=	::print/lilypond-test-baseline:patch
+REGRESS_DEPENDS=	print/lilypond-test-baseline:patch
 
 pre-regress:
 .for d in input/regression input/regression/musicxml
diff --git a/print/lout/Makefile b/print/lout/Makefile
index af8b363e097..dfd0657da4a 100644
--- a/print/lout/Makefile
+++ b/print/lout/Makefile
@@ -1,11 +1,13 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/18 21:25:09 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/20 09:48:39 espie Exp $
 
 COMMENT-main= 	object oriented type setting language
 COMMENT-doc=	Lout user and expert documentation
 
 DISTNAME=       lout-3.30
-PKGNAME-main=	${DISTNAME}p1
-PKGNAME-doc=    ${DISTNAME:S/-/-doc-/}p0
+PKGNAME-main=	${DISTNAME}
+REVISION-main =	1
+PKGNAME-doc=    ${DISTNAME:S/-/-doc-/}
+REVISION-doc =	0
 CATEGORIES=	print
 
 HOMEPAGE=	http://lout.sourceforge.net/
diff --git a/print/lss/Makefile b/print/lss/Makefile
index 7224ab2d546..6ff85df42b2 100644
--- a/print/lss/Makefile
+++ b/print/lss/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/11/11 18:34:59 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=		LaTeX symbols selector
 
@@ -25,9 +25,9 @@ WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
 WANTLIB += pthread-stubs xcb z gdk_pixbuf-2.0
 WANTLIB += xml2 gdk-x11-2.0 gtk-x11-2.0
 
-LIB_DEPENDS=		::textproc/libxml \
-			::x11/gtk+2
-RUN_DEPENDS=		::devel/desktop-file-utils
+LIB_DEPENDS=		textproc/libxml \
+			x11/gtk+2
+RUN_DEPENDS=		devel/desktop-file-utils
 
 USE_GMAKE=		Yes
 
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index c4229450a25..1fda719a3c0 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.58 2010/10/24 21:32:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.59 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	graphical frontend for LaTeX (nearly WYSIWYG)
 
@@ -19,16 +19,16 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MODULES=	devel/gettext lang/python x11/qt4
 
-RUN_DEPENDS=	::print/texlive/base \
-		::graphics/ImageMagick
+RUN_DEPENDS=	print/texlive/base \
+		graphics/ImageMagick
 
-LIB_DEPENDS=	:qt4->=4.5.3:x11/qt4 \
-		::devel/boost \
-		::textproc/aspell/core
+LIB_DEPENDS=	x11/qt4>=4.5.3 \
+		devel/boost \
+		textproc/aspell/core
 
-WANTLIB += QtGui.>=8 X11 aspell c m pthread stdc++ z
-WANTLIB += boost_filesystem-mt.>=1 boost_iostreams-mt.>=1
-WANTLIB += boost_regex-mt.>=1 boost_signals-mt.>=1
+WANTLIB += QtGui>=8 X11 aspell c m pthread stdc++ z
+WANTLIB += boost_filesystem-mt>=1 boost_iostreams-mt>=1
+WANTLIB += boost_regex-mt>=1 boost_signals-mt>=1
 
 SEPARATE_BUILD=	concurrent
 USE_LIBTOOL=	Yes
diff --git a/print/mftrace/Makefile b/print/mftrace/Makefile
index 419b529924c..1c5cd4c62d4 100644
--- a/print/mftrace/Makefile
+++ b/print/mftrace/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/10/18 21:25:09 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	Scalable PostScript fonts for MetaFont
 
@@ -22,11 +22,11 @@ WANTLIB=	c
 
 MODULES=	lang/python
 
-BUILD_DEPENDS=	:potrace-*:graphics/potrace
-RUN_DEPENDS=	:potrace-*:graphics/potrace \
-		:t1utils-*:print/t1utils \
-		:fontforge-*:print/fontforge \
-		::print/texlive/base
+BUILD_DEPENDS=	graphics/potrace
+RUN_DEPENDS=	graphics/potrace \
+		print/t1utils \
+		print/fontforge \
+		print/texlive/base
 
 USE_GMAKE=	Yes
 USE_GROFF =	Yes
diff --git a/print/openclipart/Makefile b/print/openclipart/Makefile
index a1b855c68f3..d64f96c0c4e 100644
--- a/print/openclipart/Makefile
+++ b/print/openclipart/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/03/29 12:23:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	desktop publishing clip-art
 
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 MASTER_SITES=	${HOMEPAGE}/downloads/$V/
 EXTRACT_SUFX=	.tar.bz2
 
-BUILD_DEPENDS=	:bzip2-*:archivers/bzip2
+BUILD_DEPENDS=	archivers/bzip2
 
 EXTRACT_ONLY=
 PKG_ARCH=	*
diff --git a/print/pdfjam/Makefile b/print/pdfjam/Makefile
index e5ed5ffda76..dae885de20a 100644
--- a/print/pdfjam/Makefile
+++ b/print/pdfjam/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2010/10/18 21:25:09 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/20 09:48:39 espie Exp $
 
 PKG_ARCH=	*
 
@@ -24,7 +24,7 @@ EXTRACT_SUFX=	.tgz
 
 WRKDIST=	${WRKDIR}/pdfjam
 
-RUN_DEPENDS=	::print/texlive/base
+RUN_DEPENDS=	print/texlive/base
 
 USE_GROFF =	Yes
 NO_BUILD=	Yes
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index e5e4e9b4570..c6828752321 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/11/11 18:34:59 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=		C library to produce PDF files
 
@@ -16,10 +16,10 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		http://www.pdflib.com/pdflib/download/
 
-WANTLIB=		m z jpeg png.>=2 tiff.>=35
+WANTLIB=		m z jpeg png>=2 tiff>=35
 
-LIB_DEPENDS=		::graphics/png \
-			::graphics/tiff
+LIB_DEPENDS=		graphics/png \
+			graphics/tiff
 
 USE_LIBTOOL=		Yes
 
diff --git a/print/pkfonts/Makefile b/print/pkfonts/Makefile
index 48ffa9a8bdd..0d7b6068204 100644
--- a/print/pkfonts/Makefile
+++ b/print/pkfonts/Makefile
@@ -1,11 +1,13 @@
-# $OpenBSD: Makefile,v 1.24 2007/09/15 21:36:45 merdely Exp $
+# $OpenBSD: Makefile,v 1.25 2010/11/20 09:48:39 espie Exp $
 
 COMMENT-main=	English PK fonts (300dpi) for ghostscript, xdvi, etc.
 
 DISTNAME=	pkfonts
 VERSION=	1.0
-PKGNAME=	pkfonts-dpi300-${VERSION}p0
-PKGNAME-main=	pkfonts-dpi300-${VERSION}p0
+PKGNAME=	pkfonts-dpi300-${VERSION}
+REVISION =	0
+PKGNAME-main=	pkfonts-dpi300-${VERSION}
+REVISION-main =	0
 CATEGORIES=	print
 
 PERMIT_PACKAGE_CDROM=	no license
diff --git a/print/poppler-data/Makefile b/print/poppler-data/Makefile
index 3d02394f86f..77373dea9c1 100644
--- a/print/poppler-data/Makefile
+++ b/print/poppler-data/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/09 08:06:05 kili Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/20 09:48:39 espie Exp $
 
 COMMENT =		encoding files for poppler
 DISTNAME =		poppler-data-0.4.3
@@ -15,7 +15,7 @@ MASTER_SITES =		${HOMEPAGE}
 
 PKG_ARCH =		*
 
-RUN_DEPENDS =		::print/poppler
+RUN_DEPENDS =		print/poppler
 
 NO_BUILD =		Yes
 NO_REGRESS =		Yes
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 2d6786eadb1..34f93df4571 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2010/11/18 22:30:04 sthen Exp $
+# $OpenBSD: Makefile,v 1.43 2010/11/20 09:48:39 espie Exp $
 .include <bsd.own.mk>
 
 COMMENT-main=	PDF rendering library
@@ -59,16 +59,16 @@ CONFIGURE_ARGS+=	--disable-poppler-qt4
 MODULES+=	devel/gettext
 
 LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
-		::x11/gtk+2 \
-		::graphics/lcms \
-		::graphics/openjpeg \
-		::textproc/libxml
+		x11/gtk+2 \
+		graphics/lcms \
+		graphics/openjpeg \
+		textproc/libxml
 LIB_DEPENDS-qt=	${MODQT3_LIB_DEPENDS} \
 		${MODLIBICONV_LIB_DEPENDS} \
-		::print/poppler
-LIB_DEPENDS-qt4=::x11/qt4 \
+		print/poppler
+LIB_DEPENDS-qt4=x11/qt4 \
 		${MODGETTEXT_LIB_DEPENDS} \
-		::print/poppler
+		print/poppler
 
 WANTLIB-main=	${cWANTLIB} Xcursor Xext Xfixes Xi Xinerama Xrandr gio-2.0 \
 		glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 xml2 \
diff --git a/print/ps2eps/Makefile b/print/ps2eps/Makefile
index 4229187e85a..37241b5f5d6 100644
--- a/print/ps2eps/Makefile
+++ b/print/ps2eps/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2010/10/18 21:25:09 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	convert Postscript to Encapsulated Postscript
 
@@ -17,7 +17,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	http://www.tm.uka.de/~bless/
 
-RUN_DEPENDS=	::print/ghostscript/gnu
+RUN_DEPENDS=	print/ghostscript/gnu
 
 WANTLIB=	c
 WRKDIST= 	${WRKDIR}/ps2eps
diff --git a/print/psdim/Makefile b/print/psdim/Makefile
index 5445a568a75..ccd8b29211e 100644
--- a/print/psdim/Makefile
+++ b/print/psdim/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2010/10/18 21:25:09 espie Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=		intelligent n-up printing
 
 DISTNAME=		psdim-1.4
-PKGNAME=		${DISTNAME}p0
+REVISION =		0
 CATEGORIES=		print
 
 HOMEPAGE=		http://www.mathstat.dal.ca/~selinger/psdim
@@ -18,14 +18,14 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=		${HOMEPAGE}/download/
 
-RUN_DEPENDS=		:ghostscript-*:print/ghostscript/gnu
+RUN_DEPENDS=		print/ghostscript/gnu
 BUILD_DEPENDS=		${RUN_DEPENDS}
 
 WANTLIB=		c
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--enable-metric
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 SEPARATE_BUILD=		concurrent
 
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index 4c8259d78f2..6b4d7455172 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.30 2010/10/18 21:25:09 espie Exp $
+# $OpenBSD: Makefile,v 1.31 2010/11/20 09:48:39 espie Exp $
 
 COMMENT=	utilities for manipulating PostScript documents
 
 MINV=		17
 DISTNAME=	psutils-p${MINV}
-PKGNAME=	psutils-1.${MINV}p0
+PKGNAME=	psutils-1.${MINV}
+REVISION =	0
 
 CATEGORIES=	print
 
diff --git a/print/py-cups/Makefile b/print/py-cups/Makefile
index b33fc1d9a3a..5ab0c54aed4 100644
--- a/print/py-cups/Makefile
+++ b/print/py-cups/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/08/30 18:29:28 fgsch Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/20 09:48:39 espie Exp $
 
 SHARED_ONLY=		Yes
 
@@ -29,7 +29,7 @@ EXTRACT_SUFX=		.tar.bz2
 MODULES=		converters/libiconv \
 			lang/python
 
-LIB_DEPENDS=		::print/cups
+LIB_DEPENDS=		print/cups
 
 CFLAGS+=		-I${LOCALBASE}/include -DVERSION=\"${VERSION}\"
 LDFLAGS+=		-L${LOCALBASE}/lib
diff --git a/print/py-reportlab/plugins/Makefile.inc b/print/py-reportlab/plugins/Makefile.inc
index c205d0b8b1a..6a7d0f7e20e 100644
--- a/print/py-reportlab/plugins/Makefile.inc
+++ b/print/py-reportlab/plugins/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.3 2004/11/02 21:10:03 alek Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2010/11/20 09:48:40 espie Exp $
 
 CATEGORIES=	print graphics
 
@@ -16,6 +16,6 @@ EXTRACT_SUFX=	.tgz
 
 MODULES=	lang/python
 
-RUN_DEPENDS=	::print/py-reportlab/reportlab
+RUN_DEPENDS=	print/py-reportlab/reportlab
 
 REGRESS_DEPENDS=${RUN_DEPENDS}
diff --git a/print/py-reportlab/plugins/renderPM/Makefile b/print/py-reportlab/plugins/renderPM/Makefile
index c8cc4beaa60..8d6cda06e31 100644
--- a/print/py-reportlab/plugins/renderPM/Makefile
+++ b/print/py-reportlab/plugins/renderPM/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/11/11 18:34:59 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/20 09:48:40 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -10,9 +10,9 @@ PKGNAME=	py-reportlab-renderPM-${VERSION}
 REVISION =	5
 
 MASTER_SITES=	http://www.reportlab.org/ftp/
-WANTLIB =	art_lgpl_2.>=5
+WANTLIB =	art_lgpl_2>=5
 
-LIB_DEPENDS=	::graphics/libart
+LIB_DEPENDS=	graphics/libart
 
 WRKDIST=	${WRKDIR}
 
diff --git a/print/py-reportlab/reportlab/Makefile b/print/py-reportlab/reportlab/Makefile
index 17cdf4f5efa..f3a5ffb9b04 100644
--- a/print/py-reportlab/reportlab/Makefile
+++ b/print/py-reportlab/reportlab/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2010/08/30 18:29:28 fgsch Exp $
+# $OpenBSD: Makefile,v 1.14 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=	PDF-generating toolkit for Python
 
@@ -27,13 +27,13 @@ EXTRACT_SUFX=	.tgz
 
 MODULES=	lang/python
 
-RUN_DEPENDS=	:py-Imaging-*:graphics/py-Imaging
+RUN_DEPENDS=	graphics/py-Imaging
 
 WRKDIST=	${WRKDIR}/reportlab_${VERSION:S/./_/}
 WRKSRC=		${WRKDIST}/reportlab
 
 REGRESS_DEPENDS=${RUN_DEPENDS} \
-		::print/py-reportlab/plugins/renderPM 
+		print/py-reportlab/plugins/renderPM 
 
 post-extract:
 	@mv ${WRKDIR}/rl_accel-*/rl_accel ${WRKSRC}/rl_accel
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index fe1a5857aa2..f426dbb82f0 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2010/11/11 18:34:59 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2010/11/20 09:48:40 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -34,16 +34,16 @@ MODULES=	x11/qt3 \
 		lang/python
 MODPY_VERSION=	2.6
 
-RUN_DEPENDS=	:shared-mime-info-*:misc/shared-mime-info \
-		::devel/desktop-file-utils
-LIB_DEPENDS=	::graphics/jpeg \
-		::graphics/lcms \
-		::graphics/libart \
-		::graphics/png \
-		::graphics/tiff \
+RUN_DEPENDS=	misc/shared-mime-info \
+		devel/desktop-file-utils
+LIB_DEPENDS=	graphics/jpeg \
+		graphics/lcms \
+		graphics/libart \
+		graphics/png \
+		graphics/tiff \
 		${MODPY_LIB_DEPENDS} \
-		::print/cups \
-		::textproc/libxml
+		print/cups \
+		textproc/libxml
 
 USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
diff --git a/print/splix/Makefile b/print/splix/Makefile
index 1b6799b0e7c..6ce7f86a1ad 100644
--- a/print/splix/Makefile
+++ b/print/splix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/11/12 13:54:58 jasper Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=	CUPS drivers for SPL printers
 
@@ -19,14 +19,14 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB += asn1 c crypto gssapi krb5 m pthread ssl stdc++ z
-WANTLIB += cups.>=3 cupsimage jbig.>=2
+WANTLIB += cups>=3 cupsimage jbig>=2
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=splix/}
 
-LIB_DEPENDS=	::print/cups \
-		::graphics/jbigkit
+LIB_DEPENDS=	print/cups \
+		graphics/jbigkit
 # pstoraster
-RUN_DEPENDS=	::print/ghostscript/gnu
+RUN_DEPENDS=	print/ghostscript/gnu
 
 USE_GMAKE=	Yes
 NO_REGRESS=	Yes
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index 9f43f3bcc69..38fade01f3c 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2010/10/18 21:25:09 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=		printer (CUPS) administration tool
 
@@ -24,17 +24,17 @@ MODULES=		lang/python \
 			textproc/intltool
 
 BUILD_DEPENDS=		${RUN_DEPENDS} \
-			::textproc/xmlto
-RUN_DEPENDS=		::devel/desktop-file-utils \
-			::devel/gettext \
-			::devel/py-notify \
-			::print/py-cups \
-			::textproc/py-xml \
-			::x11/dbus-python \
-			::x11/gnome/py-gnome
+			textproc/xmlto
+RUN_DEPENDS=		devel/desktop-file-utils \
+			devel/gettext \
+			devel/py-notify \
+			print/py-cups \
+			textproc/py-xml \
+			x11/dbus-python \
+			x11/gnome/py-gnome
 
 USE_GMAKE=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+= 	CPPFLAGS=-I${LOCALBASE}/include \
diff --git a/print/texlive/Makefile.inc b/print/texlive/Makefile.inc
index d3e426aa130..4a5d1a096d1 100644
--- a/print/texlive/Makefile.inc
+++ b/print/texlive/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 2009/12/15 16:21:18 edd Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2010/11/20 09:48:40 espie Exp $
 
 CATEGORIES ?=	print
 HOMEPAGE ?=	http://tug.org/texlive/
@@ -12,7 +12,7 @@ PERMIT_DISTFILES_FTP ?=		Yes
 
 EXTRACT_SUFX ?=		.tar.xz
 EXTRACT_CASES +=	*.tar.xz) xzcat ${FULLDISTDIR}/$$archive | tar xf -;;
-BUILD_DEPENDS +=	::archivers/xz
+BUILD_DEPENDS +=	archivers/xz
 
 V ?=		2009
 DIST_V ?=	${V}1107
diff --git a/print/texlive/base/Makefile b/print/texlive/base/Makefile
index b778719b9d6..d27777ff924 100755
--- a/print/texlive/base/Makefile
+++ b/print/texlive/base/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2010/11/14 19:53:51 edd Exp $
+# $OpenBSD: Makefile,v 1.43 2010/11/20 09:48:40 espie Exp $
 
 COMMENT =		base binaries for TeXLive typesetting distribution
 
@@ -12,19 +12,19 @@ WANTLIB =		m X11 ICE freetype Xt c Xext fontconfig Xpm SM Xmu gd \
 			png.>=3	poppler pthread pthread-stubs stdc++ t1.>=4 \
 			ttf xcb	xml2 z
 
-RUN_DEPENDS =		:ghostscript-*:print/ghostscript/gnu \
-			:detex-*:print/detex \
-			:dvi2tty-*:print/dvi2tty \
-			:ps2eps-*:print/ps2eps \
-			:psutils-*:print/psutils \
-			:t1utils-*:print/t1utils \
-			:texlive_texmf-minimal-${V}:print/texlive/texmf,-main
+RUN_DEPENDS =		print/ghostscript/gnu \
+			print/detex \
+			print/dvi2tty \
+			print/ps2eps \
+			print/psutils \
+			print/t1utils \
+			texlive_texmf-minimal-${V}:print/texlive/texmf,-main
 			
-LIB_DEPENDS =		::devel/t1lib \
-			::graphics/png \
-			::graphics/gd \
-			::print/freetype \
-			::print/poppler
+LIB_DEPENDS =		devel/t1lib \
+			graphics/png \
+			graphics/gd \
+			print/freetype \
+			print/poppler
 
 # Never set SEPARATE_BUILD
 CONFIGURE_STYLE =	gnu
@@ -48,9 +48,9 @@ CFLAGS +=	-fPIC
 
 # clisp limits which arches we can use xindy on
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
-BUILD_DEPENDS += 	:clisp-*:lang/clisp
-LIB_DEPENDS +=		::devel/libsigsegv \
-			::devel/ffcall
+BUILD_DEPENDS += 	lang/clisp
+LIB_DEPENDS +=		devel/libsigsegv \
+			devel/ffcall
 WANTLIB +=		sigsegv avcall callback
 CONFIGURE_ARGS +=	--enable-xindy
 PKG_ARGS +=		-Dxindy=1
diff --git a/print/texlive/texmf/Makefile b/print/texlive/texmf/Makefile
index 0be0b4587ca..e600542e0b7 100644
--- a/print/texlive/texmf/Makefile
+++ b/print/texlive/texmf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2010/08/20 11:06:29 edd Exp $
+# $OpenBSD: Makefile,v 1.15 2010/11/20 09:48:40 espie Exp $
 
 COMMENT-main =		texlive texmf for laTeX/PdfTeX 
 COMMENT-full =		texlive texmf for XeTeX/ConTeXt and extra macros
@@ -18,10 +18,10 @@ NO_BUILD =		Yes
 NO_REGRESS =		Yes
 PKG_ARCH =		*
 
-BUILD_DEPENDS =		::archivers/xz
-RUN_DEPENDS-full =	:texlive_texmf-minimal-${V}:print/texlive/texmf,-main \
-			:texlive_base-${V}:print/texlive/base
-RUN_DEPENDS-docs = 	:texlive_base-${V}:print/texlive/base
+BUILD_DEPENDS =		archivers/xz
+RUN_DEPENDS-full =	texlive_texmf-minimal-${V}:print/texlive/texmf,-main \
+			texlive_base-${V}:print/texlive/base
+RUN_DEPENDS-docs = 	texlive_base-${V}:print/texlive/base
 
 MULTI_PACKAGES = 	-main -full -docs
 
diff --git a/print/texlive2010/Makefile.inc b/print/texlive2010/Makefile.inc
index 68dd2ff9a9d..ac6bf50cea9 100644
--- a/print/texlive2010/Makefile.inc
+++ b/print/texlive2010/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.2 2010/10/20 23:13:00 edd Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2010/11/20 09:48:40 espie Exp $
 
 CATEGORIES ?=	print
 HOMEPAGE ?=	http://tug.org/texlive/
@@ -12,7 +12,7 @@ PERMIT_DISTFILES_FTP ?=		Yes
 
 EXTRACT_SUFX ?=		.tar.xz
 EXTRACT_CASES +=	*.tar.xz) xzcat ${FULLDISTDIR}/$$archive | tar xf -;;
-BUILD_DEPENDS +=	::archivers/xz
+BUILD_DEPENDS +=	archivers/xz
 
 V ?=		2010
 DIST_V ?=	${V}0722
diff --git a/print/texlive2010/base/Makefile b/print/texlive2010/base/Makefile
index 8a53d52a64e..d38037eddb9 100755
--- a/print/texlive2010/base/Makefile
+++ b/print/texlive2010/base/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/17 13:19:06 edd Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/20 09:48:40 espie Exp $
 
 COMMENT =		base binaries for TeXLive typesetting distribution
 
@@ -13,22 +13,22 @@ WANTLIB +=		fontconfig freetype gd jpeg lcms m ncurses
 WANTLIB +=		openjpeg png>=3 poppler pthread pthread-stubs stdc++
 WANTLIB +=		t1>=4 ttf xcb xml2 z
 
-RUN_DEPENDS =		::print/ghostscript/gnu \
-			::print/detex \
-			::print/dvi2tty \
-			::print/ps2eps \
-			::print/psutils \
-			::print/t1utils \
-			:texlive_texmf-minimal-${V}:print/texlive2010/texmf,-main \
-			::print/latex-mk
+RUN_DEPENDS =		print/ghostscript/gnu \
+			print/detex \
+			print/dvi2tty \
+			print/ps2eps \
+			print/psutils \
+			print/t1utils \
+			texlive_texmf-minimal-${V}:print/texlive2010/texmf,-main \
+			print/latex-mk
 # re-enable when linked, it depends up tl2009, conflicts
 #::print/pdfjam
 			
-LIB_DEPENDS =		::devel/t1lib \
-			::graphics/png \
-			::graphics/gd \
-			::print/freetype \
-			::print/poppler
+LIB_DEPENDS =		devel/t1lib \
+			graphics/png \
+			graphics/gd \
+			print/freetype \
+			print/poppler
 
 MODULES =		textproc/intltool converters/libiconv
 
@@ -54,8 +54,8 @@ CFLAGS +=	-fPIC
 
 # clisp limits which arches we can use xindy on
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
-BUILD_DEPENDS += 	:clisp-*:lang/clisp
-LIB_DEPENDS +=		::devel/ffcall	# XXX still needed? try build on fresh sys
+BUILD_DEPENDS += 	lang/clisp
+LIB_DEPENDS +=		devel/ffcall	# XXX still needed? try build on fresh sys
 CONFIGURE_ARGS +=	--enable-xindy \
 			--disable-xindy-rules
 PKG_ARGS +=		-Dxindy=1
diff --git a/print/texlive2010/texmf/Makefile b/print/texlive2010/texmf/Makefile
index 071a491dbea..2695db5c4ca 100644
--- a/print/texlive2010/texmf/Makefile
+++ b/print/texlive2010/texmf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2010/11/09 13:38:23 edd Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/20 09:48:40 espie Exp $
 
 COMMENT-main =		texlive texmf for laTeX/PdfTeX 
 COMMENT-full =		texlive texmf for XeTeX/ConTeXt and extra macros
@@ -17,11 +17,11 @@ NO_BUILD =		Yes
 NO_REGRESS =		Yes
 PKG_ARCH =		*
 
-BUILD_DEPENDS =		::archivers/xz
-RUN_DEPENDS-full =	:texlive_texmf-minimal-${V}:print/texlive/texmf,-main \
-			:texlive_base-${V}:print/texlive/base
-RUN_DEPENDS-docs = 	:texlive_base-${V}:print/texlive/base \
-			::x11/p5-Tk
+BUILD_DEPENDS =		archivers/xz
+RUN_DEPENDS-full =	texlive_texmf-minimal-${V}:print/texlive/texmf,-main \
+			texlive_base-${V}:print/texlive/base
+RUN_DEPENDS-docs = 	texlive_base-${V}:print/texlive/base \
+			x11/p5-Tk
 
 MULTI_PACKAGES = 	-main -full -docs
 
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index cc17253d745..ac8ede91a55 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2010/11/11 18:34:59 espie Exp $
+# $OpenBSD: Makefile,v 1.38 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=	tools to convert Xfig's .fig files
 
@@ -10,9 +10,9 @@ CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mcj/}
 HOMEPAGE=	http://xfig.org/
 
-LIB_DEPENDS=	::graphics/png
-RUN_DEPENDS=	:ghostscript-*:print/ghostscript/gnu \
-		:netpbm->=9.19:graphics/netpbm
+LIB_DEPENDS=	graphics/png
+RUN_DEPENDS=	print/ghostscript/gnu \
+		graphics/netpbm>=9.19
 
 # MIT-like
 PERMIT_PACKAGE_CDROM=	Yes
@@ -27,7 +27,7 @@ USE_GROFF =	Yes
 
 FLAVORS=	a4
 FLAVOR?=
-WANTLIB=	X11 Xpm c m z png.>=2
+WANTLIB=	X11 Xpm c m z png>=2
 
 .if ${FLAVOR:L:Ma4}
 PATCH_LIST=	patch-* a4-*
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 667435f2a7d..aa77803c95b 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/10/24 21:32:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=		X Printing Panel
 
@@ -20,8 +20,8 @@ WANTLIB += m pthread ssl stdc++ z cups jpeg fltk fltk_images png
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=cups/}
 
-LIB_DEPENDS=		::print/cups \
-			::x11/fltk
+LIB_DEPENDS=		print/cups \
+			x11/fltk
 
 CONFIGURE_STYLE=	gnu
 USE_GMAKE=		Yes
diff --git a/productivity/bruce/Makefile b/productivity/bruce/Makefile
index 645a1f06336..8d02664861c 100644
--- a/productivity/bruce/Makefile
+++ b/productivity/bruce/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/08/30 17:57:31 fgsch Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=		Python-based presentation tool
 
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MASTER_SITES=		${MASTER_SITE_PYPI:=b/bruce/}
 
 MODULES=		lang/python
-RUN_DEPENDS=		::devel/pygame
+RUN_DEPENDS=		devel/pygame
 
 NO_REGRESS=		Yes
 
diff --git a/productivity/fet/Makefile b/productivity/fet/Makefile
index 50d92ced867..cbd3a721691 100644
--- a/productivity/fet/Makefile
+++ b/productivity/fet/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/10/24 21:33:27 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=		automatically create timetables
 
@@ -25,9 +25,9 @@ EXTRACT_SUFX=		.tar.bz2
 MODULES=		devel/gettext \
 			x11/qt4
 
-LIB_DEPENDS=		::x11/qt4
+LIB_DEPENDS=		x11/qt4
 
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 PORTHOME=		${WRKDIR}
 
diff --git a/productivity/glabels/Makefile b/productivity/glabels/Makefile
index 1f99e9757ca..966a99171b0 100644
--- a/productivity/glabels/Makefile
+++ b/productivity/glabels/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/11/05 07:57:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/20 09:48:40 espie Exp $
 
 COMMENT =	labels and businesss card designer
 
@@ -38,10 +38,10 @@ WANTLIB += plc4 plds4 png popt pthread pthread-stubs smime3 softokn3 soup-2.4
 WANTLIB += sqlite3 ssl ssl3 tasn1 util xcb xml2 z xcb-render xcb-render-util
 WANTLIB += gnomeui-2 camel-1.2 ebook-1.2 edataserver-1.2
 
-LIB_DEPENDS =	::x11/gnome/libgnomeui \
-		::databases/evolution-data-server
+LIB_DEPENDS =	x11/gnome/libgnomeui \
+		databases/evolution-data-server
 
-RUN_DEPENDS =	::misc/shared-mime-info
+RUN_DEPENDS =	misc/shared-mime-info
 
 MODGNOME_HELP_FILES =	Yes
 DESKTOP_FILES =		Yes
@@ -53,6 +53,6 @@ CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib" \
 CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
 			--disable-update-desktopdb \
 			--disable-update-mimedb
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 .include <bsd.port.mk>
diff --git a/productivity/gnucash/Makefile b/productivity/gnucash/Makefile
index 629e7c9a13d..0b473fc9b01 100644
--- a/productivity/gnucash/Makefile
+++ b/productivity/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2010/11/05 07:57:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.37 2010/11/20 09:48:40 espie Exp $
 
 SHARED_ONLY =	Yes
 
@@ -57,12 +57,12 @@ MODGCONF2_SCHEMAS_DIR = gnucash
 MODGNOME_HELP_FILES =	Yes
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS =	::devel/slib \
-		::devel/slib-guile
-LIB_DEPENDS =	::devel/goffice \
-		::lang/guile \
-		::www/gtkhtml3 \
-		::x11/gnome/libgnomeui
+RUN_DEPENDS =	devel/slib \
+		devel/slib-guile
+LIB_DEPENDS =	devel/goffice \
+		lang/guile \
+		www/gtkhtml3 \
+		x11/gnome/libgnomeui
 
 CONFIGURE_STYLE =	gnu
 # --disable-ofx until libofx/libsp is fixed to work with .so
@@ -71,7 +71,7 @@ CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
 			--disable-ofx
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 # Steps to build the docs.
 DOC_DIR=		${WRKDIR}/gnucash-docs-${DOC_VERSION}
diff --git a/productivity/googlecl/Makefile b/productivity/googlecl/Makefile
index a2955578010..314b2c9b178 100644
--- a/productivity/googlecl/Makefile
+++ b/productivity/googlecl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/11/03 07:34:51 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=	command-line interface to Google services
 
@@ -25,7 +25,7 @@ MASTER_SITES=	http://googlecl.googlecode.com/files/
 
 MODPY_SETUPTOOLS= Yes
 USE_GROFF =	Yes
-RUN_DEPENDS=	::devel/py-gdata
+RUN_DEPENDS=	devel/py-gdata
 NO_REGRESS=	Yes
 
 # Use the version of python we are configured against.
diff --git a/productivity/grisbi/Makefile b/productivity/grisbi/Makefile
index b739fd8b733..97e23ebb4c5 100644
--- a/productivity/grisbi/Makefile
+++ b/productivity/grisbi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/11/05 07:57:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=	personal accounting application
 SHARED_ONLY =	Yes
@@ -31,11 +31,11 @@ WANTLIB += xml2 gdk-x11-2.0 gtk-x11-2.0 ofx
 
 MODULES=	devel/gettext
 
-LIB_DEPENDS=	::textproc/libxml \
-		::x11/gtk+2 \
-		::devel/libofx
+LIB_DEPENDS=	textproc/libxml \
+		x11/gtk+2 \
+		devel/libofx
 
-RUN_DEPENDS=	::devel/desktop-file-utils
+RUN_DEPENDS=	devel/desktop-file-utils
 
 USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
diff --git a/productivity/gtg/Makefile b/productivity/gtg/Makefile
index 5c34b76ec95..3c0caefe407 100644
--- a/productivity/gtg/Makefile
+++ b/productivity/gtg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/10/18 21:25:09 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=		GTD organizer for GNOME
 
@@ -21,16 +21,16 @@ EXTRACT_SUFX=		.tar.gz
 MODULES=		lang/python \
 			x11/gnome
 
-RUN_DEPENDS=		::devel/py-configobj \
-			::devel/py-simplejson \
-			::devel/py-xdg \
-			::x11/dbus-python \
-			::x11/gnome/py-gnome
-BUILD_DEPENDS=		::x11/py-gtk2
+RUN_DEPENDS=		devel/py-configobj \
+			devel/py-simplejson \
+			devel/py-xdg \
+			x11/dbus-python \
+			x11/gnome/py-gnome
+BUILD_DEPENDS=		x11/py-gtk2
 
 DESKTOP_FILES=		Yes
 
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 NO_REGRESS=		Yes
 
 SUBST_VARS+=		VERSION
diff --git a/productivity/homebank/Makefile b/productivity/homebank/Makefile
index ebd3d4f0bb2..51520e71a14 100644
--- a/productivity/homebank/Makefile
+++ b/productivity/homebank/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/05 07:57:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/20 09:48:40 espie Exp $
 
 COMMENT =	personal accounting application
 
@@ -31,11 +31,11 @@ WANTLIB = 	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		xcb-render xcb-render-util gdk_pixbuf-2.0 \
 		gdk-x11-2.0 gtk-x11-2.0 ofx
 
-LIB_DEPENDS =	::x11/gtk+2 \
-		::devel/libofx 
+LIB_DEPENDS =	x11/gtk+2 \
+		devel/libofx 
 
-RUN_DEPENDS =	:desktop-file-utils-*:devel/desktop-file-utils \
-		:shared-mime-info-*:misc/shared-mime-info
+RUN_DEPENDS =	devel/desktop-file-utils \
+		misc/shared-mime-info
 
 USE_GMAKE =	Yes
 
diff --git a/productivity/impressive/Makefile b/productivity/impressive/Makefile
index 7d04beab84e..01863d4364e 100644
--- a/productivity/impressive/Makefile
+++ b/productivity/impressive/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2010/10/18 21:25:09 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/20 09:48:40 espie Exp $
 
 COMMENT =		stylish PDF presentation generator
 
@@ -23,12 +23,12 @@ PY_FLAVOR =		python${MODPY_VERSION}
 # Set NO_BUILD to prevent python.port.mk from adding Python to
 # BUILD_DEPENDS.
 NO_BUILD =		Yes
-USE_GROFF =	Yes
-RUN_DEPENDS =		::graphics/py-opengl \
-			::devel/pygame \
-			:py-Imaging-*-${PY_FLAVOR}:graphics/py-Imaging,${PY_FLAVOR} \
-			::textproc/xpdf \
-			::devel/xdg-utils
+USE_GROFF =		Yes
+RUN_DEPENDS =		graphics/py-opengl \
+			devel/pygame \
+			py-Imaging-*-${PY_FLAVOR}:graphics/py-Imaging,${PY_FLAVOR} \
+			textproc/xpdf \
+			devel/xdg-utils
 
 # We don't use SUBST_CMD here because it goofs with some images inlined
 # in the code.
diff --git a/productivity/ledger/Makefile b/productivity/ledger/Makefile
index 0494b11ea68..a0511c03aed 100644
--- a/productivity/ledger/Makefile
+++ b/productivity/ledger/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/14 00:02:24 jim Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=	command line double-entry accounting ledger
 
@@ -19,10 +19,10 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	http://github.com/downloads/jwiegley/ledger/
 
-WANTLIB=	gmp.>=4 m pcre stdc++
+WANTLIB=	gmp>=4 m pcre stdc++
 
-LIB_DEPENDS=	::devel/gmp \
-		::devel/pcre
+LIB_DEPENDS=	devel/gmp \
+		devel/pcre
 
 SEPARATE_BUILD=	simple
 
diff --git a/productivity/osmo/Makefile b/productivity/osmo/Makefile
index 99dd4631ad5..6cfa288d13a 100644
--- a/productivity/osmo/Makefile
+++ b/productivity/osmo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2010/11/05 07:57:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=	handy personal organizer
 
@@ -29,14 +29,14 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=osmo-pim/}
 
 MODULES=	devel/gettext
 
-LIB_DEPENDS=	::security/libgringotts \
-		::devel/libnotify \
-		::textproc/libxml \
-		::textproc/libical \
-		::textproc/gtkspell \
-		::x11/gtk+2
+LIB_DEPENDS=	security/libgringotts \
+		devel/libnotify \
+		textproc/libxml \
+		textproc/libical \
+		textproc/gtkspell \
+		x11/gtk+2
 
-RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
+RUN_DEPENDS=	devel/desktop-file-utils
 
 USE_GMAKE=	Yes
 USE_GROFF =	Yes
diff --git a/productivity/rednotebook/Makefile b/productivity/rednotebook/Makefile
index 2092fdf790d..d5b65f2c9d2 100644
--- a/productivity/rednotebook/Makefile
+++ b/productivity/rednotebook/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/09/30 11:06:18 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/20 09:48:40 espie Exp $
 
 COMMENT =	diary and journal application
 
@@ -21,9 +21,9 @@ NO_REGRESS =	Yes
 
 MODULES =	lang/python
 
-RUN_DEPENDS =	::x11/py-gtk2 \
-		::textproc/py-yaml \
-		::www/py-webkitgtk \
-		:desktop-file-utils-*:devel/desktop-file-utils
+RUN_DEPENDS =	x11/py-gtk2 \
+		textproc/py-yaml \
+		www/py-webkitgtk \
+		devel/desktop-file-utils
 
 .include <bsd.port.mk>
diff --git a/productivity/rubrica2/Makefile b/productivity/rubrica2/Makefile
index 372aef4bbfd..0df1d01d0be 100644
--- a/productivity/rubrica2/Makefile
+++ b/productivity/rubrica2/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/11/05 07:57:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/20 09:48:40 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -47,12 +47,12 @@ CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include"
 
-RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils \
-		:shared-mime-info-*:misc/shared-mime-info \
-		::x11/gnome/icon-theme
+RUN_DEPENDS=	devel/desktop-file-utils \
+		misc/shared-mime-info \
+		x11/gnome/icon-theme
 
-LIB_DEPENDS=	::devel/libnotify \
-		::devel/libglade2
+LIB_DEPENDS=	devel/libnotify \
+		devel/libglade2
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/configure
diff --git a/productivity/siag/Makefile b/productivity/siag/Makefile
index 3dfcfc1a57e..c18d88e67a3 100644
--- a/productivity/siag/Makefile
+++ b/productivity/siag/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2010/11/05 07:57:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=		tightly integrated, free office package
 
@@ -22,8 +22,8 @@ MASTER_SITES=		http://siag.nu/pub/siag/
 
 USE_GROFF=		Yes
 
-LIB_DEPENDS=		::x11/mowitz \
-			::x11/neXtaw
+LIB_DEPENDS=		x11/mowitz \
+			x11/neXtaw
 
 CONFIGURE_STYLE=	gnu
 
diff --git a/productivity/slideml/Makefile b/productivity/slideml/Makefile
index cb41feec723..7843e008003 100644
--- a/productivity/slideml/Makefile
+++ b/productivity/slideml/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2010/09/02 08:22:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/20 09:48:40 espie Exp $
 
 COMMENT =		HTML slide generator based on SlideML
 
@@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP =	Yes
 MASTER_SITES =		http://opensource.conformal.com/snapshots/slideml/
 EXTRACT_SUFX =		.tgz
 
-RUN_DEPENDS =		::graphics/p5-Image-Size 
+RUN_DEPENDS =		graphics/p5-Image-Size 
 
 NO_BUILD =		Yes
 NO_REGRESS =		Yes
diff --git a/productivity/taskjuggler/Makefile b/productivity/taskjuggler/Makefile
index 94b2e750210..2dac531570a 100644
--- a/productivity/taskjuggler/Makefile
+++ b/productivity/taskjuggler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2010/11/05 07:57:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=	project management tool
 
@@ -41,8 +41,8 @@ CONFIGURE_ARGS+=${MODKDE_CONFIGURE_ARGS} \
 CONFIGURE_ENV=	${MODKDE_CONFIGURE_ENV} \
 		ac_cv_prog_DOCBOOK_TO_MAN=no
 
-LIB_DEPENDS=	::x11/kde/pim3
-RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS=	x11/kde/pim3
+RUN_DEPENDS=	devel/desktop-file-utils
 
 # XXX tries building the documentation from XML, which fails
 NO_REGRESS=	Yes
diff --git a/productivity/tasks/Makefile b/productivity/tasks/Makefile
index 3f6fc64c2f6..b0b37ffc0f9 100644
--- a/productivity/tasks/Makefile
+++ b/productivity/tasks/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/11/05 07:57:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=		lightweight tasklist
 
@@ -32,8 +32,8 @@ MODULES=		devel/gettext \
 USE_LIBTOOL=		Yes
 USE_GMAKE=		Yes
 
-LIB_DEPENDS=		::databases/evolution-data-server
-RUN_DEPENDS=		::devel/desktop-file-utils
+LIB_DEPENDS=		databases/evolution-data-server
+RUN_DEPENDS=		devel/desktop-file-utils
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
diff --git a/productivity/thinkingrock/Makefile b/productivity/thinkingrock/Makefile
index 216da381052..61024a0859b 100644
--- a/productivity/thinkingrock/Makefile
+++ b/productivity/thinkingrock/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/08/28 09:19:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=	collecting and processing thoughts according to GTD
 
@@ -22,8 +22,8 @@ MODULES=	java
 MODJAVA_VER=	1.6+
 MODJAVA_JRERUN= Yes
 
-RUN_DEPENDS=	::java/javaPathHelper \
-		::devel/xdg-utils
+RUN_DEPENDS=	java/javaPathHelper \
+		devel/xdg-utils
 
 NO_BUILD=	Yes
 NO_REGRESS=	Yes
diff --git a/productivity/vym/Makefile b/productivity/vym/Makefile
index eb4070c4d81..bd96747ddbc 100644
--- a/productivity/vym/Makefile
+++ b/productivity/vym/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/11/05 07:57:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=	generate and manipulate maps of your thoughts
 
@@ -23,8 +23,7 @@ WANTLIB += stdc++ z Qt3Support QtGui QtNetwork QtSql QtXml
 MODULES=	devel/gettext \
 		x11/qt4
 
-RUN_DEPENDS=	::archivers/zip
-LIB_DEPENDS=	::x11/qt4
+RUN_DEPENDS=	archivers/zip
 
 PORTHOME=	${WRKDIR}
 NO_REGRESS=	Yes
diff --git a/productivity/workrave/Makefile b/productivity/workrave/Makefile
index e1c9e26079c..59984c968fd 100644
--- a/productivity/workrave/Makefile
+++ b/productivity/workrave/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/11/05 07:57:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=		reminder program for prevention of RSI
 
@@ -30,11 +30,11 @@ WANTLIB += gnet-2.0 gstreamer-0.10 panel-applet-2 gdkmm-2.4 gtkmm-2.4
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=workrave/}
 
-BUILD_DEPENDS=		::devel/py-cheetah
-LIB_DEPENDS=		::multimedia/gstreamer-0.10/core \
-			::net/gnet \
-			::x11/gnome/panel \
-			::x11/gtk2mm
+BUILD_DEPENDS=		devel/py-cheetah
+LIB_DEPENDS=		multimedia/gstreamer-0.10/core \
+			net/gnet \
+			x11/gnome/panel \
+			x11/gtk2mm
 
 MODULES=		devel/gettext \
 			lang/python \
diff --git a/productivity/wyrd/Makefile b/productivity/wyrd/Makefile
index 2077c60458a..e780454ca66 100644
--- a/productivity/wyrd/Makefile
+++ b/productivity/wyrd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/05 07:57:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=		curses calendar front-end to remind
 
@@ -25,7 +25,7 @@ CONFIGURE_STYLE=	gnu
 USE_GMAKE=		Yes
 
 BUILD_DEPENDS=		${RUN_DEPENDS}
-RUN_DEPENDS=		::misc/remind
+RUN_DEPENDS=		misc/remind
 
 USE_GROFF=		Yes
 NO_REGRESS=		Yes
diff --git a/productivity/xquote/Makefile b/productivity/xquote/Makefile
index 8d5642c5f46..616490701d2 100644
--- a/productivity/xquote/Makefile
+++ b/productivity/xquote/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/11/05 07:57:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/20 09:48:40 espie Exp $
 
 COMMENT= 		WWW quote retrieval tool
 
@@ -18,7 +18,7 @@ WANTLIB=	ICE SM X11 Xau Xdmcp Xext Xmu Xpm Xt c m pthread-stubs xcb Xbae
 
 MASTER_SITES=	http://distfiles.nl/
 
-LIB_DEPENDS=	::x11/xbae
+LIB_DEPENDS=	x11/xbae
 
 USE_MOTIF=	Yes
 CONFIGURE_STYLE= imake
diff --git a/productivity/yokadi/Makefile b/productivity/yokadi/Makefile
index c1e8c3fb44f..3c9fd43b9fe 100644
--- a/productivity/yokadi/Makefile
+++ b/productivity/yokadi/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2010/08/30 17:57:31 fgsch Exp $
+# $OpenBSD: Makefile,v 1.3 2010/11/20 09:48:40 espie Exp $
 
 COMMENT =	command-line oriented todo list system
 
@@ -22,8 +22,8 @@ WRKDIST =	${WRKDIR}/yokadi-${MODPY_EGG_VERSION}
 MODULES =	lang/python
 NO_REGRESS =	Yes
 
-RUN_DEPENDS =	::devel/py-dateutil \
-		::databases/py-sqlobject
+RUN_DEPENDS =	devel/py-dateutil \
+		databases/py-sqlobject
 
 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/update/{dump.py,update{.py,1to2,2to3,3to4}} \
diff --git a/russian/pscyr/Makefile b/russian/pscyr/Makefile
index 872a8f93856..16050720214 100644
--- a/russian/pscyr/Makefile
+++ b/russian/pscyr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/07/24 17:36:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/20 09:48:40 espie Exp $
 
 COMMENT=		cyrillic PostScript Type1 fonts to use with TeX
 
@@ -18,7 +18,7 @@ MASTER_SITES=		ftp://ftp.vsu.ru/pub/tex/font-packs/pscyr/
 DISTFILES=		PSCyr-0.4c-patch2-tex.tar.gz \
 			PSCyr-0.4c-patch2-type1.tar.gz
 
-RUN_DEPENDS=		::print/texlive/base
+RUN_DEPENDS=		print/texlive/base
 
 NO_BUILD=		Yes
 NO_REGRESS=		Yes