diff --git a/audio/gmpc-plugins/Makefile b/audio/gmpc-plugins/Makefile
index 9bf66b51f21..db494f88b0f 100644
--- a/audio/gmpc-plugins/Makefile
+++ b/audio/gmpc-plugins/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2009/09/21 18:33:57 landry Exp $
+# $OpenBSD: Makefile,v 1.10 2010/04/03 00:32:55 sthen Exp $
 
 SHARED_ONLY =	Yes
 
@@ -8,7 +8,7 @@ COMMENT-wikipedia =	wikipedia plugin for gmpc
 VERSION =	0.19.0
 DISTNAME =	gmpc-plugins-${VERSION}
 PKGNAME-main =		${DISTNAME}
-PKGNAME-wikipedia =	gmpc-wikipedia-${VERSION}
+PKGNAME-wikipedia =	gmpc-wikipedia-${VERSION}p0
 
 CATEGORIES =	audio
 
@@ -45,7 +45,8 @@ LIB_DEPENDS-wikipedia =	${LIB_DEPENDS} \
 			webkit-1.0::www/webkit
 WANTLIB-wikipedia =	${WANTLIB} ICE SM Xt enchant gcrypt gnutls gpg-error \
 			icudata icui18n icuuc jpeg soup-2.4 tasn1 xslt \
-			gailutil
+			gailutil gstbase-0.10 gstpbutils-0.10 gstreamer-0.10 \
+			gstvideo-0.10
 
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
 WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 2be7147cd1f..0e36605eb79 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/01/09 00:21:30 fgsch Exp $
+# $OpenBSD: Makefile,v 1.11 2010/04/03 00:32:55 sthen Exp $
 
 SHARED_ONLY =	Yes
 
@@ -6,6 +6,7 @@ COMMENT =	distributed version control system by Canonical
 
 MODPY_EGG_VERSION = 2.0.3
 DISTNAME =	bzr-${MODPY_EGG_VERSION}
+PKGNAME =	${DISTNAME}p0
 CATEGORIES =	devel
 
 HOMEPAGE =	http://bazaar-vcs.org/
@@ -16,6 +17,8 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM = Yes
 PERMIT_DISTFILES_FTP =	Yes
 
+WANTLIB =	z
+
 MASTER_SITES =	http://launchpad.net/bzr/${MODPY_EGG_VERSION:C/..$//}/${MODPY_EGG_VERSION}/+download/
 
 MODULES =	lang/python
diff --git a/devel/gtkparasite/Makefile b/devel/gtkparasite/Makefile
index efec6efc2aa..6ace5bcef0a 100644
--- a/devel/gtkparasite/Makefile
+++ b/devel/gtkparasite/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2009/10/13 10:55:19 landry Exp $
+# $OpenBSD: Makefile,v 1.2 2010/04/03 00:32:55 sthen Exp $
 
 COMMENT =	Gtk debugging tool
 
 DISTNAME =	gtkparasite-0.0.1
+PKGNAME =	${DISTNAME}p0
 CATEGORIES =	devel
 
 HOMEPAGE =	http://chipx86.github.com/gtkparasite/
@@ -28,7 +29,7 @@ RUN_DEPENDS =	::x11/py-gtk2
 BUILD_DEPENDS+=	${RUN_DEPENDS}
 
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig
+WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat ffi fontconfig
 WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
 WANTLIB += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pcre pixman-1 png pthread-stubs util xcb z
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile
index 1c931b212f4..a7141630487 100644
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.12 2009/11/18 00:49:09 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2010/04/03 00:32:55 sthen Exp $
 
 COMMENT=	x86 with DOS emulator targeted at playing games
 DISTNAME=	dosbox-0.73
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	games x11 emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dosbox/}
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-WANTLIB=		SDL c m pthread stdc++ z
+WANTLIB=		SDL X11 c m pthread z
 
 LIB_DEPENDS=	SDL_net::devel/sdl-net \
 		SDL_sound::devel/sdl-sound \
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index e544a12ce1e..6102832dd5c 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.45 2009/12/22 16:06:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.46 2010/04/03 00:32:55 sthen Exp $
 
 COMMENT=	image viewer for KDE
 
 DISTNAME=	gwenview-1.4.2
-PKGNAME=	${DISTNAME}p7
+PKGNAME=	${DISTNAME}p8
 SHARED_LIBS +=	gwenviewcore         5.0      # .1.0
 CATEGORIES=	graphics x11 x11/kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gwenview/}
@@ -18,8 +18,8 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=	ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xrender \
-		art_lgpl_2 c fam idn jpeg m mng png pthread pthread-stubs \
-		rpcsvc stdc++ util xcb z
+		art_lgpl_2 c expat fam idn jpeg m mng png pthread \
+		pthread-stubs stdc++ util xcb z
 
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils
 LIB_DEPENDS=	kdecore.>=6,DCOP,kdefx,kdeprint,kdesu,kparts,kdeui,kio,kmediaplayer,kutils,kwalletclient::x11/kde/libs3 \
diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index a8d3a8b700f..d1dcb47c3bf 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.10 2009/09/07 21:36:12 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2010/04/03 00:32:56 sthen Exp $
 
 COMMENT=		Python bindings for goocanvas
 
 GNOME_PROJECT=		pygoocanvas
 GNOME_VERSION=		0.14.1
-PKGNAME=		py-goocanvas-${VERSION}p2
+PKGNAME=		py-goocanvas-${VERSION}p3
 
 HOMEPAGE=		http://live.gnome.org/GooCanvas
 
@@ -21,7 +21,7 @@ MODULES=		devel/gettext \
 			x11/gnome
 
 WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
-		Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \
+		Xi Xinerama Xrandr Xrender atk-1.0 cairo expat ffi fontconfig \
 		freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 \
 		glitz gmodule-2.0 gobject-2.0 gtk-x11-2.0 m pango-1.0 \
 		pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs \
diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile
index a2b0aecce9c..8b99ac62d38 100644
--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2009/11/16 12:03:12 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2010/04/03 00:32:56 sthen Exp $
 
 COMMENT=	read and manipulate raw images from digital cameras
 
 DISTNAME=	ufraw-0.16
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ufraw/}
@@ -28,6 +28,7 @@ LIB_DEPENDS=	gimp-2.0,gimpbase-2.0,gimpcolor-2.0,gimpconfig-2.0,gimpmath-2.0,gim
 		lcms.>=1.15::graphics/lcms \
 		bz2.>=10::archivers/bzip2 \
 		exiv2::graphics/exiv2 \
+		cfitsio::math/cfitsio \
 		gtkimageview::graphics/gtkimageview
 
 MODULES=	devel/gettext
diff --git a/net/unison/Makefile.inc b/net/unison/Makefile.inc
index f376791ff43..a3c18c146ba 100644
--- a/net/unison/Makefile.inc
+++ b/net/unison/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.10 2009/10/09 18:01:19 giovanni Exp $
+# $OpenBSD: Makefile.inc,v 1.11 2010/04/03 00:32:56 sthen Exp $
 
 DISTNAME=	unison-$V
 CATEGORIES=	net
@@ -30,6 +30,8 @@ USE_X11=	Yes
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama
 WANTLIB += Xrandr Xrender expat fontconfig freetype pixman-1 pthread-stubs
 WANTLIB += atk-1.0 iconv intl cairo glitz png xcb z
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0
 .endif
 
 # CFLAGS _must_ be empty.  This is an OCaml compiler.
diff --git a/net/unison/snapshot/Makefile b/net/unison/snapshot/Makefile
index 4a63d6bb05e..9202fe64424 100644
--- a/net/unison/snapshot/Makefile
+++ b/net/unison/snapshot/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2009/08/10 06:33:44 kili Exp $
+# $OpenBSD: Makefile,v 1.7 2010/04/03 00:32:56 sthen Exp $
 
 COMMENT=	multi-platform file synchronization tool, beta version
 
 V=		2.27.57
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 
 MASTER_SITES=	${HOMEPAGE}download/releases/beta/
 
diff --git a/net/unison/stable/Makefile b/net/unison/stable/Makefile
index aa2c4e078e0..05aa45d5f54 100644
--- a/net/unison/stable/Makefile
+++ b/net/unison/stable/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2009/10/09 18:01:19 giovanni Exp $
+# $OpenBSD: Makefile,v 1.11 2010/04/03 00:32:56 sthen Exp $
 
 COMMENT=	multi-platform file synchronization tool
 
 V=		2.32.52
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 
 MASTER_SITES=	${HOMEPAGE}download/releases/stable/
 
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 83d008e24c0..f28b3c1d9ab 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.55 2009/12/22 13:02:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.56 2010/04/03 00:32:56 sthen Exp $
 
 COMMENT=	GNOME web browser based on gecko
 
 DISTNAME=	galeon-2.0.7
-PKGNAME=	${DISTNAME}p10
+PKGNAME=	${DISTNAME}p11
 
 CATEGORIES=	www
 
@@ -26,7 +26,7 @@ WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \
 		pangocairo-1.0 pangoft2-1.0 pcre pixman-1 plc4 plds4 \
 		png popt pthread smime3 softokn3 ssl ssl3 startup-notification-1 \
 		stdc++ util z avahi-client avahi-common avahi-glib \
-		pthread-stubs xcb
+		pthread-stubs xcb execinfo xcb-atom xcb-aux xcb-event
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=galeon/}