diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 9b491d19594..634851eadc6 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.42 2008/06/15 00:08:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.43 2009/06/28 21:46:38 sthen Exp $
 
 COMMENT=	game where you deal drugs on the streets of NY
 
 DISTNAME=	dopewars-1.5.12
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dopewars/}
 
@@ -18,7 +18,7 @@ WANTLIB=		c ncurses
 
 MODULES+=	devel/gettext
 
-LIB_DEPENDS+=   glib-2.0::devel/glib2
+LIB_DEPENDS+=   gio-2.0,glib-2.0::devel/glib2
 
 USE_LIBTOOL=	Yes
 CONFIGURE_STYLE= gnu
diff --git a/graphics/amide/Makefile b/graphics/amide/Makefile
index 0e95cfd7714..a5c09d98788 100644
--- a/graphics/amide/Makefile
+++ b/graphics/amide/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2009/06/04 12:59:33 benoit Exp $
+# $OpenBSD: Makefile,v 1.2 2009/06/28 21:46:38 sthen Exp $
 
 COMMENT =	Amide a Medical Imaging Data Examiner
 
 DISTNAME =	amide-0.9.1
+PKGNAME =	${DISTNAME}p0
 CATEGORIES =	graphics
 
 HOMEPAGE =	http://amide.sourceforge.net/
@@ -22,7 +23,8 @@ WANTLIB += freetype gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 glitz 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 += pcre pixman-1 png pthread ssl stdc++ util xml2 z
-                
+WANTLIB += avahi-client avahi-common avahi-glib
+
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=amide/}
 
 EXTRACT_SUFX =	.tgz
@@ -58,5 +60,5 @@ NO_REGRESS =	Yes
 
 post-extract:
 	@rm -f ${WRKSRC}/src/ui_common.c.orig
-        
+
 .include <bsd.port.mk>
diff --git a/graphics/cal3d/Makefile b/graphics/cal3d/Makefile
index 11070b6ff2d..3fb85e9e446 100644
--- a/graphics/cal3d/Makefile
+++ b/graphics/cal3d/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2008/08/21 21:59:51 simon Exp $
+# $OpenBSD: Makefile,v 1.4 2009/06/28 21:46:38 sthen Exp $
 
 COMMENT =	skeletal based character animation library
 DISTNAME =	cal3d-0.11.0
+PKGNAME =	${DISTNAME}p0
 
 SHARED_LIBS =	cal3d	1.0	# .12.0
 
@@ -17,7 +18,7 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =	c
+WANTLIB =	c m stdc++
 
 MASTER_SITES =	http://download.gna.org/cal3d/sources/
 
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 5e29b4272d6..30880852f0a 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.58 2009/06/01 21:17:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.59 2009/06/28 21:46:38 sthen Exp $
 
 COMMENT=	technical diagrams drawing tool
 
 GNOME_PROJECT=	dia
 GNOME_VERSION=	0.97
+PKGNAME=	${DISTNAME}p0
 
 CATEGORIES=	graphics
 
@@ -57,7 +58,7 @@ LIB_DEPENDS+=	gnomeui-2::x11/gnome/libgnomeui \
 WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM bonobo-2 bonobo-activation
 WANTLIB += bonoboui-2 crypto dbus-1 dbus-glib-1 gconf-2 gailutil
 WANTLIB += gnome-2 gnome-keyring gnomecanvas-2 gnomevfs-2 popt ssl
-WANTLIB += util
+WANTLIB += util avahi-client avahi-common avahi-glib
 MODGNOME_HELP_FILES= Yes
 .else
 # help is only installed and usable with yelp