diff --git a/graphics/quesoglc/Makefile b/graphics/quesoglc/Makefile
index 4dde835545f..68034956c6b 100644
--- a/graphics/quesoglc/Makefile
+++ b/graphics/quesoglc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2010/10/24 21:21:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=	implementation of the OpenGL Character Renderer
 
 DISTNAME=	quesoglc-0.7.2
-PKGNAME=	${DISTNAME}p0
+REVISION =	0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=quesoglc/}
 
@@ -20,9 +20,9 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=	GL GLU X11 Xau Xdmcp expat fontconfig freetype m \
-		pthread-stubs xcb z
+		pthread-stubs xcb z fribidi
 
-LIB_DEPENDS=	fribidi::devel/fribidi
+LIB_DEPENDS=	::devel/fribidi
 
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= gnu
diff --git a/graphics/s10sh/Makefile b/graphics/s10sh/Makefile
index cea55b6678b..aec1cf431d2 100644
--- a/graphics/s10sh/Makefile
+++ b/graphics/s10sh/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2007/09/15 20:09:43 simon Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=	S10sh - a Canon PowerShot digital camera driver
 
 DISTNAME=	s10sh-0.2.0
-PKGNAME=	${DISTNAME}p0
+REVISION =	0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.kyuzz.org/antirez/s10sh-src/
 
@@ -16,11 +16,11 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		readline c termcap
+WANTLIB=		readline c termcap usb
 
 DOCDIR=		${PREFIX}/share/doc/s10sh
 
-LIB_DEPENDS=	usb::devel/libusb
+LIB_DEPENDS=	::devel/libusb
 
 CONFIGURE_STYLE= simple
 
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 7c7e255afb3..493f6406d82 100755
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2010/10/24 21:21:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=	API for accessing scanners, frontends
 
@@ -28,10 +28,11 @@ WANTLIB += fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 gphoto2 gphoto2_port jpeg m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs tiff usb xcb z
 WANTLIB += avahi-client avahi-common gdk_pixbuf-2.0
+WANTLIB += gdk-x11-2.0 gtk-x11-2.0 sane.>=1
 
 MODULES=	devel/gettext
-LIB_DEPENDS=	gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
-		sane.>=1::graphics/sane-backends
+LIB_DEPENDS=	::x11/gtk+2 \
+		::graphics/sane-backends
 
 USE_GMAKE=	Yes
 USE_GROFF =	Yes
@@ -46,7 +47,10 @@ FLAVORS=	gimp
 FLAVOR?=
 
 .if ${FLAVOR:L} == "gimp"
-LIB_DEPENDS+=	gimp-2.0.>=200.0,gimpui-2.0.>=200.0,gimpmath-2.0.>=200.0,gimpwidgets-2.0.>=200.0,gimpbase-2.0.>=200.0,gimpcolor-2.0.>=200.0::graphics/gimp/stable
+LIB_DEPENDS+=	::graphics/gimp/stable
+WANTLIB +=	gimp-2.0.>=200.0 gimpui-2.0.>=200.0 gimpmath-2.0.>=200.0 \
+		gimpwidgets-2.0.>=200.0 gimpbase-2.0.>=200.0 \
+		gimpcolor-2.0.>=200.0
 CONFIGURE_ENV+=	CPPFLAGS+="-I${LOCALBASE}/include/gimp-2.0"
 .else
 CONFIGURE_ARGS+=--disable-gimp
diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile
index a7bd2245d12..b1518711e69 100644
--- a/graphics/scrot/Makefile
+++ b/graphics/scrot/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2010/10/24 21:21:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=		commandline screen capture util
 
 DISTNAME=		scrot-0.8
-PKGNAME=		${DISTNAME}p1
+REVISION =		1
 CATEGORIES=		graphics
 
 HOMEPAGE=		http://www.linuxbrit.co.uk/scrot/
@@ -16,14 +16,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		X11 Xext c freetype m pthread-stubs xcb z
+WANTLIB=		X11 Xext c freetype m pthread-stubs xcb z \
+			giblib.>=1 Imlib2.>=1
 
 MASTER_SITES=		http://www.linuxbrit.co.uk/downloads/
 
-LIB_DEPENDS=            giblib.>=1::devel/giblib \
-			Imlib2.>=1::graphics/imlib2
+LIB_DEPENDS=            ::devel/giblib \
+			::graphics/imlib2
 
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 CONFIGURE_STYLE=	gnu
 
 .include <bsd.port.mk>
diff --git a/graphics/simple-scan/Makefile b/graphics/simple-scan/Makefile
index 06b44232d8d..04d7c3bb2a9 100644
--- a/graphics/simple-scan/Makefile
+++ b/graphics/simple-scan/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/22 06:41:15 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=	simple scanning utility
 
@@ -26,6 +26,7 @@ WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
 WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pixman-1 png pthread pthread-stubs xcb z
 WANTLIB += xcb-render GL Xxf86vm dbus-glib-1 drm jpeg xcb-shm
+WANTLIB += sane.>=2
 
 #MASTER_SITES=	http://people.ubuntu.com/~robert-ancell/simple-scan/
 
@@ -33,7 +34,7 @@ MODULES=	devel/gettext \
 		x11/gnome \
 		devel/gconf2
 
-LIB_DEPENDS=	sane.>=2::graphics/sane-backends
+LIB_DEPENDS=	::graphics/sane-backends
 
 DESKTOP_FILES=	Yes
 MODGNOME_HELP_FILES= Yes
diff --git a/graphics/smpeg-xmms/Makefile b/graphics/smpeg-xmms/Makefile
index 0502b7e545f..8ebd2339f4d 100644
--- a/graphics/smpeg-xmms/Makefile
+++ b/graphics/smpeg-xmms/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.15 2010/10/24 21:21:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=	MPEG and VCD video playback in XMMS
 SHARED_ONLY=	Yes
 
 VERSION=	0.3.5
 DISTNAME=	smpeg-xmms-${VERSION}
-PKGNAME=	xmms-smpeg-${VERSION}p3
+PKGNAME=	xmms-smpeg-${VERSION}
+REVISION =	3
 CATEGORIES=	graphics
 
 MAINTAINER=	Wilbern Cobb <wcobb@openbsd.org>
@@ -17,12 +18,12 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=	SDL X11 Xau Xdmcp Xext Xrandr Xrender iconv m sndio \
-		pthread-stubs xcb usbhid
+		pthread-stubs xcb usbhid xmms.>=2 smpeg.>=1.3
 
 MASTER_SITES=	ftp://ftp.sunet.se/pub/multimedia/xmms/plugins/smpeg-xmms/
 
-LIB_DEPENDS=	xmms.>=2::audio/xmms \
-		smpeg.>=1.3::devel/smpeg
+LIB_DEPENDS=	::audio/xmms \
+		::devel/smpeg
 
 USE_LIBTOOL=	Yes
 LIBTOOL_FLAGS=	--tag=disable-static
diff --git a/graphics/sng/Makefile b/graphics/sng/Makefile
index f77bc8d44c7..8aa4cb7394f 100644
--- a/graphics/sng/Makefile
+++ b/graphics/sng/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2010/10/24 21:21:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=		PNG to ASCII compiler and decompiler
 
 DISTNAME=		sng-1.0.1
-PKGNAME=		${DISTNAME}p1
+REVISION =		1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=sng/}
 
@@ -15,11 +15,11 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		m c z
+WANTLIB=		m c z png
 
-LIB_DEPENDS=		png::graphics/png
+LIB_DEPENDS=		::graphics/png
 USE_GMAKE=		yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS=		--with-png-inc=${LOCALBASE}/include/libpng \
diff --git a/graphics/synaesthesia/Makefile b/graphics/synaesthesia/Makefile
index 40d878244c9..335fa4a9f07 100644
--- a/graphics/synaesthesia/Makefile
+++ b/graphics/synaesthesia/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2010/10/24 21:21:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=		visual sound representation
 
 DISTNAME=		synaesthesia-2.1
-PKGNAME=		${DISTNAME}p0
+REVISION =		0
 CATEGORIES=     	graphics x11
 
 HOMEPAGE=		http://yoyo.cc.monash.edu.au/~pfh/synaesthesia.html
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		ICE SM X11 Xext c m ossaudio pthread pthread-stubs \
-			stdc++ usbhid xcb
+			stdc++ usbhid xcb SDL
 
 MASTER_SITES=		http://yoyo.cc.monash.edu.au/~pfh/
 
@@ -22,16 +22,17 @@ MASTER_SITES=		http://yoyo.cc.monash.edu.au/~pfh/
 FLAVORS=	esd
 FLAVOR?=	esd
 
-LIB_DEPENDS=		SDL.::devel/sdl
+LIB_DEPENDS=		::devel/sdl
 
 SEPARATE_BUILD=		concurrent
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
 
 .if ${FLAVOR:L:Mesd}
-LIB_DEPENDS+=	esd.>=2::audio/esound
+LIB_DEPENDS+=		::audio/esound
 CONFIGURE_ARGS+=	--with-esound
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
+WANTLIB +=		esd.>=2
 .else
 CONFIGURE_ARGS+=	--disable-esound
 .endif
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index b0260acd9a6..21d5fb1b320 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2010/10/18 18:13:15 espie Exp $
+# $OpenBSD: Makefile,v 1.56 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=	tools and library routines for working with TIFF images
 
@@ -11,8 +11,8 @@ MASTER_SITES=	http://download.osgeo.org/libtiff/
 
 HOMEPAGE=	http://www.remotesensing.org/libtiff/
 
-LIB_DEPENDS=	jpeg.>=64::graphics/jpeg
-WANTLIB=	c m stdc++ z
+LIB_DEPENDS=	::graphics/jpeg
+WANTLIB=	c m stdc++ z jpeg.>=64
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/graphics/tiff2png/Makefile b/graphics/tiff2png/Makefile
index f1b8a0c0aa5..fda68b807a9 100644
--- a/graphics/tiff2png/Makefile
+++ b/graphics/tiff2png/Makefile
@@ -1,17 +1,19 @@
-# $OpenBSD: Makefile,v 1.14 2009/12/20 17:10:04 benoit Exp $
+# $OpenBSD: Makefile,v 1.15 2010/11/09 19:00:28 espie Exp $
 
 COMMENT =	converts TIFF images to PNG format
 
 DISTNAME =	tiff2png-0.91
-PKGNAME =	${DISTNAME}p0
+REVISION =	0
 CATEGORIES =	graphics
 
 HOMEPAGE =	http://www.libpng.org/pub/png/apps/tiff2png.html
 
 MAINTAINER =	Benoit Lecocq <benoit@openbsd.org>
 
-LIB_DEPENDS =	tiff.>=35::graphics/tiff \
-		png.>=8::graphics/png
+LIB_DEPENDS =	::graphics/tiff \
+		::graphics/png
+
+WANTLIB =	c jpeg m z tiff.>=35 png.>=8
 
 # custom, see tiff2png.c
 PERMIT_PACKAGE_CDROM =	Yes
@@ -19,7 +21,6 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =	c jpeg m z
 
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=png-mng/}
 
diff --git a/graphics/vcdimager/Makefile b/graphics/vcdimager/Makefile
index c2bc986567f..57702883bec 100644
--- a/graphics/vcdimager/Makefile
+++ b/graphics/vcdimager/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2010/10/18 18:13:15 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=	(S)VCD authoring software
 
@@ -17,17 +17,17 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += c m z
+WANTLIB += c m z xml2.>=11 cdio iso9660 popt
 
 MODULES=		converters/libiconv
 
 USE_LIBTOOL=		Yes
 USE_GMAKE=		Yes
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 
-LIB_DEPENDS=		xml2.>=11::textproc/libxml \
-			cdio,iso9660::audio/libcdio \
-			popt::devel/popt
+LIB_DEPENDS=		::textproc/libxml \
+			::audio/libcdio \
+			::devel/popt
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/graphics/vid/Makefile b/graphics/vid/Makefile
index 6cda2b2d12c..b121211ba31 100644
--- a/graphics/vid/Makefile
+++ b/graphics/vid/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2007/09/15 20:09:43 simon Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/09 19:00:28 espie Exp $
 # $FreeBSD: ports/graphics/vid/Makefile,v 1.5 2001/02/21 07:48:56 roger Exp $
 
 COMMENT=	get images from USB cameras using the OV511(+) chipsets
 
 DISTNAME=	vid-1.0.1
-PKGNAME=	${DISTNAME}p4
+REVISION =	4
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://ovtvid-bsd.sourceforge.net/
@@ -18,8 +18,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ovtvid-bsd/}
 
-LIB_DEPENDS=	netpbm::graphics/netpbm
-WANTLIB=	c m
+LIB_DEPENDS=	::graphics/netpbm
+WANTLIB=	c m netpbm
 
 MAKE_FLAGS=	CFLAGS="${CFLAGS}" CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lnetpbm -lm"
diff --git a/graphics/videod/Makefile b/graphics/videod/Makefile
index 7a10372340b..0c036ad99b7 100644
--- a/graphics/videod/Makefile
+++ b/graphics/videod/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/10/18 18:13:15 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2010/11/09 19:00:28 espie Exp $
 
 # we use "macppc" and not "powerpc" on purpose here ; i.e. bktr(4) needed
 ONLY_FOR_ARCHS=	i386 macppc amd64
@@ -7,7 +7,7 @@ COMMENT=	video capture daemon for bktr(4) driver
 
 VERSION=	1.2
 DISTNAME=	videod-${VERSION}
-PKGNAME=	${DISTNAME}p0
+REVISION =	0
 CATEGORIES=	graphics
 HOMEPAGE=	http://videod.csoft.org/
 MASTER_SITES=	http://stable.csoft.org/videod/
@@ -19,10 +19,11 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		c
+
+WANTLIB=	c jpeg.>=62
 
 USE_GROFF =	Yes
-LIB_DEPENDS=	jpeg.>=62::graphics/jpeg
+LIB_DEPENDS=	::graphics/jpeg
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/videod ${PREFIX}/bin
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 6cf08b43105..46acb868e0a 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.46 2010/10/24 21:21:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.47 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=	CAD drawing program for X11
 
 VERSION=	3.2.5b
 DISTNAME=	xfig.${VERSION}.full
-PKGNAME=	xfig-${VERSION}p4
+PKGNAME=	xfig-${VERSION}
+REVISION =	4
 CATEGORIES=	graphics x11
 
 HOMEPAGE=	http://www.xfig.org/
@@ -15,15 +16,16 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += ICE SM X11 Xmu Xpm Xt c m pthread-stubs xcb z
+WANTLIB += ICE SM X11 Xmu Xpm Xt c m pthread-stubs xcb z jpeg.>=62 png.>=2
+WANTLIB += Xaw3d.>=6.1
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mcj/}
 
 FAKE=		lib
 PATCHORIG=	.pat.orig
-LIB_DEPENDS=	jpeg.>=62::graphics/jpeg \
-		png.>=2::graphics/png \
-		Xaw3d.>=6.1::x11/Xaw3d
+LIB_DEPENDS=	::graphics/jpeg \
+		::graphics/png \
+		::x11/Xaw3d
 RUN_DEPENDS=	::print/transfig \
 		::textproc/xpdf
 
diff --git a/graphics/xmms-kj/Makefile b/graphics/xmms-kj/Makefile
index 13091ed12c1..2d3ac20de1c 100644
--- a/graphics/xmms-kj/Makefile
+++ b/graphics/xmms-kj/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/10/24 21:21:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/09 19:00:28 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -6,7 +6,8 @@ COMMENT=	XMMS visualization plugin, to display Kjofol skins
 
 VERSION=	0.95
 DISTNAME=	kint_xmms-${VERSION}
-PKGNAME=	xmms-kj-${VERSION}p0
+PKGNAME=	xmms-kj-${VERSION}
+REVISION =	0
 CATEGORIES=	graphics
 HOMEPAGE=	http://www.csse.monash.edu.au/~timf/
 
@@ -18,13 +19,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		X11 Xext Xi gdk glib gmodule gtk iconv intl m \
-			pthread-stubs xcb z
+			pthread-stubs xcb z xmms.>=2 png.>=3
 
 MASTER_SITES=	${HOMEPAGE} \
 		http://mirror.csoft.org/xmms-kj/
 
-LIB_DEPENDS=	xmms.>=2::audio/xmms \
-		png.>=3::graphics/png
+LIB_DEPENDS=	::audio/xmms \
+		::graphics/png
 
 WRKDIST=	${WRKDIR}/xmms-kj
 MAKE_FILE=      makefile
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 661a8d7d240..cc12c047cba 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2010/10/24 21:21:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.48 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=		simple paint program
 
@@ -17,16 +17,16 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=		ICE SM X11 Xau Xdmcp Xaw Xext Xmu Xpm Xt c m \
-			pthread-stubs xcb z
+			pthread-stubs xcb z jpeg.>=62 tiff.>=36 png.>=4
 
 FAKE=			lib
-LIB_DEPENDS=		jpeg.>=62::graphics/jpeg \
-			tiff.>=36::graphics/tiff \
-			png.>=4::graphics/png
+LIB_DEPENDS=		::graphics/jpeg \
+			::graphics/tiff \
+			::graphics/png
 
 CONFIGURE_STYLE= 	imake
 ALL_TARGET=		xaw
-USE_GROFF =	Yes
+USE_GROFF =		Yes
 NO_REGRESS=		Yes
 
 .include <bsd.port.mk>
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 71839cc9a58..8b3a289e3b6 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2010/10/24 21:21:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=	scanner frontend for SANE
 
@@ -25,11 +25,12 @@ WANTLIB += fontconfig freetype gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gobject-2.0 gphoto2 gphoto2_port jpeg m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs tiff usb xcb z
 WANTLIB += avahi-client avahi-common gthread-2.0 xcb-render xcb-render-util
+WANTLIB += gdk-x11-2.0 gtk-x11-2.0 lcms.>=1 sane.>=1
 
 MODULES=	devel/gettext
-LIB_DEPENDS=	gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
-		lcms.>=1::graphics/lcms \
-		sane.>=1::graphics/sane-backends
+LIB_DEPENDS=	::x11/gtk+2 \
+		::graphics/lcms \
+		::graphics/sane-backends
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils \
 		::devel/xdg-utils
 
@@ -48,9 +49,11 @@ FLAVORS=	gimp
 FLAVOR?=
 
 .if ${FLAVOR:L} == "gimp"
-WANTLIB+=	gthread-2.0
-LIB_DEPENDS+=	gimp-2.0.>=200.0,gimpmodule-2.0,gimpui-2.0,gimpmath-2.0,gimpwidgets-2.0,gimpbase-2.0,gimpcolor-2.0,gimpconfig-2.0::graphics/gimp/stable
-CONFIGURE_ENV+=	CPPFLAGS+="-I${LOCALBASE}/include/gimp-2.0"
+WANTLIB += gthread-2.0 gimp-2.0.>=200.0 gimpmodule-2.0 gimpui-2.0 
+WANTLIB += gimpmath-2.0 gimpwidgets-2.0 gimpbase-2.0 gimpcolor-2.0 
+WANTLIB += gimpconfig-2.0
+LIB_DEPENDS +=::graphics/gimp/stable
+CONFIGURE_ENV += CPPFLAGS+="-I${LOCALBASE}/include/gimp-2.0"
 .else
 CONFIGURE_ARGS+=--disable-gimp
 .endif
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 1bd76ba0e22..491e3ac9915 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2010/10/24 21:21:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=	picture viewer for X, with thumbnail-based file selector
 DISTNAME=	xzgv-0.9
@@ -19,9 +19,10 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xzgv/}
 
 MODULES=	devel/gettext
 
-LIB_DEPENDS+=   gdk-x11-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2
+LIB_DEPENDS+=   ::x11/gtk+2
 
-WANTLIB+=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes gdk_pixbuf-2.0
+WANTLIB+=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes 
+WANTLIB +=	gdk_pixbuf-2.0 gdk-x11-2.0.>=0.11 gtk-x11-2.0.>=0.11
 WANTLIB+=	Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
 WANTLIB+=	freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 m pango-1.0
 WANTLIB+=	pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs xcb z
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index f5ff8492972..eba45751317 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2010/10/24 21:21:02 ajacoutot Exp $
+#	$OpenBSD: Makefile,v 1.8 2010/11/09 19:00:28 espie Exp $
 
 COMMENT=	ZBar barcode reader
 DISTNAME=	zbar-0.10
@@ -30,11 +30,12 @@ WANTLIB += cairo expat fontconfig freetype gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 jasper jbig jpeg
 WANTLIB += lcms m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
 WANTLIB += pixman-1 png pthread pthread-stubs tiff wmflite
-WANTLIB += xcb xml2 z gdk_pixbuf-2.0
+WANTLIB += xcb xml2 z gdk_pixbuf-2.0 MagickCore.>=1 MagickWand.>=1
+WANTLIB += ffi gdk-x11-2.0.>=0.11 gtk-x11-2.0.>=0.11
 
-LIB_DEPENDS=	MagickCore.>=1,MagickWand.>=1::graphics/ImageMagick \
-		ffi::devel/libffi \
-		gdk-x11-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2
+LIB_DEPENDS=	::graphics/ImageMagick \
+		::devel/libffi \
+		::x11/gtk+2
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	::x11/py-gtk2